diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index 749e6f526aa4b1..2120d82b733461 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -23,7 +23,7 @@ jobs: operating_system: ["ubuntu-latest", "macos-latest"] steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: ${{inputs.python_version}} - name: Install Python packages diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index fd863b6abb8726..21c1b2f0ba3f1d 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -159,7 +159,7 @@ jobs: brew install cmake bison@2.7 tree - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: "3.12" - name: Bootstrap clingo diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 880cf9c64495f5..066b65f84ccac6 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -57,7 +57,7 @@ jobs: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 - - uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 + - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c id: docker_meta with: images: | @@ -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] }} diff --git a/.github/workflows/nightly-win-builds.yml b/.github/workflows/nightly-win-builds.yml index 511316a2a35504..e93e80e3e44e75 100644 --- a/.github/workflows/nightly-win-builds.yml +++ b/.github/workflows/nightly-win-builds.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: 3.9 - name: Install Python packages diff --git a/.github/workflows/style/requirements.txt b/.github/workflows/style/requirements.txt index 0822ba39339737..d662c32fb0c5c4 100644 --- a/.github/workflows/style/requirements.txt +++ b/.github/workflows/style/requirements.txt @@ -1,7 +1,7 @@ -black==23.10.1 +black==23.12.1 clingo==5.6.2 -flake8==6.1.0 -isort==5.12.0 -mypy==1.6.1 +flake8==7.0.0 +isort==5.13.2 +mypy==1.8.0 types-six==1.16.21.9 -vermin==1.5.2 +vermin==1.6.0 diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index ec2b5aa52c2764..1bdf98ba7c0b04 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: ${{ matrix.python-version }} - name: Install System packages @@ -117,7 +117,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: '3.10' - name: Install System packages @@ -184,7 +184,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: '3.10' - name: Install System packages @@ -223,7 +223,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # @v2 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # @v2 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # @v2 with: python-version: ${{ matrix.python-version }} - name: Install Python packages @@ -248,7 +248,7 @@ jobs: $(which spack) bootstrap disable spack-install $(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 --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}" + $(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}" - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d with: flags: unittests,macos diff --git a/.github/workflows/valid-style.yml b/.github/workflows/valid-style.yml index 80aa5b2a4f1ff1..4440eebfb55244 100644 --- a/.github/workflows/valid-style.yml +++ b/.github/workflows/valid-style.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: '3.11' cache: 'pip' @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: '3.11' cache: 'pip' diff --git a/.github/workflows/windows_python.yml b/.github/workflows/windows_python.yml index 137c00a9bdbc70..b1e4f72f2cbdf5 100644 --- a/.github/workflows/windows_python.yml +++ b/.github/workflows/windows_python.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: 3.9 - name: Install Python packages @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: 3.9 - name: Install Python packages @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 + - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: 3.9 - name: Install Python packages diff --git a/CITATION.cff b/CITATION.cff index 16f42d01651f19..59888b51ce29e1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -31,13 +31,17 @@ type: software message: "If you are referencing Spack in a publication, please cite the paper below." title: "The Spack Package Manager: Bringing Order to HPC Software Chaos" abstract: >- - Large HPC centers spend considerable time supporting software for thousands of users, but the complexity of HPC software is quickly outpacing the capabilities of existing software management tools. - Scientific applications require specific versions of compilers, MPI, and other dependency libraries, so using a single, standard software stack is infeasible. - However, managing many configurations is difficult because the configuration space is combinatorial in size. - We introduce Spack, a tool used at Lawrence Livermore National Laboratory to manage this complexity. - Spack provides a novel, re- cursive specification syntax to invoke parametric builds of packages and dependencies. - It allows any number of builds to coexist on the same system, and it ensures that installed packages can find their dependencies, regardless of the environment. - We show through real-world use cases that Spack supports diverse and demanding applications, bringing order to HPC software chaos. + Large HPC centers spend considerable time supporting software for thousands of users, but the + complexity of HPC software is quickly outpacing the capabilities of existing software management + tools. Scientific applications require specific versions of compilers, MPI, and other dependency + libraries, so using a single, standard software stack is infeasible. However, managing many + configurations is difficult because the configuration space is combinatorial in size. We + introduce Spack, a tool used at Lawrence Livermore National Laboratory to manage this complexity. + Spack provides a novel, re- cursive specification syntax to invoke parametric builds of packages + and dependencies. It allows any number of builds to coexist on the same system, and it ensures + that installed packages can find their dependencies, regardless of the environment. We show + through real-world use cases that Spack supports diverse and demanding applications, bringing + order to HPC software chaos. preferred-citation: title: "The Spack Package Manager: Bringing Order to HPC Software Chaos" type: conference-paper @@ -71,7 +75,7 @@ preferred-citation: type: doi value: 10.1145/2807591.2807623 - description: "The DOE Document Release Number of the work" - type: other + type: other value: "LLNL-CONF-669890" authors: - family-names: "Gamblin" diff --git a/LICENSE-MIT b/LICENSE-MIT index 54bef34ec5a051..8d8e1325df3389 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2013-2023 LLNS, LLC and other Spack Project Developers. +Copyright (c) 2013-2024 LLNS, LLC and other Spack Project Developers. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d048140ec1badc..0bb54035f5cf1b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,34 @@ -# Spack Spack +
-[![Unit Tests](https://github.com/spack/spack/workflows/linux%20tests/badge.svg)](https://github.com/spack/spack/actions) -[![Bootstrapping](https://github.com/spack/spack/actions/workflows/bootstrap.yml/badge.svg)](https://github.com/spack/spack/actions/workflows/bootstrap.yml) -[![codecov](https://codecov.io/gh/spack/spack/branch/develop/graph/badge.svg)](https://codecov.io/gh/spack/spack) -[![Containers](https://github.com/spack/spack/actions/workflows/build-containers.yml/badge.svg)](https://github.com/spack/spack/actions/workflows/build-containers.yml) -[![Read the Docs](https://readthedocs.org/projects/spack/badge/?version=latest)](https://spack.readthedocs.io) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -[![Slack](https://slack.spack.io/badge.svg)](https://slack.spack.io) -[![Matrix](https://img.shields.io/matrix/spack-space%3Amatrix.org?label=Matrix)](https://matrix.to/#/#spack-space:matrix.org) +

+ + + + Spack + + +
+
+ +CI Status +Bootstrap Status +Containers Status +Documentation Status +Code coverage +Slack +Matrix + +

+ +**[Getting Started]   •   [Config]   •   [Community]   •   [Contributing]   •   [Packaging Guide]** + +[Getting Started]: https://spack.readthedocs.io/en/latest/getting_started.html +[Config]: https://spack.readthedocs.io/en/latest/configuration.html +[Community]: #community +[Contributing]: https://spack.readthedocs.io/en/latest/contribution_guide.html +[Packaging Guide]: https://spack.readthedocs.io/en/latest/packaging_guide.html + +
Spack is a multi-platform package manager that builds and installs multiple versions and configurations of software. It works on Linux, @@ -66,10 +87,11 @@ Resources: * **Matrix space**: [#spack-space:matrix.org](https://matrix.to/#/#spack-space:matrix.org): [bridged](https://github.com/matrix-org/matrix-appservice-slack#matrix-appservice-slack) to Slack. * [**Github Discussions**](https://github.com/spack/spack/discussions): - not just for discussions, but also Q&A. -* **Mailing list**: [groups.google.com/d/forum/spack](https://groups.google.com/d/forum/spack) + for Q&A and discussions. Note the pinned discussions for announcements. * **Twitter**: [@spackpm](https://twitter.com/spackpm). Be sure to `@mention` us! +* **Mailing list**: [groups.google.com/d/forum/spack](https://groups.google.com/d/forum/spack): + only for announcements. Please use other venues for discussions. Contributing ------------------------ diff --git a/bin/haspywin.py b/bin/haspywin.py index da9e5ab7de7b09..538286819f68fd 100644 --- a/bin/haspywin.py +++ b/bin/haspywin.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/bin/sbang b/bin/sbang index 727a3bbce6d31a..47275348124637 100755 --- a/bin/sbang +++ b/bin/sbang @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # sbang project developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) diff --git a/bin/spack b/bin/spack index a94faad09b12ac..44ad33f35a4fbb 100755 --- a/bin/spack +++ b/bin/spack @@ -1,7 +1,7 @@ #!/bin/sh # -*- python -*- # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/bin/spack-python b/bin/spack-python index 30196d46c164e3..ff555aa93b2d34 100755 --- a/bin/spack-python +++ b/bin/spack-python @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/bin/spack.bat b/bin/spack.bat index b067256cf90ef7..832801359967b3 100644 --- a/bin/spack.bat +++ b/bin/spack.bat @@ -1,4 +1,4 @@ -:: Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +:: 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) diff --git a/bin/spack.ps1 b/bin/spack.ps1 index e08f1fc53d7204..5a82b0b620cfee 100644 --- a/bin/spack.ps1 +++ b/bin/spack.ps1 @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/bin/spack_pwsh.ps1 b/bin/spack_pwsh.ps1 index 0f5f0725496b18..6340aa8e86e705 100644 --- a/bin/spack_pwsh.ps1 +++ b/bin/spack_pwsh.ps1 @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/etc/spack/defaults/darwin/packages.yaml b/etc/spack/defaults/darwin/packages.yaml index 63f85bbbd98b65..9fd54f2e6e0991 100644 --- a/etc/spack/defaults/darwin/packages.yaml +++ b/etc/spack/defaults/darwin/packages.yaml @@ -50,4 +50,4 @@ packages: # Apple bundles libuuid in libsystem_c version 1353.100.2, # although the version number used here isn't critical - spec: apple-libuuid@1353.100.2 - prefix: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + prefix: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk diff --git a/lib/spack/docs/_pygments/style.py b/lib/spack/docs/_pygments/style.py index 0d7c386463d7fe..23104f95656f0c 100644 --- a/lib/spack/docs/_pygments/style.py +++ b/lib/spack/docs/_pygments/style.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index 52054a9405653e..a866d80fa80224 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/binary_caches.rst b/lib/spack/docs/binary_caches.rst index eeb6c4b783c8d1..27d72877a7eb15 100644 --- a/lib/spack/docs/binary_caches.rst +++ b/lib/spack/docs/binary_caches.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -153,7 +153,43 @@ keyring, and trusting all downloaded keys. List of popular build caches ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -* `Extreme-scale Scientific Software Stack (E4S) `_: `build cache `_ +* `Extreme-scale Scientific Software Stack (E4S) `_: `build cache `_' + +------------------- +Build cache signing +------------------- + +By default, Spack will add a cryptographic signature to each package pushed to +a build cache, and verifies the signature when installing from a build cache. + +Keys for signing can be managed with the :ref:`spack gpg ` command, +as well as ``spack buildcache keys`` as mentioned above. + +You can disable signing when pushing with ``spack buildcache push --unsigned``, +and disable verification when installing from any build cache with +``spack install --no-check-signature``. + +Alternatively, signing and verification can be enabled or disabled on a per build cache +basis: + +.. code-block:: console + + $ spack mirror add --signed # enable signing and verification + $ spack mirror add --unsigned # disable signing and verification + + $ spack mirror set --signed # enable signing and verification for an existing mirror + $ spack mirror set --unsigned # disable signing and verification for an existing mirror + +Or you can directly edit the ``mirrors.yaml`` configuration file: + +.. code-block:: yaml + + mirrors: + : + url: + signed: false # disable signing and verification + +See also :ref:`mirrors`. ---------- Relocation @@ -182,6 +218,7 @@ section of the configuration: padded_length: 128 +.. _binary_caches_oci: ----------------------------------------- OCI / Docker V2 registries as build cache @@ -250,87 +287,13 @@ To significantly speed up Spack in GitHub Actions, binaries can be cached in GitHub Packages. This service is an OCI registry that can be linked to a GitHub repository. -A typical workflow is to include a ``spack.yaml`` environment in your repository -that specifies the packages to install, the target architecture, and the build -cache to use under ``mirrors``: - -.. code-block:: yaml - - spack: - specs: - - python@3.11 - config: - install_tree: - root: /opt/spack - padded_length: 128 - packages: - all: - require: target=x86_64_v2 - mirrors: - local-buildcache: oci://ghcr.io// - -A GitHub action can then be used to install the packages and push them to the -build cache: - -.. code-block:: yaml - - name: Install Spack packages - - on: push - - env: - SPACK_COLOR: always - - jobs: - example: - runs-on: ubuntu-22.04 - permissions: - packages: write - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Checkout Spack - uses: actions/checkout@v3 - with: - repository: spack/spack - path: spack - - - name: Setup Spack - run: echo "$PWD/spack/bin" >> "$GITHUB_PATH" - - - name: Concretize - run: spack -e . concretize - - - name: Install - run: spack -e . install --no-check-signature - - - name: Run tests - run: ./my_view/bin/python3 -c 'print("hello world")' - - - name: Push to buildcache - run: | - spack -e . mirror set --oci-username ${{ github.actor }} --oci-password "${{ secrets.GITHUB_TOKEN }}" local-buildcache - spack -e . buildcache push --base-image ubuntu:22.04 --unsigned --update-index local-buildcache - if: ${{ !cancelled() }} - -The first time this action runs, it will build the packages from source and -push them to the build cache. Subsequent runs will pull the binaries from the -build cache. The concretizer will ensure that prebuilt binaries are favored -over source builds. - -The build cache entries appear in the GitHub Packages section of your repository, -and contain instructions for pulling and running them with ``docker`` or ``podman``. - - -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Using Spack's public build cache for GitHub Actions -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Spack offers a public build cache for GitHub Actions with a set of common packages, which lets you get started quickly. See the following resources for more information: -* `spack/github-actions-buildcache `_ +* `spack/setup-spack `_ for setting up Spack in GitHub + Actions +* `spack/github-actions-buildcache `_ for + more details on the public build cache .. _cmd-spack-buildcache: diff --git a/lib/spack/docs/bootstrapping.rst b/lib/spack/docs/bootstrapping.rst index 8eca492413c998..621f888c678805 100644 --- a/lib/spack/docs/bootstrapping.rst +++ b/lib/spack/docs/bootstrapping.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_settings.rst b/lib/spack/docs/build_settings.rst index 0f53355a81dd80..f58c9f4c9772e7 100644 --- a/lib/spack/docs/build_settings.rst +++ b/lib/spack/docs/build_settings.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems.rst b/lib/spack/docs/build_systems.rst index f659d63e4a322d..c13c82a34115fb 100644 --- a/lib/spack/docs/build_systems.rst +++ b/lib/spack/docs/build_systems.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/autotoolspackage.rst b/lib/spack/docs/build_systems/autotoolspackage.rst index 8b8ccb8f35c1c7..c0adcda178bb42 100644 --- a/lib/spack/docs/build_systems/autotoolspackage.rst +++ b/lib/spack/docs/build_systems/autotoolspackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/bundlepackage.rst b/lib/spack/docs/build_systems/bundlepackage.rst index 323a13d47206b8..3339de630ddfe9 100644 --- a/lib/spack/docs/build_systems/bundlepackage.rst +++ b/lib/spack/docs/build_systems/bundlepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/cachedcmakepackage.rst b/lib/spack/docs/build_systems/cachedcmakepackage.rst index 7d0b8ff7e8d0c5..17b005f6bc46bc 100644 --- a/lib/spack/docs/build_systems/cachedcmakepackage.rst +++ b/lib/spack/docs/build_systems/cachedcmakepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/cmakepackage.rst b/lib/spack/docs/build_systems/cmakepackage.rst index fc1de918fd925b..140fa34e3e34a8 100644 --- a/lib/spack/docs/build_systems/cmakepackage.rst +++ b/lib/spack/docs/build_systems/cmakepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -82,7 +82,7 @@ class already contains: .. code-block:: python - depends_on('cmake', type='build') + depends_on("cmake", type="build") If you need to specify a particular version requirement, you can @@ -90,7 +90,7 @@ override this in your package: .. code-block:: python - depends_on('cmake@2.8.12:', type='build') + depends_on("cmake@2.8.12:", type="build") ^^^^^^^^^^^^^^^^^^^ @@ -137,10 +137,10 @@ and without the :meth:`~spack.build_systems.cmake.CMakeBuilder.define` and def cmake_args(self): args = [ - '-DWHATEVER:STRING=somevalue', - self.define('ENABLE_BROKEN_FEATURE', False), - self.define_from_variant('DETECT_HDF5', 'hdf5'), - self.define_from_variant('THREADS'), # True if +threads + "-DWHATEVER:STRING=somevalue", + self.define("ENABLE_BROKEN_FEATURE", False), + self.define_from_variant("DETECT_HDF5", "hdf5"), + self.define_from_variant("THREADS"), # True if +threads ] return args @@ -151,10 +151,10 @@ and CMake simply ignores the empty command line argument. For example the follow .. code-block:: python - variant('example', default=True, when='@2.0:') + variant("example", default=True, when="@2.0:") def cmake_args(self): - return [self.define_from_variant('EXAMPLE', 'example')] + return [self.define_from_variant("EXAMPLE", "example")] will generate ``'cmake' '-DEXAMPLE=ON' ...`` when `@2.0: +example` is met, but will result in ``'cmake' '' ...`` when the spec version is below ``2.0``. @@ -193,9 +193,9 @@ a variant to control this: .. code-block:: python - variant('build_type', default='RelWithDebInfo', - description='CMake build type', - values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel')) + variant("build_type", default="RelWithDebInfo", + description="CMake build type", + values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel")) However, not every CMake package accepts all four of these options. Grep the ``CMakeLists.txt`` file to see if the default values are @@ -205,9 +205,9 @@ package overrides the default variant with: .. code-block:: python - variant('build_type', default='DebugRelease', - description='The build type to build', - values=('Debug', 'Release', 'DebugRelease')) + variant("build_type", default="DebugRelease", + description="The build type to build", + values=("Debug", "Release", "DebugRelease")) For more information on ``CMAKE_BUILD_TYPE``, see: https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html @@ -250,7 +250,7 @@ generator is Ninja. To switch to the Ninja generator, simply add: .. code-block:: python - generator = 'Ninja' + generator = "Ninja" ``CMakePackage`` defaults to "Unix Makefiles". If you switch to the @@ -258,7 +258,7 @@ Ninja generator, make sure to add: .. code-block:: python - depends_on('ninja', type='build') + depends_on("ninja", type="build") to the package as well. Aside from that, you shouldn't need to do anything else. Spack will automatically detect that you are using @@ -288,7 +288,7 @@ like so: .. code-block:: python - root_cmakelists_dir = 'src' + root_cmakelists_dir = "src" Note that this path is relative to the root of the extracted tarball, @@ -304,7 +304,7 @@ different sub-directory, simply override ``build_directory`` like so: .. code-block:: python - build_directory = 'my-build' + build_directory = "my-build" ^^^^^^^^^^^^^^^^^^^^^^^^^ Build and install targets @@ -324,8 +324,8 @@ library or build the documentation, you can add these like so: .. code-block:: python - build_targets = ['all', 'docs'] - install_targets = ['install', 'docs'] + build_targets = ["all", "docs"] + install_targets = ["install", "docs"] ^^^^^^^ Testing diff --git a/lib/spack/docs/build_systems/cudapackage.rst b/lib/spack/docs/build_systems/cudapackage.rst index 79c98dd52c94f1..34686b8b629482 100644 --- a/lib/spack/docs/build_systems/cudapackage.rst +++ b/lib/spack/docs/build_systems/cudapackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/custompackage.rst b/lib/spack/docs/build_systems/custompackage.rst index 5175a0df4df703..35475fc8ecb2f6 100644 --- a/lib/spack/docs/build_systems/custompackage.rst +++ b/lib/spack/docs/build_systems/custompackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/inteloneapipackage.rst b/lib/spack/docs/build_systems/inteloneapipackage.rst index e9fd26690f9ddb..feae03a280d24d 100644 --- a/lib/spack/docs/build_systems/inteloneapipackage.rst +++ b/lib/spack/docs/build_systems/inteloneapipackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -53,18 +53,24 @@ Install the oneAPI compilers:: Add the compilers to your ``compilers.yaml`` so spack can use them:: - spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin/intel64 - spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin + spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/bin Verify that the compilers are available:: spack compiler list +Note that 2024 and later releases do not include ``icc``. Before 2024, +the package layout was different:: + + spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin/intel64 + spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin + The ``intel-oneapi-compilers`` package includes 2 families of compilers: * ``intel``: ``icc``, ``icpc``, ``ifort``. Intel's *classic* - compilers. + compilers. 2024 and later releases contain ``ifort``, but not + ``icc`` and ``icpc``. * ``oneapi``: ``icx``, ``icpx``, ``ifx``. Intel's new generation of compilers based on LLVM. @@ -89,8 +95,8 @@ Install the oneAPI compilers:: Add the compilers to your ``compilers.yaml`` so Spack can use them:: - spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin/intel64 - spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/linux/bin + spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/bin + spack compiler add `spack location -i intel-oneapi-compilers`/compiler/latest/bin Verify that the compilers are available:: @@ -146,8 +152,7 @@ Compilers To use the compilers, add some information about the installation to ``compilers.yaml``. For most users, it is sufficient to do:: - spack compiler add /opt/intel/oneapi/compiler/latest/linux/bin/intel64 - spack compiler add /opt/intel/oneapi/compiler/latest/linux/bin + spack compiler add /opt/intel/oneapi/compiler/latest/bin Adapt the paths above if you did not install the tools in the default location. After adding the compilers, using them is the same @@ -156,6 +161,12 @@ Another option is to manually add the configuration to ``compilers.yaml`` as described in :ref:`Compiler configuration `. +Before 2024, the directory structure was different:: + + spack compiler add /opt/intel/oneapi/compiler/latest/linux/bin/intel64 + spack compiler add /opt/intel/oneapi/compiler/latest/linux/bin + + Libraries --------- diff --git a/lib/spack/docs/build_systems/intelpackage.rst b/lib/spack/docs/build_systems/intelpackage.rst index 9afe1a8b919543..b2159d88cf32fa 100644 --- a/lib/spack/docs/build_systems/intelpackage.rst +++ b/lib/spack/docs/build_systems/intelpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -90,7 +90,7 @@ and optimizers do require a paid license. In Spack, they are packaged as: TODO: Confirm and possible change(!) the scope of MPI components (runtime vs. devel) in current (and previous?) *cluster/professional/composer* editions, i.e., presence in downloads, possibly subject to license - coverage(!); see `disussion in PR #4300 + coverage(!); see `discussion in PR #4300 `_. [NB: An "mpi" subdirectory is not indicative of the full MPI SDK being present (i.e., ``mpicc``, ..., and header files). The directory may just as well @@ -934,9 +934,9 @@ a *virtual* ``mkl`` package is declared in Spack. .. code-block:: python # Examples for absolute and conditional dependencies: - depends_on('mkl') - depends_on('mkl', when='+mkl') - depends_on('mkl', when='fftw=mkl') + depends_on("mkl") + depends_on("mkl", when="+mkl") + depends_on("mkl", when="fftw=mkl") The ``MKLROOT`` environment variable (part of the documented API) will be set during all stages of client package installation, and is available to both @@ -972,8 +972,8 @@ a *virtual* ``mkl`` package is declared in Spack. def configure_args(self): args = [] ... - args.append('--with-blas=%s' % self.spec['blas'].libs.ld_flags) - args.append('--with-lapack=%s' % self.spec['lapack'].libs.ld_flags) + args.append("--with-blas=%s" % self.spec["blas"].libs.ld_flags) + args.append("--with-lapack=%s" % self.spec["lapack"].libs.ld_flags) ... .. tip:: @@ -989,13 +989,13 @@ a *virtual* ``mkl`` package is declared in Spack. .. code-block:: python - self.spec['blas'].headers.include_flags + self.spec["blas"].headers.include_flags and to generate linker options (``-L -llibname ...``), use the same as above, .. code-block:: python - self.spec['blas'].libs.ld_flags + self.spec["blas"].libs.ld_flags See :ref:`MakefilePackage ` diff --git a/lib/spack/docs/build_systems/luapackage.rst b/lib/spack/docs/build_systems/luapackage.rst index 71a0c3962c6100..a900507442ca3d 100644 --- a/lib/spack/docs/build_systems/luapackage.rst +++ b/lib/spack/docs/build_systems/luapackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -88,7 +88,7 @@ override the ``luarocks_args`` method like so: .. code-block:: python def luarocks_args(self): - return ['flag1', 'flag2'] + return ["flag1", "flag2"] One common use of this is to override warnings or flags for newer compilers, as in: diff --git a/lib/spack/docs/build_systems/makefilepackage.rst b/lib/spack/docs/build_systems/makefilepackage.rst index af027aab1c69c7..c6d6300ccce320 100644 --- a/lib/spack/docs/build_systems/makefilepackage.rst +++ b/lib/spack/docs/build_systems/makefilepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -88,13 +88,13 @@ command-line. However, Makefiles that use ``?=`` for assignment honor environment variables. Since Spack already sets ``CC``, ``CXX``, ``F77``, and ``FC``, you won't need to worry about setting these variables. If there are any other variables you need to set, you can do this in the -``edit`` method: +``setup_build_environment`` method: .. code-block:: python - def edit(self, spec, prefix): - env["PREFIX"] = prefix - env["BLASLIB"] = spec["blas"].libs.ld_flags + def setup_build_environment(self, env): + env.set("PREFIX", prefix) + env.set("BLASLIB", spec["blas"].libs.ld_flags) `cbench `_ @@ -140,7 +140,7 @@ Edit Makefile Some Makefiles are just plain stubborn and will ignore command-line variables. The only way to ensure that these packages build correctly is to directly edit the Makefile. Spack provides a ``FileFilter`` class -and a ``filter_file`` method to help with this. For example: +and a ``filter`` method to help with this. For example: .. code-block:: python diff --git a/lib/spack/docs/build_systems/mavenpackage.rst b/lib/spack/docs/build_systems/mavenpackage.rst index 70c57024acfb33..5b0a7cf6d7f130 100644 --- a/lib/spack/docs/build_systems/mavenpackage.rst +++ b/lib/spack/docs/build_systems/mavenpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -48,8 +48,8 @@ class automatically adds the following dependencies: .. code-block:: python - depends_on('java', type=('build', 'run')) - depends_on('maven', type='build') + depends_on("java", type=("build", "run")) + depends_on("maven", type="build") In the ``pom.xml`` file, you may see sections like: @@ -72,8 +72,8 @@ should add: .. code-block:: python - depends_on('java@7:', type='build') - depends_on('maven@3.5.4:', type='build') + depends_on("java@7:", type="build") + depends_on("maven@3.5.4:", type="build") ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -88,9 +88,9 @@ the build phase. For example: def build_args(self): return [ - '-Pdist,native', - '-Dtar', - '-Dmaven.javadoc.skip=true' + "-Pdist,native", + "-Dtar", + "-Dmaven.javadoc.skip=true" ] diff --git a/lib/spack/docs/build_systems/mesonpackage.rst b/lib/spack/docs/build_systems/mesonpackage.rst index e2f2e0a99eba63..f19aa78151900e 100644 --- a/lib/spack/docs/build_systems/mesonpackage.rst +++ b/lib/spack/docs/build_systems/mesonpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -86,8 +86,8 @@ the ``MesonPackage`` base class already contains: .. code-block:: python - depends_on('meson', type='build') - depends_on('ninja', type='build') + depends_on("meson", type="build") + depends_on("ninja", type="build") If you need to specify a particular version requirement, you can @@ -95,8 +95,8 @@ override this in your package: .. code-block:: python - depends_on('meson@0.43.0:', type='build') - depends_on('ninja', type='build') + depends_on("meson@0.43.0:", type="build") + depends_on("ninja", type="build") ^^^^^^^^^^^^^^^^^^^ @@ -121,7 +121,7 @@ override the ``meson_args`` method like so: .. code-block:: python def meson_args(self): - return ['--warnlevel=3'] + return ["--warnlevel=3"] This method can be used to pass flags as well as variables. diff --git a/lib/spack/docs/build_systems/octavepackage.rst b/lib/spack/docs/build_systems/octavepackage.rst index 2679a1dacc4b99..8bf0ee010af201 100644 --- a/lib/spack/docs/build_systems/octavepackage.rst +++ b/lib/spack/docs/build_systems/octavepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/perlpackage.rst b/lib/spack/docs/build_systems/perlpackage.rst index c29dfaad55caf3..49fb874525492f 100644 --- a/lib/spack/docs/build_systems/perlpackage.rst +++ b/lib/spack/docs/build_systems/perlpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -118,7 +118,7 @@ so ``PerlPackage`` contains: .. code-block:: python - extends('perl') + extends("perl") If your package requires a specific version of Perl, you should @@ -132,14 +132,14 @@ properly. If your package uses ``Makefile.PL`` to build, add: .. code-block:: python - depends_on('perl-extutils-makemaker', type='build') + depends_on("perl-extutils-makemaker", type="build") If your package uses ``Build.PL`` to build, add: .. code-block:: python - depends_on('perl-module-build', type='build') + depends_on("perl-module-build", type="build") ^^^^^^^^^^^^^^^^^ @@ -165,11 +165,11 @@ arguments to ``Makefile.PL`` or ``Build.PL`` by overriding .. code-block:: python def configure_args(self): - expat = self.spec['expat'].prefix + expat = self.spec["expat"].prefix return [ - 'EXPATLIBPATH={0}'.format(expat.lib), - 'EXPATINCPATH={0}'.format(expat.include), + "EXPATLIBPATH={0}".format(expat.lib), + "EXPATINCPATH={0}".format(expat.include), ] diff --git a/lib/spack/docs/build_systems/pythonpackage.rst b/lib/spack/docs/build_systems/pythonpackage.rst index 168ff5dc88223c..372d4ad47c5ce7 100644 --- a/lib/spack/docs/build_systems/pythonpackage.rst +++ b/lib/spack/docs/build_systems/pythonpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/qmakepackage.rst b/lib/spack/docs/build_systems/qmakepackage.rst index 98d625ede08b6a..be66c4a1cfaeef 100644 --- a/lib/spack/docs/build_systems/qmakepackage.rst +++ b/lib/spack/docs/build_systems/qmakepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -83,7 +83,7 @@ base class already contains: .. code-block:: python - depends_on('qt', type='build') + depends_on("qt", type="build") If you want to specify a particular version requirement, or need to @@ -91,7 +91,7 @@ link to the ``qt`` libraries, you can override this in your package: .. code-block:: python - depends_on('qt@5.6.0:') + depends_on("qt@5.6.0:") ^^^^^^^^^^^^^^^^^^^^^^^^^^ Passing arguments to qmake @@ -103,7 +103,7 @@ override the ``qmake_args`` method like so: .. code-block:: python def qmake_args(self): - return ['-recursive'] + return ["-recursive"] This method can be used to pass flags as well as variables. @@ -118,7 +118,7 @@ sub-directory by adding the following to the package: .. code-block:: python - build_directory = 'src' + build_directory = "src" ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/spack/docs/build_systems/racketpackage.rst b/lib/spack/docs/build_systems/racketpackage.rst index 8e0611af413185..cd94b9fc4b574a 100644 --- a/lib/spack/docs/build_systems/racketpackage.rst +++ b/lib/spack/docs/build_systems/racketpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/rocmpackage.rst b/lib/spack/docs/build_systems/rocmpackage.rst index 8f90794dfb7df5..fb517fe21bf0db 100644 --- a/lib/spack/docs/build_systems/rocmpackage.rst +++ b/lib/spack/docs/build_systems/rocmpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/rpackage.rst b/lib/spack/docs/build_systems/rpackage.rst index a5a5fcee3182e2..b2ac27f72a2503 100644 --- a/lib/spack/docs/build_systems/rpackage.rst +++ b/lib/spack/docs/build_systems/rpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -163,28 +163,28 @@ attributes that can be used to set ``homepage``, ``url``, ``list_url``, and .. code-block:: python - cran = 'caret' + cran = "caret" is equivalent to: .. code-block:: python - homepage = 'https://cloud.r-project.org/package=caret' - url = 'https://cloud.r-project.org/src/contrib/caret_6.0-86.tar.gz' - list_url = 'https://cloud.r-project.org/src/contrib/Archive/caret' + homepage = "https://cloud.r-project.org/package=caret" + url = "https://cloud.r-project.org/src/contrib/caret_6.0-86.tar.gz" + list_url = "https://cloud.r-project.org/src/contrib/Archive/caret" Likewise, the following ``bioc`` attribute: .. code-block:: python - bioc = 'BiocVersion' + bioc = "BiocVersion" is equivalent to: .. code-block:: python - homepage = 'https://bioconductor.org/packages/BiocVersion/' - git = 'https://git.bioconductor.org/packages/BiocVersion' + homepage = "https://bioconductor.org/packages/BiocVersion/" + git = "https://git.bioconductor.org/packages/BiocVersion" ^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -200,7 +200,7 @@ base class contains: .. code-block:: python - extends('r') + extends("r") Take a close look at the homepage for ``caret``. If you look at the @@ -209,7 +209,7 @@ You should add this to your package like so: .. code-block:: python - depends_on('r@3.2.0:', type=('build', 'run')) + depends_on("r@3.2.0:", type=("build", "run")) ^^^^^^^^^^^^^^ @@ -227,7 +227,7 @@ and list all of their dependencies in the following sections: * LinkingTo As far as Spack is concerned, all 3 of these dependency types -correspond to ``type=('build', 'run')``, so you don't have to worry +correspond to ``type=("build", "run")``, so you don't have to worry about the details. If you are curious what they mean, https://github.com/spack/spack/issues/2951 has a pretty good summary: @@ -330,7 +330,7 @@ the dependency: .. code-block:: python - depends_on('r-lattice@0.20:', type=('build', 'run')) + depends_on("r-lattice@0.20:", type=("build", "run")) ^^^^^^^^^^^^^^^^^^ @@ -361,20 +361,20 @@ like so: .. code-block:: python def configure_args(self): - mpi_name = self.spec['mpi'].name + mpi_name = self.spec["mpi"].name # The type of MPI. Supported values are: # OPENMPI, LAM, MPICH, MPICH2, or CRAY - if mpi_name == 'openmpi': - Rmpi_type = 'OPENMPI' - elif mpi_name == 'mpich': - Rmpi_type = 'MPICH2' + if mpi_name == "openmpi": + Rmpi_type = "OPENMPI" + elif mpi_name == "mpich": + Rmpi_type = "MPICH2" else: - raise InstallError('Unsupported MPI type') + raise InstallError("Unsupported MPI type") return [ - '--with-Rmpi-type={0}'.format(Rmpi_type), - '--with-mpi={0}'.format(spec['mpi'].prefix), + "--with-Rmpi-type={0}".format(Rmpi_type), + "--with-mpi={0}".format(spec["mpi"].prefix), ] diff --git a/lib/spack/docs/build_systems/rubypackage.rst b/lib/spack/docs/build_systems/rubypackage.rst index d5c38b863b9478..c30ed9bec26ee7 100644 --- a/lib/spack/docs/build_systems/rubypackage.rst +++ b/lib/spack/docs/build_systems/rubypackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -84,8 +84,8 @@ The ``*.gemspec`` file may contain something like: .. code-block:: ruby - summary = 'An implementation of the AsciiDoc text processor and publishing toolchain' - description = 'A fast, open source text processor and publishing toolchain for converting AsciiDoc content to HTML 5, DocBook 5, and other formats.' + summary = "An implementation of the AsciiDoc text processor and publishing toolchain" + description = "A fast, open source text processor and publishing toolchain for converting AsciiDoc content to HTML 5, DocBook 5, and other formats." Either of these can be used for the description of the Spack package. @@ -98,7 +98,7 @@ The ``*.gemspec`` file may contain something like: .. code-block:: ruby - homepage = 'https://asciidoctor.org' + homepage = "https://asciidoctor.org" This should be used as the official homepage of the Spack package. @@ -112,21 +112,21 @@ the base class contains: .. code-block:: python - extends('ruby') + extends("ruby") The ``*.gemspec`` file may contain something like: .. code-block:: ruby - required_ruby_version = '>= 2.3.0' + required_ruby_version = ">= 2.3.0" This can be added to the Spack package using: .. code-block:: python - depends_on('ruby@2.3.0:', type=('build', 'run')) + depends_on("ruby@2.3.0:", type=("build", "run")) ^^^^^^^^^^^^^^^^^ diff --git a/lib/spack/docs/build_systems/sconspackage.rst b/lib/spack/docs/build_systems/sconspackage.rst index a17e1271b86d3b..8200d0998d73eb 100644 --- a/lib/spack/docs/build_systems/sconspackage.rst +++ b/lib/spack/docs/build_systems/sconspackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/sippackage.rst b/lib/spack/docs/build_systems/sippackage.rst index a4f52bf18648c4..5d4dc21f14495f 100644 --- a/lib/spack/docs/build_systems/sippackage.rst +++ b/lib/spack/docs/build_systems/sippackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -124,7 +124,7 @@ are wrong, you can provide the names yourself by overriding .. code-block:: python - import_modules = ['PyQt5'] + import_modules = ["PyQt5"] These tests often catch missing dependencies and non-RPATHed diff --git a/lib/spack/docs/build_systems/sourceforgepackage.rst b/lib/spack/docs/build_systems/sourceforgepackage.rst index 944c660eff69d1..ad3c191b3d22ff 100644 --- a/lib/spack/docs/build_systems/sourceforgepackage.rst +++ b/lib/spack/docs/build_systems/sourceforgepackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/build_systems/wafpackage.rst b/lib/spack/docs/build_systems/wafpackage.rst index c9bbf8bb5a42c2..ff69d5e9018ee1 100644 --- a/lib/spack/docs/build_systems/wafpackage.rst +++ b/lib/spack/docs/build_systems/wafpackage.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -63,8 +63,8 @@ run package-specific unit tests. .. code-block:: python def installtest(self): - with working_dir('test'): - pytest = which('py.test') + with working_dir("test"): + pytest = which("py.test") pytest() @@ -93,7 +93,7 @@ the following dependency automatically: .. code-block:: python - depends_on('python@2.5:', type='build') + depends_on("python@2.5:", type="build") Waf only supports Python 2.5 and up. @@ -113,7 +113,7 @@ phase, you can use: args = [] if self.run_tests: - args.append('--test') + args.append("--test") return args diff --git a/lib/spack/docs/chain.rst b/lib/spack/docs/chain.rst index 0fef1e6e1a7ef3..e4a275df662f47 100644 --- a/lib/spack/docs/chain.rst +++ b/lib/spack/docs/chain.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/conf.py b/lib/spack/docs/conf.py index 250a600e7f75ec..8f52edb89caeac 100644 --- a/lib/spack/docs/conf.py +++ b/lib/spack/docs/conf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -215,6 +215,7 @@ def setup(sphinx): ("py:class", "spack.spec.InstallStatus"), ("py:class", "spack.spec.SpecfileReaderBase"), ("py:class", "spack.install_test.Pb"), + ("py:class", "spack.filesystem_view.SimpleFilesystemView"), ] # The reST default role (used for this markup: `text`) to use for all documents. diff --git a/lib/spack/docs/config_yaml.rst b/lib/spack/docs/config_yaml.rst index d54977bebab21c..4781597d1a49a4 100644 --- a/lib/spack/docs/config_yaml.rst +++ b/lib/spack/docs/config_yaml.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/configuration.rst b/lib/spack/docs/configuration.rst index ab56817b77ee00..a4b60e43e32f38 100644 --- a/lib/spack/docs/configuration.rst +++ b/lib/spack/docs/configuration.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -243,9 +243,11 @@ lower-precedence settings. Completely ignoring higher-level configuration options is supported with the ``::`` notation for keys (see :ref:`config-overrides` below). -There are also special notations for string concatenation and precendense override. -Using the ``+:`` notation can be used to force *prepending* strings or lists. For lists, this is identical -to the default behavior. Using the ``-:`` works similarly, but for *appending* values. +There are also special notations for string concatenation and precendense override: + +* ``+:`` will force *prepending* strings or lists. For lists, this is the default behavior. +* ``-:`` works similarly, but for *appending* values. + :ref:`config-prepend-append` ^^^^^^^^^^^ diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst index 64ca1df926bbec..50d96f65370fa1 100644 --- a/lib/spack/docs/containers.rst +++ b/lib/spack/docs/containers.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -9,24 +9,96 @@ Container Images ================ -Spack :ref:`environments` are a great tool to create container images, but -preparing one that is suitable for production requires some more boilerplate -than just: +Spack :ref:`environments` can easily be turned into container images. This page +outlines two ways in which this can be done: + +1. By installing the environment on the host system, and copying the installations + into the container image. This approach does not require any tools like Docker + or Singularity to be installed. +2. By generating a Docker or Singularity recipe that can be used to build the + container image. In this approach, Spack builds the software inside the + container runtime, not on the host system. + +The first approach is easiest if you already have an installed environment, +the second approach gives more control over the container image. + +--------------------------- +From existing installations +--------------------------- + +If you already have a Spack environment installed on your system, you can +share the binaries as an OCI compatible container image. To get started you +just have to configure and OCI registry and run ``spack buildcache push``. + +.. code-block:: console + + # Create and install an environment in the current directory + spack env create -d . + spack -e . add pkg-a pkg-b + spack -e . install + + # Configure the registry + spack -e . mirror add --oci-username ... --oci-password ... container-registry oci://example.com/name/image + + # Push the image + spack -e . buildcache push --update-index --base-image ubuntu:22.04 --tag my_env container-registry + +The resulting container image can then be run as follows: + +.. code-block:: console + + $ docker run -it example.com/name/image:my_env + +The image generated by Spack consists of the specified base image with each package from the +environment as a separate layer on top. The image is minimal by construction, it only contains the +environment roots and its runtime dependencies. + +.. note:: + + When using registries like GHCR and Docker Hub, the ``--oci-password`` flag is not + the password for your account, but a personal access token you need to generate separately. + +The specified ``--base-image`` should have a libc that is compatible with the host system. +For example if your host system is Ubuntu 20.04, you can use ``ubuntu:20.04``, ``ubuntu:22.04`` +or newer: the libc in the container image must be at least the version of the host system, +assuming ABI compatibility. It is also perfectly fine to use a completely different +Linux distribution as long as the libc is compatible. + +For convenience, Spack also turns the OCI registry into a :ref:`build cache `, +so that future ``spack install`` of the environment will simply pull the binaries from the +registry instead of doing source builds. The flag ``--update-index`` is needed to make Spack +take the build cache into account when concretizing. + +.. note:: + + When generating container images in CI, the approach above is recommended when CI jobs + already run in a sandboxed environment. You can simply use ``spack`` directly + in the CI job and push the resulting image to a registry. Subsequent CI jobs should + run faster because Spack can install from the same registry instead of rebuilding from + sources. + +--------------------------------------------- +Generating recipes for Docker and Singularity +--------------------------------------------- + +Apart from copying existing installations into container images, Spack can also +generate recipes for container images. This is useful if you want to run Spack +itself in a sandboxed environment instead of on the host system. + +Since recipes need a little bit more boilerplate than .. code-block:: docker COPY spack.yaml /environment RUN spack -e /environment install -Additional actions may be needed to minimize the size of the -container, or to update the system software that is installed in the base -image, or to set up a proper entrypoint to run the image. These tasks are -usually both necessary and repetitive, so Spack comes with a command -to generate recipes for container images starting from a ``spack.yaml``. +Spack provides a command to generate customizable recipes for container images. Customizations +include minimizing the size of the image, installing packages in the base image using the system +package manager, and setting up a proper entrypoint to run the image. --------------------- +~~~~~~~~~~~~~~~~~~~~ A Quick Introduction --------------------- +~~~~~~~~~~~~~~~~~~~~ Consider having a Spack environment like the following: @@ -37,8 +109,8 @@ Consider having a Spack environment like the following: - gromacs+mpi - mpich -Producing a ``Dockerfile`` from it is as simple as moving to the directory -where the ``spack.yaml`` file is stored and giving the following command: +Producing a ``Dockerfile`` from it is as simple as changing directories to +where the ``spack.yaml`` file is stored and running the following command: .. code-block:: console @@ -104,9 +176,9 @@ configuration are discussed in details in the sections below. .. _container_spack_images: --------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~ Spack Images on Docker Hub --------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~ Docker images with Spack preinstalled and ready to be used are built when a release is tagged, or nightly on ``develop``. The images @@ -176,9 +248,9 @@ by Spack use them as default base images for their ``build`` stage, even though handles to use custom base images provided by users are available to accommodate complex use cases. ---------------------------------- -Creating Images From Environments ---------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Configuring the Container Recipe +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Any Spack Environment can be used for the automatic generation of container recipes. Sensible defaults are provided for things like the base image or the @@ -219,18 +291,18 @@ under the ``container`` attribute of environments: A detailed description of the options available can be found in the :ref:`container_config_options` section. -------------------- +~~~~~~~~~~~~~~~~~~~ Setting Base Images -------------------- +~~~~~~~~~~~~~~~~~~~ The ``images`` subsection is used to select both the image where Spack builds the software and the image where the built software is installed. This attribute can be set in different ways and which one to use depends on the use case at hand. -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +"""""""""""""""""""""""""""""""""""""""" Use Official Spack Images From Dockerhub -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +"""""""""""""""""""""""""""""""""""""""" To generate a recipe that uses an official Docker image from the Spack organization to build the software and the corresponding official OS image @@ -435,9 +507,9 @@ responsibility to ensure that: Therefore we don't recommend its use in cases that can be otherwise covered by the simplified mode shown first. ----------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Singularity Definition Files ----------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In addition to producing recipes in ``Dockerfile`` format Spack can produce Singularity Definition Files by just changing the value of the ``format`` @@ -458,9 +530,9 @@ attribute: The minimum version of Singularity required to build a SIF (Singularity Image Format) image from the recipes generated by Spack is ``3.5.3``. ------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Extending the Jinja2 Templates ------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Dockerfile and the Singularity definition file that Spack can generate are based on a few Jinja2 templates that are rendered according to the environment being containerized. @@ -581,9 +653,9 @@ The recipe that gets generated contains the two extra instruction that we added .. _container_config_options: ------------------------ +~~~~~~~~~~~~~~~~~~~~~~~ Configuration Reference ------------------------ +~~~~~~~~~~~~~~~~~~~~~~~ The tables below describe all the configuration options that are currently supported to customize the generation of container recipes: @@ -680,13 +752,13 @@ to customize the generation of container recipes: - Description string - No --------------- +~~~~~~~~~~~~~~ Best Practices --------------- +~~~~~~~~~~~~~~ -^^^ +""" MPI -^^^ +""" Due to the dependency on Fortran for OpenMPI, which is the spack default implementation, consider adding ``gfortran`` to the ``apt-get install`` list. @@ -697,9 +769,9 @@ For execution on HPC clusters, it can be helpful to import the docker image into Singularity in order to start a program with an *external* MPI. Otherwise, also add ``openssh-server`` to the ``apt-get install`` list. -^^^^ +"""" CUDA -^^^^ +"""" Starting from CUDA 9.0, Nvidia provides minimal CUDA images based on Ubuntu. Please see `their instructions `_. Avoid double-installing CUDA by adding, e.g. @@ -718,9 +790,9 @@ to your ``spack.yaml``. Users will either need ``nvidia-docker`` or e.g. Singularity to *execute* device kernels. -^^^^^^^^^^^^^^^^^^^^^^^^^ +""""""""""""""""""""""""" Docker on Windows and OSX -^^^^^^^^^^^^^^^^^^^^^^^^^ +""""""""""""""""""""""""" On Mac OS and Windows, docker runs on a hypervisor that is not allocated much memory by default, and some spack packages may fail to build due to lack of diff --git a/lib/spack/docs/contribution_guide.rst b/lib/spack/docs/contribution_guide.rst index ec9234aa461ab5..68a381be9f7f80 100644 --- a/lib/spack/docs/contribution_guide.rst +++ b/lib/spack/docs/contribution_guide.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst index 4dc8d1249dfc92..440fe018803dc1 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/environments.rst b/lib/spack/docs/environments.rst index a96e7259c9323a..93db76b332d0b8 100644 --- a/lib/spack/docs/environments.rst +++ b/lib/spack/docs/environments.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -142,6 +142,21 @@ user's prompt to begin with the environment name in brackets. $ spack env activate -p myenv [myenv] $ ... +The ``activate`` command can also be used to create a new environment, if it is +not already defined, by adding the ``--create`` flag. Managed and anonymous +environments, anonymous environments are explained in the next section, +can both be created using the same flags that `spack env create` accepts. +If an environment already exists then spack will simply activate it and ignore the +create specific flags. + +.. code-block:: console + + $ spack env activate --create -p myenv + # ... + # [creates if myenv does not exist yet] + # ... + [myenv] $ ... + To deactivate an environment, use the command: .. code-block:: console diff --git a/lib/spack/docs/extensions.rst b/lib/spack/docs/extensions.rst index bc5b3a762f95ed..2d82c2ba84002c 100644 --- a/lib/spack/docs/extensions.rst +++ b/lib/spack/docs/extensions.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -9,46 +9,42 @@ Custom Extensions ================= -*Spack extensions* permit you to extend Spack capabilities by deploying your +*Spack extensions* allow you to extend Spack capabilities by deploying your own custom commands or logic in an arbitrary location on your filesystem. This might be extremely useful e.g. to develop and maintain a command whose purpose is too specific to be considered for reintegration into the mainline or to evolve a command through its early stages before starting a discussion to merge it upstream. + From Spack's point of view an extension is any path in your filesystem which -respects a prescribed naming and layout for files: +respects the following naming and layout for files: .. code-block:: console spack-scripting/ # The top level directory must match the format 'spack-{extension_name}' ├── pytest.ini # Optional file if the extension ships its own tests ├── scripting # Folder that may contain modules that are needed for the extension commands - │   └── cmd # Folder containing extension commands - │   └── filter.py # A new command that will be available - ├── tests # Tests for this extension + │   ├── cmd # Folder containing extension commands + │   │   └── filter.py # A new command that will be available + │   └── functions.py # Module with internal details + └── tests # Tests for this extension │ ├── conftest.py │ └── test_filter.py └── templates # Templates that may be needed by the extension -In the example above the extension named *scripting* adds an additional command (``filter``) -and unit tests to verify its behavior. The code for this example can be -obtained by cloning the corresponding git repository: +In the example above, the extension is named *scripting*. It adds an additional command +(``spack filter``) and unit tests to verify its behavior. -.. TODO: write an ad-hoc "hello world" extension and make it part of the spack organization +The extension can import any core Spack module in its implementation. When loaded by +the ``spack`` command, the extension itself is imported as a Python package in the +``spack.extensions`` namespace. In the example above, since the extension is named +"scripting", the corresponding Python module is ``spack.extensions.scripting``. -.. code-block:: console +The code for this example extension can be obtained by cloning the corresponding git repository: - $ cd ~/ - $ mkdir tmp && cd tmp - $ git clone https://github.com/alalazo/spack-scripting.git - Cloning into 'spack-scripting'... - remote: Counting objects: 11, done. - remote: Compressing objects: 100% (7/7), done. - remote: Total 11 (delta 0), reused 11 (delta 0), pack-reused 0 - Receiving objects: 100% (11/11), done. +.. code-block:: console -As you can see by inspecting the sources, Python modules that are part of the extension -can import any core Spack module. + $ git -C /tmp clone https://github.com/spack/spack-scripting.git --------------------------------- Configure Spack to Use Extensions @@ -61,7 +57,7 @@ paths to ``config.yaml``. In the case of our example this means ensuring that: config: extensions: - - ~/tmp/spack-scripting + - /tmp/spack-scripting is part of your configuration file. Once this is setup any command that the extension provides will be available from the command line: @@ -86,37 +82,32 @@ will be available from the command line: --implicit select specs that are not installed or were installed implicitly --output OUTPUT where to dump the result -The corresponding unit tests can be run giving the appropriate options -to ``spack unit-test``: +The corresponding unit tests can be run giving the appropriate options to ``spack unit-test``: .. code-block:: console $ spack unit-test --extension=scripting - - ============================================================== test session starts =============================================================== - platform linux2 -- Python 2.7.15rc1, pytest-3.2.5, py-1.4.34, pluggy-0.4.0 - rootdir: /home/mculpo/tmp/spack-scripting, inifile: pytest.ini + ========================================== test session starts =========================================== + platform linux -- Python 3.11.5, pytest-7.4.3, pluggy-1.3.0 + rootdir: /home/culpo/github/spack-scripting + configfile: pytest.ini + testpaths: tests + plugins: xdist-3.5.0 collected 5 items - tests/test_filter.py ...XX - ============================================================ short test summary info ============================================================= - XPASS tests/test_filter.py::test_filtering_specs[flags3-specs3-expected3] - XPASS tests/test_filter.py::test_filtering_specs[flags4-specs4-expected4] - - =========================================================== slowest 20 test durations ============================================================ - 3.74s setup tests/test_filter.py::test_filtering_specs[flags0-specs0-expected0] - 0.17s call tests/test_filter.py::test_filtering_specs[flags3-specs3-expected3] - 0.16s call tests/test_filter.py::test_filtering_specs[flags2-specs2-expected2] - 0.15s call tests/test_filter.py::test_filtering_specs[flags1-specs1-expected1] - 0.13s call tests/test_filter.py::test_filtering_specs[flags4-specs4-expected4] - 0.08s call tests/test_filter.py::test_filtering_specs[flags0-specs0-expected0] - 0.04s teardown tests/test_filter.py::test_filtering_specs[flags4-specs4-expected4] - 0.00s setup tests/test_filter.py::test_filtering_specs[flags4-specs4-expected4] - 0.00s setup tests/test_filter.py::test_filtering_specs[flags3-specs3-expected3] - 0.00s setup tests/test_filter.py::test_filtering_specs[flags1-specs1-expected1] - 0.00s setup tests/test_filter.py::test_filtering_specs[flags2-specs2-expected2] - 0.00s teardown tests/test_filter.py::test_filtering_specs[flags2-specs2-expected2] - 0.00s teardown tests/test_filter.py::test_filtering_specs[flags1-specs1-expected1] - 0.00s teardown tests/test_filter.py::test_filtering_specs[flags0-specs0-expected0] - 0.00s teardown tests/test_filter.py::test_filtering_specs[flags3-specs3-expected3] - ====================================================== 3 passed, 2 xpassed in 4.51 seconds ======================================================= + tests/test_filter.py ..... [100%] + + ========================================== slowest 30 durations ========================================== + 2.31s setup tests/test_filter.py::test_filtering_specs[kwargs0-specs0-expected0] + 0.57s call tests/test_filter.py::test_filtering_specs[kwargs2-specs2-expected2] + 0.56s call tests/test_filter.py::test_filtering_specs[kwargs4-specs4-expected4] + 0.54s call tests/test_filter.py::test_filtering_specs[kwargs3-specs3-expected3] + 0.54s call tests/test_filter.py::test_filtering_specs[kwargs1-specs1-expected1] + 0.48s call tests/test_filter.py::test_filtering_specs[kwargs0-specs0-expected0] + 0.01s setup tests/test_filter.py::test_filtering_specs[kwargs4-specs4-expected4] + 0.01s setup tests/test_filter.py::test_filtering_specs[kwargs2-specs2-expected2] + 0.01s setup tests/test_filter.py::test_filtering_specs[kwargs1-specs1-expected1] + 0.01s setup tests/test_filter.py::test_filtering_specs[kwargs3-specs3-expected3] + + (5 durations < 0.005s hidden. Use -vv to show these durations.) + =========================================== 5 passed in 5.06s ============================================ diff --git a/lib/spack/docs/features.rst b/lib/spack/docs/features.rst index c39075fe10678c..25153d0d7af9d7 100644 --- a/lib/spack/docs/features.rst +++ b/lib/spack/docs/features.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/frequently_asked_questions.rst b/lib/spack/docs/frequently_asked_questions.rst index 345fa1a81a816a..2ae663524a804e 100644 --- a/lib/spack/docs/frequently_asked_questions.rst +++ b/lib/spack/docs/frequently_asked_questions.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 70d7cb497a4ac1..7c53a077444f18 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/gpu_configuration.rst b/lib/spack/docs/gpu_configuration.rst index 1f807bb3b8a82e..fd35ae25f053a0 100644 --- a/lib/spack/docs/gpu_configuration.rst +++ b/lib/spack/docs/gpu_configuration.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -111,3 +111,28 @@ CUDA is split into fewer components and is simpler to specify: prefix: /opt/cuda/cuda-11.0.2/ where ``/opt/cuda/cuda-11.0.2/lib/`` contains ``libcudart.so``. + + + +----------------------------------- +Using an External OpenGL API +----------------------------------- +Depending on whether we have a graphics card or not, we may choose to use OSMesa or GLX to implement the OpenGL API. + +If a graphics card is unavailable, OSMesa is recommended and can typically be built with Spack. +However, if we prefer to utilize the system GLX tailored to our graphics card, we need to declare it as an external. Here's how to do it: + + +.. code-block:: yaml + + packages: + libglx: + require: [opengl] + opengl: + buildable: false + externals: + - prefix: /usr/ + spec: opengl@4.6 + +Note that prefix has to be the root of both the libraries and the headers, using is /usr not the path the the lib. +To know which spec for opengl is available use ``cd /usr/include/GL && grep -Ri gl_version``. diff --git a/lib/spack/docs/index.rst b/lib/spack/docs/index.rst index 7607181ada5947..410cb8e41c77bd 100644 --- a/lib/spack/docs/index.rst +++ b/lib/spack/docs/index.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/mirrors.rst b/lib/spack/docs/mirrors.rst index 2f376c095e656f..8b01263cbbbd7e 100644 --- a/lib/spack/docs/mirrors.rst +++ b/lib/spack/docs/mirrors.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index f6b292e7553dab..9ba9c3710de5e7 100644 --- a/lib/spack/docs/module_file_support.rst +++ b/lib/spack/docs/module_file_support.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/packages_yaml.rst b/lib/spack/docs/packages_yaml.rst index e08f51e612a318..e33291909472f2 100644 --- a/lib/spack/docs/packages_yaml.rst +++ b/lib/spack/docs/packages_yaml.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -97,6 +97,35 @@ Each package version and compiler listed in an external should have entries in Spack's packages and compiler configuration, even though the package and compiler may not ever be built. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Extra attributes for external packages +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Sometimes external packages require additional attributes to be used +effectively. This information can be defined on a per-package basis +and stored in the ``extra_attributes`` section of the external package +configuration. In addition to per-package information, this section +can be used to define environment modifications to be performed +whenever the package is used. For example, if an external package is +built without ``rpath`` support, it may require ``LD_LIBRARY_PATH`` +settings to find its dependencies. This could be configured as +follows: + +.. code-block:: yaml + + packages: + mpich: + externals: + - spec: mpich@3.3 %clang@12.0.0 +hwloc + prefix: /path/to/mpich + extra_attributes: + environment: + prepend_path: + LD_LIBRARY_PATH: /path/to/hwloc/lib64 + +See :ref:`configuration_environment_variables` for more information on +how to configure environment modifications in Spack config files. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Prevent packages from being built from sources ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -383,7 +412,33 @@ like this: which means every spec will be required to use ``clang`` as a compiler. -Note that in this case ``all`` represents a *default set of requirements* - +Requirements on variants for all packages are possible too, but note that they +are only enforced for those packages that define these variants, otherwise they +are disregarded. For example: + +.. code-block:: yaml + + packages: + all: + require: + - "+shared" + - "+cuda" + +will just enforce ``+shared`` on ``zlib``, which has a boolean ``shared`` variant but +no ``cuda`` variant. + +Constraints in a single spec literal are always considered as a whole, so in a case like: + +.. code-block:: yaml + + packages: + all: + require: "+shared +cuda" + +the default requirement will be enforced only if a package has both a ``cuda`` and +a ``shared`` variant, and will never be partially enforced. + +Finally, ``all`` represents a *default set of requirements* - if there are specific package requirements, then the default requirements under ``all`` are disregarded. For example, with a configuration like this: @@ -391,12 +446,18 @@ under ``all`` are disregarded. For example, with a configuration like this: packages: all: - require: '%clang' + require: + - 'build_type=Debug' + - '%clang' cmake: - require: '%gcc' + require: + - 'build_type=Debug' + - '%gcc' Spack requires ``cmake`` to use ``gcc`` and all other nodes (including ``cmake`` -dependencies) to use ``clang``. +dependencies) to use ``clang``. If enforcing ``build_type=Debug`` is needed also +on ``cmake``, it must be repeated in the specific ``cmake`` requirements. + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Setting requirements on virtual specs @@ -426,6 +487,56 @@ present. For instance with a configuration like: you will use ``mvapich2~cuda %gcc`` as an ``mpi`` provider. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Conflicts and strong preferences +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +If the semantic of requirements is too strong, you can also express "strong preferences" and "conflicts" +from configuration files: + +.. code-block:: yaml + + packages: + all: + prefer: + - '%clang' + conflict: + - '+shared' + +The ``prefer`` and ``conflict`` sections can be used whenever a ``require`` section is allowed. +The argument is always a list of constraints, and each constraint can be either a simple string, +or a more complex object: + +.. code-block:: yaml + + packages: + all: + conflict: + - spec: '%clang' + when: 'target=x86_64_v3' + message: 'reason why clang cannot be used' + +The ``spec`` attribute is mandatory, while both ``when`` and ``message`` are optional. + +.. note:: + + Requirements allow for expressing both "strong preferences" and "conflicts". + The syntax for doing so, though, may not be immediately clear. For + instance, if we want to prevent any package from using ``%clang``, we can set: + + .. code-block:: yaml + + packages: + all: + require: + - one_of: ['%clang', '@:'] + + Since only one of the requirements must hold, and ``@:`` is always true, the rule above is + equivalent to a conflict. For "strong preferences" we need to substitute the ``one_of`` policy + with ``any_of``. + + + .. _package-preferences: ------------------- diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 3dd1c7952d12e7..0fa8e4dce31941 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) @@ -237,7 +237,7 @@ for details): .. code-block:: python :linenos: - # Copyright 2013-2023 Lawrence Livermore National Security, LLC and other + # 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) @@ -2337,7 +2337,7 @@ window while a batch job is running ``spack install`` on the same or overlapping dependencies without any process trying to re-do the work of another. -For example, if you are using SLURM, you could launch an installation +For example, if you are using Slurm, you could launch an installation of ``mpich`` using the following command: .. code-block:: console @@ -4379,10 +4379,16 @@ implementation was selected for this build: elif "mvapich" in spec: configure_args.append("--with-mvapich") -It's also a bit more concise than satisfies. The difference between -the two functions is that ``satisfies()`` tests whether spec -constraints overlap at all, while ``in`` tests whether a spec or any -of its dependencies satisfy the provided spec. +It's also a bit more concise than satisfies. + +.. note:: + + The ``satisfies()`` method tests whether this spec has, at least, all the constraints of the argument spec, + while ``in`` tests whether a spec or any of its dependencies satisfy the provided spec. + + If the provided spec is anonymous (e.g., ":1.2:", "+shared") or has the + same name as the spec being checked, then ``in`` works the same as + ``satisfies()``; however, use of ``satisfies()`` is more intuitive. ^^^^^^^^^^^^^^^^^^^^^^^ Architecture specifiers @@ -5284,7 +5290,7 @@ installed example. example = which(self.prefix.bin.example) example() -Output showing the identification of each test part after runnig the tests +Output showing the identification of each test part after running the tests is illustrated below. .. code-block:: console @@ -5781,7 +5787,7 @@ with those implemented in the package itself. * - `Cxx `_ - Compiles and runs several ``hello`` programs - * - `Fortan + * - `Fortran `_ - Compiles and runs ``hello`` programs (``F`` and ``f90``) * - `Mpi @@ -6973,3 +6979,18 @@ you probably care most about are: You may also care about `license exceptions `_ that use the ``WITH`` operator, e.g. ``Apache-2.0 WITH LLVM-exception``. + +Many of the licenses that are currently in the spack repositories have been +automatically determined. While this is great for bulk adding license +information and is most likely correct, there are sometimes edge cases that +require manual intervention. To determine which licenses are validated and +which are not, there is the `checked_by` parameter in the license directive: + +.. code-block:: python + + license("", when="", checked_by="") + +When you have validated a github license, either when doing so explicitly or +as part of packaging a new package, please set the `checked_by` parameter +to your Github username to signal that the license has been manually +verified. diff --git a/lib/spack/docs/pipelines.rst b/lib/spack/docs/pipelines.rst index 4ebe90fb0b6de4..0bed42ffd6429e 100644 --- a/lib/spack/docs/pipelines.rst +++ b/lib/spack/docs/pipelines.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/replace_conda_homebrew.rst b/lib/spack/docs/replace_conda_homebrew.rst index c0d2060c703b96..e4b3de0ec114c7 100644 --- a/lib/spack/docs/replace_conda_homebrew.rst +++ b/lib/spack/docs/replace_conda_homebrew.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/repositories.rst b/lib/spack/docs/repositories.rst index 9cb93af21f716f..5a4cf1c1084c18 100644 --- a/lib/spack/docs/repositories.rst +++ b/lib/spack/docs/repositories.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +.. 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) diff --git a/lib/spack/docs/requirements.txt b/lib/spack/docs/requirements.txt index 10e19f093e5eec..18e2a26f13ffc6 100644 --- a/lib/spack/docs/requirements.txt +++ b/lib/spack/docs/requirements.txt @@ -1,13 +1,13 @@ sphinx==7.2.6 sphinxcontrib-programoutput==0.17 sphinx_design==0.5.0 -sphinx-rtd-theme==1.3.0 +sphinx-rtd-theme==2.0.0 python-levenshtein==0.23.0 -docutils==0.18.1 -pygments==2.16.1 -urllib3==2.0.7 -pytest==7.4.3 -isort==5.12.0 -black==23.10.1 -flake8==6.1.0 -mypy==1.6.1 +docutils==0.20.1 +pygments==2.17.2 +urllib3==2.1.0 +pytest==7.4.4 +isort==5.13.2 +black==23.12.1 +flake8==7.0.0 +mypy==1.8.0 diff --git a/lib/spack/docs/signing.rst b/lib/spack/docs/signing.rst index dc44eaec1d8678..8927f874ceb58a 100644 --- a/lib/spack/docs/signing.rst +++ b/lib/spack/docs/signing.rst @@ -1,4 +1,4 @@ -.. Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +.. 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) @@ -142,7 +142,7 @@ Reputational Key ---------------- The Reputational Key is the public facing key used to sign complete groups of -development and release packages. Only one key pair exsits in this class of +development and release packages. Only one key pair exists in this class of keys. In contrast to the Intermediate CI Key the Reputational Key *should* be used to verify package integrity. At the end of develop and release pipeline a final pipeline job pulls down all signed package metadata built by the pipeline, @@ -272,7 +272,7 @@ Internal Implementation The technical implementation of the pipeline signing process includes components defined in Amazon Web Services, the Kubernetes cluster, at affilicated -institutions, and the GitLab/GitLab Runner deployment. We present the techincal +institutions, and the GitLab/GitLab Runner deployment. We present the technical implementation in two interdependent sections. The first addresses how secrets are managed through the lifecycle of a develop or release pipeline. The second section describes how Gitlab Runner and pipelines are configured and managed to @@ -295,7 +295,7 @@ infrastructure. ----------------------- Multiple intermediate CI signing keys exist, one Intermediate CI Key for jobs -run in AWS, and one key for each affiliated institution (e.g. Univerity of +run in AWS, and one key for each affiliated institution (e.g. University of Oregon). Here we describe how the Intermediate CI Key is managed in AWS: The Intermediate CI Key (including the Signing Intermediate CI Private Key is @@ -305,7 +305,7 @@ contains an ASCII-armored export of just the *public* components of the Reputational Key. This secret also contains the *public* components of each of the affiliated institutions' Intermediate CI Key. These are potentially needed to verify dependent packages which may have been found in the public mirror or -built by a protected job running on an affiliated institution's infrastrcuture +built by a protected job running on an affiliated institution's infrastructure in an earlier stage of the pipeline. Procedurally the ``spack-intermediate-ci-signing-key`` secret is used in diff --git a/lib/spack/docs/spack.yaml b/lib/spack/docs/spack.yaml index 924280bc04ee8f..4fe4090c8122a2 100644 --- a/lib/spack/docs/spack.yaml +++ b/lib/spack/docs/spack.yaml @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/env/cc b/lib/spack/env/cc index 360a0de8bcc2a3..f72a6663a37bb3 100755 --- a/lib/spack/env/cc +++ b/lib/spack/env/cc @@ -1,7 +1,7 @@ #!/bin/sh -f # shellcheck disable=SC2034 # evals in this script fool shellcheck # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index 2e8bf3a4f8b80b..cb88b0c867f6e9 100644 --- a/lib/spack/external/__init__.py +++ b/lib/spack/external/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/external/archspec/cpu/detect.py b/lib/spack/external/archspec/cpu/detect.py index 85e1f4677f1ccb..305bf9d9d67435 100644 --- a/lib/spack/external/archspec/cpu/detect.py +++ b/lib/spack/external/archspec/cpu/detect.py @@ -101,17 +101,9 @@ def _machine(): ).strip() if "Apple" in output: - # Need to distinguish between running in Rosetta2 emulator - # mode for x86_64, and native mode for aarch64. - output = _check_output( - ["arch"], env=_ensure_bin_usrbin_in_path() - ).strip() # Note that a native Python interpreter on Apple M1 would return # "arm64" instead of "aarch64". Here we normalize to the latter. - if "arm64" in output: - return "aarch64" - else: - return "x86_64" + return "aarch64" return "x86_64" @@ -125,29 +117,17 @@ def sysctl(*args): return _check_output(["sysctl"] + list(args), env=child_environment).strip() if _machine() == "x86_64": - # Rosetta 2 emulator - if "Apple" in sysctl("-n", "machdep.cpu.brand_string"): - flags = ( - sysctl("-n", "machdep.cpu.features").lower() - ) - info = { - "vendor_id": "Apple", - "flags": flags, - "model": "m1", - "model name": sysctl("-n", "machdep.cpu.brand_string"), - } - else: - flags = ( - sysctl("-n", "machdep.cpu.features").lower() - + " " - + sysctl("-n", "machdep.cpu.leaf7_features").lower() - ) - info = { - "vendor_id": sysctl("-n", "machdep.cpu.vendor"), - "flags": flags, - "model": sysctl("-n", "machdep.cpu.model"), - "model name": sysctl("-n", "machdep.cpu.brand_string"), - } + flags = ( + sysctl("-n", "machdep.cpu.features").lower() + + " " + + sysctl("-n", "machdep.cpu.leaf7_features").lower() + ) + info = { + "vendor_id": sysctl("-n", "machdep.cpu.vendor"), + "flags": flags, + "model": sysctl("-n", "machdep.cpu.model"), + "model name": sysctl("-n", "machdep.cpu.brand_string"), + } else: model = "unknown" model_str = sysctl("-n", "machdep.cpu.brand_string").lower() diff --git a/lib/spack/llnl/__init__.py b/lib/spack/llnl/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/llnl/__init__.py +++ b/lib/spack/llnl/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/path.py b/lib/spack/llnl/path.py index bef9e14adac4c2..18f9b6e9a24eb6 100644 --- a/lib/spack/llnl/path.py +++ b/lib/spack/llnl/path.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/string.py b/lib/spack/llnl/string.py index a203be8d3468b6..d2995f34c1b6a9 100644 --- a/lib/spack/llnl/string.py +++ b/lib/spack/llnl/string.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/url.py b/lib/spack/llnl/url.py index 40e7606506c6d2..28f3187dd9b459 100644 --- a/lib/spack/llnl/url.py +++ b/lib/spack/llnl/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/__init__.py b/lib/spack/llnl/util/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/llnl/util/__init__.py +++ b/lib/spack/llnl/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/argparsewriter.py b/lib/spack/llnl/util/argparsewriter.py index 60a404abd438ff..54911b4f03b79c 100644 --- a/lib/spack/llnl/util/argparsewriter.py +++ b/lib/spack/llnl/util/argparsewriter.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/filesystem.py b/lib/spack/llnl/util/filesystem.py index 47c66248b53aee..75d2023c16f1e2 100644 --- a/lib/spack/llnl/util/filesystem.py +++ b/lib/spack/llnl/util/filesystem.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/lang.py b/lib/spack/llnl/util/lang.py index 607b093de8b406..4f14a29ef8feb0 100644 --- a/lib/spack/llnl/util/lang.py +++ b/lib/spack/llnl/util/lang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -1047,9 +1047,9 @@ def __bool__(self): """Whether any exceptions were handled.""" return bool(self.exceptions) - def forward(self, context: str) -> "GroupedExceptionForwarder": + def forward(self, context: str, base: type = BaseException) -> "GroupedExceptionForwarder": """Return a contextmanager which extracts tracebacks and prefixes a message.""" - return GroupedExceptionForwarder(context, self) + return GroupedExceptionForwarder(context, self, base) def _receive_forwarded(self, context: str, exc: Exception, tb: List[str]): self.exceptions.append((context, exc, tb)) @@ -1072,15 +1072,18 @@ class GroupedExceptionForwarder: """A contextmanager to capture exceptions and forward them to a GroupedExceptionHandler.""" - def __init__(self, context: str, handler: GroupedExceptionHandler): + def __init__(self, context: str, handler: GroupedExceptionHandler, base: type): self._context = context self._handler = handler + self._base = base def __enter__(self): return None def __exit__(self, exc_type, exc_value, tb): if exc_value is not None: + if not issubclass(exc_type, self._base): + return False self._handler._receive_forwarded(self._context, exc_value, traceback.format_tb(tb)) # Suppress any exception from being re-raised: diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index 816c9049b11bd0..8ae1b0ab293717 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/lock.py b/lib/spack/llnl/util/lock.py index 156300b891b528..08c90b21ce89f7 100644 --- a/lib/spack/llnl/util/lock.py +++ b/lib/spack/llnl/util/lock.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/multiproc.py b/lib/spack/llnl/util/multiproc.py index d67427218fa18e..ae7f09482f4915 100644 --- a/lib/spack/llnl/util/multiproc.py +++ b/lib/spack/llnl/util/multiproc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/symlink.py b/lib/spack/llnl/util/symlink.py index 4f4f965f139e59..229f3f8115fc52 100644 --- a/lib/spack/llnl/util/symlink.py +++ b/lib/spack/llnl/util/symlink.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/tty/__init__.py b/lib/spack/llnl/util/tty/__init__.py index ec7bd665374c08..7a322a6e48c21a 100644 --- a/lib/spack/llnl/util/tty/__init__.py +++ b/lib/spack/llnl/util/tty/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/tty/colify.py b/lib/spack/llnl/util/tty/colify.py index eb493aec33236a..719b480e4a0827 100644 --- a/lib/spack/llnl/util/tty/colify.py +++ b/lib/spack/llnl/util/tty/colify.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/tty/color.py b/lib/spack/llnl/util/tty/color.py index 67bd129eabf254..bef7af8e58d968 100644 --- a/lib/spack/llnl/util/tty/color.py +++ b/lib/spack/llnl/util/tty/color.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -204,17 +204,23 @@ def color_when(value): class match_to_ansi: - def __init__(self, color=True, enclose=False): + def __init__(self, color=True, enclose=False, zsh=False): self.color = _color_when_value(color) self.enclose = enclose + self.zsh = zsh def escape(self, s): """Returns a TTY escape sequence for a color""" if self.color: - if self.enclose: - return r"\[\033[%sm\]" % s + if self.zsh: + result = rf"\e[0;{s}m" else: - return "\033[%sm" % s + result = f"\033[{s}m" + + if self.enclose: + result = rf"\[{result}\]" + + return result else: return "" @@ -261,9 +267,11 @@ def colorize(string, **kwargs): codes, for output to non-console devices. enclose (bool): If True, enclose ansi color sequences with square brackets to prevent misestimation of terminal width. + zsh (bool): If True, use zsh ansi codes instead of bash ones (for variables like PS1) """ color = _color_when_value(kwargs.get("color", get_color_when())) - string = re.sub(color_re, match_to_ansi(color, kwargs.get("enclose")), string) + zsh = kwargs.get("zsh", False) + string = re.sub(color_re, match_to_ansi(color, kwargs.get("enclose")), string, zsh) string = string.replace("}}", "}") return string diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 8f685442a2079f..16fe45edfc7267 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/llnl/util/tty/pty.py b/lib/spack/llnl/util/tty/pty.py index 60d5eee8796b1b..1d9fe724fcde91 100644 --- a/lib/spack/llnl/util/tty/pty.py +++ b/lib/spack/llnl/util/tty/pty.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 32d8192bcb0ea1..2e2342ac803a71 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -1,10 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) #: PEP440 canonical ... string -__version__ = "0.21.1.dev0" +__version__ = "0.22.0.dev0" spack_version = __version__ diff --git a/lib/spack/spack/abi.py b/lib/spack/spack/abi.py index dd12d6dbafe484..33bc6293f5d561 100644 --- a/lib/spack/spack/abi.py +++ b/lib/spack/spack/abi.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/audit.py b/lib/spack/spack/audit.py index 970e4a3b367ff9..070062c6bbea7c 100644 --- a/lib/spack/spack/audit.py +++ b/lib/spack/spack/audit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -244,7 +244,7 @@ def _search_duplicate_specs_in_externals(error_cls): + lines + ["as they might result in non-deterministic hashes"] ) - except TypeError: + except (TypeError, AttributeError): details = [] errors.append(error_cls(summary=error_msg, details=details)) @@ -292,12 +292,6 @@ def _avoid_mismatched_variants(error_cls): errors = [] packages_yaml = spack.config.CONFIG.get_config("packages") - def make_error(config_data, summary): - s = io.StringIO() - s.write("Occurring in the following file:\n") - syaml.dump_config(config_data, stream=s, blame=True) - return error_cls(summary=summary, details=[s.getvalue()]) - for pkg_name in packages_yaml: # 'all:' must be more forgiving, since it is setting defaults for everything if pkg_name == "all" or "variants" not in packages_yaml[pkg_name]: @@ -317,7 +311,7 @@ def make_error(config_data, summary): f"Setting a preference for the '{pkg_name}' package to the " f"non-existing variant '{variant.name}'" ) - errors.append(make_error(preferences, summary)) + errors.append(_make_config_error(preferences, summary, error_cls=error_cls)) continue # Variant cannot accept this value @@ -329,11 +323,41 @@ def make_error(config_data, summary): f"Setting the variant '{variant.name}' of the '{pkg_name}' package " f"to the invalid value '{str(variant)}'" ) - errors.append(make_error(preferences, summary)) + errors.append(_make_config_error(preferences, summary, error_cls=error_cls)) + + return errors + + +@config_packages +def _wrongly_named_spec(error_cls): + """Warns if the wrong name is used for an external spec""" + errors = [] + packages_yaml = spack.config.CONFIG.get_config("packages") + for pkg_name in packages_yaml: + if pkg_name == "all": + continue + externals = packages_yaml[pkg_name].get("externals", []) + is_virtual = spack.repo.PATH.is_virtual(pkg_name) + for entry in externals: + spec = spack.spec.Spec(entry["spec"]) + regular_pkg_is_wrong = not is_virtual and pkg_name != spec.name + virtual_pkg_is_wrong = is_virtual and not any( + p.name == spec.name for p in spack.repo.PATH.providers_for(pkg_name) + ) + if regular_pkg_is_wrong or virtual_pkg_is_wrong: + summary = f"Wrong external spec detected for '{pkg_name}': {spec}" + errors.append(_make_config_error(entry, summary, error_cls=error_cls)) return errors +def _make_config_error(config_data, summary, error_cls): + s = io.StringIO() + s.write("Occurring in the following file:\n") + syaml.dump_config(config_data, stream=s, blame=True) + return error_cls(summary=summary, details=[s.getvalue()]) + + #: Sanity checks on package directives package_directives = AuditClass( group="packages", @@ -667,8 +691,8 @@ def _unknown_variants_in_directives(pkgs, error_cls): pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) # Check "conflicts" directive - for conflict, triggers in pkg_cls.conflicts.items(): - for trigger, _ in triggers: + for trigger, conflicts in pkg_cls.conflicts.items(): + for conflict, _ in conflicts: vrn = spack.spec.Spec(conflict) try: vrn.constrain(trigger) @@ -694,25 +718,21 @@ def _unknown_variants_in_directives(pkgs, error_cls): ) # Check "depends_on" directive - for _, triggers in pkg_cls.dependencies.items(): - triggers = list(triggers) - for trigger in list(triggers): - vrn = spack.spec.Spec(trigger) - errors.extend( - _analyze_variants_in_directive( - pkg_cls, vrn, directive="depends_on", error_cls=error_cls - ) + for trigger in pkg_cls.dependencies: + vrn = spack.spec.Spec(trigger) + errors.extend( + _analyze_variants_in_directive( + pkg_cls, vrn, directive="depends_on", error_cls=error_cls ) + ) - # Check "patch" directive - for _, triggers in pkg_cls.provided.items(): - triggers = [spack.spec.Spec(x) for x in triggers] - for vrn in triggers: - errors.extend( - _analyze_variants_in_directive( - pkg_cls, vrn, directive="patch", error_cls=error_cls - ) + # Check "provides" directive + for when_spec in pkg_cls.provided: + errors.extend( + _analyze_variants_in_directive( + pkg_cls, when_spec, directive="provides", error_cls=error_cls ) + ) # Check "resource" directive for vrn in pkg_cls.resources: @@ -726,47 +746,82 @@ def _unknown_variants_in_directives(pkgs, error_cls): @package_directives -def _unknown_variants_in_dependencies(pkgs, error_cls): - """Report unknown dependencies and wrong variants for dependencies""" +def _issues_in_depends_on_directive(pkgs, error_cls): + """Reports issues with 'depends_on' directives. + + Issues might be unknown dependencies, unknown variants or variant values, or declaration + of nested dependencies. + """ errors = [] for pkg_name in pkgs: pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) filename = spack.repo.PATH.filename_for_package_name(pkg_name) - for dependency_name, dependency_data in pkg_cls.dependencies.items(): - # No need to analyze virtual packages - if spack.repo.PATH.is_virtual(dependency_name): - continue - try: - dependency_pkg_cls = spack.repo.PATH.get_pkg_class(dependency_name) - except spack.repo.UnknownPackageError: - # This dependency is completely missing, so report - # and continue the analysis - summary = pkg_name + ": unknown package '{0}' in " "'depends_on' directive".format( - dependency_name - ) - details = [" in " + filename] - errors.append(error_cls(summary=summary, details=details)) - continue + for when, deps_by_name in pkg_cls.dependencies.items(): + for dep_name, dep in deps_by_name.items(): + # Check if there are nested dependencies declared. We don't want directives like: + # + # depends_on('foo+bar ^fee+baz') + # + # but we'd like to have two dependencies listed instead. + nested_dependencies = dep.spec.dependencies() + if nested_dependencies: + summary = f"{pkg_name}: nested dependency declaration '{dep.spec}'" + ndir = len(nested_dependencies) + 1 + details = [ + f"split depends_on('{dep.spec}', when='{when}') into {ndir} directives", + f"in {filename}", + ] + errors.append(error_cls(summary=summary, details=details)) + + def check_virtual_with_variants(spec, msg): + if not spec.virtual or not spec.variants: + return + error = error_cls( + f"{pkg_name}: {msg}", + f"remove variants from '{spec}' in depends_on directive in {filename}", + ) + errors.append(error) + + check_virtual_with_variants(dep.spec, "virtual dependency cannot have variants") + check_virtual_with_variants(dep.spec, "virtual when= spec cannot have variants") + + # No need to analyze virtual packages + if spack.repo.PATH.is_virtual(dep_name): + continue - for _, dependency_edge in dependency_data.items(): - dependency_variants = dependency_edge.spec.variants + # check for unknown dependencies + try: + dependency_pkg_cls = spack.repo.PATH.get_pkg_class(dep_name) + except spack.repo.UnknownPackageError: + # This dependency is completely missing, so report + # and continue the analysis + summary = ( + f"{pkg_name}: unknown package '{dep_name}' in " "'depends_on' directive" + ) + details = [f" in {filename}"] + errors.append(error_cls(summary=summary, details=details)) + continue + + # check variants + dependency_variants = dep.spec.variants for name, value in dependency_variants.items(): try: v, _ = dependency_pkg_cls.variants[name] v.validate_or_raise(value, pkg_cls=dependency_pkg_cls) except Exception as e: summary = ( - pkg_name + ": wrong variant used for a " - "dependency in a 'depends_on' directive" + f"{pkg_name}: wrong variant used for dependency in 'depends_on()'" ) - error_msg = str(e).strip() + if isinstance(e, KeyError): - error_msg = "the variant {0} does not " "exist".format(error_msg) - error_msg += " in package '" + dependency_name + "'" + error_msg = ( + f"variant {str(e).strip()} does not exist in package {dep_name}" + ) + error_msg += f" in package '{dep_name}'" errors.append( - error_cls(summary=summary, details=[error_msg, "in " + filename]) + error_cls(summary=summary, details=[error_msg, f"in {filename}"]) ) return errors @@ -833,14 +888,17 @@ def _version_constraints_are_satisfiable_by_some_version_in_repo(pkgs, error_cls for pkg_name in pkgs: pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) filename = spack.repo.PATH.filename_for_package_name(pkg_name) + dependencies_to_check = [] - for dependency_name, dependency_data in pkg_cls.dependencies.items(): - # Skip virtual dependencies for the time being, check on - # their versions can be added later - if spack.repo.PATH.is_virtual(dependency_name): - continue - dependencies_to_check.extend([edge.spec for edge in dependency_data.values()]) + for _, deps_by_name in pkg_cls.dependencies.items(): + for dep_name, dep in deps_by_name.items(): + # Skip virtual dependencies for the time being, check on + # their versions can be added later + if spack.repo.PATH.is_virtual(dep_name): + continue + + dependencies_to_check.append(dep.spec) host_architecture = spack.spec.ArchSpec.default_arch() for s in dependencies_to_check: @@ -912,39 +970,53 @@ def _named_specs_in_when_arguments(pkgs, error_cls): for pkg_name in pkgs: pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) + def _refers_to_pkg(when): + when_spec = spack.spec.Spec(when) + return when_spec.name is None or when_spec.name == pkg_name + + def _error_items(when_dict): + for when, elts in when_dict.items(): + if not _refers_to_pkg(when): + yield when, elts, [f"using '{when}', should be '^{when}'"] + def _extracts_errors(triggers, summary): _errors = [] for trigger in list(triggers): - when_spec = spack.spec.Spec(trigger) - if when_spec.name is not None and when_spec.name != pkg_name: + if not _refers_to_pkg(trigger): details = [f"using '{trigger}', should be '^{trigger}'"] _errors.append(error_cls(summary=summary, details=details)) return _errors - for dname, triggers in pkg_cls.dependencies.items(): - summary = f"{pkg_name}: wrong 'when=' condition for the '{dname}' dependency" - errors.extend(_extracts_errors(triggers, summary)) + for when, dnames, details in _error_items(pkg_cls.dependencies): + errors.extend( + error_cls(f"{pkg_name}: wrong 'when=' condition for '{dname}' dependency", details) + for dname in dnames + ) for vname, (variant, triggers) in pkg_cls.variants.items(): summary = f"{pkg_name}: wrong 'when=' condition for the '{vname}' variant" errors.extend(_extracts_errors(triggers, summary)) - for provided, triggers in pkg_cls.provided.items(): - summary = f"{pkg_name}: wrong 'when=' condition for the '{provided}' virtual" - errors.extend(_extracts_errors(triggers, summary)) + for when, providers, details in _error_items(pkg_cls.provided): + errors.extend( + error_cls(f"{pkg_name}: wrong 'when=' condition for '{provided}' virtual", details) + for provided in providers + ) - for _, triggers in pkg_cls.requirements.items(): - triggers = [when_spec for when_spec, _, _ in triggers] - summary = f"{pkg_name}: wrong 'when=' condition in 'requires' directive" - errors.extend(_extracts_errors(triggers, summary)) + for when, requirements, details in _error_items(pkg_cls.requirements): + errors.append( + error_cls(f"{pkg_name}: wrong 'when=' condition in 'requires' directive", details) + ) - triggers = list(pkg_cls.patches) - summary = f"{pkg_name}: wrong 'when=' condition in 'patch' directives" - errors.extend(_extracts_errors(triggers, summary)) + for when, _, details in _error_items(pkg_cls.patches): + errors.append( + error_cls(f"{pkg_name}: wrong 'when=' condition in 'patch' directives", details) + ) - triggers = list(pkg_cls.resources) - summary = f"{pkg_name}: wrong 'when=' condition in 'resource' directives" - errors.extend(_extracts_errors(triggers, summary)) + for when, _, details in _error_items(pkg_cls.resources): + errors.append( + error_cls(f"{pkg_name}: wrong 'when=' condition in 'resource' directives", details) + ) return llnl.util.lang.dedupe(errors) diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 8cfb891640026c..6f401e4a97df7b 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -1,11 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 codecs import collections -import errno import hashlib import io import itertools @@ -23,9 +22,8 @@ import urllib.parse import urllib.request import warnings -from contextlib import closing, contextmanager -from gzip import GzipFile -from typing import Dict, List, NamedTuple, Optional, Set, Tuple +from contextlib import closing +from typing import Dict, Iterable, List, NamedTuple, Optional, Set, Tuple from urllib.error import HTTPError, URLError import llnl.util.filesystem as fsys @@ -50,6 +48,7 @@ import spack.stage import spack.store import spack.traverse as traverse +import spack.util.archive import spack.util.crypto import spack.util.file_cache as file_cache import spack.util.gpg @@ -68,7 +67,10 @@ BUILD_CACHE_RELATIVE_PATH = "build_cache" BUILD_CACHE_KEYS_RELATIVE_PATH = "_pgp" -CURRENT_BUILD_CACHE_LAYOUT_VERSION = 1 + +#: The build cache layout version that this version of Spack creates. +#: Version 2: includes parent directories of the package prefix in the tarball +CURRENT_BUILD_CACHE_LAYOUT_VERSION = 2 class BuildCacheDatabase(spack_db.Database): @@ -230,7 +232,11 @@ def _associate_built_specs_with_mirror(self, cache_key, mirror_url): ) return - spec_list = db.query_local(installed=False, in_buildcache=True) + spec_list = [ + s + for s in db.query_local(installed=any, in_buildcache=any) + if s.external or db.query_local_by_spec_hash(s.dag_hash()).in_buildcache + ] for indexed_spec in spec_list: dag_hash = indexed_spec.dag_hash() @@ -1126,195 +1132,46 @@ def generate_key_index(key_prefix, tmpdir=None): shutil.rmtree(tmpdir) -@contextmanager -def gzip_compressed_tarfile(path): - """Create a reproducible, compressed tarfile""" - # Create gzip compressed tarball of the install prefix - # 1) Use explicit empty filename and mtime 0 for gzip header reproducibility. - # If the filename="" is dropped, Python will use fileobj.name instead. - # This should effectively mimick `gzip --no-name`. - # 2) On AMD Ryzen 3700X and an SSD disk, we have the following on compression speed: - # compresslevel=6 gzip default: llvm takes 4mins, roughly 2.1GB - # compresslevel=9 python default: llvm takes 12mins, roughly 2.1GB - # So we follow gzip. - with open(path, "wb") as f, ChecksumWriter(f) as inner_checksum, closing( - GzipFile(filename="", mode="wb", compresslevel=6, mtime=0, fileobj=inner_checksum) - ) as gzip_file, ChecksumWriter(gzip_file) as outer_checksum, tarfile.TarFile( - name="", mode="w", fileobj=outer_checksum - ) as tar: - yield tar, inner_checksum, outer_checksum - - -def _tarinfo_name(absolute_path: str, *, _path=pathlib.PurePath) -> str: - """Compute tarfile entry name as the relative path from the (system) root.""" - return _path(*_path(absolute_path).parts[1:]).as_posix() - - def tarfile_of_spec_prefix(tar: tarfile.TarFile, prefix: str) -> None: """Create a tarfile of an install prefix of a spec. Skips existing buildinfo file. - Only adds regular files, symlinks and dirs. Skips devices, fifos. Preserves hardlinks. - Normalizes permissions like git. Tar entries are added in depth-first pre-order, with - dir entries partitioned by file | dir, and sorted alphabetically, for reproducibility. - Partitioning ensures only one dir is in memory at a time, and sorting improves compression. Args: tar: tarfile object to add files to prefix: absolute install prefix of spec""" if not os.path.isabs(prefix) or not os.path.isdir(prefix): raise ValueError(f"prefix '{prefix}' must be an absolute path to a directory") - hardlink_to_tarinfo_name: Dict[Tuple[int, int], str] = dict() stat_key = lambda stat: (stat.st_dev, stat.st_ino) try: # skip buildinfo file if it exists files_to_skip = [stat_key(os.lstat(buildinfo_file_name(prefix)))] + skip = lambda entry: stat_key(entry.stat(follow_symlinks=False)) in files_to_skip except OSError: - files_to_skip = [] - - dir_stack = [prefix] - while dir_stack: - dir = dir_stack.pop() - - # Add the dir before its contents - dir_info = tarfile.TarInfo(_tarinfo_name(dir)) - dir_info.type = tarfile.DIRTYPE - dir_info.mode = 0o755 - tar.addfile(dir_info) - - # Sort by name: reproducible & improves compression - with os.scandir(dir) as it: - entries = sorted(it, key=lambda entry: entry.name) - - new_dirs = [] - for entry in entries: - if entry.is_dir(follow_symlinks=False): - new_dirs.append(entry.path) - continue - - file_info = tarfile.TarInfo(_tarinfo_name(entry.path)) - - s = entry.stat(follow_symlinks=False) - - # Skip existing binary distribution files. - id = stat_key(s) - if id in files_to_skip: - continue - - # Normalize the mode - file_info.mode = 0o644 if s.st_mode & 0o100 == 0 else 0o755 - - if entry.is_symlink(): - file_info.type = tarfile.SYMTYPE - file_info.linkname = os.readlink(entry.path) - tar.addfile(file_info) - - elif entry.is_file(follow_symlinks=False): - # Deduplicate hardlinks - if s.st_nlink > 1: - if id in hardlink_to_tarinfo_name: - file_info.type = tarfile.LNKTYPE - file_info.linkname = hardlink_to_tarinfo_name[id] - tar.addfile(file_info) - continue - hardlink_to_tarinfo_name[id] = file_info.name - - # If file not yet seen, copy it. - file_info.type = tarfile.REGTYPE - file_info.size = s.st_size - - with open(entry.path, "rb") as f: - tar.addfile(file_info, f) - - dir_stack.extend(reversed(new_dirs)) # we pop, so reverse to stay alphabetical - - -class ChecksumWriter(io.BufferedIOBase): - """Checksum writer computes a checksum while writing to a file.""" - - myfileobj = None - - def __init__(self, fileobj, algorithm=hashlib.sha256): - self.fileobj = fileobj - self.hasher = algorithm() - self.length = 0 - - def hexdigest(self): - return self.hasher.hexdigest() - - def write(self, data): - if isinstance(data, (bytes, bytearray)): - length = len(data) - else: - data = memoryview(data) - length = data.nbytes - - if length > 0: - self.fileobj.write(data) - self.hasher.update(data) - - self.length += length - - return length - - def read(self, size=-1): - raise OSError(errno.EBADF, "read() on write-only object") - - def read1(self, size=-1): - raise OSError(errno.EBADF, "read1() on write-only object") - - def peek(self, n): - raise OSError(errno.EBADF, "peek() on write-only object") - - @property - def closed(self): - return self.fileobj is None - - def close(self): - fileobj = self.fileobj - if fileobj is None: - return - self.fileobj.close() - self.fileobj = None - - def flush(self): - self.fileobj.flush() - - def fileno(self): - return self.fileobj.fileno() - - def rewind(self): - raise OSError("Can't rewind while computing checksum") - - def readable(self): - return False - - def writable(self): - return True - - def seekable(self): - return True - - def tell(self): - return self.fileobj.tell() - - def seek(self, offset, whence=io.SEEK_SET): - # In principle forward seek is possible with b"0" padding, - # but this is not implemented. - if offset == 0 and whence == io.SEEK_CUR: - return - raise OSError("Can't seek while computing checksum") - - def readline(self, size=-1): - raise OSError(errno.EBADF, "readline() on write-only object") + skip = lambda entry: False + + spack.util.archive.reproducible_tarfile_from_prefix( + tar, + prefix, + # Spack <= 0.21 did not include parent directories, leading to issues when tarballs are + # used in runtimes like AWS lambda. + include_parent_directories=True, + skip=skip, + ) def _do_create_tarball(tarfile_path: str, binaries_dir: str, buildinfo: dict): - with gzip_compressed_tarfile(tarfile_path) as (tar, inner_checksum, outer_checksum): + with spack.util.archive.gzip_compressed_tarfile(tarfile_path) as ( + tar, + inner_checksum, + outer_checksum, + ): # Tarball the install prefix tarfile_of_spec_prefix(tar, binaries_dir) # Serialize buildinfo for the tarball bstring = syaml.dump(buildinfo, default_flow_style=True).encode("utf-8") - tarinfo = tarfile.TarInfo(name=_tarinfo_name(buildinfo_file_name(binaries_dir))) + tarinfo = tarfile.TarInfo( + name=spack.util.archive.default_path_to_name(buildinfo_file_name(binaries_dir)) + ) tarinfo.type = tarfile.REGTYPE tarinfo.size = len(bstring) tarinfo.mode = 0o644 @@ -1601,14 +1458,14 @@ def _get_valid_spec_file(path: str, max_supported_layout: int) -> Tuple[Dict, in return spec_dict, layout_version -def download_tarball(spec, unsigned=False, mirrors_for_spec=None): +def download_tarball(spec, unsigned: Optional[bool] = False, mirrors_for_spec=None): """ Download binary tarball for given package into stage area, returning path to downloaded tarball if successful, None otherwise. Args: spec (spack.spec.Spec): Concrete spec - unsigned (bool): Whether or not to require signed binaries + unsigned: if ``True`` or ``False`` override the mirror signature verification defaults mirrors_for_spec (list): Optional list of concrete specs and mirrors obtained by calling binary_distribution.get_mirrors_for_spec(). These will be checked in order first before looking in other @@ -1629,7 +1486,9 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): "signature_verified": "true-if-binary-pkg-was-already-verified" } """ - configured_mirrors = spack.mirror.MirrorCollection(binary=True).values() + configured_mirrors: Iterable[spack.mirror.Mirror] = spack.mirror.MirrorCollection( + binary=True + ).values() if not configured_mirrors: tty.die("Please add a spack mirror to allow download of pre-compiled packages.") @@ -1647,8 +1506,16 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): # mirror for the spec twice though. try_first = [i["mirror_url"] for i in mirrors_for_spec] if mirrors_for_spec else [] try_next = [i.fetch_url for i in configured_mirrors if i.fetch_url not in try_first] + mirror_urls = try_first + try_next - mirrors = try_first + try_next + # TODO: turn `mirrors_for_spec` into a list of Mirror instances, instead of doing that here. + def fetch_url_to_mirror(url): + for mirror in configured_mirrors: + if mirror.fetch_url == url: + return mirror + return spack.mirror.Mirror(url) + + mirrors = [fetch_url_to_mirror(url) for url in mirror_urls] tried_to_verify_sigs = [] @@ -1657,14 +1524,17 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): # we remove support for deprecated spec formats and buildcache layouts. for try_signed in (True, False): for mirror in mirrors: + # Override mirror's default if + currently_unsigned = unsigned if unsigned is not None else not mirror.signed + # If it's an OCI index, do things differently, since we cannot compose URLs. - parsed = urllib.parse.urlparse(mirror) + fetch_url = mirror.fetch_url # TODO: refactor this to some "nice" place. - if parsed.scheme == "oci": - ref = spack.oci.image.ImageReference.from_string(mirror[len("oci://") :]).with_tag( - spack.oci.image.default_tag(spec) - ) + if fetch_url.startswith("oci://"): + ref = spack.oci.image.ImageReference.from_string( + fetch_url[len("oci://") :] + ).with_tag(spack.oci.image.default_tag(spec)) # Fetch the manifest try: @@ -1701,7 +1571,7 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): except InvalidMetadataFile as e: tty.warn( f"Ignoring binary package for {spec.name}/{spec.dag_hash()[:7]} " - f"from {mirror} due to invalid metadata file: {e}" + f"from {fetch_url} due to invalid metadata file: {e}" ) local_specfile_stage.destroy() continue @@ -1723,13 +1593,16 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): "tarball_stage": tarball_stage, "specfile_stage": local_specfile_stage, "signature_verified": False, + "signature_required": not currently_unsigned, } else: ext = "json.sig" if try_signed else "json" - specfile_path = url_util.join(mirror, BUILD_CACHE_RELATIVE_PATH, specfile_prefix) + specfile_path = url_util.join( + fetch_url, BUILD_CACHE_RELATIVE_PATH, specfile_prefix + ) specfile_url = f"{specfile_path}.{ext}" - spackfile_url = url_util.join(mirror, BUILD_CACHE_RELATIVE_PATH, tarball) + spackfile_url = url_util.join(fetch_url, BUILD_CACHE_RELATIVE_PATH, tarball) local_specfile_stage = try_fetch(specfile_url) if local_specfile_stage: local_specfile_path = local_specfile_stage.save_filename @@ -1742,21 +1615,21 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): except InvalidMetadataFile as e: tty.warn( f"Ignoring binary package for {spec.name}/{spec.dag_hash()[:7]} " - f"from {mirror} due to invalid metadata file: {e}" + f"from {fetch_url} due to invalid metadata file: {e}" ) local_specfile_stage.destroy() continue - if try_signed and not unsigned: + if try_signed and not currently_unsigned: # If we found a signed specfile at the root, try to verify # the signature immediately. We will not download the # tarball if we could not verify the signature. tried_to_verify_sigs.append(specfile_url) signature_verified = try_verify(local_specfile_path) if not signature_verified: - tty.warn("Failed to verify: {0}".format(specfile_url)) + tty.warn(f"Failed to verify: {specfile_url}") - if unsigned or signature_verified or not try_signed: + if currently_unsigned or signature_verified or not try_signed: # We will download the tarball in one of three cases: # 1. user asked for --no-check-signature # 2. user didn't ask for --no-check-signature, but we @@ -1779,6 +1652,7 @@ def download_tarball(spec, unsigned=False, mirrors_for_spec=None): "tarball_stage": tarball_stage, "specfile_stage": local_specfile_stage, "signature_verified": signature_verified, + "signature_required": not currently_unsigned, } local_specfile_stage.destroy() @@ -1977,7 +1851,7 @@ def is_backup_file(file): relocate.relocate_text(text_names, prefix_to_prefix_text) -def _extract_inner_tarball(spec, filename, extract_to, unsigned, remote_checksum): +def _extract_inner_tarball(spec, filename, extract_to, signature_required: bool, remote_checksum): stagepath = os.path.dirname(filename) spackfile_name = tarball_name(spec, ".spack") spackfile_path = os.path.join(stagepath, spackfile_name) @@ -1997,7 +1871,7 @@ def _extract_inner_tarball(spec, filename, extract_to, unsigned, remote_checksum else: raise ValueError("Cannot find spec file for {0}.".format(extract_to)) - if not unsigned: + if signature_required: if os.path.exists("%s.asc" % specfile_path): suppress = config.get("config:suppress_gpg_warnings", False) try: @@ -2026,11 +1900,12 @@ def _extract_inner_tarball(spec, filename, extract_to, unsigned, remote_checksum def _tar_strip_component(tar: tarfile.TarFile, prefix: str): - """Strip the top-level directory `prefix` from the member names in a tarfile.""" + """Yield all members of tarfile that start with given prefix, and strip that prefix (including + symlinks)""" # Including trailing /, otherwise we end up with absolute paths. regex = re.compile(re.escape(prefix) + "/*") - # Remove the top-level directory from the member (link)names. + # Only yield members in the package prefix. # Note: when a tarfile is created, relative in-prefix symlinks are # expanded to matching member names of tarfile entries. So, we have # to ensure that those are updated too. @@ -2038,15 +1913,17 @@ def _tar_strip_component(tar: tarfile.TarFile, prefix: str): # them. for m in tar.getmembers(): result = regex.match(m.name) - assert result is not None + if not result: + continue m.name = m.name[result.end() :] if m.linkname: result = regex.match(m.linkname) if result: m.linkname = m.linkname[result.end() :] + yield m -def extract_tarball(spec, download_result, unsigned=False, force=False, timer=timer.NULL_TIMER): +def extract_tarball(spec, download_result, force=False, timer=timer.NULL_TIMER): """ extract binary tarball for given package into install area """ @@ -2072,7 +1949,8 @@ def extract_tarball(spec, download_result, unsigned=False, force=False, timer=ti bchecksum = spec_dict["binary_cache_checksum"] filename = download_result["tarball_stage"].save_filename - signature_verified = download_result["signature_verified"] + signature_verified: bool = download_result["signature_verified"] + signature_required: bool = download_result["signature_required"] tmpdir = None if layout_version == 0: @@ -2081,12 +1959,14 @@ def extract_tarball(spec, download_result, unsigned=False, force=False, timer=ti # and another tarball containing the actual install tree. tmpdir = tempfile.mkdtemp() try: - tarfile_path = _extract_inner_tarball(spec, filename, tmpdir, unsigned, bchecksum) + tarfile_path = _extract_inner_tarball( + spec, filename, tmpdir, signature_required, bchecksum + ) except Exception as e: _delete_staged_downloads(download_result) shutil.rmtree(tmpdir) raise e - elif layout_version == 1: + elif 1 <= layout_version <= 2: # Newer buildcache layout: the .spack file contains just # in the install tree, the signature, if it exists, is # wrapped around the spec.json at the root. If sig verify @@ -2094,9 +1974,10 @@ def extract_tarball(spec, download_result, unsigned=False, force=False, timer=ti # the tarball. tarfile_path = filename - if not unsigned and not signature_verified: + if signature_required and not signature_verified: raise UnsignedPackageException( - "To install unsigned packages, use the --no-check-signature option." + "To install unsigned packages, use the --no-check-signature option, " + "or configure the mirror with signed: false." ) # compute the sha256 checksum of the tarball @@ -2113,8 +1994,10 @@ def extract_tarball(spec, download_result, unsigned=False, force=False, timer=ti try: with closing(tarfile.open(tarfile_path, "r")) as tar: # Remove install prefix from tarfil to extract directly into spec.prefix - _tar_strip_component(tar, prefix=_ensure_common_prefix(tar)) - tar.extractall(path=spec.prefix) + tar.extractall( + path=spec.prefix, + members=_tar_strip_component(tar, prefix=_ensure_common_prefix(tar)), + ) except Exception: shutil.rmtree(spec.prefix, ignore_errors=True) _delete_staged_downloads(download_result) @@ -2149,20 +2032,47 @@ def extract_tarball(spec, download_result, unsigned=False, force=False, timer=ti def _ensure_common_prefix(tar: tarfile.TarFile) -> str: - # Get the shortest length directory. - common_prefix = min((e.name for e in tar.getmembers() if e.isdir()), key=len, default=None) + # Find the lowest `binary_distribution` file (hard-coded forward slash is on purpose). + binary_distribution = min( + ( + e.name + for e in tar.getmembers() + if e.isfile() and e.name.endswith(".spack/binary_distribution") + ), + key=len, + default=None, + ) + + if binary_distribution is None: + raise ValueError("Tarball is not a Spack package, missing binary_distribution file") + + pkg_path = pathlib.PurePosixPath(binary_distribution).parent.parent + + # Even the most ancient Spack version has required to list the dir of the package itself, so + # guard against broken tarballs where `path.parent.parent` is empty. + if pkg_path == pathlib.PurePosixPath(): + raise ValueError("Invalid tarball, missing package prefix dir") - if common_prefix is None: - raise ValueError("Tarball does not contain a common prefix") + pkg_prefix = str(pkg_path) - # Validate that each file starts with the prefix + # Ensure all tar entries are in the pkg_prefix dir, and if they're not, they should be parent + # dirs of it. + has_prefix = False for member in tar.getmembers(): - if not member.name.startswith(common_prefix): - raise ValueError( - f"Tarball contains file {member.name} outside of prefix {common_prefix}" - ) + stripped = member.name.rstrip("/") + if not ( + stripped.startswith(pkg_prefix) or member.isdir() and pkg_prefix.startswith(stripped) + ): + raise ValueError(f"Tarball contains file {stripped} outside of prefix {pkg_prefix}") + if member.isdir() and stripped == pkg_prefix: + has_prefix = True + + # This is technically not required, but let's be defensive about the existence of the package + # prefix dir. + if not has_prefix: + raise ValueError(f"Tarball does not contain a common prefix {pkg_prefix}") - return common_prefix + return pkg_prefix def install_root_node(spec, unsigned=False, force=False, sha256=None): @@ -2209,7 +2119,7 @@ def install_root_node(spec, unsigned=False, force=False, sha256=None): # don't print long padded paths while extracting/relocating binaries with spack.util.path.filter_padding(): tty.msg('Installing "{0}" from a buildcache'.format(spec.format())) - extract_tarball(spec, download_result, unsigned, force) + extract_tarball(spec, download_result, force) spack.hooks.post_install(spec, False) spack.store.STORE.db.add(spec, spack.store.STORE.layout) diff --git a/lib/spack/spack/bootstrap/__init__.py b/lib/spack/spack/bootstrap/__init__.py index 1f2f239de3d844..d6844ac14d3b2c 100644 --- a/lib/spack/spack/bootstrap/__init__.py +++ b/lib/spack/spack/bootstrap/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/bootstrap/_common.py b/lib/spack/spack/bootstrap/_common.py index 0b8192f77f807d..08bb9377b7c325 100644 --- a/lib/spack/spack/bootstrap/_common.py +++ b/lib/spack/spack/bootstrap/_common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,7 @@ import llnl.util.filesystem as fs from llnl.util import tty +import spack.platforms import spack.store import spack.util.environment import spack.util.executable @@ -206,17 +207,19 @@ def _root_spec(spec_str: str) -> str: """Add a proper compiler and target to a spec used during bootstrapping. Args: - spec_str (str): spec to be bootstrapped. Must be without compiler and target. + spec_str: spec to be bootstrapped. Must be without compiler and target. """ - # Add a proper compiler hint to the root spec. We use GCC for - # everything but MacOS and Windows. - if str(spack.platforms.host()) == "darwin": + # Add a compiler requirement to the root spec. + platform = str(spack.platforms.host()) + if platform == "darwin": spec_str += " %apple-clang" - elif str(spack.platforms.host()) == "windows": + elif platform == "windows": # TODO (johnwparent): Remove version constraint when clingo patch is up spec_str += " %msvc@:19.37" - else: + elif platform == "linux": spec_str += " %gcc" + elif platform == "freebsd": + spec_str += " %clang" target = archspec.cpu.host().family spec_str += f" target={target}" diff --git a/lib/spack/spack/bootstrap/config.py b/lib/spack/spack/bootstrap/config.py index 6786bc0d3ead00..10c5a3db4b1cec 100644 --- a/lib/spack/spack/bootstrap/config.py +++ b/lib/spack/spack/bootstrap/config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/bootstrap/core.py b/lib/spack/spack/bootstrap/core.py index 5f73c7bfaf49c8..6ff18db8433997 100644 --- a/lib/spack/spack/bootstrap/core.py +++ b/lib/spack/spack/bootstrap/core.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -386,7 +386,7 @@ def ensure_module_importable_or_raise(module: str, abstract_spec: Optional[str] exception_handler = GroupedExceptionHandler() for current_config in bootstrapping_sources(): - with exception_handler.forward(current_config["name"]): + with exception_handler.forward(current_config["name"], Exception): source_is_enabled_or_raise(current_config) current_bootstrapper = create_bootstrapper(current_config) if current_bootstrapper.try_import(module, abstract_spec): @@ -441,7 +441,7 @@ def ensure_executables_in_path_or_raise( exception_handler = GroupedExceptionHandler() for current_config in bootstrapping_sources(): - with exception_handler.forward(current_config["name"]): + with exception_handler.forward(current_config["name"], Exception): source_is_enabled_or_raise(current_config) current_bootstrapper = create_bootstrapper(current_config) if current_bootstrapper.try_search_path(executables, abstract_spec): diff --git a/lib/spack/spack/bootstrap/environment.py b/lib/spack/spack/bootstrap/environment.py index 2a2fc37b454afa..1f8fbe80974a80 100644 --- a/lib/spack/spack/bootstrap/environment.py +++ b/lib/spack/spack/bootstrap/environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,6 @@ import spack.tengine import spack.util.cpus import spack.util.executable -from spack.environment import depfile from ._common import _root_spec from .config import root_path, spec_for_current_python, store_path @@ -86,12 +85,9 @@ def __init__(self) -> None: super().__init__(self.environment_root()) def update_installations(self) -> None: - """Update the installations of this environment. - - The update is done using a depfile on Linux and macOS, and using the ``install_all`` - method of environments on Windows. - """ - with tty.SuppressOutput(msg_enabled=False, warn_enabled=False): + """Update the installations of this environment.""" + log_enabled = tty.is_debug() or tty.is_verbose() + with tty.SuppressOutput(msg_enabled=log_enabled, warn_enabled=log_enabled): specs = self.concretize() if specs: colorized_specs = [ @@ -100,11 +96,9 @@ def update_installations(self) -> None: ] tty.msg(f"[BOOTSTRAPPING] Installing dependencies ({', '.join(colorized_specs)})") self.write(regenerate=False) - if sys.platform == "win32": + with tty.SuppressOutput(msg_enabled=log_enabled, warn_enabled=log_enabled): self.install_all() - else: - self._install_with_depfile() - self.write(regenerate=True) + self.write(regenerate=True) def update_syspath_and_environ(self) -> None: """Update ``sys.path`` and the PATH, PYTHONPATH environment variables to point to @@ -122,25 +116,6 @@ def update_syspath_and_environ(self) -> None: + [str(x) for x in self.pythonpaths()] ) - def _install_with_depfile(self) -> None: - model = depfile.MakefileModel.from_env(self) - template = spack.tengine.make_environment().get_template( - os.path.join("depfile", "Makefile") - ) - makefile = self.environment_root() / "Makefile" - makefile.write_text(template.render(model.to_dict())) - make = spack.util.executable.which("make") - kwargs = {} - if not tty.is_debug(): - kwargs = {"output": os.devnull, "error": os.devnull} - make( - "-C", - str(self.environment_root()), - "-j", - str(spack.util.cpus.determine_number_of_jobs(parallel=True)), - **kwargs, - ) - def _write_spack_yaml_file(self) -> None: tty.msg( "[BOOTSTRAPPING] Spack has missing dependencies, creating a bootstrapping environment" @@ -161,7 +136,7 @@ def _write_spack_yaml_file(self) -> None: def isort_root_spec() -> str: """Return the root spec used to bootstrap isort""" - return _root_spec("py-isort@4.3.5:") + return _root_spec("py-isort@5") def mypy_root_spec() -> str: diff --git a/lib/spack/spack/bootstrap/status.py b/lib/spack/spack/bootstrap/status.py index 39caa9eac261f6..37b6bc37da925e 100644 --- a/lib/spack/spack/bootstrap/status.py +++ b/lib/spack/spack/bootstrap/status.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -66,7 +66,6 @@ def _core_requirements() -> List[RequiredResponseType]: _core_system_exes = { "make": _missing("make", "required to build software from sources"), "patch": _missing("patch", "required to patch source code before building"), - "bash": _missing("bash", "required for Spack compiler wrapper"), "tar": _missing("tar", "required to manage code archives"), "gzip": _missing("gzip", "required to compress/decompress code archives"), "unzip": _missing("unzip", "required to compress/decompress code archives"), diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 20d8e75f9bc47b..68369cbe059f30 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -217,6 +217,9 @@ def clean_environment(): env.unset("R_HOME") env.unset("R_ENVIRON") + env.unset("LUA_PATH") + env.unset("LUA_CPATH") + # Affects GNU make, can e.g. indirectly inhibit enabling parallel build # env.unset('MAKEFLAGS') @@ -552,58 +555,55 @@ def set_package_py_globals(pkg, context: Context = Context.BUILD): """ module = ModuleChangePropagator(pkg) - m = module - if context == Context.BUILD: - jobs = determine_number_of_jobs(parallel=pkg.parallel) - m.make_jobs = jobs - - # TODO: make these build deps that can be installed if not found. - m.make = MakeExecutable("make", jobs) - m.gmake = MakeExecutable("gmake", jobs) - m.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False) - # TODO: johnwparent: add package or builder support to define these build tools - # for now there is no entrypoint for builders to define these on their - # own - if sys.platform == "win32": - m.nmake = Executable("nmake") - m.msbuild = Executable("msbuild") - # analog to configure for win32 - m.cscript = Executable("cscript") - - # Find the configure script in the archive path - # Don't use which for this; we want to find it in the current dir. - m.configure = Executable("./configure") - - # Standard CMake arguments - m.std_cmake_args = spack.build_systems.cmake.CMakeBuilder.std_args(pkg) - m.std_meson_args = spack.build_systems.meson.MesonBuilder.std_args(pkg) - m.std_pip_args = spack.build_systems.python.PythonPipBuilder.std_args(pkg) + module.std_cmake_args = spack.build_systems.cmake.CMakeBuilder.std_args(pkg) + module.std_meson_args = spack.build_systems.meson.MesonBuilder.std_args(pkg) + module.std_pip_args = spack.build_systems.python.PythonPipBuilder.std_args(pkg) + + jobs = determine_number_of_jobs(parallel=pkg.parallel) + module.make_jobs = jobs + + # TODO: make these build deps that can be installed if not found. + module.make = MakeExecutable("make", jobs) + module.gmake = MakeExecutable("gmake", jobs) + module.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False) + # TODO: johnwparent: add package or builder support to define these build tools + # for now there is no entrypoint for builders to define these on their + # own + if sys.platform == "win32": + module.nmake = Executable("nmake") + module.msbuild = Executable("msbuild") + # analog to configure for win32 + module.cscript = Executable("cscript") + + # Find the configure script in the archive path + # Don't use which for this; we want to find it in the current dir. + module.configure = Executable("./configure") # Put spack compiler paths in module scope. (Some packages use it # in setup_run_environment etc, so don't put it context == build) link_dir = spack.paths.build_env_path - m.spack_cc = os.path.join(link_dir, pkg.compiler.link_paths["cc"]) - m.spack_cxx = os.path.join(link_dir, pkg.compiler.link_paths["cxx"]) - m.spack_f77 = os.path.join(link_dir, pkg.compiler.link_paths["f77"]) - m.spack_fc = os.path.join(link_dir, pkg.compiler.link_paths["fc"]) + module.spack_cc = os.path.join(link_dir, pkg.compiler.link_paths["cc"]) + module.spack_cxx = os.path.join(link_dir, pkg.compiler.link_paths["cxx"]) + module.spack_f77 = os.path.join(link_dir, pkg.compiler.link_paths["f77"]) + module.spack_fc = os.path.join(link_dir, pkg.compiler.link_paths["fc"]) # Useful directories within the prefix are encapsulated in # a Prefix object. - m.prefix = pkg.prefix + module.prefix = pkg.prefix # Platform-specific library suffix. - m.dso_suffix = dso_suffix + module.dso_suffix = dso_suffix def static_to_shared_library(static_lib, shared_lib=None, **kwargs): - compiler_path = kwargs.get("compiler", m.spack_cc) + compiler_path = kwargs.get("compiler", module.spack_cc) compiler = Executable(compiler_path) return _static_to_shared_library( pkg.spec.architecture, compiler, static_lib, shared_lib, **kwargs ) - m.static_to_shared_library = static_to_shared_library + module.static_to_shared_library = static_to_shared_library module.propagate_changes_to_mro() @@ -972,8 +972,8 @@ def __init__(self, *specs: spack.spec.Spec, context: Context) -> None: self.should_set_package_py_globals = ( self.should_setup_dependent_build_env | self.should_setup_run_env | UseMode.ROOT ) - # In a build context, the root and direct build deps need build-specific globals set. - self.needs_build_context = UseMode.ROOT | UseMode.BUILDTIME_DIRECT + # In a build context, the root needs build-specific globals set. + self.needs_build_context = UseMode.ROOT def set_all_package_py_globals(self): """Set the globals in modules of package.py files.""" @@ -1032,6 +1032,11 @@ def get_env_modifications(self) -> EnvironmentModifications: if id(spec) in self.nodes_in_subdag: pkg.setup_dependent_run_environment(run_env_mods, spec) pkg.setup_run_environment(run_env_mods) + + external_env = (dspec.extra_attributes or {}).get("environment", {}) + if external_env: + run_env_mods.extend(spack.schema.environment.parse(external_env)) + if self.context == Context.BUILD: # Don't let the runtime environment of comiler like dependencies leak into the # build env @@ -1333,7 +1338,7 @@ def make_stack(tb, stack=None): # don't provide context if the code is actually in the base classes. obj = frame.f_locals["self"] func = getattr(obj, tb.tb_frame.f_code.co_name, "") - if func: + if func and hasattr(func, "__qualname__"): typename, *_ = func.__qualname__.partition(".") if isinstance(obj, CONTEXT_BASES) and typename not in basenames: break diff --git a/lib/spack/spack/build_systems/__init__.py b/lib/spack/spack/build_systems/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/build_systems/__init__.py +++ b/lib/spack/spack/build_systems/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/_checks.py b/lib/spack/spack/build_systems/_checks.py index 38fada308f5aed..dfda043fad08ef 100644 --- a/lib/spack/spack/build_systems/_checks.py +++ b/lib/spack/spack/build_systems/_checks.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/aspell_dict.py b/lib/spack/spack/build_systems/aspell_dict.py index 1bc8c663f13b4e..e9fc4e14978e9e 100644 --- a/lib/spack/spack/build_systems/aspell_dict.py +++ b/lib/spack/spack/build_systems/aspell_dict.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index 760faf307bbc65..d3b7893bfec5e6 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/bundle.py b/lib/spack/spack/build_systems/bundle.py index 403c521968aa85..357513176a58d6 100644 --- a/lib/spack/spack/build_systems/bundle.py +++ b/lib/spack/spack/build_systems/bundle.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/cached_cmake.py b/lib/spack/spack/build_systems/cached_cmake.py index d85c2b7e199352..ca9eae52b40400 100644 --- a/lib/spack/spack/build_systems/cached_cmake.py +++ b/lib/spack/spack/build_systems/cached_cmake.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,6 +9,7 @@ import llnl.util.filesystem as fs import llnl.util.tty as tty +import spack.build_environment import spack.builder from .cmake import CMakeBuilder, CMakePackage @@ -34,6 +35,11 @@ def cmake_cache_option(name, boolean_value, comment="", force=False): return 'set({0} {1} CACHE BOOL "{2}"{3})\n'.format(name, value, comment, force_str) +def cmake_cache_filepath(name, value, comment=""): + """Generate a string for a cmake cache variable of type FILEPATH""" + return 'set({0} "{1}" CACHE FILEPATH "{2}")\n'.format(name, value, comment) + + class CachedCMakeBuilder(CMakeBuilder): #: Phases of a Cached CMake package #: Note: the initconfig phase is used for developer builds as a final phase to stop on @@ -193,6 +199,8 @@ def initconfig_mpi_entries(self): mpiexec = "/usr/bin/srun" else: mpiexec = os.path.join(spec["slurm"].prefix.bin, "srun") + elif hasattr(spec["mpi"].package, "mpiexec"): + mpiexec = spec["mpi"].package.mpiexec else: mpiexec = os.path.join(spec["mpi"].prefix.bin, "mpirun") if not os.path.exists(mpiexec): @@ -257,6 +265,15 @@ def initconfig_hardware_entries(self): entries.append( cmake_cache_path("HIP_CXX_COMPILER", "{0}".format(self.spec["hip"].hipcc)) ) + llvm_bin = spec["llvm-amdgpu"].prefix.bin + llvm_prefix = spec["llvm-amdgpu"].prefix + # Some ROCm systems seem to point to //rocm-/ and + # others point to //rocm-/llvm + if os.path.basename(os.path.normpath(llvm_prefix)) != "llvm": + llvm_bin = os.path.join(llvm_prefix, "llvm/bin/") + entries.append( + cmake_cache_filepath("CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "clang++")) + ) archs = self.spec.variants["amdgpu_target"].value if archs[0] != "none": arch_str = ";".join(archs) @@ -271,13 +288,29 @@ def initconfig_hardware_entries(self): def std_initconfig_entries(self): cmake_prefix_path_env = os.environ["CMAKE_PREFIX_PATH"] cmake_prefix_path = cmake_prefix_path_env.replace(os.pathsep, ";") + cmake_rpaths_env = spack.build_environment.get_rpaths(self.pkg) + cmake_rpaths_path = ";".join(cmake_rpaths_env) + complete_rpath_list = cmake_rpaths_path + if "SPACK_COMPILER_EXTRA_RPATHS" in os.environ: + spack_extra_rpaths_env = os.environ["SPACK_COMPILER_EXTRA_RPATHS"] + spack_extra_rpaths_path = spack_extra_rpaths_env.replace(os.pathsep, ";") + complete_rpath_list = "{0};{1}".format(complete_rpath_list, spack_extra_rpaths_path) + + if "SPACK_COMPILER_IMPLICIT_RPATHS" in os.environ: + spack_implicit_rpaths_env = os.environ["SPACK_COMPILER_IMPLICIT_RPATHS"] + spack_implicit_rpaths_path = spack_implicit_rpaths_env.replace(os.pathsep, ";") + complete_rpath_list = "{0};{1}".format(complete_rpath_list, spack_implicit_rpaths_path) + return [ "#------------------{0}".format("-" * 60), "# !!!! This is a generated file, edit at own risk !!!!", "#------------------{0}".format("-" * 60), "# CMake executable path: {0}".format(self.pkg.spec["cmake"].command.path), "#------------------{0}\n".format("-" * 60), - cmake_cache_path("CMAKE_PREFIX_PATH", cmake_prefix_path), + cmake_cache_string("CMAKE_PREFIX_PATH", cmake_prefix_path), + cmake_cache_string("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "ON"), + cmake_cache_string("CMAKE_BUILD_RPATH", complete_rpath_list), + cmake_cache_string("CMAKE_INSTALL_RPATH", complete_rpath_list), self.define_cmake_cache_from_variant("CMAKE_BUILD_TYPE", "build_type"), ] diff --git a/lib/spack/spack/build_systems/cargo.py b/lib/spack/spack/build_systems/cargo.py new file mode 100644 index 00000000000000..0aa31b48555a97 --- /dev/null +++ b/lib/spack/spack/build_systems/cargo.py @@ -0,0 +1,89 @@ +# 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 inspect + +import llnl.util.filesystem as fs + +import spack.builder +import spack.package_base +from spack.directives import build_system, depends_on +from spack.multimethod import when + +from ._checks import BaseBuilder, execute_install_time_tests + + +class CargoPackage(spack.package_base.PackageBase): + """Specialized class for packages built using a Makefiles.""" + + #: This attribute is used in UI queries that need to know the build + #: system base class + build_system_class = "CargoPackage" + + build_system("cargo") + + with when("build_system=cargo"): + depends_on("rust", type="build") + + +@spack.builder.builder("cargo") +class CargoBuilder(BaseBuilder): + """The Cargo builder encodes the most common way of building software with + a rust Cargo.toml file. It has two phases that can be overridden, if need be: + + 1. :py:meth:`~.CargoBuilder.build` + 2. :py:meth:`~.CargoBuilder.install` + + For a finer tuning you may override: + + +-----------------------------------------------+----------------------+ + | **Method** | **Purpose** | + +===============================================+======================+ + | :py:meth:`~.CargoBuilder.build_args` | Specify arguments | + | | to ``cargo install`` | + +-----------------------------------------------+----------------------+ + | :py:meth:`~.CargoBuilder.check_args` | Specify arguments | + | | to ``cargo test`` | + +-----------------------------------------------+----------------------+ + """ + + phases = ("build", "install") + + #: Callback names for install-time test + install_time_test_callbacks = ["check"] + + @property + def build_directory(self): + """Return the directory containing the main Cargo.toml.""" + return self.pkg.stage.source_path + + @property + def build_args(self): + """Arguments for ``cargo build``.""" + return [] + + @property + def check_args(self): + """Argument for ``cargo test`` during check phase""" + return [] + + def build(self, pkg, spec, prefix): + """Runs ``cargo install`` in the source directory""" + with fs.working_dir(self.build_directory): + inspect.getmodule(pkg).cargo( + "install", "--root", "out", "--path", ".", *self.build_args + ) + + def install(self, pkg, spec, prefix): + """Copy build files into package prefix.""" + with fs.working_dir(self.build_directory): + fs.install_tree("out", prefix) + + spack.builder.run_after("install")(execute_install_time_tests) + + def check(self): + """Run "cargo test".""" + with fs.working_dir(self.build_directory): + inspect.getmodule(self.pkg).cargo("test", *self.check_args) diff --git a/lib/spack/spack/build_systems/cmake.py b/lib/spack/spack/build_systems/cmake.py index 1859e40fe51d20..d66d531694b4b0 100644 --- a/lib/spack/spack/build_systems/cmake.py +++ b/lib/spack/spack/build_systems/cmake.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,7 @@ import spack.build_environment import spack.builder +import spack.deptypes as dt import spack.package_base from spack.directives import build_system, conflicts, depends_on, variant from spack.multimethod import when @@ -31,8 +32,68 @@ def _extract_primary_generator(generator): primary generator from the generator string which may contain an optional secondary generator. """ - primary_generator = _primary_generator_extractor.match(generator).group(1) - return primary_generator + return _primary_generator_extractor.match(generator).group(1) + + +def _maybe_set_python_hints(pkg: spack.package_base.PackageBase, args: List[str]) -> None: + """Set the PYTHON_EXECUTABLE, Python_EXECUTABLE, and Python3_EXECUTABLE CMake variables + if the package has Python as build or link dep and ``find_python_hints`` is set to True. See + ``find_python_hints`` for context.""" + if not getattr(pkg, "find_python_hints", False): + return + pythons = pkg.spec.dependencies("python", dt.BUILD | dt.LINK) + if len(pythons) != 1: + return + try: + python_executable = pythons[0].package.command.path + except RuntimeError: + return + + args.extend( + [ + CMakeBuilder.define("PYTHON_EXECUTABLE", python_executable), + CMakeBuilder.define("Python_EXECUTABLE", python_executable), + CMakeBuilder.define("Python3_EXECUTABLE", python_executable), + ] + ) + + +def _conditional_cmake_defaults(pkg: spack.package_base.PackageBase, args: List[str]) -> None: + """Set a few default defines for CMake, depending on its version.""" + cmakes = pkg.spec.dependencies("cmake", dt.BUILD) + + if len(cmakes) != 1: + return + + cmake = cmakes[0] + + # CMAKE_INTERPROCEDURAL_OPTIMIZATION only exists for CMake >= 3.9 + try: + ipo = pkg.spec.variants["ipo"].value + except KeyError: + ipo = False + + if cmake.satisfies("@3.9:"): + args.append(CMakeBuilder.define("CMAKE_INTERPROCEDURAL_OPTIMIZATION", ipo)) + + # Disable Package Registry: export(PACKAGE) may put files in the user's home directory, and + # find_package may search there. This is not what we want. + + # Do not populate CMake User Package Registry + if cmake.satisfies("@3.15:"): + # see https://cmake.org/cmake/help/latest/policy/CMP0090.html + args.append(CMakeBuilder.define("CMAKE_POLICY_DEFAULT_CMP0090", "NEW")) + elif cmake.satisfies("@3.1:"): + # see https://cmake.org/cmake/help/latest/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.html + args.append(CMakeBuilder.define("CMAKE_EXPORT_NO_PACKAGE_REGISTRY", True)) + + # Do not use CMake User/System Package Registry + # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry + if cmake.satisfies("@3.16:"): + args.append(CMakeBuilder.define("CMAKE_FIND_USE_PACKAGE_REGISTRY", False)) + elif cmake.satisfies("@3.1:3.15"): + args.append(CMakeBuilder.define("CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY", False)) + args.append(CMakeBuilder.define("CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY", False)) def generator(*names: str, default: Optional[str] = None): @@ -86,6 +147,13 @@ class CMakePackage(spack.package_base.PackageBase): #: Legacy buildsystem attribute used to deserialize and install old specs legacy_buildsystem = "cmake" + #: When this package depends on Python and ``find_python_hints`` is set to True, pass the + #: defines {Python3,Python,PYTHON}_EXECUTABLE explicitly, so that CMake locates the right + #: Python in its builtin FindPython3, FindPython, and FindPythonInterp modules. Spack does + #: CMake's job because CMake's modules by default only search for Python versions known at the + #: time of release. + find_python_hints = True + build_system("cmake") with when("build_system=cmake"): @@ -241,9 +309,9 @@ def std_cmake_args(self): """Standard cmake arguments provided as a property for convenience of package writers """ - std_cmake_args = CMakeBuilder.std_args(self.pkg, generator=self.generator) - std_cmake_args += getattr(self.pkg, "cmake_flag_args", []) - return std_cmake_args + args = CMakeBuilder.std_args(self.pkg, generator=self.generator) + args += getattr(self.pkg, "cmake_flag_args", []) + return args @staticmethod def std_args(pkg, generator=None): @@ -263,11 +331,6 @@ def std_args(pkg, generator=None): except KeyError: build_type = "RelWithDebInfo" - try: - ipo = pkg.spec.variants["ipo"].value - except KeyError: - ipo = False - define = CMakeBuilder.define args = [ "-G", @@ -276,10 +339,6 @@ def std_args(pkg, generator=None): define("CMAKE_BUILD_TYPE", build_type), ] - # CMAKE_INTERPROCEDURAL_OPTIMIZATION only exists for CMake >= 3.9 - if pkg.spec.satisfies("^cmake@3.9:"): - args.append(define("CMAKE_INTERPROCEDURAL_OPTIMIZATION", ipo)) - if primary_generator == "Unix Makefiles": args.append(define("CMAKE_VERBOSE_MAKEFILE", True)) @@ -288,6 +347,9 @@ def std_args(pkg, generator=None): [define("CMAKE_FIND_FRAMEWORK", "LAST"), define("CMAKE_FIND_APPBUNDLE", "LAST")] ) + _conditional_cmake_defaults(pkg, args) + _maybe_set_python_hints(pkg, args) + # Set up CMake rpath args.extend( [ diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 4a07c8b2c4cf44..4311df3a1746c7 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -136,12 +136,12 @@ def cuda_flags(arch_list): conflicts("%gcc@11:", when="+cuda ^cuda@:11.4.0") conflicts("%gcc@11.2:", when="+cuda ^cuda@:11.5") conflicts("%gcc@12:", when="+cuda ^cuda@:11.8") - conflicts("%gcc@13:", when="+cuda ^cuda@:12.1") + conflicts("%gcc@13:", when="+cuda ^cuda@:12.3") conflicts("%clang@12:", when="+cuda ^cuda@:11.4.0") conflicts("%clang@13:", when="+cuda ^cuda@:11.5") conflicts("%clang@14:", when="+cuda ^cuda@:11.7") conflicts("%clang@15:", when="+cuda ^cuda@:12.0") - conflicts("%clang@16:", when="+cuda ^cuda@:12.1") + conflicts("%clang@16:", when="+cuda ^cuda@:12.3") # https://gist.github.com/ax3l/9489132#gistcomment-3860114 conflicts("%gcc@10", when="+cuda ^cuda@:11.4.0") diff --git a/lib/spack/spack/build_systems/generic.py b/lib/spack/spack/build_systems/generic.py index 1e5759ae5669c4..5a0446a4ad6e7f 100644 --- a/lib/spack/spack/build_systems/generic.py +++ b/lib/spack/spack/build_systems/generic.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/gnu.py b/lib/spack/spack/build_systems/gnu.py index 77adfcb9c22e21..2d747c59c53385 100644 --- a/lib/spack/spack/build_systems/gnu.py +++ b/lib/spack/spack/build_systems/gnu.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/go.py b/lib/spack/spack/build_systems/go.py new file mode 100644 index 00000000000000..95472642f68695 --- /dev/null +++ b/lib/spack/spack/build_systems/go.py @@ -0,0 +1,98 @@ +# 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 inspect + +import llnl.util.filesystem as fs + +import spack.builder +import spack.package_base +from spack.directives import build_system, extends +from spack.multimethod import when + +from ._checks import BaseBuilder, execute_install_time_tests + + +class GoPackage(spack.package_base.PackageBase): + """Specialized class for packages built using the Go toolchain.""" + + #: This attribute is used in UI queries that need to know the build + #: system base class + build_system_class = "GoPackage" + + #: Legacy buildsystem attribute used to deserialize and install old specs + legacy_buildsystem = "go" + + build_system("go") + + with when("build_system=go"): + # TODO: this seems like it should be depends_on, see + # setup_dependent_build_environment in go for why I kept it like this + extends("go@1.14:", type="build") + + +@spack.builder.builder("go") +class GoBuilder(BaseBuilder): + """The Go builder encodes the most common way of building software with + a golang go.mod file. It has two phases that can be overridden, if need be: + + 1. :py:meth:`~.GoBuilder.build` + 2. :py:meth:`~.GoBuilder.install` + + For a finer tuning you may override: + + +-----------------------------------------------+--------------------+ + | **Method** | **Purpose** | + +===============================================+====================+ + | :py:meth:`~.GoBuilder.build_args` | Specify arguments | + | | to ``go build`` | + +-----------------------------------------------+--------------------+ + | :py:meth:`~.GoBuilder.check_args` | Specify arguments | + | | to ``go test`` | + +-----------------------------------------------+--------------------+ + """ + + phases = ("build", "install") + + #: Callback names for install-time test + install_time_test_callbacks = ["check"] + + def setup_build_environment(self, env): + env.set("GO111MODULE", "on") + env.set("GOTOOLCHAIN", "local") + + @property + def build_directory(self): + """Return the directory containing the main go.mod.""" + return self.pkg.stage.source_path + + @property + def build_args(self): + """Arguments for ``go build``.""" + # Pass ldflags -s = --strip-all and -w = --no-warnings by default + return ["-ldflags", "-s -w", "-o", f"{self.pkg.name}"] + + @property + def check_args(self): + """Argument for ``go test`` during check phase""" + return [] + + def build(self, pkg, spec, prefix): + """Runs ``go build`` in the source directory""" + with fs.working_dir(self.build_directory): + inspect.getmodule(pkg).go("build", *self.build_args) + + def install(self, pkg, spec, prefix): + """Install built binaries into prefix bin.""" + with fs.working_dir(self.build_directory): + fs.mkdirp(prefix.bin) + fs.install(pkg.name, prefix.bin) + + spack.builder.run_after("install")(execute_install_time_tests) + + def check(self): + """Run ``go test .`` in the source directory""" + with fs.working_dir(self.build_directory): + inspect.getmodule(self.pkg).go("test", *self.check_args) diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index dbb8313acfef04..0dfe4ede2606df 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/lua.py b/lib/spack/spack/build_systems/lua.py index ad67f50825e60b..d862604e9015ed 100644 --- a/lib/spack/spack/build_systems/lua.py +++ b/lib/spack/spack/build_systems/lua.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/makefile.py b/lib/spack/spack/build_systems/makefile.py index 25eec07095b176..baae2308a2fcbb 100644 --- a/lib/spack/spack/build_systems/makefile.py +++ b/lib/spack/spack/build_systems/makefile.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/maven.py b/lib/spack/spack/build_systems/maven.py index 4b63efbdf6d4f6..809258d5dff2c5 100644 --- a/lib/spack/spack/build_systems/maven.py +++ b/lib/spack/spack/build_systems/maven.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py index 38939dc7adc323..2c2bc0d1a0ca40 100644 --- a/lib/spack/spack/build_systems/meson.py +++ b/lib/spack/spack/build_systems/meson.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -149,7 +149,7 @@ def std_args(pkg): else: default_library = "shared" - args = [ + return [ "-Dprefix={0}".format(pkg.prefix), # If we do not specify libdir explicitly, Meson chooses something # like lib/x86_64-linux-gnu, which causes problems when trying to @@ -163,8 +163,6 @@ def std_args(pkg): "-Dwrap_mode=nodownload", ] - return args - @property def build_dirname(self): """Returns the directory name to use when building the package.""" diff --git a/lib/spack/spack/build_systems/msbuild.py b/lib/spack/spack/build_systems/msbuild.py index 90c4018de8169e..4de8c86e0ac28c 100644 --- a/lib/spack/spack/build_systems/msbuild.py +++ b/lib/spack/spack/build_systems/msbuild.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/nmake.py b/lib/spack/spack/build_systems/nmake.py index 3349ff892966f7..b9148dcd9fbb18 100644 --- a/lib/spack/spack/build_systems/nmake.py +++ b/lib/spack/spack/build_systems/nmake.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/octave.py b/lib/spack/spack/build_systems/octave.py index ba0770812ee738..64958ce94179a9 100644 --- a/lib/spack/spack/build_systems/octave.py +++ b/lib/spack/spack/build_systems/octave.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/oneapi.py b/lib/spack/spack/build_systems/oneapi.py index 4c432c0cace6d6..f1e63761bc97b0 100644 --- a/lib/spack/spack/build_systems/oneapi.py +++ b/lib/spack/spack/build_systems/oneapi.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,9 +7,9 @@ import os import platform import shutil -from os.path import basename, dirname, isdir +from os.path import basename, isdir -from llnl.util.filesystem import find_headers, find_libraries, join_path, mkdirp +from llnl.util.filesystem import HeaderList, find_libraries, join_path, mkdirp from llnl.util.link_tree import LinkTree from spack.directives import conflicts, variant @@ -55,10 +55,21 @@ def component_dir(self): """Subdirectory for this component in the install prefix.""" raise NotImplementedError + @property + def v2_layout_versions(self): + """Version that implements the v2 directory layout.""" + raise NotImplementedError + + @property + def v2_layout(self): + """Returns true if this version implements the v2 directory layout.""" + return self.spec.satisfies(self.v2_layout_versions) + @property def component_prefix(self): """Path to component //.""" - return self.prefix.join(join_path(self.component_dir, self.spec.version)) + v = self.spec.version.up_to(2) if self.v2_layout else self.spec.version + return self.prefix.join(self.component_dir).join(str(v)) @property def env_script_args(self): @@ -112,8 +123,9 @@ def install_component(self, installer_path): shutil.rmtree("/var/intel/installercache", ignore_errors=True) # Some installers have a bug and do not return an error code when failing - if not isdir(join_path(self.prefix, self.component_dir)): - raise RuntimeError("install failed") + install_dir = self.component_prefix + if not isdir(install_dir): + raise RuntimeError("install failed to directory: {0}".format(install_dir)) def setup_run_environment(self, env): """Adds environment variables to the generated module file. @@ -128,7 +140,7 @@ def setup_run_environment(self, env): if "~envmods" not in self.spec: env.extend( EnvironmentModifications.from_sourcing_file( - join_path(self.component_prefix, "env", "vars.sh"), *self.env_script_args + self.component_prefix.env.join("vars.sh"), *self.env_script_args ) ) @@ -167,16 +179,40 @@ class IntelOneApiLibraryPackage(IntelOneApiPackage): """ + def header_directories(self, dirs): + h = HeaderList([]) + h.directories = dirs + return h + + @property + def headers(self): + return self.header_directories( + [self.component_prefix.include, self.component_prefix.include.join(self.component_dir)] + ) + + @property + def libs(self): + # for v2_layout all libraries are in the top level, v1 sometimes put them in intel64 + return find_libraries("*", root=self.component_prefix.lib, recursive=not self.v2_layout) + + +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 headers(self): - include_path = join_path(self.component_prefix, "include") - return find_headers("*", include_path, recursive=True) + return self.header_directories([self.component_prefix.sdk.include]) @property def libs(self): - lib_path = join_path(self.component_prefix, "lib", "intel64") - lib_path = lib_path if isdir(lib_path) else dirname(lib_path) - return find_libraries("*", root=lib_path, shared=True, recursive=True) + return find_libraries("*", self.component_prefix.sdk.lib64) class IntelOneApiStaticLibraryList: diff --git a/lib/spack/spack/build_systems/perl.py b/lib/spack/spack/build_systems/perl.py index 53787316c45d92..ff28bfe672a898 100644 --- a/lib/spack/spack/build_systems/perl.py +++ b/lib/spack/spack/build_systems/perl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,13 +10,12 @@ import spack.builder import spack.package_base from spack.directives import build_system, extends -from spack.package_base import PackageBase from spack.util.executable import Executable from ._checks import BaseBuilder, execute_build_time_tests -class PerlPackage(PackageBase): +class PerlPackage(spack.package_base.PackageBase): """Specialized class for packages that are built using Perl.""" #: This attribute is used in UI queries that need to know the build @@ -61,6 +60,30 @@ class PerlBuilder(BaseBuilder): #: Callback names for build-time test build_time_test_callbacks = ["check"] + @property + def build_method(self): + """Searches the package for either a Makefile.PL or Build.PL. + + Raises: + RuntimeError: if neither Makefile.PL nor Build.PL exist + """ + if os.path.isfile("Makefile.PL"): + build_method = "Makefile.PL" + elif os.path.isfile("Build.PL"): + build_method = "Build.PL" + else: + raise RuntimeError("Unknown build_method for perl package") + return build_method + + @property + def build_executable(self): + """Returns the executable method to build the perl package""" + if self.build_method == "Makefile.PL": + build_executable = inspect.getmodule(self.pkg).make + elif self.build_method == "Build.PL": + build_executable = Executable(os.path.join(self.pkg.stage.source_path, "Build")) + return build_executable + def configure_args(self): """List of arguments passed to :py:meth:`~.PerlBuilder.configure`. @@ -73,19 +96,7 @@ def configure(self, pkg, spec, prefix): """Run Makefile.PL or Build.PL with arguments consisting of an appropriate installation base directory followed by the list returned by :py:meth:`~.PerlBuilder.configure_args`. - - Raises: - RuntimeError: if neither Makefile.PL nor Build.PL exist """ - if os.path.isfile("Makefile.PL"): - self.build_method = "Makefile.PL" - self.build_executable = inspect.getmodule(self.pkg).make - elif os.path.isfile("Build.PL"): - self.build_method = "Build.PL" - self.build_executable = Executable(os.path.join(self.pkg.stage.source_path, "Build")) - else: - raise RuntimeError("Unknown build_method for perl package") - if self.build_method == "Makefile.PL": options = ["Makefile.PL", "INSTALL_BASE={0}".format(prefix)] elif self.build_method == "Build.PL": diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index 521994b1ec95f7..39dc7519e8c63e 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,13 +6,14 @@ import os import re import shutil -from typing import Optional +from typing import Iterable, List, Mapping, Optional import archspec import llnl.util.filesystem as fs import llnl.util.lang as lang import llnl.util.tty as tty +from llnl.util.filesystem import HeaderList, LibraryList import spack.builder import spack.config @@ -25,14 +26,18 @@ from spack.directives import build_system, depends_on, extends, maintainers from spack.error import NoHeadersError, NoLibrariesError from spack.install_test import test_part +from spack.spec import Spec +from spack.util.prefix import Prefix from ._checks import BaseBuilder, execute_install_time_tests -def _flatten_dict(dictionary): +def _flatten_dict(dictionary: Mapping[str, object]) -> Iterable[str]: """Iterable that yields KEY=VALUE paths through a dictionary. + Args: dictionary: Possibly nested dictionary of arbitrary keys and values. + Yields: A single path through the dictionary. """ @@ -50,7 +55,7 @@ class PythonExtension(spack.package_base.PackageBase): maintainers("adamjstewart") @property - def import_modules(self): + def import_modules(self) -> Iterable[str]: """Names of modules that the Python package provides. These are used to test whether or not the installation succeeded. @@ -65,7 +70,7 @@ def import_modules(self): detected, this property can be overridden by the package. Returns: - list: list of strings of module names + List of strings of module names. """ modules = [] pkg = self.spec["python"].package @@ -102,14 +107,14 @@ def import_modules(self): return modules @property - def skip_modules(self): + def skip_modules(self) -> Iterable[str]: """Names of modules that should be skipped when running tests. These are a subset of import_modules. If a module has submodules, they are skipped as well (meaning a.b is skipped if a is contained). Returns: - list: list of strings of module names + List of strings of module names. """ return [] @@ -185,12 +190,12 @@ def remove_files_from_view(self, view, merge_map): view.remove_files(to_remove) - def test_imports(self): + def test_imports(self) -> None: """Attempts to import modules of the installed package.""" # Make sure we are importing the installed modules, # not the ones in the source directory - python = inspect.getmodule(self).python + python = inspect.getmodule(self).python # type: ignore[union-attr] for module in self.import_modules: with test_part( self, @@ -315,24 +320,27 @@ class PythonPackage(PythonExtension): py_namespace: Optional[str] = None @lang.classproperty - def homepage(cls): + def homepage(cls) -> Optional[str]: # type: ignore[override] if cls.pypi: name = cls.pypi.split("/")[0] - return "https://pypi.org/project/" + name + "/" + return f"https://pypi.org/project/{name}/" + return None @lang.classproperty - def url(cls): + def url(cls) -> Optional[str]: if cls.pypi: - return "https://files.pythonhosted.org/packages/source/" + cls.pypi[0] + "/" + cls.pypi + return f"https://files.pythonhosted.org/packages/source/{cls.pypi[0]}/{cls.pypi}" + return None @lang.classproperty - def list_url(cls): + def list_url(cls) -> Optional[str]: # type: ignore[override] if cls.pypi: name = cls.pypi.split("/")[0] - return "https://pypi.org/simple/" + name + "/" + return f"https://pypi.org/simple/{name}/" + return None @property - def headers(self): + def headers(self) -> HeaderList: """Discover header files in platlib.""" # Remove py- prefix in package name @@ -350,7 +358,7 @@ def headers(self): raise NoHeadersError(msg.format(self.spec.name, include, platlib)) @property - def libs(self): + def libs(self) -> LibraryList: """Discover libraries in platlib.""" # Remove py- prefix in package name @@ -384,7 +392,7 @@ class PythonPipBuilder(BaseBuilder): install_time_test_callbacks = ["test"] @staticmethod - def std_args(cls): + def std_args(cls) -> List[str]: return [ # Verbose "-vvv", @@ -409,7 +417,7 @@ def std_args(cls): ] @property - def build_directory(self): + def build_directory(self) -> str: """The root directory of the Python package. This is usually the directory containing one of the following files: @@ -420,51 +428,51 @@ def build_directory(self): """ return self.pkg.stage.source_path - def config_settings(self, spec, prefix): + def config_settings(self, spec: Spec, prefix: Prefix) -> Mapping[str, object]: """Configuration settings to be passed to the PEP 517 build backend. Requires pip 22.1 or newer for keys that appear only a single time, or pip 23.1 or newer if the same key appears multiple times. Args: - spec (spack.spec.Spec): build spec - prefix (spack.util.prefix.Prefix): installation prefix + spec: Build spec. + prefix: Installation prefix. Returns: - dict: Possibly nested dictionary of KEY, VALUE settings + Possibly nested dictionary of KEY, VALUE settings. """ return {} - def install_options(self, spec, prefix): + def install_options(self, spec: Spec, prefix: Prefix) -> Iterable[str]: """Extra arguments to be supplied to the setup.py install command. Requires pip 23.0 or older. Args: - spec (spack.spec.Spec): build spec - prefix (spack.util.prefix.Prefix): installation prefix + spec: Build spec. + prefix: Installation prefix. Returns: - list: list of options + List of options. """ return [] - def global_options(self, spec, prefix): + def global_options(self, spec: Spec, prefix: Prefix) -> Iterable[str]: """Extra global options to be supplied to the setup.py call before the install or bdist_wheel command. Deprecated in pip 23.1. Args: - spec (spack.spec.Spec): build spec - prefix (spack.util.prefix.Prefix): installation prefix + spec: Build spec. + prefix: Installation prefix. Returns: - list: list of options + List of options. """ return [] - def install(self, pkg, spec, prefix): + def install(self, pkg: PythonPackage, spec: Spec, prefix: Prefix) -> None: """Install everything from build directory.""" args = PythonPipBuilder.std_args(pkg) + [f"--prefix={prefix}"] diff --git a/lib/spack/spack/build_systems/qmake.py b/lib/spack/spack/build_systems/qmake.py index 538054f3b05643..a1e679b50c609f 100644 --- a/lib/spack/spack/build_systems/qmake.py +++ b/lib/spack/spack/build_systems/qmake.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/r.py b/lib/spack/spack/build_systems/r.py index f2e7e095b7c7c4..5154f5a42dd3a4 100644 --- a/lib/spack/spack/build_systems/r.py +++ b/lib/spack/spack/build_systems/r.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/racket.py b/lib/spack/spack/build_systems/racket.py index 50c4944a5d7ccb..facac62032cf54 100644 --- a/lib/spack/spack/build_systems/racket.py +++ b/lib/spack/spack/build_systems/racket.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py index a1c6d661f50549..f6ea0537fd5a00 100644 --- a/lib/spack/spack/build_systems/rocm.py +++ b/lib/spack/spack/build_systems/rocm.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -108,6 +108,8 @@ class ROCmPackage(PackageBase): "gfx90a:xnack+", "gfx90c", "gfx940", + "gfx941", + "gfx942", "gfx1010", "gfx1011", "gfx1012", @@ -168,6 +170,8 @@ def hip_flags(amdgpu_target): depends_on("llvm-amdgpu@4.3.0:", when="amdgpu_target=gfx90a:xnack-") depends_on("llvm-amdgpu@4.3.0:", when="amdgpu_target=gfx90a:xnack+") depends_on("llvm-amdgpu@5.2.0:", when="amdgpu_target=gfx940") + depends_on("llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx941") + depends_on("llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx942") depends_on("llvm-amdgpu@4.5.0:", when="amdgpu_target=gfx1013") depends_on("llvm-amdgpu@3.8.0:", when="amdgpu_target=gfx1030") depends_on("llvm-amdgpu@3.9.0:", when="amdgpu_target=gfx1031") diff --git a/lib/spack/spack/build_systems/ruby.py b/lib/spack/spack/build_systems/ruby.py index ef99259f86d0ad..0f069e99f28fcc 100644 --- a/lib/spack/spack/build_systems/ruby.py +++ b/lib/spack/spack/build_systems/ruby.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/scons.py b/lib/spack/spack/build_systems/scons.py index a8adee8959a800..0d2ea175a12358 100644 --- a/lib/spack/spack/build_systems/scons.py +++ b/lib/spack/spack/build_systems/scons.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index 884c740d561d4f..5d93e23ac2d52d 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/sourceforge.py b/lib/spack/spack/build_systems/sourceforge.py index 35bb10e5bd18a9..76c9a059af12a9 100644 --- a/lib/spack/spack/build_systems/sourceforge.py +++ b/lib/spack/spack/build_systems/sourceforge.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/sourceware.py b/lib/spack/spack/build_systems/sourceware.py index d88a179dd3a226..f95c5c5a15d928 100644 --- a/lib/spack/spack/build_systems/sourceware.py +++ b/lib/spack/spack/build_systems/sourceware.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/waf.py b/lib/spack/spack/build_systems/waf.py index bf146cb350ea1b..0fd78d48da7ea7 100644 --- a/lib/spack/spack/build_systems/waf.py +++ b/lib/spack/spack/build_systems/waf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/build_systems/xorg.py b/lib/spack/spack/build_systems/xorg.py index 81de9aef866fa2..f4a9c2b372b890 100644 --- a/lib/spack/spack/build_systems/xorg.py +++ b/lib/spack/spack/build_systems/xorg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/builder.py b/lib/spack/spack/builder.py index ebd52ff101f832..4119062ab6bc55 100644 --- a/lib/spack/spack/builder.py +++ b/lib/spack/spack/builder.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/caches.py b/lib/spack/spack/caches.py index 14c7571f4832db..81a16ea5d8f2d4 100644 --- a/lib/spack/spack/caches.py +++ b/lib/spack/spack/caches.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index afad3b7a45197e..7c2f3f2eb6dbc8 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -46,7 +46,22 @@ from spack.reporters import CDash, CDashConfiguration from spack.reporters.cdash import build_stamp as cdash_build_stamp -JOB_RETRY_CONDITIONS = ["always"] +# See https://docs.gitlab.com/ee/ci/yaml/#retry for descriptions of conditions +JOB_RETRY_CONDITIONS = [ + # "always", + "unknown_failure", + "script_failure", + "api_failure", + "stuck_or_timeout_failure", + "runner_system_failure", + "runner_unsupported", + "stale_schedule", + # "job_execution_timeout", + "archived_failure", + "unmet_prerequisites", + "scheduler_failure", + "data_integrity_failure", +] TEMP_STORAGE_MIRROR_NAME = "ci_temporary_mirror" SPACK_RESERVED_TAGS = ["public", "protected", "notary"] @@ -1238,6 +1253,7 @@ def main_script_replacements(cmd): op=lambda cmd: cmd.replace("mirror_prefix", temp_storage_url_prefix), ) + cleanup_job["dependencies"] = [] output_object["cleanup"] = cleanup_job if ( @@ -1261,6 +1277,7 @@ def main_script_replacements(cmd): if buildcache_destination else remote_mirror_override or remote_mirror_url ) + signing_job["dependencies"] = [] output_object["sign-pkgs"] = signing_job @@ -1281,6 +1298,7 @@ def main_script_replacements(cmd): final_job["when"] = "always" final_job["retry"] = service_job_retries final_job["interruptible"] = True + final_job["dependencies"] = [] output_object["rebuild-index"] = final_job diff --git a/lib/spack/spack/ci_needs_workaround.py b/lib/spack/spack/ci_needs_workaround.py index 99597edb2e80f8..e026b5c4fdbca2 100644 --- a/lib/spack/spack/ci_needs_workaround.py +++ b/lib/spack/spack/ci_needs_workaround.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/ci_optimization.py b/lib/spack/spack/ci_optimization.py index bb9e5eec1600ad..7d799fc907e172 100644 --- a/lib/spack/spack/ci_optimization.py +++ b/lib/spack/spack/ci_optimization.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/__init__.py b/lib/spack/spack/cmd/__init__.py index c26ab181c10230..b30c6360d9fc5f 100644 --- a/lib/spack/spack/cmd/__init__.py +++ b/lib/spack/spack/cmd/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,10 +6,8 @@ import argparse import os import re -import shlex import sys -from textwrap import dedent -from typing import List, Match, Tuple +from typing import List, Union import llnl.string import llnl.util.tty as tty @@ -147,89 +145,37 @@ def get_command(cmd_name): return getattr(get_module(cmd_name), pname) -class _UnquotedFlags: - """Use a heuristic in `.extract()` to detect whether the user is trying to set - multiple flags like the docker ENV attribute allows (e.g. 'cflags=-Os -pipe'). +def quote_kvp(string: str) -> str: + """For strings like ``name=value`` or ``name==value``, quote and escape the value if needed. - If the heuristic finds a match (which can be checked with `__bool__()`), a warning - message explaining how to quote multiple flags correctly can be generated with - `.report()`. + This is a compromise to respect quoting of key-value pairs on the CLI. The shell + strips quotes from quoted arguments, so we cannot know *exactly* how CLI arguments + were quoted. To compensate, we re-add quotes around anything staritng with ``name=`` + or ``name==``, and we assume the rest of the argument is the value. This covers the + common cases of passign flags, e.g., ``cflags="-O2 -g"`` on the command line. """ + match = spack.parser.SPLIT_KVP.match(string) + if not match: + return string - flags_arg_pattern = re.compile( - r'^({0})=([^\'"].*)$'.format("|".join(spack.spec.FlagMap.valid_compiler_flags())) - ) + key, delim, value = match.groups() + return f"{key}{delim}{spack.parser.quote_if_needed(value)}" - def __init__(self, all_unquoted_flag_pairs: List[Tuple[Match[str], str]]): - self._flag_pairs = all_unquoted_flag_pairs - - def __bool__(self) -> bool: - return bool(self._flag_pairs) - - @classmethod - def extract(cls, sargs: str) -> "_UnquotedFlags": - all_unquoted_flag_pairs: List[Tuple[Match[str], str]] = [] - prev_flags_arg = None - for arg in shlex.split(sargs): - if prev_flags_arg is not None: - all_unquoted_flag_pairs.append((prev_flags_arg, arg)) - prev_flags_arg = cls.flags_arg_pattern.match(arg) - return cls(all_unquoted_flag_pairs) - - def report(self) -> str: - single_errors = [ - "({0}) {1} {2} => {3}".format( - i + 1, - match.group(0), - next_arg, - '{0}="{1} {2}"'.format(match.group(1), match.group(2), next_arg), - ) - for i, (match, next_arg) in enumerate(self._flag_pairs) - ] - return dedent( - """\ - Some compiler or linker flags were provided without quoting their arguments, - which now causes spack to try to parse the *next* argument as a spec component - such as a variant instead of an additional compiler or linker flag. If the - intent was to set multiple flags, try quoting them together as described below. - - Possible flag quotation errors (with the correctly-quoted version after the =>): - {0}""" - ).format("\n".join(single_errors)) - - -def parse_specs(args, **kwargs): + +def parse_specs( + args: Union[str, List[str]], concretize: bool = False, tests: bool = False +) -> List[spack.spec.Spec]: """Convenience function for parsing arguments from specs. Handles common exceptions and dies if there are errors. """ - concretize = kwargs.get("concretize", False) - normalize = kwargs.get("normalize", False) - tests = kwargs.get("tests", False) - - sargs = args - if not isinstance(args, str): - sargs = " ".join(args) - unquoted_flags = _UnquotedFlags.extract(sargs) + args = [args] if isinstance(args, str) else args + arg_string = " ".join([quote_kvp(arg) for arg in args]) - try: - specs = spack.parser.parse(sargs) - for spec in specs: - if concretize: - spec.concretize(tests=tests) # implies normalize - elif normalize: - spec.normalize(tests=tests) - return specs - - except spack.error.SpecError as e: - msg = e.message - if e.long_message: - msg += e.long_message - # Unquoted flags will be read as a variant or hash - if unquoted_flags and ("variant" in msg or "hash" in msg): - msg += "\n\n" - msg += unquoted_flags.report() - - raise spack.error.SpackError(msg) from e + specs = spack.parser.parse(arg_string) + for spec in specs: + if concretize: + spec.concretize(tests=tests) + return specs def matching_spec_from_env(spec): diff --git a/lib/spack/spack/cmd/add.py b/lib/spack/spack/cmd/add.py index 53544ad40a110c..c0b982868e6030 100644 --- a/lib/spack/spack/cmd/add.py +++ b/lib/spack/spack/cmd/add.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments +from spack.cmd.common import arguments description = "add a spec to an environment" section = "environments" diff --git a/lib/spack/spack/cmd/arch.py b/lib/spack/spack/cmd/arch.py index b1845cf19d30dd..56f597d778d1d4 100644 --- a/lib/spack/spack/cmd/arch.py +++ b/lib/spack/spack/cmd/arch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/audit.py b/lib/spack/spack/cmd/audit.py index 58d7a5362cf56d..c8cef494ef749b 100644 --- a/lib/spack/spack/cmd/audit.py +++ b/lib/spack/spack/cmd/audit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/blame.py b/lib/spack/spack/cmd/blame.py index c7e34904858dd1..af0126fb43adf7 100644 --- a/lib/spack/spack/cmd/blame.py +++ b/lib/spack/spack/cmd/blame.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/bootstrap.py b/lib/spack/spack/cmd/bootstrap.py index 71c3d3a04526e7..5221a980c78b3a 100644 --- a/lib/spack/spack/cmd/bootstrap.py +++ b/lib/spack/spack/cmd/bootstrap.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,13 +15,13 @@ import spack.bootstrap import spack.bootstrap.config import spack.bootstrap.core -import spack.cmd.common.arguments import spack.config import spack.main import spack.mirror import spack.spec import spack.stage import spack.util.path +from spack.cmd.common import arguments description = "manage bootstrap configuration" section = "system" @@ -68,12 +68,8 @@ def _add_scope_option(parser): - scopes = spack.config.scopes() parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - help="configuration scope to read/modify", + "--scope", action=arguments.ConfigScope, help="configuration scope to read/modify" ) @@ -106,7 +102,7 @@ def setup_parser(subparser): disable.add_argument("name", help="name of the source to be disabled", nargs="?", default=None) reset = sp.add_parser("reset", help="reset bootstrapping configuration to Spack defaults") - spack.cmd.common.arguments.add_common_arguments(reset, ["yes_to_all"]) + arguments.add_common_arguments(reset, ["yes_to_all"]) root = sp.add_parser("root", help="get/set the root bootstrap directory") _add_scope_option(root) diff --git a/lib/spack/spack/cmd/build_env.py b/lib/spack/spack/cmd/build_env.py index f5efca6e230484..2083b4a5b2673a 100644 --- a/lib/spack/spack/cmd/build_env.py +++ b/lib/spack/spack/cmd/build_env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/buildcache.py b/lib/spack/spack/cmd/buildcache.py index 94cce16030be32..46279cd06a3ccc 100644 --- a/lib/spack/spack/cmd/buildcache.py +++ b/lib/spack/spack/cmd/buildcache.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,13 +7,14 @@ import glob import hashlib import json +import multiprocessing import multiprocessing.pool import os import shutil import sys import tempfile import urllib.request -from typing import Dict, List, Optional, Tuple +from typing import Dict, List, Optional, Tuple, Union import llnl.util.tty as tty from llnl.string import plural @@ -21,7 +22,6 @@ import spack.binary_distribution as bindist import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.error @@ -38,8 +38,10 @@ import spack.util.crypto import spack.util.url as url_util import spack.util.web as web_util +from spack import traverse from spack.build_environment import determine_number_of_jobs from spack.cmd import display_specs +from spack.cmd.common import arguments from spack.oci.image import ( Digest, ImageReference, @@ -76,7 +78,19 @@ def setup_parser(subparser: argparse.ArgumentParser): ) push_sign = push.add_mutually_exclusive_group(required=False) push_sign.add_argument( - "--unsigned", "-u", action="store_true", help="push unsigned buildcache tarballs" + "--unsigned", + "-u", + action="store_false", + dest="signed", + default=None, + help="push unsigned buildcache tarballs", + ) + push_sign.add_argument( + "--signed", + action="store_true", + dest="signed", + default=None, + help="push signed buildcache tarballs", ) push_sign.add_argument( "--key", "-k", metavar="key", type=str, default=None, help="key for signing" @@ -110,7 +124,14 @@ def setup_parser(subparser: argparse.ArgumentParser): help="stop pushing on first failure (default is best effort)", ) push.add_argument( - "--base-image", default=None, help="specify the base image for the buildcache. " + "--base-image", default=None, help="specify the base image for the buildcache" + ) + push.add_argument( + "--tag", + "-t", + default=None, + help="when pushing to an OCI registry, tag an image containing all root specs and their " + "runtime dependencies", ) arguments.add_common_arguments(push, ["specs", "jobs"]) push.set_defaults(func=push_fn) @@ -182,23 +203,22 @@ def setup_parser(subparser: argparse.ArgumentParser): ) # used to construct scope arguments below - scopes = spack.config.scopes() - check.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope containing mirrors to check", ) - check_spec_or_specfile = check.add_mutually_exclusive_group(required=True) - check_spec_or_specfile.add_argument( + # Unfortunately there are 3 ways to do the same thing here: + check_specs = check.add_mutually_exclusive_group() + check_specs.add_argument( "-s", "--spec", help="check single spec instead of release specs file" ) - check_spec_or_specfile.add_argument( + check_specs.add_argument( "--spec-file", help="check single spec from json or yaml file instead of release specs file", ) + arguments.add_common_arguments(check, ["specs"]) check.set_defaults(func=check_fn) @@ -307,8 +327,30 @@ def _progress(i: int, total: int): return "" -def _make_pool(): - return multiprocessing.pool.Pool(determine_number_of_jobs(parallel=True)) +class NoPool: + def map(self, func, args): + return [func(a) for a in args] + + def starmap(self, func, args): + return [func(*a) for a in args] + + def __enter__(self): + return self + + def __exit__(self, *args): + pass + + +MaybePool = Union[multiprocessing.pool.Pool, NoPool] + + +def _make_pool() -> MaybePool: + """Can't use threading because it's unsafe, and can't use spawned processes because of globals. + That leaves only forking""" + if multiprocessing.get_start_method() == "fork": + return multiprocessing.pool.Pool(determine_number_of_jobs(parallel=True)) + else: + return NoPool() def push_fn(args): @@ -320,26 +362,36 @@ def push_fn(args): ) if args.specs or args.spec_file: - specs = _matching_specs(spack.cmd.parse_specs(args.specs or args.spec_file)) + roots = _matching_specs(spack.cmd.parse_specs(args.specs or args.spec_file)) else: - specs = spack.cmd.require_active_env("buildcache push").all_specs() + roots = spack.cmd.require_active_env(cmd_name="buildcache push").concrete_roots() if args.allow_root: tty.warn( "The flag `--allow-root` is the default in Spack 0.21, will be removed in Spack 0.22" ) + mirror: spack.mirror.Mirror = args.mirror + # Check if this is an OCI image. try: - image_ref = spack.oci.oci.image_from_mirror(args.mirror) + target_image = spack.oci.oci.image_from_mirror(mirror) except ValueError: - image_ref = None + target_image = None + + push_url = mirror.push_url + + # When neither --signed, --unsigned nor --key are specified, use the mirror's default. + if args.signed is None and not args.key: + unsigned = not mirror.signed + else: + unsigned = not (args.key or args.signed) # For OCI images, we require dependencies to be pushed for now. - if image_ref: + if target_image: if "dependencies" not in args.things_to_install: tty.die("Dependencies must be pushed for OCI images.") - if not args.unsigned: + if not unsigned: tty.warn( "Code signing is currently not supported for OCI images. " "Use --unsigned to silence this warning." @@ -347,26 +399,48 @@ def push_fn(args): # This is a list of installed, non-external specs. specs = bindist.specs_to_be_packaged( - specs, + roots, root="package" in args.things_to_install, dependencies="dependencies" in args.things_to_install, ) - url = args.mirror.push_url - # When pushing multiple specs, print the url once ahead of time, as well as how # many specs are being pushed. if len(specs) > 1: - tty.info(f"Selected {len(specs)} specs to push to {url}") + tty.info(f"Selected {len(specs)} specs to push to {push_url}") failed = [] # TODO: unify this logic in the future. - if image_ref: + if target_image: + base_image = ImageReference.from_string(args.base_image) if args.base_image else None with tempfile.TemporaryDirectory( dir=spack.stage.get_stage_root() ) as tmpdir, _make_pool() as pool: - skipped = _push_oci(args, image_ref, specs, tmpdir, pool) + skipped, base_images, checksums = _push_oci( + target_image=target_image, + base_image=base_image, + installed_specs_with_deps=specs, + force=args.force, + tmpdir=tmpdir, + pool=pool, + ) + + # Apart from creating manifests for each individual spec, we allow users to create a + # separate image tag for all root specs and their runtime dependencies. + if args.tag: + tagged_image = target_image.with_tag(args.tag) + # _push_oci may not populate base_images if binaries were already in the registry + for spec in roots: + _update_base_images( + base_image=base_image, + target_image=target_image, + spec=spec, + base_image_cache=base_images, + ) + _put_manifest(base_images, checksums, tagged_image, tmpdir, None, None, *roots) + tty.info(f"Tagged {tagged_image}") + else: skipped = [] @@ -374,10 +448,10 @@ def push_fn(args): try: bindist.push_or_raise( spec, - url, + push_url, bindist.PushOptions( force=args.force, - unsigned=args.unsigned, + unsigned=unsigned, key=args.key, regenerate_index=args.update_index, ), @@ -385,7 +459,7 @@ def push_fn(args): msg = f"{_progress(i, len(specs))}Pushed {_format_spec(spec)}" if len(specs) == 1: - msg += f" to {url}" + msg += f" to {push_url}" tty.info(msg) except bindist.NoOverwriteException: @@ -427,11 +501,11 @@ def push_fn(args): # Update the index if requested # TODO: remove update index logic out of bindist; should be once after all specs are pushed # not once per spec. - if image_ref and len(skipped) < len(specs) and args.update_index: + if target_image and len(skipped) < len(specs) and args.update_index: with tempfile.TemporaryDirectory( dir=spack.stage.get_stage_root() ) as tmpdir, _make_pool() as pool: - _update_index_oci(image_ref, tmpdir, pool) + _update_index_oci(target_image, tmpdir, pool) def _get_spack_binary_blob(image_ref: ImageReference) -> Optional[spack.oci.oci.Blob]: @@ -497,17 +571,21 @@ def _archspec_to_gooarch(spec: spack.spec.Spec) -> str: def _put_manifest( base_images: Dict[str, Tuple[dict, dict]], checksums: Dict[str, spack.oci.oci.Blob], - spec: spack.spec.Spec, image_ref: ImageReference, tmpdir: str, + extra_config: Optional[dict], + annotations: Optional[dict], + *specs: spack.spec.Spec, ): - architecture = _archspec_to_gooarch(spec) + architecture = _archspec_to_gooarch(specs[0]) dependencies = list( reversed( list( s - for s in spec.traverse(order="topo", deptype=("link", "run"), root=True) + for s in traverse.traverse_nodes( + specs, order="topo", deptype=("link", "run"), root=True + ) if not s.external ) ) @@ -516,7 +594,7 @@ def _put_manifest( base_manifest, base_config = base_images[architecture] env = _retrieve_env_dict_from_config(base_config) - spack.user_environment.environment_modifications_for_specs(spec).apply_modifications(env) + spack.user_environment.environment_modifications_for_specs(*specs).apply_modifications(env) # Create an oci.image.config file config = copy.deepcopy(base_config) @@ -528,20 +606,14 @@ def _put_manifest( # Set the environment variables config["config"]["Env"] = [f"{k}={v}" for k, v in env.items()] - # From the OCI v1.0 spec: - # > Any extra fields in the Image JSON struct are considered implementation - # > specific and MUST be ignored by any implementations which are unable to - # > interpret them. - # We use this to store the Spack spec, so we can use it to create an index. - spec_dict = spec.to_dict(hash=ht.dag_hash) - spec_dict["buildcache_layout_version"] = 1 - spec_dict["binary_cache_checksum"] = { - "hash_algorithm": "sha256", - "hash": checksums[spec.dag_hash()].compressed_digest.digest, - } - config.update(spec_dict) + if extra_config: + # From the OCI v1.0 spec: + # > Any extra fields in the Image JSON struct are considered implementation + # > specific and MUST be ignored by any implementations which are unable to + # > interpret them. + config.update(extra_config) - config_file = os.path.join(tmpdir, f"{spec.dag_hash()}.config.json") + config_file = os.path.join(tmpdir, f"{specs[0].dag_hash()}.config.json") with open(config_file, "w") as f: json.dump(config, f, separators=(",", ":")) @@ -572,48 +644,69 @@ def _put_manifest( for s in dependencies ), ], - "annotations": {"org.opencontainers.image.description": spec.format()}, } - image_ref_for_spec = image_ref.with_tag(default_tag(spec)) + if annotations: + oci_manifest["annotations"] = annotations # Finally upload the manifest - upload_manifest_with_retry(image_ref_for_spec, oci_manifest=oci_manifest) + upload_manifest_with_retry(image_ref, oci_manifest=oci_manifest) # delete the config file os.unlink(config_file) - return image_ref_for_spec + +def _update_base_images( + *, + base_image: Optional[ImageReference], + target_image: ImageReference, + spec: spack.spec.Spec, + base_image_cache: Dict[str, Tuple[dict, dict]], +): + """For a given spec and base image, copy the missing layers of the base image with matching + arch to the registry of the target image. If no base image is specified, create a dummy + manifest and config file.""" + architecture = _archspec_to_gooarch(spec) + if architecture in base_image_cache: + return + if base_image is None: + base_image_cache[architecture] = ( + default_manifest(), + default_config(architecture, "linux"), + ) + else: + base_image_cache[architecture] = copy_missing_layers_with_retry( + base_image, target_image, architecture + ) def _push_oci( - args, - image_ref: ImageReference, + *, + target_image: ImageReference, + base_image: Optional[ImageReference], installed_specs_with_deps: List[Spec], tmpdir: str, - pool: multiprocessing.pool.Pool, -) -> List[str]: + pool: MaybePool, + force: bool = False, +) -> Tuple[List[str], Dict[str, Tuple[dict, dict]], Dict[str, spack.oci.oci.Blob]]: """Push specs to an OCI registry Args: - args: The command line arguments. - image_ref: The image reference. + image_ref: The target OCI image + base_image: Optional base image, which will be copied to the target registry. installed_specs_with_deps: The installed specs to push, excluding externals, including deps, ordered from roots to leaves. + force: Whether to overwrite existing layers and manifests in the buildcache. Returns: - List[str]: The list of skipped specs (already in the buildcache). + A tuple consisting of the list of skipped specs already in the build cache, + a dictionary mapping architectures to base image manifests and configs, + and a dictionary mapping each spec's dag hash to a blob. """ # Reverse the order installed_specs_with_deps = list(reversed(installed_specs_with_deps)) - # The base image to use for the package. When not set, we use - # the OCI registry only for storage, and do not use any base image. - base_image_ref: Optional[ImageReference] = ( - ImageReference.from_string(args.base_image) if args.base_image else None - ) - # Spec dag hash -> blob checksums: Dict[str, spack.oci.oci.Blob] = {} @@ -623,11 +716,11 @@ def _push_oci( # Specs not uploaded because they already exist skipped = [] - if not args.force: + if not force: tty.info("Checking for existing specs in the buildcache") to_be_uploaded = [] - tags_to_check = (image_ref.with_tag(default_tag(s)) for s in installed_specs_with_deps) + tags_to_check = (target_image.with_tag(default_tag(s)) for s in installed_specs_with_deps) available_blobs = pool.map(_get_spack_binary_blob, tags_to_check) for spec, maybe_blob in zip(installed_specs_with_deps, available_blobs): @@ -640,46 +733,63 @@ def _push_oci( to_be_uploaded = installed_specs_with_deps if not to_be_uploaded: - return skipped + return skipped, base_images, checksums tty.info( - f"{len(to_be_uploaded)} specs need to be pushed to {image_ref.domain}/{image_ref.name}" + f"{len(to_be_uploaded)} specs need to be pushed to " + f"{target_image.domain}/{target_image.name}" ) # Upload blobs new_blobs = pool.starmap( - _push_single_spack_binary_blob, ((image_ref, spec, tmpdir) for spec in to_be_uploaded) + _push_single_spack_binary_blob, ((target_image, spec, tmpdir) for spec in to_be_uploaded) ) # And update the spec to blob mapping for spec, blob in zip(to_be_uploaded, new_blobs): checksums[spec.dag_hash()] = blob - # Copy base image layers, probably fine to do sequentially. + # Copy base images if necessary for spec in to_be_uploaded: - architecture = _archspec_to_gooarch(spec) - # Get base image details, if we don't have them yet - if architecture in base_images: - continue - if base_image_ref is None: - base_images[architecture] = (default_manifest(), default_config(architecture, "linux")) - else: - base_images[architecture] = copy_missing_layers_with_retry( - base_image_ref, image_ref, architecture - ) + _update_base_images( + base_image=base_image, + target_image=target_image, + spec=spec, + base_image_cache=base_images, + ) + + def extra_config(spec: Spec): + spec_dict = spec.to_dict(hash=ht.dag_hash) + spec_dict["buildcache_layout_version"] = 1 + spec_dict["binary_cache_checksum"] = { + "hash_algorithm": "sha256", + "hash": checksums[spec.dag_hash()].compressed_digest.digest, + } + return spec_dict # Upload manifests tty.info("Uploading manifests") - pushed_image_ref = pool.starmap( + pool.starmap( _put_manifest, - ((base_images, checksums, spec, image_ref, tmpdir) for spec in to_be_uploaded), + ( + ( + base_images, + checksums, + target_image.with_tag(default_tag(spec)), + tmpdir, + extra_config(spec), + {"org.opencontainers.image.description": spec.format()}, + spec, + ) + for spec in to_be_uploaded + ), ) # Print the image names of the top-level specs - for spec, ref in zip(to_be_uploaded, pushed_image_ref): - tty.info(f"Pushed {_format_spec(spec)} to {ref}") + for spec in to_be_uploaded: + tty.info(f"Pushed {_format_spec(spec)} to {target_image.with_tag(default_tag(spec))}") - return skipped + return skipped, base_images, checksums def _config_from_tag(image_ref: ImageReference, tag: str) -> Optional[dict]: @@ -692,11 +802,10 @@ def _config_from_tag(image_ref: ImageReference, tag: str) -> Optional[dict]: return config if "spec" in config else None -def _update_index_oci( - image_ref: ImageReference, tmpdir: str, pool: multiprocessing.pool.Pool -) -> None: - response = spack.oci.opener.urlopen(urllib.request.Request(url=image_ref.tags_url())) - spack.oci.opener.ensure_status(response, 200) +def _update_index_oci(image_ref: ImageReference, tmpdir: str, pool: MaybePool) -> None: + request = urllib.request.Request(url=image_ref.tags_url()) + response = spack.oci.opener.urlopen(request) + spack.oci.opener.ensure_status(request, response, 200) tags = json.load(response)["tags"] # Fetch all image config files in parallel @@ -816,15 +925,24 @@ def check_fn(args: argparse.Namespace): exit code is non-zero, then at least one of the indicated specs needs to be rebuilt """ if args.spec_file: + specs_arg = ( + args.spec_file if os.path.sep in args.spec_file else os.path.join(".", args.spec_file) + ) tty.warn( "The flag `--spec-file` is deprecated and will be removed in Spack 0.22. " - "Use --spec instead." + f"Use `spack buildcache check {specs_arg}` instead." ) + elif args.spec: + specs_arg = args.spec + tty.warn( + "The flag `--spec` is deprecated and will be removed in Spack 0.23. " + f"Use `spack buildcache check {specs_arg}` instead." + ) + else: + specs_arg = args.specs - specs = spack.cmd.parse_specs(args.spec or args.spec_file) - - if specs: - specs = _matching_specs(specs) + if specs_arg: + specs = _matching_specs(spack.cmd.parse_specs(specs_arg)) else: specs = spack.cmd.require_active_env("buildcache check").all_specs() diff --git a/lib/spack/spack/cmd/cd.py b/lib/spack/spack/cmd/cd.py index f85be7f2d86c6a..237eb2b51340e1 100644 --- a/lib/spack/spack/cmd/cd.py +++ b/lib/spack/spack/cmd/cd.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/change.py b/lib/spack/spack/cmd/change.py index 0a57cb6da5b5be..9807d5cc55786c 100644 --- a/lib/spack/spack/cmd/change.py +++ b/lib/spack/spack/cmd/change.py @@ -1,10 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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.cmd -import spack.cmd.common.arguments as arguments +from spack.cmd.common import arguments description = "change an existing spec in an environment" section = "environments" diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py index f927d2d922a26d..e3e9c1a30807c0 100644 --- a/lib/spack/spack/cmd/checksum.py +++ b/lib/spack/spack/cmd/checksum.py @@ -1,10 +1,11 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 re import sys +from typing import Dict, Optional import llnl.string import llnl.util.lang @@ -17,10 +18,15 @@ import spack.util.crypto import spack.util.web as web_util from spack.cmd.common import arguments -from spack.package_base import PackageBase, deprecated_version, preferred_version +from spack.package_base import ( + ManualDownloadRequiredError, + PackageBase, + deprecated_version, + preferred_version, +) from spack.util.editor import editor from spack.util.format import get_version_lines -from spack.version import Version +from spack.version import StandardVersion, Version description = "checksum available versions of a package" section = "packaging" @@ -84,28 +90,30 @@ def checksum(parser, args): spec = spack.spec.Spec(args.package) # Get the package we're going to generate checksums for - pkg = spack.repo.PATH.get_pkg_class(spec.name)(spec) + pkg: PackageBase = spack.repo.PATH.get_pkg_class(spec.name)(spec) - versions = [Version(v) for v in args.versions] + # Skip manually downloaded packages + if pkg.manual_download: + raise ManualDownloadRequiredError(pkg.download_instr) - # Define placeholder for remote versions. - # This'll help reduce redundant work if we need to check for the existance - # of remote versions more than once. - remote_versions = None + versions = [StandardVersion.from_string(v) for v in args.versions] + + # Define placeholder for remote versions. This'll help reduce redundant work if we need to + # check for the existence of remote versions more than once. + remote_versions: Optional[Dict[StandardVersion, str]] = None # Add latest version if requested if args.latest: - remote_versions = pkg.fetch_remote_versions(args.jobs) + remote_versions = pkg.fetch_remote_versions(concurrency=args.jobs) if len(remote_versions) > 0: - latest_version = sorted(remote_versions.keys(), reverse=True)[0] - versions.append(latest_version) + versions.append(max(remote_versions.keys())) - # Add preferred version if requested + # Add preferred version if requested (todo: exclude git versions) if args.preferred: versions.append(preferred_version(pkg)) # Store a dict of the form version -> URL - url_dict = {} + url_dict: Dict[StandardVersion, str] = {} for version in versions: if deprecated_version(pkg, version): @@ -115,16 +123,16 @@ def checksum(parser, args): if url is not None: url_dict[version] = url continue - # if we get here, it's because no valid url was provided by the package - # do expensive fallback to try to recover + # If we get here, it's because no valid url was provided by the package. Do expensive + # fallback to try to recover if remote_versions is None: - remote_versions = pkg.fetch_remote_versions(args.jobs) + remote_versions = pkg.fetch_remote_versions(concurrency=args.jobs) if version in remote_versions: url_dict[version] = remote_versions[version] if len(versions) <= 0: if remote_versions is None: - remote_versions = pkg.fetch_remote_versions(args.jobs) + remote_versions = pkg.fetch_remote_versions(concurrency=args.jobs) url_dict = remote_versions # A spidered URL can differ from the package.py *computed* URL, pointing to different tarballs. diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py index 6c573193026fbf..1b0eab888c761f 100644 --- a/lib/spack/spack/cmd/ci.py +++ b/lib/spack/spack/cmd/ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,7 @@ import spack.cmd.buildcache as buildcache import spack.config as cfg import spack.environment as ev +import spack.environment.depfile import spack.hash_types as ht import spack.mirror import spack.util.gpg as gpg_util @@ -606,7 +607,9 @@ def ci_rebuild(args): "SPACK_INSTALL_FLAGS={}".format(args_to_string(deps_install_args)), "-j$(nproc)", "install-deps/{}".format( - ev.depfile.MakefileSpec(job_spec).safe_format("{name}-{version}-{hash}") + spack.environment.depfile.MakefileSpec(job_spec).safe_format( + "{name}-{version}-{hash}" + ) ), ], spack_cmd + ["install"] + root_install_args, diff --git a/lib/spack/spack/cmd/clean.py b/lib/spack/spack/cmd/clean.py index 5a1831cda5a43d..3a9a7f32abc546 100644 --- a/lib/spack/spack/cmd/clean.py +++ b/lib/spack/spack/cmd/clean.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,13 @@ import spack.bootstrap import spack.caches -import spack.cmd.common.arguments as arguments import spack.cmd.test import spack.config import spack.repo import spack.stage import spack.store import spack.util.path +from spack.cmd.common import arguments from spack.paths import lib_path, var_path description = "remove temporary build files and/or downloaded archives" diff --git a/lib/spack/spack/cmd/clone.py b/lib/spack/spack/cmd/clone.py index ade3c2a7390658..21ab0f8791ca41 100644 --- a/lib/spack/spack/cmd/clone.py +++ b/lib/spack/spack/cmd/clone.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/commands.py b/lib/spack/spack/cmd/commands.py index 25e1a24d0077d0..f9979339edb644 100644 --- a/lib/spack/spack/cmd/commands.py +++ b/lib/spack/spack/cmd/commands.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/common/__init__.py b/lib/spack/spack/cmd/common/__init__.py index 51329a1b6c3241..d530bd61769709 100644 --- a/lib/spack/spack/cmd/common/__init__.py +++ b/lib/spack/spack/cmd/common/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index 9aa3edac479f50..12f9e5b0d70c50 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -67,12 +67,13 @@ class ConstraintAction(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): # Query specs from command line - self.values = values - namespace.constraint = values + self.constraint = namespace.constraint = values + self.constraint_specs = namespace.constraint_specs = [] namespace.specs = self._specs def _specs(self, **kwargs): - qspecs = spack.cmd.parse_specs(self.values) + # store parsed specs in spec.constraint after a call to specs() + self.constraint_specs[:] = spack.cmd.parse_specs(self.constraint) # If an environment is provided, we'll restrict the search to # only its installed packages. @@ -81,12 +82,12 @@ def _specs(self, **kwargs): kwargs["hashes"] = set(env.all_hashes()) # return everything for an empty query. - if not qspecs: + if not self.constraint_specs: return spack.store.STORE.db.query(**kwargs) # Return only matching stuff otherwise. specs = {} - for spec in qspecs: + for spec in self.constraint_specs: for s in spack.store.STORE.db.query(spec, **kwargs): # This is fast for already-concrete specs specs[s.dag_hash()] = s @@ -124,6 +125,33 @@ def __call__(self, parser, namespace, values, option_string=None): setattr(namespace, self.dest, deptype) +class ConfigScope(argparse.Action): + """Pick the currently configured config scopes.""" + + def __init__(self, *args, **kwargs) -> None: + kwargs.setdefault("metavar", spack.config.SCOPES_METAVAR) + super().__init__(*args, **kwargs) + + @property + def default(self): + return self._default() if callable(self._default) else self._default + + @default.setter + def default(self, value): + self._default = value + + @property + def choices(self): + return spack.config.scopes().keys() + + @choices.setter + def choices(self, value): + pass + + def __call__(self, parser, namespace, values, option_string=None): + setattr(namespace, self.dest, values) + + def _cdash_reporter(namespace): """Helper function to create a CDash reporter. This function gets an early reference to the argparse namespace under construction, so it can later use it to create the object. @@ -357,10 +385,11 @@ def install_status(): "--install-status", action="store_true", default=True, - help="show install status of packages\n\npackages can be: " - "installed [+], missing and needed by an installed package [-], " - "installed in an upstream instance [^], " - "or not installed (no annotation)", + help=( + "show install status of packages\n" + "[+] installed [^] installed in an upstream\n" + " - not installed [-] missing dep of installed package\n" + ), ) diff --git a/lib/spack/spack/cmd/common/confirmation.py b/lib/spack/spack/cmd/common/confirmation.py index 8a5cd2592b44e9..8033e776b9ba07 100644 --- a/lib/spack/spack/cmd/common/confirmation.py +++ b/lib/spack/spack/cmd/common/confirmation.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,10 +21,11 @@ def confirm_action(specs: List[spack.spec.Spec], participle: str, noun: str): participle: action expressed as a participle, e.g. "uninstalled" noun: action expressed as a noun, e.g. "uninstallation" """ - tty.msg(f"The following {len(specs)} packages will be {participle}:\n") spack.cmd.display_specs(specs, **display_args) - print("") - answer = tty.get_yes_or_no("Do you want to proceed?", default=False) + print() + answer = tty.get_yes_or_no( + f"{len(specs)} packages will be {participle}. Do you want to proceed?", default=False + ) if not answer: tty.msg(f"Aborting {noun}") sys.exit(0) diff --git a/lib/spack/spack/cmd/common/env_utility.py b/lib/spack/spack/cmd/common/env_utility.py index b8a6338d924f83..1d04e199d9cced 100644 --- a/lib/spack/spack/cmd/common/env_utility.py +++ b/lib/spack/spack/cmd/common/env_utility.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,13 +8,13 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.deptypes as dt import spack.error import spack.paths import spack.spec import spack.store from spack import build_environment, traverse +from spack.cmd.common import arguments from spack.context import Context from spack.util.environment import dump_environment, pickle_environment diff --git a/lib/spack/spack/cmd/compiler.py b/lib/spack/spack/cmd/compiler.py index 76eb8d31508a67..006c6a79a75d9c 100644 --- a/lib/spack/spack/cmd/compiler.py +++ b/lib/spack/spack/cmd/compiler.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,7 @@ import spack.compilers import spack.config import spack.spec +from spack.cmd.common import arguments description = "manage compilers" section = "system" @@ -23,8 +24,6 @@ def setup_parser(subparser): sp = subparser.add_subparsers(metavar="SUBCOMMAND", dest="compiler_command") - scopes = spack.config.scopes() - # Find find_parser = sp.add_parser( "find", @@ -47,9 +46,8 @@ def setup_parser(subparser): find_parser.add_argument("add_paths", nargs=argparse.REMAINDER) find_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope("compilers"), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope("compilers"), help="configuration scope to modify", ) @@ -60,32 +58,20 @@ def setup_parser(subparser): ) remove_parser.add_argument("compiler_spec") remove_parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=None, - help="configuration scope to modify", + "--scope", action=arguments.ConfigScope, default=None, help="configuration scope to modify" ) # List list_parser = sp.add_parser("list", help="list available compilers") list_parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_list_scope(), - help="configuration scope to read from", + "--scope", action=arguments.ConfigScope, help="configuration scope to read from" ) # Info info_parser = sp.add_parser("info", help="show compiler paths") info_parser.add_argument("compiler_spec") info_parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_list_scope(), - help="configuration scope to read from", + "--scope", action=arguments.ConfigScope, help="configuration scope to read from" ) diff --git a/lib/spack/spack/cmd/compilers.py b/lib/spack/spack/cmd/compilers.py index 6d0ff43ea2e88d..f38c958539ab7d 100644 --- a/lib/spack/spack/cmd/compilers.py +++ b/lib/spack/spack/cmd/compilers.py @@ -1,9 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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.config +from spack.cmd.common import arguments from spack.cmd.compiler import compiler_list description = "list available compilers" @@ -12,13 +12,8 @@ def setup_parser(subparser): - scopes = spack.config.scopes() - subparser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - help="configuration scope to read/modify", + "--scope", action=arguments.ConfigScope, help="configuration scope to read/modify" ) diff --git a/lib/spack/spack/cmd/concretize.py b/lib/spack/spack/cmd/concretize.py index 47cccef9ba2bbf..e07c0eb18ccfd4 100644 --- a/lib/spack/spack/cmd/concretize.py +++ b/lib/spack/spack/cmd/concretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py index 14514400a86ceb..61b27bcdfe7f2d 100644 --- a/lib/spack/spack/cmd/config.py +++ b/lib/spack/spack/cmd/config.py @@ -1,16 +1,16 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 collections import os import shutil +import sys from typing import List import llnl.util.filesystem as fs import llnl.util.tty as tty -import spack.cmd.common.arguments import spack.config import spack.environment as ev import spack.repo @@ -18,6 +18,7 @@ import spack.schema.packages import spack.store import spack.util.spack_yaml as syaml +from spack.cmd.common import arguments from spack.util.editor import editor description = "get and set configuration options" @@ -26,14 +27,9 @@ def setup_parser(subparser): - scopes = spack.config.scopes() - # User can only choose one subparser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - help="configuration scope to read/modify", + "--scope", action=arguments.ConfigScope, help="configuration scope to read/modify" ) sp = subparser.add_subparsers(metavar="SUBCOMMAND", dest="config_command") @@ -53,6 +49,7 @@ def setup_parser(subparser): blame_parser.add_argument( "section", help="configuration section to print\n\noptions: %(choices)s", + nargs="?", metavar="section", choices=spack.config.SECTION_SCHEMAS, ) @@ -79,6 +76,10 @@ def setup_parser(subparser): ) add_parser.add_argument("-f", "--file", help="file from which to set all config values") + change_parser = sp.add_parser("change", help="swap variants etc. on specs in config") + change_parser.add_argument("path", help="colon-separated path to config section with specs") + change_parser.add_argument("--match-spec", help="only change constraints that match this") + prefer_upstream_parser = sp.add_parser( "prefer-upstream", help="set package preferences from upstream" ) @@ -101,13 +102,13 @@ def setup_parser(subparser): setup_parser.add_parser = add_parser update = sp.add_parser("update", help="update configuration files to the latest format") - spack.cmd.common.arguments.add_common_arguments(update, ["yes_to_all"]) + arguments.add_common_arguments(update, ["yes_to_all"]) update.add_argument("section", help="section to update") revert = sp.add_parser( "revert", help="revert configuration files to their state before update" ) - spack.cmd.common.arguments.add_common_arguments(revert, ["yes_to_all"]) + arguments.add_common_arguments(revert, ["yes_to_all"]) revert.add_argument("section", help="section to update") @@ -121,7 +122,7 @@ def _get_scope_and_section(args): if not section and not scope: env = ev.active_environment() if env: - scope = env.env_file_config_scope_name() + scope = env.scope_name # set scope defaults elif not scope: @@ -136,32 +137,50 @@ def _get_scope_and_section(args): return scope, section +def print_configuration(args, *, blame: bool) -> None: + if args.scope and args.section is None: + tty.die(f"the argument --scope={args.scope} requires specifying a section.") + + if args.section is not None: + spack.config.CONFIG.print_section(args.section, blame=blame, scope=args.scope) + return + + print_flattened_configuration(blame=blame) + + +def print_flattened_configuration(*, blame: bool) -> None: + """Prints to stdout a flattened version of the configuration. + + Args: + blame: if True, shows file provenance for each entry in the configuration. + """ + env = ev.active_environment() + if env is not None: + pristine = env.manifest.pristine_yaml_content + flattened = pristine.copy() + flattened[spack.schema.env.TOP_LEVEL_KEY] = pristine[spack.schema.env.TOP_LEVEL_KEY].copy() + else: + flattened = syaml.syaml_dict() + flattened[spack.schema.env.TOP_LEVEL_KEY] = syaml.syaml_dict() + + for config_section in spack.config.SECTION_SCHEMAS: + current = spack.config.get(config_section) + flattened[spack.schema.env.TOP_LEVEL_KEY][config_section] = current + syaml.dump_config(flattened, stream=sys.stdout, default_flow_style=False, blame=blame) + + def config_get(args): """Dump merged YAML configuration for a specific section. With no arguments and an active environment, print the contents of the environment's manifest file (spack.yaml). """ - scope, section = _get_scope_and_section(args) - - if section is not None: - spack.config.CONFIG.print_section(section) - - elif scope and scope.startswith("env:"): - config_file = spack.config.CONFIG.get_config_filename(scope, section) - if os.path.exists(config_file): - with open(config_file) as f: - print(f.read()) - else: - tty.die("environment has no %s file" % ev.manifest_name) - - else: - tty.die("`spack config get` requires a section argument or an active environment.") + print_configuration(args, blame=False) def config_blame(args): """Print out line-by-line blame of merged YAML.""" - spack.config.CONFIG.print_section(args.section, blame=True) + print_configuration(args, blame=True) def config_edit(args): @@ -248,6 +267,98 @@ def _can_update_config_file(scope: spack.config.ConfigScope, cfg_file): return fs.can_write_to_dir(scope.path) and fs.can_access(cfg_file) +def _config_change_requires_scope(path, spec, scope, match_spec=None): + """Return whether or not anything changed.""" + require = spack.config.get(path, scope=scope) + if not require: + return False + + changed = False + + def override_cfg_spec(spec_str): + nonlocal changed + + init_spec = spack.spec.Spec(spec_str) + # Overridden spec cannot be anonymous + init_spec.name = spec.name + if match_spec and not init_spec.satisfies(match_spec): + # If there is a match_spec, don't change constraints that + # don't match it + return spec_str + elif not init_spec.intersects(spec): + changed = True + return str(spack.spec.Spec.override(init_spec, spec)) + else: + # Don't override things if they intersect, otherwise we'd + # be e.g. attaching +debug to every single version spec + return spec_str + + if isinstance(require, str): + new_require = override_cfg_spec(require) + else: + new_require = [] + for item in require: + if "one_of" in item: + item["one_of"] = [override_cfg_spec(x) for x in item["one_of"]] + elif "any_of" in item: + item["any_of"] = [override_cfg_spec(x) for x in item["any_of"]] + elif "spec" in item: + item["spec"] = override_cfg_spec(item["spec"]) + elif isinstance(item, str): + item = override_cfg_spec(item) + else: + raise ValueError(f"Unexpected requirement: ({type(item)}) {str(item)}") + new_require.append(item) + + spack.config.set(path, new_require, scope=scope) + return changed + + +def _config_change(config_path, match_spec_str=None): + all_components = spack.config.process_config_path(config_path) + key_components = all_components[:-1] + key_path = ":".join(key_components) + + spec = spack.spec.Spec(syaml.syaml_str(all_components[-1])) + + match_spec = None + if match_spec_str: + match_spec = spack.spec.Spec(match_spec_str) + + if key_components[-1] == "require": + # Extract the package name from the config path, which allows + # args.spec to be anonymous if desired + pkg_name = key_components[1] + spec.name = pkg_name + + changed = False + for scope in spack.config.writable_scope_names(): + changed |= _config_change_requires_scope(key_path, spec, scope, match_spec=match_spec) + + if not changed: + existing_requirements = spack.config.get(key_path) + if isinstance(existing_requirements, str): + raise spack.config.ConfigError( + "'config change' needs to append a requirement," + " but existing require: config is not a list" + ) + + ideal_scope_to_modify = None + for scope in spack.config.writable_scope_names(): + if spack.config.get(key_path, scope=scope): + ideal_scope_to_modify = scope + break + + update_path = f"{key_path}:[{str(spec)}]" + spack.config.add(update_path, scope=ideal_scope_to_modify) + else: + raise ValueError("'config change' can currently only change 'require' sections") + + +def config_change(args): + _config_change(args.path, args.match_spec) + + def config_update(args): # Read the configuration files spack.config.CONFIG.get_config(args.section, scope=args.scope) @@ -475,5 +586,6 @@ def config(parser, args): "update": config_update, "revert": config_revert, "prefer-upstream": config_prefer_upstream, + "change": config_change, } action[args.config_command](args) diff --git a/lib/spack/spack/cmd/containerize.py b/lib/spack/spack/cmd/containerize.py index b34b7783b68829..abb13d68c19bc4 100644 --- a/lib/spack/spack/cmd/containerize.py +++ b/lib/spack/spack/cmd/containerize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index 946e9bc8b960d3..49f4ae217786e5 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,7 +27,7 @@ package_template = '''\ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -64,8 +64,9 @@ class {class_name}({base_class_name}): # maintainers("github_user1", "github_user2") # FIXME: Add the SPDX identifier of the project's license below. - # See https://spdx.org/licenses/ for a list. - license("UNKNOWN") + # See https://spdx.org/licenses/ for a list. Upon manually verifying + # the license, set checked_by to your Github username. + license("UNKNOWN", checked_by="github_user1") {versions} @@ -172,6 +173,14 @@ def configure_args(self): return args""" +class CargoPackageTemplate(PackageTemplate): + """Provides appropriate overrides for cargo-based packages""" + + base_class_name = "CargoPackage" + + body_def = "" + + class CMakePackageTemplate(PackageTemplate): """Provides appropriate overrides for CMake-based packages""" @@ -186,6 +195,14 @@ def cmake_args(self): return args""" +class GoPackageTemplate(PackageTemplate): + """Provides appropriate overrides for Go-module-based packages""" + + base_class_name = "GoPackage" + + body_def = "" + + class LuaPackageTemplate(PackageTemplate): """Provides appropriate overrides for LuaRocks-based packages""" @@ -575,28 +592,30 @@ def __init__(self, name, *args, **kwargs): templates = { - "autotools": AutotoolsPackageTemplate, "autoreconf": AutoreconfPackageTemplate, - "cmake": CMakePackageTemplate, + "autotools": AutotoolsPackageTemplate, + "bazel": BazelPackageTemplate, "bundle": BundlePackageTemplate, - "qmake": QMakePackageTemplate, + "cargo": CargoPackageTemplate, + "cmake": CMakePackageTemplate, + "generic": PackageTemplate, + "go": GoPackageTemplate, + "intel": IntelPackageTemplate, + "lua": LuaPackageTemplate, + "makefile": MakefilePackageTemplate, "maven": MavenPackageTemplate, - "scons": SconsPackageTemplate, - "waf": WafPackageTemplate, - "bazel": BazelPackageTemplate, + "meson": MesonPackageTemplate, + "octave": OctavePackageTemplate, + "perlbuild": PerlbuildPackageTemplate, + "perlmake": PerlmakePackageTemplate, "python": PythonPackageTemplate, + "qmake": QMakePackageTemplate, "r": RPackageTemplate, "racket": RacketPackageTemplate, - "perlmake": PerlmakePackageTemplate, - "perlbuild": PerlbuildPackageTemplate, - "octave": OctavePackageTemplate, "ruby": RubyPackageTemplate, - "makefile": MakefilePackageTemplate, - "intel": IntelPackageTemplate, - "meson": MesonPackageTemplate, - "lua": LuaPackageTemplate, + "scons": SconsPackageTemplate, "sip": SIPPackageTemplate, - "generic": PackageTemplate, + "waf": WafPackageTemplate, } @@ -679,6 +698,8 @@ def __call__(self, stage, url): clues = [ (r"/CMakeLists\.txt$", "cmake"), (r"/NAMESPACE$", "r"), + (r"/Cargo\.toml$", "cargo"), + (r"/go\.mod$", "go"), (r"/configure$", "autotools"), (r"/configure\.(in|ac)$", "autoreconf"), (r"/Makefile\.am$", "autoreconf"), diff --git a/lib/spack/spack/cmd/debug.py b/lib/spack/spack/cmd/debug.py index 7f729ad83eb114..1c9fb214f41fa9 100644 --- a/lib/spack/spack/cmd/debug.py +++ b/lib/spack/spack/cmd/debug.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/deconcretize.py b/lib/spack/spack/cmd/deconcretize.py index dbcf72ea8b3a29..ffb05eebe71ffa 100644 --- a/lib/spack/spack/cmd/deconcretize.py +++ b/lib/spack/spack/cmd/deconcretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,10 +10,10 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.cmd.common.confirmation as confirmation import spack.environment as ev import spack.spec +from spack.cmd.common import arguments description = "remove specs from the concretized lockfile of an environment" section = "environments" diff --git a/lib/spack/spack/cmd/dependencies.py b/lib/spack/spack/cmd/dependencies.py index ed85d47d2266d0..676da2f089f8f5 100644 --- a/lib/spack/spack/cmd/dependencies.py +++ b/lib/spack/spack/cmd/dependencies.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,11 +9,11 @@ from llnl.util.tty.colify import colify import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.package_base import spack.repo import spack.store +from spack.cmd.common import arguments description = "show dependencies of a package" section = "basic" diff --git a/lib/spack/spack/cmd/dependents.py b/lib/spack/spack/cmd/dependents.py index 733feaf71559b9..4cbb7cdd3cdc51 100644 --- a/lib/spack/spack/cmd/dependents.py +++ b/lib/spack/spack/cmd/dependents.py @@ -1,18 +1,19 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 collections import sys import llnl.util.tty as tty from llnl.util.tty.colify import colify import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.repo import spack.store +from spack.cmd.common import arguments description = "show packages that depend on another" section = "basic" @@ -49,15 +50,25 @@ def inverted_dependencies(): dag = {} for pkg_cls in spack.repo.PATH.all_package_classes(): dag.setdefault(pkg_cls.name, set()) - for dep in pkg_cls.dependencies: + for dep in pkg_cls.dependencies_by_name(): deps = [dep] # expand virtuals if necessary if spack.repo.PATH.is_virtual(dep): deps += [s.name for s in spack.repo.PATH.providers_for(dep)] - for d in deps: - dag.setdefault(d, set()).add(pkg_cls.name) + dag = collections.defaultdict(set) + for pkg_cls in spack.repo.PATH.all_package_classes(): + for _, deps_by_name in pkg_cls.dependencies.items(): + for dep in deps_by_name: + deps = [dep] + + # expand virtuals if necessary + if spack.repo.PATH.is_virtual(dep): + deps += [s.name for s in spack.repo.PATH.providers_for(dep)] + + for d in deps: + dag[d].add(pkg_cls.name) return dag diff --git a/lib/spack/spack/cmd/deprecate.py b/lib/spack/spack/cmd/deprecate.py index dca9b49756b501..dd61b0915ba49d 100644 --- a/lib/spack/spack/cmd/deprecate.py +++ b/lib/spack/spack/cmd/deprecate.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,9 +20,9 @@ from llnl.util.symlink import symlink import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.store +from spack.cmd.common import arguments from spack.database import InstallStatuses from spack.error import SpackError diff --git a/lib/spack/spack/cmd/dev_build.py b/lib/spack/spack/cmd/dev_build.py index 90008c8b3ef601..fbd8a78f092584 100644 --- a/lib/spack/spack/cmd/dev_build.py +++ b/lib/spack/spack/cmd/dev_build.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,9 +9,9 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.repo +from spack.cmd.common import arguments description = "developer build: build from code in current working directory" section = "build" diff --git a/lib/spack/spack/cmd/develop.py b/lib/spack/spack/cmd/develop.py index ac7e89596fa851..13a265af12580e 100644 --- a/lib/spack/spack/cmd/develop.py +++ b/lib/spack/spack/cmd/develop.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,10 +8,10 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.spec import spack.util.path import spack.version +from spack.cmd.common import arguments from spack.error import SpackError description = "add a spec to an environment's dev-build information" @@ -45,10 +45,41 @@ def setup_parser(subparser): arguments.add_common_arguments(subparser, ["spec"]) -def develop(parser, args): - env = spack.cmd.require_active_env(cmd_name="develop") +def _update_config(spec, path): + find_fn = lambda section: spec.name in section + + entry = {"spec": str(spec)} + if path != spec.name: + entry["path"] = path + + def change_fn(section): + section[spec.name] = entry + + spack.config.change_or_add("develop", find_fn, change_fn) + + +def _retrieve_develop_source(spec, abspath): + # "steal" the source code via staging API. We ask for a stage + # to be created, then copy it afterwards somewhere else. It would be + # better if we can create the `source_path` directly into its final + # destination. + pkg_cls = spack.repo.PATH.get_pkg_class(spec.name) + # We construct a package class ourselves, rather than asking for + # Spec.package, since Spec only allows this when it is concrete + package = pkg_cls(spec) + if isinstance(package.stage[0].fetcher, spack.fetch_strategy.GitFetchStrategy): + package.stage[0].fetcher.get_full_repo = True + # If we retrieved this version before and cached it, we may have + # done so without cloning the full git repo; likewise, any + # mirror might store an instance with truncated history. + package.stage[0].disable_mirrors() + package.stage.steal_source(abspath) + + +def develop(parser, args): if not args.spec: + env = spack.cmd.require_active_env(cmd_name="develop") if args.clone is False: raise SpackError("No spec provided to spack develop command") @@ -66,7 +97,7 @@ def develop(parser, args): # Both old syntax `spack develop pkg@x` and new syntax `spack develop pkg@=x` # are currently supported. spec = spack.spec.parse_with_version_concrete(entry["spec"]) - env.develop(spec=spec, path=path, clone=True) + _retrieve_develop_source(spec, abspath) if not env.dev_specs: tty.warn("No develop specs to download") @@ -81,12 +112,16 @@ def develop(parser, args): version = spec.versions.concrete_range_as_version if not version: raise SpackError("Packages to develop must have a concrete version") - spec.versions = spack.version.VersionList([version]) - # default path is relative path to spec.name + # If user does not specify --path, we choose to create a directory in the + # active environment's directory, named after the spec path = args.path or spec.name - abspath = spack.util.path.canonicalize_path(path, default_wd=env.path) + if not os.path.isabs(path): + env = spack.cmd.require_active_env(cmd_name="develop") + abspath = spack.util.path.canonicalize_path(path, default_wd=env.path) + else: + abspath = path # clone default: only if the path doesn't exist clone = args.clone @@ -96,15 +131,24 @@ def develop(parser, args): if not clone and not os.path.exists(abspath): raise SpackError("Provided path %s does not exist" % abspath) - if clone and os.path.exists(abspath): - if args.force: - shutil.rmtree(abspath) - else: - msg = "Path %s already exists and cannot be cloned to." % abspath - msg += " Use `spack develop -f` to overwrite." - raise SpackError(msg) - + if clone: + if os.path.exists(abspath): + if args.force: + shutil.rmtree(abspath) + else: + msg = "Path %s already exists and cannot be cloned to." % abspath + msg += " Use `spack develop -f` to overwrite." + raise SpackError(msg) + + _retrieve_develop_source(spec, abspath) + + # Note: we could put develop specs in any scope, but I assume + # users would only ever want to do this for either (a) an active + # env or (b) a specified config file (e.g. that is included by + # an environment) + # TODO: when https://github.com/spack/spack/pull/35307 is merged, + # an active env is not required if a scope is specified + env = spack.cmd.require_active_env(cmd_name="develop") + tty.debug("Updating develop config for {0} transactionally".format(env.name)) with env.write_transaction(): - changed = env.develop(spec, path, clone) - if changed: - env.write() + _update_config(spec, path) diff --git a/lib/spack/spack/cmd/diff.py b/lib/spack/spack/cmd/diff.py index c654f6a5b8c6db..a841986355b71f 100644 --- a/lib/spack/spack/cmd/diff.py +++ b/lib/spack/spack/cmd/diff.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,11 +10,11 @@ from llnl.util.tty.color import cprint, get_color_when import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.solver.asp as asp import spack.util.environment import spack.util.spack_json as sjson +from spack.cmd.common import arguments description = "compare two specs" section = "basic" @@ -44,6 +44,9 @@ def setup_parser(subparser): action="append", help="select the attributes to show (defaults to all)", ) + subparser.add_argument( + "--ignore", action="append", help="omit diffs related to these dependencies" + ) def shift(asp_function): @@ -54,7 +57,7 @@ def shift(asp_function): return asp.AspFunction(first, rest) -def compare_specs(a, b, to_string=False, color=None): +def compare_specs(a, b, to_string=False, color=None, ignore_packages=None): """ Generate a comparison, including diffs (for each side) and an intersection. @@ -73,6 +76,14 @@ def compare_specs(a, b, to_string=False, color=None): if color is None: color = get_color_when() + a = a.copy() + b = b.copy() + + if ignore_packages: + for pkg_name in ignore_packages: + a.trim(pkg_name) + b.trim(pkg_name) + # Prepare a solver setup to parse differences setup = asp.SpackSolverSetup() @@ -200,6 +211,8 @@ def diff(parser, args): specs = [] for spec in spack.cmd.parse_specs(args.specs): + # If the spec has a hash, check it before disambiguating + spec.replace_hash() if spec.concrete: specs.append(spec) else: @@ -207,7 +220,7 @@ def diff(parser, args): # Calculate the comparison (c) color = False if args.dump_json else get_color_when() - c = compare_specs(specs[0], specs[1], to_string=True, color=color) + c = compare_specs(specs[0], specs[1], to_string=True, color=color, ignore_packages=args.ignore) # Default to all attributes attributes = args.attribute or ["all"] diff --git a/lib/spack/spack/cmd/docs.py b/lib/spack/spack/cmd/docs.py index d386fb97319763..d0107a35ef23a4 100644 --- a/lib/spack/spack/cmd/docs.py +++ b/lib/spack/spack/cmd/docs.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/edit.py b/lib/spack/spack/cmd/edit.py index 79f441a67adf57..0134a522d82153 100644 --- a/lib/spack/spack/cmd/edit.py +++ b/lib/spack/spack/cmd/edit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index bb1ad13ec2b985..ae5b320b19a8fb 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,7 +20,6 @@ import spack.cmd import spack.cmd.common import spack.cmd.common.arguments -import spack.cmd.common.arguments as arguments import spack.cmd.install import spack.cmd.modules import spack.cmd.uninstall @@ -31,6 +30,7 @@ import spack.schema.env import spack.spec import spack.tengine +from spack.cmd.common import arguments from spack.util.environment import EnvironmentModifications description = "manage virtual environments" @@ -54,6 +54,104 @@ ] +# +# env create +# +def env_create_setup_parser(subparser): + """create a new environment""" + subparser.add_argument( + "env_name", + metavar="env", + help=( + "name of managed environment or directory of the anonymous env " + "(when using --dir/-d) to activate" + ), + ) + subparser.add_argument( + "-d", "--dir", action="store_true", help="create an environment in a specific directory" + ) + subparser.add_argument( + "--keep-relative", + action="store_true", + help="copy relative develop paths verbatim into the new environment" + " when initializing from envfile", + ) + view_opts = subparser.add_mutually_exclusive_group() + view_opts.add_argument( + "--without-view", action="store_true", help="do not maintain a view for this environment" + ) + view_opts.add_argument( + "--with-view", + help="specify that this environment should maintain a view at the" + " specified path (by default the view is maintained in the" + " environment directory)", + ) + subparser.add_argument( + "envfile", + nargs="?", + default=None, + help="either a lockfile (must end with '.json' or '.lock') or a manifest file", + ) + + +def env_create(args): + if args.with_view: + # Expand relative paths provided on the command line to the current working directory + # This way we interpret `spack env create --with-view ./view --dir ./env` as + # a view in $PWD/view, not $PWD/env/view. This is different from specifying a relative + # path in the manifest, which is resolved relative to the manifest file's location. + with_view = os.path.abspath(args.with_view) + elif args.without_view: + with_view = False + else: + # Note that 'None' means unspecified, in which case the Environment + # object could choose to enable a view by default. False means that + # the environment should not include a view. + with_view = None + + env = _env_create( + args.env_name, + init_file=args.envfile, + dir=args.dir, + with_view=with_view, + keep_relative=args.keep_relative, + ) + + # Generate views, only really useful for environments created from spack.lock files. + env.regenerate_views() + + +def _env_create(name_or_path, *, init_file=None, dir=False, with_view=None, keep_relative=False): + """Create a new environment, with an optional yaml description. + + Arguments: + name_or_path (str): name of the environment to create, or path to it + init_file (str or file): optional initialization file -- can be + a JSON lockfile (*.lock, *.json) or YAML manifest file + dir (bool): if True, create an environment in a directory instead + of a named environment + keep_relative (bool): if True, develop paths are copied verbatim into + the new environment file, otherwise they may be made absolute if the + new environment is in a different location + """ + if not dir: + env = ev.create( + name_or_path, init_file=init_file, with_view=with_view, keep_relative=keep_relative + ) + tty.msg("Created environment '%s' in %s" % (name_or_path, env.path)) + tty.msg("You can activate this environment with:") + tty.msg(" spack env activate %s" % (name_or_path)) + return env + + env = ev.create_in_dir( + name_or_path, init_file=init_file, with_view=with_view, keep_relative=keep_relative + ) + tty.msg("Created environment in %s" % env.path) + tty.msg("You can activate this environment with:") + tty.msg(" spack env activate %s" % env.path) + return env + + # # env activate # @@ -118,22 +216,46 @@ def env_activate_setup_parser(subparser): help="decorate the command line prompt when activating", ) - env_options = subparser.add_mutually_exclusive_group() - env_options.add_argument( + subparser.add_argument( "--temp", action="store_true", default=False, help="create and activate an environment in a temporary directory", ) - env_options.add_argument( - "-d", "--dir", default=None, help="activate the environment in this directory" + subparser.add_argument( + "--create", + action="store_true", + default=False, + help="create and activate the environment if it doesn't exist", + ) + subparser.add_argument( + "--envfile", + nargs="?", + default=None, + help="either a lockfile (must end with '.json' or '.lock') or a manifest file", + ) + subparser.add_argument( + "--keep-relative", + action="store_true", + help="copy relative develop paths verbatim into the new environment" + " when initializing from envfile", ) - env_options.add_argument( + subparser.add_argument( + "-d", + "--dir", + default=False, + action="store_true", + help="activate environment based on the directory supplied", + ) + subparser.add_argument( metavar="env", - dest="activate_env", + dest="env_name", nargs="?", default=None, - help="name of environment to activate", + help=( + "name of managed environment or directory of the anonymous env" + " (when using --dir/-d) to activate" + ), ) @@ -162,11 +284,17 @@ def env_activate(args): if args.env or args.no_env or args.env_dir: tty.die("Calling spack env activate with --env, --env-dir and --no-env is ambiguous") - env_name_or_dir = args.activate_env or args.dir + # special parser error handling relative to the --temp flag + temp_conflicts = iter([args.keep_relative, args.dir, args.env_name, args.with_view]) + if args.temp and any(temp_conflicts): + tty.die( + "spack env activate --temp cannot be combined with managed environments, --with-view," + " --keep-relative, or --dir." + ) # When executing `spack env activate` without further arguments, activate # the default environment. It's created when it doesn't exist yet. - if not env_name_or_dir and not args.temp: + if not args.env_name and not args.temp: short_name = "default" if not ev.exists(short_name): ev.create(short_name) @@ -185,17 +313,25 @@ def env_activate(args): _tty_info(f"Created and activated temporary environment in {env_path}") # Managed environment - elif ev.exists(env_name_or_dir) and not args.dir: - env_path = ev.root(env_name_or_dir) - short_name = env_name_or_dir + elif ev.exists(args.env_name) and not args.dir: + env_path = ev.root(args.env_name) + short_name = args.env_name # Environment directory - elif ev.is_env_dir(env_name_or_dir): - env_path = os.path.abspath(env_name_or_dir) + elif ev.is_env_dir(args.env_name): + env_path = os.path.abspath(args.env_name) short_name = os.path.basename(env_path) + # create if user requested, and then recall recursively + elif args.create: + tty.set_msg_enabled(False) + env_create(args) + tty.set_msg_enabled(True) + env_activate(args) + return + else: - tty.die("No such environment: '%s'" % env_name_or_dir) + tty.die("No such environment: '%s'" % args.env_name) env_prompt = "[%s]" % short_name @@ -290,97 +426,6 @@ def env_deactivate(args): sys.stdout.write(cmds) -# -# env create -# -def env_create_setup_parser(subparser): - """create a new environment""" - subparser.add_argument("create_env", metavar="env", help="name of environment to create") - subparser.add_argument( - "-d", "--dir", action="store_true", help="create an environment in a specific directory" - ) - subparser.add_argument( - "--keep-relative", - action="store_true", - help="copy relative develop paths verbatim into the new environment" - " when initializing from envfile", - ) - view_opts = subparser.add_mutually_exclusive_group() - view_opts.add_argument( - "--without-view", action="store_true", help="do not maintain a view for this environment" - ) - view_opts.add_argument( - "--with-view", - help="specify that this environment should maintain a view at the" - " specified path (by default the view is maintained in the" - " environment directory)", - ) - subparser.add_argument( - "envfile", - nargs="?", - default=None, - help="either a lockfile (must end with '.json' or '.lock') or a manifest file", - ) - - -def env_create(args): - if args.with_view: - # Expand relative paths provided on the command line to the current working directory - # This way we interpret `spack env create --with-view ./view --dir ./env` as - # a view in $PWD/view, not $PWD/env/view. This is different from specifying a relative - # path in the manifest, which is resolved relative to the manifest file's location. - with_view = os.path.abspath(args.with_view) - elif args.without_view: - with_view = False - else: - # Note that 'None' means unspecified, in which case the Environment - # object could choose to enable a view by default. False means that - # the environment should not include a view. - with_view = None - - env = _env_create( - args.create_env, - init_file=args.envfile, - dir=args.dir, - with_view=with_view, - keep_relative=args.keep_relative, - ) - - # Generate views, only really useful for environments created from spack.lock files. - env.regenerate_views() - - -def _env_create(name_or_path, *, init_file=None, dir=False, with_view=None, keep_relative=False): - """Create a new environment, with an optional yaml description. - - Arguments: - name_or_path (str): name of the environment to create, or path to it - init_file (str or file): optional initialization file -- can be - a JSON lockfile (*.lock, *.json) or YAML manifest file - dir (bool): if True, create an environment in a directory instead - of a named environment - keep_relative (bool): if True, develop paths are copied verbatim into - the new environment file, otherwise they may be made absolute if the - new environment is in a different location - """ - if not dir: - env = ev.create( - name_or_path, init_file=init_file, with_view=with_view, keep_relative=keep_relative - ) - tty.msg("Created environment '%s' in %s" % (name_or_path, env.path)) - tty.msg("You can activate this environment with:") - tty.msg(" spack env activate %s" % (name_or_path)) - return env - - env = ev.create_in_dir( - name_or_path, init_file=init_file, with_view=with_view, keep_relative=keep_relative - ) - tty.msg("Created environment in %s" % env.path) - tty.msg("You can activate this environment with:") - tty.msg(" spack env activate %s" % env.path) - return env - - # # env remove # diff --git a/lib/spack/spack/cmd/extensions.py b/lib/spack/spack/cmd/extensions.py index 1bf5c9ecffc4d9..51527a10285f42 100644 --- a/lib/spack/spack/cmd/extensions.py +++ b/lib/spack/spack/cmd/extensions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,10 +10,10 @@ from llnl.util.tty.colify import colify import spack.cmd as cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.repo import spack.store +from spack.cmd.common import arguments description = "list extensions for package" section = "extensions" diff --git a/lib/spack/spack/cmd/external.py b/lib/spack/spack/cmd/external.py index 081ec8039438bd..29be54ba643806 100644 --- a/lib/spack/spack/cmd/external.py +++ b/lib/spack/spack/cmd/external.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,12 +14,12 @@ import spack import spack.cmd -import spack.cmd.common.arguments import spack.config import spack.cray_manifest as cray_manifest import spack.detection import spack.error import spack.util.environment +from spack.cmd.common import arguments description = "manage external packages in Spack configuration" section = "config" @@ -29,8 +29,6 @@ def setup_parser(subparser): sp = subparser.add_subparsers(metavar="SUBCOMMAND", dest="external_command") - scopes = spack.config.scopes() - find_parser = sp.add_parser("find", help="add external packages to packages.yaml") find_parser.add_argument( "--not-buildable", @@ -48,15 +46,14 @@ def setup_parser(subparser): ) find_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope("packages"), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope("packages"), help="configuration scope to modify", ) find_parser.add_argument( "--all", action="store_true", help="search for all packages that Spack knows about" ) - spack.cmd.common.arguments.add_common_arguments(find_parser, ["tags", "jobs"]) + arguments.add_common_arguments(find_parser, ["tags", "jobs"]) find_parser.add_argument("packages", nargs=argparse.REMAINDER) find_parser.epilog = ( 'The search is by default on packages tagged with the "build-tools" or ' diff --git a/lib/spack/spack/cmd/fetch.py b/lib/spack/spack/cmd/fetch.py index 227f7e89732a27..383c722ad664bb 100644 --- a/lib/spack/spack/cmd/fetch.py +++ b/lib/spack/spack/cmd/fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,11 +6,11 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.repo import spack.traverse +from spack.cmd.common import arguments description = "fetch archives for packages" section = "build" diff --git a/lib/spack/spack/cmd/find.py b/lib/spack/spack/cmd/find.py index a0570038456018..070ac9bd0e7ff9 100644 --- a/lib/spack/spack/cmd/find.py +++ b/lib/spack/spack/cmd/find.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,9 @@ import spack.bootstrap import spack.cmd as cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.repo +from spack.cmd.common import arguments from spack.database import InstallStatuses description = "list and search installed packages" @@ -261,10 +261,8 @@ def find(parser, args): # Exit early with an error code if no package matches the constraint if not results and args.constraint: - msg = "No package matches the query: {0}" - msg = msg.format(" ".join(args.constraint)) - tty.msg(msg) - raise SystemExit(1) + constraint_str = " ".join(str(s) for s in args.constraint_specs) + tty.die(f"No package matches the query: {constraint_str}") # If tags have been specified on the command line, filter by tags if args.tags: diff --git a/lib/spack/spack/cmd/gc.py b/lib/spack/spack/cmd/gc.py index 9918bf7479fd05..7e55dc42406f56 100644 --- a/lib/spack/spack/cmd/gc.py +++ b/lib/spack/spack/cmd/gc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,6 +8,7 @@ import spack.cmd.common.arguments import spack.cmd.common.confirmation import spack.cmd.uninstall +import spack.deptypes as dt import spack.environment as ev import spack.store @@ -17,31 +18,91 @@ def setup_parser(subparser): + subparser.add_argument( + "-E", + "--except-any-environment", + action="store_true", + help="remove everything unless needed by an environment", + ) + subparser.add_argument( + "-e", + "--except-environment", + metavar="ENV", + action="append", + default=[], + help="remove everything unless needed by specified environment\n" + "you can list multiple environments, or specify directory\n" + "environments by path.", + ) + subparser.add_argument( + "-b", + "--keep-build-dependencies", + action="store_true", + help="do not remove installed build-only dependencies of roots\n" + "(default is to keep only link & run dependencies)", + ) spack.cmd.common.arguments.add_common_arguments(subparser, ["yes_to_all"]) +def roots_from_environments(args, active_env): + # if we're using -E or -e, make a list of environments whose roots we should consider. + all_environments = [] + + # -E will garbage collect anything not needed by any env, including the current one + if args.except_any_environment: + all_environments += list(ev.all_environments()) + if active_env: + all_environments.append(active_env) + + # -e says "also preserve things needed by this particular env" + for env_name_or_dir in args.except_environment: + print("HMM", env_name_or_dir) + if ev.exists(env_name_or_dir): + env = ev.read(env_name_or_dir) + elif ev.is_env_dir(env_name_or_dir): + env = ev.Environment(env_name_or_dir) + else: + tty.die(f"No such environment: '{env_name_or_dir}'") + all_environments.append(env) + + # add root hashes from all considered environments to list of roots + root_hashes = set() + for env in all_environments: + root_hashes |= set(env.concretized_order) + + return root_hashes + + def gc(parser, args): - specs = spack.store.STORE.db.unused_specs - - # Restrict garbage collection to the active environment - # speculating over roots that are yet to be installed - env = ev.active_environment() - if env: - msg = 'Restricting the garbage collection to the "{0}" environment' - tty.msg(msg.format(env.name)) - env.concretize() - roots = [s for s in env.roots()] - all_hashes = set([s.dag_hash() for r in roots for s in r.traverse()]) - lr_hashes = set([s.dag_hash() for r in roots for s in r.traverse(deptype=("link", "run"))]) - maybe_to_be_removed = all_hashes - lr_hashes - specs = [s for s in specs if s.dag_hash() in maybe_to_be_removed] - - if not specs: - msg = "There are no unused specs. Spack's store is clean." - tty.msg(msg) - return - - if not args.yes_to_all: - spack.cmd.common.confirmation.confirm_action(specs, "uninstalled", "uninstallation") - - spack.cmd.uninstall.do_uninstall(specs, force=False) + deptype = dt.LINK | dt.RUN + if args.keep_build_dependencies: + deptype |= dt.BUILD + + active_env = ev.active_environment() + + # wrap the whole command with a read transaction to avoid multiple + with spack.store.STORE.db.read_transaction(): + if args.except_environment or args.except_any_environment: + # if either of these is specified, we ignore the active environment and garbage + # collect anything NOT in specified environments. + root_hashes = roots_from_environments(args, active_env) + + elif active_env: + # only gc what's in current environment + tty.msg(f"Restricting garbage collection to environment '{active_env.name}'") + root_hashes = set(spack.store.STORE.db.all_hashes()) # keep everything + root_hashes -= set(active_env.all_hashes()) # except this env + root_hashes |= set(active_env.concretized_order) # but keep its roots + else: + # consider all explicit specs roots (the default for db.unused_specs()) + root_hashes = None + + specs = spack.store.STORE.db.unused_specs(root_hashes=root_hashes, deptype=deptype) + if not specs: + tty.msg("There are no unused specs. Spack's store is clean.") + return + + if not args.yes_to_all: + spack.cmd.common.confirmation.confirm_action(specs, "uninstalled", "uninstall") + + spack.cmd.uninstall.do_uninstall(specs, force=False) diff --git a/lib/spack/spack/cmd/gpg.py b/lib/spack/spack/cmd/gpg.py index 0bce5f473664c5..d05db0a61e9493 100644 --- a/lib/spack/spack/cmd/gpg.py +++ b/lib/spack/spack/cmd/gpg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,11 +7,11 @@ import os import spack.binary_distribution -import spack.cmd.common.arguments as arguments import spack.mirror import spack.paths import spack.util.gpg import spack.util.url +from spack.cmd.common import arguments description = "handle GPG actions for spack" section = "packaging" diff --git a/lib/spack/spack/cmd/graph.py b/lib/spack/spack/cmd/graph.py index 4122d8d58894e2..36a49a1ea06611 100644 --- a/lib/spack/spack/cmd/graph.py +++ b/lib/spack/spack/cmd/graph.py @@ -1,14 +1,14 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) from llnl.util import tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.store +from spack.cmd.common import arguments from spack.graph import DAGWithDependencyTypes, SimpleDAG, graph_ascii, graph_dot, static_graph_dot description = "generate graphs of package dependency relationships" @@ -18,7 +18,14 @@ def setup_parser(subparser): setup_parser.parser = subparser + subparser.epilog = """ +Outside of an environment, the command concretizes specs and graphs them, unless the +--installed option is given. In that case specs are matched from the current DB. +If an environment is active, specs are matched from the currently available concrete specs +in the lockfile. + +""" method = subparser.add_mutually_exclusive_group() method.add_argument( "-a", "--ascii", action="store_true", help="draw graph as ascii to stdout (default)" @@ -41,39 +48,40 @@ def setup_parser(subparser): ) subparser.add_argument( - "-i", - "--installed", - action="store_true", - help="graph installed specs, or specs in the active env (implies --dot)", + "-i", "--installed", action="store_true", help="graph specs from the DB" ) arguments.add_common_arguments(subparser, ["deptype", "specs"]) def graph(parser, args): - if args.installed and args.specs: - tty.die("cannot specify specs with --installed") + env = ev.active_environment() + if args.installed and env: + tty.die("cannot use --installed with an active environment") if args.color and not args.dot: tty.die("the --color option can be used only with --dot") if args.installed: - args.dot = True - env = ev.active_environment() - if env: - specs = env.concrete_roots() - else: + if not args.specs: specs = spack.store.STORE.db.query() + else: + result = [] + for item in args.specs: + result.extend(spack.store.STORE.db.query(item)) + specs = list(set(result)) + elif env: + specs = env.concrete_roots() + if args.specs: + specs = env.all_matching_specs(*args.specs) else: specs = spack.cmd.parse_specs(args.specs, concretize=not args.static) if not specs: - setup_parser.parser.print_help() - return 1 + tty.die("no spec matching the query") if args.static: - args.dot = True static_graph_dot(specs, depflag=args.deptype) return diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py index eeba15b431a851..d8e053f8ae03ad 100644 --- a/lib/spack/spack/cmd/help.py +++ b/lib/spack/spack/cmd/help.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index af03fd93975baf..b007c6051639e8 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,13 @@ import llnl.util.tty.color as color from llnl.util.tty.colify import colify -import spack.cmd.common.arguments as arguments import spack.deptypes as dt import spack.fetch_strategy as fs import spack.install_test import spack.repo import spack.spec import spack.version +from spack.cmd.common import arguments from spack.package_base import preferred_version description = "get detailed information on a particular package" @@ -139,7 +139,7 @@ def lines(self): yield " " + self.fmt % t -def print_dependencies(pkg): +def print_dependencies(pkg, args): """output build, link, and run package dependencies""" for deptype in ("build", "link", "run"): @@ -152,7 +152,7 @@ def print_dependencies(pkg): color.cprint(" None") -def print_detectable(pkg): +def print_detectable(pkg, args): """output information on external detection""" color.cprint("") @@ -180,7 +180,7 @@ def print_detectable(pkg): color.cprint(" False") -def print_maintainers(pkg): +def print_maintainers(pkg, args): """output package maintainers""" if len(pkg.maintainers) > 0: @@ -189,7 +189,7 @@ def print_maintainers(pkg): color.cprint(section_title("Maintainers: ") + mnt) -def print_phases(pkg): +def print_phases(pkg, args): """output installation phases""" if hasattr(pkg.builder, "phases") and pkg.builder.phases: @@ -201,7 +201,7 @@ def print_phases(pkg): color.cprint(phase_str) -def print_tags(pkg): +def print_tags(pkg, args): """output package tags""" color.cprint("") @@ -213,7 +213,7 @@ def print_tags(pkg): color.cprint(" None") -def print_tests(pkg): +def print_tests(pkg, args): """output relevant build-time and stand-alone tests""" # Some built-in base packages (e.g., Autotools) define callback (e.g., @@ -407,12 +407,15 @@ def print_variants_by_name(pkg): sys.stdout.write("\n") -def print_variants(pkg): +def print_variants(pkg, args): """output variants""" - print_variants_grouped_by_when(pkg) + if args.variants_by_name: + print_variants_by_name(pkg) + else: + print_variants_grouped_by_when(pkg) -def print_versions(pkg): +def print_versions(pkg, args): """output versions""" color.cprint("") @@ -465,19 +468,13 @@ def get_url(version): color.cprint(line) -def print_virtuals(pkg): +def print_virtuals(pkg, args): """output virtual packages""" color.cprint("") color.cprint(section_title("Virtual Packages: ")) if pkg.provided: - inverse_map = {} - for spec, whens in pkg.provided.items(): - for when in whens: - if when not in inverse_map: - inverse_map[when] = set() - inverse_map[when].add(spec) - for when, specs in reversed(sorted(inverse_map.items())): + for when, specs in reversed(sorted(pkg.provided.items())): line = " %s provides %s" % ( when.colorized(), ", ".join(s.colorized() for s in specs), @@ -488,7 +485,7 @@ def print_virtuals(pkg): color.cprint(" None") -def print_licenses(pkg): +def print_licenses(pkg, args): """Output the licenses of the project.""" color.cprint("") @@ -523,17 +520,13 @@ def info(parser, args): if getattr(pkg, "homepage"): color.cprint(section_title("Homepage: ") + pkg.homepage) - _print_variants = ( - print_variants_by_name if args.variants_by_name else print_variants_grouped_by_when - ) - # Now output optional information in expected order sections = [ (args.all or args.maintainers, print_maintainers), (args.all or args.detectable, print_detectable), (args.all or args.tags, print_tags), (args.all or not args.no_versions, print_versions), - (args.all or not args.no_variants, _print_variants), + (args.all or not args.no_variants, print_variants), (args.all or args.phases, print_phases), (args.all or not args.no_dependencies, print_dependencies), (args.all or args.virtuals, print_virtuals), @@ -542,6 +535,6 @@ def info(parser, args): ] for print_it, func in sections: if print_it: - func(pkg) + func(pkg, args) color.cprint("") diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index b74f982755115b..9c66c661a071b5 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,6 @@ import spack.build_environment import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.fetch_strategy @@ -23,6 +22,7 @@ import spack.report import spack.spec import spack.store +from spack.cmd.common import arguments from spack.error import SpackError from spack.installer import PackageInstaller @@ -162,8 +162,8 @@ def setup_parser(subparser): "--no-check-signature", action="store_true", dest="unsigned", - default=False, - help="do not check signatures of binary packages", + default=None, + help="do not check signatures of binary packages (override mirror config)", ) subparser.add_argument( "--show-log-on-error", @@ -290,11 +290,11 @@ def require_user_confirmation_for_overwrite(concrete_specs, args): def _dump_log_on_error(e: spack.build_environment.InstallError): e.print_context() assert e.pkg, "Expected InstallError to include the associated package" - if not os.path.exists(e.pkg.build_log_path): + if not os.path.exists(e.pkg.log_path): tty.error("'spack install' created no log.") else: sys.stderr.write("Full build log:\n") - with open(e.pkg.build_log_path, errors="replace") as log: + with open(e.pkg.log_path, errors="replace") as log: shutil.copyfileobj(log, sys.stderr) diff --git a/lib/spack/spack/cmd/license.py b/lib/spack/spack/cmd/license.py index 9326ca1b4dfe37..7e2caf1b55bc9a 100644 --- a/lib/spack/spack/cmd/license.py +++ b/lib/spack/spack/cmd/license.py @@ -1,8 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 datetime import os import re from collections import defaultdict @@ -26,15 +27,22 @@ licensed_files = [ # spack scripts r"^bin/spack$", + r"^bin/spack\.bat$", + r"^bin/spack\.ps1$", + r"^bin/spack_pwsh\.ps1$", + r"^bin/sbang$", r"^bin/spack-python$", + r"^bin/haspywin\.py$", # all of spack core except unparse + r"^lib/spack/spack_installable/main\.py$", r"^lib/spack/spack/(?!(test/)?util/unparse).*\.py$", r"^lib/spack/spack/.*\.sh$", r"^lib/spack/spack/.*\.lp$", r"^lib/spack/llnl/.*\.py$", r"^lib/spack/env/cc$", - # special case this test data file, which has a license header + # special case some test data files that have license headers r"^lib/spack/spack/test/data/style/broken.dummy", + r"^lib/spack/spack/test/data/unparse/.*\.txt", # rst files in documentation r"^lib/spack/docs/(?!command_index|spack|llnl).*\.rst$", r"^lib/spack/docs/.*\.py$", @@ -46,6 +54,7 @@ r"^share/spack/.*\.bash$", r"^share/spack/.*\.csh$", r"^share/spack/.*\.fish$", + r"share/spack/setup-env\.ps1$", r"^share/spack/qa/run-[^/]*$", r"^share/spack/bash/spack-completion.in$", # action workflows @@ -88,14 +97,14 @@ def list_files(args): OLD_LICENSE, SPDX_MISMATCH, GENERAL_MISMATCH = range(1, 4) #: Latest year that copyright applies. UPDATE THIS when bumping copyright. -latest_year = 2023 +latest_year = datetime.date.today().year strict_date = r"Copyright 2013-%s" % latest_year #: regexes for valid license lines at tops of files license_line_regexes = [ r"Copyright 2013-(%d|%d) Lawrence Livermore National Security, LLC and other" % (latest_year - 1, latest_year), # allow a little leeway: current or last year - r"Spack Project Developers\. See the top-level COPYRIGHT file for details.", + r"(Spack|sbang) [Pp]roject [Dd]evelopers\. See the top-level COPYRIGHT file for details.", r"SPDX-License-Identifier: \(Apache-2\.0 OR MIT\)", ] @@ -127,7 +136,7 @@ def _check_license(lines, path): found = [] for line in lines: - line = re.sub(r"^[\s#\%\.]*", "", line) + line = re.sub(r"^[\s#\%\.\:]*", "", line) line = line.rstrip() for i, line_regex in enumerate(license_line_regexes): if re.match(line_regex, line): diff --git a/lib/spack/spack/cmd/list.py b/lib/spack/spack/cmd/list.py index a46d7fa5e079c6..eb34e388419c97 100644 --- a/lib/spack/spack/cmd/list.py +++ b/lib/spack/spack/cmd/list.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,9 +15,9 @@ import llnl.util.tty as tty from llnl.util.tty.colify import colify -import spack.cmd.common.arguments as arguments import spack.deptypes as dt import spack.repo +from spack.cmd.common import arguments from spack.version import VersionList description = "list and search available packages" @@ -40,6 +40,16 @@ def setup_parser(subparser): nargs=argparse.REMAINDER, help="optional case-insensitive glob patterns to filter results", ) + subparser.add_argument( + "-r", + "--repo", + "-N", + "--namespace", + dest="repos", + action="append", + default=[], + help="only list packages from the specified repo/namespace", + ) subparser.add_argument( "-d", "--search-description", @@ -307,7 +317,11 @@ def list(parser, args): formatter = formatters[args.format] # Retrieve the names of all the packages - pkgs = set(spack.repo.all_package_names(args.virtuals)) + repos = [spack.repo.PATH] + if args.repos: + repos = [spack.repo.PATH.get_repo(name) for name in args.repos] + pkgs = set().union(*[set(repo.all_package_names(args.virtuals)) for repo in repos]) + # Filter the set appropriately sorted_packages = filter_by_name(pkgs, args) diff --git a/lib/spack/spack/cmd/load.py b/lib/spack/spack/cmd/load.py index 5cdd2909c7ae40..a34b72ebb202d8 100644 --- a/lib/spack/spack/cmd/load.py +++ b/lib/spack/spack/cmd/load.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,12 +8,12 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.cmd.find import spack.environment as ev import spack.store import spack.user_environment as uenv import spack.util.environment +from spack.cmd.common import arguments description = "add package to the user environment" section = "user environment" @@ -98,15 +98,15 @@ def load(parser, args): spack.cmd.display_specs(results) return + constraint_specs = spack.cmd.parse_specs(args.constraint) specs = [ - spack.cmd.disambiguate_spec(spec, env, first=args.load_first) - for spec in spack.cmd.parse_specs(args.constraint) + spack.cmd.disambiguate_spec(spec, env, first=args.load_first) for spec in constraint_specs ] if not args.shell: - specs_str = " ".join(args.constraint) or "SPECS" + specs_str = " ".join(str(s) for s in constraint_specs) or "SPECS" spack.cmd.common.shell_init_instructions( - "spack load", " eval `spack load {sh_arg} %s`" % specs_str + "spack load", f" eval `spack load {{sh_arg}} {specs_str}`" ) return 1 diff --git a/lib/spack/spack/cmd/location.py b/lib/spack/spack/cmd/location.py index b4bbaf54b82a8a..d2bac9b9ba3227 100644 --- a/lib/spack/spack/cmd/location.py +++ b/lib/spack/spack/cmd/location.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,11 +9,11 @@ import spack.builder import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.paths import spack.repo import spack.stage +from spack.cmd.common import arguments description = "print out locations of packages and spack directories" section = "basic" diff --git a/lib/spack/spack/cmd/log_parse.py b/lib/spack/spack/cmd/log_parse.py index 6746ef11ffe2cf..e64e56ae491207 100644 --- a/lib/spack/spack/cmd/log_parse.py +++ b/lib/spack/spack/cmd/log_parse.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/maintainers.py b/lib/spack/spack/cmd/maintainers.py index 80140f6291f014..6875fa15669b98 100644 --- a/lib/spack/spack/cmd/maintainers.py +++ b/lib/spack/spack/cmd/maintainers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/make_installer.py b/lib/spack/spack/cmd/make_installer.py index 986631d39f778d..dbca577118b02d 100644 --- a/lib/spack/spack/cmd/make_installer.py +++ b/lib/spack/spack/cmd/make_installer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/mark.py b/lib/spack/spack/cmd/mark.py index 61939c9458322c..cf816a21f544cf 100644 --- a/lib/spack/spack/cmd/mark.py +++ b/lib/spack/spack/cmd/mark.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,11 +8,11 @@ from llnl.util import tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.error import spack.package_base import spack.repo import spack.store +from spack.cmd.common import arguments from spack.database import InstallStatuses description = "mark packages as explicitly or implicitly installed" diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py index 1036dcbe917e35..fe9cafd54550f8 100644 --- a/lib/spack/spack/cmd/mirror.py +++ b/lib/spack/spack/cmd/mirror.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,7 +11,6 @@ import spack.caches import spack.cmd -import spack.cmd.common.arguments as arguments import spack.concretize import spack.config import spack.environment as ev @@ -20,6 +19,7 @@ import spack.spec import spack.util.path import spack.util.web as web_util +from spack.cmd.common import arguments from spack.error import SpackError description = "manage mirrors (source and binary)" @@ -88,18 +88,14 @@ def setup_parser(subparser): "--mirror-url", metavar="mirror_url", type=str, help="find mirror to destroy by url" ) - # used to construct scope arguments below - scopes = spack.config.scopes() - # Add add_parser = sp.add_parser("add", help=mirror_add.__doc__) add_parser.add_argument("name", help="mnemonic name for mirror", metavar="mirror") add_parser.add_argument("url", help="url of mirror directory from 'spack mirror create'") add_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) add_parser.add_argument( @@ -111,15 +107,31 @@ def setup_parser(subparser): "and source use `--type binary --type source` (default)" ), ) + add_parser_signed = add_parser.add_mutually_exclusive_group(required=False) + add_parser_signed.add_argument( + "--unsigned", + help="do not require signing and signature verification when pushing and installing from " + "this build cache", + action="store_false", + default=None, + dest="signed", + ) + add_parser_signed.add_argument( + "--signed", + help="require signing and signature verification when pushing and installing from this " + "build cache", + action="store_true", + default=None, + dest="signed", + ) arguments.add_connection_args(add_parser, False) # Remove remove_parser = sp.add_parser("remove", aliases=["rm"], help=mirror_remove.__doc__) remove_parser.add_argument("name", help="mnemonic name for mirror", metavar="mirror") remove_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) @@ -136,9 +148,8 @@ def setup_parser(subparser): ) set_url_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) arguments.add_connection_args(set_url_parser, False) @@ -163,11 +174,27 @@ def setup_parser(subparser): ), ) set_parser.add_argument("--url", help="url of mirror directory from 'spack mirror create'") + set_parser_unsigned = set_parser.add_mutually_exclusive_group(required=False) + set_parser_unsigned.add_argument( + "--unsigned", + help="do not require signing and signature verification when pushing and installing from " + "this build cache", + action="store_false", + default=None, + dest="signed", + ) + set_parser_unsigned.add_argument( + "--signed", + help="require signing and signature verification when pushing and installing from this " + "build cache", + action="store_true", + default=None, + dest="signed", + ) set_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) arguments.add_connection_args(set_parser, False) @@ -175,11 +202,7 @@ def setup_parser(subparser): # List list_parser = sp.add_parser("list", help=mirror_list.__doc__) list_parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_list_scope(), - help="configuration scope to read from", + "--scope", action=arguments.ConfigScope, help="configuration scope to read from" ) @@ -194,6 +217,7 @@ def mirror_add(args): or args.type or args.oci_username or args.oci_password + or args.signed is not None ): connection = {"url": args.url} if args.s3_access_key_id and args.s3_access_key_secret: @@ -209,6 +233,8 @@ def mirror_add(args): if args.type: connection["binary"] = "binary" in args.type connection["source"] = "source" in args.type + if args.signed is not None: + connection["signed"] = args.signed mirror = spack.mirror.Mirror(connection, name=args.name) else: mirror = spack.mirror.Mirror(args.url, name=args.name) @@ -241,6 +267,8 @@ def _configure_mirror(args): changes["endpoint_url"] = args.s3_endpoint_url if args.oci_username and args.oci_password: changes["access_pair"] = [args.oci_username, args.oci_password] + if getattr(args, "signed", None) is not None: + changes["signed"] = args.signed # argparse cannot distinguish between --binary and --no-binary when same dest :( # notice that set-url does not have these args, so getattr diff --git a/lib/spack/spack/cmd/module.py b/lib/spack/spack/cmd/module.py index c7735149ab774d..26bb9636ab762b 100644 --- a/lib/spack/spack/cmd/module.py +++ b/lib/spack/spack/cmd/module.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/modules/__init__.py b/lib/spack/spack/cmd/modules/__init__.py index 65b174a06f6628..1cb04189b9278a 100644 --- a/lib/spack/spack/cmd/modules/__init__.py +++ b/lib/spack/spack/cmd/modules/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,11 +14,11 @@ from llnl.util.tty import color import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.modules import spack.modules.common import spack.repo +from spack.cmd.common import arguments description = "manipulate module files" section = "environment" @@ -388,21 +388,15 @@ def modules_cmd(parser, args, module_type, callbacks=callbacks): callbacks[args.subparser_name](module_type, specs, args) except MultipleSpecsMatch: - msg = "the constraint '{query}' matches multiple packages:\n" + query = " ".join(str(s) for s in args.constraint_specs) + msg = f"the constraint '{query}' matches multiple packages:\n" for s in specs: spec_fmt = "{hash:7} {name}{@version}{%compiler}" spec_fmt += "{compiler_flags}{variants}{arch=architecture}" msg += "\t" + s.cformat(spec_fmt) + "\n" - tty.error(msg.format(query=args.constraint)) - tty.die( - "In this context exactly **one** match is needed: " - "please specify your constraints better." - ) + tty.die(msg, "In this context exactly *one* match is needed.") except NoSpecMatches: - msg = "the constraint '{query}' matches no package." - tty.error(msg.format(query=args.constraint)) - tty.die( - "In this context exactly **one** match is needed: " - "please specify your constraints better." - ) + query = " ".join(str(s) for s in args.constraint_specs) + msg = f"the constraint '{query}' matches no package." + tty.die(msg, "In this context exactly *one* match is needed.") diff --git a/lib/spack/spack/cmd/modules/lmod.py b/lib/spack/spack/cmd/modules/lmod.py index f973e9b51534f8..4fd6992a47a97d 100644 --- a/lib/spack/spack/cmd/modules/lmod.py +++ b/lib/spack/spack/cmd/modules/lmod.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/modules/tcl.py b/lib/spack/spack/cmd/modules/tcl.py index 09f9e1d6c92d7f..4ca8ece704479e 100644 --- a/lib/spack/spack/cmd/modules/tcl.py +++ b/lib/spack/spack/cmd/modules/tcl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/patch.py b/lib/spack/spack/cmd/patch.py index 2d2596c9c53e57..e9aac661a2bcb8 100644 --- a/lib/spack/spack/cmd/patch.py +++ b/lib/spack/spack/cmd/patch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,12 +6,12 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.package_base import spack.repo import spack.traverse +from spack.cmd.common import arguments description = "patch expanded archive sources in preparation for install" section = "build" diff --git a/lib/spack/spack/cmd/pkg.py b/lib/spack/spack/cmd/pkg.py index 9bbd34ca812ae5..e4e616db563f13 100644 --- a/lib/spack/spack/cmd/pkg.py +++ b/lib/spack/spack/cmd/pkg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,11 +12,11 @@ from llnl.util.tty.colify import colify import spack.cmd -import spack.cmd.common.arguments as arguments import spack.paths import spack.repo import spack.util.executable as exe import spack.util.package_hash as ph +from spack.cmd.common import arguments description = "query packages associated with particular git revisions" section = "developer" diff --git a/lib/spack/spack/cmd/providers.py b/lib/spack/spack/cmd/providers.py index 8efd5c2a66bee6..1a3f8893b6c5ba 100644 --- a/lib/spack/spack/cmd/providers.py +++ b/lib/spack/spack/cmd/providers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/pydoc.py b/lib/spack/spack/cmd/pydoc.py index 33a01f0a10776a..cca82ec1a4efd1 100644 --- a/lib/spack/spack/cmd/pydoc.py +++ b/lib/spack/spack/cmd/pydoc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/python.py b/lib/spack/spack/cmd/python.py index 2e7b490a63708f..71ce88eed6f85a 100644 --- a/lib/spack/spack/cmd/python.py +++ b/lib/spack/spack/cmd/python.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/reindex.py b/lib/spack/spack/cmd/reindex.py index e2fd0d559af3e0..3c7af5fbbdbe2c 100644 --- a/lib/spack/spack/cmd/reindex.py +++ b/lib/spack/spack/cmd/reindex.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/remove.py b/lib/spack/spack/cmd/remove.py index 4fdb36a5e53b05..b574582d8f7696 100644 --- a/lib/spack/spack/cmd/remove.py +++ b/lib/spack/spack/cmd/remove.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments +from spack.cmd.common import arguments description = "remove specs from an environment" section = "environments" diff --git a/lib/spack/spack/cmd/repo.py b/lib/spack/spack/cmd/repo.py index 7953f227e51bc4..68af91cd918fc4 100644 --- a/lib/spack/spack/cmd/repo.py +++ b/lib/spack/spack/cmd/repo.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,7 @@ import spack.config import spack.repo import spack.util.path +from spack.cmd.common import arguments description = "manage package source repositories" section = "config" @@ -19,7 +20,6 @@ def setup_parser(subparser): sp = subparser.add_subparsers(metavar="SUBCOMMAND", dest="repo_command") - scopes = spack.config.scopes() # Create create_parser = sp.add_parser("create", help=repo_create.__doc__) @@ -42,11 +42,7 @@ def setup_parser(subparser): # List list_parser = sp.add_parser("list", help=repo_list.__doc__) list_parser.add_argument( - "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_list_scope(), - help="configuration scope to read from", + "--scope", action=arguments.ConfigScope, help="configuration scope to read from" ) # Add @@ -54,9 +50,8 @@ def setup_parser(subparser): add_parser.add_argument("path", help="path to a Spack package repository directory") add_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) @@ -67,9 +62,8 @@ def setup_parser(subparser): ) remove_parser.add_argument( "--scope", - choices=scopes, - metavar=spack.config.SCOPES_METAVAR, - default=spack.config.default_modify_scope(), + action=arguments.ConfigScope, + default=lambda: spack.config.default_modify_scope(), help="configuration scope to modify", ) diff --git a/lib/spack/spack/cmd/resource.py b/lib/spack/spack/cmd/resource.py index 7e3bb04706410a..aed399ae438aa9 100644 --- a/lib/spack/spack/cmd/resource.py +++ b/lib/spack/spack/cmd/resource.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/restage.py b/lib/spack/spack/cmd/restage.py index ab4d68dcc9460b..a21317405c459a 100644 --- a/lib/spack/spack/cmd/restage.py +++ b/lib/spack/spack/cmd/restage.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,8 +6,8 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.repo +from spack.cmd.common import arguments description = "revert checked out package source code" section = "build" diff --git a/lib/spack/spack/cmd/solve.py b/lib/spack/spack/cmd/solve.py index 4a30b1694b9ac2..9b03e596ed12de 100644 --- a/lib/spack/spack/cmd/solve.py +++ b/lib/spack/spack/cmd/solve.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,12 +12,12 @@ import spack import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment import spack.hash_types as ht import spack.package_base import spack.solver.asp as asp +from spack.cmd.common import arguments description = "concretize a specs using an ASP solver" section = "developer" diff --git a/lib/spack/spack/cmd/spec.py b/lib/spack/spack/cmd/spec.py index 0abd63ff6a69b6..e2d5cb10557eff 100644 --- a/lib/spack/spack/cmd/spec.py +++ b/lib/spack/spack/cmd/spec.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,11 +10,11 @@ import spack import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.hash_types as ht import spack.spec import spack.store +from spack.cmd.common import arguments description = "show what would be installed, given a spec" section = "build" diff --git a/lib/spack/spack/cmd/stage.py b/lib/spack/spack/cmd/stage.py index 4405ddedca47c9..8e74bcafca5b06 100644 --- a/lib/spack/spack/cmd/stage.py +++ b/lib/spack/spack/cmd/stage.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,13 +8,13 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments import spack.config import spack.environment as ev import spack.package_base import spack.repo import spack.stage import spack.traverse +from spack.cmd.common import arguments description = "expand downloaded archive in preparation for install" section = "build" diff --git a/lib/spack/spack/cmd/style.py b/lib/spack/spack/cmd/style.py index adc880f1bdae52..d16ff342770d16 100644 --- a/lib/spack/spack/cmd/style.py +++ b/lib/spack/spack/cmd/style.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/tags.py b/lib/spack/spack/cmd/tags.py index 0fbc91b6f4980d..a4f9786b93de34 100644 --- a/lib/spack/spack/cmd/tags.py +++ b/lib/spack/spack/cmd/tags.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/test.py b/lib/spack/spack/cmd/test.py index 99c2e906047fc5..e84df8c74a3804 100644 --- a/lib/spack/spack/cmd/test.py +++ b/lib/spack/spack/cmd/test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,12 +15,12 @@ from llnl.util.tty import colify import spack.cmd -import spack.cmd.common.arguments as arguments import spack.environment as ev import spack.install_test import spack.package_base import spack.repo import spack.report +from spack.cmd.common import arguments description = "run spack's tests for an install" section = "admin" diff --git a/lib/spack/spack/cmd/test_env.py b/lib/spack/spack/cmd/test_env.py index 070b766248d8dc..aa3691f111a522 100644 --- a/lib/spack/spack/cmd/test_env.py +++ b/lib/spack/spack/cmd/test_env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/tutorial.py b/lib/spack/spack/cmd/tutorial.py index 5759912b66ffc7..e0c49c831d4356 100644 --- a/lib/spack/spack/cmd/tutorial.py +++ b/lib/spack/spack/cmd/tutorial.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,11 +10,11 @@ from llnl.util.filesystem import working_dir import spack -import spack.cmd.common.arguments as arguments import spack.config import spack.paths import spack.util.git import spack.util.gpg +from spack.cmd.common import arguments from spack.util.spack_yaml import syaml_dict description = "set up spack for our tutorial (WARNING: modifies config!)" diff --git a/lib/spack/spack/cmd/undevelop.py b/lib/spack/spack/cmd/undevelop.py index f633a6d0d6652f..539ddb850d0d8a 100644 --- a/lib/spack/spack/cmd/undevelop.py +++ b/lib/spack/spack/cmd/undevelop.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ import llnl.util.tty as tty import spack.cmd -import spack.cmd.common.arguments as arguments +from spack.cmd.common import arguments description = "remove specs from an environment" section = "environments" @@ -17,21 +17,51 @@ def setup_parser(subparser): subparser.add_argument( "-a", "--all", action="store_true", help="remove all specs from (clear) the environment" ) + arguments.add_common_arguments(subparser, ["specs"]) -def undevelop(parser, args): - env = spack.cmd.require_active_env(cmd_name="undevelop") +def _update_config(specs_to_remove, remove_all=False): + def change_fn(dev_config): + modified = False + for spec in specs_to_remove: + if spec.name in dev_config: + tty.msg("Undevelop: removing {0}".format(spec.name)) + del dev_config[spec.name] + modified = True + if remove_all and dev_config: + dev_config.clear() + modified = True + return modified + spack.config.update_all("develop", change_fn) + + +def undevelop(parser, args): + remove_specs = None + remove_all = False if args.all: - specs = env.dev_specs.keys() + remove_all = True else: - specs = spack.cmd.parse_specs(args.specs) + remove_specs = spack.cmd.parse_specs(args.specs) + # TODO: when https://github.com/spack/spack/pull/35307 is merged, + # an active env is not required if a scope is specified + env = spack.cmd.require_active_env(cmd_name="undevelop") with env.write_transaction(): - changed = False - for spec in specs: - tty.msg("Removing %s from environment %s development specs" % (spec, env.name)) - changed |= env.undevelop(spec) - if changed: - env.write() + _update_config(remove_specs, remove_all) + + updated_all_dev_specs = set(spack.config.get("develop")) + remove_spec_names = set(x.name for x in remove_specs) + + if remove_all: + not_fully_removed = updated_all_dev_specs + else: + not_fully_removed = updated_all_dev_specs & remove_spec_names + + if not_fully_removed: + tty.msg( + "The following specs could not be removed as develop specs" + " - see `spack config blame develop` to locate files requiring" + f" manual edits: {', '.join(not_fully_removed)}" + ) diff --git a/lib/spack/spack/cmd/uninstall.py b/lib/spack/spack/cmd/uninstall.py index 3288404151d230..62a7ac1f327e0f 100644 --- a/lib/spack/spack/cmd/uninstall.py +++ b/lib/spack/spack/cmd/uninstall.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,13 +10,13 @@ from llnl.util.tty.colify import colify import spack.cmd -import spack.cmd.common.arguments as arguments import spack.cmd.common.confirmation as confirmation import spack.environment as ev import spack.package_base import spack.spec import spack.store import spack.traverse as traverse +from spack.cmd.common import arguments from spack.database import InstallStatuses description = "remove installed packages" @@ -277,7 +277,7 @@ def uninstall_specs(args, specs): return if not args.yes_to_all: - confirmation.confirm_action(uninstall_list, "uninstalled", "uninstallation") + confirmation.confirm_action(uninstall_list, "uninstalled", "uninstall") # Uninstall everything on the list do_uninstall(uninstall_list, args.force) diff --git a/lib/spack/spack/cmd/unit_test.py b/lib/spack/spack/cmd/unit_test.py index 4963ad14c64c28..2931be5e748bc8 100644 --- a/lib/spack/spack/cmd/unit_test.py +++ b/lib/spack/spack/cmd/unit_test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -227,9 +227,7 @@ def unit_test(parser, args, unknown_args): # has been used, then test that extension. pytest_root = spack.paths.spack_root if args.extension: - target = args.extension - extensions = spack.extensions.get_extension_paths() - pytest_root = spack.extensions.path_for_extension(target, *extensions) + pytest_root = spack.extensions.load_extension(args.extension) # pytest.ini lives in the root of the spack repository. with llnl.util.filesystem.working_dir(pytest_root): diff --git a/lib/spack/spack/cmd/unload.py b/lib/spack/spack/cmd/unload.py index 7fe634c56de91e..3bafe5e8c62d83 100644 --- a/lib/spack/spack/cmd/unload.py +++ b/lib/spack/spack/cmd/unload.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,10 +7,10 @@ import sys import spack.cmd -import spack.cmd.common.arguments as arguments import spack.error import spack.user_environment as uenv import spack.util.environment +from spack.cmd.common import arguments description = "remove package from the user environment" section = "user environment" diff --git a/lib/spack/spack/cmd/url.py b/lib/spack/spack/cmd/url.py index 25f8ad382a6058..38dd6a4aeb05d1 100644 --- a/lib/spack/spack/cmd/url.py +++ b/lib/spack/spack/cmd/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/verify.py b/lib/spack/spack/cmd/verify.py index 88a52b691858f4..383e9e046baaaf 100644 --- a/lib/spack/spack/cmd/verify.py +++ b/lib/spack/spack/cmd/verify.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cmd/versions.py b/lib/spack/spack/cmd/versions.py index 9ac6c9e4da72ba..fb1a303713cd9f 100644 --- a/lib/spack/spack/cmd/versions.py +++ b/lib/spack/spack/cmd/versions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,9 +8,9 @@ import llnl.util.tty as tty from llnl.util.tty.colify import colify -import spack.cmd.common.arguments as arguments import spack.repo import spack.spec +from spack.cmd.common import arguments from spack.version import infinity_versions, ver description = "list available versions of a package" diff --git a/lib/spack/spack/cmd/view.py b/lib/spack/spack/cmd/view.py index de847bd9f655fe..586a9c6eb41fca 100644 --- a/lib/spack/spack/cmd/view.py +++ b/lib/spack/spack/cmd/view.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 70da3ca2c42712..30511d90db5fbe 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index be9edeecb4226a..c58bc4996c2948 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/aocc.py b/lib/spack/spack/compilers/aocc.py index 326522c93cfc91..ad67e173380e47 100644 --- a/lib/spack/spack/compilers/aocc.py +++ b/lib/spack/spack/compilers/aocc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -40,7 +40,6 @@ def debug_flags(self): "-gdwarf-5", "-gline-tables-only", "-gmodules", - "-gz", "-g", ] diff --git a/lib/spack/spack/compilers/apple_clang.py b/lib/spack/spack/compilers/apple_clang.py index e81703b2d2d4f5..9201b164027e48 100644 --- a/lib/spack/spack/compilers/apple_clang.py +++ b/lib/spack/spack/compilers/apple_clang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/arm.py b/lib/spack/spack/compilers/arm.py index 9b4648ec1b3e27..3bf40aec200519 100644 --- a/lib/spack/spack/compilers/arm.py +++ b/lib/spack/spack/compilers/arm.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py index 283f1b55085b63..e9377a0bb1bab7 100644 --- a/lib/spack/spack/compilers/cce.py +++ b/lib/spack/spack/compilers/cce.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,16 +20,16 @@ def __init__(self, *args, **kwargs): self.version_argument = "-V" # Subclasses use possible names of C compiler - cc_names = ["craycc", "cc"] + cc_names = ["craycc"] # Subclasses use possible names of C++ compiler - cxx_names = ["crayCC", "CC"] + cxx_names = ["crayCC"] # Subclasses use possible names of Fortran 77 compiler - f77_names = ["crayftn", "ftn"] + f77_names = ["crayftn"] # Subclasses use possible names of Fortran 90 compiler - fc_names = ["crayftn", "ftn"] + fc_names = ["crayftn"] # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes. suffixes = [r"-mp-\d\.\d"] diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py index 71837bfe5e1c81..88154a19219987 100644 --- a/lib/spack/spack/compilers/clang.py +++ b/lib/spack/spack/compilers/clang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -55,7 +55,6 @@ def debug_flags(self): "-gdwarf-5", "-gline-tables-only", "-gmodules", - "-gz", "-g", ] diff --git a/lib/spack/spack/compilers/dpcpp.py b/lib/spack/spack/compilers/dpcpp.py index a88545325f40e3..392817fd39fc1d 100644 --- a/lib/spack/spack/compilers/dpcpp.py +++ b/lib/spack/spack/compilers/dpcpp.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/fj.py b/lib/spack/spack/compilers/fj.py index 3b33d15686e8be..a9df7d2c23cfe9 100644 --- a/lib/spack/spack/compilers/fj.py +++ b/lib/spack/spack/compilers/fj.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py index adef8a8277dd2f..6d635523ae4e74 100644 --- a/lib/spack/spack/compilers/gcc.py +++ b/lib/spack/spack/compilers/gcc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/intel.py b/lib/spack/spack/compilers/intel.py index d4ff7c5ebc9067..c7b0d8033c6eaa 100644 --- a/lib/spack/spack/compilers/intel.py +++ b/lib/spack/spack/compilers/intel.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/msvc.py b/lib/spack/spack/compilers/msvc.py index 3699a65481dd60..e6cd29c57087d3 100644 --- a/lib/spack/spack/compilers/msvc.py +++ b/lib/spack/spack/compilers/msvc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index 18b7ac4db3a77d..c12ccec7bfa1b8 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/nvhpc.py b/lib/spack/spack/compilers/nvhpc.py index 8fba575472da3d..1078e921081af9 100644 --- a/lib/spack/spack/compilers/nvhpc.py +++ b/lib/spack/spack/compilers/nvhpc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py index fde6fa677ae7ad..ecba99081a4b95 100644 --- a/lib/spack/spack/compilers/oneapi.py +++ b/lib/spack/spack/compilers/oneapi.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,6 +6,8 @@ import os from os.path import dirname +from llnl.util import tty + from spack.compiler import Compiler @@ -135,3 +137,13 @@ def setup_custom_environment(self, pkg, env): # Executable "sycl-post-link" doesn't exist! if self.cxx: env.prepend_path("PATH", dirname(self.cxx)) + + # 2024 release bumped the libsycl version because of an ABI + # change, 2024 compilers are required. You will see this + # error: + # + # /usr/bin/ld: warning: libsycl.so.7, needed by ...., not found + if pkg.spec.satisfies("%oneapi@:2023"): + for c in ["dnn"]: + if pkg.spec.satisfies(f"^intel-oneapi-{c}@2024:"): + tty.warn(f"intel-oneapi-{c}@2024 SYCL APIs requires %oneapi@2024:") diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 77a0db7860f714..1e8656fd3fbfb3 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/rocmcc.py b/lib/spack/spack/compilers/rocmcc.py index 07dc87b16da846..863d3c2cbfbd6b 100644 --- a/lib/spack/spack/compilers/rocmcc.py +++ b/lib/spack/spack/compilers/rocmcc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index db7241cb0fc8b7..1c1be0e41b4378 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/compilers/xl_r.py b/lib/spack/spack/compilers/xl_r.py index 238d43cea15d32..15bcb7234f89b3 100644 --- a/lib/spack/spack/compilers/xl_r.py +++ b/lib/spack/spack/compilers/xl_r.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/concretize.py b/lib/spack/spack/concretize.py index 6e85d66b154f51..bfa3c133b787a5 100644 --- a/lib/spack/spack/concretize.py +++ b/lib/spack/spack/concretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index cd1be71c9d0a33..be6aeea7f0dc36 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,12 +35,9 @@ import os import re import sys -from contextlib import contextmanager -from typing import Dict, List, Optional, Union +from typing import Any, Callable, Dict, Generator, List, Optional, Tuple, Type, Union -import llnl.util.lang -import llnl.util.tty as tty -from llnl.util.filesystem import mkdirp, rename +from llnl.util import filesystem, lang, tty import spack.compilers import spack.paths @@ -70,6 +67,7 @@ "compilers": spack.schema.compilers.schema, "concretizer": spack.schema.concretizer.schema, "definitions": spack.schema.definitions.schema, + "develop": spack.schema.develop.schema, "mirrors": spack.schema.mirrors.schema, "repos": spack.schema.repos.schema, "packages": spack.schema.packages.schema, @@ -113,28 +111,34 @@ #: Base name for the (internal) overrides scope. _OVERRIDES_BASE_NAME = "overrides-" +#: Type used for raw YAML configuration +YamlConfigDict = Dict[str, Any] + class ConfigScope: """This class represents a configuration scope. A scope is one directory containing named configuration files. - Each file is a config "section" (e.g., mirrors, compilers, etc). + Each file is a config "section" (e.g., mirrors, compilers, etc.). """ - def __init__(self, name, path): + def __init__(self, name, path) -> None: self.name = name # scope name. self.path = path # path to directory containing configs. self.sections = syaml.syaml_dict() # sections read from config files. @property - def is_platform_dependent(self): + def is_platform_dependent(self) -> bool: + """Returns true if the scope name is platform specific""" return os.sep in self.name - def get_section_filename(self, section): + def get_section_filename(self, section: str) -> str: + """Returns the filename associated with a given section""" _validate_section_name(section) - return os.path.join(self.path, "%s.yaml" % section) + return os.path.join(self.path, f"{section}.yaml") - def get_section(self, section): + def get_section(self, section: str) -> Optional[YamlConfigDict]: + """Returns the data associated with a given section""" if section not in self.sections: path = self.get_section_filename(section) schema = SECTION_SCHEMAS[section] @@ -142,39 +146,44 @@ def get_section(self, section): self.sections[section] = data return self.sections[section] - def _write_section(self, section): + def _write_section(self, section: str) -> None: filename = self.get_section_filename(section) data = self.get_section(section) + if data is None: + return # We copy data here to avoid adding defaults at write time validate_data = copy.deepcopy(data) validate(validate_data, SECTION_SCHEMAS[section]) try: - mkdirp(self.path) + filesystem.mkdirp(self.path) with open(filename, "w") as f: syaml.dump_config(data, stream=f, default_flow_style=False) - except (syaml.SpackYAMLError, IOError) as e: + except (syaml.SpackYAMLError, OSError) as e: raise ConfigFileError(f"cannot write to '{filename}'") from e - def clear(self): + def clear(self) -> None: """Empty cached config information.""" self.sections = syaml.syaml_dict() - def __repr__(self): - return "" % (self.name, self.path) + def __repr__(self) -> str: + return f"" class SingleFileScope(ConfigScope): """This class represents a configuration scope in a single YAML file.""" - def __init__(self, name, path, schema, yaml_path=None): + def __init__( + self, name: str, path: str, schema: YamlConfigDict, yaml_path: Optional[List[str]] = None + ) -> None: """Similar to ``ConfigScope`` but can be embedded in another schema. Arguments: schema (dict): jsonschema for the file to read yaml_path (list): path in the schema where config data can be found. + If the schema accepts the following yaml data, the yaml_path would be ['outer', 'inner'] @@ -186,18 +195,18 @@ def __init__(self, name, path, schema, yaml_path=None): install_tree: $spack/opt/spack """ super().__init__(name, path) - self._raw_data = None + self._raw_data: Optional[YamlConfigDict] = None self.schema = schema self.yaml_path = yaml_path or [] @property - def is_platform_dependent(self): + def is_platform_dependent(self) -> bool: return False - def get_section_filename(self, section): + def get_section_filename(self, section) -> str: return self.path - def get_section(self, section): + def get_section(self, section: str) -> Optional[YamlConfigDict]: # read raw data from the file, which looks like: # { # 'config': { @@ -246,8 +255,8 @@ def get_section(self, section): return self.sections.get(section, None) - def _write_section(self, section): - data_to_write = self._raw_data + def _write_section(self, section: str) -> None: + data_to_write: Optional[YamlConfigDict] = self._raw_data # If there is no existing data, this section SingleFileScope has never # been written to disk. We need to construct the portion of the data @@ -277,18 +286,18 @@ def _write_section(self, section): validate(data_to_write, self.schema) try: parent = os.path.dirname(self.path) - mkdirp(parent) + filesystem.mkdirp(parent) - tmp = os.path.join(parent, ".%s.tmp" % os.path.basename(self.path)) + tmp = os.path.join(parent, f".{os.path.basename(self.path)}.tmp") with open(tmp, "w") as f: syaml.dump_config(data_to_write, stream=f, default_flow_style=False) - rename(tmp, self.path) + filesystem.rename(tmp, self.path) - except (syaml.SpackYAMLError, IOError) as e: + except (syaml.SpackYAMLError, OSError) as e: raise ConfigFileError(f"cannot write to config file {str(e)}") from e - def __repr__(self): - return "" % (self.name, self.path) + def __repr__(self) -> str: + return f"" class ImmutableConfigScope(ConfigScope): @@ -297,11 +306,11 @@ class ImmutableConfigScope(ConfigScope): This is used for ConfigScopes passed on the command line. """ - def _write_section(self, section): - raise ConfigError("Cannot write to immutable scope %s" % self) + def _write_section(self, section) -> None: + raise ConfigError(f"Cannot write to immutable scope {self}") - def __repr__(self): - return "" % (self.name, self.path) + def __repr__(self) -> str: + return f"" class InternalConfigScope(ConfigScope): @@ -312,56 +321,58 @@ class InternalConfigScope(ConfigScope): override settings from files. """ - def __init__(self, name, data=None): + def __init__(self, name: str, data: Optional[YamlConfigDict] = None) -> None: super().__init__(name, None) self.sections = syaml.syaml_dict() - if data: + if data is not None: data = InternalConfigScope._process_dict_keyname_overrides(data) for section in data: dsec = data[section] validate({section: dsec}, SECTION_SCHEMAS[section]) self.sections[section] = _mark_internal(syaml.syaml_dict({section: dsec}), name) - def get_section_filename(self, section): + def get_section_filename(self, section: str) -> str: raise NotImplementedError("Cannot get filename for InternalConfigScope.") - def get_section(self, section): + def get_section(self, section: str) -> Optional[YamlConfigDict]: """Just reads from an internal dictionary.""" if section not in self.sections: self.sections[section] = None return self.sections[section] - def _write_section(self, section): + def _write_section(self, section: str) -> None: """This only validates, as the data is already in memory.""" data = self.get_section(section) if data is not None: validate(data, SECTION_SCHEMAS[section]) self.sections[section] = _mark_internal(data, self.name) - def __repr__(self): - return "" % self.name + def __repr__(self) -> str: + return f"" - def clear(self): + def clear(self) -> None: # no cache to clear here. pass @staticmethod - def _process_dict_keyname_overrides(data): + def _process_dict_keyname_overrides(data: YamlConfigDict) -> YamlConfigDict: """Turn a trailing `:' in a key name into an override attribute.""" - result = {} + # Below we have a lot of type directives, since we hack on types and monkey-patch them + # by adding attributes that otherwise they won't have. + result: YamlConfigDict = {} for sk, sv in data.items(): if sk.endswith(":"): key = syaml.syaml_str(sk[:-1]) - key.override = True + key.override = True # type: ignore[attr-defined] elif sk.endswith("+"): key = syaml.syaml_str(sk[:-1]) - key.prepend = True + key.prepend = True # type: ignore[attr-defined] elif sk.endswith("-"): key = syaml.syaml_str(sk[:-1]) - key.append = True + key.append = True # type: ignore[attr-defined] else: - key = sk + key = sk # type: ignore[assignment] if isinstance(sv, dict): result[key] = InternalConfigScope._process_dict_keyname_overrides(sv) @@ -394,7 +405,7 @@ class Configuration: # convert to typing.OrderedDict when we drop 3.6, or OrderedDict when we reach 3.9 scopes: Dict[str, ConfigScope] - def __init__(self, *scopes: ConfigScope): + def __init__(self, *scopes: ConfigScope) -> None: """Initialize a configuration with an initial list of scopes. Args: @@ -405,26 +416,26 @@ def __init__(self, *scopes: ConfigScope): self.scopes = collections.OrderedDict() for scope in scopes: self.push_scope(scope) - self.format_updates: Dict[str, List[str]] = collections.defaultdict(list) + self.format_updates: Dict[str, List[ConfigScope]] = collections.defaultdict(list) @_config_mutator - def push_scope(self, scope: ConfigScope): + def push_scope(self, scope: ConfigScope) -> None: """Add a higher precedence scope to the Configuration.""" - tty.debug("[CONFIGURATION: PUSH SCOPE]: {}".format(str(scope)), level=2) + tty.debug(f"[CONFIGURATION: PUSH SCOPE]: {str(scope)}", level=2) self.scopes[scope.name] = scope @_config_mutator def pop_scope(self) -> ConfigScope: """Remove the highest precedence scope and return it.""" name, scope = self.scopes.popitem(last=True) # type: ignore[call-arg] - tty.debug("[CONFIGURATION: POP SCOPE]: {}".format(str(scope)), level=2) + tty.debug(f"[CONFIGURATION: POP SCOPE]: {str(scope)}", level=2) return scope @_config_mutator def remove_scope(self, scope_name: str) -> Optional[ConfigScope]: """Remove scope by name; has no effect when ``scope_name`` does not exist""" scope = self.scopes.pop(scope_name, None) - tty.debug("[CONFIGURATION: POP SCOPE]: {}".format(str(scope)), level=2) + tty.debug(f"[CONFIGURATION: POP SCOPE]: {str(scope)}", level=2) return scope @property @@ -481,16 +492,16 @@ def _validate_scope(self, scope: Optional[str]) -> ConfigScope: else: raise ValueError( - "Invalid config scope: '%s'. Must be one of %s" % (scope, self.scopes.keys()) + f"Invalid config scope: '{scope}'. Must be one of {self.scopes.keys()}" ) - def get_config_filename(self, scope, section) -> str: + def get_config_filename(self, scope: str, section: str) -> str: """For some scope and section, get the name of the configuration file.""" scope = self._validate_scope(scope) return scope.get_section_filename(section) @_config_mutator - def clear_caches(self): + def clear_caches(self) -> None: """Clears the caches for configuration files, This will cause files to be re-read upon the next request.""" @@ -500,7 +511,7 @@ def clear_caches(self): @_config_mutator def update_config( self, section: str, update_data: Dict, scope: Optional[str] = None, force: bool = False - ): + ) -> None: """Update the configuration file for a particular scope. Overwrites contents of a section in a scope with update_data, @@ -514,10 +525,10 @@ def update_config( format will fail to update unless ``force`` is True. Args: - section (str): section of the configuration to be updated - update_data (dict): data to be used for the update - scope (str): scope to be updated - force (str): force the update + section: section of the configuration to be updated + update_data: data to be used for the update + scope: scope to be updated + force: force the update """ if self.format_updates.get(section) and not force: msg = ( @@ -546,7 +557,7 @@ def update_config( scope._write_section(section) - def get_config(self, section, scope=None): + def get_config(self, section: str, scope: Optional[str] = None) -> YamlConfigDict: """Get configuration settings for a section. If ``scope`` is ``None`` or not provided, return the merged contents @@ -573,12 +584,12 @@ def get_config(self, section, scope=None): """ return self._get_config_memoized(section, scope) - @llnl.util.lang.memoized - def _get_config_memoized(self, section, scope): + @lang.memoized + def _get_config_memoized(self, section: str, scope: Optional[str]) -> YamlConfigDict: _validate_section_name(section) if scope is None: - scopes = self.scopes.values() + scopes = list(self.scopes.values()) else: scopes = [self._validate_scope(scope)] @@ -613,7 +624,7 @@ def _get_config_memoized(self, section, scope): ret = syaml.syaml_dict(ret) return ret - def get(self, path, default=None, scope=None): + def get(self, path: str, default: Optional[Any] = None, scope: Optional[str] = None) -> Any: """Get a config section or a single value from one. Accepts a path syntax that allows us to grab nested config map @@ -627,7 +638,6 @@ def get(self, path, default=None, scope=None): We use ``:`` as the separator, like YAML objects. """ - # TODO: Currently only handles maps. Think about lists if needed. parts = process_config_path(path) section = parts.pop(0) @@ -644,7 +654,7 @@ def get(self, path, default=None, scope=None): return value @_config_mutator - def set(self, path, value, scope=None): + def set(self, path: str, value: Any, scope: Optional[str] = None) -> None: """Convenience function for setting single values in config files. Accepts the path syntax described in ``get()``. @@ -686,21 +696,22 @@ def set(self, path, value, scope=None): def __iter__(self): """Iterate over scopes in this configuration.""" - for scope in self.scopes.values(): - yield scope + yield from self.scopes.values() - def print_section(self, section, blame=False): + def print_section(self, section: str, blame: bool = False, *, scope=None) -> None: """Print a configuration to stdout.""" try: data = syaml.syaml_dict() - data[section] = self.get_config(section) + data[section] = self.get_config(section, scope=scope) syaml.dump_config(data, stream=sys.stdout, default_flow_style=False, blame=blame) - except (syaml.SpackYAMLError, IOError) as e: + except (syaml.SpackYAMLError, OSError) as e: raise ConfigError(f"cannot read '{section}' configuration") from e -@contextmanager -def override(path_or_scope, value=None): +@contextlib.contextmanager +def override( + path_or_scope: Union[ConfigScope, str], value: Optional[Any] = None +) -> Generator[Union[lang.Singleton, Configuration], None, None]: """Simple way to override config settings within a context. Arguments: @@ -718,10 +729,10 @@ def override(path_or_scope, value=None): else: base_name = _OVERRIDES_BASE_NAME # Ensure the new override gets a unique scope name - current_overrides = [s.name for s in CONFIG.matching_scopes(r"^{0}".format(base_name))] + current_overrides = [s.name for s in CONFIG.matching_scopes(rf"^{base_name}")] num_overrides = len(current_overrides) while True: - scope_name = "{0}{1}".format(base_name, num_overrides) + scope_name = f"{base_name}{num_overrides}" if scope_name in current_overrides: num_overrides += 1 else: @@ -738,12 +749,13 @@ def override(path_or_scope, value=None): assert scope is overrides -#: configuration scopes added on the command line -#: set by ``spack.main.main()``. +#: configuration scopes added on the command line set by ``spack.main.main()`` COMMAND_LINE_SCOPES: List[str] = [] -def _add_platform_scope(cfg, scope_type, name, path): +def _add_platform_scope( + cfg: Union[Configuration, lang.Singleton], scope_type: Type[ConfigScope], name: str, path: str +) -> None: """Add a platform-specific subdirectory for the current platform.""" platform = spack.platforms.host().name plat_name = os.path.join(name, platform) @@ -751,7 +763,9 @@ def _add_platform_scope(cfg, scope_type, name, path): cfg.push_scope(scope_type(plat_name, plat_path)) -def _add_command_line_scopes(cfg, command_line_scopes): +def _add_command_line_scopes( + cfg: Union[Configuration, lang.Singleton], command_line_scopes: List[str] +) -> None: """Add additional scopes from the --config-scope argument. Command line scopes are named after their position in the arg list. @@ -760,26 +774,22 @@ def _add_command_line_scopes(cfg, command_line_scopes): # We ensure that these scopes exist and are readable, as they are # provided on the command line by the user. if not os.path.isdir(path): - raise ConfigError("config scope is not a directory: '%s'" % path) + raise ConfigError(f"config scope is not a directory: '{path}'") elif not os.access(path, os.R_OK): - raise ConfigError("config scope is not readable: '%s'" % path) + raise ConfigError(f"config scope is not readable: '{path}'") # name based on order on the command line - name = "cmd_scope_%d" % i + name = f"cmd_scope_{i:d}" cfg.push_scope(ImmutableConfigScope(name, path)) _add_platform_scope(cfg, ImmutableConfigScope, name, path) -def create(): +def create() -> Configuration: """Singleton Configuration instance. This constructs one instance associated with this module and returns it. It is bundled inside a function so that configuration can be initialized lazily. - - Return: - (Configuration): object for accessing spack configuration - """ cfg = Configuration() @@ -828,16 +838,25 @@ def create(): #: This is the singleton configuration instance for Spack. -CONFIG: Union[Configuration, llnl.util.lang.Singleton] = llnl.util.lang.Singleton(create) +CONFIG: Union[Configuration, lang.Singleton] = lang.Singleton(create) -def add_from_file(filename, scope=None): +def add_from_file(filename: str, scope: Optional[str] = None) -> None: """Add updates to a config from a filename""" # Extract internal attributes, if we are dealing with an environment data = read_config_file(filename) + if data is None: + return + if spack.schema.env.TOP_LEVEL_KEY in data: data = data[spack.schema.env.TOP_LEVEL_KEY] + msg = ( + "unexpected 'None' value when retrieving configuration. " + "Please submit a bug-report at https://github.com/spack/spack/issues" + ) + assert data is not None, msg + # update all sections from config dict # We have to iterate on keys to keep overrides from the file for section in data.keys(): @@ -855,7 +874,7 @@ def add_from_file(filename, scope=None): CONFIG.set(section, new, scope) -def add(fullpath, scope=None): +def add(fullpath: str, scope: Optional[str] = None) -> None: """Add the given configuration to the specified config scope. Add accepts a path. If you want to add from a filename, use add_from_file""" components = process_config_path(fullpath) @@ -863,7 +882,9 @@ def add(fullpath, scope=None): has_existing_value = True path = "" override = False - value = syaml.load_config(components[-1]) + value = components[-1] + if not isinstance(value, syaml.syaml_str): + value = syaml.load_config(value) for idx, name in enumerate(components[:-1]): # First handle double colons in constructing path colon = "::" if override else ":" if path else "" @@ -885,7 +906,7 @@ def add(fullpath, scope=None): # construct value from this point down for component in reversed(components[idx + 1 : -1]): - value = {component: value} + value: Dict[str, str] = {component: value} # type: ignore[no-redef] break if override: @@ -896,19 +917,19 @@ def add(fullpath, scope=None): # append values to lists if isinstance(existing, list) and not isinstance(value, list): - value = [value] + value: List[str] = [value] # type: ignore[no-redef] # merge value into existing new = merge_yaml(existing, value) CONFIG.set(path, new, scope) -def get(path, default=None, scope=None): +def get(path: str, default: Optional[Any] = None, scope: Optional[str] = None) -> Any: """Module-level wrapper for ``Configuration.get()``.""" return CONFIG.get(path, default, scope) -def set(path, value, scope=None): +def set(path: str, value: Any, scope: Optional[str] = None) -> None: """Convenience function for setting single values in config files. Accepts the path syntax described in ``get()``. @@ -916,32 +937,114 @@ def set(path, value, scope=None): return CONFIG.set(path, value, scope) -def add_default_platform_scope(platform): +def add_default_platform_scope(platform: str) -> None: plat_name = os.path.join("defaults", platform) plat_path = os.path.join(CONFIGURATION_DEFAULTS_PATH[1], platform) CONFIG.push_scope(ConfigScope(plat_name, plat_path)) -def scopes(): +def scopes() -> Dict[str, ConfigScope]: """Convenience function to get list of configuration scopes.""" return CONFIG.scopes -def _validate_section_name(section): +def writable_scopes() -> List[ConfigScope]: + """ + Return list of writable scopes. Higher-priority scopes come first in the + list. + """ + return list( + reversed( + list( + x + for x in CONFIG.scopes.values() + if not isinstance(x, (InternalConfigScope, ImmutableConfigScope)) + ) + ) + ) + + +def writable_scope_names() -> List[str]: + return list(x.name for x in writable_scopes()) + + +def matched_config(cfg_path: str) -> List[Tuple[str, Any]]: + return [(scope, get(cfg_path, scope=scope)) for scope in writable_scope_names()] + + +def change_or_add( + section_name: str, find_fn: Callable[[str], bool], update_fn: Callable[[str], None] +) -> None: + """Change or add a subsection of config, with additional logic to + select a reasonable scope where the change is applied. + + Search through config scopes starting with the highest priority: + the first matching a criteria (determined by ``find_fn``) is updated; + if no such config exists, find the first config scope that defines + any config for the named section; if no scopes define any related + config, then update the highest-priority config scope. + """ + configs_by_section = matched_config(section_name) + + found = False + for scope, section in configs_by_section: + found = find_fn(section) + if found: + break + + if found: + update_fn(section) + spack.config.set(section_name, section, scope=scope) + return + + # If no scope meets the criteria specified by ``find_fn``, + # then look for a scope that has any content (for the specified + # section name) + for scope, section in configs_by_section: + if section: + update_fn(section) + found = True + break + + if found: + spack.config.set(section_name, section, scope=scope) + return + + # If no scopes define any config for the named section, then + # modify the highest-priority scope. + scope, section = configs_by_section[0] + update_fn(section) + spack.config.set(section_name, section, scope=scope) + + +def update_all(section_name: str, change_fn: Callable[[str], bool]) -> None: + """Change a config section, which may have details duplicated + across multiple scopes. + """ + configs_by_section = matched_config("develop") + + for scope, section in configs_by_section: + modified = change_fn(section) + if modified: + spack.config.set(section_name, section, scope=scope) + + +def _validate_section_name(section: str) -> None: """Exit if the section is not a valid section.""" if section not in SECTION_SCHEMAS: raise ConfigSectionError( - "Invalid config section: '%s'. Options are: %s" - % (section, " ".join(SECTION_SCHEMAS.keys())) + f"Invalid config section: '{section}'. Options are: {' '.join(SECTION_SCHEMAS.keys())}" ) -def validate(data, schema, filename=None): +def validate( + data: YamlConfigDict, schema: YamlConfigDict, filename: Optional[str] = None +) -> YamlConfigDict: """Validate data read in from a Spack YAML file. Arguments: - data (dict or list): data read from a Spack YAML file - schema (dict or list): jsonschema to validate data + data: data read from a Spack YAML file + schema: jsonschema to validate data This leverages the line information (start_mark, end_mark) stored on Spack YAML structures. @@ -964,7 +1067,9 @@ def validate(data, schema, filename=None): return test_data -def read_config_file(filename, schema=None): +def read_config_file( + filename: str, schema: Optional[YamlConfigDict] = None +) -> Optional[YamlConfigDict]: """Read a YAML configuration file. User can provide a schema for validation. If no schema is provided, @@ -976,17 +1081,17 @@ def read_config_file(filename, schema=None): if not os.path.exists(filename): # Ignore nonexistent files. - tty.debug("Skipping nonexistent config path {0}".format(filename), level=3) + tty.debug(f"Skipping nonexistent config path {filename}", level=3) return None elif not os.path.isfile(filename): - raise ConfigFileError("Invalid configuration. %s exists but is not a file." % filename) + raise ConfigFileError(f"Invalid configuration. {filename} exists but is not a file.") elif not os.access(filename, os.R_OK): - raise ConfigFileError("Config file is not readable: {0}".format(filename)) + raise ConfigFileError(f"Config file is not readable: {filename}") try: - tty.debug("Reading config from file {0}".format(filename)) + tty.debug(f"Reading config from file {filename}") with open(filename) as f: data = syaml.load_config(f) @@ -1004,11 +1109,11 @@ def read_config_file(filename, schema=None): except syaml.SpackYAMLError as e: raise ConfigFileError(str(e)) from e - except IOError as e: + except OSError as e: raise ConfigFileError(f"Error reading configuration file {filename}: {str(e)}") from e -def _override(string): +def _override(string: str) -> bool: """Test if a spack YAML string is an override. See ``spack_yaml`` for details. Keys in Spack YAML can end in `::`, @@ -1019,7 +1124,7 @@ def _override(string): return hasattr(string, "override") and string.override -def _append(string): +def _append(string: str) -> bool: """Test if a spack YAML string is an override. See ``spack_yaml`` for details. Keys in Spack YAML can end in `+:`, @@ -1033,7 +1138,7 @@ def _append(string): return getattr(string, "append", False) -def _prepend(string): +def _prepend(string: str) -> bool: """Test if a spack YAML string is an override. See ``spack_yaml`` for details. Keys in Spack YAML can end in `+:`, @@ -1105,7 +1210,7 @@ def get_valid_type(path): return types[schema_type]() else: return type(None) - raise ConfigError("Cannot determine valid type for path '%s'." % path) + raise ConfigError(f"Cannot determine valid type for path '{path}'.") def remove_yaml(dest, source): @@ -1233,62 +1338,147 @@ def they_are(t): return copy.copy(source) -def process_config_path(path): +class ConfigPath: + quoted_string = "(?:\"[^\"]+\")|(?:'[^']+')" + unquoted_string = "[^:'\"]+" + element = rf"(?:(?:{quoted_string})|(?:{unquoted_string}))" + next_key_pattern = rf"({element}[+-]?)(?:\:|$)" + + @staticmethod + def _split_front(string, extract): + m = re.match(extract, string) + if not m: + return None, None + token = m.group(1) + return token, string[len(token) :] + + @staticmethod + def _validate(path): + """Example valid config paths: + + x:y:z + x:"y":z + x:y+:z + x:y::z + x:y+::z + x:y: + x:y:: + """ + first_key, path = ConfigPath._split_front(path, ConfigPath.next_key_pattern) + if not first_key: + raise ValueError(f"Config path does not start with a parse-able key: {path}") + path_elements = [first_key] + path_index = 1 + while path: + separator, path = ConfigPath._split_front(path, r"(\:+)") + if not separator: + raise ValueError(f"Expected separator for {path}") + + path_elements[path_index - 1] += separator + if not path: + break + + element, remainder = ConfigPath._split_front(path, ConfigPath.next_key_pattern) + if not element: + # If we can't parse something as a key, then it must be a + # value (if it's valid). + try: + syaml.load_config(path) + except spack.util.spack_yaml.SpackYAMLError as e: + raise ValueError( + "Remainder of path is not a valid key" + f" and does not parse as a value {path}" + ) from e + element = path + path = None # The rest of the path was consumed into the value + else: + path = remainder + + path_elements.append(element) + path_index += 1 + + return path_elements + + @staticmethod + def process(path): + result = [] + quote = "['\"]" + seen_override_in_path = False + + path_elements = ConfigPath._validate(path) + last_element_idx = len(path_elements) - 1 + for i, element in enumerate(path_elements): + override = False + append = False + prepend = False + quoted = False + if element.endswith("::") or (element.endswith(":") and i == last_element_idx): + if seen_override_in_path: + raise syaml.SpackYAMLError( + "Meaningless second override indicator `::' in path `{0}'".format(path), "" + ) + override = True + seen_override_in_path = True + element = element.rstrip(":") + + if element.endswith("+"): + prepend = True + elif element.endswith("-"): + append = True + element = element.rstrip("+-") + + if re.match(f"^{quote}", element): + quoted = True + element = element.strip("'\"") + + if any([append, prepend, override, quoted]): + element = syaml.syaml_str(element) + if append: + element.append = True + if prepend: + element.prepend = True + if override: + element.override = True + + result.append(element) + + return result + + +def process_config_path(path: str) -> List[str]: """Process a path argument to config.set() that may contain overrides ('::' or trailing ':') - Note: quoted value path components will be processed as a single value (escaping colons) - quoted path components outside of the value will be considered ill formed and will - raise. - e.g. `this:is:a:path:'value:with:colon'` will yield: + Colons will be treated as static strings if inside of quotes, + e.g. `this:is:a:path:'value:with:colon'` will yield: - [this, is, a, path, value:with:colon] - """ - result = [] - if path.startswith(":"): - raise syaml.SpackYAMLError("Illegal leading `:' in path `{0}'".format(path), "") - seen_override_in_path = False - while path: - front, sep, path = path.partition(":") - if (sep and not path) or path.startswith(":"): - if seen_override_in_path: - raise syaml.SpackYAMLError( - "Meaningless second override" " indicator `::' in path `{0}'".format(path), "" - ) - path = path.lstrip(":") - front = syaml.syaml_str(front) - front.override = True - seen_override_in_path = True - - elif front.endswith("+"): - front = front.rstrip("+") - front = syaml.syaml_str(front) - front.prepend = True - - elif front.endswith("-"): - front = front.rstrip("-") - front = syaml.syaml_str(front) - front.append = True - - result.append(front) + [this, is, a, path, value:with:colon] - quote = "['\"]" - not_quote = "[^'\"]" + The path may consist only of keys (e.g. for a `get`) or may end in a value. + Keys are always strings: if a user encloses a key in quotes, the quotes + should be removed. Values with quotes should be treated as strings, + but without quotes, may be parsed as a different yaml object (e.g. + '{}' is a dict, but '"{}"' is a string). - if re.match(f"^{quote}", path): - m = re.match(rf"^({quote}{not_quote}+{quote})$", path) - if not m: - raise ValueError("Quotes indicate value, but there are additional path entries") - result.append(m.group(1)) - break + This function does not know whether the final element of the path is a + key or value, so: - return result + * It must strip the quotes, in case it is a key (so we look for "key" and + not '"key"')) + * It must indicate somehow that the quotes were stripped, in case it is a + value (so that we don't process '"{}"' as a YAML dict) + + Therefore, all elements with quotes are stripped, and then also converted + to ``syaml_str`` (if treating the final element as a value, the caller + should not parse it in this case). + """ + return ConfigPath.process(path) # # Settings for commands that modify configuration # -def default_modify_scope(section="config"): +def default_modify_scope(section: str = "config") -> str: """Return the config scope that commands should modify by default. Commands that modify configuration by default modify the *highest* @@ -1304,23 +1494,15 @@ def default_modify_scope(section="config"): return CONFIG.highest_precedence_non_platform_scope().name -def default_list_scope(): - """Return the config scope that is listed by default. - - Commands that list configuration list *all* scopes (merged) by default. - """ - return None - - -def _update_in_memory(data, section): +def _update_in_memory(data: YamlConfigDict, section: str) -> bool: """Update the format of the configuration data in memory. This function assumes the section is valid (i.e. validation is responsibility of the caller) Args: - data (dict): configuration data - section (str): section of the configuration to update + data: configuration data + section: section of the configuration to update Returns: True if the data was changed, False otherwise @@ -1330,14 +1512,14 @@ def _update_in_memory(data, section): return changed -def ensure_latest_format_fn(section): +def ensure_latest_format_fn(section: str) -> Callable[[YamlConfigDict], bool]: """Return a function that takes as input a dictionary read from a configuration file and update it to the latest format. The function returns True if there was any update, False otherwise. Args: - section (str): section of the configuration e.g. "packages", + section: section of the configuration e.g. "packages", "config", etc. """ # The line below is based on the fact that every module we need @@ -1348,7 +1530,9 @@ def ensure_latest_format_fn(section): @contextlib.contextmanager -def use_configuration(*scopes_or_paths): +def use_configuration( + *scopes_or_paths: Union[ConfigScope, str] +) -> Generator[Configuration, None, None]: """Use the configuration scopes passed as arguments within the context manager. @@ -1372,8 +1556,8 @@ def use_configuration(*scopes_or_paths): CONFIG = saved_config -@llnl.util.lang.memoized -def _config_from(scopes_or_paths): +@lang.memoized +def _config_from(scopes_or_paths: List[Union[ConfigScope, str]]) -> Configuration: scopes = [] for scope_or_path in scopes_or_paths: # If we have a config scope we are already done @@ -1383,7 +1567,7 @@ def _config_from(scopes_or_paths): # Otherwise we need to construct it path = os.path.normpath(scope_or_path) - assert os.path.isdir(path), '"{0}" must be a directory'.format(path) + assert os.path.isdir(path), f'"{path}" must be a directory' name = os.path.basename(path) scopes.append(ConfigScope(name, path)) @@ -1391,13 +1575,14 @@ def _config_from(scopes_or_paths): return configuration -def raw_github_gitlab_url(url): +def raw_github_gitlab_url(url: str) -> str: """Transform a github URL to the raw form to avoid undesirable html. Args: url: url to be converted to raw form - Returns: (str) raw github/gitlab url or the original url + Returns: + Raw github/gitlab url or the original url """ # Note we rely on GitHub to redirect the 'raw' URL returned here to the # actual URL under https://raw.githubusercontent.com/ with '/blob' @@ -1450,7 +1635,7 @@ def fetch_remote_configs(url: str, dest_dir: str, skip_existing: bool = True) -> def _fetch_file(url): raw = raw_github_gitlab_url(url) - tty.debug("Reading config from url {0}".format(raw)) + tty.debug(f"Reading config from url {raw}") return web_util.fetch_url_text(raw, dest_dir=dest_dir) if not url: @@ -1466,8 +1651,8 @@ def _fetch_file(url): basename = os.path.basename(config_url) if skip_existing and basename in existing_files: tty.warn( - "Will not fetch configuration from {0} since a version already" - "exists in {1}".format(config_url, dest_dir) + f"Will not fetch configuration from {config_url} since a " + f"version already exists in {dest_dir}" ) path = os.path.join(dest_dir, basename) else: @@ -1479,7 +1664,50 @@ def _fetch_file(url): if paths: return dest_dir if len(paths) > 1 else paths[0] - raise ConfigFileError("Cannot retrieve configuration (yaml) from {0}".format(url)) + raise ConfigFileError(f"Cannot retrieve configuration (yaml) from {url}") + + +def get_mark_from_yaml_data(obj): + """Try to get ``spack.util.spack_yaml`` mark from YAML data. + + We try the object, and if that fails we try its first member (if it's a container). + + Returns: + mark if one is found, otherwise None. + """ + # mark of object itelf + mark = getattr(obj, "_start_mark", None) + if mark: + return mark + + # mark of first member if it is a container + if isinstance(obj, (list, dict)): + first_member = next(iter(obj), None) + if first_member: + mark = getattr(first_member, "_start_mark", None) + + return mark + + +def parse_spec_from_yaml_string(string: str) -> "spack.spec.Spec": + """Parse a spec from YAML and add file/line info to errors, if it's available. + + Parse a ``Spec`` from the supplied string, but also intercept any syntax errors and + add file/line information for debugging using file/line annotations from the string. + + Arguments: + string: a string representing a ``Spec`` from config YAML. + + """ + try: + spec = spack.spec.Spec(string) + return spec + except spack.parser.SpecSyntaxError as e: + mark = spack.config.get_mark_from_yaml_data(string) + if mark: + msg = f"{mark.name}:{mark.line + 1}: {str(e)}" + raise spack.parser.SpecSyntaxError(msg) from e + raise e class ConfigError(SpackError): @@ -1497,7 +1725,13 @@ class ConfigFileError(ConfigError): class ConfigFormatError(ConfigError): """Raised when a configuration format does not match its schema.""" - def __init__(self, validation_error, data, filename=None, line=None): + def __init__( + self, + validation_error, + data: YamlConfigDict, + filename: Optional[str] = None, + line: Optional[int] = None, + ) -> None: # spack yaml has its own file/line marks -- try to find them # we prioritize these over the inputs self.validation_error = validation_error @@ -1511,33 +1745,19 @@ def __init__(self, validation_error, data, filename=None, line=None): # construct location location = "" if filename: - location = "%s" % filename + location = f"{filename}" if line is not None: - location += ":%d" % line + location += f":{line:d}" - message = "%s: %s" % (location, validation_error.message) + message = f"{location}: {validation_error.message}" super().__init__(message) def _get_mark(self, validation_error, data): """Get the file/line mark fo a validation error from a Spack YAML file.""" - def _get_mark_or_first_member_mark(obj): - # mark of object itelf - mark = getattr(obj, "_start_mark", None) - if mark: - return mark - - # mark of first member if it is a container - if isinstance(obj, (list, dict)): - first_member = next(iter(obj), None) - if first_member: - mark = getattr(first_member, "_start_mark", None) - if mark: - return mark - # Try various places, starting with instance and parent for obj in (validation_error.instance, validation_error.parent): - mark = _get_mark_or_first_member_mark(obj) + mark = get_mark_from_yaml_data(obj) if mark: return mark diff --git a/lib/spack/spack/container/__init__.py b/lib/spack/spack/container/__init__.py index 988849d5f2eb1c..1c333f721f3b83 100644 --- a/lib/spack/spack/container/__init__.py +++ b/lib/spack/spack/container/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/container/images.py b/lib/spack/spack/container/images.py index 476fbab1db3614..6ff4f456af24d8 100644 --- a/lib/spack/spack/container/images.py +++ b/lib/spack/spack/container/images.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/container/writers/__init__.py b/lib/spack/spack/container/writers/__init__.py index 60e6dc61ea4f7d..1be85aaf2ae051 100644 --- a/lib/spack/spack/container/writers/__init__.py +++ b/lib/spack/spack/container/writers/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/container/writers/docker.py b/lib/spack/spack/container/writers/docker.py index 98b9bef75b4ca7..287ef9d1ac79cc 100644 --- a/lib/spack/spack/container/writers/docker.py +++ b/lib/spack/spack/container/writers/docker.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/container/writers/singularity.py b/lib/spack/spack/container/writers/singularity.py index d54eb935cfa2a2..5cbb055fd3fd5f 100644 --- a/lib/spack/spack/container/writers/singularity.py +++ b/lib/spack/spack/container/writers/singularity.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/context.py b/lib/spack/spack/context.py index de3311da22b0ff..4eb8740753b1d9 100644 --- a/lib/spack/spack/context.py +++ b/lib/spack/spack/context.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/cray_manifest.py b/lib/spack/spack/cray_manifest.py index 48ec52d782d3bb..eb26b3e6b99ac3 100644 --- a/lib/spack/spack/cray_manifest.py +++ b/lib/spack/spack/cray_manifest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index ecda8c36b0f0ba..a854b864da7831 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,9 +25,20 @@ import socket import sys import time -from typing import Any, Callable, Dict, Generator, List, NamedTuple, Set, Type, Union - -import spack.deptypes as dt +from typing import ( + Any, + Callable, + Container, + Dict, + Generator, + List, + NamedTuple, + Optional, + Set, + Tuple, + Type, + Union, +) try: import uuid @@ -37,13 +48,13 @@ _use_uuid = False pass -from typing import Optional, Tuple - import llnl.util.filesystem as fs import llnl.util.tty as tty +import spack.deptypes as dt import spack.hash_types as ht import spack.spec +import spack.traverse as tr import spack.util.lock as lk import spack.util.spack_json as sjson import spack.version as vn @@ -297,7 +308,7 @@ def __reduce__(self): end_date (datetime.datetime or None): filters the query discarding specs that have been installed after ``end_date``. - hashes (typing.Container): list or set of hashes that we can use to + hashes (Container): list or set of hashes that we can use to restrict the search in_buildcache (bool or None): Specs that are marked in @@ -1648,31 +1659,35 @@ def is_occupied_install_prefix(self, path): with self.read_transaction(): return path in self._installed_prefixes - @property - def unused_specs(self): - """Return all the specs that are currently installed but not needed - at runtime to satisfy user's requests. - - Specs in the return list are those which are not either: - 1. Installed on an explicit user request - 2. Installed as a "run" or "link" dependency (even transitive) of - a spec at point 1. - """ - needed, visited = set(), set() + def all_hashes(self): + """Return dag hash of every spec in the database.""" with self.read_transaction(): - for key, rec in self._data.items(): - if not rec.explicit: - continue + return list(self._data.keys()) - # recycle `visited` across calls to avoid redundantly traversing - for spec in rec.spec.traverse(visited=visited, deptype=("link", "run")): - needed.add(spec.dag_hash()) + def unused_specs( + self, + root_hashes: Optional[Container[str]] = None, + deptype: Union[dt.DepFlag, dt.DepTypes] = dt.LINK | dt.RUN, + ) -> "List[spack.spec.Spec]": + """Return all specs that are currently installed but not needed by root specs. - unused = [ - rec.spec for key, rec in self._data.items() if key not in needed and rec.installed - ] + By default, roots are all explicit specs in the database. If a set of root + hashes are passed in, they are instead used as the roots. - return unused + Arguments: + root_hashes: optional list of roots to consider when evaluating needed installations. + deptype: if a spec is reachable from a root via these dependency types, it is + considered needed. By default only link and run dependency types are considered. + """ + + def root(key, record): + """Whether a DB record is a root for garbage collection.""" + return key in root_hashes if root_hashes is not None else record.explicit + + with self.read_transaction(): + roots = [rec.spec for key, rec in self._data.items() if root(key, rec)] + needed = set(id(spec) for spec in tr.traverse_nodes(roots, deptype=deptype)) + return [rec.spec for rec in self._data.values() if id(rec.spec) not in needed] def update_explicit(self, spec, explicit): """ diff --git a/lib/spack/spack/dependency.py b/lib/spack/spack/dependency.py index 3bb2df791b91b3..d8dd7b941fa71d 100644 --- a/lib/spack/spack/dependency.py +++ b/lib/spack/spack/dependency.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -79,4 +79,7 @@ def merge(self, other: "Dependency"): def __repr__(self) -> str: types = dt.flag_to_chars(self.depflag) - return f" {self.spec} [{types}]>" + if self.patches: + return f" {self.spec} [{types}, {self.patches}]>" + else: + return f" {self.spec} [{types}]>" diff --git a/lib/spack/spack/deptypes.py b/lib/spack/spack/deptypes.py index 91ac6907908df3..af196bd4ad00a3 100644 --- a/lib/spack/spack/deptypes.py +++ b/lib/spack/spack/deptypes.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/detection/__init__.py b/lib/spack/spack/detection/__init__.py index 7c54fb9d49ba76..44225ef0620087 100644 --- a/lib/spack/spack/detection/__init__.py +++ b/lib/spack/spack/detection/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/detection/common.py b/lib/spack/spack/detection/common.py index 6fba021b336b0c..516bd11c8d506b 100644 --- a/lib/spack/spack/detection/common.py +++ b/lib/spack/spack/detection/common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -309,10 +309,14 @@ def find_windows_kit_roots() -> List[str]: return glob.glob(kit_base) @staticmethod - def find_windows_kit_bin_paths(kit_base: Optional[str] = None) -> List[str]: + def find_windows_kit_bin_paths( + kit_base: Union[Optional[str], Optional[list]] = None + ) -> List[str]: """Returns Windows kit bin directory per version""" kit_base = WindowsKitExternalPaths.find_windows_kit_roots() if not kit_base else kit_base assert kit_base, "Unexpectedly empty value for Windows kit base path" + if isinstance(kit_base, str): + kit_base = kit_base.split(";") kit_paths = [] for kit in kit_base: kit_bin = os.path.join(kit, "bin") @@ -320,10 +324,14 @@ def find_windows_kit_bin_paths(kit_base: Optional[str] = None) -> List[str]: return kit_paths @staticmethod - def find_windows_kit_lib_paths(kit_base: Optional[str] = None) -> List[str]: + def find_windows_kit_lib_paths( + kit_base: Union[Optional[str], Optional[list]] = None + ) -> List[str]: """Returns Windows kit lib directory per version""" kit_base = WindowsKitExternalPaths.find_windows_kit_roots() if not kit_base else kit_base assert kit_base, "Unexpectedly empty value for Windows kit base path" + if isinstance(kit_base, str): + kit_base = kit_base.split(";") kit_paths = [] for kit in kit_base: kit_lib = os.path.join(kit, "Lib") diff --git a/lib/spack/spack/detection/path.py b/lib/spack/spack/detection/path.py index f5da02bede1842..514d1c13e28b47 100644 --- a/lib/spack/spack/detection/path.py +++ b/lib/spack/spack/detection/path.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/detection/test.py b/lib/spack/spack/detection/test.py index f33040f2929e86..a9a03115201407 100644 --- a/lib/spack/spack/detection/test.py +++ b/lib/spack/spack/detection/test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index fcd72d5bfcc12d..25245624280b79 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,7 @@ class OpenMpi(Package): * ``requires`` """ +import collections import collections.abc import functools import os.path @@ -83,7 +84,14 @@ class OpenMpi(Package): _patch_order_index = 0 -def make_when_spec(value): +SpecType = Union["spack.spec.Spec", str] +DepType = Union[Tuple[str, ...], str] +WhenType = Optional[Union["spack.spec.Spec", str, bool]] +Patcher = Callable[[Union["spack.package_base.PackageBase", Dependency]], None] +PatchesType = Optional[Union[Patcher, str, List[Union[Patcher, str]]]] + + +def _make_when_spec(value: WhenType) -> Optional["spack.spec.Spec"]: """Create a ``Spec`` that indicates when a directive should be applied. Directives with ``when`` specs, e.g.: @@ -106,7 +114,7 @@ def make_when_spec(value): as part of concretization. Arguments: - value (spack.spec.Spec or bool): a conditional Spec or a constant ``bool`` + value: a conditional Spec, constant ``bool``, or None if not supplied value indicating when a directive should be applied. """ @@ -116,7 +124,7 @@ def make_when_spec(value): # Unsatisfiable conditions are discarded by the caller, and never # added to the package class if value is False: - return False + return None # If there is no constraint, the directive should always apply; # represent this by returning the unconstrained `Spec()`, which is @@ -175,8 +183,8 @@ def __init__(cls, name, bases, attr_dict): # that the directives are called to set it up. if "spack.pkg" in cls.__module__: - # Ensure the presence of the dictionaries associated - # with the directives + # Ensure the presence of the dictionaries associated with the directives. + # All dictionaries are defaultdicts that create lists for missing keys. for d in DirectiveMeta._directive_dict_names: setattr(cls, d, {}) @@ -455,8 +463,15 @@ def _execute_version(pkg, ver, **kwargs): pkg.versions[version] = kwargs -def _depends_on(pkg, spec, when=None, type=dt.DEFAULT_TYPES, patches=None): - when_spec = make_when_spec(when) +def _depends_on( + pkg: "spack.package_base.PackageBase", + spec: SpecType, + *, + when: WhenType = None, + type: DepType = dt.DEFAULT_TYPES, + patches: PatchesType = None, +): + when_spec = _make_when_spec(when) if not when_spec: return @@ -467,7 +482,6 @@ def _depends_on(pkg, spec, when=None, type=dt.DEFAULT_TYPES, patches=None): raise CircularReferenceError("Package '%s' cannot depend on itself." % pkg.name) depflag = dt.canonicalize(type) - conditions = pkg.dependencies.setdefault(dep_spec.name, {}) # call this patches here for clarity -- we want patch to be a list, # but the caller doesn't have to make it one. @@ -495,11 +509,13 @@ def _depends_on(pkg, spec, when=None, type=dt.DEFAULT_TYPES, patches=None): assert all(callable(p) for p in patches) # this is where we actually add the dependency to this package - if when_spec not in conditions: + deps_by_name = pkg.dependencies.setdefault(when_spec, {}) + dependency = deps_by_name.get(dep_spec.name) + + if not dependency: dependency = Dependency(pkg, dep_spec, depflag=depflag) - conditions[when_spec] = dependency + deps_by_name[dep_spec.name] = dependency else: - dependency = conditions[when_spec] dependency.spec.constrain(dep_spec, deps=False) dependency.depflag |= depflag @@ -509,7 +525,7 @@ def _depends_on(pkg, spec, when=None, type=dt.DEFAULT_TYPES, patches=None): @directive("conflicts") -def conflicts(conflict_spec, when=None, msg=None): +def conflicts(conflict_spec: SpecType, when: WhenType = None, msg: Optional[str] = None): """Allows a package to define a conflict. Currently, a "conflict" is a concretized configuration that is known @@ -529,30 +545,35 @@ def conflicts(conflict_spec, when=None, msg=None): msg (str): optional user defined message """ - def _execute_conflicts(pkg): + def _execute_conflicts(pkg: "spack.package_base.PackageBase"): # If when is not specified the conflict always holds - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return # Save in a list the conflicts and the associated custom messages - when_spec_list = pkg.conflicts.setdefault(conflict_spec, []) + conflict_spec_list = pkg.conflicts.setdefault(when_spec, []) msg_with_name = f"{pkg.name}: {msg}" if msg is not None else msg - when_spec_list.append((when_spec, msg_with_name)) + conflict_spec_list.append((spack.spec.Spec(conflict_spec), msg_with_name)) return _execute_conflicts @directive(("dependencies")) -def depends_on(spec, when=None, type=dt.DEFAULT_TYPES, patches=None): +def depends_on( + spec: SpecType, + when: WhenType = None, + type: DepType = dt.DEFAULT_TYPES, + patches: PatchesType = None, +): """Creates a dict of deps with specs defining when they apply. Args: - spec (spack.spec.Spec or str): the package and constraints depended on - when (spack.spec.Spec or str): when the dependent satisfies this, it has + spec: the package and constraints depended on + when: when the dependent satisfies this, it has the dependency represented by ``spec`` - type (str or tuple): str or tuple of legal Spack deptypes - patches (typing.Callable or list): single result of ``patch()`` directive, a + type: str or tuple of legal Spack deptypes + patches: single result of ``patch()`` directive, a ``str`` to be passed to ``patch``, or a list of these This directive is to be used inside a Package definition to declare @@ -561,14 +582,14 @@ def depends_on(spec, when=None, type=dt.DEFAULT_TYPES, patches=None): """ - def _execute_depends_on(pkg): + def _execute_depends_on(pkg: "spack.package_base.PackageBase"): _depends_on(pkg, spec, when=when, type=type, patches=patches) return _execute_depends_on @directive(("extendees", "dependencies")) -def extends(spec, type=("build", "run"), **kwargs): +def extends(spec, when=None, type=("build", "run"), patches=None): """Same as depends_on, but also adds this package to the extendee list. keyword arguments can be passed to extends() so that extension @@ -578,20 +599,21 @@ def extends(spec, type=("build", "run"), **kwargs): """ def _execute_extends(pkg): - when = kwargs.get("when") - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return - _depends_on(pkg, spec, when=when, type=type) + _depends_on(pkg, spec, when=when, type=type, patches=patches) spec_obj = spack.spec.Spec(spec) - pkg.extendees[spec_obj.name] = (spec_obj, kwargs) + + # TODO: the values of the extendees dictionary are not used. Remove in next refactor. + pkg.extendees[spec_obj.name] = (spec_obj, None) return _execute_extends @directive(dicts=("provided", "provided_together")) -def provides(*specs, when: Optional[str] = None): +def provides(*specs: SpecType, when: WhenType = None): """Allows packages to provide a virtual dependency. If a package provides "mpi", other packages can declare that they depend on "mpi", @@ -602,16 +624,17 @@ def provides(*specs, when: Optional[str] = None): when: condition when this provides clause needs to be considered """ - def _execute_provides(pkg): + def _execute_provides(pkg: "spack.package_base.PackageBase"): import spack.parser # Avoid circular dependency - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return # ``when`` specs for ``provides()`` need a name, as they are used # to build the ProviderIndex. when_spec.name = pkg.name + spec_objs = [spack.spec.Spec(x) for x in specs] spec_names = [x.name for x in spec_objs] if len(spec_names) > 1: @@ -621,36 +644,38 @@ def _execute_provides(pkg): if pkg.name == provided_spec.name: raise CircularReferenceError("Package '%s' cannot provide itself." % pkg.name) - if provided_spec not in pkg.provided: - pkg.provided[provided_spec] = set() - pkg.provided[provided_spec].add(when_spec) + provided_set = pkg.provided.setdefault(when_spec, set()) + provided_set.add(provided_spec) return _execute_provides @directive("patches") -def patch(url_or_filename, level=1, when=None, working_dir=".", **kwargs): +def patch( + url_or_filename: str, + level: int = 1, + when: WhenType = None, + working_dir: str = ".", + sha256: Optional[str] = None, + archive_sha256: Optional[str] = None, +) -> Patcher: """Packages can declare patches to apply to source. You can optionally provide a when spec to indicate that a particular patch should only be applied when the package's spec meets certain conditions (e.g. a particular version). Args: - url_or_filename (str): url or relative filename of the patch - level (int): patch level (as in the patch shell command) - when (spack.spec.Spec): optional anonymous spec that specifies when to apply - the patch - working_dir (str): dir to change to before applying - - Keyword Args: - sha256 (str): sha256 sum of the patch, used to verify the patch - (only required for URL patches) - archive_sha256 (str): sha256 sum of the *archive*, if the patch - is compressed (only required for compressed URL patches) + url_or_filename: url or relative filename of the patch + level: patch level (as in the patch shell command) + when: optional anonymous spec that specifies when to apply the patch + working_dir: dir to change to before applying + sha256: sha256 sum of the patch, used to verify the patch (only required for URL patches) + archive_sha256: sha256 sum of the *archive*, if the patch is compressed (only required for + compressed URL patches) """ - def _execute_patch(pkg_or_dep): + def _execute_patch(pkg_or_dep: Union["spack.package_base.PackageBase", Dependency]): pkg = pkg_or_dep if isinstance(pkg, Dependency): pkg = pkg.pkg @@ -660,7 +685,7 @@ def _execute_patch(pkg_or_dep): "Patches are not allowed in {0}: package has no code.".format(pkg.name) ) - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return @@ -672,9 +697,16 @@ def _execute_patch(pkg_or_dep): ordering_key = (pkg.name, _patch_order_index) _patch_order_index += 1 + patch: spack.patch.Patch if "://" in url_or_filename: patch = spack.patch.UrlPatch( - pkg, url_or_filename, level, working_dir, ordering_key=ordering_key, **kwargs + pkg, + url_or_filename, + level, + working_dir, + ordering_key=ordering_key, + sha256=sha256, + archive_sha256=archive_sha256, ) else: patch = spack.patch.FilePatch( @@ -781,7 +813,7 @@ def _raise_default_not_set(pkg): description = str(description).strip() def _execute_variant(pkg): - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) when_specs = [when_spec] if not re.match(spack.spec.IDENTIFIER_RE, name): @@ -823,7 +855,7 @@ def resource(**kwargs): def _execute_resource(pkg): when = kwargs.get("when") - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return @@ -889,17 +921,17 @@ def _execute_maintainer(pkg): def _execute_license(pkg, license_identifier: str, when): # If when is not specified the license always holds - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return for other_when_spec in pkg.licenses: if when_spec.intersects(other_when_spec): when_message = "" - if when_spec != make_when_spec(None): + if when_spec != _make_when_spec(None): when_message = f"when {when_spec}" other_when_message = "" - if other_when_spec != make_when_spec(None): + if other_when_spec != _make_when_spec(None): other_when_message = f"when {other_when_spec}" err_msg = ( f"{pkg.name} is specified as being licensed as {license_identifier} " @@ -912,21 +944,28 @@ def _execute_license(pkg, license_identifier: str, when): @directive("licenses") -def license(license_identifier: str, when=None): +def license( + license_identifier: str, + checked_by: Optional[Union[str, List[str]]] = None, + when: Optional[Union[str, bool]] = None, +): """Add a new license directive, to specify the SPDX identifier the software is distributed under. Args: - license_identifiers: A list of SPDX identifiers specifying the licenses - the software is distributed under. + license_identifiers: SPDX identifier specifying the license(s) the software + is distributed under. + checked_by: string or list of strings indicating which github user checked the + license (if any). when: A spec specifying when the license applies. + when: A spec specifying when the license applies. """ return lambda pkg: _execute_license(pkg, license_identifier, when) @directive("requirements") -def requires(*requirement_specs, policy="one_of", when=None, msg=None): +def requires(*requirement_specs: str, policy="one_of", when=None, msg=None): """Allows a package to request a configuration to be present in all valid solutions. For instance, a package that is known to compile only with GCC can declare: @@ -945,7 +984,7 @@ def requires(*requirement_specs, policy="one_of", when=None, msg=None): msg: optional user defined message """ - def _execute_requires(pkg): + def _execute_requires(pkg: "spack.package_base.PackageBase"): if policy not in ("one_of", "any_of"): err_msg = ( f"the 'policy' argument of the 'requires' directive in {pkg.name} is set " @@ -953,14 +992,15 @@ def _execute_requires(pkg): ) raise DirectiveError(err_msg) - when_spec = make_when_spec(when) + when_spec = _make_when_spec(when) if not when_spec: return # Save in a list the requirements and the associated custom messages - when_spec_list = pkg.requirements.setdefault(tuple(requirement_specs), []) + requirement_list = pkg.requirements.setdefault(when_spec, []) msg_with_name = f"{pkg.name}: {msg}" if msg is not None else msg - when_spec_list.append((when_spec, policy, msg_with_name)) + requirements = tuple(spack.spec.Spec(s) for s in requirement_specs) + requirement_list.append((requirements, policy, msg_with_name)) return _execute_requires diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index c0741a037c0a03..b7a9b93431ce00 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/environment/__init__.py b/lib/spack/spack/environment/__init__.py index 2f293d9eb8f81b..e6521aed871bdf 100644 --- a/lib/spack/spack/environment/__init__.py +++ b/lib/spack/spack/environment/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/environment/depfile.py b/lib/spack/spack/environment/depfile.py index 34e2481fa916c3..06dc8f157d05ec 100644 --- a/lib/spack/spack/environment/depfile.py +++ b/lib/spack/spack/environment/depfile.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py index 5d6273506ec9c6..2a6cc6e77440d5 100644 --- a/lib/spack/spack/environment/environment.py +++ b/lib/spack/spack/environment/environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,7 @@ import urllib.parse import urllib.request import warnings -from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union +from typing import Dict, Iterable, List, Optional, Set, Tuple, Union import llnl.util.filesystem as fs import llnl.util.tty as tty @@ -83,17 +83,30 @@ lockfile_name = "spack.lock" -#: Name of the directory where environments store repos, logs, views +#: Name of the directory where environments store repos, logs, views, configs env_subdir_name = ".spack-env" -def env_root_path(): +def env_root_path() -> str: """Override default root path if the user specified it""" return spack.util.path.canonicalize_path( spack.config.get("config:environments_root", default=default_env_path) ) +def environment_name(path: Union[str, pathlib.Path]) -> str: + """Human-readable representation of the environment. + + This is the path for directory environments, and just the name + for managed environments. + """ + path_str = str(path) + if path_str.startswith(env_root_path()): + return os.path.basename(path_str) + else: + return path_str + + def check_disallowed_env_config_mods(scopes): for scope in scopes: with spack.config.use_configuration(scope): @@ -179,9 +192,8 @@ def validate_env_name(name): def activate(env, use_env_repo=False): """Activate an environment. - To activate an environment, we add its configuration scope to the - existing Spack configuration, and we set active to the current - environment. + To activate an environment, we add its manifest's configuration scope to the + existing Spack configuration, and we set active to the current environment. Arguments: env (Environment): the environment to activate @@ -198,7 +210,7 @@ def activate(env, use_env_repo=False): # below. install_tree_before = spack.config.get("config:install_tree") upstreams_before = spack.config.get("upstreams") - prepare_config_scope(env) + env.manifest.prepare_config_scope() install_tree_after = spack.config.get("config:install_tree") upstreams_after = spack.config.get("upstreams") if install_tree_before != install_tree_after or upstreams_before != upstreams_after: @@ -226,7 +238,7 @@ def deactivate(): if hasattr(_active_environment, "store_token"): spack.store.restore(_active_environment.store_token) delattr(_active_environment, "store_token") - deactivate_config_scope(_active_environment) + _active_environment.manifest.deactivate_config_scope() # use _repo so we only remove if a repo was actually constructed if _active_environment._repo: @@ -307,7 +319,7 @@ def create( def create_in_dir( - manifest_dir: Union[str, pathlib.Path], + root: Union[str, pathlib.Path], init_file: Optional[Union[str, pathlib.Path]] = None, with_view: Optional[Union[str, pathlib.Path, bool]] = None, keep_relative: bool = False, @@ -318,35 +330,72 @@ def create_in_dir( are considered manifest files. Args: - manifest_dir: directory where to create the environment. + root: directory where to create the environment. init_file: either a lockfile, a manifest file, or None with_view: whether a view should be maintained for the environment. If the value is a string, it specifies the path to the view keep_relative: if True, develop paths are copied verbatim into the new environment file, otherwise they are made absolute """ - initialize_environment_dir(manifest_dir, envfile=init_file) + initialize_environment_dir(root, envfile=init_file) if with_view is None and keep_relative: - return Environment(manifest_dir) + return Environment(root) try: - manifest = EnvironmentManifestFile(manifest_dir) + manifest = EnvironmentManifestFile(root) if with_view is not None: manifest.set_default_view(with_view) - if not keep_relative and init_file is not None and str(init_file).endswith(manifest_name): - init_file = pathlib.Path(init_file) - manifest.absolutify_dev_paths(init_file.parent) - manifest.flush() except (spack.config.ConfigFormatError, SpackEnvironmentConfigError) as e: - shutil.rmtree(manifest_dir) + shutil.rmtree(root) raise e - return Environment(manifest_dir) + env = Environment(root) + + if init_file: + init_file_dir = os.path.abspath(os.path.dirname(init_file)) + + if not keep_relative: + if env.path != init_file_dir: + # If we are here, we are creating an environment based on an + # spack.yaml file in another directory, and moreover we want + # dev paths in this environment to refer to their original + # locations. + _rewrite_relative_dev_paths_on_relocation(env, init_file_dir) + + return env + + +def _rewrite_relative_dev_paths_on_relocation(env, init_file_dir): + """When initializing the environment from a manifest file and we plan + to store the environment in a different directory, we have to rewrite + relative paths to absolute ones.""" + with env: + dev_specs = spack.config.get("develop", default={}, scope=env.scope_name) + if not dev_specs: + return + for name, entry in dev_specs.items(): + dev_path = entry["path"] + expanded_path = os.path.normpath(os.path.join(init_file_dir, entry["path"])) + + # Skip if the expanded path is the same (e.g. when absolute) + if dev_path == expanded_path: + continue + + tty.debug("Expanding develop path for {0} to {1}".format(name, expanded_path)) + + dev_specs[name]["path"] = expanded_path + + spack.config.set("develop", dev_specs, scope=env.scope_name) + + env._dev_specs = None + # If we changed the environment's spack.yaml scope, that will not be reflected + # in the manifest that we read + env._re_read() def environment_dir_from_name(name: str, exists_ok: bool = True) -> str: @@ -562,39 +611,33 @@ def content_hash(self, specs): return spack.util.hash.b32_hash(contents) def get_projection_for_spec(self, spec): - """Get projection for spec relative to view root - - Getting the projection from the underlying root will get the temporary - projection. This gives the permanent projection relative to the root - symlink. - """ - view = self.view() - view_path = view.get_projection_for_spec(spec) - rel_path = os.path.relpath(view_path, self._current_root) - return os.path.join(self.root, rel_path) + """Get projection for spec. This function does not require the view + to exist on the filesystem.""" + return self._view(self.root).get_projection_for_spec(spec) - def view(self, new=None): + def view(self, new: Optional[str] = None) -> SimpleFilesystemView: """ - Generate the FilesystemView object for this ViewDescriptor - - By default, this method returns a FilesystemView object rooted at the - current underlying root of this ViewDescriptor (self._current_root) + Returns a view object for the *underlying* view directory. This means that the + self.root symlink is followed, and that the view has to exist on the filesystem + (unless ``new``). This function is useful when writing to the view. Raise if new is None and there is no current view Arguments: - new (str or None): If a string, create a FilesystemView - rooted at that path. Default None. This should only be used to - regenerate the view, and cannot be used to access specs. + new: If a string, create a FilesystemView rooted at that path. Default None. This + should only be used to regenerate the view, and cannot be used to access specs. """ root = new if new else self._current_root if not root: # This can only be hit if we write a future bug - msg = ( + raise SpackEnvironmentViewError( "Attempting to get nonexistent view from environment. " - "View root is at %s" % self.root + f"View root is at {self.root}" ) - raise SpackEnvironmentViewError(msg) + return self._view(root) + + def _view(self, root: str) -> SimpleFilesystemView: + """Returns a view object for a given root dir.""" return SimpleFilesystemView( root, spack.store.STORE.layout, @@ -732,6 +775,17 @@ def _create_environment(path): return Environment(path) +def env_subdir_path(manifest_dir: Union[str, pathlib.Path]) -> str: + """Path to where the environment stores repos, logs, views, configs. + + Args: + manifest_dir: directory containing the environment manifest file + + Returns: directory the environment uses to manage its files + """ + return os.path.join(str(manifest_dir), env_subdir_name) + + class Environment: """A Spack environment, which bundles together configuration and a list of specs.""" @@ -743,32 +797,38 @@ def __init__(self, manifest_dir: Union[str, pathlib.Path]) -> None: manifest_dir: directory with the "spack.yaml" associated with the environment """ self.path = os.path.abspath(str(manifest_dir)) + self.name = environment_name(self.path) + self.env_subdir_path = env_subdir_path(self.path) self.txlock = lk.Lock(self._transaction_lock_path) self._unify = None self.new_specs: List[Spec] = [] - self.new_installs: List[Spec] = [] self.views: Dict[str, ViewDescriptor] = {} #: Specs from "spack.yaml" self.spec_lists: Dict[str, SpecList] = {user_speclist_name: SpecList()} - #: Dev-build specs from "spack.yaml" - self.dev_specs: Dict[str, Any] = {} #: User specs from the last concretization self.concretized_user_specs: List[Spec] = [] #: Roots associated with the last concretization, in order - self.concretized_order: List[Spec] = [] + self.concretized_order: List[str] = [] #: Concretized specs by hash self.specs_by_hash: Dict[str, Spec] = {} #: Repository for this environment (memoized) self._repo = None #: Previously active environment self._previous_active = None + self._dev_specs = None + + # Load the manifest file contents into memory + self._load_manifest_file() + def _load_manifest_file(self): + """Instantiate and load the manifest file contents into memory.""" with lk.ReadTransaction(self.txlock): - self.manifest = EnvironmentManifestFile(manifest_dir) - self._read() + self.manifest = EnvironmentManifestFile(self.path) + with self.manifest.use_config(): + self._read() @property def unify(self): @@ -786,19 +846,10 @@ def __reduce__(self): def _re_read(self): """Reinitialize the environment object.""" self.clear(re_read=True) - self.manifest = EnvironmentManifestFile(self.path) - self._read(re_read=True) + self._load_manifest_file() - def _read(self, re_read=False): - # If the manifest has included files, then some of the information - # (e.g., definitions) MAY be in those files. So we need to ensure - # the config is populated with any associated spec lists in order - # to fully construct the manifest state. - includes = self.manifest[TOP_LEVEL_KEY].get("include", []) - if includes and not re_read: - prepare_config_scope(self) - - self._construct_state_from_manifest(re_read) + def _read(self): + self._construct_state_from_manifest() if os.path.exists(self.lock_path): with open(self.lock_path) as f: @@ -825,18 +876,14 @@ def _process_definition(self, item): else: self.spec_lists[name] = user_specs - def _construct_state_from_manifest(self, re_read=False): - """Read manifest file and set up user specs.""" + def _construct_state_from_manifest(self): + """Set up user specs and views from the manifest file.""" self.spec_lists = collections.OrderedDict() - if not re_read: - for item in spack.config.get("definitions", []): - self._process_definition(item) - - env_configuration = self.manifest[TOP_LEVEL_KEY] - for item in env_configuration.get("definitions", []): + for item in spack.config.get("definitions", []): self._process_definition(item) + env_configuration = self.manifest[TOP_LEVEL_KEY] spec_list = env_configuration.get(user_speclist_name, []) user_specs = SpecList( user_speclist_name, [s for s in spec_list if s], self.spec_lists.copy() @@ -858,32 +905,40 @@ def _construct_state_from_manifest(self, re_read=False): else: self.views = {} - # Retrieve dev-build packages: - self.dev_specs = copy.deepcopy(env_configuration.get("develop", {})) - for name, entry in self.dev_specs.items(): - # spec must include a concrete version - assert Spec(entry["spec"]).versions.concrete_range_as_version - # default path is the spec name - if "path" not in entry: - self.dev_specs[name]["path"] = name - @property def user_specs(self): return self.spec_lists[user_speclist_name] + @property + def dev_specs(self): + if not self._dev_specs: + self._dev_specs = self._read_dev_specs() + return self._dev_specs + + def _read_dev_specs(self): + dev_specs = {} + dev_config = spack.config.get("develop", {}) + for name, entry in dev_config.items(): + local_entry = {"spec": str(entry["spec"])} + # default path is the spec name + if "path" not in entry: + local_entry["path"] = name + else: + local_entry["path"] = entry["path"] + dev_specs[name] = local_entry + return dev_specs + def clear(self, re_read=False): """Clear the contents of the environment Arguments: - re_read (bool): If True, do not clear ``new_specs`` nor - ``new_installs`` values. These values cannot be read from - yaml, and need to be maintained when re-reading an existing - environment. + re_read: If ``True``, do not clear ``new_specs``. This value cannot be read from yaml, + and needs to be maintained when re-reading an existing environment. """ self.spec_lists = collections.OrderedDict() self.spec_lists[user_speclist_name] = SpecList() - self.dev_specs = {} # dev-build specs from yaml + self._dev_specs = {} self.concretized_user_specs = [] # user specs from last concretize self.concretized_order = [] # roots of last concretize, in order self.specs_by_hash = {} # concretized specs by hash @@ -892,24 +947,6 @@ def clear(self, re_read=False): if not re_read: # things that cannot be recreated from file self.new_specs = [] # write packages for these on write() - self.new_installs = [] # write modules for these on write() - - @property - def internal(self): - """Whether this environment is managed by Spack.""" - return self.path.startswith(env_root_path()) - - @property - def name(self): - """Human-readable representation of the environment. - - This is the path for directory environments, and just the name - for managed environments. - """ - if self.internal: - return os.path.basename(self.path) - else: - return self.path @property def active(self): @@ -938,23 +975,9 @@ def _lock_backup_v1_path(self): """Path to backup of v1 lockfile before conversion to v2""" return self.lock_path + ".backup.v1" - @property - def env_subdir_path(self): - """Path to directory where the env stores repos, logs, views.""" - return os.path.join(self.path, env_subdir_name) - @property def repos_path(self): - return os.path.join(self.path, env_subdir_name, "repos") - - @property - def log_path(self): - return os.path.join(self.path, env_subdir_name, "logs") - - @property - def config_stage_dir(self): - """Directory for any staged configuration file(s).""" - return os.path.join(self.env_subdir_path, "config") + return os.path.join(self.env_subdir_path, "repos") @property def view_path_default(self): @@ -967,122 +990,10 @@ def repo(self): self._repo = make_repo_path(self.repos_path) return self._repo - def included_config_scopes(self): - """List of included configuration scopes from the environment. - - Scopes are listed in the YAML file in order from highest to - lowest precedence, so configuration from earlier scope will take - precedence over later ones. - - This routine returns them in the order they should be pushed onto - the internal scope stack (so, in reverse, from lowest to highest). - """ - scopes = [] - - # load config scopes added via 'include:', in reverse so that - # highest-precedence scopes are last. - includes = self.manifest[TOP_LEVEL_KEY].get("include", []) - missing = [] - for i, config_path in enumerate(reversed(includes)): - # allow paths to contain spack config/environment variables, etc. - config_path = substitute_path_variables(config_path) - - include_url = urllib.parse.urlparse(config_path) - - # Transform file:// URLs to direct includes. - if include_url.scheme == "file": - config_path = urllib.request.url2pathname(include_url.path) - - # Any other URL should be fetched. - elif include_url.scheme in ("http", "https", "ftp"): - # Stage any remote configuration file(s) - staged_configs = ( - os.listdir(self.config_stage_dir) - if os.path.exists(self.config_stage_dir) - else [] - ) - remote_path = urllib.request.url2pathname(include_url.path) - basename = os.path.basename(remote_path) - if basename in staged_configs: - # Do NOT re-stage configuration files over existing - # ones with the same name since there is a risk of - # losing changes (e.g., from 'spack config update'). - tty.warn( - "Will not re-stage configuration from {0} to avoid " - "losing changes to the already staged file of the " - "same name.".format(remote_path) - ) - - # Recognize the configuration stage directory - # is flattened to ensure a single copy of each - # configuration file. - config_path = self.config_stage_dir - if basename.endswith(".yaml"): - config_path = os.path.join(config_path, basename) - else: - staged_path = spack.config.fetch_remote_configs( - config_path, self.config_stage_dir, skip_existing=True - ) - if not staged_path: - raise SpackEnvironmentError( - "Unable to fetch remote configuration {0}".format(config_path) - ) - config_path = staged_path - - elif include_url.scheme: - raise ValueError( - f"Unsupported URL scheme ({include_url.scheme}) for " - f"environment include: {config_path}" - ) - - # treat relative paths as relative to the environment - if not os.path.isabs(config_path): - config_path = os.path.join(self.path, config_path) - config_path = os.path.normpath(os.path.realpath(config_path)) - - if os.path.isdir(config_path): - # directories are treated as regular ConfigScopes - config_name = "env:%s:%s" % (self.name, os.path.basename(config_path)) - tty.debug("Creating ConfigScope {0} for '{1}'".format(config_name, config_path)) - scope = spack.config.ConfigScope(config_name, config_path) - elif os.path.exists(config_path): - # files are assumed to be SingleFileScopes - config_name = "env:%s:%s" % (self.name, config_path) - tty.debug( - "Creating SingleFileScope {0} for '{1}'".format(config_name, config_path) - ) - scope = spack.config.SingleFileScope( - config_name, config_path, spack.schema.merged.schema - ) - else: - missing.append(config_path) - continue - - scopes.append(scope) - - if missing: - msg = "Detected {0} missing include path(s):".format(len(missing)) - msg += "\n {0}".format("\n ".join(missing)) - raise spack.config.ConfigFileError(msg) - - return scopes - - def env_file_config_scope_name(self): + @property + def scope_name(self): """Name of the config scope of this environment's manifest file.""" - return "env:%s" % self.name - - def env_file_config_scope(self): - """Get the configuration scope for the environment's manifest file.""" - config_name = self.env_file_config_scope_name() - return spack.config.SingleFileScope( - config_name, self.manifest_path, spack.schema.env.schema, [TOP_LEVEL_KEY] - ) - - def config_scopes(self): - """A list of all configuration scopes for this environment.""" - return check_disallowed_env_config_mods( - self.included_config_scopes() + [self.env_file_config_scope()] - ) + return self.manifest.scope_name def destroy(self): """Remove this environment from Spack entirely.""" @@ -1182,7 +1093,7 @@ def change_existing_spec( for idx, spec in matches: override_spec = Spec.override(spec, change_spec) - self.spec_lists[list_name].specs[idx] = override_spec + self.spec_lists[list_name].replace(idx, str(override_spec)) if list_name == user_speclist_name: self.manifest.override_user_spec(str(override_spec), idx=idx) else: @@ -1190,7 +1101,6 @@ def change_existing_spec( str(spec), override=str(override_spec), list_name=list_name ) self.update_stale_references(from_list=list_name) - self._construct_state_from_manifest() def remove(self, query_spec, list_name=user_speclist_name, force=False): """Remove specs from an environment that match a query_spec""" @@ -1251,82 +1161,6 @@ def remove(self, query_spec, list_name=user_speclist_name, force=False): del self.concretized_order[i] del self.specs_by_hash[dag_hash] - def develop(self, spec: Spec, path: str, clone: bool = False) -> bool: - """Add dev-build info for package - - Args: - spec: Set constraints on development specs. Must include a - concrete version. - path: Path to find code for developer builds. Relative - paths will be resolved relative to the environment. - clone: Clone the package code to the path. - If clone is False Spack will assume the code is already present - at ``path``. - - Return: - (bool): True iff the environment was changed. - """ - spec = spec.copy() # defensive copy since we access cached attributes - - if not spec.versions.concrete: - raise SpackEnvironmentError("Cannot develop spec %s without a concrete version" % spec) - - for name, entry in self.dev_specs.items(): - if name == spec.name: - e_spec = Spec(entry["spec"]) - e_path = entry["path"] - - if e_spec == spec: - if path == e_path: - tty.msg("Spec %s already configured for development" % spec) - return False - else: - tty.msg("Updating development path for spec %s" % spec) - break - else: - msg = "Updating development spec for package " - msg += "%s with path %s" % (spec.name, path) - tty.msg(msg) - break - else: - tty.msg("Configuring spec %s for development at path %s" % (spec, path)) - - if clone: - # "steal" the source code via staging API. We ask for a stage - # to be created, then copy it afterwards somewhere else. It would be - # better if we can create the `source_path` directly into its final - # destination. - abspath = spack.util.path.canonicalize_path(path, default_wd=self.path) - pkg_cls = spack.repo.PATH.get_pkg_class(spec.name) - # We construct a package class ourselves, rather than asking for - # Spec.package, since Spec only allows this when it is concrete - package = pkg_cls(spec) - if isinstance(package.fetcher, spack.fetch_strategy.GitFetchStrategy): - package.fetcher.get_full_repo = True - # If we retrieved this version before and cached it, we may have - # done so without cloning the full git repo; likewise, any - # mirror might store an instance with truncated history. - package.stage.disable_mirrors() - - package.stage.steal_source(abspath) - - # If it wasn't already in the list, append it - entry = {"path": path, "spec": str(spec)} - self.dev_specs[spec.name] = entry - self.manifest.add_develop_spec(spec.name, entry=entry.copy()) - return True - - def undevelop(self, spec): - """Remove develop info for abstract spec ``spec``. - - returns True on success, False if no entry existed.""" - spec = Spec(spec) # In case it's a spec object - if spec.name in self.dev_specs: - del self.dev_specs[spec.name] - self.manifest.remove_develop_spec(spec.name) - return True - return False - def is_develop(self, spec): """Returns true when the spec is built from local sources""" return spec.name in self.dev_specs @@ -1837,8 +1671,8 @@ def _add_concrete_spec(self, spec, concrete, new=True): self.concretized_order.append(h) self.specs_by_hash[h] = concrete - def _get_overwrite_specs(self): - # Find all dev specs that were modified. + def _dev_specs_that_need_overwrite(self): + """Return the hashes of all specs that need to be reinstalled due to source code change.""" changed_dev_specs = [ s for s in traverse.traverse_nodes( @@ -1863,21 +1697,6 @@ def _get_overwrite_specs(self): if depth == 0 or spec.installed ] - def _install_log_links(self, spec): - if not spec.external: - # Make sure log directory exists - log_path = self.log_path - fs.mkdirp(log_path) - - with fs.working_dir(self.path): - # Link the resulting log file into logs dir - build_log_link = os.path.join( - log_path, "%s-%s.log" % (spec.name, spec.dag_hash(7)) - ) - if os.path.lexists(build_log_link): - os.remove(build_log_link) - symlink(spec.package.build_log_path, build_log_link) - def _partition_roots_by_install_status(self): """Partition root specs into those that do not have to be passed to the installer, and those that should be, taking into account development @@ -1911,58 +1730,18 @@ def install_all(self, **install_args): """ self.install_specs(None, **install_args) - def install_specs(self, specs=None, **install_args): - tty.debug("Assessing installation status of environment packages") - # If "spack install" is invoked repeatedly for a large environment - # where all specs are already installed, the operation can take - # a large amount of time due to repeatedly acquiring and releasing - # locks. As a small optimization, drop already installed root specs. - installed_roots, uninstalled_roots = self._partition_roots_by_install_status() - if specs: - specs_to_install = [s for s in specs if s not in installed_roots] - specs_dropped = [s for s in specs if s in installed_roots] - else: - specs_to_install = uninstalled_roots - specs_dropped = installed_roots - - # We need to repeat the work of the installer thanks to the above optimization: - # Already installed root specs should be marked explicitly installed in the - # database. - if specs_dropped: - with spack.store.STORE.db.write_transaction(): # do all in one transaction - for spec in specs_dropped: - spack.store.STORE.db.update_explicit(spec, True) - - if not specs_to_install: - tty.msg("All of the packages are already installed") - else: - tty.debug("Processing {0} uninstalled specs".format(len(specs_to_install))) + def install_specs(self, specs: Optional[List[Spec]] = None, **install_args): + roots = self.concrete_roots() + specs = specs if specs is not None else roots - specs_to_overwrite = self._get_overwrite_specs() - tty.debug("{0} specs need to be overwritten".format(len(specs_to_overwrite))) + # Extend the set of specs to overwrite with modified dev specs and their parents + install_args["overwrite"] = ( + install_args.get("overwrite", []) + self._dev_specs_that_need_overwrite() + ) - install_args["overwrite"] = install_args.get("overwrite", []) + specs_to_overwrite + installs = [(spec.package, {**install_args, "explicit": spec in roots}) for spec in specs] - installs = [] - for spec in specs_to_install: - pkg_install_args = install_args.copy() - pkg_install_args["explicit"] = spec in self.roots() - installs.append((spec.package, pkg_install_args)) - - try: - builder = PackageInstaller(installs) - builder.install() - finally: - # Ensure links are set appropriately - for spec in specs_to_install: - if spec.installed: - self.new_installs.append(spec) - try: - self._install_log_links(spec) - except OSError as e: - tty.warn( - "Could not install log links for {0}: {1}".format(spec.name, str(e)) - ) + PackageInstaller(installs).install() def all_specs_generator(self) -> Iterable[Spec]: """Returns a generator for all concrete specs""" @@ -2285,11 +2064,7 @@ def write(self, regenerate: bool = True) -> None: self.regenerate_views() spack.hooks.post_env_write(self) - self._reset_new_specs_and_installs() - - def _reset_new_specs_and_installs(self) -> None: - self.new_specs = [] - self.new_installs = [] + self.new_specs.clear() def update_lockfile(self) -> None: with fs.write_tmp_and_move(self.lock_path) as f: @@ -2487,18 +2262,6 @@ def make_repo_path(root): return path -def prepare_config_scope(env): - """Add env's scope to the global configuration search path.""" - for scope in env.config_scopes(): - spack.config.CONFIG.push_scope(scope) - - -def deactivate_config_scope(env): - """Remove any scopes from env from the global config path.""" - for scope in env.config_scopes(): - spack.config.CONFIG.remove_scope(scope.name) - - def manifest_file(env_name_or_dir): """Return the absolute path to a manifest file given the environment name or directory. @@ -2677,8 +2440,9 @@ def from_lockfile(manifest_dir: Union[pathlib.Path, str]) -> "EnvironmentManifes already existing in the directory. Args: - manifest_dir: directory where the lockfile is + manifest_dir: directory containing the manifest and lockfile """ + # TBD: Should this be the abspath? manifest_dir = pathlib.Path(manifest_dir) lockfile = manifest_dir / lockfile_name with lockfile.open("r") as f: @@ -2696,6 +2460,8 @@ def from_lockfile(manifest_dir: Union[pathlib.Path, str]) -> "EnvironmentManifes def __init__(self, manifest_dir: Union[pathlib.Path, str]) -> None: self.manifest_dir = pathlib.Path(manifest_dir) self.manifest_file = self.manifest_dir / manifest_name + self.scope_name = f"env:{environment_name(self.manifest_dir)}" + self.config_stage_dir = os.path.join(env_subdir_path(manifest_dir), "config") if not self.manifest_file.exists(): msg = f"cannot find '{manifest_name}' in {self.manifest_dir}" @@ -2901,57 +2667,6 @@ def remove_default_view(self) -> None: self.set_default_view(view=False) - def add_develop_spec(self, pkg_name: str, entry: Dict[str, str]) -> None: - """Adds a develop spec to the manifest file - - Args: - pkg_name: name of the package to be developed - entry: spec and path of the developed package - """ - # The environment sets the path to pkg_name is that is implicit - if entry["path"] == pkg_name: - entry.pop("path") - - self.pristine_configuration.setdefault("develop", {}).setdefault(pkg_name, {}).update( - entry - ) - self.configuration.setdefault("develop", {}).setdefault(pkg_name, {}).update(entry) - self.changed = True - - def remove_develop_spec(self, pkg_name: str) -> None: - """Removes a develop spec from the manifest file - - Args: - pkg_name: package to be removed from development - - Raises: - SpackEnvironmentError: if there is nothing to remove - """ - try: - del self.pristine_configuration["develop"][pkg_name] - except KeyError as e: - msg = f"cannot remove '{pkg_name}' from develop specs in {self}, entry does not exist" - raise SpackEnvironmentError(msg) from e - del self.configuration["develop"][pkg_name] - self.changed = True - - def absolutify_dev_paths(self, init_file_dir: Union[str, pathlib.Path]) -> None: - """Normalizes the dev paths in the environment with respect to the directory where the - initialization file resides. - - Args: - init_file_dir: directory with the "spack.yaml" used to initialize the environment. - """ - init_file_dir = pathlib.Path(init_file_dir).absolute() - for _, entry in self.pristine_configuration.get("develop", {}).items(): - expanded_path = os.path.normpath(str(init_file_dir / entry["path"])) - entry["path"] = str(expanded_path) - - for _, entry in self.configuration.get("develop", {}).items(): - expanded_path = os.path.normpath(str(init_file_dir / entry["path"])) - entry["path"] = str(expanded_path) - self.changed = True - def flush(self) -> None: """Synchronizes the object with the manifest file on disk.""" if not self.changed: @@ -2983,6 +2698,145 @@ def __iter__(self): def __str__(self): return str(self.manifest_file) + @property + def included_config_scopes(self) -> List[spack.config.ConfigScope]: + """List of included configuration scopes from the manifest. + + Scopes are listed in the YAML file in order from highest to + lowest precedence, so configuration from earlier scope will take + precedence over later ones. + + This routine returns them in the order they should be pushed onto + the internal scope stack (so, in reverse, from lowest to highest). + + Returns: Configuration scopes associated with the environment manifest + + Raises: + SpackEnvironmentError: if the manifest includes a remote file but + no configuration stage directory has been identified + """ + scopes = [] + + # load config scopes added via 'include:', in reverse so that + # highest-precedence scopes are last. + includes = self[TOP_LEVEL_KEY].get("include", []) + env_name = environment_name(self.manifest_dir) + missing = [] + for i, config_path in enumerate(reversed(includes)): + # allow paths to contain spack config/environment variables, etc. + config_path = substitute_path_variables(config_path) + + include_url = urllib.parse.urlparse(config_path) + + # Transform file:// URLs to direct includes. + if include_url.scheme == "file": + config_path = urllib.request.url2pathname(include_url.path) + + # Any other URL should be fetched. + elif include_url.scheme in ("http", "https", "ftp"): + # Stage any remote configuration file(s) + staged_configs = ( + os.listdir(self.config_stage_dir) + if os.path.exists(self.config_stage_dir) + else [] + ) + remote_path = urllib.request.url2pathname(include_url.path) + basename = os.path.basename(remote_path) + if basename in staged_configs: + # Do NOT re-stage configuration files over existing + # ones with the same name since there is a risk of + # losing changes (e.g., from 'spack config update'). + tty.warn( + "Will not re-stage configuration from {0} to avoid " + "losing changes to the already staged file of the " + "same name.".format(remote_path) + ) + + # Recognize the configuration stage directory + # is flattened to ensure a single copy of each + # configuration file. + config_path = self.config_stage_dir + if basename.endswith(".yaml"): + config_path = os.path.join(config_path, basename) + else: + staged_path = spack.config.fetch_remote_configs( + config_path, str(self.config_stage_dir), skip_existing=True + ) + if not staged_path: + raise SpackEnvironmentError( + "Unable to fetch remote configuration {0}".format(config_path) + ) + config_path = staged_path + + elif include_url.scheme: + raise ValueError( + f"Unsupported URL scheme ({include_url.scheme}) for " + f"environment include: {config_path}" + ) + + # treat relative paths as relative to the environment + if not os.path.isabs(config_path): + config_path = os.path.join(self.manifest_dir, config_path) + config_path = os.path.normpath(os.path.realpath(config_path)) + + if os.path.isdir(config_path): + # directories are treated as regular ConfigScopes + config_name = "env:%s:%s" % (env_name, os.path.basename(config_path)) + tty.debug("Creating ConfigScope {0} for '{1}'".format(config_name, config_path)) + scope = spack.config.ConfigScope(config_name, config_path) + elif os.path.exists(config_path): + # files are assumed to be SingleFileScopes + config_name = "env:%s:%s" % (env_name, config_path) + tty.debug( + "Creating SingleFileScope {0} for '{1}'".format(config_name, config_path) + ) + scope = spack.config.SingleFileScope( + config_name, config_path, spack.schema.merged.schema + ) + else: + missing.append(config_path) + continue + + scopes.append(scope) + + if missing: + msg = "Detected {0} missing include path(s):".format(len(missing)) + msg += "\n {0}".format("\n ".join(missing)) + raise spack.config.ConfigFileError(msg) + + return scopes + + @property + def env_config_scopes(self) -> List[spack.config.ConfigScope]: + """A list of all configuration scopes for the environment manifest. + + Returns: All configuration scopes associated with the environment + """ + config_name = self.scope_name + env_scope = spack.config.SingleFileScope( + config_name, str(self.manifest_file), spack.schema.env.schema, [TOP_LEVEL_KEY] + ) + + return check_disallowed_env_config_mods(self.included_config_scopes + [env_scope]) + + def prepare_config_scope(self) -> None: + """Add the manifest's scopes to the global configuration search path.""" + for scope in self.env_config_scopes: + spack.config.CONFIG.push_scope(scope) + + def deactivate_config_scope(self) -> None: + """Remove any of the manifest's scopes from the global config path.""" + for scope in self.env_config_scopes: + spack.config.CONFIG.remove_scope(scope.name) + + @contextlib.contextmanager + def use_config(self): + """Ensure only the manifest's configuration scopes are global.""" + with no_active_environment(): + self.prepare_config_scope() + yield + self.deactivate_config_scope() + class SpackEnvironmentError(spack.error.SpackError): """Superclass for all errors to do with Spack environments.""" diff --git a/lib/spack/spack/environment/shell.py b/lib/spack/spack/environment/shell.py index a4f9634a8da051..b1d87a48fd7649 100644 --- a/lib/spack/spack/environment/shell.py +++ b/lib/spack/spack/environment/shell.py @@ -1,8 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import textwrap from typing import Optional import llnl.util.tty as tty @@ -54,22 +55,35 @@ def activate_header(env, shell, prompt=None, view: Optional[str] = None): if view: cmds += "$Env:SPACK_ENV_VIEW='%s'\n" % view else: - if "color" in os.getenv("TERM", "") and prompt: - prompt = colorize("@G{%s}" % prompt, color=True, enclose=True) + bash_color_prompt = colorize(f"@G{{{prompt}}}", color=True, enclose=True) + zsh_color_prompt = colorize(f"@G{{{prompt}}}", color=True, enclose=False, zsh=True) cmds += "export SPACK_ENV=%s;\n" % env.path if view: cmds += "export SPACK_ENV_VIEW=%s;\n" % view cmds += "alias despacktivate='spack env deactivate';\n" if prompt: - cmds += "if [ -z ${SPACK_OLD_PS1+x} ]; then\n" - cmds += " if [ -z ${PS1+x} ]; then\n" - cmds += " PS1='$$$$';\n" - cmds += " fi;\n" - cmds += ' export SPACK_OLD_PS1="${PS1}";\n' - cmds += "fi;\n" - cmds += 'export PS1="%s ${PS1}";\n' % prompt - + cmds += textwrap.dedent( + rf""" + if [ -z ${{SPACK_OLD_PS1+x}} ]; then + if [ -z ${{PS1+x}} ]; then + PS1='$$$$'; + fi; + export SPACK_OLD_PS1="${{PS1}}"; + fi; + if [ -n "${{TERM:-}}" ] && [ "${{TERM#*color}}" != "${{TERM}}" ] && \ + [ -n "${{BASH:-}}" ]; + then + export PS1="{bash_color_prompt} ${{PS1}}"; + elif [ -n "${{TERM:-}}" ] && [ "${{TERM#*color}}" != "${{TERM}}" ] && \ + [ -n "${{ZSH_NAME:-}}" ]; + then + export PS1="{zsh_color_prompt} ${{PS1}}"; + else + export PS1="{prompt} ${{PS1}}"; + fi + """ + ).lstrip("\n") return cmds diff --git a/lib/spack/spack/error.py b/lib/spack/spack/error.py index 8c9015ed6d9de7..804dc6867b20f1 100644 --- a/lib/spack/spack/error.py +++ b/lib/spack/spack/error.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/extensions.py b/lib/spack/spack/extensions.py index 0ee01a22a12a99..b7b30e135c83ba 100644 --- a/lib/spack/spack/extensions.py +++ b/lib/spack/spack/extensions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,11 +6,13 @@ for Spack's command extensions. """ import difflib +import glob import importlib import os import re import sys import types +from typing import List import llnl.util.lang @@ -75,6 +77,15 @@ def load_command_extension(command, path): if not os.path.exists(cmd_path): return None + ensure_extension_loaded(extension, path=path) + + module = importlib.import_module(module_name) + sys.modules[module_name] = module + + return module + + +def ensure_extension_loaded(extension, *, path): def ensure_package_creation(name): package_name = "{0}.{1}".format(__name__, name) if package_name in sys.modules: @@ -100,10 +111,22 @@ def ensure_package_creation(name): ensure_package_creation(extension) ensure_package_creation(extension + ".cmd") - module = importlib.import_module(module_name) - sys.modules[module_name] = module - return module +def load_extension(name: str) -> str: + """Loads a single extension into the 'spack.extensions' package. + + Args: + name: name of the extension + """ + extension_root = path_for_extension(name, paths=get_extension_paths()) + ensure_extension_loaded(name, path=extension_root) + commands = glob.glob( + os.path.join(extension_root, extension_name(extension_root), "cmd", "*.py") + ) + commands = [os.path.basename(x).rstrip(".py") for x in commands] + for command in commands: + load_command_extension(command, extension_root) + return extension_root def get_extension_paths(): @@ -125,7 +148,7 @@ def get_command_paths(): return command_paths -def path_for_extension(target_name, *paths): +def path_for_extension(target_name: str, *, paths: List[str]) -> str: """Return the test root dir for a given extension. Args: diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index a922d9caf4c085..93df10c98f0f37 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,7 @@ import shutil import urllib.error import urllib.parse +from pathlib import PurePath from typing import List, Optional import llnl.url @@ -37,13 +38,14 @@ import llnl.util.filesystem as fs import llnl.util.tty as tty from llnl.string import comma_and, quote -from llnl.util.filesystem import get_single_file, mkdirp, temp_cwd, temp_rename, working_dir +from llnl.util.filesystem import get_single_file, mkdirp, temp_cwd, working_dir from llnl.util.symlink import symlink import spack.config import spack.error import spack.oci.opener import spack.url +import spack.util.archive import spack.util.crypto as crypto import spack.util.git import spack.util.url as url_util @@ -600,29 +602,21 @@ def expand(self): tty.debug("Source fetched with %s is already expanded." % self.url_attr) @_needs_stage - def archive(self, destination, **kwargs): + def archive(self, destination, *, exclude: Optional[str] = None): assert llnl.url.extension_from_path(destination) == "tar.gz" assert self.stage.source_path.startswith(self.stage.path) - - tar = which("tar", required=True) - - patterns = kwargs.get("exclude", None) - if patterns is not None: - if isinstance(patterns, str): - patterns = [patterns] - for p in patterns: - tar.add_default_arg("--exclude=%s" % p) - - with working_dir(self.stage.path): - if self.stage.srcdir: - # Here we create an archive with the default repository name. - # The 'tar' command has options for changing the name of a - # directory that is included in the archive, but they differ - # based on OS, so we temporarily rename the repo - with temp_rename(self.stage.source_path, self.stage.srcdir): - tar("-czf", destination, self.stage.srcdir) - else: - tar("-czf", destination, os.path.basename(self.stage.source_path)) + # We need to prepend this dir name to every entry of the tarfile + top_level_dir = PurePath(self.stage.srcdir or os.path.basename(self.stage.source_path)) + + with working_dir(self.stage.source_path), spack.util.archive.gzip_compressed_tarfile( + destination + ) as (tar, _, _): + spack.util.archive.reproducible_tarfile_from_prefix( + tar=tar, + prefix=".", + skip=lambda entry: entry.name == exclude, + path_to_name=lambda path: (top_level_dir / PurePath(path)).as_posix(), + ) def __str__(self): return "VCS: %s" % self.url diff --git a/lib/spack/spack/filesystem_view.py b/lib/spack/spack/filesystem_view.py index e6631fecbf66a4..6d9e85b9c43767 100644 --- a/lib/spack/spack/filesystem_view.py +++ b/lib/spack/spack/filesystem_view.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/graph.py b/lib/spack/spack/graph.py index 78bf38ec0e7e43..684a6061fb2038 100644 --- a/lib/spack/spack/graph.py +++ b/lib/spack/spack/graph.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hash_types.py b/lib/spack/spack/hash_types.py index c1e25198cb3242..0684667528b5de 100644 --- a/lib/spack/spack/hash_types.py +++ b/lib/spack/spack/hash_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/__init__.py b/lib/spack/spack/hooks/__init__.py index e433d72ffb5029..5eb2c0bf57084c 100644 --- a/lib/spack/spack/hooks/__init__.py +++ b/lib/spack/spack/hooks/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/absolutify_elf_sonames.py b/lib/spack/spack/hooks/absolutify_elf_sonames.py index c0194a32664d60..d203c6d1efb926 100644 --- a/lib/spack/spack/hooks/absolutify_elf_sonames.py +++ b/lib/spack/spack/hooks/absolutify_elf_sonames.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/drop_redundant_rpaths.py b/lib/spack/spack/hooks/drop_redundant_rpaths.py index a32d435e388617..0c43fc1b5a78b9 100644 --- a/lib/spack/spack/hooks/drop_redundant_rpaths.py +++ b/lib/spack/spack/hooks/drop_redundant_rpaths.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py index e21445c302c5be..000a5ef9ce4a29 100644 --- a/lib/spack/spack/hooks/licensing.py +++ b/lib/spack/spack/hooks/licensing.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/module_file_generation.py b/lib/spack/spack/hooks/module_file_generation.py index 1a2bbfdfe42d5c..485861d27c4a46 100644 --- a/lib/spack/spack/hooks/module_file_generation.py +++ b/lib/spack/spack/hooks/module_file_generation.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -34,21 +34,8 @@ def _for_each_enabled( def post_install(spec, explicit: bool): - import spack.environment as ev # break import cycle - - if ev.active_environment(): - # If the installed through an environment, we skip post_install - # module generation and generate the modules on env_write so Spack - # can manage interactions between env views and modules - return - _for_each_enabled(spec, "write", explicit) def post_uninstall(spec): _for_each_enabled(spec, "remove") - - -def post_env_write(env): - for spec in env.new_installs: - _for_each_enabled(spec, "write") diff --git a/lib/spack/spack/hooks/permissions_setters.py b/lib/spack/spack/hooks/permissions_setters.py index fbd8079783ee90..3b1a822696489a 100644 --- a/lib/spack/spack/hooks/permissions_setters.py +++ b/lib/spack/spack/hooks/permissions_setters.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/hooks/sbang.py b/lib/spack/spack/hooks/sbang.py index 11e2d12f74b74b..83968603d59b02 100644 --- a/lib/spack/spack/hooks/sbang.py +++ b/lib/spack/spack/hooks/sbang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -229,6 +229,8 @@ def post_install(spec, explicit=None): $spack_prefix/bin/sbang instead of something longer than the shebang limit. """ + if sys.platform == "win32": + return if spec.external: tty.debug("SKIP: shebang filtering [external package]") return diff --git a/lib/spack/spack/hooks/write_install_manifest.py b/lib/spack/spack/hooks/write_install_manifest.py index fc796fb4b4295f..1921d8bc5c0d5f 100644 --- a/lib/spack/spack/hooks/write_install_manifest.py +++ b/lib/spack/spack/hooks/write_install_manifest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/install_test.py b/lib/spack/spack/install_test.py index 662a1536c4b827..c27e8ea60ada33 100644 --- a/lib/spack/spack/install_test.py +++ b/lib/spack/spack/install_test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py index 51f70341761835..b2d2da0d8aa7f2 100644 --- a/lib/spack/spack/installer.py +++ b/lib/spack/spack/installer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -36,6 +36,7 @@ import sys import time from collections import defaultdict +from gzip import GzipFile from typing import Dict, Iterator, List, Optional, Set, Tuple import llnl.util.filesystem as fs @@ -357,7 +358,8 @@ def _print_installed_pkg(message: str) -> None: Args: message (str): message to be output """ - print(colorize("@*g{[+]} ") + spack.util.path.debug_padded_filter(message)) + if tty.msg_enabled(): + print(colorize("@*g{[+]} ") + spack.util.path.debug_padded_filter(message)) def print_install_test_log(pkg: "spack.package_base.PackageBase") -> None: @@ -380,18 +382,16 @@ def _print_timer(pre: str, pkg_id: str, timer: timer.BaseTimer) -> None: def _install_from_cache( - pkg: "spack.package_base.PackageBase", cache_only: bool, explicit: bool, unsigned: bool = False + pkg: "spack.package_base.PackageBase", explicit: bool, unsigned: Optional[bool] = False ) -> bool: """ - Extract the package from binary cache + Install the package from binary cache Args: pkg: package to install from the binary cache - cache_only: only extract from binary cache explicit: ``True`` if installing the package was explicitly requested by the user, otherwise, ``False`` - unsigned: ``True`` if binary package signatures to be checked, - otherwise, ``False`` + unsigned: if ``True`` or ``False`` override the mirror signature verification defaults Return: ``True`` if the package was extract from binary cache, ``False`` otherwise """ @@ -399,15 +399,11 @@ def _install_from_cache( installed_from_cache = _try_install_from_binary_cache( pkg, explicit, unsigned=unsigned, timer=t ) - pkg_id = package_id(pkg) if not installed_from_cache: - pre = f"No binary for {pkg_id} found" - if cache_only: - tty.die(f"{pre} when cache-only specified") - - tty.msg(f"{pre}: installing from source") return False t.stop() + + pkg_id = package_id(pkg) tty.debug(f"Successfully extracted {pkg_id} from binary cache") _write_timer_json(pkg, t, True) @@ -461,7 +457,7 @@ def _process_external_package(pkg: "spack.package_base.PackageBase", explicit: b def _process_binary_cache_tarball( pkg: "spack.package_base.PackageBase", explicit: bool, - unsigned: bool, + unsigned: Optional[bool], mirrors_for_spec: Optional[list] = None, timer: timer.BaseTimer = timer.NULL_TIMER, ) -> bool: @@ -471,8 +467,7 @@ def _process_binary_cache_tarball( Args: pkg: the package being installed explicit: the package was explicitly requested by the user - unsigned: ``True`` if binary package signatures to be checked, - otherwise, ``False`` + unsigned: if ``True`` or ``False`` override the mirror signature verification defaults mirrors_for_spec: Optional list of concrete specs and mirrors obtained by calling binary_distribution.get_mirrors_for_spec(). timer: timer to keep track of binary install phases. @@ -492,9 +487,7 @@ def _process_binary_cache_tarball( tty.msg(f"Extracting {package_id(pkg)} from binary cache") with timer.measure("install"), spack.util.path.filter_padding(): - binary_distribution.extract_tarball( - pkg.spec, download_result, unsigned=unsigned, force=False, timer=timer - ) + binary_distribution.extract_tarball(pkg.spec, download_result, force=False, timer=timer) pkg.installed_from_binary_cache = True spack.store.STORE.db.add(pkg.spec, spack.store.STORE.layout, explicit=explicit) @@ -504,7 +497,7 @@ def _process_binary_cache_tarball( def _try_install_from_binary_cache( pkg: "spack.package_base.PackageBase", explicit: bool, - unsigned: bool = False, + unsigned: Optional[bool] = None, timer: timer.BaseTimer = timer.NULL_TIMER, ) -> bool: """ @@ -513,8 +506,7 @@ def _try_install_from_binary_cache( Args: pkg: package to be extracted from binary cache explicit: the package was explicitly requested by the user - unsigned: ``True`` if binary package signatures to be checked, - otherwise, ``False`` + unsigned: if ``True`` or ``False`` override the mirror signature verification defaults timer: timer to keep track of binary install phases. """ # Early exit if no binary mirrors are configured. @@ -647,13 +639,12 @@ def archive_install_logs(pkg: "spack.package_base.PackageBase", phase_log_dir: s pkg: the package that was built and installed phase_log_dir: path to the archive directory """ - # Archive the whole stdout + stderr for the package - fs.install(pkg.log_path, pkg.install_log_path) - - # Archive all phase log paths - for phase_log in pkg.phase_log_files: - log_file = os.path.basename(phase_log) - fs.install(phase_log, os.path.join(phase_log_dir, log_file)) + # Copy a compressed version of the install log + with open(pkg.log_path, "rb") as f, open(pkg.install_log_path, "wb") as g: + # Use GzipFile directly so we can omit filename / mtime in header + gzip_file = GzipFile(filename="", mode="wb", compresslevel=6, mtime=0, fileobj=g) + shutil.copyfileobj(f, gzip_file) + gzip_file.close() # Archive the install-phase test log, if present pkg.archive_install_test_log() @@ -824,7 +815,7 @@ def _add_default_args(self) -> None: ("restage", False), ("skip_patch", False), ("tests", False), - ("unsigned", False), + ("unsigned", None), ("verbose", False), ]: _ = self.install_args.setdefault(arg, default) @@ -1335,7 +1326,6 @@ def _prepare_for_install(self, task: BuildTask) -> None: """ install_args = task.request.install_args keep_prefix = install_args.get("keep_prefix") - restage = install_args.get("restage") # Make sure the package is ready to be locally installed. self._ensure_install_ready(task.pkg) @@ -1367,10 +1357,6 @@ def _prepare_for_install(self, task: BuildTask) -> None: else: tty.debug(f"{task.pkg_id} is partially installed") - # Destroy the stage for a locally installed, non-DIYStage, package - if restage and task.pkg.stage.managed_by_spack: - task.pkg.stage.destroy() - if ( rec and installed_in_db @@ -1662,7 +1648,7 @@ def _install_task(self, task: BuildTask, install_status: InstallStatus) -> None: use_cache = task.use_cache tests = install_args.get("tests", False) assert isinstance(tests, (bool, list)) # make mypy happy. - unsigned = bool(install_args.get("unsigned")) + unsigned: Optional[bool] = install_args.get("unsigned") pkg, pkg_id = task.pkg, task.pkg_id @@ -1671,11 +1657,16 @@ def _install_task(self, task: BuildTask, install_status: InstallStatus) -> None: task.status = STATUS_INSTALLING # Use the binary cache if requested - if use_cache and _install_from_cache(pkg, cache_only, explicit, unsigned): - self._update_installed(task) - if task.compiler: - self._add_compiler_package_to_config(pkg) - return + if use_cache: + if _install_from_cache(pkg, explicit, unsigned): + self._update_installed(task) + if task.compiler: + self._add_compiler_package_to_config(pkg) + return + elif cache_only: + raise InstallError("No binary found when cache-only was specified", pkg=pkg) + else: + tty.msg(f"No binary for {pkg_id} found: installing from source") pkg.run_tests = tests if isinstance(tests, bool) else pkg.name in tests @@ -1691,6 +1682,10 @@ def _install_task(self, task: BuildTask, install_status: InstallStatus) -> None: try: self._setup_install_dir(pkg) + # Create stage object now and let it be serialized for the child process. That + # way monkeypatch in tests works correctly. + pkg.stage + # Create a child process to do the actual installation. # Preserve verbosity settings across installs. spack.package_base.PackageBase._verbose = spack.build_environment.start_build_process( @@ -2007,7 +2002,9 @@ def install(self) -> None: # Only enable the terminal status line when we're in a tty without debug info # enabled, so that the output does not get cluttered. - term_status = TermStatusLine(enabled=sys.stdout.isatty() and not tty.is_debug()) + term_status = TermStatusLine( + enabled=sys.stdout.isatty() and tty.msg_enabled() and not tty.is_debug() + ) while self.build_pq: task = self._pop_task() @@ -2223,11 +2220,6 @@ def install(self) -> None: if not keep_prefix and not action == InstallAction.OVERWRITE: pkg.remove_prefix() - # The subprocess *may* have removed the build stage. Mark it - # not created so that the next time pkg.stage is invoked, we - # check the filesystem for it. - pkg.stage.created = False - # Perform basic task cleanup for the installed spec to # include downgrading the write to a read lock self._cleanup_task(pkg) @@ -2297,6 +2289,9 @@ def __init__(self, pkg: "spack.package_base.PackageBase", install_args: dict): # whether to keep the build stage after installation self.keep_stage = install_args.get("keep_stage", False) + # whether to restage + self.restage = install_args.get("restage", False) + # whether to skip the patch phase self.skip_patch = install_args.get("skip_patch", False) @@ -2327,9 +2322,13 @@ def __init__(self, pkg: "spack.package_base.PackageBase", install_args: dict): def run(self) -> bool: """Main entry point from ``build_process`` to kick off install in child.""" - self.pkg.stage.keep = self.keep_stage + stage = self.pkg.stage + stage.keep = self.keep_stage + + if self.restage: + stage.destroy() - with self.pkg.stage: + with stage: self.timer.start("stage") if not self.fake: diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 56a4dc0e33534c..5d78e354d1caec 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py index d5425772cdd3be..2f1b9966ce2155 100644 --- a/lib/spack/spack/mirror.py +++ b/lib/spack/spack/mirror.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -133,6 +133,10 @@ def binary(self): def source(self): return isinstance(self._data, str) or self._data.get("source", True) + @property + def signed(self) -> bool: + return isinstance(self._data, str) or self._data.get("signed", True) + @property def fetch_url(self): """Get the valid, canonicalized fetch URL""" @@ -146,7 +150,7 @@ def push_url(self): def _update_connection_dict(self, current_data: dict, new_data: dict, top_level: bool): keys = ["url", "access_pair", "access_token", "profile", "endpoint_url"] if top_level: - keys += ["binary", "source"] + keys += ["binary", "source", "signed"] changed = False for key in keys: if key in new_data and current_data.get(key) != new_data[key]: diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index 189c3947efc1e9..e0e25f42bb4530 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -93,7 +93,7 @@ def _filter_compiler_wrappers_impl(pkg_or_builder): replacements = [] for idx, (env_var, compiler_path) in enumerate(compiler_vars): - if env_var in os.environ: + if env_var in os.environ and compiler_path is not None: # filter spack wrapper and links to spack wrapper in case # build system runs realpath wrapper = os.environ[env_var] diff --git a/lib/spack/spack/modules/__init__.py b/lib/spack/spack/modules/__init__.py index dde8b74a5c285e..b466b2aafb428a 100644 --- a/lib/spack/spack/modules/__init__.py +++ b/lib/spack/spack/modules/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 2ad5bb51bc002b..c13c04dcc9dcbd 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -43,6 +43,7 @@ import spack.build_environment import spack.config +import spack.deptypes as dt import spack.environment import spack.error import spack.modules.common @@ -53,6 +54,7 @@ import spack.spec import spack.store import spack.tengine as tengine +import spack.user_environment import spack.util.environment import spack.util.file_permissions as fp import spack.util.path @@ -62,7 +64,7 @@ #: config section for this file def configuration(module_set_name): - config_path = "modules:%s" % module_set_name + config_path = f"modules:{module_set_name}" return spack.config.get(config_path, {}) @@ -96,10 +98,10 @@ def _check_tokens_are_valid(format_string, message): named_tokens = re.findall(r"{(\w*)}", format_string) invalid_tokens = [x for x in named_tokens if x.lower() not in _valid_tokens] if invalid_tokens: - msg = message - msg += " [{0}]. ".format(", ".join(invalid_tokens)) - msg += 'Did you check your "modules.yaml" configuration?' - raise RuntimeError(msg) + raise RuntimeError( + f"{message} [{', '.join(invalid_tokens)}]. " + f"Did you check your 'modules.yaml' configuration?" + ) def update_dictionary_extending_lists(target, update): @@ -219,7 +221,7 @@ def root_path(name, module_set_name): """ defaults = {"lmod": "$spack/share/spack/lmod", "tcl": "$spack/share/spack/modules"} # Root folders where the various module files should be written - roots = spack.config.get("modules:%s:roots" % module_set_name, {}) + roots = spack.config.get(f"modules:{module_set_name}:roots", {}) # Merge config values into the defaults so we prefer configured values roots = spack.config.merge_yaml(defaults, roots) @@ -262,7 +264,7 @@ def read_module_index(root): index_path = os.path.join(root, "module-index.yaml") if not os.path.exists(index_path): return {} - with open(index_path, "r") as index_file: + with open(index_path) as index_file: return _read_module_index(index_file) @@ -310,21 +312,21 @@ def upstream_module(self, spec, module_type): if db_for_spec in self.upstream_dbs: db_index = self.upstream_dbs.index(db_for_spec) elif db_for_spec: - raise spack.error.SpackError("Unexpected: {0} is installed locally".format(spec)) + raise spack.error.SpackError(f"Unexpected: {spec} is installed locally") else: - raise spack.error.SpackError("Unexpected: no install DB found for {0}".format(spec)) + raise spack.error.SpackError(f"Unexpected: no install DB found for {spec}") module_index = self.module_indices[db_index] module_type_index = module_index.get(module_type, {}) if not module_type_index: tty.debug( - "No {0} modules associated with the Spack instance where" - " {1} is installed".format(module_type, spec) + f"No {module_type} modules associated with the Spack instance " + f"where {spec} is installed" ) return None if spec.dag_hash() in module_type_index: return module_type_index[spec.dag_hash()] else: - tty.debug("No module is available for upstream package {0}".format(spec)) + tty.debug(f"No module is available for upstream package {spec}") return None @@ -603,7 +605,7 @@ def filename(self): # Just the name of the file filename = self.use_name if self.extension: - filename = "{0}.{1}".format(self.use_name, self.extension) + filename = f"{self.use_name}.{self.extension}" # Architecture sub-folder arch_folder_conf = spack.config.get("modules:%s:arch_folder" % self.conf.name, True) if arch_folder_conf: @@ -671,7 +673,7 @@ def configure_options(self): return msg if os.path.exists(pkg.install_configure_args_path): - with open(pkg.install_configure_args_path, "r") as args_file: + with open(pkg.install_configure_args_path) as args_file: return spack.util.path.padding_filter(args_file.read()) # Returning a false-like value makes the default templates skip @@ -695,28 +697,33 @@ def environment_modifications(self): ) spack.config.merge_yaml( prefix_inspections, - spack.config.get("modules:%s:prefix_inspections" % self.conf.name, {}), + spack.config.get(f"modules:{self.conf.name}:prefix_inspections", {}), ) - use_view = spack.config.get("modules:%s:use_view" % self.conf.name, False) + use_view = spack.config.get(f"modules:{self.conf.name}:use_view", False) - spec = self.spec.copy() # defensive copy before setting prefix - if use_view: - if use_view is True: - use_view = spack.environment.default_view_name + assert isinstance(use_view, (bool, str)) + if use_view: env = spack.environment.active_environment() if not env: raise spack.environment.SpackEnvironmentViewError( "Module generation with views requires active environment" ) - view = env.views[use_view] + view_name = spack.environment.default_view_name if use_view is True else use_view + + if not env.has_view(view_name): + raise spack.environment.SpackEnvironmentViewError( + f"View {view_name} not found in environment {env.name} when generating modules" + ) - spec.prefix = view.get_projection_for_spec(spec) + view = env.views[view_name] + else: + view = None env = spack.util.environment.inspect_path( - spec.prefix, prefix_inspections, exclude=spack.util.environment.is_system_path + self.spec.prefix, prefix_inspections, exclude=spack.util.environment.is_system_path ) # Let the extendee/dependency modify their extensions/dependencies @@ -726,13 +733,19 @@ def environment_modifications(self): # whole chain of setup_dependent_package has to be followed from leaf to spec. # So: just run it here, but don't collect env mods. spack.build_environment.SetupContext( - spec, context=Context.RUN + self.spec, context=Context.RUN ).set_all_package_py_globals() # Then run setup_dependent_run_environment before setup_run_environment. - for dep in spec.dependencies(deptype=("link", "run")): - dep.package.setup_dependent_run_environment(env, spec) - spec.package.setup_run_environment(env) + for dep in self.spec.dependencies(deptype=("link", "run")): + dep.package.setup_dependent_run_environment(env, self.spec) + self.spec.package.setup_run_environment(env) + + # Project the environment variables from prefix to view if needed + if view and self.spec in view: + spack.user_environment.project_env_mods( + *self.spec.traverse(deptype=dt.LINK | dt.RUN), view=view, env=env + ) # Modifications required from modules.yaml env.extend(self.conf.env) @@ -754,11 +767,11 @@ def environment_modifications(self): msg = "some tokens cannot be expanded in an environment variable name" _check_tokens_are_valid(x.name, message=msg) # Transform them - x.name = spec.format(x.name, transform=transform) + x.name = self.spec.format(x.name, transform=transform) if self.modification_needs_formatting(x): try: # Not every command has a value - x.value = spec.format(x.value) + x.value = self.spec.format(x.value) except AttributeError: pass x.name = str(x.name).replace("-", "_") @@ -886,7 +899,7 @@ def _get_template(self): # 2. template specified in a package directly # 3. default template (must be defined, check in __init__) module_system_name = str(self.module.__name__).split(".")[-1] - package_attribute = "{0}_template".format(module_system_name) + package_attribute = f"{module_system_name}_template" choices = [ self.conf.template, getattr(self.spec.package, package_attribute, None), @@ -952,7 +965,7 @@ def write(self, overwrite=False): # Attribute from package module_name = str(self.module.__name__).split(".")[-1] - attr_name = "{0}_context".format(module_name) + attr_name = f"{module_name}_context" pkg_update = getattr(self.spec.package, attr_name, {}) context.update(pkg_update) @@ -1002,7 +1015,7 @@ def update_module_hiddenness(self, remove=False): if modulerc_exists: # retrieve modulerc content - with open(modulerc_path, "r") as f: + with open(modulerc_path) as f: content = f.readlines() content = "".join(content).split("\n") # remove last empty item if any diff --git a/lib/spack/spack/modules/lmod.py b/lib/spack/spack/modules/lmod.py index 5e042259c3a418..270ab43c0fd7cc 100644 --- a/lib/spack/spack/modules/lmod.py +++ b/lib/spack/spack/modules/lmod.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/modules/tcl.py b/lib/spack/spack/modules/tcl.py index 6d7f49b3309f33..c9a0ec8ca85eb8 100644 --- a/lib/spack/spack/modules/tcl.py +++ b/lib/spack/spack/modules/tcl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/multimethod.py b/lib/spack/spack/multimethod.py index 0c661172424751..4c21da3c9101f6 100644 --- a/lib/spack/spack/multimethod.py +++ b/lib/spack/spack/multimethod.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/oci/__init__.py b/lib/spack/spack/oci/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/oci/__init__.py +++ b/lib/spack/spack/oci/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/oci/image.py b/lib/spack/spack/oci/image.py index b61591b7bed0d0..6973b90fa9bcaa 100644 --- a/lib/spack/spack/oci/image.py +++ b/lib/spack/spack/oci/image.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/oci/oci.py b/lib/spack/spack/oci/oci.py index 4e5e196cd10db9..ce9e3b9ded0c03 100644 --- a/lib/spack/spack/oci/oci.py +++ b/lib/spack/spack/oci/oci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -134,7 +134,7 @@ def upload_blob( return True # Otherwise, do another PUT request. - spack.oci.opener.ensure_status(response, 202) + spack.oci.opener.ensure_status(request, response, 202) assert "Location" in response.headers # Can be absolute or relative, joining handles both @@ -143,19 +143,16 @@ def upload_blob( ) f.seek(0) - response = _urlopen( - Request( - url=upload_url, - method="PUT", - data=f, - headers={ - "Content-Type": "application/octet-stream", - "Content-Length": str(file_size), - }, - ) + request = Request( + url=upload_url, + method="PUT", + data=f, + headers={"Content-Type": "application/octet-stream", "Content-Length": str(file_size)}, ) - spack.oci.opener.ensure_status(response, 201) + response = _urlopen(request) + + spack.oci.opener.ensure_status(request, response, 201) # print elapsed time and # MB/s _log_upload_progress(digest, file_size, time.time() - start) @@ -189,16 +186,16 @@ def upload_manifest( if not tag: ref = ref.with_digest(digest) - response = _urlopen( - Request( - url=ref.manifest_url(), - method="PUT", - data=data, - headers={"Content-Type": oci_manifest["mediaType"]}, - ) + request = Request( + url=ref.manifest_url(), + method="PUT", + data=data, + headers={"Content-Type": oci_manifest["mediaType"]}, ) - spack.oci.opener.ensure_status(response, 201) + response = _urlopen(request) + + spack.oci.opener.ensure_status(request, response, 201) return digest, size diff --git a/lib/spack/spack/oci/opener.py b/lib/spack/spack/oci/opener.py index 792598578d3204..182e60eb94054b 100644 --- a/lib/spack/spack/oci/opener.py +++ b/lib/spack/spack/oci/opener.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -310,19 +310,15 @@ def http_error_401(self, req: Request, fp, code, msg, headers): # Login failed, avoid infinite recursion where we go back and # forth between auth server and registry if hasattr(req, "login_attempted"): - raise urllib.error.HTTPError( - req.full_url, code, f"Failed to login to {req.full_url}: {msg}", headers, fp + raise spack.util.web.DetailedHTTPError( + req, code, f"Failed to login: {msg}", headers, fp ) # On 401 Unauthorized, parse the WWW-Authenticate header # to determine what authentication is required if "WWW-Authenticate" not in headers: - raise urllib.error.HTTPError( - req.full_url, - code, - "Cannot login to registry, missing WWW-Authenticate header", - headers, - fp, + raise spack.util.web.DetailedHTTPError( + req, code, "Cannot login to registry, missing WWW-Authenticate header", headers, fp ) header_value = headers["WWW-Authenticate"] @@ -330,8 +326,8 @@ def http_error_401(self, req: Request, fp, code, msg, headers): try: challenge = get_bearer_challenge(parse_www_authenticate(header_value)) except ValueError as e: - raise urllib.error.HTTPError( - req.full_url, + raise spack.util.web.DetailedHTTPError( + req, code, f"Cannot login to registry, malformed WWW-Authenticate header: {header_value}", headers, @@ -340,8 +336,8 @@ def http_error_401(self, req: Request, fp, code, msg, headers): # If there is no bearer challenge, we can't handle it if not challenge: - raise urllib.error.HTTPError( - req.full_url, + raise spack.util.web.DetailedHTTPError( + req, code, f"Cannot login to registry, unsupported authentication scheme: {header_value}", headers, @@ -356,8 +352,8 @@ def http_error_401(self, req: Request, fp, code, msg, headers): timeout=req.timeout, ) except ValueError as e: - raise urllib.error.HTTPError( - req.full_url, + raise spack.util.web.DetailedHTTPError( + req, code, f"Cannot login to registry, failed to obtain bearer token: {e}", headers, @@ -412,13 +408,13 @@ def create_opener(): return opener -def ensure_status(response: HTTPResponse, status: int): +def ensure_status(request: urllib.request.Request, response: HTTPResponse, status: int): """Raise an error if the response status is not the expected one.""" if response.status == status: return - raise urllib.error.HTTPError( - response.geturl(), response.status, response.reason, response.info(), None + raise spack.util.web.DetailedHTTPError( + request, response.status, response.reason, response.info(), None ) diff --git a/lib/spack/spack/operating_systems/__init__.py b/lib/spack/spack/operating_systems/__init__.py index 7caf70324b2270..22a5ea48e78a14 100644 --- a/lib/spack/spack/operating_systems/__init__.py +++ b/lib/spack/spack/operating_systems/__init__.py @@ -1,15 +1,24 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) from ._operating_system import OperatingSystem from .cray_backend import CrayBackend from .cray_frontend import CrayFrontend +from .freebsd import FreeBSDOs from .linux_distro import LinuxDistro from .mac_os import MacOs from .windows_os import WindowsOs -__all__ = ["OperatingSystem", "LinuxDistro", "MacOs", "CrayFrontend", "CrayBackend", "WindowsOs"] +__all__ = [ + "OperatingSystem", + "LinuxDistro", + "MacOs", + "CrayFrontend", + "CrayBackend", + "WindowsOs", + "FreeBSDOs", +] #: List of all the Operating Systems known to Spack -operating_systems = [LinuxDistro, MacOs, CrayFrontend, CrayBackend, WindowsOs] +operating_systems = [LinuxDistro, MacOs, CrayFrontend, CrayBackend, WindowsOs, FreeBSDOs] diff --git a/lib/spack/spack/operating_systems/_operating_system.py b/lib/spack/spack/operating_systems/_operating_system.py index b9b82cdae1699b..bd9f6aaff77af9 100644 --- a/lib/spack/spack/operating_systems/_operating_system.py +++ b/lib/spack/spack/operating_systems/_operating_system.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/operating_systems/cray_backend.py b/lib/spack/spack/operating_systems/cray_backend.py index 9312e653a649ef..6657020dfffbc3 100644 --- a/lib/spack/spack/operating_systems/cray_backend.py +++ b/lib/spack/spack/operating_systems/cray_backend.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/operating_systems/cray_frontend.py b/lib/spack/spack/operating_systems/cray_frontend.py index 090e99e4744657..d6fa4fd2fae2fd 100644 --- a/lib/spack/spack/operating_systems/cray_frontend.py +++ b/lib/spack/spack/operating_systems/cray_frontend.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/operating_systems/freebsd.py b/lib/spack/spack/operating_systems/freebsd.py new file mode 100644 index 00000000000000..41ab69547f1d9d --- /dev/null +++ b/lib/spack/spack/operating_systems/freebsd.py @@ -0,0 +1,15 @@ +# 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 platform as py_platform + +from spack.version import Version + +from ._operating_system import OperatingSystem + + +class FreeBSDOs(OperatingSystem): + def __init__(self): + release = py_platform.release().split("-", 1)[0] + super().__init__("freebsd", Version(release)) diff --git a/lib/spack/spack/operating_systems/linux_distro.py b/lib/spack/spack/operating_systems/linux_distro.py index a5e958711598f4..0d170fc3a3d430 100644 --- a/lib/spack/spack/operating_systems/linux_distro.py +++ b/lib/spack/spack/operating_systems/linux_distro.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/operating_systems/mac_os.py b/lib/spack/spack/operating_systems/mac_os.py index d52885fd5460e5..799f183d11f391 100644 --- a/lib/spack/spack/operating_systems/mac_os.py +++ b/lib/spack/spack/operating_systems/mac_os.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/operating_systems/windows_os.py b/lib/spack/spack/operating_systems/windows_os.py index fa767d71fb1c22..073a654eed9be1 100755 --- a/lib/spack/spack/operating_systems/windows_os.py +++ b/lib/spack/spack/operating_systems/windows_os.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 16b1216acb6e1b..ac56cf1e1ae0f7 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,14 +32,17 @@ from spack.build_systems.bundle import BundlePackage from spack.build_systems.cached_cmake import ( CachedCMakePackage, + cmake_cache_filepath, cmake_cache_option, cmake_cache_path, cmake_cache_string, ) +from spack.build_systems.cargo import CargoPackage from spack.build_systems.cmake import CMakePackage, generator from spack.build_systems.cuda import CudaPackage from spack.build_systems.generic import Package from spack.build_systems.gnu import GNUMirrorPackage +from spack.build_systems.go import GoPackage from spack.build_systems.intel import IntelPackage from spack.build_systems.lua import LuaPackage from spack.build_systems.makefile import MakefilePackage @@ -51,6 +54,7 @@ from spack.build_systems.oneapi import ( INTEL_MATH_LIBRARIES, IntelOneApiLibraryPackage, + IntelOneApiLibraryPackageWithSdk, IntelOneApiPackage, IntelOneApiStaticLibraryList, ) diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py index 416b16cefc0621..8066c1b70f8a12 100644 --- a/lib/spack/spack/package_base.py +++ b/lib/spack/spack/package_base.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,8 +24,9 @@ import textwrap import time import traceback +import typing import warnings -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, TypeVar +from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Type, TypeVar, Union import llnl.util.filesystem as fsys import llnl.util.tty as tty @@ -66,7 +67,7 @@ from spack.stage import DIYStage, ResourceStage, Stage, StageComposite, compute_stage_name from spack.util.executable import ProcessError, which from spack.util.package_hash import package_hash -from spack.version import GitVersion, StandardVersion, Version +from spack.version import GitVersion, StandardVersion FLAG_HANDLER_RETURN_TYPE = Tuple[ Optional[Iterable[str]], Optional[Iterable[str]], Optional[Iterable[str]] @@ -93,29 +94,26 @@ spack_times_log = "install_times.json" -def deprecated_version(pkg, version): - """Return True if the version is deprecated, False otherwise. +def deprecated_version(pkg: "PackageBase", version: Union[str, StandardVersion]) -> bool: + """Return True iff the version is deprecated. Arguments: - pkg (PackageBase): The package whose version is to be checked. - version (str or spack.version.StandardVersion): The version being checked + pkg: The package whose version is to be checked. + version: The version being checked """ if not isinstance(version, StandardVersion): - version = Version(version) + version = StandardVersion.from_string(version) - for k, v in pkg.versions.items(): - if version == k and v.get("deprecated", False): - return True + details = pkg.versions.get(version) + return details is not None and details.get("deprecated", False) - return False - -def preferred_version(pkg): +def preferred_version(pkg: "PackageBase"): """ Returns a sorted list of the preferred versions of the package. Arguments: - pkg (PackageBase): The package whose versions are to be assessed. + pkg: The package whose versions are to be assessed. """ # Here we sort first on the fact that a version is marked # as preferred in the package, then on the fact that the @@ -432,6 +430,43 @@ def remove_files_from_view(self, view, merge_map): Pb = TypeVar("Pb", bound="PackageBase") +WhenDict = Dict[spack.spec.Spec, Dict[str, Any]] +NameValuesDict = Dict[str, List[Any]] +NameWhenDict = Dict[str, Dict[spack.spec.Spec, List[Any]]] + + +def _by_name( + when_indexed_dictionary: WhenDict, when: bool = False +) -> Union[NameValuesDict, NameWhenDict]: + """Convert a dict of dicts keyed by when/name into a dict of lists keyed by name. + + Optional Arguments: + when: if ``True``, don't discared the ``when`` specs; return a 2-level dictionary + keyed by name and when spec. + """ + # very hard to define this type to be conditional on `when` + all_by_name: Dict[str, Any] = {} + + for when_spec, by_name in when_indexed_dictionary.items(): + for name, value in by_name.items(): + if when: + when_dict = all_by_name.setdefault(name, {}) + when_dict.setdefault(when_spec, []).append(value) + else: + all_by_name.setdefault(name, []).append(value) + + return dict(sorted(all_by_name.items())) + + +def _names(when_indexed_dictionary): + """Get sorted names from dicts keyed by when/name.""" + all_names = set() + for when, by_name in when_indexed_dictionary.items(): + for name in by_name: + all_names.add(name) + + return sorted(all_names) + class PackageBase(WindowsRPath, PackageViewMixin, metaclass=PackageMeta): """This is the superclass for all spack packages. @@ -523,9 +558,14 @@ class PackageBase(WindowsRPath, PackageViewMixin, metaclass=PackageMeta): # Declare versions dictionary as placeholder for values. # This allows analysis tools to correctly interpret the class attributes. versions: dict - - # Same for dependencies - dependencies: dict + dependencies: Dict["spack.spec.Spec", Dict[str, "spack.dependency.Dependency"]] + conflicts: Dict["spack.spec.Spec", List[Tuple["spack.spec.Spec", Optional[str]]]] + requirements: Dict[ + "spack.spec.Spec", List[Tuple[Tuple["spack.spec.Spec", ...], str, Optional[str]]] + ] + provided: Dict["spack.spec.Spec", Set["spack.spec.Spec"]] + provided_together: Dict["spack.spec.Spec", List[Set[str]]] + patches: Dict["spack.spec.Spec", List["spack.patch.Patch"]] #: By default, packages are not virtual #: Virtual packages override this attribute @@ -679,16 +719,24 @@ def __init__(self, spec): super().__init__() + @classmethod + def dependency_names(cls): + return _names(cls.dependencies) + + @classmethod + def dependencies_by_name(cls, when: bool = False): + return _by_name(cls.dependencies, when=when) + @classmethod def possible_dependencies( cls, - transitive=True, - expand_virtuals=True, + transitive: bool = True, + expand_virtuals: bool = True, depflag: dt.DepFlag = dt.ALL, - visited=None, - missing=None, - virtuals=None, - ): + visited: Optional[dict] = None, + missing: Optional[dict] = None, + virtuals: Optional[set] = None, + ) -> Dict[str, Set[str]]: """Return dict of possible dependencies of this package. Args: @@ -727,11 +775,12 @@ def possible_dependencies( visited.setdefault(cls.name, set()) - for name, conditions in cls.dependencies.items(): + for name, conditions in cls.dependencies_by_name(when=True).items(): # check whether this dependency could be of the type asked for depflag_union = 0 - for dep in conditions.values(): - depflag_union |= dep.depflag + for deplist in conditions.values(): + for dep in deplist: + depflag_union |= dep.depflag if not (depflag & depflag_union): continue @@ -851,22 +900,16 @@ def version(self): @classmethod @memoized - def version_urls(cls): - """OrderedDict of explicitly defined URLs for versions of this package. + def version_urls(cls) -> Dict[StandardVersion, str]: + """Dict of explicitly defined URLs for versions of this package. Return: - An OrderedDict (version -> URL) different versions of this - package, sorted by version. + An dict mapping version to url, ordered by version. - A version's URL only appears in the result if it has an an - explicitly defined ``url`` argument. So, this list may be empty - if a package only defines ``url`` at the top level. + A version's URL only appears in the result if it has an an explicitly defined ``url`` + argument. So, this list may be empty if a package only defines ``url`` at the top level. """ - version_urls = collections.OrderedDict() - for v, args in sorted(cls.versions.items()): - if "url" in args: - version_urls[v] = args["url"] - return version_urls + return {v: args["url"] for v, args in sorted(cls.versions.items()) if "url" in args} def nearest_url(self, version): """Finds the URL with the "closest" version to ``version``. @@ -909,36 +952,39 @@ def update_external_dependencies(self, extendee_spec=None): """ pass - def all_urls_for_version(self, version): + def all_urls_for_version(self, version: StandardVersion) -> List[str]: """Return all URLs derived from version_urls(), url, urls, and list_url (if it contains a version) in a package in that order. Args: - version (spack.version.Version): the version for which a URL is sought + version: the version for which a URL is sought """ uf = None if type(self).url_for_version != PackageBase.url_for_version: uf = self.url_for_version return self._implement_all_urls_for_version(version, uf) - def _implement_all_urls_for_version(self, version, custom_url_for_version=None): - if not isinstance(version, StandardVersion): - version = Version(version) + def _implement_all_urls_for_version( + self, + version: Union[str, StandardVersion], + custom_url_for_version: Optional[Callable[[StandardVersion], Optional[str]]] = None, + ) -> List[str]: + version = StandardVersion.from_string(version) if isinstance(version, str) else version - urls = [] + urls: List[str] = [] # If we have a specific URL for this version, don't extrapolate. - version_urls = self.version_urls() - if version in version_urls: - urls.append(version_urls[version]) + url = self.version_urls().get(version) + if url: + urls.append(url) # if there is a custom url_for_version, use it if custom_url_for_version is not None: u = custom_url_for_version(version) - if u not in urls and u is not None: + if u is not None and u not in urls: urls.append(u) - def sub_and_add(u): + def sub_and_add(u: Optional[str]) -> None: if u is None: return # skip the url if there is no version to replace @@ -946,9 +992,7 @@ def sub_and_add(u): spack.url.parse_version(u) except spack.url.UndetectableVersionError: return - nu = spack.url.substitute_version(u, self.url_version(version)) - - urls.append(nu) + urls.append(spack.url.substitute_version(u, self.url_version(version))) # If no specific URL, use the default, class-level URL sub_and_add(getattr(self, "url", None)) @@ -1035,15 +1079,26 @@ def _make_stage(self): # To fetch the current version source_stage = self._make_root_stage(self.fetcher) - # Extend it with all resources and patches + # all_stages is source + resources + patches all_stages = StageComposite() all_stages.append(source_stage) all_stages.extend( self._make_resource_stage(source_stage, r) for r in self._get_needed_resources() ) - all_stages.extend( - p.stage for p in self.spec.patches if isinstance(p, spack.patch.UrlPatch) - ) + if self.spec.concrete: + all_stages.extend( + p.stage for p in self.spec.patches if isinstance(p, spack.patch.UrlPatch) + ) + else: + # The only code path that gets here is spack mirror create --all which just needs all + # matching patches. + all_stages.extend( + p.stage + for when_spec, patch_list in self.patches.items() + if self.spec.intersects(when_spec) + for p in patch_list + if isinstance(p, spack.patch.UrlPatch) + ) return all_stages @property @@ -1068,13 +1123,7 @@ def stage(self, stage): @property def env_path(self): """Return the build environment file path associated with staging.""" - # Backward compatibility: Return the name of an existing log path; - # otherwise, return the current install env path name. - old_filename = os.path.join(self.stage.path, "spack-build.env") - if os.path.exists(old_filename): - return old_filename - else: - return os.path.join(self.stage.path, _spack_build_envfile) + return os.path.join(self.stage.path, _spack_build_envfile) @property def env_mods_path(self): @@ -1105,13 +1154,6 @@ def install_env_path(self): @property def log_path(self): """Return the build log file path associated with staging.""" - # Backward compatibility: Return the name of an existing log path. - for filename in ["spack-build.out", "spack-build.txt"]: - old_log = os.path.join(self.stage.path, filename) - if os.path.exists(old_log): - return old_log - - # Otherwise, return the current log path name. return os.path.join(self.stage.path, _spack_build_logfile) @property @@ -1124,15 +1166,15 @@ def phase_log_files(self): @property def install_log_path(self): - """Return the build log file path on successful installation.""" + """Return the (compressed) build log file path on successful installation""" # Backward compatibility: Return the name of an existing install log. - for filename in ["build.out", "build.txt"]: + for filename in [_spack_build_logfile, "build.out", "build.txt"]: old_log = os.path.join(self.metadata_dir, filename) if os.path.exists(old_log): return old_log # Otherwise, return the current install log path name. - return os.path.join(self.metadata_dir, _spack_build_logfile) + return os.path.join(self.metadata_dir, _spack_build_logfile + ".gz") @property def configure_args_path(self): @@ -1208,7 +1250,7 @@ def fetcher(self, f): @classmethod def dependencies_of_type(cls, deptypes: dt.DepFlag): - """Get dependencies that can possibly have these deptypes. + """Get names of dependencies that can possibly have these deptypes. This analyzes the package and determines which dependencies *can* be a certain kind of dependency. Note that they may not *always* @@ -1216,11 +1258,11 @@ def dependencies_of_type(cls, deptypes: dt.DepFlag): so something may be a build dependency in one configuration and a run dependency in another. """ - return dict( - (name, conds) - for name, conds in cls.dependencies.items() - if any(deptypes & cls.dependencies[name][cond].depflag for cond in conds) - ) + return { + name + for name, dependencies in cls.dependencies_by_name().items() + if any(deptypes & dep.depflag for dep in dependencies) + } # TODO: allow more than one active extendee. @property @@ -1249,21 +1291,9 @@ def extendee_spec(self): else: # If it's not concrete, then return the spec from the # extends() directive since that is all we know so far. - spec_str, kwargs = next(iter(self.extendees.items())) + spec_str = next(iter(self.extendees)) return spack.spec.Spec(spec_str) - @property - def extendee_args(self): - """ - Spec of the extendee of this package, or None if it is not an extension - """ - if not self.extendees: - return None - - # TODO: allow multiple extendees. - name = next(iter(self.extendees)) - return self.extendees[name][1] - @property def is_extension(self): # if it is concrete, it's only an extension if it actually @@ -1294,9 +1324,9 @@ def provides(self, vpkg_name): True if this package provides a virtual package with the specified name """ return any( - any(self.spec.intersects(c) for c in constraints) - for s, constraints in self.provided.items() - if s.name == vpkg_name + any(spec.name == vpkg_name for spec in provided) + for when_spec, provided in self.provided.items() + if self.spec.intersects(when_spec) ) @property @@ -1306,10 +1336,16 @@ def virtuals_provided(self): """ return [ vspec - for vspec, constraints in self.provided.items() - if any(self.spec.satisfies(c) for c in constraints) + for when_spec, provided in self.provided.items() + for vspec in provided + if self.spec.satisfies(when_spec) ] + @classmethod + def provided_virtual_names(cls): + """Return sorted list of names of virtuals that can be provided by this package.""" + return sorted(set(vpkg.name for virtuals in cls.provided.values() for vpkg in virtuals)) + @property def prefix(self): """Get the prefix into which this package should be installed.""" @@ -1356,13 +1392,9 @@ def download_instr(self): (str): default manual download instructions """ required = ( - "Manual download is required for {0}. ".format(self.spec.name) - if self.manual_download - else "" - ) - return "{0}Refer to {1} for download instructions.".format( - required, self.spec.package.homepage + f"Manual download is required for {self.spec.name}. " if self.manual_download else "" ) + return f"{required}Refer to {self.homepage} for download instructions." def do_fetch(self, mirror_only=False): """ @@ -1743,28 +1775,16 @@ def _if_ninja_target_execute(self, target, *args, **kwargs): inspect.getmodule(self).ninja(target, *args, **kwargs) def _get_needed_resources(self): - resources = [] - # Select the resources that are needed for this build - if self.spec.concrete: - for when_spec, resource_list in self.resources.items(): - if when_spec in self.spec: - resources.extend(resource_list) - else: - for when_spec, resource_list in self.resources.items(): - # Note that variant checking is always strict for specs where - # the name is not specified. But with strict variant checking, - # only variants mentioned in 'other' are checked. Here we only - # want to make sure that no constraints in when_spec - # conflict with the spec, so we need to invoke - # when_spec.satisfies(self.spec) vs. - # self.spec.satisfies(when_spec) - if when_spec.intersects(self.spec): - resources.extend(resource_list) - # Sorts the resources by the length of the string representing their - # destination. Since any nested resource must contain another - # resource's name in its path, it seems that should work - resources = sorted(resources, key=lambda res: len(res.destination)) - return resources + # We use intersects here cause it would also work if self.spec is abstract + resources = [ + resource + for when_spec, resource_list in self.resources.items() + if self.spec.intersects(when_spec) + for resource in resource_list + ] + # Sorts the resources by the length of the string representing their destination. Since any + # nested resource must contain another resource's path, that should work + return sorted(resources, key=lambda res: len(res.destination)) def _resource_stage(self, resource): pieces = ["resource", resource.name, self.spec.dag_hash()] @@ -2047,15 +2067,6 @@ def unit_test_check(self): """ return True - @property - def build_log_path(self): - """ - Return the expected (or current) build log file path. The path points - to the staging build file until the software is successfully installed, - when it points to the file in the installation directory. - """ - return self.install_log_path if self.spec.installed else self.log_path - @classmethod def inject_flags(cls: Type[Pb], name: str, flags: Iterable[str]) -> FLAG_HANDLER_RETURN_TYPE: """ @@ -2339,15 +2350,14 @@ def format_doc(cls, **kwargs): return results.getvalue() @property - def all_urls(self): + def all_urls(self) -> List[str]: """A list of all URLs in a package. Check both class-level and version-specific URLs. - Returns: - list: a list of URLs + Returns a list of URLs """ - urls = [] + urls: List[str] = [] if hasattr(self, "url") and self.url: urls.append(self.url) @@ -2360,7 +2370,9 @@ def all_urls(self): urls.append(args["url"]) return urls - def fetch_remote_versions(self, concurrency=None): + def fetch_remote_versions( + self, concurrency: Optional[int] = None + ) -> Dict[StandardVersion, str]: """Find remote versions of this package. Uses ``list_url`` and any other URLs listed in the package file. @@ -2449,14 +2461,21 @@ def flatten_dependencies(spec, flat_dir): dep_files.merge(flat_dir + "/" + name) -def possible_dependencies(*pkg_or_spec, **kwargs): +def possible_dependencies( + *pkg_or_spec: Union[str, spack.spec.Spec, typing.Type[PackageBase]], + transitive: bool = True, + expand_virtuals: bool = True, + depflag: dt.DepFlag = dt.ALL, + missing: Optional[dict] = None, + virtuals: Optional[set] = None, +) -> Dict[str, Set[str]]: """Get the possible dependencies of a number of packages. See ``PackageBase.possible_dependencies`` for details. """ packages = [] for pos in pkg_or_spec: - if isinstance(pos, PackageMeta): + if isinstance(pos, PackageMeta) and issubclass(pos, PackageBase): packages.append(pos) continue @@ -2469,9 +2488,16 @@ def possible_dependencies(*pkg_or_spec, **kwargs): else: packages.append(pos.package_class) - visited = {} + visited: Dict[str, Set[str]] = {} for pkg in packages: - pkg.possible_dependencies(visited=visited, **kwargs) + pkg.possible_dependencies( + visited=visited, + transitive=transitive, + expand_virtuals=expand_virtuals, + depflag=depflag, + missing=missing, + virtuals=virtuals, + ) return visited @@ -2519,3 +2545,7 @@ class DependencyConflictError(spack.error.SpackError): def __init__(self, conflict): super().__init__("%s conflicts with another file in the flattened directory." % (conflict)) + + +class ManualDownloadRequiredError(InvalidPackageOpError): + """Raised when attempting an invalid operation on a package that requires a manual download.""" diff --git a/lib/spack/spack/package_prefs.py b/lib/spack/spack/package_prefs.py index c2997034feeaf4..117308e84e2f19 100644 --- a/lib/spack/spack/package_prefs.py +++ b/lib/spack/spack/package_prefs.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/package_test.py b/lib/spack/spack/package_test.py index e5b0cb576e9dab..abc85ae8c3fb7a 100644 --- a/lib/spack/spack/package_test.py +++ b/lib/spack/spack/package_test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/parser.py b/lib/spack/spack/parser.py index c69918b41905b5..29e335d65e7ad1 100644 --- a/lib/spack/spack/parser.py +++ b/lib/spack/spack/parser.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -58,6 +58,7 @@ expansion when it is the first character in an id typed on the command line. """ import enum +import json import pathlib import re import sys @@ -95,13 +96,55 @@ else: FILENAME = WINDOWS_FILENAME +#: These are legal values that *can* be parsed bare, without quotes on the command line. VALUE = r"(?:[a-zA-Z_0-9\-+\*.,:=\~\/\\]+)" -QUOTED_VALUE = r"[\"']+(?:[a-zA-Z_0-9\-+\*.,:=\~\/\\\s]+)[\"']+" + +#: Variant/flag values that match this can be left unquoted in Spack output +NO_QUOTES_NEEDED = re.compile(r"^[a-zA-Z0-9,/_.-]+$") + +#: Quoted values can be *anything* in between quotes, including escaped quotes. +QUOTED_VALUE = r"(?:'(?:[^']|(?<=\\)')*'|\"(?:[^\"]|(?<=\\)\")*\")" VERSION = r"=?(?:[a-zA-Z0-9_][a-zA-Z_0-9\-\.]*\b)" VERSION_RANGE = rf"(?:(?:{VERSION})?:(?:{VERSION}(?!\s*=))?)" VERSION_LIST = rf"(?:{VERSION_RANGE}|{VERSION})(?:\s*,\s*(?:{VERSION_RANGE}|{VERSION}))*" +#: Regex with groups to use for splitting (optionally propagated) key-value pairs +SPLIT_KVP = re.compile(rf"^({NAME})(==?)(.*)$") + +#: Regex to strip quotes. Group 2 will be the unquoted string. +STRIP_QUOTES = re.compile(r"^(['\"])(.*)\1$") + + +def strip_quotes_and_unescape(string: str) -> str: + """Remove surrounding single or double quotes from string, if present.""" + match = STRIP_QUOTES.match(string) + if not match: + return string + + # replace any escaped quotes with bare quotes + quote, result = match.groups() + return result.replace(rf"\{quote}", quote) + + +def quote_if_needed(value: str) -> str: + """Add quotes around the value if it requires quotes. + + This will add quotes around the value unless it matches ``NO_QUOTES_NEEDED``. + + This adds: + * single quotes by default + * double quotes around any value that contains single quotes + + If double quotes are used, we json-escpae the string. That is, we escape ``\\``, + ``"``, and control codes. + + """ + if NO_QUOTES_NEEDED.match(value): + return value + + return json.dumps(value) if "'" in value else f"'{value}'" + class TokenBase(enum.Enum): """Base class for an enum type with a regex value""" @@ -138,8 +181,8 @@ class TokenType(TokenBase): # Variants PROPAGATED_BOOL_VARIANT = rf"(?:(?:\+\+|~~|--)\s*{NAME})" BOOL_VARIANT = rf"(?:[~+-]\s*{NAME})" - PROPAGATED_KEY_VALUE_PAIR = rf"(?:{NAME}\s*==\s*(?:{VALUE}|{QUOTED_VALUE}))" - KEY_VALUE_PAIR = rf"(?:{NAME}\s*=\s*(?:{VALUE}|{QUOTED_VALUE}))" + PROPAGATED_KEY_VALUE_PAIR = rf"(?:{NAME}==(?:{VALUE}|{QUOTED_VALUE}))" + KEY_VALUE_PAIR = rf"(?:{NAME}=(?:{VALUE}|{QUOTED_VALUE}))" # Compilers COMPILER_AND_VERSION = rf"(?:%\s*(?:{NAME})(?:[\s]*)@\s*(?:{VERSION_LIST}))" COMPILER = rf"(?:%\s*(?:{NAME}))" @@ -206,11 +249,15 @@ def tokenize(text: str) -> Iterator[Token]: scanner = ALL_TOKENS.scanner(text) # type: ignore[attr-defined] match: Optional[Match] = None for match in iter(scanner.match, None): + # The following two assertions are to help mypy + msg = ( + "unexpected value encountered during parsing. Please submit a bug report " + "at https://github.com/spack/spack/issues/new/choose" + ) + assert match is not None, msg + assert match.lastgroup is not None, msg yield Token( - TokenType.__members__[match.lastgroup], # type: ignore[attr-defined] - match.group(), # type: ignore[attr-defined] - match.start(), # type: ignore[attr-defined] - match.end(), # type: ignore[attr-defined] + TokenType.__members__[match.lastgroup], match.group(), match.start(), match.end() ) if match is None and not text: @@ -347,12 +394,14 @@ def parse( # accept another package name afterwards in a node if self.ctx.accept(TokenType.UNQUALIFIED_PACKAGE_NAME): initial_spec.name = self.ctx.current_token.value + elif self.ctx.accept(TokenType.FULLY_QUALIFIED_PACKAGE_NAME): parts = self.ctx.current_token.value.split(".") name = parts[-1] namespace = ".".join(parts[:-1]) initial_spec.name = name initial_spec.namespace = namespace + elif self.ctx.accept(TokenType.FILENAME): return FileParser(self.ctx).parse(initial_spec) @@ -366,6 +415,7 @@ def parse( compiler_name = self.ctx.current_token.value[1:] initial_spec.compiler = spack.spec.CompilerSpec(compiler_name.strip(), ":") self.has_compiler = True + elif self.ctx.accept(TokenType.COMPILER_AND_VERSION): if self.has_compiler: raise spack.spec.DuplicateCompilerSpecError( @@ -377,6 +427,7 @@ def parse( compiler_name.strip(), compiler_version ) self.has_compiler = True + elif ( self.ctx.accept(TokenType.VERSION_HASH_PAIR) or self.ctx.accept(TokenType.GIT_VERSION) @@ -391,31 +442,39 @@ def parse( ) initial_spec.attach_git_version_lookup() self.has_version = True + elif self.ctx.accept(TokenType.BOOL_VARIANT): variant_value = self.ctx.current_token.value[0] == "+" initial_spec._add_flag( self.ctx.current_token.value[1:].strip(), variant_value, propagate=False ) + elif self.ctx.accept(TokenType.PROPAGATED_BOOL_VARIANT): variant_value = self.ctx.current_token.value[0:2] == "++" initial_spec._add_flag( self.ctx.current_token.value[2:].strip(), variant_value, propagate=True ) + elif self.ctx.accept(TokenType.KEY_VALUE_PAIR): - name, value = self.ctx.current_token.value.split("=", maxsplit=1) - name = name.strip("'\" ") - value = value.strip("'\" ") - initial_spec._add_flag(name, value, propagate=False) + match = SPLIT_KVP.match(self.ctx.current_token.value) + assert match, "SPLIT_KVP and KEY_VALUE_PAIR do not agree." + + name, delim, value = match.groups() + initial_spec._add_flag(name, strip_quotes_and_unescape(value), propagate=False) + elif self.ctx.accept(TokenType.PROPAGATED_KEY_VALUE_PAIR): - name, value = self.ctx.current_token.value.split("==", maxsplit=1) - name = name.strip("'\" ") - value = value.strip("'\" ") - initial_spec._add_flag(name, value, propagate=True) + match = SPLIT_KVP.match(self.ctx.current_token.value) + assert match, "SPLIT_KVP and PROPAGATED_KEY_VALUE_PAIR do not agree." + + name, delim, value = match.groups() + initial_spec._add_flag(name, strip_quotes_and_unescape(value), propagate=True) + elif self.ctx.expect(TokenType.DAG_HASH): if initial_spec.abstract_hash: break self.ctx.accept(TokenType.DAG_HASH) initial_spec.abstract_hash = self.ctx.current_token.value[1:] + else: break diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py index 7e2fcaff103ef3..75d1ab7f37e166 100644 --- a/lib/spack/spack/patch.py +++ b/lib/spack/spack/patch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -389,10 +389,9 @@ def _index_patches(pkg_class, repository): patch_dict.pop("sha256") # save some space index[patch.sha256] = {pkg_class.fullname: patch_dict} - # and patches on dependencies - for name, conditions in pkg_class.dependencies.items(): - for cond, dependency in conditions.items(): - for pcond, patch_list in dependency.patches.items(): + for deps_by_name in pkg_class.dependencies.values(): + for dependency in deps_by_name.values(): + for patch_list in dependency.patches.values(): for patch in patch_list: dspec_cls = repository.get_pkg_class(dependency.spec.name) patch_dict = patch.to_dict() diff --git a/lib/spack/spack/paths.py b/lib/spack/spack/paths.py index 4e66adf11a6a1f..aa642764215117 100644 --- a/lib/spack/spack/paths.py +++ b/lib/spack/spack/paths.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/__init__.py b/lib/spack/spack/platforms/__init__.py index 1a41d26971ac15..54d3e6eae52c63 100644 --- a/lib/spack/spack/platforms/__init__.py +++ b/lib/spack/spack/platforms/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,6 +8,7 @@ from ._platform import Platform from .cray import Cray from .darwin import Darwin +from .freebsd import FreeBSD from .linux import Linux from .test import Test from .windows import Windows @@ -17,6 +18,7 @@ "Cray", "Darwin", "Linux", + "FreeBSD", "Test", "Windows", "platforms", diff --git a/lib/spack/spack/platforms/_functions.py b/lib/spack/spack/platforms/_functions.py index bfd035c375a7f5..d04f2587b0cdea 100644 --- a/lib/spack/spack/platforms/_functions.py +++ b/lib/spack/spack/platforms/_functions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,12 +10,13 @@ from .cray import Cray from .darwin import Darwin +from .freebsd import FreeBSD from .linux import Linux from .test import Test from .windows import Windows #: List of all the platform classes known to Spack -platforms = [Cray, Darwin, Linux, Windows, Test] +platforms = [Cray, Darwin, Linux, Windows, FreeBSD, Test] @llnl.util.lang.memoized diff --git a/lib/spack/spack/platforms/_platform.py b/lib/spack/spack/platforms/_platform.py index d313b624c1bf42..c165cf9f3375af 100644 --- a/lib/spack/spack/platforms/_platform.py +++ b/lib/spack/spack/platforms/_platform.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index af40510b2c0469..180af15435eaf6 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py index 74226728027906..1b7a5927f43ac2 100644 --- a/lib/spack/spack/platforms/darwin.py +++ b/lib/spack/spack/platforms/darwin.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/freebsd.py b/lib/spack/spack/platforms/freebsd.py new file mode 100644 index 00000000000000..4485550789726e --- /dev/null +++ b/lib/spack/spack/platforms/freebsd.py @@ -0,0 +1,37 @@ +# 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 platform + +import archspec.cpu + +import spack.target +from spack.operating_systems.freebsd import FreeBSDOs + +from ._platform import Platform + + +class FreeBSD(Platform): + priority = 102 + + def __init__(self): + super().__init__("freebsd") + + for name in archspec.cpu.TARGETS: + self.add_target(name, spack.target.Target(name)) + + # Get specific default + self.default = archspec.cpu.host().name + self.front_end = self.default + self.back_end = self.default + + os = FreeBSDOs() + self.default_os = str(os) + self.front_os = self.default_os + self.back_os = self.default_os + self.add_operating_system(str(os), os) + + @classmethod + def detect(cls): + return platform.system().lower() == "freebsd" diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py index 60624a800935e9..2be5b51cb295e2 100644 --- a/lib/spack/spack/platforms/linux.py +++ b/lib/spack/spack/platforms/linux.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/test.py b/lib/spack/spack/platforms/test.py index 89ac57dc0581f7..9ead66ab273191 100644 --- a/lib/spack/spack/platforms/test.py +++ b/lib/spack/spack/platforms/test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/platforms/windows.py b/lib/spack/spack/platforms/windows.py index d37a644e278c30..c00382e1980d17 100755 --- a/lib/spack/spack/platforms/windows.py +++ b/lib/spack/spack/platforms/windows.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/projections.py b/lib/spack/spack/projections.py index 58f7b9bb7131a4..b11c9c2a6d4262 100644 --- a/lib/spack/spack/projections.py +++ b/lib/spack/spack/projections.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/provider_index.py b/lib/spack/spack/provider_index.py index 32ace00a1669e7..29c32ce1b5a43b 100644 --- a/lib/spack/spack/provider_index.py +++ b/lib/spack/spack/provider_index.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -128,8 +128,8 @@ def update(self, spec): assert not self.repository.is_virtual_safe(spec.name), msg pkg_provided = self.repository.get_pkg_class(spec.name).provided - for provided_spec, provider_specs in pkg_provided.items(): - for provider_spec_readonly in provider_specs: + for provider_spec_readonly, provided_specs in pkg_provided.items(): + for provided_spec in provided_specs: # TODO: fix this comment. # We want satisfaction other than flags provider_spec = provider_spec_readonly.copy() diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index 756e3fa9dc60d1..6fcb4e98bc4feb 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/relocate_text.py b/lib/spack/spack/relocate_text.py index fced612d7b64e6..95aee0d12661ef 100644 --- a/lib/spack/spack/relocate_text.py +++ b/lib/spack/spack/relocate_text.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 5918454005df85..307654d328489d 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -490,7 +490,7 @@ def read(self, stream): self.index = spack.tag.TagIndex.from_json(stream, self.repository) def update(self, pkg_fullname): - self.index.update_package(pkg_fullname) + self.index.update_package(pkg_fullname.split(".")[-1]) def write(self, stream): self.index.to_json(stream) diff --git a/lib/spack/spack/report.py b/lib/spack/spack/report.py index f7d16b5e293811..9c56e7edbe0722 100644 --- a/lib/spack/spack/report.py +++ b/lib/spack/spack/report.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,6 +6,7 @@ import collections import contextlib import functools +import gzip import os import time import traceback @@ -190,9 +191,13 @@ def on_success(self, pkg, kwargs, package_record): def fetch_log(self, pkg): try: - with open(pkg.build_log_path, "r", encoding="utf-8") as stream: - return "".join(stream.readlines()) - except Exception: + if os.path.exists(pkg.install_log_path): + stream = gzip.open(pkg.install_log_path, "rt") + else: + stream = open(pkg.log_path) + with stream as f: + return f.read() + except OSError: return f"Cannot open log for {pkg.spec.cshort_spec}" def extract_package_from_signature(self, instance, *args, **kwargs): diff --git a/lib/spack/spack/reporters/__init__.py b/lib/spack/spack/reporters/__init__.py index f752eadc6324ec..0fa7d73e8dc164 100644 --- a/lib/spack/spack/reporters/__init__.py +++ b/lib/spack/spack/reporters/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/reporters/base.py b/lib/spack/spack/reporters/base.py index f1c10286066014..31cb02f1751c82 100644 --- a/lib/spack/spack/reporters/base.py +++ b/lib/spack/spack/reporters/base.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/reporters/cdash.py b/lib/spack/spack/reporters/cdash.py index 4517530751ac36..c65feb35d8ad4d 100644 --- a/lib/spack/spack/reporters/cdash.py +++ b/lib/spack/spack/reporters/cdash.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,13 +32,26 @@ from .extract import extract_test_parts # Mapping Spack phases to the corresponding CTest/CDash phase. +# TODO: Some of the phases being lumped into configure in the CDash tables +# TODO: really belong in a separate column, such as "Setup". +# TODO: Would also be nice to have `stage` as a separate phase that could +# TODO: be lumped into that new column instead of configure, for example. MAP_PHASES_TO_CDASH = { - "autoreconf": "configure", - "cmake": "configure", - "configure": "configure", - "edit": "configure", + "autoreconf": "configure", # AutotoolsBuilder + "bootstrap": "configure", # CMakeBuilder "build": "build", + "build_processes": "build", # Openloops + "cmake": "configure", # CMakeBuilder + "configure": "configure", + "edit": "configure", # MakefileBuilder + "generate_luarocks_config": "configure", # LuaBuilder + "hostconfig": "configure", # Lvarray + "initconfig": "configure", # CachedCMakeBuilder "install": "build", + "meson": "configure", # MesonBuilder + "preprocess": "configure", # LuaBuilder + "qmake": "configure", # QMakeBuilder + "unpack": "configure", # LuaBuilder } # Initialize data structures common to each phase's report. @@ -92,11 +105,12 @@ def __init__(self, configuration: CDashConfiguration): self.osname = platform.system() self.osrelease = platform.release() self.target = spack.platforms.host().target("default_target") - self.endtime = int(time.time()) + self.starttime = int(time.time()) + self.endtime = self.starttime self.buildstamp = ( configuration.buildstamp if configuration.buildstamp - else build_stamp(configuration.track, self.endtime) + else build_stamp(configuration.track, self.starttime) ) self.buildIds: Dict[str, str] = {} self.revision = "" @@ -125,7 +139,7 @@ def build_report_for_package(self, report_dir, package, duration): report_data[phase] = {} report_data[phase]["loglines"] = [] report_data[phase]["status"] = 0 - report_data[phase]["endtime"] = self.endtime + report_data[phase]["starttime"] = self.starttime # Track the phases we perform so we know what reports to create. # We always report the update step because this is how we tell CDash @@ -153,6 +167,25 @@ def build_report_for_package(self, report_dir, package, duration): elif cdash_phase: report_data[cdash_phase]["loglines"].append(xml.sax.saxutils.escape(line)) + # something went wrong pre-cdash "configure" phase b/c we have an exception and only + # "update" was encounterd. + # dump the report in the configure line so teams can see what the issue is + if len(phases_encountered) == 1 and package["exception"]: + # TODO this mapping is not ideal since these are pre-configure errors + # we need to determine if a more appropriate cdash phase can be utilized + # for now we will add a message to the log explaining this + cdash_phase = "configure" + phases_encountered.append(cdash_phase) + + log_message = ( + "Pre-configure errors occured in Spack's process that terminated the " + "build process prematurely.\nSpack output::\n{0}".format( + xml.sax.saxutils.escape(package["exception"]) + ) + ) + + report_data[cdash_phase]["loglines"].append(log_message) + # Move the build phase to the front of the list if it occurred. # This supports older versions of CDash that expect this phase # to be reported before all others. @@ -160,9 +193,9 @@ def build_report_for_package(self, report_dir, package, duration): build_pos = phases_encountered.index("build") phases_encountered.insert(0, phases_encountered.pop(build_pos)) - self.starttime = self.endtime - duration + self.endtime = self.starttime + duration for phase in phases_encountered: - report_data[phase]["starttime"] = self.starttime + report_data[phase]["endtime"] = self.endtime report_data[phase]["log"] = "\n".join(report_data[phase]["loglines"]) errors, warnings = parse_log_events(report_data[phase]["loglines"]) @@ -309,7 +342,7 @@ def test_report_for_package(self, report_dir, package, duration): self.buildname = "{0}-{1}".format(self.current_package_name, package["id"]) else: self.buildname = self.report_build_name(self.current_package_name) - self.starttime = self.endtime - duration + self.endtime = self.starttime + duration report_data = self.initialize_report(report_dir) report_data["hostname"] = socket.gethostname() @@ -354,7 +387,7 @@ def concretization_report(self, report_dir, msg): self.buildname = self.base_buildname report_data = self.initialize_report(report_dir) report_data["update"] = {} - report_data["update"]["starttime"] = self.endtime + report_data["update"]["starttime"] = self.starttime report_data["update"]["endtime"] = self.endtime report_data["update"]["revision"] = self.revision report_data["update"]["log"] = msg diff --git a/lib/spack/spack/reporters/extract.py b/lib/spack/spack/reporters/extract.py index 5b912610f0d298..5554d89f0a2799 100644 --- a/lib/spack/spack/reporters/extract.py +++ b/lib/spack/spack/reporters/extract.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/reporters/junit.py b/lib/spack/spack/reporters/junit.py index dcc3bc635b10f0..ad13db61e4ce7b 100644 --- a/lib/spack/spack/reporters/junit.py +++ b/lib/spack/spack/reporters/junit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/resource.py b/lib/spack/spack/resource.py index 4fc2898adae188..ba855cbb6388ed 100644 --- a/lib/spack/spack/resource.py +++ b/lib/spack/spack/resource.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/rewiring.py b/lib/spack/spack/rewiring.py index 2c18827e872294..297b0bd232ca2f 100644 --- a/lib/spack/spack/rewiring.py +++ b/lib/spack/spack/rewiring.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/__init__.py b/lib/spack/spack/schema/__init__.py index bdb1a272d03754..d6df072117615b 100644 --- a/lib/spack/spack/schema/__init__.py +++ b/lib/spack/spack/schema/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/bootstrap.py b/lib/spack/spack/schema/bootstrap.py index 73882c43c95942..0007852d1ccbb0 100644 --- a/lib/spack/spack/schema/bootstrap.py +++ b/lib/spack/spack/schema/bootstrap.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/buildcache_spec.py b/lib/spack/spack/schema/buildcache_spec.py index 7c74c7f4eba012..e04a8e9519fe48 100644 --- a/lib/spack/spack/schema/buildcache_spec.py +++ b/lib/spack/spack/schema/buildcache_spec.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/cdash.py b/lib/spack/spack/schema/cdash.py index f0178babc00552..42d40a5c3aac02 100644 --- a/lib/spack/spack/schema/cdash.py +++ b/lib/spack/spack/schema/cdash.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/ci.py b/lib/spack/spack/schema/ci.py index 9ba65b26820830..9cc9baf385b929 100644 --- a/lib/spack/spack/schema/ci.py +++ b/lib/spack/spack/schema/ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/compilers.py b/lib/spack/spack/schema/compilers.py index 924fee7a21ff76..831ef9ad2b788e 100644 --- a/lib/spack/spack/schema/compilers.py +++ b/lib/spack/spack/schema/compilers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/concretizer.py b/lib/spack/spack/schema/concretizer.py index a4bd82e267c190..57f0c06b54d5cc 100644 --- a/lib/spack/spack/schema/concretizer.py +++ b/lib/spack/spack/schema/concretizer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py index 6818cd78f39079..add66118f718d1 100644 --- a/lib/spack/spack/schema/config.py +++ b/lib/spack/spack/schema/config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py index ef409c3d56bf0e..c5f0516966125f 100644 --- a/lib/spack/spack/schema/container.py +++ b/lib/spack/spack/schema/container.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/cray_manifest.py b/lib/spack/spack/schema/cray_manifest.py index 39529fc48f96ab..c922bb2c31f690 100644 --- a/lib/spack/spack/schema/cray_manifest.py +++ b/lib/spack/spack/schema/cray_manifest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/database_index.py b/lib/spack/spack/schema/database_index.py index 021146f92a4c40..4b25b415a3225d 100644 --- a/lib/spack/spack/schema/database_index.py +++ b/lib/spack/spack/schema/database_index.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/definitions.py b/lib/spack/spack/schema/definitions.py index 470eb7e8989ce4..81579811b28c6e 100644 --- a/lib/spack/spack/schema/definitions.py +++ b/lib/spack/spack/schema/definitions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/develop.py b/lib/spack/spack/schema/develop.py new file mode 100644 index 00000000000000..7fa2ec5b0790f6 --- /dev/null +++ b/lib/spack/spack/schema/develop.py @@ -0,0 +1,34 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +properties = { + "develop": { + "type": "object", + "default": {}, + "additionalProperties": False, + "patternProperties": { + r"\w[\w-]*": { + "type": "object", + "additionalProperties": False, + "properties": {"spec": {"type": "string"}, "path": {"type": "string"}}, + } + }, + } +} + + +def update(data): + return False + + +#: Full schema with metadata +schema = { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "Spack repository configuration file schema", + "type": "object", + "additionalProperties": False, + "properties": properties, +} diff --git a/lib/spack/spack/schema/env.py b/lib/spack/spack/schema/env.py index 463c6680f0d47e..b5f1294722f31d 100644 --- a/lib/spack/spack/schema/env.py +++ b/lib/spack/spack/schema/env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -37,21 +37,6 @@ # extra environment schema properties { "include": {"type": "array", "default": [], "items": {"type": "string"}}, - "develop": { - "type": "object", - "default": {}, - "additionalProperties": False, - "patternProperties": { - r"\w[\w-]*": { - "type": "object", - "additionalProperties": False, - "properties": { - "spec": {"type": "string"}, - "path": {"type": "string"}, - }, - } - }, - }, "specs": spack.schema.spec_list_schema, "view": { "anyOf": [ diff --git a/lib/spack/spack/schema/environment.py b/lib/spack/spack/schema/environment.py index a65a4eaf1485f1..1c5070092eb9db 100644 --- a/lib/spack/spack/schema/environment.py +++ b/lib/spack/spack/schema/environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/gitlab_ci.py b/lib/spack/spack/schema/gitlab_ci.py index 2f2e51c8318c48..c95cd674d9d337 100644 --- a/lib/spack/spack/schema/gitlab_ci.py +++ b/lib/spack/spack/schema/gitlab_ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/merged.py b/lib/spack/spack/schema/merged.py index 7ceb6494108d0e..f4d70f8241a356 100644 --- a/lib/spack/spack/schema/merged.py +++ b/lib/spack/spack/schema/merged.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,7 @@ import spack.schema.config import spack.schema.container import spack.schema.definitions +import spack.schema.develop import spack.schema.mirrors import spack.schema.modules import spack.schema.packages @@ -34,6 +35,7 @@ spack.schema.container.properties, spack.schema.ci.properties, spack.schema.definitions.properties, + spack.schema.develop.properties, spack.schema.mirrors.properties, spack.schema.modules.properties, spack.schema.packages.properties, diff --git a/lib/spack/spack/schema/mirrors.py b/lib/spack/spack/schema/mirrors.py index 8001172afd4b64..13ed1c746e9d30 100644 --- a/lib/spack/spack/schema/mirrors.py +++ b/lib/spack/spack/schema/mirrors.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -42,6 +42,7 @@ "properties": { "source": {"type": "boolean"}, "binary": {"type": "boolean"}, + "signed": {"type": "boolean"}, "fetch": fetch_and_push, "push": fetch_and_push, **connection, # type: ignore diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py index fb4130d345d02b..48db98c485cfdb 100644 --- a/lib/spack/spack/schema/modules.py +++ b/lib/spack/spack/schema/modules.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/packages.py b/lib/spack/spack/schema/packages.py index 2802f8952947aa..365536990e58c4 100644 --- a/lib/spack/spack/schema/packages.py +++ b/lib/spack/spack/schema/packages.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,6 +7,7 @@ .. literalinclude:: _spack_root/lib/spack/spack/schema/packages.py :lines: 13- """ +import spack.schema.environment permissions = { "type": "object", @@ -53,6 +54,24 @@ ] } +prefer_and_conflict = { + "type": "array", + "items": { + "oneOf": [ + { + "type": "object", + "additionalProperties": False, + "properties": { + "spec": {"type": "string"}, + "message": {"type": "string"}, + "when": {"type": "string"}, + }, + }, + {"type": "string"}, + ] + }, +} + permissions = { "type": "object", "additionalProperties": False, @@ -84,6 +103,8 @@ "additionalProperties": False, "properties": { "require": requirements, + "prefer": prefer_and_conflict, + "conflict": prefer_and_conflict, "version": {}, # Here only to warn users on ignored properties "target": { "type": "array", @@ -132,6 +153,8 @@ "additionalProperties": False, "properties": { "require": requirements, + "prefer": prefer_and_conflict, + "conflict": prefer_and_conflict, "version": { "type": "array", "default": [], @@ -155,7 +178,13 @@ "spec": {"type": "string"}, "prefix": {"type": "string"}, "modules": {"type": "array", "items": {"type": "string"}}, - "extra_attributes": {"type": "object"}, + "extra_attributes": { + "type": "object", + "additionalProperties": True, + "properties": { + "environment": spack.schema.environment.definition + }, + }, }, "additionalProperties": True, "required": ["spec"], @@ -179,7 +208,6 @@ } } - #: Full schema with metadata schema = { "$schema": "http://json-schema.org/draft-07/schema#", diff --git a/lib/spack/spack/schema/projections.py b/lib/spack/spack/schema/projections.py index a28df1c5b5cd4d..00f28d8bf98fb6 100644 --- a/lib/spack/spack/schema/projections.py +++ b/lib/spack/spack/schema/projections.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/repos.py b/lib/spack/spack/schema/repos.py index e846285ca16a2e..46f775fb4e85d9 100644 --- a/lib/spack/spack/schema/repos.py +++ b/lib/spack/spack/schema/repos.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/spec.py b/lib/spack/spack/schema/spec.py index 8d2390b2f3e958..3cbb8a65d278ad 100644 --- a/lib/spack/spack/schema/spec.py +++ b/lib/spack/spack/schema/spec.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/schema/upstreams.py b/lib/spack/spack/schema/upstreams.py index e45d492d5fa586..eee9d050ba5c02 100644 --- a/lib/spack/spack/schema/upstreams.py +++ b/lib/spack/spack/schema/upstreams.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/solver/__init__.py b/lib/spack/spack/solver/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/solver/__init__.py +++ b/lib/spack/spack/solver/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py index 0e298bfb4e92f3..151aef20a6e289 100644 --- a/lib/spack/spack/solver/asp.py +++ b/lib/spack/spack/solver/asp.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,19 @@ import pathlib import pprint import re +import sys import types +import typing import warnings from typing import Callable, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, Union import archspec.cpu +import spack.config as sc import spack.deptypes as dt +import spack.parser +import spack.paths as sp +import spack.util.path as sup try: import clingo # type: ignore[import] @@ -27,6 +33,36 @@ except ImportError: clingo = None # type: ignore clingo_cffi = False +except AttributeError: + # Reaching this point indicates a broken clingo installation + # If Spack derived clingo, suggest user re-run bootstrap + # if non-spack, suggest user investigate installation + + # assume Spack is not responsibe for broken clingo + msg = ( + f"Clingo installation at {clingo.__file__} is incomplete or invalid." + "Please repair installation or re-install. " + "Alternatively, consider installing clingo via Spack." + ) + # check whether Spack is responsible + if ( + pathlib.Path( + sup.canonicalize_path(sc.get("bootstrap:root", sp.default_user_bootstrap_path)) + ) + in pathlib.Path(clingo.__file__).parents + ): + # Spack is responsible for the broken clingo + msg = ( + "Spack bootstrapped copy of Clingo is broken, " + "please re-run the bootstrapping process via command `spack bootstrap now`." + " If this issue persists, please file a bug at: github.com/spack/spack" + ) + raise RuntimeError( + "Clingo installation may be broken or incomplete, " + "please verify clingo has been installed correctly" + "\n\nClingo does not provide symbol clingo.Symbol" + f"{msg}" + ) import llnl.util.lang import llnl.util.tty as tty @@ -61,6 +97,8 @@ ASTType = None parse_files = None +#: Enable the addition of a runtime node +WITH_RUNTIME = sys.platform != "win32" #: Data class that contain configuration on what a #: clingo solve should output. @@ -122,6 +160,8 @@ class Provenance(enum.IntEnum): PACKAGE_PY = enum.auto() # An installed spec INSTALLED = enum.auto() + # A runtime injected from another package (e.g. a compiler) + RUNTIME = enum.auto() def __str__(self): return f"{self._name_.lower()}" @@ -379,7 +419,7 @@ def check_packages_exist(specs): for spec in specs: for s in spec.traverse(): try: - check_passed = repo.exists(s.name) or repo.is_virtual(s.name) + check_passed = repo.repo_for_pkg(s).exists(s.name) or repo.is_virtual(s.name) except Exception as e: msg = "Cannot find package: {0}".format(str(e)) check_passed = False @@ -824,9 +864,13 @@ def on_model(model): #: Data class to collect information on a requirement -RequirementRule = collections.namedtuple( - "RequirementRule", ["pkg_name", "policy", "requirements", "condition", "kind", "message"] -) +class RequirementRule(NamedTuple): + pkg_name: str + policy: str + requirements: List["spack.spec.Spec"] + condition: "spack.spec.Spec" + kind: RequirementKind + message: Optional[str] class PyclingoDriver: @@ -1132,6 +1176,7 @@ def __init__(self, tests=False): # Set during the call to setup self.pkgs = None + self.explicitly_required_namespaces = {} def pkg_version_rules(self, pkg): """Output declared versions of a package. @@ -1144,7 +1189,9 @@ def key_fn(version): # Origins are sorted by "provenance" first, see the Provenance enumeration above return version.origin, version.idx - pkg = packagize(pkg) + if isinstance(pkg, str): + pkg = self.pkg_class(pkg) + declared_versions = self.declared_versions[pkg.name] partially_sorted_versions = sorted(set(declared_versions), key=key_fn) @@ -1196,29 +1243,30 @@ def target_ranges(self, spec, single_target_fn): return [fn.attr("node_target_satisfies", spec.name, target)] def conflict_rules(self, pkg): - default_msg = "{0}: '{1}' conflicts with '{2}'" - no_constraint_msg = "{0}: conflicts with '{1}'" - for trigger, constraints in pkg.conflicts.items(): - trigger_msg = f"conflict is triggered when {str(trigger)}" - trigger_spec = spack.spec.Spec(trigger) - trigger_id = self.condition( - trigger_spec, name=trigger_spec.name or pkg.name, msg=trigger_msg - ) + for when_spec, conflict_specs in pkg.conflicts.items(): + when_spec_msg = "conflict constraint %s" % str(when_spec) + when_spec_id = self.condition(when_spec, name=pkg.name, msg=when_spec_msg) - for constraint, conflict_msg in constraints: + for conflict_spec, conflict_msg in conflict_specs: + conflict_spec = spack.spec.Spec(conflict_spec) if conflict_msg is None: - if constraint == spack.spec.Spec(): - conflict_msg = no_constraint_msg.format(pkg.name, trigger) + conflict_msg = f"{pkg.name}: " + if when_spec == spack.spec.Spec(): + conflict_msg += f"conflicts with '{conflict_spec}'" else: - conflict_msg = default_msg.format(pkg.name, trigger, constraint) - - spec_for_msg = ( - spack.spec.Spec(pkg.name) if constraint == spack.spec.Spec() else constraint + conflict_msg += f"'{conflict_spec}' conflicts with '{when_spec}'" + + spec_for_msg = conflict_spec + if conflict_spec == spack.spec.Spec(): + spec_for_msg = spack.spec.Spec(pkg.name) + conflict_spec_msg = f"conflict is triggered when {str(spec_for_msg)}" + conflict_spec_id = self.condition( + conflict_spec, name=conflict_spec.name or pkg.name, msg=conflict_spec_msg ) - constraint_msg = f"conflict applies to spec {str(spec_for_msg)}" - constraint_id = self.condition(constraint, name=pkg.name, msg=constraint_msg) self.gen.fact( - fn.pkg_fact(pkg.name, fn.conflict(trigger_id, constraint_id, conflict_msg)) + fn.pkg_fact( + pkg.name, fn.conflict(conflict_spec_id, when_spec_id, conflict_msg) + ) ) self.gen.newline() @@ -1258,85 +1306,14 @@ def compiler_facts(self): self.gen.fact(f) def package_requirement_rules(self, pkg): - rules = self.requirement_rules_from_package_py(pkg) - rules.extend(self.requirement_rules_from_packages_yaml(pkg)) - self.emit_facts_from_requirement_rules(rules) - - def requirement_rules_from_package_py(self, pkg): - rules = [] - for requirements, conditions in pkg.requirements.items(): - for when_spec, policy, message in conditions: - rules.append( - RequirementRule( - pkg_name=pkg.name, - policy=policy, - requirements=requirements, - kind=RequirementKind.PACKAGE, - condition=when_spec, - message=message, - ) - ) - return rules - - def requirement_rules_from_packages_yaml(self, pkg): - pkg_name = pkg.name - config = spack.config.get("packages") - requirements = config.get(pkg_name, {}).get("require", []) - kind = RequirementKind.PACKAGE - if not requirements: - requirements = config.get("all", {}).get("require", []) - kind = RequirementKind.DEFAULT - return self._rules_from_requirements(pkg_name, requirements, kind=kind) - - def _rules_from_requirements(self, pkg_name: str, requirements, *, kind: RequirementKind): - """Manipulate requirements from packages.yaml, and return a list of tuples - with a uniform structure (name, policy, requirements). - """ - if isinstance(requirements, str): - rules = [self._rule_from_str(pkg_name, requirements, kind)] - else: - rules = [] - for requirement in requirements: - if isinstance(requirement, str): - # A string represents a spec that must be satisfied. It is - # equivalent to a one_of group with a single element - rules.append(self._rule_from_str(pkg_name, requirement, kind)) - else: - for policy in ("spec", "one_of", "any_of"): - if policy in requirement: - constraints = requirement[policy] - - # "spec" is for specifying a single spec - if policy == "spec": - constraints = [constraints] - policy = "one_of" - - rules.append( - RequirementRule( - pkg_name=pkg_name, - policy=policy, - requirements=constraints, - kind=kind, - message=requirement.get("message"), - condition=requirement.get("when"), - ) - ) - return rules - - def _rule_from_str( - self, pkg_name: str, requirements: str, kind: RequirementKind - ) -> RequirementRule: - return RequirementRule( - pkg_name=pkg_name, - policy="one_of", - requirements=[requirements], - kind=kind, - condition=None, - message=None, - ) + parser = RequirementParser(spack.config.CONFIG) + self.emit_facts_from_requirement_rules(parser.rules(pkg)) def pkg_rules(self, pkg, tests): - pkg = packagize(pkg) + pkg = self.pkg_class(pkg) + + # Namespace of the package + self.gen.fact(fn.pkg_fact(pkg.name, fn.namespace(pkg.namespace))) # versions self.pkg_version_rules(pkg) @@ -1558,19 +1535,20 @@ def impose(self, condition_id, imposed_spec, node=True, name=None, body=False): self.gen.fact(fn.imposed_constraint(condition_id, *pred.args)) def package_provider_rules(self, pkg): - for provider_name in sorted(set(s.name for s in pkg.provided.keys())): - if provider_name not in self.possible_virtuals: + for vpkg_name in pkg.provided_virtual_names(): + if vpkg_name not in self.possible_virtuals: continue - self.gen.fact(fn.pkg_fact(pkg.name, fn.possible_provider(provider_name))) + self.gen.fact(fn.pkg_fact(pkg.name, fn.possible_provider(vpkg_name))) - for provided, whens in pkg.provided.items(): - if provided.name not in self.possible_virtuals: - continue - for when in whens: - msg = "%s provides %s when %s" % (pkg.name, provided, when) - condition_id = self.condition(when, provided, pkg.name, msg) + for when, provided in pkg.provided.items(): + for vpkg in provided: + if vpkg.name not in self.possible_virtuals: + continue + + msg = f"{pkg.name} provides {vpkg} when {when}" + condition_id = self.condition(when, vpkg, pkg.name, msg) self.gen.fact( - fn.pkg_fact(when.name, fn.provider_condition(condition_id, provided.name)) + fn.pkg_fact(when.name, fn.provider_condition(condition_id, vpkg.name)) ) self.gen.newline() @@ -1587,8 +1565,8 @@ def package_provider_rules(self, pkg): def package_dependencies_rules(self, pkg): """Translate 'depends_on' directives into ASP logic.""" - for _, conditions in sorted(pkg.dependencies.items()): - for cond, dep in sorted(conditions.items()): + for cond, deps_by_name in sorted(pkg.dependencies.items()): + for _, dep in sorted(deps_by_name.items()): depflag = dep.depflag # Skip test dependencies if they're not requested if not self.tests: @@ -1662,16 +1640,14 @@ def provider_requirements(self): "Internal Error: possible_virtuals is not populated. Please report to the spack" " maintainers" ) - packages_yaml = spack.config.CONFIG.get("packages") + parser = RequirementParser(spack.config.CONFIG) assert self.possible_virtuals is not None, msg for virtual_str in sorted(self.possible_virtuals): - requirements = packages_yaml.get(virtual_str, {}).get("require", []) - rules = self._rules_from_requirements( - virtual_str, requirements, kind=RequirementKind.VIRTUAL - ) - self.emit_facts_from_requirement_rules(rules) - self.trigger_rules() - self.effect_rules() + rules = parser.rules_from_virtual(virtual_str) + if rules: + self.emit_facts_from_requirement_rules(rules) + self.trigger_rules() + self.effect_rules() def emit_facts_from_requirement_rules(self, rules: List[RequirementRule]): """Generate facts to enforce requirements. @@ -1683,19 +1659,13 @@ def emit_facts_from_requirement_rules(self, rules: List[RequirementRule]): virtual = rule.kind == RequirementKind.VIRTUAL pkg_name, policy, requirement_grp = rule.pkg_name, rule.policy, rule.requirements - requirement_weight = 0 - main_requirement_condition = spack.directives.make_when_spec(rule.condition) - if main_requirement_condition is False: - continue # Write explicitly if a requirement is conditional or not - if main_requirement_condition != spack.spec.Spec(): + if rule.condition != spack.spec.Spec(): msg = f"condition to activate requirement {requirement_grp_id}" try: - main_condition_id = self.condition( - main_requirement_condition, name=pkg_name, msg=msg - ) + main_condition_id = self.condition(rule.condition, name=pkg_name, msg=msg) except Exception as e: if rule.kind != RequirementKind.DEFAULT: raise RuntimeError( @@ -1713,8 +1683,8 @@ def emit_facts_from_requirement_rules(self, rules: List[RequirementRule]): self.gen.fact(fn.requirement_message(pkg_name, requirement_grp_id, rule.message)) self.gen.newline() - for spec_str in requirement_grp: - spec = spack.spec.Spec(spec_str) + for input_spec in requirement_grp: + spec = spack.spec.Spec(input_spec) if not spec.name: spec.name = pkg_name spec.attach_git_version_lookup() @@ -1734,7 +1704,7 @@ def emit_facts_from_requirement_rules(self, rules: List[RequirementRule]): imposed_spec=spec, name=pkg_name, transform_imposed=transform, - msg=f"{spec_str} is a requirement for package {pkg_name}", + msg=f"{input_spec} is a requirement for package {pkg_name}", ) except Exception as e: # Do not raise if the rule comes from the 'all' subsection, since usability @@ -1798,15 +1768,12 @@ def external_packages(self): for local_idx, spec in enumerate(external_specs): msg = "%s available as external when satisfying %s" % (spec.name, spec) - def external_imposition(input_spec, _): - return [fn.attr("external_conditions_hold", input_spec.name, local_idx)] + def external_imposition(input_spec, requirements): + return requirements + [ + fn.attr("external_conditions_hold", input_spec.name, local_idx) + ] - self.condition( - spec, - spack.spec.Spec(spec.name), - msg=msg, - transform_imposed=external_imposition, - ) + self.condition(spec, spec, msg=msg, transform_imposed=external_imposition) self.possible_versions[spec.name].add(spec.version) self.gen.newline() @@ -1973,7 +1940,7 @@ class Body: if not spec.concrete: reserved_names = spack.directives.reserved_names if not spec.virtual and vname not in reserved_names: - pkg_cls = spack.repo.PATH.get_pkg_class(spec.name) + pkg_cls = self.pkg_class(spec.name) try: variant_def, _ = pkg_cls.variants[vname] except KeyError: @@ -2005,7 +1972,9 @@ class Body: f.node_compiler_version(spec.name, spec.compiler.name, spec.compiler.version) ) - elif spec.compiler.versions: + elif spec.compiler.versions and spec.compiler.versions != vn.any_version: + # The condition above emits a facts only if we have an actual constraint + # on the compiler version, and avoids emitting them if any version is fine clauses.append( fn.attr( "node_compiler_version_satisfies", @@ -2092,7 +2061,7 @@ def define_package_versions_and_validate_preferences( """Declare any versions in specs not declared in packages.""" packages_yaml = spack.config.get("packages") for pkg_name in possible_pkgs: - pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) + pkg_cls = self.pkg_class(pkg_name) # All the versions from the corresponding package.py file. Since concepts # like being a "develop" version or being preferred exist only at a @@ -2554,12 +2523,13 @@ def setup( """ check_packages_exist(specs) - self.possible_virtuals = set(x.name for x in specs if x.virtual) - node_counter = _create_counter(specs, tests=self.tests) self.possible_virtuals = node_counter.possible_virtuals() self.pkgs = node_counter.possible_dependencies() + runtimes = spack.repo.PATH.packages_with_tags("runtime") + self.pkgs.update(set(runtimes)) + # Fail if we already know an unreachable node is requested for spec in specs: missing_deps = [ @@ -2568,6 +2538,10 @@ def setup( if missing_deps: raise spack.spec.InvalidDependencyError(spec.name, missing_deps) + for node in spack.traverse.traverse_nodes(specs): + if node.namespace is not None: + self.explicitly_required_namespaces[node.name] = node.namespace + # driver is used by all the functions below to add facts and # rules to generate an ASP program. self.gen = driver @@ -2660,6 +2634,10 @@ def setup( self.gen.h1("Variant Values defined in specs") self.define_variant_values() + if WITH_RUNTIME: + self.gen.h1("Runtimes") + self.define_runtime_constraints() + self.gen.h1("Version Constraints") self.collect_virtual_constraints() self.define_version_constraints() @@ -2670,6 +2648,21 @@ def setup( self.gen.h1("Target Constraints") self.define_target_constraints() + def define_runtime_constraints(self): + """Define the constraints to be imposed on the runtimes""" + recorder = RuntimePropertyRecorder(self) + for compiler in self.possible_compilers: + if compiler.name != "gcc": + continue + try: + compiler_cls = spack.repo.PATH.get_pkg_class(compiler.name) + except spack.repo.UnknownPackageError: + continue + if hasattr(compiler_cls, "runtime_constraints"): + compiler_cls.runtime_constraints(compiler=compiler, pkg=recorder) + + recorder.consume_facts() + def literal_specs(self, specs): for spec in specs: self.gen.h2("Spec: %s" % str(spec)) @@ -2777,6 +2770,341 @@ def _specs_from_requires(self, pkg_name, section): for s in spec_group[key]: yield _spec_with_default_name(s, pkg_name) + def pkg_class(self, pkg_name: str) -> typing.Type["spack.package_base.PackageBase"]: + request = pkg_name + if pkg_name in self.explicitly_required_namespaces: + namespace = self.explicitly_required_namespaces[pkg_name] + request = f"{namespace}.{pkg_name}" + return spack.repo.PATH.get_pkg_class(request) + + +class RequirementParser: + """Parses requirements from package.py files and configuration, and returns rules.""" + + def __init__(self, configuration): + self.config = configuration + + def rules(self, pkg: "spack.package_base.PackageBase") -> List[RequirementRule]: + result = [] + result.extend(self.rules_from_package_py(pkg)) + result.extend(self.rules_from_require(pkg)) + result.extend(self.rules_from_prefer(pkg)) + result.extend(self.rules_from_conflict(pkg)) + return result + + def rules_from_package_py(self, pkg) -> List[RequirementRule]: + rules = [] + for when_spec, requirement_list in pkg.requirements.items(): + for requirements, policy, message in requirement_list: + rules.append( + RequirementRule( + pkg_name=pkg.name, + policy=policy, + requirements=requirements, + kind=RequirementKind.PACKAGE, + condition=when_spec, + message=message, + ) + ) + return rules + + def rules_from_virtual(self, virtual_str: str) -> List[RequirementRule]: + requirements = self.config.get("packages", {}).get(virtual_str, {}).get("require", []) + return self._rules_from_requirements( + virtual_str, requirements, kind=RequirementKind.VIRTUAL + ) + + def rules_from_require(self, pkg: "spack.package_base.PackageBase") -> List[RequirementRule]: + kind, requirements = self._raw_yaml_data(pkg, section="require") + return self._rules_from_requirements(pkg.name, requirements, kind=kind) + + def rules_from_prefer(self, pkg: "spack.package_base.PackageBase") -> List[RequirementRule]: + result = [] + kind, preferences = self._raw_yaml_data(pkg, section="prefer") + for item in preferences: + spec, condition, message = self._parse_prefer_conflict_item(item) + result.append( + # A strong preference is defined as: + # + # require: + # - any_of: [spec_str, "@:"] + RequirementRule( + pkg_name=pkg.name, + policy="any_of", + requirements=[spec, spack.spec.Spec("@:")], + kind=kind, + message=message, + condition=condition, + ) + ) + return result + + def rules_from_conflict(self, pkg: "spack.package_base.PackageBase") -> List[RequirementRule]: + result = [] + kind, conflicts = self._raw_yaml_data(pkg, section="conflict") + for item in conflicts: + spec, condition, message = self._parse_prefer_conflict_item(item) + result.append( + # A conflict is defined as: + # + # require: + # - one_of: [spec_str, "@:"] + RequirementRule( + pkg_name=pkg.name, + policy="one_of", + requirements=[spec, spack.spec.Spec("@:")], + kind=kind, + message=message, + condition=condition, + ) + ) + return result + + def _parse_prefer_conflict_item(self, item): + # The item is either a string or an object with at least a "spec" attribute + if isinstance(item, str): + spec = sc.parse_spec_from_yaml_string(item) + condition = spack.spec.Spec() + message = None + else: + spec = sc.parse_spec_from_yaml_string(item["spec"]) + condition = spack.spec.Spec(item.get("when")) + message = item.get("message") + return spec, condition, message + + def _raw_yaml_data(self, pkg: "spack.package_base.PackageBase", *, section: str): + config = self.config.get("packages") + data = config.get(pkg.name, {}).get(section, []) + kind = RequirementKind.PACKAGE + if not data: + data = config.get("all", {}).get(section, []) + kind = RequirementKind.DEFAULT + return kind, data + + def _rules_from_requirements( + self, pkg_name: str, requirements, *, kind: RequirementKind + ) -> List[RequirementRule]: + """Manipulate requirements from packages.yaml, and return a list of tuples + with a uniform structure (name, policy, requirements). + """ + if isinstance(requirements, str): + requirements = [requirements] + + rules = [] + for requirement in requirements: + # A string is equivalent to a one_of group with a single element + if isinstance(requirement, str): + requirement = {"one_of": [requirement]} + + for policy in ("spec", "one_of", "any_of"): + if policy not in requirement: + continue + + constraints = requirement[policy] + # "spec" is for specifying a single spec + if policy == "spec": + constraints = [constraints] + policy = "one_of" + + # validate specs from YAML first, and fail with line numbers if parsing fails. + constraints = [ + sc.parse_spec_from_yaml_string(constraint) for constraint in constraints + ] + when_str = requirement.get("when") + when = sc.parse_spec_from_yaml_string(when_str) if when_str else spack.spec.Spec() + + constraints = [ + x + for x in constraints + if not self.reject_requirement_constraint(pkg_name, constraint=x, kind=kind) + ] + if not constraints: + continue + + rules.append( + RequirementRule( + pkg_name=pkg_name, + policy=policy, + requirements=constraints, + kind=kind, + message=requirement.get("message"), + condition=when, + ) + ) + return rules + + def reject_requirement_constraint( + self, pkg_name: str, *, constraint: spack.spec.Spec, kind: RequirementKind + ) -> bool: + """Returns True if a requirement constraint should be rejected""" + if kind == RequirementKind.DEFAULT: + # Requirements under all: are applied only if they are satisfiable considering only + # package rules, so e.g. variants must exist etc. Otherwise, they are rejected. + try: + s = spack.spec.Spec(pkg_name) + s.constrain(constraint) + s.validate_or_raise() + except spack.error.SpackError as e: + tty.debug( + f"[SETUP] Rejecting the default '{constraint}' requirement " + f"on '{pkg_name}': {str(e)}", + level=2, + ) + return True + return False + + +class RuntimePropertyRecorder: + """An object of this class is injected in callbacks to compilers, to let them declare + properties of the runtimes they support and of the runtimes they provide, and to add + runtime dependencies to the nodes using said compiler. + + The usage of the object is the following. First, a runtime package name or the wildcard + "*" are passed as an argument to __call__, to set which kind of package we are referring to. + Then we can call one method with a directive-like API. + + Examples: + >>> pkg = RuntimePropertyRecorder(setup) + >>> # Every package compiled with %gcc has a link dependency on 'gcc-runtime' + >>> pkg("*").depends_on( + ... "gcc-runtime", + ... when="%gcc", + ... type="link", + ... description="If any package uses %gcc, it depends on gcc-runtime" + ... ) + >>> # The version of gcc-runtime is the same as the %gcc used to "compile" it + >>> pkg("gcc-runtime").requires("@=9.4.0", when="%gcc@=9.4.0") + """ + + def __init__(self, setup): + self._setup = setup + self.rules = [] + self.runtime_conditions = set() + # State of this object set in the __call__ method, and reset after + # each directive-like method + self.current_package = None + + def __call__(self, package_name: str) -> "RuntimePropertyRecorder": + """Sets a package name for the next directive-like method call""" + assert self.current_package is None, f"state was already set to '{self.current_package}'" + self.current_package = package_name + return self + + def reset(self): + """Resets the current state.""" + self.current_package = None + + def depends_on(self, dependency_str: str, *, when: str, type: str, description: str) -> None: + """Injects conditional dependencies on packages. + + Args: + dependency_str: the dependency spec to inject + when: anonymous condition to be met on a package to have the dependency + type: dependency type + description: human-readable description of the rule for adding the dependency + """ + # TODO: The API for this function is not final, and is still subject to change. At + # TODO: the moment, we implemented only the features strictly needed for the + # TODO: functionality currently provided by Spack, and we assert nothing else is required. + msg = "the 'depends_on' method can be called only with pkg('*')" + assert self.current_package == "*", msg + + when_spec = spack.spec.Spec(when) + assert when_spec.name is None, "only anonymous when specs are accepted" + + dependency_spec = spack.spec.Spec(dependency_str) + if dependency_spec.versions != vn.any_version: + self._setup.version_constraints.add((dependency_spec.name, dependency_spec.versions)) + + placeholder = "XXX" + node_variable = "node(ID, Package)" + when_spec.name = placeholder + + body_clauses = self._setup.spec_clauses(when_spec, body=True) + body_str = ( + f" {f',{os.linesep} '.join(str(x) for x in body_clauses)},\n" + f" not external({node_variable}),\n" + f" not runtime(Package)" + ).replace(f'"{placeholder}"', f"{node_variable}") + head_clauses = self._setup.spec_clauses(dependency_spec, body=False) + + runtime_pkg = dependency_spec.name + main_rule = ( + f"% {description}\n" + f'1 {{ attr("depends_on", {node_variable}, node(0..X-1, "{runtime_pkg}"), "{type}") :' + f' max_dupes("gcc-runtime", X)}} 1:-\n' + f"{body_str}.\n\n" + ) + self.rules.append(main_rule) + for clause in head_clauses: + if clause.args[0] == "node": + continue + runtime_node = f'node(RuntimeID, "{runtime_pkg}")' + head_str = str(clause).replace(f'"{runtime_pkg}"', runtime_node) + rule = ( + f"{head_str} :-\n" + f' attr("depends_on", {node_variable}, {runtime_node}, "{type}"),\n' + f"{body_str}.\n\n" + ) + self.rules.append(rule) + + self.reset() + + def requires(self, impose: str, *, when: str): + """Injects conditional requirements on a given package. + + Args: + impose: constraint to be imposed + when: condition triggering the constraint + """ + msg = "the 'requires' method cannot be called with pkg('*') or without setting the package" + assert self.current_package is not None and self.current_package != "*", msg + + imposed_spec = spack.spec.Spec(f"{self.current_package}{impose}") + when_spec = spack.spec.Spec(f"{self.current_package}{when}") + + assert imposed_spec.versions.concrete, f"{impose} must have a concrete version" + assert when_spec.compiler.concrete, f"{when} must have a concrete compiler" + + # Add versions to possible versions + for s in (imposed_spec, when_spec): + if not s.versions.concrete: + continue + self._setup.possible_versions[s.name].add(s.version) + self._setup.declared_versions[s.name].append( + DeclaredVersion(version=s.version, idx=0, origin=Provenance.RUNTIME) + ) + + self.runtime_conditions.add((imposed_spec, when_spec)) + self.reset() + + def consume_facts(self): + """Consume the facts collected by this object, and emits rules and + facts for the runtimes. + """ + self._setup.gen.h2("Runtimes: rules") + self._setup.gen.newline() + for rule in self.rules: + if not isinstance(self._setup.gen.out, llnl.util.lang.Devnull): + self._setup.gen.out.write(rule) + self._setup.gen.control.add("base", [], rule) + + self._setup.gen.h2("Runtimes: conditions") + for runtime_pkg in spack.repo.PATH.packages_with_tags("runtime"): + self._setup.gen.fact(fn.runtime(runtime_pkg)) + self._setup.gen.fact(fn.possible_in_link_run(runtime_pkg)) + self._setup.gen.newline() + # Inject version rules for runtimes (versions are declared based + # on the available compilers) + self._setup.pkg_version_rules(runtime_pkg) + + for imposed_spec, when_spec in self.runtime_conditions: + msg = f"{when_spec} requires {imposed_spec} at runtime" + _ = self._setup.condition(when_spec, imposed_spec=imposed_spec, msg=msg) + + self._setup.trigger_rules() + self._setup.effect_rules() + class SpecBuilder: """Class with actions to rebuild a spec from ASP results.""" @@ -2836,6 +3164,9 @@ def _arch(self, node): self._specs[node].architecture = arch return arch + def namespace(self, node, namespace): + self._specs[node].namespace = namespace + def node_platform(self, node, platform): self._arch(node).platform = platform @@ -3050,14 +3381,6 @@ def build_specs(self, function_tuples): action(*args) - # namespace assignment is done after the fact, as it is not - # currently part of the solve - for spec in self._specs.values(): - if spec.namespace: - continue - repo = spack.repo.PATH.repo_for_pkg(spec) - spec.namespace = repo.namespace - # fix flags after all specs are constructed self.reorder_flags() @@ -3116,6 +3439,49 @@ def _develop_specs_from_env(spec, env): spec.constrain(dev_info["spec"]) +def _is_reusable(spec: spack.spec.Spec, packages, local: bool) -> bool: + """A spec is reusable if it's not a dev spec, it's imported from the cray manifest, it's not + external, or it's external with matching packages.yaml entry. The latter prevents two issues: + + 1. Externals in build caches: avoid installing an external on the build machine not + available on the target machine + 2. Local externals: avoid reusing an external if the local config changes. This helps in + particular when a user removes an external from packages.yaml, and expects that that + takes effect immediately. + + Arguments: + spec: the spec to check + packages: the packages configuration + """ + if "dev_path" in spec.variants: + return False + + if not spec.external: + return True + + # Cray external manifest externals are always reusable + if local: + _, record = spack.store.STORE.db.query_by_spec_hash(spec.dag_hash()) + if record and record.origin == "external-db": + return True + + try: + provided = spack.repo.PATH.get(spec).provided_virtual_names() + except spack.repo.RepoError: + provided = [] + + for name in {spec.name, *provided}: + for entry in packages.get(name, {}).get("externals", []): + if ( + spec.satisfies(entry["spec"]) + and spec.external_path == entry.get("prefix") + and spec.external_modules == entry.get("modules") + ): + return True + + return False + + class Solver: """This is the main external interface class for solving. @@ -3151,20 +3517,22 @@ def _check_input_and_extract_concrete_specs(specs): def _reusable_specs(self, specs): reusable_specs = [] if self.reuse: + packages = spack.config.get("packages") # Specs from the local Database with spack.store.STORE.db.read_transaction(): reusable_specs.extend( - [ - s - for s in spack.store.STORE.db.query(installed=True) - if not s.satisfies("dev_path=*") - ] + s + for s in spack.store.STORE.db.query(installed=True) + if _is_reusable(s, packages, local=True) ) # Specs from buildcaches try: - index = spack.binary_distribution.update_cache_and_get_specs() - reusable_specs.extend(index) + reusable_specs.extend( + s + for s in spack.binary_distribution.update_cache_and_get_specs() + if _is_reusable(s, packages, local=False) + ) except (spack.binary_distribution.FetchCacheError, IndexError): # this is raised when no mirrors had indices. # TODO: update mirror configuration so it can indicate that the diff --git a/lib/spack/spack/solver/concretize.lp b/lib/spack/spack/solver/concretize.lp index d5f24ddc3b33f0..c8d96eed9c6613 100644 --- a/lib/spack/spack/solver/concretize.lp +++ b/lib/spack/spack/solver/concretize.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) @@ -20,7 +20,7 @@ % Integrity constraints on DAG nodes :- attr("root", PackageNode), not attr("node", PackageNode). :- attr("version", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode). -:- attr("node_version_satisfies", PackageNode), not attr("node", PackageNode). +:- attr("node_version_satisfies", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode). :- attr("hash", PackageNode, _), not attr("node", PackageNode). :- attr("node_platform", PackageNode, _), not attr("node", PackageNode). :- attr("node_os", PackageNode, _), not attr("node", PackageNode). @@ -45,6 +45,9 @@ :- attr("depends_on", node(min_dupe_id, Package), node(ID, _), "link"), ID != min_dupe_id, unification_set("root", node(min_dupe_id, Package)), internal_error("link dependency out of the root unification set"). :- attr("depends_on", node(min_dupe_id, Package), node(ID, _), "run"), ID != min_dupe_id, unification_set("root", node(min_dupe_id, Package)), internal_error("run dependency out of the root unification set"). +% Namespaces are statically assigned by a package fact +attr("namespace", node(ID, Package), Namespace) :- attr("node", node(ID, Package)), pkg_fact(Package, namespace(Namespace)). + % Rules on "unification sets", i.e. on sets of nodes allowing a single configuration of any given package unify(SetID, PackageName) :- unification_set(SetID, node(_, PackageName)). :- 2 { unification_set(SetID, node(_, PackageName)) }, unify(SetID, PackageName). @@ -695,6 +698,18 @@ requirement_group_satisfied(node(ID, Package), X) :- activate_requirement(node(ID, Package), X), requirement_group(Package, X). +% When we have a required provider, we need to ensure that the provider/2 facts respect +% the requirement. This is particularly important for packages that could provide multiple +% virtuals independently +required_provider(Provider, Virtual) + :- requirement_group_member(ConditionID, Virtual, RequirementID), + condition_holds(ConditionID, _), + virtual(Virtual), + pkg_fact(Virtual, condition_effect(ConditionID, EffectID)), + imposed_constraint(EffectID, "node", Provider). + +:- provider(node(Y, Package), node(X, Virtual)), required_provider(Provider, Virtual), Package != Provider. + % TODO: the following two choice rules allow the solver to add compiler % flags if their only source is from a requirement. This is overly-specific % and should use a more-generic approach like in https://github.com/spack/spack/pull/37180 diff --git a/lib/spack/spack/solver/counter.py b/lib/spack/spack/solver/counter.py index 28883817dfe564..632740da05091e 100644 --- a/lib/spack/spack/solver/counter.py +++ b/lib/spack/spack/solver/counter.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/solver/display.lp b/lib/spack/spack/solver/display.lp index 58d04d42ea3002..358a1628aadd73 100644 --- a/lib/spack/spack/solver/display.lp +++ b/lib/spack/spack/solver/display.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/solver/error_messages.lp b/lib/spack/spack/solver/error_messages.lp index 7eb383860d8c75..79a9b4b7eb8aaa 100644 --- a/lib/spack/spack/solver/error_messages.lp +++ b/lib/spack/spack/solver/error_messages.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/solver/heuristic.lp b/lib/spack/spack/solver/heuristic.lp index cc87207047d438..71ed64b3f88690 100644 --- a/lib/spack/spack/solver/heuristic.lp +++ b/lib/spack/spack/solver/heuristic.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/solver/heuristic_separate.lp b/lib/spack/spack/solver/heuristic_separate.lp index caa47aa09d84d1..2b499d07984568 100644 --- a/lib/spack/spack/solver/heuristic_separate.lp +++ b/lib/spack/spack/solver/heuristic_separate.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/solver/os_compatibility.lp b/lib/spack/spack/solver/os_compatibility.lp index 3c0c223a868f84..2ed8a15388ecc8 100644 --- a/lib/spack/spack/solver/os_compatibility.lp +++ b/lib/spack/spack/solver/os_compatibility.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/solver/when_possible.lp b/lib/spack/spack/solver/when_possible.lp index b887c9175f7df6..bab0852b276734 100644 --- a/lib/spack/spack/solver/when_possible.lp +++ b/lib/spack/spack/solver/when_possible.lp @@ -1,4 +1,4 @@ -% Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +% 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) diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 8c15a873afc728..eb6c81a9ae36ff 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -923,19 +923,23 @@ def flags(): yield flags def __str__(self): - sorted_keys = [k for k in sorted(self.keys()) if self[k] != []] - cond_symbol = " " if len(sorted_keys) > 0 else "" - return ( - cond_symbol - + " ".join( - key - + ('=="' if True in [f.propagate for f in self[key]] else '="') - + " ".join(self[key]) - + '"' - for key in sorted_keys - ) - + cond_symbol - ) + sorted_items = sorted((k, v) for k, v in self.items() if v) + + result = "" + for flag_type, flags in sorted_items: + normal = [f for f in flags if not f.propagate] + if normal: + result += f" {flag_type}={spack.parser.quote_if_needed(' '.join(normal))}" + + propagated = [f for f in flags if f.propagate] + if propagated: + result += f" {flag_type}=={spack.parser.quote_if_needed(' '.join(propagated))}" + + # TODO: somehow add this space only if something follows in Spec.format() + if sorted_items: + result += " " + + return result def _sort_by_dep_types(dspec: DependencySpec): @@ -1497,7 +1501,9 @@ def edge_attributes(self) -> str: result = f"{deptypes_str} {virtuals_str}".strip() return f"[{result}]" - def dependencies(self, name=None, deptype: Union[dt.DepTypes, dt.DepFlag] = dt.ALL): + def dependencies( + self, name=None, deptype: Union[dt.DepTypes, dt.DepFlag] = dt.ALL + ) -> List["Spec"]: """Return a list of direct dependencies (nodes in the DAG). Args: @@ -1508,7 +1514,9 @@ def dependencies(self, name=None, deptype: Union[dt.DepTypes, dt.DepFlag] = dt.A deptype = dt.canonicalize(deptype) return [d.spec for d in self.edges_to_dependencies(name, depflag=deptype)] - def dependents(self, name=None, deptype: Union[dt.DepTypes, dt.DepFlag] = dt.ALL): + def dependents( + self, name=None, deptype: Union[dt.DepTypes, dt.DepFlag] = dt.ALL + ) -> List["Spec"]: """Return a list of direct dependents (nodes in the DAG). Args: @@ -1632,23 +1640,23 @@ def _add_dependency(self, spec: "Spec", *, depflag: dt.DepFlag, virtuals: Tuple[ self.add_dependency_edge(spec, depflag=depflag, virtuals=virtuals) return - # Keep the intersection of constraints when a dependency is added - # multiple times. Currently, we only allow identical edge types. + # Keep the intersection of constraints when a dependency is added multiple times. + # The only restriction, currently, is keeping the same dependency type orig = self._dependencies[spec.name] try: dspec = next(dspec for dspec in orig if depflag == dspec.depflag) except StopIteration: - current_deps = ", ".join( - dt.flag_to_chars(x.depflag) + " " + x.spec.short_spec for x in orig - ) + edge_attrs = f"deptypes={dt.flag_to_chars(depflag).strip()}" + required_dep_str = f"^[{edge_attrs}] {str(spec)}" + raise DuplicateDependencyError( - f"{self.short_spec} cannot depend on '{spec.short_spec}' multiple times.\n" - f"\tRequired: {dt.flag_to_chars(depflag)}\n" - f"\tDependency: {current_deps}" + f"{spec.name} is a duplicate dependency, with conflicting dependency types\n" + f"\t'{str(self)}' cannot depend on '{required_dep_str}'" ) try: dspec.spec.constrain(spec) + dspec.update_virtuals(virtuals=virtuals) except spack.error.UnsatisfiableSpecError: raise DuplicateDependencyError( f"Cannot depend on incompatible specs '{dspec.spec}' and '{spec}'" @@ -2764,14 +2772,16 @@ def _old_concretize(self, tests=False, deprecation_warning=True): if self._concrete: return + # take the spec apart once before starting the main concretization loop and resolving + # deps, but don't break dependencies during concretization as the spec is built. + user_spec_deps = self.flat_dependencies(disconnect=True) + changed = True force = False - - user_spec_deps = self.flat_dependencies(copy=False) concretizer = spack.concretize.Concretizer(self.copy()) while changed: changes = ( - self.normalize(force, tests=tests, user_spec_deps=user_spec_deps), + self.normalize(force, tests, user_spec_deps, disconnect=False), self._expand_virtual_packages(concretizer), self._concretize_helper(concretizer), ) @@ -2782,7 +2792,7 @@ def _old_concretize(self, tests=False, deprecation_warning=True): for dep in self.traverse(): visited_user_specs.add(dep.name) pkg_cls = spack.repo.PATH.get_pkg_class(dep.name) - visited_user_specs.update(x.name for x in pkg_cls(dep).provided) + visited_user_specs.update(pkg_cls(dep).provided_virtual_names()) extra = set(user_spec_deps.keys()).difference(visited_user_specs) if extra: @@ -2817,10 +2827,11 @@ def _old_concretize(self, tests=False, deprecation_warning=True): # external specs are already built, don't worry about whether # it's possible to build that configuration with Spack continue - for conflict_spec, when_list in x.package_class.conflicts.items(): - if x.satisfies(conflict_spec): - for when_spec, msg in when_list: - if x.satisfies(when_spec): + + for when_spec, conflict_list in x.package_class.conflicts.items(): + if x.satisfies(when_spec): + for conflict_spec, msg in conflict_list: + if x.satisfies(conflict_spec): when = when_spec.copy() when.name = x.name matches.append((x, conflict_spec, when, msg)) @@ -2870,13 +2881,14 @@ def inject_patches_variant(root): continue # Add any patches from the package to the spec. - patches = [] + patches = set() for cond, patch_list in s.package_class.patches.items(): if s.satisfies(cond): for patch in patch_list: - patches.append(patch) + patches.add(patch) if patches: spec_to_patches[id(s)] = patches + # Also record all patches required on dependencies by # depends_on(..., patch=...) for dspec in root.traverse_edges(deptype=all, cover="edges", root=False): @@ -2884,17 +2896,25 @@ def inject_patches_variant(root): continue pkg_deps = dspec.parent.package_class.dependencies - if dspec.spec.name not in pkg_deps: - continue patches = [] - for cond, dependency in pkg_deps[dspec.spec.name].items(): + for cond, deps_by_name in pkg_deps.items(): + if not dspec.parent.satisfies(cond): + continue + + dependency = deps_by_name.get(dspec.spec.name) + if not dependency: + continue + for pcond, patch_list in dependency.patches.items(): - if dspec.parent.satisfies(cond) and dspec.spec.satisfies(pcond): + if dspec.spec.satisfies(pcond): patches.extend(patch_list) + if patches: - all_patches = spec_to_patches.setdefault(id(dspec.spec), []) - all_patches.extend(patches) + all_patches = spec_to_patches.setdefault(id(dspec.spec), set()) + for patch in patches: + all_patches.add(patch) + for spec in root.traverse(): if id(spec) not in spec_to_patches: continue @@ -3104,47 +3124,33 @@ def concretized(self, tests=False): clone.concretize(tests=tests) return clone - def flat_dependencies(self, **kwargs): - """Return a DependencyMap containing all of this spec's - dependencies with their constraints merged. - - If copy is True, returns merged copies of its dependencies - without modifying the spec it's called on. + def flat_dependencies(self, disconnect: bool = False): + """Build DependencyMap of all of this spec's dependencies with their constraints merged. - If copy is False, clears this spec's dependencies and - returns them. This disconnects all dependency links including - transitive dependencies, except for concrete specs: if a spec - is concrete it will not be disconnected from its dependencies - (although a non-concrete spec with concrete dependencies will - be disconnected from those dependencies). + Arguments: + disconnect: if True, disconnect all dependents and dependencies among nodes in this + spec's DAG. """ - copy = kwargs.get("copy", True) - flat_deps = {} - try: - deptree = self.traverse(root=False) - for spec in deptree: - if spec.name not in flat_deps: - if copy: - spec = spec.copy(deps=False) - flat_deps[spec.name] = spec - else: - flat_deps[spec.name].constrain(spec) + deptree = self.traverse(root=False) - if not copy: - for spec in flat_deps.values(): - if not spec.concrete: - spec.clear_edges() - self.clear_dependencies() + for spec in deptree: + if spec.name not in flat_deps: + flat_deps[spec.name] = spec + else: + try: + flat_deps[spec.name].constrain(spec) + except spack.error.UnsatisfiableSpecError as e: + # DAG contains two instances of the same package with inconsistent constraints. + raise InconsistentSpecError("Invalid Spec DAG: %s" % e.message) from e - return flat_deps + if disconnect: + for spec in flat_deps.values(): + if not spec.concrete: + spec.clear_edges() + self.clear_dependencies() - except spack.error.UnsatisfiableSpecError as e: - # Here, the DAG contains two instances of the same package - # with inconsistent constraints. Users cannot produce - # inconsistent specs like this on the command line: the - # parser doesn't allow it. Spack must be broken! - raise InconsistentSpecError("Invalid Spec DAG: %s" % e.message) from e + return flat_deps def index(self, deptype="all"): """Return a dictionary that points to all the dependencies in this @@ -3171,15 +3177,19 @@ def _evaluate_dependency_conditions(self, name): If no conditions are True (and we don't depend on it), return ``(None, None)``. """ - conditions = self.package_class.dependencies[name] - vt.substitute_abstract_variants(self) # evaluate when specs to figure out constraints on the dependency. dep = None - for when_spec, dependency in conditions.items(): - if self.satisfies(when_spec): + for when_spec, deps_by_name in self.package_class.dependencies.items(): + if not self.satisfies(when_spec): + continue + + for dep_name, dependency in deps_by_name.items(): + if dep_name != name: + continue + if dep is None: - dep = dp.Dependency(self.name, Spec(name), depflag=0) + dep = dp.Dependency(Spec(self.name), Spec(name), depflag=0) try: dep.merge(dependency) except spack.error.UnsatisfiableSpecError as e: @@ -3352,7 +3362,7 @@ def _normalize_helper(self, visited, spec_deps, provider_index, tests): while changed: changed = False - for dep_name in self.package_class.dependencies: + for dep_name in self.package_class.dependency_names(): # Do we depend on dep_name? If so pkg_dep is not None. dep = self._evaluate_dependency_conditions(dep_name) @@ -3375,7 +3385,7 @@ def _normalize_helper(self, visited, spec_deps, provider_index, tests): return any_change - def normalize(self, force=False, tests=False, user_spec_deps=None): + def normalize(self, force=False, tests=False, user_spec_deps=None, disconnect=True): """When specs are parsed, any dependencies specified are hanging off the root, and ONLY the ones that were explicitly provided are there. Normalization turns a partial flat spec into a DAG, where: @@ -3412,7 +3422,7 @@ def normalize(self, force=False, tests=False, user_spec_deps=None): # user-specified dependencies are recorded separately in case they # refer to specs which take several normalization passes to # materialize. - all_spec_deps = self.flat_dependencies(copy=False) + all_spec_deps = self.flat_dependencies(disconnect=disconnect) if user_spec_deps: for name, spec in user_spec_deps.items(): @@ -3437,6 +3447,14 @@ def normalize(self, force=False, tests=False, user_spec_deps=None): any_change = self._normalize_helper(visited, all_spec_deps, provider_index, tests) + # remove any leftover dependents outside the spec from, e.g., pruning externals + valid = {id(spec) for spec in all_spec_deps.values()} | {id(self)} + for spec in all_spec_deps.values(): + remove = [dep for dep in spec.dependents() if id(dep) not in valid] + for dep in remove: + del spec._dependents.edges[dep.name] + del dep._dependencies.edges[spec.name] + # Mark the spec as normal once done. self._normal = True return any_change @@ -3760,11 +3778,9 @@ def intersects(self, other: Union[str, "Spec"], deps: bool = True) -> bool: return False if pkg.provides(virtual_spec.name): - for provided, when_specs in pkg.provided.items(): - if any( - non_virtual_spec.intersects(when, deps=False) for when in when_specs - ): - if provided.intersects(virtual_spec): + for when_spec, provided in pkg.provided.items(): + if non_virtual_spec.intersects(when_spec, deps=False): + if any(vpkg.intersects(virtual_spec) for vpkg in provided): return True return False @@ -3867,9 +3883,9 @@ def satisfies(self, other: Union[str, "Spec"], deps: bool = True) -> bool: return False if pkg.provides(other.name): - for provided, when_specs in pkg.provided.items(): - if any(self.satisfies(when, deps=False) for when in when_specs): - if provided.intersects(other): + for when_spec, provided in pkg.provided.items(): + if self.satisfies(when_spec, deps=False): + if any(vpkg.intersects(other) for vpkg in provided): return True return False @@ -4740,6 +4756,20 @@ def build_spec(self): def build_spec(self, value): self._build_spec = value + def trim(self, dep_name): + """ + Remove any package that is or provides `dep_name` transitively + from this tree. This can also remove other dependencies if + they are only present because of `dep_name`. + """ + for spec in list(self.traverse()): + new_dependencies = _EdgeMap() # A new _EdgeMap + for pkg_name, edge_list in spec._dependencies.items(): + for edge in edge_list: + if (dep_name not in edge.virtuals) and (not dep_name == edge.spec.name): + new_dependencies.add(edge) + spec._dependencies = new_dependencies + def splice(self, other, transitive): """Splices dependency "other" into this ("target") Spec, and return the result as a concrete Spec. diff --git a/lib/spack/spack/spec_list.py b/lib/spack/spack/spec_list.py index 6bb1ba8d047e9a..9779d40fe4b0e2 100644 --- a/lib/spack/spack/spec_list.py +++ b/lib/spack/spack/spec_list.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -107,6 +107,20 @@ def remove(self, spec): self._constraints = None self._specs = None + def replace(self, idx: int, spec: str): + """Replace the existing spec at the index with the new one. + + Args: + idx: index of the spec to replace in the speclist + spec: new spec + """ + self.yaml_list[idx] = spec + + # invalidate cache variables when we change the list + self._expanded_list = None + self._constraints = None + self._specs = None + def extend(self, other, copy_reference=True): self.yaml_list.extend(other.yaml_list) self._expanded_list = None @@ -148,6 +162,7 @@ def _expand_references(self, yaml): if isinstance(item, str) and item.startswith("$"): # replace the reference and apply the sigil if needed name, sigil = self._parse_reference(item) + referent = [ _sigilify(item, sigil) for item in self._reference[name].specs_as_yaml_list ] diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 7418b5a44ee694..88ad0549cc8c11 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -1066,14 +1066,14 @@ def interactive_version_filter( def get_checksums_for_versions( - url_by_version: Dict[str, str], + url_by_version: Dict[StandardVersion, str], package_name: str, *, first_stage_function: Optional[Callable[[Stage, str], None]] = None, keep_stage: bool = False, concurrency: Optional[int] = None, fetch_options: Optional[Dict[str, str]] = None, -) -> Dict[str, str]: +) -> Dict[StandardVersion, str]: """Computes the checksums for each version passed in input, and returns the results. Archives are fetched according to the usl dictionary passed as input. diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py index 709074dea344eb..dc2d5de54b4372 100644 --- a/lib/spack/spack/store.py +++ b/lib/spack/spack/store.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/subprocess_context.py b/lib/spack/spack/subprocess_context.py index f0e004e4726e6b..c90dcf84090096 100644 --- a/lib/spack/spack/subprocess_context.py +++ b/lib/spack/spack/subprocess_context.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/tag.py b/lib/spack/spack/tag.py index 1b32f617c70ff5..559af56f0c8f21 100644 --- a/lib/spack/spack/tag.py +++ b/lib/spack/spack/tag.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/target.py b/lib/spack/spack/target.py index 22792c8c5510d5..4ce8866ac76d44 100644 --- a/lib/spack/spack/target.py +++ b/lib/spack/spack/target.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/tengine.py b/lib/spack/spack/tengine.py index 6f2e3fb69902f8..c30adbe639c6cc 100644 --- a/lib/spack/spack/tengine.py +++ b/lib/spack/spack/tengine.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/__init__.py b/lib/spack/spack/test/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/__init__.py +++ b/lib/spack/spack/test/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/abi.py b/lib/spack/spack/test/abi.py index 0a2cec644308cb..757b8b6861d8dc 100644 --- a/lib/spack/spack/test/abi.py +++ b/lib/spack/spack/test/abi.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/architecture.py b/lib/spack/spack/test/architecture.py index 7bea7a1d86a47f..f01e43ec906f2c 100644 --- a/lib/spack/spack/test/architecture.py +++ b/lib/spack/spack/test/architecture.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ def current_host_platform(): current_platform = spack.platforms.Darwin() elif "Windows" in platform.system(): current_platform = spack.platforms.Windows() + elif "FreeBSD" in platform.system(): + current_platform = spack.platforms.FreeBSD() return current_platform diff --git a/lib/spack/spack/test/audit.py b/lib/spack/spack/test/audit.py index a3d4bb8e3fbaf1..98e6ad83c85555 100644 --- a/lib/spack/spack/test/audit.py +++ b/lib/spack/spack/test/audit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/bindist.py b/lib/spack/spack/test/bindist.py index ea9caf7fc031ee..0f8b0d58ce2f3b 100644 --- a/lib/spack/spack/test/bindist.py +++ b/lib/spack/spack/test/bindist.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,7 @@ import urllib.error import urllib.request import urllib.response -from pathlib import PurePath +from pathlib import Path, PurePath import py import pytest @@ -201,6 +201,9 @@ def dummy_prefix(tmpdir): with open(data, "w") as f: f.write("hello world") + with open(p.join(".spack", "binary_distribution"), "w") as f: + f.write("{}") + os.symlink("app", relative_app_link) os.symlink(app, absolute_app_link) @@ -887,24 +890,29 @@ def urlopen(request: urllib.request.Request): fetcher.conditional_fetch() -def test_tarball_doesnt_include_buildinfo_twice(tmpdir): +def _all_parents(prefix): + parts = [p for p in prefix.split("/")] + return ["/".join(parts[: i + 1]) for i in range(len(parts))] + + +def test_tarball_doesnt_include_buildinfo_twice(tmp_path: Path): """When tarballing a package that was installed from a buildcache, make sure that the buildinfo file is not included twice in the tarball.""" - p = tmpdir.mkdir("prefix") - p.mkdir(".spack") + p = tmp_path / "prefix" + p.joinpath(".spack").mkdir(parents=True) # Create a binary_distribution file in the .spack folder - with open(p.join(".spack", "binary_distribution"), "w") as f: + with open(p / ".spack" / "binary_distribution", "w") as f: f.write(syaml.dump({"metadata", "old"})) # Now create a tarball, which should include a new binary_distribution file - tarball = str(tmpdir.join("prefix.tar.gz")) + tarball = str(tmp_path / "prefix.tar.gz") bindist._do_create_tarball( - tarfile_path=tarball, binaries_dir=p.strpath, buildinfo={"metadata": "new"} + tarfile_path=tarball, binaries_dir=str(p), buildinfo={"metadata": "new"} ) - expected_prefix = p.strpath.lstrip("/") + expected_prefix = str(p).lstrip("/") # Verify we don't have a repeated binary_distribution file, # and that the tarball contains the new one, not the old one. @@ -913,21 +921,20 @@ def test_tarball_doesnt_include_buildinfo_twice(tmpdir): "metadata": "new" } assert tar.getnames() == [ - f"{expected_prefix}", + *_all_parents(expected_prefix), f"{expected_prefix}/.spack", f"{expected_prefix}/.spack/binary_distribution", ] -def test_reproducible_tarball_is_reproducible(tmpdir): - p = tmpdir.mkdir("prefix") - p.mkdir("bin") - p.mkdir(".spack") - - app = p.join("bin", "app") +def test_reproducible_tarball_is_reproducible(tmp_path: Path): + p = tmp_path / "prefix" + p.joinpath("bin").mkdir(parents=True) + p.joinpath(".spack").mkdir(parents=True) + app = p / "bin" / "app" - tarball_1 = str(tmpdir.join("prefix-1.tar.gz")) - tarball_2 = str(tmpdir.join("prefix-2.tar.gz")) + tarball_1 = str(tmp_path / "prefix-1.tar.gz") + tarball_2 = str(tmp_path / "prefix-2.tar.gz") with open(app, "w") as f: f.write("hello world") @@ -936,16 +943,16 @@ def test_reproducible_tarball_is_reproducible(tmpdir): # Create a tarball with a certain mtime of bin/app os.utime(app, times=(0, 0)) - bindist._do_create_tarball(tarball_1, binaries_dir=p.strpath, buildinfo=buildinfo) + bindist._do_create_tarball(tarball_1, binaries_dir=str(p), buildinfo=buildinfo) # Do it another time with different mtime of bin/app os.utime(app, times=(10, 10)) - bindist._do_create_tarball(tarball_2, binaries_dir=p.strpath, buildinfo=buildinfo) + bindist._do_create_tarball(tarball_2, binaries_dir=str(p), buildinfo=buildinfo) # They should be bitwise identical: assert filecmp.cmp(tarball_1, tarball_2, shallow=False) - expected_prefix = p.strpath.lstrip("/") + expected_prefix = str(p).lstrip("/") # Sanity check for contents: with tarfile.open(tarball_1, mode="r") as f: @@ -954,7 +961,7 @@ def test_reproducible_tarball_is_reproducible(tmpdir): assert m.uname == m.gname == "" assert set(f.getnames()) == { - f"{expected_prefix}", + *_all_parents(expected_prefix), f"{expected_prefix}/bin", f"{expected_prefix}/bin/app", f"{expected_prefix}/.spack", @@ -1002,8 +1009,10 @@ def test_tarball_normalized_permissions(tmpdir): def test_tarball_common_prefix(dummy_prefix, tmpdir): - """Tests whether Spack can figure out the package directory - from the tarball contents, and strip them when extracting.""" + """Tests whether Spack can figure out the package directory from the tarball contents, and + strip them when extracting. This test creates a CURRENT_BUILD_CACHE_LAYOUT_VERSION=1 type + tarball where the parent directories of the package prefix are missing. Spack should be able + to figure out the common prefix and extract the files into the correct location.""" # When creating a tarball, Python (and tar) use relative paths, # Absolute paths become relative to `/`, so drop the leading `/`. @@ -1020,11 +1029,10 @@ def test_tarball_common_prefix(dummy_prefix, tmpdir): common_prefix = bindist._ensure_common_prefix(tar) assert common_prefix == expected_prefix - # Strip the prefix from the tar entries - bindist._tar_strip_component(tar, common_prefix) - # Extract into prefix2 - tar.extractall(path="prefix2") + tar.extractall( + path="prefix2", members=bindist._tar_strip_component(tar, common_prefix) + ) # Verify files are all there at the correct level. assert set(os.listdir("prefix2")) == {"bin", "share", ".spack"} @@ -1044,13 +1052,30 @@ def test_tarball_common_prefix(dummy_prefix, tmpdir): ) +def test_tarfile_missing_binary_distribution_file(tmpdir): + """A tarfile that does not contain a .spack/binary_distribution file cannot be + used to install.""" + with tmpdir.as_cwd(): + # An empty .spack dir. + with tarfile.open("empty.tar", mode="w") as tar: + tarinfo = tarfile.TarInfo(name="example/.spack") + tarinfo.type = tarfile.DIRTYPE + tar.addfile(tarinfo) + + with pytest.raises(ValueError, match="missing binary_distribution file"): + bindist._ensure_common_prefix(tarfile.open("empty.tar", mode="r")) + + def test_tarfile_without_common_directory_prefix_fails(tmpdir): """A tarfile that only contains files without a common package directory should fail to extract, as we won't know where to put the files.""" with tmpdir.as_cwd(): # Create a broken tarball with just a file, no directories. with tarfile.open("empty.tar", mode="w") as tar: - tar.addfile(tarfile.TarInfo(name="example/file"), fileobj=io.BytesIO(b"hello")) + tar.addfile( + tarfile.TarInfo(name="example/.spack/binary_distribution"), + fileobj=io.BytesIO(b"hello"), + ) with pytest.raises(ValueError, match="Tarball does not contain a common prefix"): bindist._ensure_common_prefix(tarfile.open("empty.tar", mode="r")) @@ -1091,7 +1116,7 @@ def test_tarfile_of_spec_prefix(tmpdir): # Verify that entries are added in depth-first pre-order, files preceding dirs, # entries ordered alphabetically assert tar.getnames() == [ - f"{expected_prefix}", + *_all_parents(expected_prefix), f"{expected_prefix}/file", f"{expected_prefix}/hardlink", f"{expected_prefix}/symlink", diff --git a/lib/spack/spack/test/bootstrap.py b/lib/spack/spack/test/bootstrap.py index dcc8bf6495e6bd..5f11e2d381e639 100644 --- a/lib/spack/spack/test/bootstrap.py +++ b/lib/spack/spack/test/bootstrap.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/build_distribution.py b/lib/spack/spack/test/build_distribution.py index 2f68ba9caeba98..6ab68659e613b0 100644 --- a/lib/spack/spack/test/build_distribution.py +++ b/lib/spack/spack/test/build_distribution.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/build_environment.py b/lib/spack/spack/test/build_environment.py index cbccbc429eac6f..1f2d9e904fd890 100644 --- a/lib/spack/spack/test/build_environment.py +++ b/lib/spack/spack/test/build_environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -285,6 +285,24 @@ def platform_pathsep(pathlist): assert name not in os.environ +def test_external_config_env(mock_packages, mutable_config, working_env): + cmake_config = { + "externals": [ + { + "spec": "cmake@1.0", + "prefix": "/fake/path", + "extra_attributes": {"environment": {"set": {"TEST_ENV_VAR_SET": "yes it's set"}}}, + } + ] + } + spack.config.set("packages:cmake", cmake_config) + + cmake_client = spack.spec.Spec("cmake-client").concretized() + spack.build_environment.setup_package(cmake_client.package, False) + + assert os.environ["TEST_ENV_VAR_SET"] == "yes it's set" + + @pytest.mark.regression("9107") def test_spack_paths_before_module_paths(config, mock_packages, monkeypatch, working_env): s = spack.spec.Spec("cmake") @@ -439,10 +457,10 @@ def test_parallel_false_is_not_propagating(default_mock_concretization): # b (parallel =True) s = default_mock_concretization("a foobar=bar") - spack.build_environment.set_package_py_globals(s.package) + spack.build_environment.set_package_py_globals(s.package, context=Context.BUILD) assert s["a"].package.module.make_jobs == 1 - spack.build_environment.set_package_py_globals(s["b"].package) + spack.build_environment.set_package_py_globals(s["b"].package, context=Context.BUILD) assert s["b"].package.module.make_jobs == spack.build_environment.determine_number_of_jobs( parallel=s["b"].package.parallel ) @@ -667,3 +685,33 @@ def test_clear_compiler_related_runtime_variables_of_build_deps(default_mock_con assert "FC" not in result assert "F77" not in result assert result["ANOTHER_VAR"] == "this-should-be-present" + + +@pytest.mark.parametrize("context", [Context.BUILD, Context.RUN]) +def test_build_system_globals_only_set_on_root_during_build(default_mock_concretization, context): + """Test whether when setting up a build environment, the build related globals are set only + in the top level spec. + + TODO: Since module instances are globals themselves, and Spack defines properties on them, they + persist across tests. In principle this is not terrible, cause the variables are mostly static. + But obviously it can lead to very hard to find bugs... We should get rid of those globals and + define them instead as a property on the package instance. + """ + root = spack.spec.Spec("mpileaks").concretized() + build_variables = ("std_cmake_args", "std_meson_args", "std_pip_args") + + # See todo above, we clear out any properties that may have been set by the previous test. + # Commenting this loop will make the test fail. I'm leaving it here as a reminder that those + # globals were always a bad idea, and we should pass them to the package instance. + for spec in root.traverse(): + for variable in build_variables: + spec.package.module.__dict__.pop(variable, None) + + spack.build_environment.SetupContext(root, context=context).set_all_package_py_globals() + + # Excpect the globals to be set at the root in a build context only. + should_be_set = lambda depth: context == Context.BUILD and depth == 0 + + for depth, spec in root.traverse(depth=True, root=True): + for variable in build_variables: + assert hasattr(spec.package.module, variable) == should_be_set(depth) diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index bc1ad6aa1ab313..97e357b8ebe1c6 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/build_systems.py b/lib/spack/spack/test/build_systems.py index ccb7a08f6cc29c..a77dfb090773ca 100644 --- a/lib/spack/spack/test/build_systems.py +++ b/lib/spack/spack/test/build_systems.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/builder.py b/lib/spack/spack/test/builder.py index 9be5b1ecbb338d..9a99e6ee08cf4e 100644 --- a/lib/spack/spack/test/builder.py +++ b/lib/spack/spack/test/builder.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/buildrequest.py b/lib/spack/spack/test/buildrequest.py index 6a022e4fb53e4e..e5bf9d3d6ee7e1 100644 --- a/lib/spack/spack/test/buildrequest.py +++ b/lib/spack/spack/test/buildrequest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/buildtask.py b/lib/spack/spack/test/buildtask.py index 6e25c3d6accefa..a571e1dccd1c6a 100644 --- a/lib/spack/spack/test/buildtask.py +++ b/lib/spack/spack/test/buildtask.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cache_fetch.py b/lib/spack/spack/test/cache_fetch.py index f4bf0ba62ded23..12273530df24ed 100644 --- a/lib/spack/spack/test/cache_fetch.py +++ b/lib/spack/spack/test/cache_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cc.py b/lib/spack/spack/test/cc.py index 6ba50004424e19..25aab774a7f183 100644 --- a/lib/spack/spack/test/cc.py +++ b/lib/spack/spack/test/cc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/ci.py b/lib/spack/spack/test/ci.py index 53ed8382520745..e01b970c2dabbd 100644 --- a/lib/spack/spack/test/ci.py +++ b/lib/spack/spack/test/ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/__init__.py b/lib/spack/spack/test/cmd/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/cmd/__init__.py +++ b/lib/spack/spack/test/cmd/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/arch.py b/lib/spack/spack/test/cmd/arch.py index 80f7195fd5d922..093d99fa44cd04 100644 --- a/lib/spack/spack/test/cmd/arch.py +++ b/lib/spack/spack/test/cmd/arch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/audit.py b/lib/spack/spack/test/cmd/audit.py index 493cf9ff366482..0a48c9fd228e69 100644 --- a/lib/spack/spack/test/cmd/audit.py +++ b/lib/spack/spack/test/cmd/audit.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/blame.py b/lib/spack/spack/test/cmd/blame.py index 05e475eed300d2..f9484e2dce0784 100644 --- a/lib/spack/spack/test/cmd/blame.py +++ b/lib/spack/spack/test/cmd/blame.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/bootstrap.py b/lib/spack/spack/test/cmd/bootstrap.py index 277a279222b8d7..7797aec31c7850 100644 --- a/lib/spack/spack/test/cmd/bootstrap.py +++ b/lib/spack/spack/test/cmd/bootstrap.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/build_env.py b/lib/spack/spack/test/cmd/build_env.py index 9a302a159c5f95..545981bd4afec6 100644 --- a/lib/spack/spack/test/cmd/build_env.py +++ b/lib/spack/spack/test/cmd/build_env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/buildcache.py b/lib/spack/spack/test/cmd/buildcache.py index 55ec605913b3f4..06d0c1d751e6a3 100644 --- a/lib/spack/spack/test/cmd/buildcache.py +++ b/lib/spack/spack/test/cmd/buildcache.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -331,3 +331,37 @@ def fake_push(node, push_url, options): # Ensure no duplicates assert len(set(packages_to_push)) == len(packages_to_push) + + +@pytest.mark.parametrize("signed", [True, False]) +def test_push_and_install_with_mirror_marked_unsigned_does_not_require_extra_flags( + tmp_path, mutable_database, mock_gnupghome, signed +): + """Tests whether marking a mirror as unsigned makes it possible to push and install to/from + it without requiring extra flags on the command line (and no signing keys configured).""" + + # Create a named mirror with signed set to True or False + add_flag = "--signed" if signed else "--unsigned" + mirror("add", add_flag, "my-mirror", str(tmp_path)) + spec = mutable_database.query_local("libelf", installed=True)[0] + + # Push + if signed: + # Need to pass "--unsigned" to override the mirror's default + args = ["push", "--update-index", "--unsigned", "my-mirror", f"/{spec.dag_hash()}"] + else: + # No need to pass "--unsigned" if the mirror is unsigned + args = ["push", "--update-index", "my-mirror", f"/{spec.dag_hash()}"] + + buildcache(*args) + + # Install + if signed: + # Need to pass "--no-check-signature" to avoid install errors + kwargs = {"cache_only": True, "unsigned": True} + else: + # No need to pass "--no-check-signature" if the mirror is unsigned + kwargs = {"cache_only": True} + + spec.package.do_uninstall(force=True) + spec.package.do_install(**kwargs) diff --git a/lib/spack/spack/test/cmd/cd.py b/lib/spack/spack/test/cmd/cd.py index 04351ee18cbb95..dcbf9bde1c825b 100644 --- a/lib/spack/spack/test/cmd/cd.py +++ b/lib/spack/spack/test/cmd/cd.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/checksum.py b/lib/spack/spack/test/cmd/checksum.py index 0dbaa88053070a..308940c268f948 100644 --- a/lib/spack/spack/test/cmd/checksum.py +++ b/lib/spack/spack/test/cmd/checksum.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,16 +8,63 @@ import pytest import spack.cmd.checksum +import spack.package_base import spack.parser import spack.repo import spack.spec +import spack.stage +import spack.util.web from spack.main import SpackCommand +from spack.package_base import ManualDownloadRequiredError from spack.stage import interactive_version_filter from spack.version import Version spack_checksum = SpackCommand("checksum") +@pytest.fixture +def can_fetch_versions(monkeypatch): + """Fake successful version detection.""" + + def fetch_remote_versions(pkg, concurrency): + return {Version("1.0"): "https://www.example.com/pkg-1.0.tar.gz"} + + def get_checksums_for_versions(url_by_version, package_name, **kwargs): + return { + v: "abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890" + for v in url_by_version + } + + def url_exists(url, curl=None): + return True + + monkeypatch.setattr( + spack.package_base.PackageBase, "fetch_remote_versions", fetch_remote_versions + ) + monkeypatch.setattr(spack.stage, "get_checksums_for_versions", get_checksums_for_versions) + monkeypatch.setattr(spack.util.web, "url_exists", url_exists) + + +@pytest.fixture +def cannot_fetch_versions(monkeypatch): + """Fake unsuccessful version detection.""" + + def fetch_remote_versions(pkg, concurrency): + return {} + + def get_checksums_for_versions(url_by_version, package_name, **kwargs): + return {} + + def url_exists(url, curl=None): + return False + + monkeypatch.setattr( + spack.package_base.PackageBase, "fetch_remote_versions", fetch_remote_versions + ) + monkeypatch.setattr(spack.stage, "get_checksums_for_versions", get_checksums_for_versions) + monkeypatch.setattr(spack.util.web, "url_exists", url_exists) + + @pytest.mark.parametrize( "arguments,expected", [ @@ -48,7 +95,7 @@ def test_checksum_args(arguments, expected): (["--verify", "zlib", "1.2.13"], "1.2.13 [-] No previous checksum"), ], ) -def test_checksum(arguments, expected, mock_packages, mock_clone_repo, mock_stage): +def test_checksum(arguments, expected, mock_packages, can_fetch_versions): output = spack_checksum(*arguments) assert expected in output @@ -226,7 +273,7 @@ def test_checksum_interactive_unrecognized_command(): assert interactive_version_filter(v.copy(), input=input) == v -def test_checksum_versions(mock_packages, mock_clone_repo, mock_fetch, mock_stage): +def test_checksum_versions(mock_packages, can_fetch_versions): pkg_cls = spack.repo.PATH.get_pkg_class("zlib") versions = [str(v) for v in pkg_cls.versions] output = spack_checksum("zlib", *versions) @@ -237,7 +284,7 @@ def test_checksum_versions(mock_packages, mock_clone_repo, mock_fetch, mock_stag assert "Added 0 new versions to" in output -def test_checksum_missing_version(mock_packages, mock_clone_repo, mock_fetch, mock_stage): +def test_checksum_missing_version(mock_packages, cannot_fetch_versions): output = spack_checksum("preferred-test", "99.99.99", fail_on_error=False) assert "Could not find any remote versions" in output output = spack_checksum("--add-to-package", "preferred-test", "99.99.99", fail_on_error=False) @@ -245,30 +292,50 @@ def test_checksum_missing_version(mock_packages, mock_clone_repo, mock_fetch, mo assert "Added 1 new versions to" not in output -def test_checksum_deprecated_version(mock_packages, mock_clone_repo, mock_fetch, mock_stage): +def test_checksum_deprecated_version(mock_packages, can_fetch_versions): output = spack_checksum("deprecated-versions", "1.1.0", fail_on_error=False) assert "Version 1.1.0 is deprecated" in output output = spack_checksum( "--add-to-package", "deprecated-versions", "1.1.0", fail_on_error=False ) assert "Version 1.1.0 is deprecated" in output - assert "Added 0 new versions to" not in output + # TODO alecbcs: broken assertion. + # assert "Added 0 new versions to" not in output -def test_checksum_url(mock_packages): +def test_checksum_url(mock_packages, config): pkg_cls = spack.repo.PATH.get_pkg_class("zlib") with pytest.raises(spack.parser.SpecSyntaxError): spack_checksum(f"{pkg_cls.url}") -def test_checksum_verification_fails(install_mockery, capsys): +def test_checksum_verification_fails(default_mock_concretization, capsys, can_fetch_versions): spec = spack.spec.Spec("zlib").concretized() pkg = spec.package versions = list(pkg.versions.keys()) - version_hashes = {versions[0]: "abadhash", spack.version.Version("0.1"): "123456789"} + version_hashes = {versions[0]: "abadhash", Version("0.1"): "123456789"} with pytest.raises(SystemExit): spack.cmd.checksum.print_checksum_status(pkg, version_hashes) out = str(capsys.readouterr()) assert out.count("Correct") == 0 assert "No previous checksum" in out assert "Invalid checksum" in out + + +def test_checksum_manual_download_fails(mock_packages, monkeypatch): + """Confirm that checksumming a manually downloadable package fails.""" + name = "zlib" + pkg_cls = spack.repo.PATH.get_pkg_class(name) + versions = [str(v) for v in pkg_cls.versions] + monkeypatch.setattr(spack.package_base.PackageBase, "manual_download", True) + + # First check that the exception is raised with the default download + # instructions. + with pytest.raises(ManualDownloadRequiredError, match=f"required for {name}"): + spack_checksum(name, *versions) + + # Now check that the exception is raised with custom download instructions. + error = "Cannot calculate the checksum for a manually downloaded package." + monkeypatch.setattr(spack.package_base.PackageBase, "download_instr", error) + with pytest.raises(ManualDownloadRequiredError, match=error): + spack_checksum(name, *versions) diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index 2695b7381f612c..6fabd16cd53ac7 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/clean.py b/lib/spack/spack/test/cmd/clean.py index f0cd58ee8434f2..43441c487c3af3 100644 --- a/lib/spack/spack/test/cmd/clean.py +++ b/lib/spack/spack/test/cmd/clean.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/commands.py b/lib/spack/spack/test/cmd/commands.py index 3288b092d4d3c0..68d28f5684352d 100644 --- a/lib/spack/spack/test/cmd/commands.py +++ b/lib/spack/spack/test/cmd/commands.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/common/__init__.py b/lib/spack/spack/test/cmd/common/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/cmd/common/__init__.py +++ b/lib/spack/spack/test/cmd/common/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/common/arguments.py b/lib/spack/spack/test/cmd/common/arguments.py index e889fe55d89e20..c1f75e99f3bdbd 100644 --- a/lib/spack/spack/test/cmd/common/arguments.py +++ b/lib/spack/spack/test/cmd/common/arguments.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,8 +50,8 @@ def test_negative_integers_not_allowed_for_parallel_jobs(job_parser): [ (['coreutils cflags="-O3 -g"'], ["-O3", "-g"], [False, False], []), (['coreutils cflags=="-O3 -g"'], ["-O3", "-g"], [True, True], []), - (["coreutils", "cflags=-O3 -g"], ["-O3"], [False], ["g"]), - (["coreutils", "cflags==-O3 -g"], ["-O3"], [True], ["g"]), + (["coreutils", "cflags=-O3 -g"], ["-O3", "-g"], [False, False], []), + (["coreutils", "cflags==-O3 -g"], ["-O3", "-g"], [True, True], []), (["coreutils", "cflags=-O3", "-g"], ["-O3"], [False], ["g"]), ], ) diff --git a/lib/spack/spack/test/cmd/compiler.py b/lib/spack/spack/test/cmd/compiler.py index 1cea72d3b25ad6..3a8c662a5e8aac 100644 --- a/lib/spack/spack/test/cmd/compiler.py +++ b/lib/spack/spack/test/cmd/compiler.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/concretize.py b/lib/spack/spack/test/cmd/concretize.py index 914f0fe6af9e8e..da3cec034d9d97 100644 --- a/lib/spack/spack/test/cmd/concretize.py +++ b/lib/spack/spack/test/cmd/concretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/config.py b/lib/spack/spack/test/cmd/config.py index 7247ce97531dcd..6bc19831a5f2b3 100644 --- a/lib/spack/spack/test/cmd/config.py +++ b/lib/spack/spack/test/cmd/config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -91,15 +91,10 @@ def test_config_edit(mutable_config, working_env): def test_config_get_gets_spack_yaml(mutable_mock_env_path): - config("get", fail_on_error=False) - assert config.returncode == 1 - with ev.create("test") as env: assert "mpileaks" not in config("get") - env.add("mpileaks") env.write() - assert "mpileaks" in config("get") @@ -122,11 +117,6 @@ def test_config_edit_fails_correctly_with_no_env(mutable_mock_env_path): assert "requires a section argument or an active environment" in output -def test_config_get_fails_correctly_with_no_env(mutable_mock_env_path): - output = config("get", fail_on_error=False) - assert "requires a section argument or an active environment" in output - - def test_config_list(): output = config("list") assert "compilers" in output @@ -470,7 +460,6 @@ def test_config_add_to_env(mutable_empty_config, mutable_mock_env_path): expected = """ config: dirty: true - """ assert expected in output @@ -497,29 +486,21 @@ def test_config_add_to_env_preserve_comments(mutable_empty_config, mutable_mock_ config("add", "config:dirty:true") output = config("get") - expected = manifest - expected += """ config: - dirty: true - -""" - assert output == expected + assert "# comment" in output + assert "dirty: true" in output def test_config_remove_from_env(mutable_empty_config, mutable_mock_env_path): env("create", "test") - with ev.read("test"): config("add", "config:dirty:true") + output = config("get") + assert "dirty: true" in output with ev.read("test"): config("rm", "config:dirty") output = config("get") - - expected = ev.default_manifest_yaml() - expected += """ config: {} - -""" - assert output == expected + assert "dirty: true" not in output def test_config_update_config(config_yaml_v015): diff --git a/lib/spack/spack/test/cmd/create.py b/lib/spack/spack/test/cmd/create.py index 089dc8b0c52440..9be5704b6779b5 100644 --- a/lib/spack/spack/test/cmd/create.py +++ b/lib/spack/spack/test/cmd/create.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,7 +27,11 @@ [r"TestNamedPackage(Package)", r"def install(self"], ), (["file://example.tar.gz"], "example", [r"Example(Package)", r"def install(self"]), - (["-n", "test-license"], "test-license", [r'license("UNKNOWN")']), + ( + ["-n", "test-license"], + "test-license", + [r'license("UNKNOWN", checked_by="github_user1")'], + ), # Template-specific cases ( ["-t", "autoreconf", "/test-autoreconf"], diff --git a/lib/spack/spack/test/cmd/debug.py b/lib/spack/spack/test/cmd/debug.py index 92fe4a2d57888f..6a240a0ca7d6bc 100644 --- a/lib/spack/spack/test/cmd/debug.py +++ b/lib/spack/spack/test/cmd/debug.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/deconcretize.py b/lib/spack/spack/test/cmd/deconcretize.py index 30e39604bf4d4d..92553b7e535d57 100644 --- a/lib/spack/spack/test/cmd/deconcretize.py +++ b/lib/spack/spack/test/cmd/deconcretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/dependencies.py b/lib/spack/spack/test/cmd/dependencies.py index bc615c7a3a10d7..3bda72ce7a0a57 100644 --- a/lib/spack/spack/test/cmd/dependencies.py +++ b/lib/spack/spack/test/cmd/dependencies.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/dependents.py b/lib/spack/spack/test/cmd/dependents.py index 9d124c0a2c4ca2..0e2931860e2202 100644 --- a/lib/spack/spack/test/cmd/dependents.py +++ b/lib/spack/spack/test/cmd/dependents.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/deprecate.py b/lib/spack/spack/test/cmd/deprecate.py index 7584827e769c24..6669be57fe05af 100644 --- a/lib/spack/spack/test/cmd/deprecate.py +++ b/lib/spack/spack/test/cmd/deprecate.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/dev_build.py b/lib/spack/spack/test/cmd/dev_build.py index 85199eddd66da2..8649e174907521 100644 --- a/lib/spack/spack/test/cmd/dev_build.py +++ b/lib/spack/spack/test/cmd/dev_build.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/develop.py b/lib/spack/spack/test/cmd/develop.py index f80038c0edd97f..73741ddbe783a9 100644 --- a/lib/spack/spack/test/cmd/develop.py +++ b/lib/spack/spack/test/cmd/develop.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,7 @@ pytestmark = pytest.mark.not_on_windows("does not run on windows") -@pytest.mark.usefixtures("mutable_mock_env_path", "mock_packages", "mock_fetch", "config") +@pytest.mark.usefixtures("mutable_mock_env_path", "mock_packages", "mock_fetch", "mutable_config") class TestDevelop: def check_develop(self, env, spec, path=None): path = path or spec.name @@ -31,9 +31,9 @@ def check_develop(self, env, spec, path=None): assert dev_specs_entry["spec"] == str(spec) # check yaml representation - yaml = env.manifest[ev.TOP_LEVEL_KEY] - assert spec.name in yaml["develop"] - yaml_entry = yaml["develop"][spec.name] + dev_config = spack.config.get("develop", {}) + assert spec.name in dev_config + yaml_entry = dev_config[spec.name] assert yaml_entry["spec"] == str(spec) if path == spec.name: # default paths aren't written out @@ -102,7 +102,7 @@ def test_develop_update_spec(self): self.check_develop(e, spack.spec.Spec("mpich@=2.0")) assert len(e.dev_specs) == 1 - def test_develop_canonicalize_path(self, monkeypatch, config): + def test_develop_canonicalize_path(self, monkeypatch): env("create", "test") with ev.read("test") as e: path = "../$user" @@ -119,7 +119,7 @@ def check_path(stage, dest): # Check modifications actually worked assert spack.spec.Spec("mpich@1.0").concretized().satisfies("dev_path=%s" % abspath) - def test_develop_canonicalize_path_no_args(self, monkeypatch, config): + def test_develop_canonicalize_path_no_args(self, monkeypatch): env("create", "test") with ev.read("test") as e: path = "$user" diff --git a/lib/spack/spack/test/cmd/diff.py b/lib/spack/spack/test/cmd/diff.py index b90c61fbc8258a..179267425386fa 100644 --- a/lib/spack/spack/test/cmd/diff.py +++ b/lib/spack/spack/test/cmd/diff.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,12 +10,150 @@ import spack.main import spack.store import spack.util.spack_json as sjson +from spack.test.conftest import create_test_repo install_cmd = spack.main.SpackCommand("install") diff_cmd = spack.main.SpackCommand("diff") find_cmd = spack.main.SpackCommand("find") +_p1 = ( + "p1", + """\ +class P1(Package): + version("1.0") + + variant("p1var", default=True) + variant("usev1", default=True) + + depends_on("p2") + depends_on("v1", when="+usev1") +""", +) + + +_p2 = ( + "p2", + """\ +class P2(Package): + version("1.0") + + variant("p2var", default=True) + + depends_on("p3") +""", +) + + +_p3 = ( + "p3", + """\ +class P3(Package): + version("1.0") + + variant("p3var", default=True) +""", +) + +_i1 = ( + "i1", + """\ +class I1(Package): + version("1.0") + + provides("v1") + + variant("i1var", default=True) + + depends_on("p3") + depends_on("p4") +""", +) + +_i2 = ( + "i2", + """\ +class I2(Package): + version("1.0") + + provides("v1") + + variant("i2var", default=True) + + depends_on("p3") + depends_on("p4") +""", +) + + +_p4 = ( + "p4", + """\ +class P4(Package): + version("1.0") + + variant("p4var", default=True) +""", +) + + +# Note that the hash of p1 will differ depending on the variant chosen +# we probably always want to omit that from diffs +@pytest.fixture +def _create_test_repo(tmpdir, mutable_config): + """ + p1____ + | \ + p2 v1 + | ____/ | + p3 p4 + + i1 and i2 provide v1 (and both have the same dependencies) + + All packages have an associated variant + """ + yield create_test_repo(tmpdir, [_p1, _p2, _p3, _i1, _i2, _p4]) + + +@pytest.fixture +def test_repo(_create_test_repo, monkeypatch, mock_stage): + with spack.repo.use_repositories(_create_test_repo) as mock_repo_path: + yield mock_repo_path + + +def test_diff_ignore(test_repo): + specA = spack.spec.Spec("p1+usev1").concretized() + specB = spack.spec.Spec("p1~usev1").concretized() + + c1 = spack.cmd.diff.compare_specs(specA, specB, to_string=False) + + def match(function, name, args): + limit = len(args) + return function.name == name and list(args[:limit]) == list(function.args[:limit]) + + def find(function_list, name, args): + return any(match(f, name, args) for f in function_list) + + assert find(c1["a_not_b"], "node_os", ["p4"]) + + c2 = spack.cmd.diff.compare_specs(specA, specB, ignore_packages=["v1"], to_string=False) + + assert not find(c2["a_not_b"], "node_os", ["p4"]) + assert find(c2["intersect"], "node_os", ["p3"]) + + # Check ignoring changes on multiple packages + + specA = spack.spec.Spec("p1+usev1 ^p3+p3var").concretized() + specA = spack.spec.Spec("p1~usev1 ^p3~p3var").concretized() + + c3 = spack.cmd.diff.compare_specs(specA, specB, to_string=False) + assert find(c3["a_not_b"], "variant_value", ["p3", "p3var"]) + + c4 = spack.cmd.diff.compare_specs(specA, specB, ignore_packages=["v1", "p3"], to_string=False) + assert not find(c4["a_not_b"], "node_os", ["p4"]) + assert not find(c4["a_not_b"], "variant_value", ["p3"]) + + def test_diff_cmd(install_mockery, mock_fetch, mock_archive, mock_packages): """Test that we can install two packages and diff them""" diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index 882e5f5356fc6f..c9137e6aea0bc6 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -48,11 +48,14 @@ install = SpackCommand("install") add = SpackCommand("add") change = SpackCommand("change") +config = SpackCommand("config") remove = SpackCommand("remove") concretize = SpackCommand("concretize") stage = SpackCommand("stage") uninstall = SpackCommand("uninstall") find = SpackCommand("find") +develop = SpackCommand("develop") +module = SpackCommand("module") sep = os.sep @@ -300,20 +303,6 @@ def test_activate_adds_transitive_run_deps_to_path(install_mockery, mock_fetch, assert env_variables["DEPENDENCY_ENV_VAR"] == "1" -def test_env_install_same_spec_twice(install_mockery, mock_fetch): - env("create", "test") - - e = ev.read("test") - with e: - # The first installation outputs the package prefix, updates the view - out = install("--add", "cmake-client") - assert "Updating view at" in out - - # The second installation reports all packages already installed - out = install("cmake-client") - assert "already installed" in out - - def test_env_definition_symlink(install_mockery, mock_fetch, tmpdir): filepath = str(tmpdir.join("spack.yaml")) filepath_mid = str(tmpdir.join("spack_mid.yaml")) @@ -718,10 +707,10 @@ def test_env_with_config(environment_from_manifest): assert any(x.intersects("mpileaks@2.2") for x in e._get_environment_specs()) -def test_with_config_bad_include(environment_from_manifest): +def test_with_config_bad_include_create(environment_from_manifest): """Confirm missing include paths raise expected exception and error.""" with pytest.raises(spack.config.ConfigFileError, match="2 missing include path"): - e = environment_from_manifest( + environment_from_manifest( """ spack: include: @@ -729,9 +718,42 @@ def test_with_config_bad_include(environment_from_manifest): - no/such/file.yaml """ ) - with e: - e.concretize() + +def test_with_config_bad_include_activate(environment_from_manifest, tmpdir): + env_root = pathlib.Path(tmpdir.ensure("env-root", dir=True)) + include1 = env_root / "include1.yaml" + include1.touch() + + abs_include_path = os.path.abspath(tmpdir.join("subdir").ensure("include2.yaml")) + + spack_yaml = env_root / ev.manifest_name + spack_yaml.write_text( + f""" +spack: + include: + - ./include1.yaml + - {abs_include_path} +""" + ) + + e = ev.Environment(env_root) + with e: + e.concretize() + + # we've created an environment with some included config files (which do + # in fact exist): now we remove them and check that we get a sensible + # error message + + os.remove(abs_include_path) + os.remove(include1) + with pytest.raises(spack.config.ConfigFileError) as exc: + ev.activate(e) + + err = exc.value.message + assert "missing include" in err + assert abs_include_path in err + assert "include1.yaml" in err assert ev.active_environment() is None @@ -834,6 +856,114 @@ def test_env_with_included_config_file(mutable_mock_env_path, packages_file): assert any(x.satisfies("mpileaks@2.2") for x in e._get_environment_specs()) +def test_config_change_existing(mutable_mock_env_path, tmp_path, mock_packages, mutable_config): + """Test ``config change`` with config in the ``spack.yaml`` as well as an + included file scope. + """ + + included_file = "included-packages.yaml" + included_path = tmp_path / included_file + with open(included_path, "w") as f: + f.write( + """\ +packages: + mpich: + require: + - spec: "@3.0.2" + libelf: + require: "@0.8.10" + bowtie: + require: + - one_of: ["@1.3.0", "@1.2.0"] +""" + ) + + spack_yaml = tmp_path / ev.manifest_name + spack_yaml.write_text( + f"""\ +spack: + packages: + mpich: + require: + - spec: "+debug" + include: + - {os.path.join(".", included_file)} + specs: [] +""" + ) + + e = ev.Environment(tmp_path) + with e: + # List of requirements, flip a variant + config("change", "packages:mpich:require:~debug") + test_spec = spack.spec.Spec("mpich").concretized() + assert test_spec.satisfies("@3.0.2~debug") + + # List of requirements, change the version (in a different scope) + config("change", "packages:mpich:require:@3.0.3") + test_spec = spack.spec.Spec("mpich").concretized() + assert test_spec.satisfies("@3.0.3") + + # "require:" as a single string, also try specifying + # a spec string that requires enclosing in quotes as + # part of the config path + config("change", 'packages:libelf:require:"@0.8.12:"') + spack.spec.Spec("libelf@0.8.12").concretized() + # No need for assert, if there wasn't a failure, we + # changed the requirement successfully. + + # Use change to add a requirement for a package that + # has no requirements defined + config("change", "packages:fftw:require:+mpi") + test_spec = spack.spec.Spec("fftw").concretized() + assert test_spec.satisfies("+mpi") + config("change", "packages:fftw:require:~mpi") + test_spec = spack.spec.Spec("fftw").concretized() + assert test_spec.satisfies("~mpi") + config("change", "packages:fftw:require:@1.0") + test_spec = spack.spec.Spec("fftw").concretized() + assert test_spec.satisfies("@1.0~mpi") + + # Use "--match-spec" to change one spec in a "one_of" + # list + config("change", "packages:bowtie:require:@1.2.2", "--match-spec", "@1.2.0") + spack.spec.Spec("bowtie@1.3.0").concretize() + spack.spec.Spec("bowtie@1.2.2").concretized() + + +def test_config_change_new(mutable_mock_env_path, tmp_path, mock_packages, mutable_config): + spack_yaml = tmp_path / ev.manifest_name + spack_yaml.write_text( + """\ +spack: + specs: [] +""" + ) + + e = ev.Environment(tmp_path) + with e: + config("change", "packages:mpich:require:~debug") + with pytest.raises(spack.solver.asp.UnsatisfiableSpecError): + spack.spec.Spec("mpich+debug").concretized() + spack.spec.Spec("mpich~debug").concretized() + + # Now check that we raise an error if we need to add a require: constraint + # when preexisting config manually specified it as a singular spec + spack_yaml.write_text( + """\ +spack: + specs: [] + packages: + mpich: + require: "@3.0.3" +""" + ) + with e: + assert spack.spec.Spec("mpich").concretized().satisfies("@3.0.3") + with pytest.raises(spack.config.ConfigError, match="not a list"): + config("change", "packages:mpich:require:~debug") + + def test_env_with_included_config_file_url(tmpdir, mutable_empty_config, packages_file): """Test configuration inclusion of a file whose path is a URL before the environment is concretized.""" @@ -844,8 +974,6 @@ def test_env_with_included_config_file_url(tmpdir, mutable_empty_config, package env = ev.Environment(tmpdir.strpath) ev.activate(env) - scopes = env.included_config_scopes() - assert len(scopes) == 1 cfg = spack.config.get("packages") assert cfg["mpileaks"]["version"] == ["2.2"] @@ -1105,13 +1233,14 @@ def test_multi_env_remove(mutable_mock_env_path, monkeypatch, answer): assert all(e in env("list") for e in environments) -def test_env_loads(install_mockery, mock_fetch): +def test_env_loads(install_mockery, mock_fetch, mock_modules_root): env("create", "test") with ev.read("test"): add("mpileaks") concretize() install("--fake") + module("tcl", "refresh", "-y") with ev.read("test"): env("loads") @@ -1171,7 +1300,7 @@ def test_env_blocks_uninstall(mock_stage, mock_fetch, install_mockery): add("mpileaks") install("--fake") - out = uninstall("mpileaks", fail_on_error=False) + out = uninstall("-y", "mpileaks", fail_on_error=False) assert uninstall.returncode == 1 assert "The following environments still reference these specs" in out @@ -2841,51 +2970,51 @@ def test_modules_relative_to_views(environment_from_manifest, install_mockery, m assert spec.prefix not in contents -def test_multiple_modules_post_env_hook(environment_from_manifest, install_mockery, mock_fetch): +def test_modules_exist_after_env_install( + environment_from_manifest, install_mockery, mock_fetch, monkeypatch +): + # Some caching issue + monkeypatch.setattr(spack.modules.tcl, "configuration_registry", {}) environment_from_manifest( """ spack: specs: - - trivial-install-test-package + - mpileaks modules: default: enable:: [tcl] use_view: true roots: - tcl: modules + tcl: uses_view full: enable:: [tcl] roots: - tcl: full_modules + tcl: without_view """ ) with ev.read("test") as e: install() + specs = e.all_specs() - spec = e.specs_by_hash[e.concretized_order[0]] - view_prefix = e.default_view.get_projection_for_spec(spec) - modules_glob = "%s/modules/**/*/*" % e.path - modules = glob.glob(modules_glob) - assert len(modules) == 1 - module = modules[0] - - full_modules_glob = "%s/full_modules/**/*/*" % e.path - full_modules = glob.glob(full_modules_glob) - assert len(full_modules) == 1 - full_module = full_modules[0] - - with open(module, "r") as f: - contents = f.read() - - with open(full_module, "r") as f: - full_contents = f.read() + for module_set in ("uses_view", "without_view"): + modules = glob.glob(f"{e.path}/{module_set}/**/*/*") + assert len(modules) == len(specs), "Not all modules were generated" + for spec in specs: + module = next((m for m in modules if os.path.dirname(m).endswith(spec.name)), None) + assert module, f"Module for {spec} not found" - assert view_prefix in contents - assert spec.prefix not in contents + # Now verify that modules have paths pointing into the view instead of the package + # prefix if and only if they set use_view to true. + with open(module, "r") as f: + contents = f.read() - assert view_prefix not in full_contents - assert spec.prefix in full_contents + if module_set == "uses_view": + assert e.default_view.get_projection_for_spec(spec) in contents + assert spec.prefix not in contents + else: + assert e.default_view.get_projection_for_spec(spec) not in contents + assert spec.prefix in contents @pytest.mark.regression("24148") @@ -2900,13 +3029,15 @@ def test_virtual_spec_concretize_together(tmpdir): assert any(s.package.provides("mpi") for _, s in e.concretized_specs()) -def test_query_develop_specs(): +def test_query_develop_specs(tmpdir): """Test whether a spec is develop'ed or not""" + srcdir = tmpdir.ensure("here") + env("create", "test") with ev.read("test") as e: e.add("mpich") e.add("mpileaks") - e.develop(Spec("mpich@=1"), "here", clone=False) + develop("--no-clone", "-p", str(srcdir), "mpich@=1") assert e.is_develop(Spec("mpich")) assert not e.is_develop(Spec("mpileaks")) @@ -2918,7 +3049,9 @@ def test_query_develop_specs(): ) def test_activation_and_deactiviation_ambiguities(method, env, no_env, env_dir, capsys): """spack [-e x | -E | -D x/] env [activate | deactivate] y are ambiguous""" - args = Namespace(shell="sh", activate_env="a", env=env, no_env=no_env, env_dir=env_dir) + args = Namespace( + shell="sh", env_name="a", env=env, no_env=no_env, env_dir=env_dir, keep_relative=False + ) with pytest.raises(SystemExit): method(args) _, err = capsys.readouterr() @@ -2959,6 +3092,34 @@ def test_activate_temp(monkeypatch, tmpdir): assert ev.is_env_dir(str(tmpdir)) +@pytest.mark.parametrize( + "conflict_arg", [["--dir"], ["--keep-relative"], ["--with-view", "foo"], ["env"]] +) +def test_activate_parser_conflicts_with_temp(conflict_arg): + with pytest.raises(SpackCommandError): + env("activate", "--sh", "--temp", *conflict_arg) + + +def test_create_and_activate_managed(tmp_path): + with fs.working_dir(str(tmp_path)): + shell = env("activate", "--without-view", "--create", "--sh", "foo") + active_env_var = next(line for line in shell.splitlines() if ev.spack_env_var in line) + assert str(tmp_path) in active_env_var + active_ev = ev.active_environment() + assert "foo" == active_ev.name + env("deactivate") + + +def test_create_and_activate_unmanaged(tmp_path): + with fs.working_dir(str(tmp_path)): + env_dir = os.path.join(str(tmp_path), "foo") + shell = env("activate", "--without-view", "--create", "--sh", "-d", env_dir) + active_env_var = next(line for line in shell.splitlines() if ev.spack_env_var in line) + assert str(env_dir) in active_env_var + assert ev.is_env_dir(env_dir) + env("deactivate") + + def test_activate_default(monkeypatch): """Tests whether `spack env activate` creates / activates the default environment""" @@ -3507,8 +3668,6 @@ def test_env_include_packages_url( with spack.config.override("config:url_fetch_method", "curl"): env = ev.Environment(tmpdir.strpath) ev.activate(env) - scopes = env.included_config_scopes() - assert len(scopes) == 1 cfg = spack.config.get("packages") assert "openmpi" in cfg["all"]["providers"]["mpi"] diff --git a/lib/spack/spack/test/cmd/extensions.py b/lib/spack/spack/test/cmd/extensions.py index e3f82b9439c138..1f6ed95b564469 100644 --- a/lib/spack/spack/test/cmd/extensions.py +++ b/lib/spack/spack/test/cmd/extensions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/external.py b/lib/spack/spack/test/cmd/external.py index e9a387aac03e66..362b2360a5f886 100644 --- a/lib/spack/spack/test/cmd/external.py +++ b/lib/spack/spack/test/cmd/external.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/fetch.py b/lib/spack/spack/test/cmd/fetch.py index 19c5d33585ead5..cf05f4299d925e 100644 --- a/lib/spack/spack/test/cmd/fetch.py +++ b/lib/spack/spack/test/cmd/fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/find.py b/lib/spack/spack/test/cmd/find.py index afeb53388d495b..5d551e6df929eb 100644 --- a/lib/spack/spack/test/cmd/find.py +++ b/lib/spack/spack/test/cmd/find.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/gc.py b/lib/spack/spack/test/cmd/gc.py index d692628e106fe0..b9d39567f4cc39 100644 --- a/lib/spack/spack/test/cmd/gc.py +++ b/lib/spack/spack/test/cmd/gc.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,37 +11,139 @@ import spack.spec gc = spack.main.SpackCommand("gc") +add = spack.main.SpackCommand("add") +install = spack.main.SpackCommand("install") pytestmark = pytest.mark.not_on_windows("does not run on windows") @pytest.mark.db -def test_no_packages_to_remove(config, mutable_database, capsys): - with capsys.disabled(): - output = gc("-y") +def test_gc_without_build_dependency(config, mutable_database): + output = gc("-yb") + assert "There are no unused specs." in output + + output = gc("-y") assert "There are no unused specs." in output @pytest.mark.db -def test_packages_are_removed(config, mutable_database, capsys): +def test_gc_with_build_dependency(config, mutable_database): s = spack.spec.Spec("simple-inheritance") s.concretize() s.package.do_install(fake=True, explicit=True) - with capsys.disabled(): - output = gc("-y") + + output = gc("-yb") + assert "There are no unused specs." in output + + output = gc("-y") assert "Successfully uninstalled cmake" in output @pytest.mark.db -def test_gc_with_environment(config, mutable_database, mutable_mock_env_path, capsys): +def test_gc_with_environment(config, mutable_database, mutable_mock_env_path): + s = spack.spec.Spec("simple-inheritance") + s.concretize() + s.package.do_install(fake=True, explicit=True) + + e = ev.create("test_gc") + with e: + add("cmake") + install() + assert mutable_database.query_local("cmake") + output = gc("-y") + assert "Restricting garbage collection" in output + assert "There are no unused specs" in output + + +@pytest.mark.db +def test_gc_with_build_dependency_in_environment(config, mutable_database, mutable_mock_env_path): s = spack.spec.Spec("simple-inheritance") s.concretize() s.package.do_install(fake=True, explicit=True) e = ev.create("test_gc") - e.add("cmake") with e: - with capsys.disabled(): - output = gc("-y") - assert "Restricting the garbage collection" in output + add("simple-inheritance") + install() + assert mutable_database.query_local("simple-inheritance") + output = gc("-yb") + assert "Restricting garbage collection" in output assert "There are no unused specs" in output + + with e: + assert mutable_database.query_local("simple-inheritance") + output = gc("-y") + assert "Restricting garbage collection" in output + assert "Successfully uninstalled cmake" in output + + +@pytest.mark.db +def test_gc_except_any_environments(config, mutable_database, mutable_mock_env_path): + s = spack.spec.Spec("simple-inheritance") + s.concretize() + s.package.do_install(fake=True, explicit=True) + + assert mutable_database.query_local("zmpi") + + e = ev.create("test_gc") + with e: + add("simple-inheritance") + install() + assert mutable_database.query_local("simple-inheritance") + + output = gc("-yE") + assert "Restricting garbage collection" not in output + assert "Successfully uninstalled zmpi" in output + assert not mutable_database.query_local("zmpi") + + with e: + output = gc("-yE") + assert "Restricting garbage collection" not in output + assert "There are no unused specs" not in output + + +@pytest.mark.db +def test_gc_except_specific_environments(config, mutable_database, mutable_mock_env_path): + s = spack.spec.Spec("simple-inheritance") + s.concretize() + s.package.do_install(fake=True, explicit=True) + + assert mutable_database.query_local("zmpi") + + e = ev.create("test_gc") + with e: + add("simple-inheritance") + install() + assert mutable_database.query_local("simple-inheritance") + + output = gc("-ye", "test_gc") + assert "Restricting garbage collection" not in output + assert "Successfully uninstalled zmpi" in output + assert not mutable_database.query_local("zmpi") + + +@pytest.mark.db +def test_gc_except_nonexisting_dir_env(config, mutable_database, mutable_mock_env_path, tmpdir): + output = gc("-ye", tmpdir.strpath, fail_on_error=False) + assert "No such environment" in output + gc.returncode == 1 + + +@pytest.mark.db +def test_gc_except_specific_dir_env(config, mutable_database, mutable_mock_env_path, tmpdir): + s = spack.spec.Spec("simple-inheritance") + s.concretize() + s.package.do_install(fake=True, explicit=True) + + assert mutable_database.query_local("zmpi") + + e = ev.create_in_dir(tmpdir.strpath) + with e: + add("simple-inheritance") + install() + assert mutable_database.query_local("simple-inheritance") + + output = gc("-ye", tmpdir.strpath) + assert "Restricting garbage collection" not in output + assert "Successfully uninstalled zmpi" in output + assert not mutable_database.query_local("zmpi") diff --git a/lib/spack/spack/test/cmd/gpg.py b/lib/spack/spack/test/cmd/gpg.py index 08749022cab360..d342897db7f800 100644 --- a/lib/spack/spack/test/cmd/gpg.py +++ b/lib/spack/spack/test/cmd/gpg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/graph.py b/lib/spack/spack/test/cmd/graph.py index 079b1a53e2adc5..e3c19e4223798c 100644 --- a/lib/spack/spack/test/cmd/graph.py +++ b/lib/spack/spack/test/cmd/graph.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/help.py b/lib/spack/spack/test/cmd/help.py index 1e296be9e6aab5..688675be68c0b7 100644 --- a/lib/spack/spack/test/cmd/help.py +++ b/lib/spack/spack/test/cmd/help.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/info.py b/lib/spack/spack/test/cmd/info.py index 5748323d8cba98..e3d7b383a5e908 100644 --- a/lib/spack/spack/test/cmd/info.py +++ b/lib/spack/spack/test/cmd/info.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,10 +33,11 @@ def _print(*args, **kwargs): @pytest.mark.parametrize( - "pkg", ["openmpi", "trilinos", "boost", "python", "dealii", "xsdk"] # a BundlePackage + "pkg", ["openmpi", "trilinos", "boost", "python", "dealii", "xsdk", "gasnet", "warpx"] ) -def test_it_just_runs(pkg): - info(pkg) +@pytest.mark.parametrize("extra_args", [[], ["--variants-by-name"]]) +def test_it_just_runs(pkg, extra_args): + info(pkg, *extra_args) def test_info_noversion(mock_packages, print_buffer): @@ -78,7 +79,8 @@ def test_is_externally_detectable(pkg_query, expected, parser, print_buffer): "gcc", # This should ensure --test's c_names processing loop covered ], ) -def test_info_fields(pkg_query, parser, print_buffer): +@pytest.mark.parametrize("extra_args", [[], ["--variants-by-name"]]) +def test_info_fields(pkg_query, extra_args, parser, print_buffer): expected_fields = ( "Description:", "Homepage:", @@ -91,7 +93,7 @@ def test_info_fields(pkg_query, parser, print_buffer): "Licenses:", ) - args = parser.parse_args(["--all", pkg_query]) + args = parser.parse_args(["--all", pkg_query] + extra_args) spack.cmd.info.info(parser, args) for text in expected_fields: diff --git a/lib/spack/spack/test/cmd/init_py_functions.py b/lib/spack/spack/test/cmd/init_py_functions.py index 260a719b2e2d29..4dc000edb9434d 100644 --- a/lib/spack/spack/test/cmd/init_py_functions.py +++ b/lib/spack/spack/test/cmd/init_py_functions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/install.py b/lib/spack/spack/test/cmd/install.py index 8eb3bfedb815c0..17a35b89735029 100644 --- a/lib/spack/spack/test/cmd/install.py +++ b/lib/spack/spack/test/cmd/install.py @@ -1,10 +1,11 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 argparse import builtins import filecmp +import gzip import itertools import os import pathlib @@ -137,8 +138,7 @@ def test_package_output(tmpdir, capsys, install_mockery, mock_fetch): pkg = spec.package pkg.do_install(verbose=True) - log_file = pkg.build_log_path - with open(log_file) as f: + with gzip.open(pkg.install_log_path, "rt") as f: out = f.read() # make sure that output from the actual package file appears in the diff --git a/lib/spack/spack/test/cmd/is_git_repo.py b/lib/spack/spack/test/cmd/is_git_repo.py index 3e1e7c287e23bc..087f69e0282f02 100644 --- a/lib/spack/spack/test/cmd/is_git_repo.py +++ b/lib/spack/spack/test/cmd/is_git_repo.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/license.py b/lib/spack/spack/test/cmd/license.py index 32c6f0846ddcc5..c46d73a5bcdae6 100644 --- a/lib/spack/spack/test/cmd/license.py +++ b/lib/spack/spack/test/cmd/license.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -37,7 +37,7 @@ def test_verify(tmpdir): with lgpl_header.open("w") as f: f.write( """\ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: LGPL-2.1-only @@ -58,7 +58,7 @@ def test_verify(tmpdir): with correct_header.open("w") as f: f.write( """\ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/list.py b/lib/spack/spack/test/cmd/list.py index de28d7b2ee0834..a46e690cd27eb9 100644 --- a/lib/spack/spack/test/cmd/list.py +++ b/lib/spack/spack/test/cmd/list.py @@ -1,8 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os.path import sys from textwrap import dedent @@ -134,3 +135,21 @@ def test_list_count(mock_packages): assert int(output.strip()) == len( [name for name in spack.repo.all_package_names() if "py-" in name] ) + + +# def test_list_repos(mock_packages, builder_test_repository): +def test_list_repos(): + with spack.repo.use_repositories( + os.path.join(spack.paths.repos_path, "builtin.mock"), + os.path.join(spack.paths.repos_path, "builder.test"), + ): + total_pkgs = len(list().strip().split()) + + mock_pkgs = len(list("-r", "builtin.mock").strip().split()) + builder_pkgs = len(list("-r", "builder.test").strip().split()) + + assert builder_pkgs == 8 + assert total_pkgs > mock_pkgs > builder_pkgs + + both_repos = len(list("-r", "builtin.mock", "-r", "builder.test").strip().split()) + assert both_repos == total_pkgs diff --git a/lib/spack/spack/test/cmd/load.py b/lib/spack/spack/test/cmd/load.py index 26fa374a05d34d..e2abe72e0e15d9 100644 --- a/lib/spack/spack/test/cmd/load.py +++ b/lib/spack/spack/test/cmd/load.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/location.py b/lib/spack/spack/test/cmd/location.py index 11450e8828cb84..25008e8e447b35 100644 --- a/lib/spack/spack/test/cmd/location.py +++ b/lib/spack/spack/test/cmd/location.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/maintainers.py b/lib/spack/spack/test/cmd/maintainers.py index 5063877a109246..3534310a9d4c02 100644 --- a/lib/spack/spack/test/cmd/maintainers.py +++ b/lib/spack/spack/test/cmd/maintainers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/mark.py b/lib/spack/spack/test/cmd/mark.py index d7d93c267cdba1..0aa7b359205a20 100644 --- a/lib/spack/spack/test/cmd/mark.py +++ b/lib/spack/spack/test/cmd/mark.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/mirror.py b/lib/spack/spack/test/cmd/mirror.py index 029765df93b5ac..ca4c0dd8ce6f82 100644 --- a/lib/spack/spack/test/cmd/mirror.py +++ b/lib/spack/spack/test/cmd/mirror.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -398,3 +398,12 @@ def test_mirror_set_2(mutable_config): "url": "http://example.com", "push": {"url": "http://example2.com", "access_pair": ["username", "password"]}, } + + +def test_mirror_add_set_signed(mutable_config): + mirror("add", "--signed", "example", "http://example.com") + assert spack.config.get("mirrors:example") == {"url": "http://example.com", "signed": True} + mirror("set", "--unsigned", "example") + assert spack.config.get("mirrors:example") == {"url": "http://example.com", "signed": False} + mirror("set", "--signed", "example") + assert spack.config.get("mirrors:example") == {"url": "http://example.com", "signed": True} diff --git a/lib/spack/spack/test/cmd/module.py b/lib/spack/spack/test/cmd/module.py index a885de79eeab91..4c1ea784320504 100644 --- a/lib/spack/spack/test/cmd/module.py +++ b/lib/spack/spack/test/cmd/module.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/pkg.py b/lib/spack/spack/test/cmd/pkg.py index 56a1f1f78676e8..f37d66363e5767 100644 --- a/lib/spack/spack/test/cmd/pkg.py +++ b/lib/spack/spack/test/cmd/pkg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/print_shell_vars.py b/lib/spack/spack/test/cmd/print_shell_vars.py index 31791b9749af72..994e2cdf8afba0 100644 --- a/lib/spack/spack/test/cmd/print_shell_vars.py +++ b/lib/spack/spack/test/cmd/print_shell_vars.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/providers.py b/lib/spack/spack/test/cmd/providers.py index 6c6467378b103e..e979f2db470f81 100644 --- a/lib/spack/spack/test/cmd/providers.py +++ b/lib/spack/spack/test/cmd/providers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/python.py b/lib/spack/spack/test/cmd/python.py index b3e1edd40cea58..504f4f69b957c4 100644 --- a/lib/spack/spack/test/cmd/python.py +++ b/lib/spack/spack/test/cmd/python.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/reindex.py b/lib/spack/spack/test/cmd/reindex.py index e33d48aedd5e29..f8c1d8b0e9eaee 100644 --- a/lib/spack/spack/test/cmd/reindex.py +++ b/lib/spack/spack/test/cmd/reindex.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/repo.py b/lib/spack/spack/test/cmd/repo.py index f5326ab5f8af86..b837e58ac9d67b 100644 --- a/lib/spack/spack/test/cmd/repo.py +++ b/lib/spack/spack/test/cmd/repo.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/resource.py b/lib/spack/spack/test/cmd/resource.py index 8e99ce406cbe69..3edd0d475e88b6 100644 --- a/lib/spack/spack/test/cmd/resource.py +++ b/lib/spack/spack/test/cmd/resource.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/spec.py b/lib/spack/spack/test/cmd/spec.py index 66dfce93089718..718a5e08d45afa 100644 --- a/lib/spack/spack/test/cmd/spec.py +++ b/lib/spack/spack/test/cmd/spec.py @@ -1,10 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 re -from textwrap import dedent import pytest @@ -74,42 +73,6 @@ def test_spec_parse_cflags_quoting(): assert ["-flto", "-Os"] == gh_flagged.compiler_flags["cxxflags"] -def test_spec_parse_unquoted_flags_report(): - """Verify that a useful error message is produced if unquoted compiler flags are - provided.""" - # This should fail during parsing, since /usr/include is interpreted as a spec hash. - with pytest.raises(spack.error.SpackError) as cm: - # We don't try to figure out how many following args were intended to be part of - # cflags, we just explain how to fix it for the immediate next arg. - spec("gcc cflags=-Os -pipe -other-arg-that-gets-ignored cflags=-I /usr/include") - # Verify that the generated error message is nicely formatted. - - expected_message = dedent( - '''\ - Some compiler or linker flags were provided without quoting their arguments, - which now causes spack to try to parse the *next* argument as a spec component - such as a variant instead of an additional compiler or linker flag. If the - intent was to set multiple flags, try quoting them together as described below. - - Possible flag quotation errors (with the correctly-quoted version after the =>): - (1) cflags=-Os -pipe => cflags="-Os -pipe" - (2) cflags=-I /usr/include => cflags="-I /usr/include"''' - ) - - assert expected_message in str(cm.value) - - # Verify that the same unquoted cflags report is generated in the error message even - # if it fails during concretization, not just during parsing. - with pytest.raises(spack.error.SpackError) as cm: - spec("gcc cflags=-Os -pipe") - cm = str(cm.value) - assert cm.startswith( - 'trying to set variant "pipe" in package "gcc", but the package has no such ' - 'variant [happened during concretization of gcc cflags="-Os" ~pipe]' - ) - assert cm.endswith('(1) cflags=-Os -pipe => cflags="-Os -pipe"') - - def test_spec_yaml(): output = spec("--yaml", "mpileaks") diff --git a/lib/spack/spack/test/cmd/stage.py b/lib/spack/spack/test/cmd/stage.py index cdf5ca9fb4c512..cdca18d5e7b432 100644 --- a/lib/spack/spack/test/cmd/stage.py +++ b/lib/spack/spack/test/cmd/stage.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/style.py b/lib/spack/spack/test/cmd/style.py index 55911169686fb0..afdb3dbb1fe2e0 100644 --- a/lib/spack/spack/test/cmd/style.py +++ b/lib/spack/spack/test/cmd/style.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/tags.py b/lib/spack/spack/test/cmd/tags.py index 17a63432a05847..7de107c9234be2 100644 --- a/lib/spack/spack/test/cmd/tags.py +++ b/lib/spack/spack/test/cmd/tags.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/test.py b/lib/spack/spack/test/cmd/test.py index 254baa253b5843..3ed5077c7857b2 100644 --- a/lib/spack/spack/test/cmd/test.py +++ b/lib/spack/spack/test/cmd/test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/undevelop.py b/lib/spack/spack/test/cmd/undevelop.py index 93b7c7ef90d75b..9b5a2a5692f073 100644 --- a/lib/spack/spack/test/cmd/undevelop.py +++ b/lib/spack/spack/test/cmd/undevelop.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,7 +17,7 @@ pytestmark = pytest.mark.not_on_windows("does not run on windows") -def test_undevelop(tmpdir, config, mock_packages, mutable_mock_env_path): +def test_undevelop(tmpdir, mutable_config, mock_packages, mutable_mock_env_path): # setup environment envdir = tmpdir.mkdir("env") with envdir.as_cwd(): @@ -46,7 +46,7 @@ def test_undevelop(tmpdir, config, mock_packages, mutable_mock_env_path): assert not after.satisfies("dev_path=*") -def test_undevelop_nonexistent(tmpdir, config, mock_packages, mutable_mock_env_path): +def test_undevelop_nonexistent(tmpdir, mutable_config, mock_packages, mutable_mock_env_path): # setup environment envdir = tmpdir.mkdir("env") with envdir.as_cwd(): diff --git a/lib/spack/spack/test/cmd/uninstall.py b/lib/spack/spack/test/cmd/uninstall.py index abad976c8f4e91..f3eca94d6501c6 100644 --- a/lib/spack/spack/test/cmd/uninstall.py +++ b/lib/spack/spack/test/cmd/uninstall.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/unit_test.py b/lib/spack/spack/test/cmd/unit_test.py index ea4c31e76617c9..86fe6dee612a2f 100644 --- a/lib/spack/spack/test/cmd/unit_test.py +++ b/lib/spack/spack/test/cmd/unit_test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/url.py b/lib/spack/spack/test/cmd/url.py index fad65292a21e39..4d970ddd97a2e4 100644 --- a/lib/spack/spack/test/cmd/url.py +++ b/lib/spack/spack/test/cmd/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/verify.py b/lib/spack/spack/test/cmd/verify.py index 1293df78e21d7f..0ac3c136c0b8db 100644 --- a/lib/spack/spack/test/cmd/verify.py +++ b/lib/spack/spack/test/cmd/verify.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/versions.py b/lib/spack/spack/test/cmd/versions.py index d0803a1965aef7..8506be82216dbc 100644 --- a/lib/spack/spack/test/cmd/versions.py +++ b/lib/spack/spack/test/cmd/versions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd/view.py b/lib/spack/spack/test/cmd/view.py index 75840d4e6b3308..eaf6999868910c 100644 --- a/lib/spack/spack/test/cmd/view.py +++ b/lib/spack/spack/test/cmd/view.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cmd_extensions.py b/lib/spack/spack/test/cmd_extensions.py index fc6c6fdf990502..8af89728599cb8 100644 --- a/lib/spack/spack/test/cmd_extensions.py +++ b/lib/spack/spack/test/cmd_extensions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/compilers/__init__.py b/lib/spack/spack/test/compilers/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/compilers/__init__.py +++ b/lib/spack/spack/test/compilers/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/compilers/basics.py b/lib/spack/spack/test/compilers/basics.py index dac7622b64d036..b0bd0b402644e7 100644 --- a/lib/spack/spack/test/compilers/basics.py +++ b/lib/spack/spack/test/compilers/basics.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -422,7 +422,6 @@ def test_clang_flags(): "-gdwarf-5", "-gline-tables-only", "-gmodules", - "-gz", "-g", ], "clang@3.3", @@ -445,7 +444,6 @@ def test_aocc_flags(): "-gdwarf-5", "-gline-tables-only", "-gmodules", - "-gz", "-g", ], "aocc@2.2.0", diff --git a/lib/spack/spack/test/compilers/detection.py b/lib/spack/spack/test/compilers/detection.py index cf197914b9dc8e..a30d1b890685e5 100644 --- a/lib/spack/spack/test/compilers/detection.py +++ b/lib/spack/spack/test/compilers/detection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 2818aad042855b..41b0eb600fe88c 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -132,6 +132,19 @@ def current_host(request, monkeypatch): yield target +@pytest.fixture(scope="function", params=[True, False]) +def fuzz_dep_order(request, monkeypatch): + """Meta-function that tweaks the order of iteration over dependencies in a package.""" + + def reverser(pkg_name): + if request.param: + pkg_cls = spack.repo.PATH.get_pkg_class(pkg_name) + reversed_dict = dict(reversed(list(pkg_cls.dependencies.items()))) + monkeypatch.setattr(pkg_cls, "dependencies", reversed_dict) + + return reverser + + @pytest.fixture() def repo_with_changing_recipe(tmpdir_factory, mutable_mock_repo): repo_namespace = "changing" @@ -895,7 +908,15 @@ def test_conditional_variants_fail(self, bad_spec): ("py-extension3@1.0 ^python@3.5.1", ["patchelf@0.10"], []), ], ) - def test_conditional_dependencies(self, spec_str, expected, unexpected): + def test_conditional_dependencies(self, spec_str, expected, unexpected, fuzz_dep_order): + """Tests that conditional dependencies are correctly attached. + + The original concretizer can be sensitive to the iteration order over the dependencies of + a package, so we use a fuzzer function to test concretization with dependencies iterated + forwards and backwards. + """ + fuzz_dep_order("py-extension3") # test forwards and backwards + s = Spec(spec_str).concretized() for dep in expected: @@ -1501,6 +1522,30 @@ def test_sticky_variant_in_package(self): s = Spec("sticky-variant %clang").concretized() assert s.satisfies("%clang") and s.satisfies("~allow-gcc") + @pytest.mark.regression("42172") + @pytest.mark.only_clingo("Original concretizer cannot use sticky variants") + @pytest.mark.parametrize( + "spec,allow_gcc", + [ + ("sticky-variant@1.0+allow-gcc", True), + ("sticky-variant@1.0~allow-gcc", False), + ("sticky-variant@1.0", False), + ], + ) + def test_sticky_variant_in_external(self, spec, allow_gcc): + # setup external for sticky-variant+allow-gcc + config = {"externals": [{"spec": spec, "prefix": "/fake/path"}], "buildable": False} + spack.config.set("packages:sticky-variant", config) + + maybe = llnl.util.lang.nullcontext if allow_gcc else pytest.raises + with maybe(spack.error.SpackError): + s = Spec("sticky-variant-dependent%gcc").concretized() + + if allow_gcc: + assert s.satisfies("%gcc") + assert s["sticky-variant"].satisfies("+allow-gcc") + assert s["sticky-variant"].external + @pytest.mark.only_clingo("Use case not supported by the original concretizer") def test_do_not_invent_new_concrete_versions_unless_necessary(self): # ensure we select a known satisfying version rather than creating @@ -1817,12 +1862,14 @@ def test_git_ref_version_succeeds_with_unknown_version(self, git_ref): @pytest.mark.regression("31484") @pytest.mark.only_clingo("Use case not supported by the original concretizer") - def test_installed_externals_are_reused(self, mutable_database, repo_with_changing_recipe): + def test_installed_externals_are_reused( + self, mutable_database, repo_with_changing_recipe, tmp_path + ): """Test that external specs that are in the DB can be reused.""" external_conf = { "changing": { "buildable": False, - "externals": [{"spec": "changing@1.0", "prefix": "/usr"}], + "externals": [{"spec": "changing@1.0", "prefix": str(tmp_path)}], } } spack.config.set("packages", external_conf) @@ -1847,12 +1894,12 @@ def test_installed_externals_are_reused(self, mutable_database, repo_with_changi @pytest.mark.regression("31484") @pytest.mark.only_clingo("Use case not supported by the original concretizer") - def test_user_can_select_externals_with_require(self, mutable_database): + def test_user_can_select_externals_with_require(self, mutable_database, tmp_path): """Test that users have means to select an external even in presence of reusable specs.""" external_conf = { "mpi": {"buildable": False}, "multi-provider-mpi": { - "externals": [{"spec": "multi-provider-mpi@2.0.0", "prefix": "/usr"}] + "externals": [{"spec": "multi-provider-mpi@2.0.0", "prefix": str(tmp_path)}] }, } spack.config.set("packages", external_conf) @@ -1882,7 +1929,7 @@ def test_installed_specs_disregard_conflicts(self, mutable_database, monkeypatch """ # Add a conflict to "mpich" that match an already installed "mpich~debug" pkg_cls = spack.repo.PATH.get_pkg_class("mpich") - monkeypatch.setitem(pkg_cls.conflicts, "~debug", [(Spec(), None)]) + monkeypatch.setitem(pkg_cls.conflicts, Spec(), [("~debug", None)]) # If we concretize with --fresh the conflict is taken into account with spack.config.override("concretizer:reuse", False): @@ -2184,6 +2231,33 @@ def test_reuse_python_from_cli_and_extension_from_db(self, mutable_database): assert with_reuse.dag_hash() == without_reuse.dag_hash() + @pytest.mark.regression("35536") + @pytest.mark.parametrize( + "spec_str,expected_namespaces", + [ + # Single node with fully qualified namespace + ("builtin.mock.gmake", {"gmake": "builtin.mock"}), + # Dependency with fully qualified namespace + ("hdf5 ^builtin.mock.gmake", {"gmake": "builtin.mock", "hdf5": "duplicates.test"}), + ("hdf5 ^gmake", {"gmake": "duplicates.test", "hdf5": "duplicates.test"}), + ], + ) + @pytest.mark.only_clingo("Uses specs requiring multiple gmake specs") + def test_select_lower_priority_package_from_repository_stack( + self, spec_str, expected_namespaces + ): + """Tests that a user can explicitly select a lower priority, fully qualified dependency + from cli. + """ + # 'builtin.mock" and "duplicates.test" share a 'gmake' package + additional_repo = os.path.join(spack.paths.repos_path, "duplicates.test") + with spack.repo.use_repositories(additional_repo, override=False): + s = Spec(spec_str).concretized() + + for name, namespace in expected_namespaces.items(): + assert s[name].concrete + assert s[name].namespace == namespace + @pytest.fixture() def duplicates_test_repository(): @@ -2427,3 +2501,87 @@ def test_virtuals_provided_together_but_only_one_required_in_dag(self): s = Spec("blas-only-client ^openblas").concretized() assert s.satisfies("^[virtuals=blas] openblas") assert not s.satisfies("^[virtuals=blas,lapack] openblas") + + +def test_reusable_externals_match(mock_packages, tmpdir): + spec = Spec("mpich@4.1%gcc@13.1.0~debug build_system=generic arch=linux-ubuntu23.04-zen2") + spec.external_path = tmpdir.strpath + spec.external_modules = ["mpich/4.1"] + spec._mark_concrete() + assert spack.solver.asp._is_reusable( + spec, + { + "mpich": { + "externals": [ + {"spec": "mpich@4.1", "prefix": tmpdir.strpath, "modules": ["mpich/4.1"]} + ] + } + }, + local=False, + ) + + +def test_reusable_externals_match_virtual(mock_packages, tmpdir): + spec = Spec("mpich@4.1%gcc@13.1.0~debug build_system=generic arch=linux-ubuntu23.04-zen2") + spec.external_path = tmpdir.strpath + spec.external_modules = ["mpich/4.1"] + spec._mark_concrete() + assert spack.solver.asp._is_reusable( + spec, + { + "mpi": { + "externals": [ + {"spec": "mpich@4.1", "prefix": tmpdir.strpath, "modules": ["mpich/4.1"]} + ] + } + }, + local=False, + ) + + +def test_reusable_externals_different_prefix(mock_packages, tmpdir): + spec = Spec("mpich@4.1%gcc@13.1.0~debug build_system=generic arch=linux-ubuntu23.04-zen2") + spec.external_path = "/other/path" + spec.external_modules = ["mpich/4.1"] + spec._mark_concrete() + assert not spack.solver.asp._is_reusable( + spec, + { + "mpich": { + "externals": [ + {"spec": "mpich@4.1", "prefix": tmpdir.strpath, "modules": ["mpich/4.1"]} + ] + } + }, + local=False, + ) + + +@pytest.mark.parametrize("modules", [None, ["mpich/4.1", "libfabric/1.19"]]) +def test_reusable_externals_different_modules(mock_packages, tmpdir, modules): + spec = Spec("mpich@4.1%gcc@13.1.0~debug build_system=generic arch=linux-ubuntu23.04-zen2") + spec.external_path = tmpdir.strpath + spec.external_modules = modules + spec._mark_concrete() + assert not spack.solver.asp._is_reusable( + spec, + { + "mpich": { + "externals": [ + {"spec": "mpich@4.1", "prefix": tmpdir.strpath, "modules": ["mpich/4.1"]} + ] + } + }, + local=False, + ) + + +def test_reusable_externals_different_spec(mock_packages, tmpdir): + spec = Spec("mpich@4.1%gcc@13.1.0~debug build_system=generic arch=linux-ubuntu23.04-zen2") + spec.external_path = tmpdir.strpath + spec._mark_concrete() + assert not spack.solver.asp._is_reusable( + spec, + {"mpich": {"externals": [{"spec": "mpich@4.1 +debug", "prefix": tmpdir.strpath}]}}, + local=False, + ) diff --git a/lib/spack/spack/test/concretize_compiler_runtimes.py b/lib/spack/spack/test/concretize_compiler_runtimes.py new file mode 100644 index 00000000000000..f331e9a7f8f35b --- /dev/null +++ b/lib/spack/spack/test/concretize_compiler_runtimes.py @@ -0,0 +1,62 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import os + +import pytest + +import spack.paths +import spack.repo +import spack.solver.asp +import spack.spec +from spack.version import Version + +pytestmark = [ + pytest.mark.only_clingo("Original concretizer does not support compiler runtimes"), + pytest.mark.usefixtures("enable_runtimes"), +] + + +@pytest.fixture +def runtime_repo(config): + repo = os.path.join(spack.paths.repos_path, "compiler_runtime.test") + with spack.repo.use_repositories(repo) as mock_repo: + yield mock_repo + + +@pytest.fixture +def enable_runtimes(): + original = spack.solver.asp.WITH_RUNTIME + spack.solver.asp.WITH_RUNTIME = True + yield + spack.solver.asp.WITH_RUNTIME = original + + +def test_correct_gcc_runtime_is_injected_as_dependency(runtime_repo): + s = spack.spec.Spec("a%gcc@10.2.1 ^b%gcc@4.5.0").concretized() + a, b = s["a"], s["b"] + + # Both a and b should depend on the same gcc-runtime directly + assert a.dependencies("gcc-runtime") == b.dependencies("gcc-runtime") + + # And the gcc-runtime version should be that of the newest gcc used in the dag. + assert a["gcc-runtime"].version == Version("10.2.1") + + +@pytest.mark.regression("41972") +def test_external_nodes_do_not_have_runtimes(runtime_repo, mutable_config, tmp_path): + """Tests that external nodes don't have runtime dependencies.""" + + packages_yaml = {"b": {"externals": [{"spec": "b@1.0", "prefix": f"{str(tmp_path)}"}]}} + spack.config.set("packages", packages_yaml) + + s = spack.spec.Spec("a%gcc@10.2.1").concretized() + + a, b = s["a"], s["b"] + + # Since b is an external, it doesn't depend on gcc-runtime + assert a.dependencies("gcc-runtime") + assert a.dependencies("b") + assert not b.dependencies("gcc-runtime") diff --git a/lib/spack/spack/test/concretize_errors.py b/lib/spack/spack/test/concretize_errors.py index 3499fe63a903de..09ac4e3b93f001 100644 --- a/lib/spack/spack/test/concretize_errors.py +++ b/lib/spack/spack/test/concretize_errors.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/concretize_preferences.py b/lib/spack/spack/test/concretize_preferences.py index 929ae0a9ec27a5..74549599afbdf3 100644 --- a/lib/spack/spack/test/concretize_preferences.py +++ b/lib/spack/spack/test/concretize_preferences.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/concretize_requirements.py b/lib/spack/spack/test/concretize_requirements.py index d5295691ce0a8b..3ef143fd365c0e 100644 --- a/lib/spack/spack/test/concretize_requirements.py +++ b/lib/spack/spack/test/concretize_requirements.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,7 @@ import spack.version from spack.solver.asp import InternalConcretizerError, UnsatisfiableSpecError from spack.spec import Spec +from spack.test.conftest import create_test_repo from spack.util.url import path_to_file_url pytestmark = [ @@ -92,30 +93,13 @@ class U(Package): @pytest.fixture -def create_test_repo(tmpdir, mutable_config): - repo_path = str(tmpdir) - repo_yaml = tmpdir.join("repo.yaml") - with open(str(repo_yaml), "w") as f: - f.write( - """\ -repo: - namespace: testcfgrequirements -""" - ) - - packages_dir = tmpdir.join("packages") - for pkg_name, pkg_str in [_pkgx, _pkgy, _pkgv, _pkgt, _pkgu]: - pkg_dir = packages_dir.ensure(pkg_name, dir=True) - pkg_file = pkg_dir.join("package.py") - with open(str(pkg_file), "w") as f: - f.write(pkg_str) - - yield spack.repo.Repo(repo_path) +def _create_test_repo(tmpdir, mutable_config): + yield create_test_repo(tmpdir, [_pkgx, _pkgy, _pkgv, _pkgt, _pkgu]) @pytest.fixture -def test_repo(create_test_repo, monkeypatch, mock_stage): - with spack.repo.use_repositories(create_test_repo) as mock_repo_path: +def test_repo(_create_test_repo, monkeypatch, mock_stage): + with spack.repo.use_repositories(_create_test_repo) as mock_repo_path: yield mock_repo_path @@ -530,7 +514,7 @@ def test_oneof_ordering(concretize_scope, test_repo): assert s2.satisfies("@2.5") -def test_reuse_oneof(concretize_scope, create_test_repo, mutable_database, fake_installs): +def test_reuse_oneof(concretize_scope, _create_test_repo, mutable_database, fake_installs): conf_str = """\ packages: y: @@ -538,7 +522,7 @@ def test_reuse_oneof(concretize_scope, create_test_repo, mutable_database, fake_ - one_of: ["@2.5", "%gcc"] """ - with spack.repo.use_repositories(create_test_repo): + with spack.repo.use_repositories(_create_test_repo): s1 = Spec("y@2.5%gcc").concretized() s1.package.do_install(fake=True, explicit=True) @@ -872,6 +856,8 @@ def test_skip_requirement_when_default_requirement_condition_cannot_be_met( def test_requires_directive(concretize_scope, mock_packages): compilers_yaml = pathlib.Path(concretize_scope) / "compilers.yaml" + + # NOTE: target is omitted here so that the test works on aarch64, as well. compilers_yaml.write_text( """ compilers:: @@ -883,7 +869,6 @@ def test_requires_directive(concretize_scope, mock_packages): f77: null fc: null operating_system: debian6 - target: x86_64 modules: [] """ ) @@ -896,3 +881,255 @@ def test_requires_directive(concretize_scope, mock_packages): # This package can only be compiled with clang with pytest.raises(spack.error.SpackError, match="can only be compiled with Clang"): Spec("requires_clang").concretized() + + +@pytest.mark.parametrize( + "packages_yaml", + [ + # Simple string + """ + packages: + all: + require: "+shared" + """, + # List of strings + """ + packages: + all: + require: + - "+shared" + """, + # Objects with attributes + """ + packages: + all: + require: + - spec: "+shared" + """, + """ + packages: + all: + require: + - one_of: ["+shared"] + """, + ], +) +def test_default_requirements_semantic(packages_yaml, concretize_scope, mock_packages): + """Tests that requirements under 'all:' are by default applied only if the variant/property + required exists, but are strict otherwise. + + For example: + + packages: + all: + require: "+shared" + + should enforce the value of "+shared" when a Boolean variant named "shared" exists. This is + not overridable from the command line, so with the configuration above: + + > spack spec zlib~shared + + is unsatisfiable. + """ + update_packages_config(packages_yaml) + + # Regular zlib concretize to +shared + s = Spec("zlib").concretized() + assert s.satisfies("+shared") + + # If we specify the variant we can concretize only the one matching the constraint + s = Spec("zlib +shared").concretized() + assert s.satisfies("+shared") + with pytest.raises(UnsatisfiableSpecError): + Spec("zlib ~shared").concretized() + + # A spec without the shared variant still concretize + s = Spec("a").concretized() + assert not s.satisfies("a +shared") + assert not s.satisfies("a ~shared") + + +@pytest.mark.parametrize( + "packages_yaml,spec_str,expected,not_expected", + [ + # The package has a 'libs' mv variant defaulting to 'libs=shared' + ( + """ + packages: + all: + require: "+libs" + """, + "multivalue-variant", + ["libs=shared"], + ["libs=static", "+libs"], + ), + ( + """ + packages: + all: + require: "libs=foo" + """, + "multivalue-variant", + ["libs=shared"], + ["libs=static", "libs=foo"], + ), + ( + # (TODO): revisit this case when we'll have exact value semantic for mv variants + """ + packages: + all: + require: "libs=static" + """, + "multivalue-variant", + ["libs=static", "libs=shared"], + [], + ), + ( + # Constraint apply as a whole, so having a non-existing variant + # invalidate the entire constraint + """ + packages: + all: + require: "libs=static +feefoo" + """, + "multivalue-variant", + ["libs=shared"], + ["libs=static"], + ), + ], +) +def test_default_requirements_semantic_with_mv_variants( + packages_yaml, spec_str, expected, not_expected, concretize_scope, mock_packages +): + """Tests that requirements under 'all:' are behaving correctly under cases that could stem + from MV variants. + """ + update_packages_config(packages_yaml) + s = Spec(spec_str).concretized() + + for constraint in expected: + assert s.satisfies(constraint), constraint + + for constraint in not_expected: + assert not s.satisfies(constraint), constraint + + +@pytest.mark.regression("42084") +def test_requiring_package_on_multiple_virtuals(concretize_scope, mock_packages): + update_packages_config( + """ + packages: + all: + providers: + scalapack: [netlib-scalapack] + blas: + require: intel-parallel-studio + lapack: + require: intel-parallel-studio + scalapack: + require: intel-parallel-studio + """ + ) + s = Spec("dla-future").concretized() + + assert s["blas"].name == "intel-parallel-studio" + assert s["lapack"].name == "intel-parallel-studio" + assert s["scalapack"].name == "intel-parallel-studio" + + +@pytest.mark.parametrize( + "packages_yaml,spec_str,expected,not_expected", + [ + ( + """ + packages: + all: + prefer: + - "%clang" + compiler: [gcc] + """, + "multivalue-variant", + ["%clang"], + ["%gcc"], + ), + ( + """ + packages: + all: + prefer: + - "%clang" + """, + "multivalue-variant %gcc", + ["%gcc"], + ["%clang"], + ), + # Test parsing objects instead of strings + ( + """ + packages: + all: + prefer: + - spec: "%clang" + compiler: [gcc] + """, + "multivalue-variant", + ["%clang"], + ["%gcc"], + ), + ], +) +def test_strong_preferences_packages_yaml( + packages_yaml, spec_str, expected, not_expected, concretize_scope, mock_packages +): + """Tests that "preferred" specs are stronger than usual preferences, but can be overridden.""" + update_packages_config(packages_yaml) + s = Spec(spec_str).concretized() + + for constraint in expected: + assert s.satisfies(constraint), constraint + + for constraint in not_expected: + assert not s.satisfies(constraint), constraint + + +@pytest.mark.parametrize( + "packages_yaml,spec_str", + [ + ( + """ + packages: + all: + conflict: + - "%clang" + """, + "multivalue-variant %clang", + ), + # Use an object instead of a string in configuration + ( + """ + packages: + all: + conflict: + - spec: "%clang" + message: "cannot use clang" + """, + "multivalue-variant %clang", + ), + ( + """ + packages: + multivalue-variant: + conflict: + - spec: "%clang" + when: "@2" + message: "cannot use clang with version 2" + """, + "multivalue-variant@=2.3 %clang", + ), + ], +) +def test_conflict_packages_yaml(packages_yaml, spec_str, concretize_scope, mock_packages): + """Tests conflicts that are specified from configuration files.""" + update_packages_config(packages_yaml) + with pytest.raises(UnsatisfiableSpecError): + Spec(spec_str).concretized() diff --git a/lib/spack/spack/test/config.py b/lib/spack/spack/test/config.py index 2453172bec5838..83a652cd41444b 100644 --- a/lib/spack/spack/test/config.py +++ b/lib/spack/spack/test/config.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -284,6 +284,13 @@ def test_add_config_path(mutable_config): set_value = spack.config.get("config")["install_tree"]["projections"]["cmake"] assert set_value == "{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}" + path = 'modules:default:tcl:all:environment:set:"{name}_ROOT":"{prefix}"' + spack.config.add(path) + set_value = spack.config.get("modules")["default"]["tcl"]["all"]["environment"]["set"] + assert r"{name}_ROOT" in set_value + assert set_value[r"{name}_ROOT"] == r"{prefix}" + assert spack.config.get('modules:default:tcl:all:environment:set:"{name}_ROOT"') == r"{prefix}" + # NOTE: # The config path: "config:install_tree:root:" is unique in that it can accept multiple # schemas (such as a dropped "root" component) which is atypical and may lead to passing tests @@ -502,6 +509,34 @@ def test_parse_install_tree(config_settings, expected, mutable_config): assert projections == expected_proj +def test_change_or_add(mutable_config, mock_packages): + spack.config.add("packages:a:version:['1.0']", scope="user") + + spack.config.add("packages:b:version:['1.1']", scope="system") + + class ChangeTest: + def __init__(self, pkg_name, new_version): + self.pkg_name = pkg_name + self.new_version = new_version + + def find_fn(self, section): + return self.pkg_name in section + + def change_fn(self, section): + pkg_section = section.get(self.pkg_name, {}) + pkg_section["version"] = self.new_version + section[self.pkg_name] = pkg_section + + change1 = ChangeTest("b", ["1.2"]) + spack.config.change_or_add("packages", change1.find_fn, change1.change_fn) + assert "b" not in mutable_config.get("packages", scope="user") + assert mutable_config.get("packages")["b"]["version"] == ["1.2"] + + change2 = ChangeTest("c", ["1.0"]) + spack.config.change_or_add("packages", change2.find_fn, change2.change_fn) + assert "c" in mutable_config.get("packages", scope="user") + + @pytest.mark.not_on_windows("Padding unsupported on Windows") @pytest.mark.parametrize( "config_settings,expected", @@ -1160,7 +1195,7 @@ def test_set_dict_override(mock_low_high_config, write_config_file): def test_set_bad_path(config): - with pytest.raises(syaml.SpackYAMLError, match="Illegal leading"): + with pytest.raises(ValueError): with spack.config.override(":bad:path", ""): pass @@ -1434,3 +1469,26 @@ def test_config_file_read_invalid_yaml(tmpdir, mutable_empty_config): with pytest.raises(spack.config.ConfigFileError, match="parsing YAML"): spack.config.read_config_file(filename) + + +@pytest.mark.parametrize( + "path,it_should_work,expected_parsed", + [ + ("x:y:z", True, ["x:", "y:", "z"]), + ("x+::y:z", True, ["x+::", "y:", "z"]), + ('x:y:"{z}"', True, ["x:", "y:", '"{z}"']), + ('x:"y"+:z', True, ["x:", '"y"+:', "z"]), + ('x:"y"trail:z', False, None), + ("x:y:[1.0]", True, ["x:", "y:", "[1.0]"]), + ("x:y:['1.0']", True, ["x:", "y:", "['1.0']"]), + ("x:{y}:z", True, ["x:", "{y}:", "z"]), + ("x:'{y}':z", True, ["x:", "'{y}':", "z"]), + ("x:{y}", True, ["x:", "{y}"]), + ], +) +def test_config_path_dsl(path, it_should_work, expected_parsed): + if it_should_work: + assert spack.config.ConfigPath._validate(path) == expected_parsed + else: + with pytest.raises(ValueError): + spack.config.ConfigPath._validate(path) diff --git a/lib/spack/spack/test/config_values.py b/lib/spack/spack/test/config_values.py index 618d2c40a81796..70f50f1e88b66f 100644 --- a/lib/spack/spack/test/config_values.py +++ b/lib/spack/spack/test/config_values.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/conftest.py b/lib/spack/spack/test/conftest.py index 73c08912199b23..1f6e0542327cb6 100644 --- a/lib/spack/spack/test/conftest.py +++ b/lib/spack/spack/test/conftest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,6 +6,7 @@ import collections import datetime import errno +import functools import inspect import itertools import json @@ -43,6 +44,7 @@ import spack.paths import spack.platforms import spack.repo +import spack.solver.asp import spack.stage import spack.store import spack.subprocess_context @@ -566,8 +568,8 @@ def mock_repo_path(): def _pkg_install_fn(pkg, spec, prefix): # sanity_check_prefix requires something in the install directory mkdirp(prefix.bin) - if not os.path.exists(spec.package.build_log_path): - touchp(spec.package.build_log_path) + if not os.path.exists(spec.package.install_log_path): + touchp(spec.package.install_log_path) @pytest.fixture @@ -716,13 +718,13 @@ def configuration_dir(tmpdir_factory, linux_os): def _create_mock_configuration_scopes(configuration_dir): """Create the configuration scopes used in `config` and `mutable_config`.""" - scopes = [spack.config.InternalConfigScope("_builtin", spack.config.CONFIG_DEFAULTS)] - scopes += [ - spack.config.ConfigScope(name, str(configuration_dir.join(name))) - for name in ["site", "system", "user"] + return [ + spack.config.InternalConfigScope("_builtin", spack.config.CONFIG_DEFAULTS), + spack.config.ConfigScope("site", str(configuration_dir.join("site"))), + spack.config.ConfigScope("system", str(configuration_dir.join("system"))), + spack.config.ConfigScope("user", str(configuration_dir.join("user"))), + spack.config.InternalConfigScope("command_line"), ] - scopes += [spack.config.InternalConfigScope("command_line")] - return scopes @pytest.fixture(scope="session") @@ -799,13 +801,13 @@ def mock_low_high_config(tmpdir): def _populate(mock_db): r"""Populate a mock database with packages. - Here is what the mock DB looks like: + Here is what the mock DB looks like (explicit roots at top): - o mpileaks o mpileaks' o mpileaks'' - |\ |\ |\ - | o callpath | o callpath' | o callpath'' - |/| |/| |/| - o | mpich o | mpich2 o | zmpi + o mpileaks o mpileaks' o mpileaks'' o externaltest o trivial-smoke-test + |\ |\ |\ | + | o callpath | o callpath' | o callpath'' o externaltool + |/| |/| |/| | + o | mpich o | mpich2 o | zmpi o externalvirtual | | o | fake | | | | |______________/ @@ -1950,17 +1952,37 @@ def pytest_runtest_setup(item): @pytest.fixture(scope="function") def disable_parallel_buildcache_push(monkeypatch): - class MockPool: - def map(self, func, args): - return [func(a) for a in args] + """Disable process pools in tests.""" + monkeypatch.setattr(spack.cmd.buildcache, "_make_pool", spack.cmd.buildcache.NoPool) - def starmap(self, func, args): - return [func(*a) for a in args] - def __enter__(self): - return self +def _root_path(x, y, *, path): + return path - def __exit__(self, *args): - pass - monkeypatch.setattr(spack.cmd.buildcache, "_make_pool", MockPool) +@pytest.fixture +def mock_modules_root(tmp_path, monkeypatch): + """Sets the modules root to a temporary directory, to avoid polluting configuration scopes.""" + fn = functools.partial(_root_path, path=str(tmp_path)) + monkeypatch.setattr(spack.modules.common, "root_path", fn) + + +def create_test_repo(tmpdir, pkg_name_content_tuples): + repo_path = str(tmpdir) + repo_yaml = tmpdir.join("repo.yaml") + with open(str(repo_yaml), "w") as f: + f.write( + """\ +repo: + namespace: testcfgrequirements +""" + ) + + packages_dir = tmpdir.join("packages") + for pkg_name, pkg_str in pkg_name_content_tuples: + pkg_dir = packages_dir.ensure(pkg_name, dir=True) + pkg_file = pkg_dir.join("package.py") + with open(str(pkg_file), "w") as f: + f.write(pkg_str) + + return spack.repo.Repo(repo_path) diff --git a/lib/spack/spack/test/container/cli.py b/lib/spack/spack/test/container/cli.py index 1ccd47d002a990..bbd111b81eb258 100644 --- a/lib/spack/spack/test/container/cli.py +++ b/lib/spack/spack/test/container/cli.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/container/conftest.py b/lib/spack/spack/test/container/conftest.py index b4e48032c88799..974fe4438bf382 100644 --- a/lib/spack/spack/test/container/conftest.py +++ b/lib/spack/spack/test/container/conftest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/container/docker.py b/lib/spack/spack/test/container/docker.py index 9f9f5f3a0f2a32..d23c9c6f86c105 100644 --- a/lib/spack/spack/test/container/docker.py +++ b/lib/spack/spack/test/container/docker.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/container/images.py b/lib/spack/spack/test/container/images.py index 8d9a831606352a..eac0f1e1faaddf 100644 --- a/lib/spack/spack/test/container/images.py +++ b/lib/spack/spack/test/container/images.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/container/singularity.py b/lib/spack/spack/test/container/singularity.py index 06aec57c8ec9f0..63f06657dc8894 100644 --- a/lib/spack/spack/test/container/singularity.py +++ b/lib/spack/spack/test/container/singularity.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/cray_manifest.py b/lib/spack/spack/test/cray_manifest.py index 123e2ac3f12fd6..3a00180da8dd0c 100644 --- a/lib/spack/spack/test/cray_manifest.py +++ b/lib/spack/spack/test/cray_manifest.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,7 @@ import spack.compilers import spack.config import spack.cray_manifest as cray_manifest +import spack.solver.asp import spack.spec import spack.store from spack.cray_manifest import compiler_from_entry, entries_to_specs @@ -488,3 +489,23 @@ def test_find_external_nonempty_default_manifest_dir( spack.cmd.external._collect_and_consume_cray_manifest_files(ignore_default_dir=False) specs = spack.store.STORE.db.query("hwloc") assert any(x.dag_hash() == "hwlocfakehashaaa" for x in specs) + + +def test_reusable_externals_cray_manifest( + tmpdir, mutable_config, mock_packages, temporary_store, manifest_content +): + """The concretizer should be able to reuse specs imported from a manifest without a + externals config entry in packages.yaml""" + with tmpdir.as_cwd(): + with open("external-db.json", "w") as f: + json.dump(manifest_content, f) + cray_manifest.read(path="external-db.json", apply_updates=True) + + # Get any imported spec + spec = temporary_store.db.query_local()[0] + + # Reusable if imported locally + assert spack.solver.asp._is_reusable(spec, packages={}, local=True) + + # If cray manifest entries end up in a build cache somehow, they are not reusable + assert not spack.solver.asp._is_reusable(spec, packages={}, local=False) diff --git a/lib/spack/spack/test/cvs_fetch.py b/lib/spack/spack/test/cvs_fetch.py index 4cf310579988be..b5ca766d52f9a8 100644 --- a/lib/spack/spack/test/cvs_fetch.py +++ b/lib/spack/spack/test/cvs_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/config/modules.yaml b/lib/spack/spack/test/data/config/modules.yaml index 28e2ec91b3d962..f217dd7eaf3379 100644 --- a/lib/spack/spack/test/data/config/modules.yaml +++ b/lib/spack/spack/test/data/config/modules.yaml @@ -14,12 +14,7 @@ # ~/.spack/modules.yaml # ------------------------------------------------------------------------- modules: - default: - enable: - - tcl - roots: - tcl: $user_cache_path/tcl - lmod: $user_cache_path/lmod + default: {} prefix_inspections: bin: - PATH diff --git a/lib/spack/spack/test/data/sourceme_first.sh b/lib/spack/spack/test/data/sourceme_first.sh index a9f52597c1ea53..bee48156de6921 100644 --- a/lib/spack/spack/test/data/sourceme_first.sh +++ b/lib/spack/spack/test/data/sourceme_first.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_lmod.sh b/lib/spack/spack/test/data/sourceme_lmod.sh index 3badac8683f1dc..8d156665a71513 100644 --- a/lib/spack/spack/test/data/sourceme_lmod.sh +++ b/lib/spack/spack/test/data/sourceme_lmod.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_modules.sh b/lib/spack/spack/test/data/sourceme_modules.sh index ee76b4a2aa56f3..d5b478c01f15de 100644 --- a/lib/spack/spack/test/data/sourceme_modules.sh +++ b/lib/spack/spack/test/data/sourceme_modules.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_parameters.sh b/lib/spack/spack/test/data/sourceme_parameters.sh index bf0de006cfe82b..bc7e622d2a3cd1 100644 --- a/lib/spack/spack/test/data/sourceme_parameters.sh +++ b/lib/spack/spack/test/data/sourceme_parameters.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_second.sh b/lib/spack/spack/test/data/sourceme_second.sh index 6d51f2a2559e9b..d2860171302aaf 100644 --- a/lib/spack/spack/test/data/sourceme_second.sh +++ b/lib/spack/spack/test/data/sourceme_second.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_unicode.sh b/lib/spack/spack/test/data/sourceme_unicode.sh index 13805cc8724001..de653f9d394d30 100644 --- a/lib/spack/spack/test/data/sourceme_unicode.sh +++ b/lib/spack/spack/test/data/sourceme_unicode.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/sourceme_unset.sh b/lib/spack/spack/test/data/sourceme_unset.sh index a301747d90e1ca..8f96c92d2c9da6 100644 --- a/lib/spack/spack/test/data/sourceme_unset.sh +++ b/lib/spack/spack/test/data/sourceme_unset.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/style/broken.dummy b/lib/spack/spack/test/data/style/broken.dummy index 49112f53c9d663..dda84b53a03bf1 100644 --- a/lib/spack/spack/test/data/style/broken.dummy +++ b/lib/spack/spack/test/data/style/broken.dummy @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/style/fixed.py b/lib/spack/spack/test/data/style/fixed.py index f51e7325a6dfad..379044eb623a8c 100644 --- a/lib/spack/spack/test/data/style/fixed.py +++ b/lib/spack/spack/test/data/style/fixed.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/amdfftw.txt b/lib/spack/spack/test/data/unparse/amdfftw.txt index ddfbe1c0ff1c40..619dec56651492 100644 --- a/lib/spack/spack/test/data/unparse/amdfftw.txt +++ b/lib/spack/spack/test/data/unparse/amdfftw.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/grads.txt b/lib/spack/spack/test/data/unparse/grads.txt index c7c98972340362..fd8db21d3b98e4 100644 --- a/lib/spack/spack/test/data/unparse/grads.txt +++ b/lib/spack/spack/test/data/unparse/grads.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/legion.txt b/lib/spack/spack/test/data/unparse/legion.txt index 21800f95f09b61..d6b37e2c9a5be8 100644 --- a/lib/spack/spack/test/data/unparse/legion.txt +++ b/lib/spack/spack/test/data/unparse/legion.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/llvm.txt b/lib/spack/spack/test/data/unparse/llvm.txt index 834ab2dc92db00..7fef007b1ec711 100644 --- a/lib/spack/spack/test/data/unparse/llvm.txt +++ b/lib/spack/spack/test/data/unparse/llvm.txt @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/mfem.txt b/lib/spack/spack/test/data/unparse/mfem.txt index d8d11c7dd70c6a..20dea060358533 100644 --- a/lib/spack/spack/test/data/unparse/mfem.txt +++ b/lib/spack/spack/test/data/unparse/mfem.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/py-torch.txt b/lib/spack/spack/test/data/unparse/py-torch.txt index 268df1924a9918..441d1be914da37 100644 --- a/lib/spack/spack/test/data/unparse/py-torch.txt +++ b/lib/spack/spack/test/data/unparse/py-torch.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/data/unparse/trilinos.txt b/lib/spack/spack/test/data/unparse/trilinos.txt index 9aeccc6620d4e2..ca4564a1d6f81a 100644 --- a/lib/spack/spack/test/data/unparse/trilinos.txt +++ b/lib/spack/spack/test/data/unparse/trilinos.txt @@ -1,5 +1,5 @@ # -*- python -*- -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/database.py b/lib/spack/spack/test/database.py index ee3e5da81ef679..299e908a76d2ec 100644 --- a/lib/spack/spack/test/database.py +++ b/lib/spack/spack/test/database.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,7 @@ from llnl.util.tty.colify import colify import spack.database +import spack.deptypes as dt import spack.package_base import spack.repo import spack.spec @@ -778,9 +779,39 @@ def test_query_unused_specs(mutable_database): s.concretize() s.package.do_install(fake=True, explicit=True) - unused = spack.store.STORE.db.unused_specs - assert len(unused) == 1 - assert unused[0].name == "cmake" + si = s.dag_hash() + ml_mpich = spack.store.STORE.db.query_one("mpileaks ^mpich").dag_hash() + ml_mpich2 = spack.store.STORE.db.query_one("mpileaks ^mpich2").dag_hash() + ml_zmpi = spack.store.STORE.db.query_one("mpileaks ^zmpi").dag_hash() + externaltest = spack.store.STORE.db.query_one("externaltest").dag_hash() + trivial_smoke_test = spack.store.STORE.db.query_one("trivial-smoke-test").dag_hash() + + def check_unused(roots, deptype, expected): + unused = spack.store.STORE.db.unused_specs(root_hashes=roots, deptype=deptype) + assert set(u.name for u in unused) == set(expected) + + default_dt = dt.LINK | dt.RUN + check_unused(None, default_dt, ["cmake"]) + check_unused( + [si, ml_mpich, ml_mpich2, ml_zmpi, externaltest], + default_dt, + ["trivial-smoke-test", "cmake"], + ) + check_unused( + [si, ml_mpich, ml_mpich2, ml_zmpi, externaltest], + dt.LINK | dt.RUN | dt.BUILD, + ["trivial-smoke-test"], + ) + check_unused( + [si, ml_mpich, ml_mpich2, externaltest, trivial_smoke_test], + dt.LINK | dt.RUN | dt.BUILD, + ["mpileaks", "callpath", "zmpi", "fake"], + ) + check_unused( + [si, ml_mpich, ml_mpich2, ml_zmpi], + default_dt, + ["trivial-smoke-test", "cmake", "externaltest", "externaltool", "externalvirtual"], + ) @pytest.mark.regression("10019") @@ -1008,6 +1039,16 @@ def test_check_parents(spec_str, parent_name, expected_nparents, database): assert len(edges) == expected_nparents +def test_db_all_hashes(database): + # ensure we get the right number of hashes without a read transaction + hashes = database.all_hashes() + assert len(hashes) == 17 + + # and make sure the hashes match + with database.read_transaction(): + assert set(s.dag_hash() for s in database.query()) == set(hashes) + + def test_consistency_of_dependents_upon_remove(mutable_database): # Check the initial state s = mutable_database.query_one("dyninst") diff --git a/lib/spack/spack/test/detection.py b/lib/spack/spack/test/detection.py index 6218bc87578f7c..b83562e4e5d4aa 100644 --- a/lib/spack/spack/test/detection.py +++ b/lib/spack/spack/test/detection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/directives.py b/lib/spack/spack/test/directives.py index 677eb043a9e6ed..a878cea6f2710a 100644 --- a/lib/spack/spack/test/directives.py +++ b/lib/spack/spack/test/directives.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,8 +29,8 @@ def test_true_directives_exist(mock_packages): cls = spack.repo.PATH.get_pkg_class("when-directives-true") assert cls.dependencies - assert spack.spec.Spec() in cls.dependencies["extendee"] - assert spack.spec.Spec() in cls.dependencies["b"] + assert "extendee" in cls.dependencies[spack.spec.Spec()] + assert "b" in cls.dependencies[spack.spec.Spec()] assert cls.resources assert spack.spec.Spec() in cls.resources @@ -43,10 +43,10 @@ def test_constraints_from_context(mock_packages): pkg_cls = spack.repo.PATH.get_pkg_class("with-constraint-met") assert pkg_cls.dependencies - assert spack.spec.Spec("@1.0") in pkg_cls.dependencies["b"] + assert "b" in pkg_cls.dependencies[spack.spec.Spec("@1.0")] assert pkg_cls.conflicts - assert (spack.spec.Spec("+foo@1.0"), None) in pkg_cls.conflicts["%gcc"] + assert (spack.spec.Spec("%gcc"), None) in pkg_cls.conflicts[spack.spec.Spec("+foo@1.0")] @pytest.mark.regression("26656") @@ -54,7 +54,7 @@ def test_constraints_from_context_are_merged(mock_packages): pkg_cls = spack.repo.PATH.get_pkg_class("with-constraint-met") assert pkg_cls.dependencies - assert spack.spec.Spec("@0.14:15 ^b@3.8:4.0") in pkg_cls.dependencies["c"] + assert "c" in pkg_cls.dependencies[spack.spec.Spec("@0.14:15 ^b@3.8:4.0")] @pytest.mark.regression("27754") @@ -101,7 +101,7 @@ def test_license_directive(config, mock_packages, package_name, expected_license def test_duplicate_exact_range_license(): package = namedtuple("package", ["licenses", "name"]) - package.licenses = {spack.directives.make_when_spec("+foo"): "Apache-2.0"} + package.licenses = {spack.spec.Spec("+foo"): "Apache-2.0"} package.name = "test_package" msg = ( @@ -115,7 +115,7 @@ def test_duplicate_exact_range_license(): def test_overlapping_duplicate_licenses(): package = namedtuple("package", ["licenses", "name"]) - package.licenses = {spack.directives.make_when_spec("+foo"): "Apache-2.0"} + package.licenses = {spack.spec.Spec("+foo"): "Apache-2.0"} package.name = "test_package" msg = ( diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py index 64676bfebcb8d9..6f422818276239 100644 --- a/lib/spack/spack/test/directory_layout.py +++ b/lib/spack/spack/test/directory_layout.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/env.py b/lib/spack/spack/test/env.py index 21c59488d15b6b..54ac9a3732d58c 100644 --- a/lib/spack/spack/test/env.py +++ b/lib/spack/spack/test/env.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -108,6 +108,12 @@ def test_env_change_spec_in_definition(tmp_path, mock_packages, config, mutable_ e.change_existing_spec(spack.spec.Spec("mpileaks@2.2"), list_name="desired_specs") e.write() + # Ensure changed specs are in memory + assert any(x.intersects("mpileaks@2.2%gcc") for x in e.user_specs) + assert not any(x.intersects("mpileaks@2.1%gcc") for x in e.user_specs) + + # Now make sure the changes can be read from the modified config + e = ev.read("test") assert any(x.intersects("mpileaks@2.2%gcc") for x in e.user_specs) assert not any(x.intersects("mpileaks@2.1%gcc") for x in e.user_specs) diff --git a/lib/spack/spack/test/environment_modifications.py b/lib/spack/spack/test/environment_modifications.py index c2daac3cdb5b05..377f60c54d82ea 100644 --- a/lib/spack/spack/test/environment_modifications.py +++ b/lib/spack/spack/test/environment_modifications.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/fetch_strategy.py b/lib/spack/spack/test/fetch_strategy.py index 59c645d4e01997..e4fee6e1a29b8e 100644 --- a/lib/spack/spack/test/fetch_strategy.py +++ b/lib/spack/spack/test/fetch_strategy.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/flag_handlers.py b/lib/spack/spack/test/flag_handlers.py index 3e680c1ab7d037..d2b67d63bc3eca 100644 --- a/lib/spack/spack/test/flag_handlers.py +++ b/lib/spack/spack/test/flag_handlers.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/gcs_fetch.py b/lib/spack/spack/test/gcs_fetch.py index 76b99714714059..3689e5780c17a4 100644 --- a/lib/spack/spack/test/gcs_fetch.py +++ b/lib/spack/spack/test/gcs_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/git_fetch.py b/lib/spack/spack/test/git_fetch.py index e900628b7b983b..a68eccb2a510f2 100644 --- a/lib/spack/spack/test/git_fetch.py +++ b/lib/spack/spack/test/git_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/graph.py b/lib/spack/spack/test/graph.py index 888d43d914bd5e..338690a72e4105 100644 --- a/lib/spack/spack/test/graph.py +++ b/lib/spack/spack/test/graph.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/hg_fetch.py b/lib/spack/spack/test/hg_fetch.py index 48c57dbe6b56ba..6d63f64dc8998a 100644 --- a/lib/spack/spack/test/hg_fetch.py +++ b/lib/spack/spack/test/hg_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/hooks/absolutify_elf_sonames.py b/lib/spack/spack/test/hooks/absolutify_elf_sonames.py index b2f4a6336438be..de38d2e9cb4903 100644 --- a/lib/spack/spack/test/hooks/absolutify_elf_sonames.py +++ b/lib/spack/spack/test/hooks/absolutify_elf_sonames.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index 467577cead8111..2b65bc9cfb6972 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,10 +12,12 @@ import llnl.util.filesystem as fs import spack.error +import spack.mirror import spack.patch import spack.repo import spack.store import spack.util.spack_json as sjson +from spack import binary_distribution from spack.package_base import ( InstallError, PackageBase, @@ -118,59 +120,25 @@ def remove_prefix(self): self.wrapped_rm_prefix() -class MockStage: - def __init__(self, wrapped_stage): - self.wrapped_stage = wrapped_stage - self.test_destroyed = False - - def __enter__(self): - self.create() - return self - - def __exit__(self, exc_type, exc_val, exc_tb): - if exc_type is None: - self.destroy() - - def destroy(self): - self.test_destroyed = True - self.wrapped_stage.destroy() - - def create(self): - self.wrapped_stage.create() - - def __getattr__(self, attr): - if attr == "wrapped_stage": - # This attribute may not be defined at some point during unpickling - raise AttributeError() - return getattr(self.wrapped_stage, attr) - - def test_partial_install_delete_prefix_and_stage(install_mockery, mock_fetch, working_env): s = Spec("canfail").concretized() instance_rm_prefix = s.package.remove_prefix - try: - s.package.remove_prefix = mock_remove_prefix - with pytest.raises(MockInstallError): - s.package.do_install() - assert os.path.isdir(s.package.prefix) - rm_prefix_checker = RemovePrefixChecker(instance_rm_prefix) - s.package.remove_prefix = rm_prefix_checker.remove_prefix - - # must clear failure markings for the package before re-installing it - spack.store.STORE.failure_tracker.clear(s, True) - - s.package.set_install_succeed() - s.package.stage = MockStage(s.package.stage) + s.package.remove_prefix = mock_remove_prefix + with pytest.raises(MockInstallError): + s.package.do_install() + assert os.path.isdir(s.package.prefix) + rm_prefix_checker = RemovePrefixChecker(instance_rm_prefix) + s.package.remove_prefix = rm_prefix_checker.remove_prefix - s.package.do_install(restage=True) - assert rm_prefix_checker.removed - assert s.package.stage.test_destroyed - assert s.package.spec.installed + # must clear failure markings for the package before re-installing it + spack.store.STORE.failure_tracker.clear(s, True) - finally: - s.package.remove_prefix = instance_rm_prefix + s.package.set_install_succeed() + s.package.do_install(restage=True) + assert rm_prefix_checker.removed + assert s.package.spec.installed @pytest.mark.disable_clean_stage_check @@ -357,10 +325,8 @@ def test_partial_install_keep_prefix(install_mockery, mock_fetch, monkeypatch, w spack.store.STORE.failure_tracker.clear(s, True) s.package.set_install_succeed() - s.package.stage = MockStage(s.package.stage) s.package.do_install(keep_prefix=True) assert s.package.spec.installed - assert not s.package.stage.test_destroyed def test_second_install_no_overwrite_first(install_mockery, mock_fetch, monkeypatch): @@ -478,41 +444,15 @@ def test_nosource_pkg_install_post_install(install_mockery, mock_fetch, mock_pac def test_pkg_build_paths(install_mockery): # Get a basic concrete spec for the trivial install package. spec = Spec("trivial-install-test-package").concretized() - - log_path = spec.package.log_path - assert log_path.endswith(_spack_build_logfile) - - env_path = spec.package.env_path - assert env_path.endswith(_spack_build_envfile) - - # Backward compatibility checks - log_dir = os.path.dirname(log_path) - fs.mkdirp(log_dir) - with fs.working_dir(log_dir): - # Start with the older of the previous log filenames - older_log = "spack-build.out" - fs.touch(older_log) - assert spec.package.log_path.endswith(older_log) - - # Now check the newer log filename - last_log = "spack-build.txt" - fs.rename(older_log, last_log) - assert spec.package.log_path.endswith(last_log) - - # Check the old environment file - last_env = "spack-build.env" - fs.rename(last_log, last_env) - assert spec.package.env_path.endswith(last_env) - - # Cleanup - shutil.rmtree(log_dir) + assert spec.package.log_path.endswith(_spack_build_logfile) + assert spec.package.env_path.endswith(_spack_build_envfile) def test_pkg_install_paths(install_mockery): # Get a basic concrete spec for the trivial install package. spec = Spec("trivial-install-test-package").concretized() - log_path = os.path.join(spec.prefix, ".spack", _spack_build_logfile) + log_path = os.path.join(spec.prefix, ".spack", _spack_build_logfile + ".gz") assert spec.package.install_log_path == log_path env_path = os.path.join(spec.prefix, ".spack", _spack_build_envfile) @@ -644,3 +584,48 @@ def test_empty_install_sanity_check_prefix( spec = Spec("failing-empty-install").concretized() with pytest.raises(spack.build_environment.ChildError, match="Nothing was installed"): spec.package.do_install() + + +def test_install_from_binary_with_missing_patch_succeeds( + temporary_store: spack.store.Store, mutable_config, tmp_path, mock_packages +): + """If a patch is missing in the local package repository, but was present when building and + pushing the package to a binary cache, installation from that binary cache shouldn't error out + because of the missing patch.""" + # Create a spec s with non-existing patches + s = Spec("trivial-install-test-package").concretized() + patches = ["a" * 64] + s_dict = s.to_dict() + s_dict["spec"]["nodes"][0]["patches"] = patches + s_dict["spec"]["nodes"][0]["parameters"]["patches"] = patches + s = Spec.from_dict(s_dict) + + # Create an install dir for it + os.makedirs(os.path.join(s.prefix, ".spack")) + with open(os.path.join(s.prefix, ".spack", "spec.json"), "w") as f: + s.to_json(f) + + # And register it in the database + temporary_store.db.add(s, directory_layout=temporary_store.layout, explicit=True) + + # Push it to a binary cache + build_cache = tmp_path / "my_build_cache" + binary_distribution.push_or_raise( + s, + build_cache.as_uri(), + binary_distribution.PushOptions(unsigned=True, regenerate_index=True), + ) + + # Now re-install it. + s.package.do_uninstall() + assert not temporary_store.db.query_local_by_spec_hash(s.dag_hash()) + + # Source install: fails, we don't have the patch. + with pytest.raises(spack.error.SpecError, match="Couldn't find patch for package"): + s.package.do_install() + + # Binary install: succeeds, we don't need the patch. + spack.mirror.add(spack.mirror.Mirror.from_local_path(str(build_cache))) + s.package.do_install(package_cache_only=True, dependencies_cache_only=True, unsigned=True) + + assert temporary_store.db.query_local_by_spec_hash(s.dag_hash()) diff --git a/lib/spack/spack/test/installer.py b/lib/spack/spack/test/installer.py index d28d3f44c387bd..ebe5ec0e0021ae 100644 --- a/lib/spack/spack/test/installer.py +++ b/lib/spack/spack/test/installer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -165,23 +165,19 @@ def test_install_msg(monkeypatch): assert inst.install_msg(name, pid, None) == expected -def test_install_from_cache_errors(install_mockery, capsys): - """Test to ensure cover _install_from_cache errors.""" +def test_install_from_cache_errors(install_mockery): + """Test to ensure cover install from cache errors.""" spec = spack.spec.Spec("trivial-install-test-package") spec.concretize() assert spec.concrete # Check with cache-only - with pytest.raises(SystemExit): - inst._install_from_cache(spec.package, True, True, False) - - captured = str(capsys.readouterr()) - assert "No binary" in captured - assert "found when cache-only specified" in captured + with pytest.raises(inst.InstallError, match="No binary found when cache-only was specified"): + spec.package.do_install(package_cache_only=True, dependencies_cache_only=True) assert not spec.package.installed_from_binary_cache # Check when don't expect to install only from binary cache - assert not inst._install_from_cache(spec.package, False, True, False) + assert not inst._install_from_cache(spec.package, explicit=True, unsigned=False) assert not spec.package.installed_from_binary_cache @@ -192,7 +188,7 @@ def test_install_from_cache_ok(install_mockery, monkeypatch): monkeypatch.setattr(inst, "_try_install_from_binary_cache", _true) monkeypatch.setattr(spack.hooks, "post_install", _noop) - assert inst._install_from_cache(spec.package, True, True, False) + assert inst._install_from_cache(spec.package, explicit=True, unsigned=False) def test_process_external_package_module(install_mockery, monkeypatch, capfd): diff --git a/lib/spack/spack/test/link_paths.py b/lib/spack/spack/test/link_paths.py index 923637b6978228..2d62c59de61f0d 100644 --- a/lib/spack/spack/test/link_paths.py +++ b/lib/spack/spack/test/link_paths.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/llnl_string.py b/lib/spack/spack/test/llnl/llnl_string.py index 93d7e662c57bea..9533212a595c82 100644 --- a/lib/spack/spack/test/llnl/llnl_string.py +++ b/lib/spack/spack/test/llnl/llnl_string.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/url.py b/lib/spack/spack/test/llnl/url.py index 8da8e727ec5587..1afee9c05cd342 100644 --- a/lib/spack/spack/test/llnl/url.py +++ b/lib/spack/spack/test/llnl/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/__init__.py b/lib/spack/spack/test/llnl/util/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/llnl/util/__init__.py +++ b/lib/spack/spack/test/llnl/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/argparsewriter.py b/lib/spack/spack/test/llnl/util/argparsewriter.py index 433833c6a21147..1ea1a8e90604f2 100644 --- a/lib/spack/spack/test/llnl/util/argparsewriter.py +++ b/lib/spack/spack/test/llnl/util/argparsewriter.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index 425ce641bd135d..75ba3ae89d9aca 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/filesystem.py b/lib/spack/spack/test/llnl/util/filesystem.py index eae5c732c6b302..e9c8b758d9af14 100644 --- a/lib/spack/spack/test/llnl/util/filesystem.py +++ b/lib/spack/spack/test/llnl/util/filesystem.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/lang.py b/lib/spack/spack/test/llnl/util/lang.py index 2cce9f155e4cf2..abf2c5b1346bd3 100644 --- a/lib/spack/spack/test/llnl/util/lang.py +++ b/lib/spack/spack/test/llnl/util/lang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -321,3 +321,18 @@ def inner(): """ ).format(__file__) ) + + +def test_grouped_exception_base_type(): + h = llnl.util.lang.GroupedExceptionHandler() + + with h.forward("catch-runtime-error", RuntimeError): + raise NotImplementedError() + + with pytest.raises(NotImplementedError): + with h.forward("catch-value-error", ValueError): + raise NotImplementedError() + + message = h.grouped_message(with_tracebacks=False) + assert "catch-runtime-error" in message + assert "catch-value-error" not in message diff --git a/lib/spack/spack/test/llnl/util/link_tree.py b/lib/spack/spack/test/llnl/util/link_tree.py index 9d154014b174c9..febad1d7736190 100644 --- a/lib/spack/spack/test/llnl/util/link_tree.py +++ b/lib/spack/spack/test/llnl/util/link_tree.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py index 9e7f3a3bde31b5..f7bf4503af7c25 100644 --- a/lib/spack/spack/test/llnl/util/lock.py +++ b/lib/spack/spack/test/llnl/util/lock.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,7 @@ mpirun -n 7 spack test lock And it will test locking correctness among MPI processes. Ideally, you -want the MPI processes to span across multiple nodes, so, e.g., for SLURM +want the MPI processes to span across multiple nodes, so, e.g., for Slurm you might do this:: srun -N 7 -n 7 -m cyclic spack test lock diff --git a/lib/spack/spack/test/llnl/util/symlink.py b/lib/spack/spack/test/llnl/util/symlink.py index bbc69473f86648..6e34c97fc4f142 100644 --- a/lib/spack/spack/test/llnl/util/symlink.py +++ b/lib/spack/spack/test/llnl/util/symlink.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/tty/__init__.py b/lib/spack/spack/test/llnl/util/tty/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/llnl/util/tty/__init__.py +++ b/lib/spack/spack/test/llnl/util/tty/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/tty/log.py b/lib/spack/spack/test/llnl/util/tty/log.py index 228c2f30448e06..b2f8cd8a9eb0f5 100644 --- a/lib/spack/spack/test/llnl/util/tty/log.py +++ b/lib/spack/spack/test/llnl/util/tty/log.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/llnl/util/tty/tty.py b/lib/spack/spack/test/llnl/util/tty/tty.py index ff65ce6594e578..ffbe2f07d606c0 100644 --- a/lib/spack/spack/test/llnl/util/tty/tty.py +++ b/lib/spack/spack/test/llnl/util/tty/tty.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/main.py b/lib/spack/spack/test/main.py index b4d831cec8e733..ed66df4c88d1fe 100644 --- a/lib/spack/spack/test/main.py +++ b/lib/spack/spack/test/main.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/make_executable.py b/lib/spack/spack/test/make_executable.py index 5716ca5a48dea8..0dd0109e90bff5 100644 --- a/lib/spack/spack/test/make_executable.py +++ b/lib/spack/spack/test/make_executable.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index 450a5b282ebc19..5e855be00aee43 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/module_parsing.py b/lib/spack/spack/test/module_parsing.py index 6ac41847211dee..568a9846b79508 100644 --- a/lib/spack/spack/test/module_parsing.py +++ b/lib/spack/spack/test/module_parsing.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/modules/__init__.py b/lib/spack/spack/test/modules/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/modules/__init__.py +++ b/lib/spack/spack/test/modules/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/modules/common.py b/lib/spack/spack/test/modules/common.py index 11b4305b4844df..7586728a8bc126 100644 --- a/lib/spack/spack/test/modules/common.py +++ b/lib/spack/spack/test/modules/common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,7 +17,10 @@ from spack.modules.common import UpstreamModuleIndex from spack.spec import Spec -pytestmark = pytest.mark.not_on_windows("does not run on windows") +pytestmark = [ + pytest.mark.not_on_windows("does not run on windows"), + pytest.mark.usefixtures("mock_modules_root"), +] def test_update_dictionary_extending_list(): @@ -174,6 +177,7 @@ def test_load_installed_package_not_in_repo(install_mockery, mock_fetch, monkeyp """Test that installed packages that have been removed are still loadable""" spec = Spec("trivial-install-test-package").concretized() spec.package.do_install() + spack.modules.module_types["tcl"](spec, "default", True).write() def find_nothing(*args): raise spack.repo.UnknownPackageError("Repo package access is disabled for test") diff --git a/lib/spack/spack/test/modules/conftest.py b/lib/spack/spack/test/modules/conftest.py index 210a88a65f8ad3..57396da426fb30 100644 --- a/lib/spack/spack/test/modules/conftest.py +++ b/lib/spack/spack/test/modules/conftest.py @@ -1,7 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 pathlib + import pytest import spack.config @@ -13,26 +15,15 @@ @pytest.fixture() def modulefile_content(request): - """Returns a function that generates the content of a module file - as a list of lines. - """ - + """Returns a function that generates the content of a module file as a list of lines.""" writer_cls = getattr(request.module, "writer_cls") def _impl(spec_str, module_set_name="default", explicit=True): - # Write the module file - spec = spack.spec.Spec(spec_str) - spec.concretize() + spec = spack.spec.Spec(spec_str).concretized() generator = writer_cls(spec, module_set_name, explicit) generator.write(overwrite=True) - - # Get its filename - filename = generator.layout.filename - - # Retrieve the content - with open(filename) as f: - content = f.readlines() - content = "".join(content).split("\n") + written_module = pathlib.Path(generator.layout.filename) + content = written_module.read_text().splitlines() generator.remove() return content @@ -40,27 +31,21 @@ def _impl(spec_str, module_set_name="default", explicit=True): @pytest.fixture() -def factory(request): - """Function that, given a spec string, returns an instance of the writer - and the corresponding spec. - """ - - # Class of the module file writer +def factory(request, mock_modules_root): + """Given a spec string, returns an instance of the writer and the corresponding spec.""" writer_cls = getattr(request.module, "writer_cls") def _mock(spec_string, module_set_name="default", explicit=True): - spec = spack.spec.Spec(spec_string) - spec.concretize() + spec = spack.spec.Spec(spec_string).concretized() return writer_cls(spec, module_set_name, explicit), spec return _mock @pytest.fixture() -def mock_module_filename(monkeypatch, tmpdir): - filename = str(tmpdir.join("module")) +def mock_module_filename(monkeypatch, tmp_path): + filename = tmp_path / "module" # Set for both module types so we can test both - monkeypatch.setattr(spack.modules.lmod.LmodFileLayout, "filename", filename) - monkeypatch.setattr(spack.modules.tcl.TclFileLayout, "filename", filename) - - yield filename + monkeypatch.setattr(spack.modules.lmod.LmodFileLayout, "filename", str(filename)) + monkeypatch.setattr(spack.modules.tcl.TclFileLayout, "filename", str(filename)) + yield str(filename) diff --git a/lib/spack/spack/test/modules/lmod.py b/lib/spack/spack/test/modules/lmod.py index ecb6ae6db80992..26224378b24f19 100644 --- a/lib/spack/spack/test/modules/lmod.py +++ b/lib/spack/spack/test/modules/lmod.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,10 @@ #: Class of the writer tested in this module writer_cls = spack.modules.lmod.LmodModulefileWriter -pytestmark = pytest.mark.not_on_windows("does not run on windows") +pytestmark = [ + pytest.mark.not_on_windows("does not run on windows"), + pytest.mark.usefixtures("mock_modules_root"), +] @pytest.fixture(params=["clang@=12.0.0", "gcc@=10.2.1"]) diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index b69a4482c27160..7821d631c76a50 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,10 @@ #: Class of the writer tested in this module writer_cls = spack.modules.tcl.TclModulefileWriter -pytestmark = pytest.mark.not_on_windows("does not run on windows") +pytestmark = [ + pytest.mark.not_on_windows("does not run on windows"), + pytest.mark.usefixtures("mock_modules_root"), +] @pytest.mark.usefixtures("config", "mock_packages", "mock_module_filename") @@ -285,7 +288,7 @@ def test_projections_all(self, factory, module_configuration): projection = writer.spec.format(writer.conf.projections["all"]) assert projection in writer.layout.use_name - def test_invalid_naming_scheme(self, factory, module_configuration, mock_module_filename): + def test_invalid_naming_scheme(self, factory, module_configuration): """Tests the evaluation of an invalid naming scheme.""" module_configuration("invalid_naming_scheme") @@ -296,7 +299,7 @@ def test_invalid_naming_scheme(self, factory, module_configuration, mock_module_ with pytest.raises(RuntimeError): writer.layout.use_name - def test_invalid_token_in_env_name(self, factory, module_configuration, mock_module_filename): + def test_invalid_token_in_env_name(self, factory, module_configuration): """Tests setting environment variables with an invalid name.""" module_configuration("invalid_token_in_env_var_name") diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py index 76e06ab3a7fa24..e4546c5139204f 100644 --- a/lib/spack/spack/test/multimethod.py +++ b/lib/spack/spack/test/multimethod.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/namespace_trie.py b/lib/spack/spack/test/namespace_trie.py index 39f7d3ca844cc6..6df74b461a8e10 100644 --- a/lib/spack/spack/test/namespace_trie.py +++ b/lib/spack/spack/test/namespace_trie.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/oci/image.py b/lib/spack/spack/test/oci/image.py index b074cc679af0a6..f16f519a147926 100644 --- a/lib/spack/spack/test/oci/image.py +++ b/lib/spack/spack/test/oci/image.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/oci/integration_test.py b/lib/spack/spack/test/oci/integration_test.py index b2f9366c3a5fbf..8129dd22cf2e4e 100644 --- a/lib/spack/spack/test/oci/integration_test.py +++ b/lib/spack/spack/test/oci/integration_test.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,15 +11,18 @@ import os from contextlib import contextmanager +import spack.environment as ev import spack.oci.opener -from spack.binary_distribution import gzip_compressed_tarfile from spack.main import SpackCommand from spack.oci.image import Digest, ImageReference, default_config, default_manifest from spack.oci.oci import blob_exists, get_manifest_and_config, upload_blob, upload_manifest from spack.test.oci.mock_registry import DummyServer, InMemoryOCIRegistry, create_opener +from spack.util.archive import gzip_compressed_tarfile buildcache = SpackCommand("buildcache") mirror = SpackCommand("mirror") +env = SpackCommand("env") +install = SpackCommand("install") @contextmanager @@ -53,6 +56,46 @@ def test_buildcache_push_command(mutable_database, disable_parallel_buildcache_p assert os.path.exists(os.path.join(spec.prefix, "bin", "mpileaks")) +def test_buildcache_tag( + install_mockery, mock_fetch, mutable_mock_env_path, disable_parallel_buildcache_push +): + """Tests whether we can create an OCI image from a full environment with multiple roots.""" + env("create", "test") + with ev.read("test"): + install("--add", "libelf") + install("--add", "trivial-install-test-package") + + registry = InMemoryOCIRegistry("example.com") + + with oci_servers(registry): + mirror("add", "oci-test", "oci://example.com/image") + + with ev.read("test"): + buildcache("push", "--tag", "full_env", "oci-test") + + name = ImageReference.from_string("example.com/image:full_env") + + with ev.read("test") as e: + specs = e.all_specs() + + manifest, config = get_manifest_and_config(name) + + # without a base image, we should have one layer per spec + assert len(manifest["layers"]) == len(specs) + + # Now create yet another tag, but with just a single selected spec as root. This should + # also test the case where Spack doesn't have to upload any binaries, it just has to create + # a new tag. + libelf = next(s for s in specs if s.name == "libelf") + with ev.read("test"): + # Get libelf spec + buildcache("push", "--tag", "single_spec", "oci-test", libelf.format("libelf{/hash}")) + + name = ImageReference.from_string("example.com/image:single_spec") + manifest, config = get_manifest_and_config(name) + assert len(manifest["layers"]) == 1 + + def test_buildcache_push_with_base_image_command( mutable_database, tmpdir, disable_parallel_buildcache_push ): diff --git a/lib/spack/spack/test/oci/mock_registry.py b/lib/spack/spack/test/oci/mock_registry.py index ec3e85c333ab7e..1bdf33a5d8bfe3 100644 --- a/lib/spack/spack/test/oci/mock_registry.py +++ b/lib/spack/spack/test/oci/mock_registry.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/oci/urlopen.py b/lib/spack/spack/test/oci/urlopen.py index 16efdfe12d9673..78d713f7e84af2 100644 --- a/lib/spack/spack/test/oci/urlopen.py +++ b/lib/spack/spack/test/oci/urlopen.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/operating_system.py b/lib/spack/spack/test/operating_system.py index 14b32c0db136a4..79c7e828dada2f 100644 --- a/lib/spack/spack/test/operating_system.py +++ b/lib/spack/spack/test/operating_system.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/optional_deps.py b/lib/spack/spack/test/optional_deps.py index e7a8676ab766a2..8d1c7e37e813ca 100644 --- a/lib/spack/spack/test/optional_deps.py +++ b/lib/spack/spack/test/optional_deps.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/package_class.py b/lib/spack/spack/test/package_class.py index 279693a529b81b..915a53400d2da7 100644 --- a/lib/spack/spack/test/package_class.py +++ b/lib/spack/spack/test/package_class.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -71,7 +71,8 @@ def test_possible_direct_dependencies(mock_packages, mpileaks_possible_deps): def test_possible_dependencies_virtual(mock_packages, mpi_names): expected = dict( - (name, set(spack.repo.PATH.get_pkg_class(name).dependencies)) for name in mpi_names + (name, set(dep for dep in spack.repo.PATH.get_pkg_class(name).dependencies_by_name())) + for name in mpi_names ) # only one mock MPI has a dependency @@ -268,12 +269,6 @@ def test_package_fetcher_fails(): pkg.fetcher -def test_package_no_extendees(): - s = spack.spec.Spec("a") - pkg = BaseTestPackage(s) - assert pkg.extendee_args is None - - def test_package_test_no_compilers(mock_packages, monkeypatch, capfd): def compilers(compiler, arch_spec): return None diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 4a5831dce707fc..f2507ee57e1a17 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -61,14 +61,15 @@ def test_import_package_as(self): import spack.pkg.builtin.mock.mpich as mp # noqa: F401 from spack.pkg.builtin import mock # noqa: F401 - def test_inheritance_of_diretives(self): + def test_inheritance_of_directives(self): pkg_cls = spack.repo.PATH.get_pkg_class("simple-inheritance") # Check dictionaries that should have been filled by directives - assert len(pkg_cls.dependencies) == 3 - assert "cmake" in pkg_cls.dependencies - assert "openblas" in pkg_cls.dependencies - assert "mpi" in pkg_cls.dependencies + dependencies = pkg_cls.dependencies_by_name() + assert len(dependencies) == 3 + assert "cmake" in dependencies + assert "openblas" in dependencies + assert "mpi" in dependencies assert len(pkg_cls.provided) == 2 # Check that Spec instantiation behaves as we expect diff --git a/lib/spack/spack/test/packaging.py b/lib/spack/spack/test/packaging.py index bd49cf94aee863..92ff4f6961d6d6 100644 --- a/lib/spack/spack/test/packaging.py +++ b/lib/spack/spack/test/packaging.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py index bfd918035b6ee2..e025994cced371 100644 --- a/lib/spack/spack/test/patch.py +++ b/lib/spack/spack/test/patch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -196,16 +196,18 @@ def test_nested_directives(mock_packages): # this ensures that results of dependency patches were properly added # to Dependency objects. - libelf_dep = next(iter(patcher.dependencies["libelf"].values())) + deps_by_name = patcher.dependencies_by_name() + + libelf_dep = deps_by_name["libelf"][0] assert len(libelf_dep.patches) == 1 assert len(libelf_dep.patches[Spec()]) == 1 - libdwarf_dep = next(iter(patcher.dependencies["libdwarf"].values())) + libdwarf_dep = deps_by_name["libdwarf"][0] assert len(libdwarf_dep.patches) == 2 assert len(libdwarf_dep.patches[Spec()]) == 1 assert len(libdwarf_dep.patches[Spec("@20111030")]) == 1 - fake_dep = next(iter(patcher.dependencies["fake"].values())) + fake_dep = deps_by_name["fake"][0] assert len(fake_dep.patches) == 1 assert len(fake_dep.patches[Spec()]) == 2 diff --git a/lib/spack/spack/test/pattern.py b/lib/spack/spack/test/pattern.py index ccf43c96f1b6de..e68c59429744c6 100644 --- a/lib/spack/spack/test/pattern.py +++ b/lib/spack/spack/test/pattern.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/permissions.py b/lib/spack/spack/test/permissions.py index 841595c516410b..606a2ed504a55e 100644 --- a/lib/spack/spack/test/permissions.py +++ b/lib/spack/spack/test/permissions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/provider_index.py b/lib/spack/spack/test/provider_index.py index d11c87f2c22233..9bc2298ce503b1 100644 --- a/lib/spack/spack/test/provider_index.py +++ b/lib/spack/spack/test/provider_index.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/relocate.py b/lib/spack/spack/test/relocate.py index cc09730a13c51c..6c8c0b1594c948 100644 --- a/lib/spack/spack/test/relocate.py +++ b/lib/spack/spack/test/relocate.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/relocate_text.py b/lib/spack/spack/test/relocate_text.py index a92497ce16f2bb..ead3dc2971a21f 100644 --- a/lib/spack/spack/test/relocate_text.py +++ b/lib/spack/spack/test/relocate_text.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/repo.py b/lib/spack/spack/test/repo.py index eb6b12391625aa..877b4af243ac50 100644 --- a/lib/spack/spack/test/repo.py +++ b/lib/spack/spack/test/repo.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/reporters.py b/lib/spack/spack/test/reporters.py index 4d3103f3e3d964..d1a78f6d7e4842 100644 --- a/lib/spack/spack/test/reporters.py +++ b/lib/spack/spack/test/reporters.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/rewiring.py b/lib/spack/spack/test/rewiring.py index 8c0286a2436416..f082b1b1539964 100644 --- a/lib/spack/spack/test/rewiring.py +++ b/lib/spack/spack/test/rewiring.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/s3_fetch.py b/lib/spack/spack/test/s3_fetch.py index 241d2648b504a2..66c4cd7bc4b15a 100644 --- a/lib/spack/spack/test/s3_fetch.py +++ b/lib/spack/spack/test/s3_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index 8f3396bb46180d..e409f49c61bdad 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/schema.py b/lib/spack/spack/test/schema.py index 916e61cf26c821..2bf18f9195f26d 100644 --- a/lib/spack/spack/test/schema.py +++ b/lib/spack/spack/test/schema.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/spack_yaml.py b/lib/spack/spack/test/spack_yaml.py index 168a5563236f71..4f3c035724ccd9 100644 --- a/lib/spack/spack/test/spack_yaml.py +++ b/lib/spack/spack/test/spack_yaml.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/spec_dag.py b/lib/spack/spack/test/spec_dag.py index 3a9c0350ae48a9..da85be6d1c7e90 100644 --- a/lib/spack/spack/test/spec_dag.py +++ b/lib/spack/spack/test/spec_dag.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -51,7 +51,7 @@ def _mock(pkg_name, spec): cond = Spec(pkg_cls.name) dependency = Dependency(pkg_cls, spec) - monkeypatch.setitem(pkg_cls.dependencies, spec.name, {cond: dependency}) + monkeypatch.setitem(pkg_cls.dependencies, cond, {spec.name: dependency}) return _mock @@ -322,7 +322,7 @@ def test_conflicting_spec_constraints(self): )[0].spec = Spec("mpich@2.0") with pytest.raises(spack.spec.InconsistentSpecError): - mpileaks.flat_dependencies(copy=False) + mpileaks.flat_dependencies() def test_normalize_twice(self): """Make sure normalize can be run twice on the same spec, diff --git a/lib/spack/spack/test/spec_list.py b/lib/spack/spack/test/spec_list.py index bd72f2fe4a4753..db31146df7cc9a 100644 --- a/lib/spack/spack/test/spec_list.py +++ b/lib/spack/spack/test/spec_list.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index 08caba1518ee88..d159bf744ae95e 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -1288,6 +1288,17 @@ def test_call_dag_hash_on_old_dag_hash_spec(mock_packages, default_mock_concreti spec.package_hash() +def test_spec_trim(mock_packages, config): + top = Spec("dt-diamond").concretized() + top.trim("dt-diamond-left") + remaining = set(x.name for x in top.traverse()) + assert set(["dt-diamond", "dt-diamond-right", "dt-diamond-bottom"]) == remaining + + top.trim("dt-diamond-right") + remaining = set(x.name for x in top.traverse()) + assert set(["dt-diamond"]) == remaining + + @pytest.mark.regression("30861") def test_concretize_partial_old_dag_hash_spec(mock_packages, config): # create an "old" spec with no package hash diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index 3cbb59e69f0af2..49f6de3b65ee58 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -1,7 +1,8 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 inspect import itertools import os import re @@ -9,6 +10,7 @@ import pytest +import spack.cmd import spack.platforms.test import spack.spec import spack.variant @@ -203,7 +205,8 @@ def _specfile_for(spec_str, filename): "mvapich_foo ^_openmpi@1.2:1.4,1.6%intel@12.1~qt_4 debug=2 ^stackwalker@8.1_1e", ), ( - "mvapich_foo ^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags=-O3 +debug~qt_4 ^stackwalker@8.1_1e", # noqa: E501 + "mvapich_foo ^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags=-O3 +debug~qt_4 " + "^stackwalker@8.1_1e", [ Token(TokenType.UNQUALIFIED_PACKAGE_NAME, value="mvapich_foo"), Token(TokenType.DEPENDENCY, value="^"), @@ -217,7 +220,8 @@ def _specfile_for(spec_str, filename): Token(TokenType.UNQUALIFIED_PACKAGE_NAME, value="stackwalker"), Token(TokenType.VERSION, value="@8.1_1e"), ], - 'mvapich_foo ^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags="-O3" +debug~qt_4 ^stackwalker@8.1_1e', # noqa: E501 + "mvapich_foo ^_openmpi@1.2:1.4,1.6%intel@12.1 cppflags=-O3 +debug~qt_4 " + "^stackwalker@8.1_1e", ), # Specs containing YAML or JSON in the package name ( @@ -424,7 +428,7 @@ def _specfile_for(spec_str, filename): compiler_with_version_range("%gcc@10.1.0,12.2.1:"), compiler_with_version_range("%gcc@:8.4.3,10.2.1:12.1.0"), # Special key value arguments - ("dev_path=*", [Token(TokenType.KEY_VALUE_PAIR, value="dev_path=*")], "dev_path=*"), + ("dev_path=*", [Token(TokenType.KEY_VALUE_PAIR, value="dev_path=*")], "dev_path='*'"), ( "dev_path=none", [Token(TokenType.KEY_VALUE_PAIR, value="dev_path=none")], @@ -444,33 +448,28 @@ def _specfile_for(spec_str, filename): ( "cflags=a=b=c", [Token(TokenType.KEY_VALUE_PAIR, value="cflags=a=b=c")], - 'cflags="a=b=c"', + "cflags='a=b=c'", ), ( "cflags=a=b=c", [Token(TokenType.KEY_VALUE_PAIR, value="cflags=a=b=c")], - 'cflags="a=b=c"', + "cflags='a=b=c'", ), ( "cflags=a=b=c+~", [Token(TokenType.KEY_VALUE_PAIR, value="cflags=a=b=c+~")], - 'cflags="a=b=c+~"', + "cflags='a=b=c+~'", ), ( "cflags=-Wl,a,b,c", [Token(TokenType.KEY_VALUE_PAIR, value="cflags=-Wl,a,b,c")], - 'cflags="-Wl,a,b,c"', + "cflags=-Wl,a,b,c", ), # Multi quoted - ( - "cflags=''-Wl,a,b,c''", - [Token(TokenType.KEY_VALUE_PAIR, value="cflags=''-Wl,a,b,c''")], - 'cflags="-Wl,a,b,c"', - ), ( 'cflags=="-O3 -g"', [Token(TokenType.PROPAGATED_KEY_VALUE_PAIR, value='cflags=="-O3 -g"')], - 'cflags=="-O3 -g"', + "cflags=='-O3 -g'", ), # Whitespace is allowed in version lists ("@1.2:1.4 , 1.6 ", [Token(TokenType.VERSION, value="@1.2:1.4 , 1.6")], "@1.2:1.4,1.6"), @@ -484,22 +483,6 @@ def _specfile_for(spec_str, filename): ], "a@1:", ), - ( - "@1.2: develop = foo", - [ - Token(TokenType.VERSION, value="@1.2:"), - Token(TokenType.KEY_VALUE_PAIR, value="develop = foo"), - ], - "@1.2: develop=foo", - ), - ( - "@1.2:develop = foo", - [ - Token(TokenType.VERSION, value="@1.2:"), - Token(TokenType.KEY_VALUE_PAIR, value="develop = foo"), - ], - "@1.2: develop=foo", - ), ( "% intel @ 12.1:12.6 + debug", [ @@ -540,6 +523,23 @@ def _specfile_for(spec_str, filename): ], "^[virtuals=mpi] openmpi", ), + # Allow merging attributes, if deptypes match + ( + "^[virtuals=mpi] openmpi+foo ^[virtuals=lapack] openmpi+bar", + [ + Token(TokenType.START_EDGE_PROPERTIES, value="^["), + Token(TokenType.KEY_VALUE_PAIR, value="virtuals=mpi"), + Token(TokenType.END_EDGE_PROPERTIES, value="]"), + Token(TokenType.UNQUALIFIED_PACKAGE_NAME, value="openmpi"), + Token(TokenType.BOOL_VARIANT, value="+foo"), + Token(TokenType.START_EDGE_PROPERTIES, value="^["), + Token(TokenType.KEY_VALUE_PAIR, value="virtuals=lapack"), + Token(TokenType.END_EDGE_PROPERTIES, value="]"), + Token(TokenType.UNQUALIFIED_PACKAGE_NAME, value="openmpi"), + Token(TokenType.BOOL_VARIANT, value="+bar"), + ], + "^[virtuals=lapack,mpi] openmpi+bar+foo", + ), ( "^[deptypes=link,build] zlib", [ @@ -587,8 +587,8 @@ def _specfile_for(spec_str, filename): ) def test_parse_single_spec(spec_str, tokens, expected_roundtrip): parser = SpecParser(spec_str) - assert parser.tokens() == tokens - assert str(parser.next_spec()) == expected_roundtrip + assert tokens == parser.tokens() + assert expected_roundtrip == str(parser.next_spec()) @pytest.mark.parametrize( @@ -654,20 +654,80 @@ def test_parse_multiple_specs(text, tokens, expected_specs): assert str(total_parser.next_spec()) == str(single_spec_parser.next_spec()) +@pytest.mark.parametrize( + "args,expected", + [ + # Test that CLI-quoted flags/variant values are preserved + (["zlib", "cflags=-O3 -g", "+bar", "baz"], "zlib cflags='-O3 -g' +bar baz"), + # Test that CLI-quoted propagated flags/variant values are preserved + (["zlib", "cflags==-O3 -g", "+bar", "baz"], "zlib cflags=='-O3 -g' +bar baz"), + # An entire string passed on the CLI with embedded quotes also works + (["zlib cflags='-O3 -g' +bar baz"], "zlib cflags='-O3 -g' +bar baz"), + # Entire string *without* quoted flags splits -O3/-g (-g interpreted as a variant) + (["zlib cflags=-O3 -g +bar baz"], "zlib cflags=-O3 +bar~g baz"), + # If the entirety of "-O3 -g +bar baz" is quoted on the CLI, it's all taken as flags + (["zlib", "cflags=-O3 -g +bar baz"], "zlib cflags='-O3 -g +bar baz'"), + # If the string doesn't start with key=, it needs internal quotes for flags + (["zlib", " cflags=-O3 -g +bar baz"], "zlib cflags=-O3 +bar~g baz"), + # Internal quotes for quoted CLI args are considered part of *one* arg + (["zlib", 'cflags="-O3 -g" +bar baz'], """zlib cflags='"-O3 -g" +bar baz'"""), + # Use double quotes if internal single quotes are present + (["zlib", "cflags='-O3 -g' +bar baz"], '''zlib cflags="'-O3 -g' +bar baz"'''), + # Use single quotes and escape single quotes with internal single and double quotes + (["zlib", "cflags='-O3 -g' \"+bar baz\""], 'zlib cflags="\'-O3 -g\' \\"+bar baz\\""'), + # Ensure that empty strings are handled correctly on CLI + (["zlib", "ldflags=", "+pic"], "zlib+pic"), + # These flags are assumed to be quoted by the shell, but the space doesn't matter because + # flags are space-separated. + (["zlib", "ldflags= +pic"], "zlib ldflags='+pic'"), + (["ldflags= +pic"], "ldflags='+pic'"), + # If the name is not a flag name, the space is preserved verbatim, because variant values + # are comma-separated. + (["zlib", "foo= +pic"], "zlib foo=' +pic'"), + (["foo= +pic"], "foo=' +pic'"), + # You can ensure no quotes are added parse_specs() by starting your string with space, + # but you still need to quote empty strings properly. + ([" ldflags= +pic"], SpecTokenizationError), + ([" ldflags=", "+pic"], SpecTokenizationError), + ([" ldflags='' +pic"], "+pic"), + ([" ldflags=''", "+pic"], "+pic"), + # Ensure that empty strings are handled properly in quoted strings + (["zlib ldflags='' +pic"], "zlib+pic"), + # Ensure that $ORIGIN is handled correctly + (["zlib", "ldflags=-Wl,-rpath=$ORIGIN/_libs"], "zlib ldflags='-Wl,-rpath=$ORIGIN/_libs'"), + # Ensure that passing escaped quotes on the CLI raises a tokenization error + (["zlib", '"-g', '-O2"'], SpecTokenizationError), + ], +) +def test_cli_spec_roundtrip(args, expected): + if inspect.isclass(expected) and issubclass(expected, BaseException): + with pytest.raises(expected): + spack.cmd.parse_specs(args) + return + + specs = spack.cmd.parse_specs(args) + output_string = " ".join(str(spec) for spec in specs) + assert expected == output_string + + @pytest.mark.parametrize( "text,expected_in_error", [ - ("x@@1.2", "x@@1.2\n ^^^^^"), - ("y ^x@@1.2", "y ^x@@1.2\n ^^^^^"), - ("x@1.2::", "x@1.2::\n ^"), - ("x::", "x::\n ^^"), + ("x@@1.2", r"x@@1.2\n ^"), + ("y ^x@@1.2", r"y ^x@@1.2\n ^"), + ("x@1.2::", r"x@1.2::\n ^"), + ("x::", r"x::\n ^^"), + ("cflags=''-Wl,a,b,c''", r"cflags=''-Wl,a,b,c''\n ^ ^ ^ ^^"), + ("@1.2: develop = foo", r"@1.2: develop = foo\n ^^"), + ("@1.2:develop = foo", r"@1.2:develop = foo\n ^^"), ], ) def test_error_reporting(text, expected_in_error): parser = SpecParser(text) with pytest.raises(SpecTokenizationError) as exc: parser.tokens() - assert expected_in_error in str(exc), parser.tokens() + + assert expected_in_error in str(exc), parser.tokens() @pytest.mark.parametrize( diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py index b19bb4308f9489..5dd854628af9ad 100644 --- a/lib/spack/spack/test/spec_yaml.py +++ b/lib/spack/spack/test/spec_yaml.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/stage.py b/lib/spack/spack/test/stage.py index 8b2b53dd05054a..f6bd267090ede0 100644 --- a/lib/spack/spack/test/stage.py +++ b/lib/spack/spack/test/stage.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/svn_fetch.py b/lib/spack/spack/test/svn_fetch.py index e6b1fbba8354d8..0b3750001431c1 100644 --- a/lib/spack/spack/test/svn_fetch.py +++ b/lib/spack/spack/test/svn_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/tag.py b/lib/spack/spack/test/tag.py index ae950002588a2e..1f5affc549cadc 100644 --- a/lib/spack/spack/test/tag.py +++ b/lib/spack/spack/test/tag.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/tengine.py b/lib/spack/spack/test/tengine.py index 20ca6f0fd78f02..aa7fdac9d2c367 100644 --- a/lib/spack/spack/test/tengine.py +++ b/lib/spack/spack/test/tengine.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/test_suite.py b/lib/spack/spack/test/test_suite.py index cf7d32322ee07a..6af98b6f2f1bc3 100644 --- a/lib/spack/spack/test/test_suite.py +++ b/lib/spack/spack/test/test_suite.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/traverse.py b/lib/spack/spack/test/traverse.py index 482103e83c092c..8e440f93fb5804 100644 --- a/lib/spack/spack/test/traverse.py +++ b/lib/spack/spack/test/traverse.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/url_fetch.py b/lib/spack/spack/test/url_fetch.py index a3c0f7c10b5ede..406344ebfb8863 100644 --- a/lib/spack/spack/test/url_fetch.py +++ b/lib/spack/spack/test/url_fetch.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index dd094ed230b908..2a3e3e7e727617 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/url_substitution.py b/lib/spack/spack/test/url_substitution.py index c4133a3d90fec1..863afad2ea4dd4 100644 --- a/lib/spack/spack/test/url_substitution.py +++ b/lib/spack/spack/test/url_substitution.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/__init__.py b/lib/spack/spack/test/util/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/test/util/__init__.py +++ b/lib/spack/spack/test/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/archive.py b/lib/spack/spack/test/util/archive.py new file mode 100644 index 00000000000000..9688f25924da55 --- /dev/null +++ b/lib/spack/spack/test/util/archive.py @@ -0,0 +1,157 @@ +# 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 gzip +import hashlib +import os +import shutil +import tarfile +from pathlib import Path, PurePath + +import spack.util.crypto +from spack.util.archive import gzip_compressed_tarfile, reproducible_tarfile_from_prefix + + +def test_gzip_compressed_tarball_is_reproducible(tmpdir): + """Test gzip_compressed_tarfile and reproducible_tarfile_from_prefix for reproducibility""" + + with tmpdir.as_cwd(): + # Create a few directories + root = Path("root") + dir_a = root / "a" + dir_b = root / "b" + root.mkdir(mode=0o777) + dir_a.mkdir(mode=0o777) + dir_b.mkdir(mode=0o777) + + (root / "y").touch() + (root / "x").touch() + + (dir_a / "executable").touch(mode=0o777) + (dir_a / "data").touch(mode=0o666) + (dir_a / "symlink_file").symlink_to("data") + (dir_a / "symlink_dir").symlink_to(PurePath("..", "b")) + try: + os.link(dir_a / "executable", dir_a / "hardlink") + hardlink_support = True + except OSError: + hardlink_support = False + + (dir_b / "executable").touch(mode=0o777) + (dir_b / "data").touch(mode=0o666) + (dir_b / "symlink_file").symlink_to("data") + (dir_b / "symlink_dir").symlink_to(PurePath("..", "a")) + + # Create the first tarball + with gzip_compressed_tarfile("fst.tar.gz") as (tar, gzip_checksum_1, tarfile_checksum_1): + reproducible_tarfile_from_prefix(tar, "root") + + # Expected mode for non-dirs is 644 if not executable, 755 if executable. Better to compute + # that as we don't know the umask of the user running the test. + expected_mode = ( + lambda name: 0o755 if Path(*name.split("/")).lstat().st_mode & 0o100 else 0o644 + ) + + # Verify the tarball contents + with tarfile.open("fst.tar.gz", "r:gz") as tar: + # Directories (mode is always 755) + for dir in ("root", "root/a", "root/b"): + m = tar.getmember(dir) + assert m.isdir() + assert m.mode == 0o755 + assert m.uid == m.gid == 0 + assert m.uname == m.gname == "" + + # Non-executable regular files + for file in ( + "root/x", + "root/y", + "root/a/data", + "root/b/data", + "root/a/executable", + "root/b/executable", + ): + m = tar.getmember(file) + assert m.isreg() + assert m.mode == expected_mode(file) + assert m.uid == m.gid == 0 + assert m.uname == m.gname == "" + + # Symlinks + for file in ( + "root/a/symlink_file", + "root/a/symlink_dir", + "root/b/symlink_file", + "root/b/symlink_dir", + ): + m = tar.getmember(file) + assert m.issym() + assert m.mode == 0o755 + assert m.uid == m.gid == m.mtime == 0 + assert m.uname == m.gname == "" + + # Verify the symlink targets. Notice that symlink targets are copied verbatim. That + # means the value is platform specific for relative symlinks within the current prefix, + # as on Windows they'd be ..\a and ..\b instead of ../a and ../b. So, reproducilility + # is only guaranteed per-platform currently. + assert PurePath(tar.getmember("root/a/symlink_file").linkname) == PurePath("data") + assert PurePath(tar.getmember("root/b/symlink_file").linkname) == PurePath("data") + assert PurePath(tar.getmember("root/a/symlink_dir").linkname) == PurePath("..", "b") + assert PurePath(tar.getmember("root/b/symlink_dir").linkname) == PurePath("..", "a") + + # Check hardlink if supported + if hardlink_support: + m = tar.getmember("root/a/hardlink") + assert m.islnk() + assert m.mode == expected_mode("root/a/hardlink") + assert m.uid == m.gid == 0 + assert m.uname == m.gname == "" + # Hardlink targets are always in posix format, as they reference a file that exists + # in the tarball. + assert m.linkname == "root/a/executable" + + # Finally verify if entries are ordered by (is_dir, name) + assert [t.name for t in tar.getmembers()] == [ + "root", + "root/x", + "root/y", + "root/a", + "root/a/data", + "root/a/executable", + *(["root/a/hardlink"] if hardlink_support else []), + "root/a/symlink_dir", + "root/a/symlink_file", + "root/b", + "root/b/data", + "root/b/executable", + "root/b/symlink_dir", + "root/b/symlink_file", + ] + + # Delete the current root dir, extract the first tarball, create a second + shutil.rmtree(root) + with tarfile.open("fst.tar.gz", "r:gz") as tar: + tar.extractall() + + # Create the second tarball + with gzip_compressed_tarfile("snd.tar.gz") as (tar, gzip_checksum_2, tarfile_checksum_2): + reproducible_tarfile_from_prefix(tar, "root") + + # Verify the .tar.gz checksums are identical and correct + assert ( + gzip_checksum_1.hexdigest() + == gzip_checksum_2.hexdigest() + == spack.util.crypto.checksum(hashlib.sha256, "fst.tar.gz") + == spack.util.crypto.checksum(hashlib.sha256, "snd.tar.gz") + ) + + # Verify the .tar checksums are identical and correct + with gzip.open("fst.tar.gz", "rb") as f, gzip.open("snd.tar.gz", "rb") as g: + assert ( + tarfile_checksum_1.hexdigest() + == tarfile_checksum_2.hexdigest() + == spack.util.crypto.checksum_stream(hashlib.sha256, f) + == spack.util.crypto.checksum_stream(hashlib.sha256, g) + ) diff --git a/lib/spack/spack/test/util/compression.py b/lib/spack/spack/test/util/compression.py index 29007a7e333ff5..b3f5c15861466c 100644 --- a/lib/spack/spack/test/util/compression.py +++ b/lib/spack/spack/test/util/compression.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/editor.py b/lib/spack/spack/test/util/editor.py index 7365bd4e4d6295..ce54bf939ae24d 100644 --- a/lib/spack/spack/test/util/editor.py +++ b/lib/spack/spack/test/util/editor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/elf.py b/lib/spack/spack/test/util/elf.py index db826df1730fab..b337c00073ea33 100644 --- a/lib/spack/spack/test/util/elf.py +++ b/lib/spack/spack/test/util/elf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/environment.py b/lib/spack/spack/test/util/environment.py index 21fbf4ebe62f01..ef7c151fee1a0c 100644 --- a/lib/spack/spack/test/util/environment.py +++ b/lib/spack/spack/test/util/environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/executable.py b/lib/spack/spack/test/util/executable.py index 9c49445aab2fcc..d854ec426e2ddc 100644 --- a/lib/spack/spack/test/util/executable.py +++ b/lib/spack/spack/test/util/executable.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/file_cache.py b/lib/spack/spack/test/util/file_cache.py index a26d688728b8f2..cd9ce1c5b8defb 100644 --- a/lib/spack/spack/test/util/file_cache.py +++ b/lib/spack/spack/test/util/file_cache.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/ld_so_conf.py b/lib/spack/spack/test/util/ld_so_conf.py index ceb24e25537ad0..b4352191a62eb7 100644 --- a/lib/spack/spack/test/util/ld_so_conf.py +++ b/lib/spack/spack/test/util/ld_so_conf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/log_parser.py b/lib/spack/spack/test/util/log_parser.py index 8d96b21afeba0d..8626b74c2f5dbf 100644 --- a/lib/spack/spack/test/util/log_parser.py +++ b/lib/spack/spack/test/util/log_parser.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/package_hash.py b/lib/spack/spack/test/util/package_hash.py index 047f5df09e0f75..b613c6630d91eb 100644 --- a/lib/spack/spack/test/util/package_hash.py +++ b/lib/spack/spack/test/util/package_hash.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/path.py b/lib/spack/spack/test/util/path.py index db9fcce53fcb41..9d7f66c60b323a 100644 --- a/lib/spack/spack/test/util/path.py +++ b/lib/spack/spack/test/util/path.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/prefix.py b/lib/spack/spack/test/util/prefix.py index 58133c64433256..a50ed7e31c7210 100644 --- a/lib/spack/spack/test/util/prefix.py +++ b/lib/spack/spack/test/util/prefix.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/spack_lock_wrapper.py b/lib/spack/spack/test/util/spack_lock_wrapper.py index 0909ce06c339c8..9838324a03ef19 100644 --- a/lib/spack/spack/test/util/spack_lock_wrapper.py +++ b/lib/spack/spack/test/util/spack_lock_wrapper.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/spack_yaml.py b/lib/spack/spack/test/util/spack_yaml.py index f7c8851d27194c..d89af309b39c48 100644 --- a/lib/spack/spack/test/util/spack_yaml.py +++ b/lib/spack/spack/test/util/spack_yaml.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/timer.py b/lib/spack/spack/test/util/timer.py index 199b9355a7f4a7..1b584576f07731 100644 --- a/lib/spack/spack/test/util/timer.py +++ b/lib/spack/spack/test/util/timer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/util_gpg.py b/lib/spack/spack/test/util/util_gpg.py index 242d9fb94805d1..8d09bc8b070bbb 100644 --- a/lib/spack/spack/test/util/util_gpg.py +++ b/lib/spack/spack/test/util/util_gpg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/util/util_url.py b/lib/spack/spack/test/util/util_url.py index ec8f60627ab881..e2b403f82e2f29 100644 --- a/lib/spack/spack/test/util/util_url.py +++ b/lib/spack/spack/test/util/util_url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/variant.py b/lib/spack/spack/test/variant.py index 517197654cfef8..0dad484ed9d017 100644 --- a/lib/spack/spack/test/variant.py +++ b/lib/spack/spack/test/variant.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -734,3 +734,40 @@ def test_conditional_value_comparable_to_bool(other): value = spack.variant.Value("98", when="@1.0") comparison = value == other assert comparison is False + + +@pytest.mark.regression("40405") +def test_wild_card_valued_variants_equivalent_to_str(): + """ + There was a bug prioro to PR 40406 in that variants with wildcard values "*" + were being overwritten in the variant constructor. + The expected/appropriate behavior is for it to behave like value=str and this + test demonstrates that the two are now equivalent + """ + str_var = spack.variant.Variant( + name="str_var", + default="none", + values=str, + description="str variant", + multi=True, + validator=None, + ) + + wild_var = spack.variant.Variant( + name="wild_var", + default="none", + values="*", + description="* variant", + multi=True, + validator=None, + ) + + several_arbitrary_values = ("doe", "re", "mi") + # "*" case + wild_output = wild_var.make_variant(several_arbitrary_values) + wild_var.validate_or_raise(wild_output) + # str case + str_output = str_var.make_variant(several_arbitrary_values) + str_var.validate_or_raise(str_output) + # equivalence each instance already validated + assert str_output.value == wild_output.value diff --git a/lib/spack/spack/test/verification.py b/lib/spack/spack/test/verification.py index 9b5de54e4e8480..0cc99a70b947fd 100644 --- a/lib/spack/spack/test/verification.py +++ b/lib/spack/spack/test/verification.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/versions.py b/lib/spack/spack/test/versions.py index 50fcc197986353..6ee18d76b00814 100644 --- a/lib/spack/spack/test/versions.py +++ b/lib/spack/spack/test/versions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/views.py b/lib/spack/spack/test/views.py index 4df1da7e4080fc..68fb286f9c24c7 100644 --- a/lib/spack/spack/test/views.py +++ b/lib/spack/spack/test/views.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/test/web.py b/lib/spack/spack/test/web.py index ed4f693c5a539f..b7312e21866777 100644 --- a/lib/spack/spack/test/web.py +++ b/lib/spack/spack/test/web.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/traverse.py b/lib/spack/spack/traverse.py index 580e4877240569..3ac2bfe24cf672 100644 --- a/lib/spack/spack/traverse.py +++ b/lib/spack/spack/traverse.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -251,7 +251,7 @@ def traverse_depth_first_edges_generator(edges, visitor, post_order=False, root= neighbors = [EdgeAndDepth(edge=n, depth=edge.depth + 1) for n in visitor.neighbors(edge)] # This extra branch is just for efficiency. - if len(neighbors) >= 0: + if len(neighbors) > 0: for item in traverse_depth_first_edges_generator( neighbors, visitor, post_order, root, depth ): diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 460c42a1af2add..e9f89b02f16ba3 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,7 @@ import os import pathlib import re +from typing import Any, Dict, Optional, Sequence, Union import llnl.url from llnl.path import convert_to_posix_path @@ -284,20 +285,19 @@ def parse_version_offset(path): raise UndetectableVersionError(original_path) -def parse_version(path): +def parse_version(path: str) -> spack.version.StandardVersion: """Try to extract a version string from a filename or URL. Args: - path (str): The filename or URL for the package + path: The filename or URL for the package - Returns: - spack.version.Version: The version of the package + Returns: The version of the package Raises: UndetectableVersionError: If the URL does not match any regexes """ version, start, length, i, regex = parse_version_offset(path) - return spack.version.Version(version) + return spack.version.StandardVersion.from_string(version) def parse_name_offset(path, v=None): @@ -604,8 +604,12 @@ def color_url(path, **kwargs): def find_versions_of_archive( - archive_urls, list_url=None, list_depth=0, concurrency=32, reference_package=None -): + archive_urls: Union[str, Sequence[str]], + list_url: Optional[str] = None, + list_depth: int = 0, + concurrency: Optional[int] = 32, + reference_package: Optional[Any] = None, +) -> Dict[spack.version.StandardVersion, str]: """Scrape web pages for new versions of a tarball. This function prefers URLs in the following order: links found on the scraped page that match a url generated by the reference package, found and in the archive_urls list, found and derived from those @@ -613,22 +617,18 @@ def find_versions_of_archive( archive_urls list is included for the version. Args: - archive_urls (str or list or tuple): URL or sequence of URLs for - different versions of a package. Typically these are just the - tarballs from the package file itself. By default, this searches - the parent directories of archives. - list_url (str or None): URL for a listing of archives. - Spack will scrape these pages for download links that look - like the archive URL. - list_depth (int): max depth to follow links on list_url pages. - Defaults to 0. - concurrency (int): maximum number of concurrent requests - reference_package (spack.package_base.PackageBase or None): a spack package - used as a reference for url detection. Uses the url_for_version - method on the package to produce reference urls which, if found, - are preferred. + archive_urls: URL or sequence of URLs for different versions of a package. Typically these + are just the tarballs from the package file itself. By default, this searches the + parent directories of archives. + list_url: URL for a listing of archives. Spack will scrape these pages for download links + that look like the archive URL. + list_depth: max depth to follow links on list_url pages. Defaults to 0. + concurrency: maximum number of concurrent requests + reference_package: a spack package used as a reference for url detection. Uses the + url_for_version method on the package to produce reference urls which, if found, are + preferred. """ - if not isinstance(archive_urls, (list, tuple)): + if isinstance(archive_urls, str): archive_urls = [archive_urls] # Generate a list of list_urls based on archive urls and any @@ -689,7 +689,7 @@ def find_versions_of_archive( # Build a dict version -> URL from any links that match the wildcards. # Walk through archive_url links first. # Any conflicting versions will be overwritten by the list_url links. - versions = {} + versions: Dict[spack.version.StandardVersion, str] = {} matched = set() for url in sorted(links): url = convert_to_posix_path(url) diff --git a/lib/spack/spack/user_environment.py b/lib/spack/spack/user_environment.py index 6e1c798e51dc1c..756b7c09a2f429 100644 --- a/lib/spack/spack/user_environment.py +++ b/lib/spack/spack/user_environment.py @@ -1,20 +1,16 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import re import sys -from contextlib import contextmanager -from typing import Callable - -from llnl.util.lang import nullcontext import spack.build_environment import spack.config import spack.error import spack.spec import spack.util.environment as environment -import spack.util.prefix as prefix from spack import traverse from spack.context import Context @@ -70,20 +66,18 @@ def unconditional_environment_modifications(view): return env -@contextmanager -def projected_prefix(*specs: spack.spec.Spec, projection: Callable[[spack.spec.Spec], str]): - """Temporarily replace every Spec's prefix with projection(s)""" - prefixes = dict() - for s in traverse.traverse_nodes(specs, key=lambda s: s.dag_hash()): - if s.external: - continue - prefixes[s.dag_hash()] = s.prefix - s.prefix = prefix.Prefix(projection(s)) - - yield - - for s in traverse.traverse_nodes(specs, key=lambda s: s.dag_hash()): - s.prefix = prefixes.get(s.dag_hash(), s.prefix) +def project_env_mods( + *specs: spack.spec.Spec, view, env: environment.EnvironmentModifications +) -> None: + """Given a list of environment modifications, project paths changes to the view.""" + prefix_to_prefix = {s.prefix: view.get_projection_for_spec(s) for s in specs if not s.external} + # Avoid empty regex if all external + if not prefix_to_prefix: + return + prefix_regex = re.compile("|".join(re.escape(p) for p in prefix_to_prefix.keys())) + for mod in env.env_modifications: + if isinstance(mod, environment.NameValueModifier): + mod.value = prefix_regex.sub(lambda m: prefix_to_prefix[m.group(0)], mod.value) def environment_modifications_for_specs( @@ -102,26 +96,25 @@ def environment_modifications_for_specs( been built on a different but compatible OS) """ env = environment.EnvironmentModifications() - topo_ordered = traverse.traverse_nodes(specs, root=True, deptype=("run", "link"), order="topo") - + topo_ordered = list( + traverse.traverse_nodes(specs, root=True, deptype=("run", "link"), order="topo") + ) + + # Static environment changes (prefix inspections) + for s in reversed(topo_ordered): + static = environment.inspect_path( + s.prefix, prefix_inspections(s.platform), exclude=environment.is_system_path + ) + env.extend(static) + + # Dynamic environment changes (setup_run_environment etc) + setup_context = spack.build_environment.SetupContext(*specs, context=Context.RUN) + if set_package_py_globals: + setup_context.set_all_package_py_globals() + env.extend(setup_context.get_env_modifications()) + + # Apply view projections if any. if view: - maybe_projected = projected_prefix(*specs, projection=view.get_projection_for_spec) - else: - maybe_projected = nullcontext() - - with maybe_projected: - # Static environment changes (prefix inspections) - for s in reversed(list(topo_ordered)): - static = environment.inspect_path( - s.prefix, prefix_inspections(s.platform), exclude=environment.is_system_path - ) - env.extend(static) - - # Dynamic environment changes (setup_run_environment etc) - setup_context = spack.build_environment.SetupContext(*specs, context=Context.RUN) - if set_package_py_globals: - setup_context.set_all_package_py_globals() - dynamic = setup_context.get_env_modifications() - env.extend(dynamic) + project_env_mods(*topo_ordered, view=view, env=env) return env diff --git a/lib/spack/spack/util/__init__.py b/lib/spack/spack/util/__init__.py index af304aecb70f37..64a29a769cea89 100644 --- a/lib/spack/spack/util/__init__.py +++ b/lib/spack/spack/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/archive.py b/lib/spack/spack/util/archive.py new file mode 100644 index 00000000000000..8bde40017cba4d --- /dev/null +++ b/lib/spack/spack/util/archive.py @@ -0,0 +1,228 @@ +# 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 errno +import hashlib +import io +import os +import pathlib +import tarfile +from contextlib import closing, contextmanager +from gzip import GzipFile +from typing import Callable, Dict, Tuple + + +class ChecksumWriter(io.BufferedIOBase): + """Checksum writer computes a checksum while writing to a file.""" + + myfileobj = None + + def __init__(self, fileobj, algorithm=hashlib.sha256): + self.fileobj = fileobj + self.hasher = algorithm() + self.length = 0 + + def hexdigest(self): + return self.hasher.hexdigest() + + def write(self, data): + if isinstance(data, (bytes, bytearray)): + length = len(data) + else: + data = memoryview(data) + length = data.nbytes + + if length > 0: + self.fileobj.write(data) + self.hasher.update(data) + + self.length += length + + return length + + def read(self, size=-1): + raise OSError(errno.EBADF, "read() on write-only object") + + def read1(self, size=-1): + raise OSError(errno.EBADF, "read1() on write-only object") + + def peek(self, n): + raise OSError(errno.EBADF, "peek() on write-only object") + + @property + def closed(self): + return self.fileobj is None + + def close(self): + fileobj = self.fileobj + if fileobj is None: + return + self.fileobj.close() + self.fileobj = None + + def flush(self): + self.fileobj.flush() + + def fileno(self): + return self.fileobj.fileno() + + def rewind(self): + raise OSError("Can't rewind while computing checksum") + + def readable(self): + return False + + def writable(self): + return True + + def seekable(self): + return True + + def tell(self): + return self.fileobj.tell() + + def seek(self, offset, whence=io.SEEK_SET): + # In principle forward seek is possible with b"0" padding, + # but this is not implemented. + if offset == 0 and whence == io.SEEK_CUR: + return + raise OSError("Can't seek while computing checksum") + + def readline(self, size=-1): + raise OSError(errno.EBADF, "readline() on write-only object") + + +@contextmanager +def gzip_compressed_tarfile(path): + """Create a reproducible, gzip compressed tarfile, and keep track of shasums of both the + compressed and uncompressed tarfile. Reproduciblity is achived by normalizing the gzip header + (no file name and zero mtime). + + Yields a tuple of the following: + tarfile.TarFile: tarfile object + ChecksumWriter: checksum of the gzip compressed tarfile + ChecksumWriter: checksum of the uncompressed tarfile + """ + # Create gzip compressed tarball of the install prefix + # 1) Use explicit empty filename and mtime 0 for gzip header reproducibility. + # If the filename="" is dropped, Python will use fileobj.name instead. + # This should effectively mimick `gzip --no-name`. + # 2) On AMD Ryzen 3700X and an SSD disk, we have the following on compression speed: + # compresslevel=6 gzip default: llvm takes 4mins, roughly 2.1GB + # compresslevel=9 python default: llvm takes 12mins, roughly 2.1GB + # So we follow gzip. + with open(path, "wb") as f, ChecksumWriter(f) as gzip_checksum, closing( + GzipFile(filename="", mode="wb", compresslevel=6, mtime=0, fileobj=gzip_checksum) + ) as gzip_file, ChecksumWriter(gzip_file) as tarfile_checksum, tarfile.TarFile( + name="", mode="w", fileobj=tarfile_checksum + ) as tar: + yield tar, gzip_checksum, tarfile_checksum + + +def default_path_to_name(path: str) -> str: + """Converts a path to a tarfile name, which uses posix path separators.""" + p = pathlib.PurePath(path) + # Drop the leading slash on posix and the drive letter on windows, and always format as a + # posix path. + return pathlib.PurePath(*p.parts[1:]).as_posix() if p.is_absolute() else p.as_posix() + + +def reproducible_tarfile_from_prefix( + tar: tarfile.TarFile, + prefix: str, + *, + include_parent_directories: bool = False, + skip: Callable[[os.DirEntry], bool] = lambda entry: False, + path_to_name: Callable[[str], str] = default_path_to_name, +) -> None: + """Create a tarball from a given directory. Only adds regular files, symlinks and dirs. + Skips devices, fifos. Preserves hardlinks. Normalizes permissions like git. Tar entries are + added in depth-first pre-order, with dir entries partitioned by file | dir, and sorted + lexicographically, for reproducibility. Partitioning ensures only one dir is in memory at a + time, and sorting improves compression. + + Args: + tar: tarfile object opened in write mode + prefix: path to directory to tar (either absolute or relative) + include_parent_directories: whether to include every directory leading up to ``prefix`` in + the tarball + skip: function that receives a DirEntry and returns True if the entry should be skipped, + whether it is a file or directory. Default implementation does not skip anything. + path_to_name: function that converts a path string to a tarfile entry name, which should be + in posix format. Not only is it necessary to transform paths in certain cases, such as + windows path to posix format, but it can also be used to prepend a directory to each + entry even if it does not exist on the filesystem. The default implementation drops the + leading slash on posix and the drive letter on windows for absolute paths, and formats + as a posix.""" + + hardlink_to_tarinfo_name: Dict[Tuple[int, int], str] = dict() + + if include_parent_directories: + parent_dirs = reversed(pathlib.Path(prefix).parents) + next(parent_dirs) # skip the root: slices are supported from python 3.10 + for parent_dir in parent_dirs: + dir_info = tarfile.TarInfo(path_to_name(str(parent_dir))) + dir_info.type = tarfile.DIRTYPE + dir_info.mode = 0o755 + tar.addfile(dir_info) + + dir_stack = [prefix] + while dir_stack: + dir = dir_stack.pop() + + # Add the dir before its contents + dir_info = tarfile.TarInfo(path_to_name(dir)) + dir_info.type = tarfile.DIRTYPE + dir_info.mode = 0o755 + tar.addfile(dir_info) + + # Sort by name: reproducible & improves compression + with os.scandir(dir) as it: + entries = sorted(it, key=lambda entry: entry.name) + + new_dirs = [] + for entry in entries: + if skip(entry): + continue + + if entry.is_dir(follow_symlinks=False): + new_dirs.append(entry.path) + continue + + file_info = tarfile.TarInfo(path_to_name(entry.path)) + + if entry.is_symlink(): + file_info.type = tarfile.SYMTYPE + file_info.linkname = os.readlink(entry.path) + # According to POSIX: "the value of the file mode bits returned in the + # st_mode field of the stat structure is unspecified." So we set it to + # something sensible without lstat'ing the link. + file_info.mode = 0o755 + tar.addfile(file_info) + + elif entry.is_file(follow_symlinks=False): + # entry.stat has zero (st_ino, st_dev, st_nlink) on Windows: use lstat. + s = os.lstat(entry.path) + + # Normalize permissions like git + file_info.mode = 0o755 if s.st_mode & 0o100 else 0o644 + + # Deduplicate hardlinks + if s.st_nlink > 1: + ident = (s.st_dev, s.st_ino) + if ident in hardlink_to_tarinfo_name: + file_info.type = tarfile.LNKTYPE + file_info.linkname = hardlink_to_tarinfo_name[ident] + tar.addfile(file_info) + continue + hardlink_to_tarinfo_name[ident] = file_info.name + + # If file not yet seen, copy it + file_info.type = tarfile.REGTYPE + file_info.size = s.st_size + + with open(entry.path, "rb") as f: + tar.addfile(file_info, f) + + dir_stack.extend(reversed(new_dirs)) # we pop, so reverse to stay alphabetical diff --git a/lib/spack/spack/util/classes.py b/lib/spack/spack/util/classes.py index 05af353601bf68..5e0b373ef8d2c3 100644 --- a/lib/spack/spack/util/classes.py +++ b/lib/spack/spack/util/classes.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index 25ccfdf0bbcc05..1e66b3e205db83 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/cpus.py b/lib/spack/spack/util/cpus.py index b8b371ebb088f2..9c98656830d338 100644 --- a/lib/spack/spack/util/cpus.py +++ b/lib/spack/spack/util/cpus.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/crypto.py b/lib/spack/spack/util/crypto.py index 2765a6042e26f4..283b5ebfc717c8 100644 --- a/lib/spack/spack/util/crypto.py +++ b/lib/spack/spack/util/crypto.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/debug.py b/lib/spack/spack/util/debug.py index baeab296a2ea24..245a83da108e31 100644 --- a/lib/spack/spack/util/debug.py +++ b/lib/spack/spack/util/debug.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/editor.py b/lib/spack/spack/util/editor.py index eff896f87e0d83..e2ed8b67ed5c89 100644 --- a/lib/spack/spack/util/editor.py +++ b/lib/spack/spack/util/editor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/elf.py b/lib/spack/spack/util/elf.py index 6d0881f4946429..d04d7ca16caa6c 100644 --- a/lib/spack/spack/util/elf.py +++ b/lib/spack/spack/util/elf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/environment.py b/lib/spack/spack/util/environment.py index d4c352b9935390..d2f56dd4a7688d 100644 --- a/lib/spack/spack/util/environment.py +++ b/lib/spack/spack/util/environment.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index 36c7e73e0638ae..f160051674609c 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/file_cache.py b/lib/spack/spack/util/file_cache.py index 2b98f291996ee8..bc75704d757870 100644 --- a/lib/spack/spack/util/file_cache.py +++ b/lib/spack/spack/util/file_cache.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/file_permissions.py b/lib/spack/spack/util/file_permissions.py index 735373c3886cf1..9b4eefda1d81a1 100644 --- a/lib/spack/spack/util/file_permissions.py +++ b/lib/spack/spack/util/file_permissions.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/format.py b/lib/spack/spack/util/format.py index 68fe8733cc6136..c42597a8c3f161 100644 --- a/lib/spack/spack/util/format.py +++ b/lib/spack/spack/util/format.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/gcs.py b/lib/spack/spack/util/gcs.py index 4e997df52bd662..318b79d7a3c796 100644 --- a/lib/spack/spack/util/gcs.py +++ b/lib/spack/spack/util/gcs.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/git.py b/lib/spack/spack/util/git.py index 39efdda9c3c3bb..3e6d944b2aaefb 100644 --- a/lib/spack/spack/util/git.py +++ b/lib/spack/spack/util/git.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/gpg.py b/lib/spack/spack/util/gpg.py index ea1e42131d91ce..beae7f707b91c1 100644 --- a/lib/spack/spack/util/gpg.py +++ b/lib/spack/spack/util/gpg.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -334,7 +334,7 @@ def _verify_exe_or_raise(exe): raise SpackGPGError(msg) output = exe("--version", output=str) - match = re.search(r"^gpg(conf)? \(GnuPG\) (.*)$", output, re.M) + match = re.search(r"^gpg(conf)? \(GnuPG(?:/MacGPG2)?\) (.*)$", output, re.M) if not match: raise SpackGPGError('Could not determine "{0}" version'.format(exe.name)) diff --git a/lib/spack/spack/util/hash.py b/lib/spack/spack/util/hash.py index d2a32da99aa1ed..0c06ebaf12915a 100644 --- a/lib/spack/spack/util/hash.py +++ b/lib/spack/spack/util/hash.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/ld_so_conf.py b/lib/spack/spack/util/ld_so_conf.py index 875ee8fe7b6371..38459ec2000e30 100644 --- a/lib/spack/spack/util/ld_so_conf.py +++ b/lib/spack/spack/util/ld_so_conf.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/lock.py b/lib/spack/spack/util/lock.py index 0174dad0570d29..3f6480b26ae23c 100644 --- a/lib/spack/spack/util/lock.py +++ b/lib/spack/spack/util/lock.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/log_parse.py b/lib/spack/spack/util/log_parse.py index bf88a9635eeaf0..de6d0661438799 100644 --- a/lib/spack/spack/util/log_parse.py +++ b/lib/spack/spack/util/log_parse.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/module_cmd.py b/lib/spack/spack/util/module_cmd.py index 41a48f81913572..90986eb396079a 100644 --- a/lib/spack/spack/util/module_cmd.py +++ b/lib/spack/spack/util/module_cmd.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/naming.py b/lib/spack/spack/util/naming.py index d7f51d8645a27f..3205121f82ab4f 100644 --- a/lib/spack/spack/util/naming.py +++ b/lib/spack/spack/util/naming.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index db2c28528f6a70..a0552b13ccb881 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/parallel.py b/lib/spack/spack/util/parallel.py index c8e6ef7907f584..9c0ff1ab8e75ea 100644 --- a/lib/spack/spack/util/parallel.py +++ b/lib/spack/spack/util/parallel.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/path.py b/lib/spack/spack/util/path.py index e2aee48df1e2cd..e0fa29dbccd904 100644 --- a/lib/spack/spack/util/path.py +++ b/lib/spack/spack/util/path.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/pattern.py b/lib/spack/spack/util/pattern.py index 061e31108494f4..49ef583dcb67c9 100644 --- a/lib/spack/spack/util/pattern.py +++ b/lib/spack/spack/util/pattern.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/prefix.py b/lib/spack/spack/util/prefix.py index e94c6526adfbf3..976653562cd473 100644 --- a/lib/spack/spack/util/prefix.py +++ b/lib/spack/spack/util/prefix.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/s3.py b/lib/spack/spack/util/s3.py index 796c49a8c8e6cf..5457abdca58453 100644 --- a/lib/spack/spack/util/s3.py +++ b/lib/spack/spack/util/s3.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/spack_json.py b/lib/spack/spack/util/spack_json.py index 579d046985133b..e6866bd8a3210f 100644 --- a/lib/spack/spack/util/spack_json.py +++ b/lib/spack/spack/util/spack_json.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index 2ca9acbed73e59..f4bec63f5cc64b 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/timer.py b/lib/spack/spack/util/timer.py index ef15c7001fe7ea..f15d692a53ccbe 100644 --- a/lib/spack/spack/util/timer.py +++ b/lib/spack/spack/util/timer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/url.py b/lib/spack/spack/util/url.py index 0644a17adac580..db84b03c3fcfc3 100644 --- a/lib/spack/spack/util/url.py +++ b/lib/spack/spack/util/url.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py index 57158db950e917..d56078a28ed14b 100644 --- a/lib/spack/spack/util/web.py +++ b/lib/spack/spack/util/web.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,7 +17,7 @@ import urllib.parse from html.parser import HTMLParser from pathlib import Path, PurePosixPath -from typing import IO, Dict, List, Optional, Set, Union +from typing import IO, Dict, Iterable, List, Optional, Set, Union from urllib.error import HTTPError, URLError from urllib.request import HTTPSHandler, Request, build_opener @@ -554,7 +554,9 @@ def list_url(url, recursive=False): return gcs.get_all_blobs(recursive=recursive) -def spider(root_urls: Union[str, List[str]], depth: int = 0, concurrency: Optional[int] = None): +def spider( + root_urls: Union[str, Iterable[str]], depth: int = 0, concurrency: Optional[int] = None +): """Get web pages from root URLs. If depth is specified (e.g., depth=2), then this will also follow up to levels diff --git a/lib/spack/spack/util/windows_registry.py b/lib/spack/spack/util/windows_registry.py index cfc16724563287..c9f2a982852dff 100644 --- a/lib/spack/spack/util/windows_registry.py +++ b/lib/spack/spack/util/windows_registry.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py index 7b045d62628022..07aafe8945f136 100644 --- a/lib/spack/spack/variant.py +++ b/lib/spack/spack/variant.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,7 @@ import spack.directives import spack.error as error +import spack.parser special_variant_values = [None, "none", "*"] @@ -74,7 +75,7 @@ def isa_type(v): self.single_value_validator = isa_type - if callable(values): + elif callable(values): # If 'values' is a callable, assume it is a single value # validator and reset the values to be explicit during debug self.single_value_validator = values @@ -399,13 +400,12 @@ def __contains__(self, item): return item in self._value def __repr__(self): - cls = type(self) - return "{0.__name__}({1}, {2})".format(cls, repr(self.name), repr(self._original_value)) + return f"{type(self).__name__}({repr(self.name)}, {repr(self._original_value)})" def __str__(self): - if self.propagate: - return "{0}=={1}".format(self.name, ",".join(str(x) for x in self.value)) - return "{0}={1}".format(self.name, ",".join(str(x) for x in self.value)) + delim = "==" if self.propagate else "=" + values = spack.parser.quote_if_needed(",".join(str(v) for v in self.value)) + return f"{self.name}{delim}{values}" class MultiValuedVariant(AbstractVariant): @@ -443,15 +443,14 @@ def append(self, value): self._original_value = ",".join(self._value) def __str__(self): - # Special-case patches to not print the full 64 character hashes + # Special-case patches to not print the full 64 character sha256 if self.name == "patches": values_str = ",".join(x[:7] for x in self.value) else: values_str = ",".join(str(x) for x in self.value) - if self.propagate: - return "{0}=={1}".format(self.name, values_str) - return "{0}={1}".format(self.name, values_str) + delim = "==" if self.propagate else "=" + return f"{self.name}{delim}{spack.parser.quote_if_needed(values_str)}" class SingleValuedVariant(AbstractVariant): @@ -467,9 +466,8 @@ def _value_setter(self, value): self._value = str(self._value[0]) def __str__(self): - if self.propagate: - return "{0}=={1}".format(self.name, self.value) - return "{0}={1}".format(self.name, self.value) + delim = "==" if self.propagate else "=" + return f"{self.name}{delim}{spack.parser.quote_if_needed(self.value)}" @implicit_variant_conversion def satisfies(self, other): @@ -916,7 +914,7 @@ def __init__(self, spec, variants): variant_str = "variant" if len(variants) == 1 else "variants" msg = ( 'trying to set {0} "{1}" in package "{2}", but the package' - " has no such {0} [happened during concretization of {3}]" + " has no such {0} [happened when validating '{3}']" ) msg = msg.format(variant_str, comma_or(variants), spec.name, spec.root) super().__init__(msg) diff --git a/lib/spack/spack/verify.py b/lib/spack/spack/verify.py index 01ca96fc7a4997..10d6f91da0f3a5 100644 --- a/lib/spack/spack/verify.py +++ b/lib/spack/spack/verify.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/version/__init__.py b/lib/spack/spack/version/__init__.py index b25048f0523f9b..30dd71ea622fab 100644 --- a/lib/spack/spack/version/__init__.py +++ b/lib/spack/spack/version/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/version/common.py b/lib/spack/spack/version/common.py index 28dced815c3329..3afa218d4dd6ae 100644 --- a/lib/spack/spack/version/common.py +++ b/lib/spack/spack/version/common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/version/git_ref_lookup.py b/lib/spack/spack/version/git_ref_lookup.py index 946cd03a187f04..e6c47194fee33b 100644 --- a/lib/spack/spack/version/git_ref_lookup.py +++ b/lib/spack/spack/version/git_ref_lookup.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/version/lookup.py b/lib/spack/spack/version/lookup.py index e33b5c217691ac..d7bb096a4d6b46 100644 --- a/lib/spack/spack/version/lookup.py +++ b/lib/spack/spack/version/lookup.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack/version/version_types.py b/lib/spack/spack/version/version_types.py index 87f4d26308cfff..35e826c2194f12 100644 --- a/lib/spack/spack/version/version_types.py +++ b/lib/spack/spack/version/version_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/lib/spack/spack_installable/main.py b/lib/spack/spack_installable/main.py index af4355f69bbe2f..3fc809aa422d00 100644 --- a/lib/spack/spack_installable/main.py +++ b/lib/spack/spack_installable/main.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,19 +7,24 @@ from os.path import dirname as dn +def get_spack_sys_paths(spack_prefix): + """Given a spack prefix, return all the paths Spack needs to function.""" + spack_libs = os.path.join(spack_prefix, "lib", "spack") + external_libs = os.path.join(spack_libs, "external") + vendored_libs = os.path.join(external_libs, "_vendoring") + + # spack externals take precedence, then vendored packages, then spack itself + return [external_libs, vendored_libs, spack_libs] + + def main(argv=None): # Find spack's location and its prefix. this_file = os.path.realpath(os.path.expanduser(__file__)) spack_prefix = dn(dn(dn(dn(this_file)))) - # Allow spack libs to be imported in our scripts - spack_lib_path = os.path.join(spack_prefix, "lib", "spack") - sys.path.insert(0, spack_lib_path) + # Add all the sys paths that allow spack libs to be imported + sys.path[:0] = get_spack_sys_paths(spack_prefix) - # Add external libs - spack_external_libs = os.path.join(spack_lib_path, "external") - sys.path.insert(0, os.path.join(spack_external_libs, "_vendoring")) - sys.path.insert(0, spack_external_libs) # Here we delete ruamel.yaml in case it has been already imported from site # (see #9206 for a broader description of the issue). # diff --git a/pyproject.toml b/pyproject.toml index d33b27a99c20ac..0a4d094d1aab03 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -171,7 +171,7 @@ ignore_missing_imports = true useLibraryCodeForTypes = true reportMissingImports = true reportWildcardImportFromLibrary = false -include = ['lib/spack'] +include = ['lib/spack', 'var/spack/repos'] ignore = ['lib/spack/external'] extraPaths = ['lib/spack', 'lib/spack/external'] diff --git a/share/spack/bash/spack-completion.bash b/share/spack/bash/spack-completion.bash index 9a5b367be7a49a..e8159bdba5acbb 100755 --- a/share/spack/bash/spack-completion.bash +++ b/share/spack/bash/spack-completion.bash @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/csh/pathadd.csh b/share/spack/csh/pathadd.csh index 3e77489f97719a..df46b00f3f6ec8 100644 --- a/share/spack/csh/pathadd.csh +++ b/share/spack/csh/pathadd.csh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,8 +25,8 @@ if ($_pa_set == 1) then eval set _pa_old_value='$'$_pa_varname endif -# Do the actual prepending here, if it is a dir and not already in the path -if ( -d $_pa_new_path && \:$_pa_old_value\: !~ *\:$_pa_new_path\:* ) then +# Do the actual prepending here, if it is a dir and not first in the path +if ( -d $_pa_new_path && $_pa_old_value\: !~ $_pa_new_path\:* ) then if ("x$_pa_old_value" == "x") then setenv $_pa_varname $_pa_new_path else diff --git a/share/spack/csh/spack.csh b/share/spack/csh/spack.csh index e344d589f8f7a9..5df90e41a8c946 100644 --- a/share/spack/csh/spack.csh +++ b/share/spack/csh/spack.csh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/docker/entrypoint.bash b/share/spack/docker/entrypoint.bash index 98869fdfcaa803..21393d2229f39e 100755 --- a/share/spack/docker/entrypoint.bash +++ b/share/spack/docker/entrypoint.bash @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/docker/package-index/split.sh b/share/spack/docker/package-index/split.sh index 33e5ea9f51e662..dfec1f4139a6d0 100755 --- a/share/spack/docker/package-index/split.sh +++ b/share/spack/docker/package-index/split.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/docs/docker/module-file-tutorial/spack.sh b/share/spack/docs/docker/module-file-tutorial/spack.sh index dd04ef96fc4197..c1780a61fd0d6d 100644 --- a/share/spack/docs/docker/module-file-tutorial/spack.sh +++ b/share/spack/docs/docker/module-file-tutorial/spack.sh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/fish/spack-completion.fish b/share/spack/fish/spack-completion.fish index ee06dade57340b..a85dec612f5a08 100644 --- a/share/spack/fish/spack-completion.fish +++ b/share/spack/fish/spack-completion.fish @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 880aeb6811a1d0..c3fc05a2e4d6e7 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -59,6 +59,11 @@ default: SPACK_TARGET_PLATFORM: "linux" SPACK_TARGET_ARCH: "neoverse_v1" +.linux_neoverse_v2: + variables: + SPACK_TARGET_PLATFORM: "linux" + SPACK_TARGET_ARCH: "neoverse_v2" + .linux_aarch64: variables: SPACK_TARGET_PLATFORM: "linux" @@ -86,8 +91,6 @@ default: SPACK_PIPELINE_TYPE: "spack_protected_branch" SPACK_COPY_BUILDCACHE: "${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}" SPACK_REQUIRE_SIGNING: "True" - AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY} OIDC_TOKEN_AUDIENCE: "protected_binary_mirror" - if: $CI_COMMIT_REF_NAME =~ /^releases\/v.*/ # Pipelines on release branches always rebuild everything @@ -98,8 +101,6 @@ default: SPACK_PRUNE_UNTOUCHED: "False" SPACK_PRUNE_UP_TO_DATE: "False" SPACK_REQUIRE_SIGNING: "True" - AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY} OIDC_TOKEN_AUDIENCE: "protected_binary_mirror" - if: $CI_COMMIT_TAG =~ /^develop-[\d]{4}-[\d]{2}-[\d]{2}$/ || $CI_COMMIT_TAG =~ /^v.*/ # Pipelines on tags (release or dev snapshots) only copy binaries from one mirror to another @@ -108,8 +109,6 @@ default: SPACK_PIPELINE_TYPE: "spack_copy_only" SPACK_COPY_BUILDCACHE: "${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}" PIPELINE_MIRROR_TEMPLATE: "copy-only-protected-mirrors.yaml.in" - AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY} OIDC_TOKEN_AUDIENCE: "protected_binary_mirror" - if: $CI_COMMIT_REF_NAME =~ /^pr[\d]+_.*$/ # Pipelines on PR branches rebuild only what's missing, and do extra pruning @@ -126,8 +125,6 @@ default: # TODO: far gitlab doesn't support that. PR_TARGET_REF_NAME: "develop" PIPELINE_MIRROR_TEMPLATE: "multi-src-mirrors.yaml.in" - AWS_ACCESS_KEY_ID: ${PR_MIRRORS_AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${PR_MIRRORS_AWS_SECRET_ACCESS_KEY} OIDC_TOKEN_AUDIENCE: "pr_binary_mirror" .generate-common: @@ -136,6 +133,8 @@ default: - uname -a || true - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true - nproc || true + - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true - . "./share/spack/setup-env.sh" - spack --version - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} @@ -147,9 +146,22 @@ default: --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}/${SPACK_TARGET_ARCH}" ${CI_STACK_CONFIG_SCOPES} compiler find + - spack + --config-scope "${SPACK_CI_CONFIG_ROOT}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}/${SPACK_TARGET_ARCH}" + ${CI_STACK_CONFIG_SCOPES} + audit configs - spack python -c "import os,sys; print(os.path.expandvars(sys.stdin.read()))" < "${SPACK_CI_CONFIG_ROOT}/${PIPELINE_MIRROR_TEMPLATE}" > "${SPACK_CI_CONFIG_ROOT}/mirrors.yaml" - spack config add -f "${SPACK_CI_CONFIG_ROOT}/mirrors.yaml" + - mkdir -p "${CI_PROJECT_DIR}/jobs_scratch_dir" + - spack + --config-scope "${SPACK_CI_CONFIG_ROOT}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}/${SPACK_TARGET_ARCH}" + ${CI_STACK_CONFIG_SCOPES} + config blame > "${CI_PROJECT_DIR}/jobs_scratch_dir/spack.yaml.blame" - spack -v --color=always --config-scope "${SPACK_CI_CONFIG_ROOT}" --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}" @@ -160,6 +172,7 @@ default: --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" after_script: - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true artifacts: paths: - "${CI_PROJECT_DIR}/jobs_scratch_dir" @@ -192,6 +205,10 @@ default: extends: [ ".generate-base" ] tags: ["spack", "public", "medium", "aarch64", "graviton3"] +.generate-neoverse-v2: + extends: [ ".generate-base" ] + tags: ["spack", "public", "medium", "neoverse_v2"] + .generate-deprecated: extends: [ ".base-job" ] stage: generate @@ -199,6 +216,8 @@ default: - uname -a || true - grep -E 'vendor|model name' /proc/cpuinfo 2>/dev/null | sort -u || head -n10 /proc/cpuinfo 2>/dev/null || true - nproc || true + - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true - . "./share/spack/setup-env.sh" - spack --version - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} @@ -210,6 +229,7 @@ default: --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/cloud-ci-pipeline.yml" after_script: - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true artifacts: paths: - "${CI_PROJECT_DIR}/jobs_scratch_dir" @@ -244,8 +264,6 @@ protected-publish: variables: SPACK_COPY_BUILDCACHE: "${PROTECTED_MIRROR_PUSH_DOMAIN}/${CI_COMMIT_REF_NAME}" SPACK_PIPELINE_TYPE: "spack_protected_branch" - AWS_ACCESS_KEY_ID: ${PROTECTED_MIRRORS_AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${PROTECTED_MIRRORS_AWS_SECRET_ACCESS_KEY} KUBERNETES_CPU_REQUEST: 4000m KUBERNETES_MEMORY_REQUEST: 16G script: @@ -321,6 +339,29 @@ e4s-build: - artifacts: True job: e4s-generate +######################################## +# E4S Neoverse V2 +######################################## +.e4s-neoverse-v2: + extends: [ ".linux_neoverse_v2" ] + variables: + SPACK_CI_STACK_NAME: e4s-neoverse-v2 + +e4s-neoverse-v2-generate: + extends: [ ".e4s-neoverse-v2", ".generate-neoverse-v2" ] + image: ghcr.io/spack/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01 + +e4s-neoverse-v2-build: + extends: [ ".e4s-neoverse-v2", ".build" ] + trigger: + include: + - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml + job: e4s-neoverse-v2-generate + strategy: depend + needs: + - artifacts: True + job: e4s-neoverse-v2-generate + ######################################## # E4S Neoverse V1 pipeline ######################################## @@ -370,25 +411,25 @@ e4s-rocm-external-build: ######################################## # GPU Testing Pipeline ######################################## -.gpu-tests: - extends: [ ".linux_x86_64_v3" ] - variables: - SPACK_CI_STACK_NAME: gpu-tests +# .gpu-tests: +# extends: [ ".linux_x86_64_v3" ] +# variables: +# SPACK_CI_STACK_NAME: gpu-tests -gpu-tests-generate: - extends: [ ".gpu-tests", ".generate-x86_64"] - image: ghcr.io/spack/ubuntu20.04-runner-x86_64:2023-01-01 +# gpu-tests-generate: +# extends: [ ".gpu-tests", ".generate-x86_64"] +# image: ghcr.io/spack/ubuntu20.04-runner-x86_64:2023-01-01 -gpu-tests-build: - extends: [ ".gpu-tests", ".build" ] - trigger: - include: - - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml - job: gpu-tests-generate - strategy: depend - needs: - - artifacts: True - job: gpu-tests-generate +# gpu-tests-build: +# extends: [ ".gpu-tests", ".build" ] +# trigger: +# include: +# - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml +# job: gpu-tests-generate +# strategy: depend +# needs: +# - artifacts: True +# job: gpu-tests-generate ######################################## # E4S OneAPI Pipeline @@ -400,7 +441,7 @@ gpu-tests-build: e4s-oneapi-generate: extends: [ ".e4s-oneapi", ".generate-x86_64"] - image: ghcr.io/spack/ubuntu20.04-runner-amd64-oneapi-2023.2.1:2023.08.01 + image: ghcr.io/spack/ubuntu22.04-runner-amd64-oneapi-2024.0.0:2024.01.16b e4s-oneapi-build: extends: [ ".e4s-oneapi", ".build" ] @@ -461,6 +502,28 @@ build_systems-build: - artifacts: True job: build_systems-generate +########################################### +# Build tests for different developer tools +########################################### +.developer-tools: + extends: [ ".linux_x86_64_v3" ] + variables: + SPACK_CI_STACK_NAME: developer-tools + +developer-tools-generate: + extends: [ ".developer-tools", ".generate-x86_64"] + +developer-tools-build: + extends: [ ".developer-tools", ".build" ] + trigger: + include: + - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml + job: developer-tools-generate + strategy: depend + needs: + - artifacts: True + job: developer-tools-generate + ######################################### # RADIUSS ######################################### @@ -894,16 +957,16 @@ e4s-cray-rhel-build: variables: SPACK_CI_STACK_NAME: e4s-cray-sles -# e4s-cray-sles-generate: -# extends: [ ".generate-cray-sles", ".e4s-cray-sles" ] +e4s-cray-sles-generate: + extends: [ ".generate-cray-sles", ".e4s-cray-sles" ] -# e4s-cray-sles-build: -# extends: [ ".build", ".e4s-cray-sles" ] -# trigger: -# include: -# - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml -# job: e4s-cray-sles-generate -# strategy: depend -# needs: -# - artifacts: True -# job: e4s-cray-sles-generate +e4s-cray-sles-build: + extends: [ ".build", ".e4s-cray-sles" ] + trigger: + include: + - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml + job: e4s-cray-sles-generate + strategy: depend + needs: + - artifacts: True + job: e4s-cray-sles-generate diff --git a/share/spack/gitlab/cloud_pipelines/configs/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/ci.yaml index 29dc993a15578c..c8c8af6edbcddb 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/ci.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/ci.yaml @@ -4,12 +4,15 @@ ci: broken-tests-packages: - gptune - superlu-dist # srun -n 4 hangs + - papyrus broken-specs-url: "https://dummy.io" # s3://spack-binaries/broken-specs" pipeline-gen: - build-job: before_script-: + - - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true - - spack list --count # ensure that spack's cache is populated - - spack env activate --without-view ${SPACK_CONCRETE_ENV_DIR} - spack compiler list @@ -24,11 +27,12 @@ ci: - - spack config blame mirrors - spack --color=always --backtrace ci rebuild --tests > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt) 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2) - - spack python ${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py - --prefix /home/software/spack:${CI_PROJECT_DIR} + --prefix /home/software/spack:${CI_PROJECT_DIR}/opt/spack --log install_times.json ${SPACK_ARTIFACTS_ROOT}/user_data/install_times.json after_script: - - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true variables: CI_JOB_SIZE: "default" CI_GPG_KEY_ROOT: /mnt/key diff --git a/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml index 86340421014601..986277bfdde5fd 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/linux/ci.yaml @@ -193,7 +193,6 @@ ci: - blt - bzip2 - camp - - cmake - curl - czmq - darshan-util diff --git a/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml new file mode 100644 index 00000000000000..b5136835b2def9 --- /dev/null +++ b/share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v2/ci.yaml @@ -0,0 +1,7 @@ +ci: + pipeline-gen: + - any-job: + variables: + SPACK_TARGET_ARCH: neoverse_v2 + - build-job: + tags: ["neoverse_v2"] diff --git a/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py b/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py index 9adab64e576a0c..ec40c4c230ce3f 100644 --- a/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py +++ b/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py @@ -28,9 +28,17 @@ def find_logs(prefix, filename): # Aggregate the install timers into a single json data = [] + + # Look in the CWD for logs + local_log_path = os.path.join(os.getcwd(), args.log) + if os.path.exists(local_log_path): + with open(local_log_path) as fd: + data.append(json.load(fd)) + + # Look in the list of prefixes for logs for prefix in prefixes: - time_logs = find_logs(prefix, args.log) - for log in time_logs: + logs = find_logs(prefix, args.log) + for log in logs: with open(log) as fd: data.append(json.load(fd)) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml index abd8f4d0242df2..d20d054f5bfd5a 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml @@ -21,7 +21,7 @@ spack: version: - 1.8.20 elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml index 038761ac1873fa..a04f22cb6da608 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc/spack.yaml @@ -21,7 +21,7 @@ spack: version: - 1.8.20 elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml index 0c6bf0b05baad5..17d5447c4d1e27 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/deprecated/spack.yaml @@ -35,6 +35,8 @@ spack: - . "./share/spack/setup-env.sh" - spack --version - spack arch + - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true script: - spack compiler find - cd ${SPACK_CONCRETE_ENV_DIR} @@ -54,6 +56,7 @@ spack: 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2) after_script: - cat /proc/loadavg || true + - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true match_behavior: first mappings: - match: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/developer-tools/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools/spack.yaml new file mode 100644 index 00000000000000..e322387a1e638e --- /dev/null +++ b/share/spack/gitlab/cloud_pipelines/stacks/developer-tools/spack.yaml @@ -0,0 +1,69 @@ +spack: + view: false + packages: + all: + require: target=x86_64_v3 + concretizer: + unify: true + definitions: + - default_specs: + # editors + - neovim~no_luajit + - py-pynvim + - emacs@29.1+json+native+treesitter # note, pulls in gcc + # - tree-sitter is a dep, should also have cli but no package + - nano # just in case + # tags and scope search helpers + - universal-ctags # only maintained ctags, works better with c++ + - direnv + # runtimes and compilers + - python + - llvm+link_llvm_dylib~lld~lldb~polly+python build_type=MinSizeRel # for clangd, clang-format + - node-js # for editor plugins etc., pyright language server + - npm + - go # to build fzf, gh, hub + - rust+dev # fd, ripgrep, hyperfine, exa, rust-analyzer + - binutils+ld+gold+plugins # support linking with built gcc + # styling and lints + - astyle + - cppcheck + - uncrustify + - py-fprettify + - py-fortran-language-server + - py-python-lsp-server + # cli dev tools + - ripgrep + - gh + - fd + - bfs + - fzf + - tree + - jq + - py-yq + - hub + - ncdu + - eza + - lsd + - hyperfine + - htop + - tmux + - ccache + # ensure we can use a jobserver build and do this fast + - gmake + - ninja # should be @kitware, can't be because of meson requirement + - "openssl certs=system" # must be this, system external does not work + - arch: + - '%gcc target=x86_64_v3' + + specs: + - matrix: + - - $default_specs + - - $arch + + ci: + pipeline-gen: + - build-job: + image: "ghcr.io/spack/ubuntu20.04-runner-amd64-gcc-11.4:2023.08.01" + + cdash: + build-group: Developer Tools diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml index 413fdf34eb28f9..1c5ac370ce2ad5 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml @@ -10,7 +10,8 @@ spack: packages: all: - require: '%cce' + prefer: + - "%cce" compiler: [cce] providers: blas: [cray-libsci] @@ -30,7 +31,9 @@ spack: cuda: version: [11.7.0] elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls + require: "%gcc" + gcc-runtime: require: "%gcc" hdf5: variants: +fortran +hl +shared diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml index c141cd9bf9233a..96e2e1ec8dba28 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml @@ -29,7 +29,7 @@ spack: cuda: version: [11.7.0] elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls require: "%gcc" hdf5: variants: +fortran +hl +shared diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml new file mode 100644 index 00000000000000..5b34695b591796 --- /dev/null +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml @@ -0,0 +1,338 @@ +spack: + view: false + + concretizer: + reuse: false + unify: false + + packages: + all: + require: '%gcc@11.4.0 target=neoverse_v2' + providers: + blas: [openblas] + mpi: [mpich] + variants: +mpi + binutils: + variants: +ld +gold +headers +libiberty ~nls + elfutils: + variants: ~nls + hdf5: + variants: +fortran +hl +shared + libfabric: + variants: fabrics=sockets,tcp,udp,rxm + libunwind: + variants: +pic +xz + openblas: + variants: threads=openmp + trilinos: + variants: +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext + +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu + +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos + +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long + xz: + variants: +pic + mesa: + version: [21.3.8] + mpi: + require: mpich + mpich: + require: '~wrapperrpath ~hwloc' + ncurses: + require: '@6.3 +termlib' + tbb: + require: intel-tbb + boost: + version: [1.79.0] + variants: +atomic +chrono +container +date_time +exception +filesystem +graph + +iostreams +locale +log +math +mpi +multithreaded +program_options +random + +regex +serialization +shared +signals +stacktrace +system +test +thread +timer + cxxstd=17 visibility=global + libffi: + require: "@3.4.4" + vtk-m: + require: "+examples" + cuda: + version: [11.8.0] + + specs: + # CPU + - adios + - alquimia + - aml + - amrex + - arborx + - argobots + - ascent # ecp dav + - axom + - bolt + - boost + - butterflypack + - cabana + - caliper + - chai ~benchmarks ~tests + - charliecloud + - conduit + - datatransferkit + - dyninst + - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc ~visit +vtkm +zfp # +visit: ? + - exaworks + - flecsi + - flit + - flux-core + - fortrilinos + - gasnet + - ginkgo + - globalarrays + - gmp + - gotcha + - gptune ~mpispawn + - gromacs +cp2k ^cp2k build_system=cmake + - h5bench + - hdf5-vol-async + - hdf5-vol-cache + - hdf5-vol-log + - heffte +fftw + - hpctoolkit + - hpx networking=mpi + - hypre + - kokkos +openmp + - kokkos-kernels +openmp + - lammps + - lbann + - legion + - libnrm + - libquo + - libunwind + - loki + - mercury + - metall + - mfem + - mgard +serial +openmp +timing +unstructured ~cuda + - mpark-variant + - mpifileutils ~xattr + - nccmp + - nco + - netlib-scalapack + - nrm + - nvhpc + - omega-h + - openfoam + - openmpi + - openpmd-api + - papi + - papyrus + - parsec ~cuda + - pdt + - petsc + - phist + - plasma + - plumed + - precice + - pruners-ninja + - pumi + - py-h5py + - py-jupyterhub + - py-libensemble + - py-petsc4py + - py-warpx + - qthreads scheduler=distrib + - quantum-espresso + - raja + - rempi + - scr + - slate ~cuda + - slepc + - stc + - strumpack ~slate + - sundials + - superlu + - superlu-dist + - swig@4.0.2-fortran + - sz3 + - tasmanian + - tau +mpi +python +syscall + - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long + - turbine + - umap + - umpire + - upcxx + - wannier90 + - xyce +mpi +shared +pymi +pymi_static_tpls + # INCLUDED IN ECP DAV CPU + - adios2 + - darshan-runtime + - darshan-util + - faodel + - hdf5 + - libcatalyst + - parallel-netcdf + - paraview + - py-cinemasci + - sz + - unifyfs + - veloc + # - visit # silo: https://github.com/spack/spack/issues/39538 + - vtk-m + - zfp + # -- + # - archer # part of llvm +omp_tsan + # - bricks ~cuda # not respecting target=aarch64? + # - dealii # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - geopm # geopm: https://github.com/spack/spack/issues/38795 + # - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp # py-numcodecs@0.7.3: gcc: error: unrecognized command-line option '-mno-sse2' + # - variorum # variorum: https://github.com/spack/spack/issues/38786 + + # CUDA NOARCH + - flux-core +cuda + - hpctoolkit +cuda + - papi +cuda + - tau +mpi +cuda +syscall + # -- + # - bricks +cuda # not respecting target=aarch64? + # - legion +cuda # legion: needs NVIDIA driver + + # CUDA 75 + - amrex +cuda cuda_arch=75 + - arborx +cuda cuda_arch=75 ^kokkos +wrapper + - cabana +cuda cuda_arch=75 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=75 + - caliper +cuda cuda_arch=75 + - chai ~benchmarks ~tests +cuda cuda_arch=75 ^umpire ~shared + - flecsi +cuda cuda_arch=75 + - ginkgo +cuda cuda_arch=75 + - gromacs +cuda cuda_arch=75 + - heffte +cuda cuda_arch=75 + - hpx +cuda cuda_arch=75 + - hypre +cuda cuda_arch=75 + - kokkos +wrapper +cuda cuda_arch=75 + - kokkos-kernels +cuda cuda_arch=75 ^kokkos +wrapper +cuda cuda_arch=75 + - magma +cuda cuda_arch=75 + - mfem +cuda cuda_arch=75 + - mgard +serial +openmp +timing +unstructured +cuda cuda_arch=75 + - omega-h +cuda cuda_arch=75 + - parsec +cuda cuda_arch=75 + - petsc +cuda cuda_arch=75 + - raja +cuda cuda_arch=75 + - slate +cuda cuda_arch=75 + - strumpack ~slate +cuda cuda_arch=75 + - sundials +cuda cuda_arch=75 + - superlu-dist +cuda cuda_arch=75 + - tasmanian +cuda cuda_arch=75 + - trilinos +cuda cuda_arch=75 + - umpire ~shared +cuda cuda_arch=75 + # INCLUDED IN ECP DAV CUDA + - adios2 +cuda cuda_arch=75 + - paraview +cuda cuda_arch=75 + - vtk-m +cuda cuda_arch=75 + - zfp +cuda cuda_arch=75 + # -- + # - ascent +cuda cuda_arch=75 # ascent: https://github.com/spack/spack/issues/38045 + # - axom +cuda cuda_arch=75 # axom: https://github.com/spack/spack/issues/29520 + # - cusz +cuda cuda_arch=75 # cusz: https://github.com/spack/spack/issues/38787 + # - dealii +cuda cuda_arch=75 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - ecp-data-vis-sdk +adios2 +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=75 # embree: https://github.com/spack/spack/issues/39534 + # - lammps +cuda cuda_arch=75 # lammps: needs NVIDIA driver + # - lbann +cuda cuda_arch=75 # lbann: https://github.com/spack/spack/issues/38788 + # - libpressio +bitgrooming +bzip2 +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf ~cusz +mgard +cuda cuda_arch=75 # libpressio: CMake Error at CMakeLists.txt:498 (find_library): Could not find CUFile_LIBRARY using the following names: cufile ; +cusz: https://github.com/spack/spack/issues/38787 + # - py-torch +cuda cuda_arch=75 # skipped, installed by other means + # - slepc +cuda cuda_arch=75 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - upcxx +cuda cuda_arch=75 # upcxx: needs NVIDIA driver + + # CUDA 80 + - amrex +cuda cuda_arch=80 + - arborx +cuda cuda_arch=80 ^kokkos +wrapper + - cabana +cuda cuda_arch=80 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=80 + - caliper +cuda cuda_arch=80 + - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire ~shared + - flecsi +cuda cuda_arch=80 + - ginkgo +cuda cuda_arch=80 + - gromacs +cuda cuda_arch=80 + - heffte +cuda cuda_arch=80 + - hpx +cuda cuda_arch=80 + - hypre +cuda cuda_arch=80 + - kokkos +wrapper +cuda cuda_arch=80 + - kokkos-kernels +cuda cuda_arch=80 ^kokkos +wrapper +cuda cuda_arch=80 + - magma +cuda cuda_arch=80 + - mfem +cuda cuda_arch=80 + - mgard +serial +openmp +timing +unstructured +cuda cuda_arch=80 + - omega-h +cuda cuda_arch=80 + - parsec +cuda cuda_arch=80 + - petsc +cuda cuda_arch=80 + - raja +cuda cuda_arch=80 + - slate +cuda cuda_arch=80 + - strumpack ~slate +cuda cuda_arch=80 + - sundials +cuda cuda_arch=80 + - superlu-dist +cuda cuda_arch=80 + - tasmanian +cuda cuda_arch=80 + - trilinos +cuda cuda_arch=80 + - umpire ~shared +cuda cuda_arch=80 + # INCLUDED IN ECP DAV CUDA + - adios2 +cuda cuda_arch=80 + - paraview +cuda cuda_arch=80 + - vtk-m +cuda cuda_arch=80 + - zfp +cuda cuda_arch=80 + # -- + # - ascent +cuda cuda_arch=80 # ascent: https://github.com/spack/spack/issues/38045 + # - axom +cuda cuda_arch=80 # axom: https://github.com/spack/spack/issues/29520 + # - cusz +cuda cuda_arch=80 # cusz: https://github.com/spack/spack/issues/38787 + # - dealii +cuda cuda_arch=80 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - ecp-data-vis-sdk +adios2 +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=80 # embree: https://github.com/spack/spack/issues/39534 + # - lammps +cuda cuda_arch=80 # lammps: needs NVIDIA driver + # - lbann +cuda cuda_arch=80 # lbann: https://github.com/spack/spack/issues/38788 + # - libpressio +bitgrooming +bzip2 +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf ~cusz +mgard +cuda cuda_arch=80 # libpressio: CMake Error at CMakeLists.txt:498 (find_library): Could not find CUFile_LIBRARY using the following names: cufile ; +cusz: https://github.com/spack/spack/issues/38787 + # - py-torch +cuda cuda_arch=80 # skipped, installed by other means + # - slepc +cuda cuda_arch=80 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - upcxx +cuda cuda_arch=80 # upcxx: needs NVIDIA driver + + # CUDA 90 + - amrex +cuda cuda_arch=90 + - arborx +cuda cuda_arch=90 ^kokkos +wrapper + - cabana +cuda cuda_arch=90 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=90 + - caliper +cuda cuda_arch=90 + - chai ~benchmarks ~tests +cuda cuda_arch=90 ^umpire ~shared + - flecsi +cuda cuda_arch=90 + - ginkgo +cuda cuda_arch=90 + - gromacs +cuda cuda_arch=90 + - heffte +cuda cuda_arch=90 + - hpx +cuda cuda_arch=90 + - kokkos +wrapper +cuda cuda_arch=90 + - kokkos-kernels +cuda cuda_arch=90 ^kokkos +wrapper +cuda cuda_arch=90 + - magma +cuda cuda_arch=90 + - mfem +cuda cuda_arch=90 + - mgard +serial +openmp +timing +unstructured +cuda cuda_arch=90 + - parsec +cuda cuda_arch=90 + - petsc +cuda cuda_arch=90 + - raja +cuda cuda_arch=90 + - slate +cuda cuda_arch=90 + - strumpack ~slate +cuda cuda_arch=90 + - sundials +cuda cuda_arch=90 + - superlu-dist +cuda cuda_arch=90 + - trilinos +cuda cuda_arch=90 + - umpire ~shared +cuda cuda_arch=90 + # INCLUDED IN ECP DAV CUDA + - adios2 +cuda cuda_arch=90 + # - paraview +cuda cuda_arch=90 # paraview: InstallError: Incompatible cuda_arch=90 + - vtk-m +cuda cuda_arch=90 + - zfp +cuda cuda_arch=90 + # -- + # - ascent +cuda cuda_arch=90 # ascent: https://github.com/spack/spack/issues/38045 + # - axom +cuda cuda_arch=90 # axom: https://github.com/spack/spack/issues/29520 + # - cusz +cuda cuda_arch=90 # cusz: https://github.com/spack/spack/issues/38787 + # - dealii +cuda cuda_arch=90 # dealii: https://github.com/spack/spack/issues/39532 + # - ecp-data-vis-sdk +adios2 +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=90 # embree: https://github.com/spack/spack/issues/39534 + # - hypre +cuda cuda_arch=90 # concretizer: hypre +cuda requires cuda@:11, but cuda_arch=90 requires cuda@12: + # - lammps +cuda cuda_arch=90 # lammps: needs NVIDIA driver + # - lbann +cuda cuda_arch=90 # concretizer: Cannot select a single "version" for package "lbann" + # - libpressio +bitgrooming +bzip2 +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf ~cusz +mgard +cuda cuda_arch=90 # libpressio: CMake Error at CMakeLists.txt:498 (find_library): Could not find CUFile_LIBRARY using the following names: cufile ; +cusz: https://github.com/spack/spack/issues/38787 + # - omega-h +cuda cuda_arch=90 # omega-h: https://github.com/spack/spack/issues/39535 + # - py-torch +cuda cuda_arch=90 # skipped, installed by other means + # - slepc +cuda cuda_arch=90 # slepc: make[1]: *** internal error: invalid --jobserver-auth string 'fifo:/tmp/GMfifo1313'. + # - tasmanian +cuda cuda_arch=90 # tasmanian: conflicts with cuda@12 + # - upcxx +cuda cuda_arch=90 # upcxx: needs NVIDIA driver + + ci: + pipeline-gen: + - build-job: + image: "ghcr.io/spack/ubuntu22.04-runner-arm64-gcc-11.4:2024.01.01" + + cdash: + build-group: E4S ARM Neoverse V2 diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml index 82a1f07c8d4186..207412cb7a17c0 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml @@ -15,7 +15,7 @@ spack: binutils: variants: +ld +gold +headers +libiberty ~nls elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: @@ -31,8 +31,6 @@ spack: +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long xz: variants: +pic - mesa: - version: [21.3.8] mpi: require: mpich mpich: @@ -199,6 +197,7 @@ spack: - chai ~benchmarks ~tests +cuda cuda_arch=75 ^umpire ~shared - flecsi +cuda cuda_arch=75 - ginkgo +cuda cuda_arch=75 + - gromacs +cuda cuda_arch=75 - heffte +cuda cuda_arch=75 - hpx +cuda cuda_arch=75 - hypre +cuda cuda_arch=75 @@ -244,6 +243,7 @@ spack: - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire ~shared - flecsi +cuda cuda_arch=80 - ginkgo +cuda cuda_arch=80 + - gromacs +cuda cuda_arch=80 - heffte +cuda cuda_arch=80 - hpx +cuda cuda_arch=80 - hypre +cuda cuda_arch=80 @@ -289,6 +289,7 @@ spack: - chai ~benchmarks ~tests +cuda cuda_arch=90 ^umpire ~shared - flecsi +cuda cuda_arch=90 - ginkgo +cuda cuda_arch=90 + - gromacs +cuda cuda_arch=90 - heffte +cuda cuda_arch=90 - hpx +cuda cuda_arch=90 - kokkos +wrapper +cuda cuda_arch=90 diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml index 8c872240f9e608..c135c2f95de250 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml @@ -7,14 +7,19 @@ spack: packages: all: - require: '%oneapi target=x86_64_v3' + require: + - "target=x86_64_v3" + prefer: + - "%oneapi" providers: blas: [openblas] mpi: [mpich] tbb: [intel-tbb] variants: +mpi elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls + gcc-runtime: + require: "%gcc" hdf5: require: "%gcc" variants: +fortran +hl +shared @@ -68,14 +73,12 @@ spack: specs: # CPU - adios - - aml - amrex - arborx - argobots - axom - bolt - boost - - bricks ~cuda - butterflypack - cabana - caliper @@ -95,6 +98,7 @@ spack: - gmp - gotcha - gptune ~mpispawn + - gromacs - h5bench - hdf5-vol-async - hdf5-vol-cache @@ -126,7 +130,6 @@ spack: - papi - papyrus - parsec ~cuda - - pdt - petsc - phist - plasma @@ -140,7 +143,6 @@ spack: - py-petsc4py - py-warpx - qthreads scheduler=distrib - - quantum-espresso - raja - rempi - scr @@ -153,7 +155,6 @@ spack: - superlu-dist - sz3 - tasmanian - - tau +mpi +python +syscall - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack +ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu +stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long - turbine - umap @@ -179,39 +180,49 @@ spack: - vtk-m ~openmp # https://github.com/spack/spack/issues/31830 - zfp # -- - # - alquimia # pflotran: https://github.com/spack/spack/issues/39474 - # - archer # subsumed under llvm +libomp_tsan - # - dealii # dealii: https://github.com/spack/spack/issues/39482 - # - dxt-explorer # r: https://github.com/spack/spack/issues/40257 + # - alquimia # pflotran: https://github.com/spack/spack/issues/39474 + # - dealii # dealii: https://github.com/spack/spack/issues/39482 + # - dxt-explorer # r: https://github.com/spack/spack/issues/40257 # - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp # embree: CMake Error at CMakeLists.txt:215 (MESSAGE): Unsupported compiler: IntelLLVM; qt: qtbase/src/corelib/global/qendian.h:333:54: error: incomplete type 'std::numeric_limits' used in nested name specifier - # - geopm # geopm issue: https://github.com/spack/spack/issues/38795 - # - hpctoolkit # 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 - # - mgard +serial +openmp +timing +unstructured ~cuda # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] - # - openfoam # cgal: https://github.com/spack/spack/issues/39481 - # - openpmd-api # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] - # - swig@4.0.2-fortran # ? - # - upcxx # upcxx: /opt/intel/oneapi/mpi/2021.10.0//libfabric/bin/fi_info: error while loading shared libraries: libfabric.so.1: cannot open shared object file: No such file or directory + # - geopm # geopm issue: https://github.com/spack/spack/issues/38795 + # - hpctoolkit # 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 + # - mgard +serial +openmp +timing +unstructured ~cuda # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] + # - openfoam # cgal: https://github.com/spack/spack/issues/39481 + # - openpmd-api # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing] + # - swig@4.0.2-fortran # ? + # - upcxx # upcxx: /opt/intel/oneapi/mpi/2021.10.0//libfabric/bin/fi_info: error while loading shared libraries: libfabric.so.1: cannot open shared object file: No such file or directory + # -- + # - bricks ~cuda # bricks: /opt/intel/oneapi/compiler/2024.0/bin/sycl-post-link: error while loading shared libraries: libonnxruntime.1.12.22.721.so: cannot open shared object file: No such file or directory + # - pdt # pdt: pdbType.cc:193:21: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings] + # - quantum-espresso # quantum-espresso@7.2 /i3fqdx5: warning: :0:0: loop not unroll-and-jammed: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering + # - tau +mpi +python +syscall # pdt: pdbType.cc:193:21: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings] # GPU - - aml +ze - amrex +sycl - - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples - - kokkos +sycl +openmp cxxstd=17 +tests +examples - - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp cxxstd=17 +tests +examples - - slate +sycl - - sundials +sycl cxxstd=17 +examples-install - - tau +mpi +opencl +level_zero ~pdt +syscall # tau: requires libdrm.so to be installed + - tau +mpi +opencl +level_zero ~pdt +syscall # 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 + # -- + - aml # aml: /opt/intel/oneapi/compiler/2024.0/bin/sycl-post-link: error while loading shared libraries: libonnxruntime.1.12.22.721.so: cannot open shared object file: No such file or directory + - aml +ze # aml: /opt/intel/oneapi/compiler/2024.0/bin/sycl-post-link: error while loading shared libraries: libonnxruntime.1.12.22.721.so: cannot open shared object file: No such file or directory + - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +examples # kokkos@4.2.00: CMake Error at cmake/Modules/FindTPLONEDPL.cmake:31 (FIND_PACKAGE): + - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +examples # kokkos@4.2.00: CMake Error at cmake/Modules/FindTPLONEDPL.cmake:31 (FIND_PACKAGE): + - ginkgo +sycl # ginkgo: Could NOT find PAPI (missing: PAPI_LIBRARY PAPI_INCLUDE_DIR sde) (Required is at least version "7.0.1.0") SYCL feature test compile failed! compile output is: CMake Error at /opt/intel/oneapi/compiler/2024.0/lib/cmake/IntelSYCL/IntelSYCLConfig.cmake:282 (SYCL_FEATURE_TEST_EXTRACT): SYCL_FEATURE_TEST_EXTRACT Function invoked with incorrect arguments for + - heffte +sycl # heffte: /opt/intel/oneapi/compiler/2024.0/bin/sycl-post-link: error while loading shared libraries: libonnxruntime.1.12.22.721.so: cannot open shared object file: No such file or directory + - kokkos +sycl +openmp cxxstd=17 +examples # kokkos@4.2.00: CMake Error at cmake/Modules/FindTPLONEDPL.cmake:31 (FIND_PACKAGE): + - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp cxxstd=17 +examples # kokkos@4.0.00: tpls/desul/include/desul/atomics/Adapt_SYCL.hpp:83:7: error: no template named 'sycl_memory_scope' + - petsc +sycl # kokkos@4.0.00: tpls/desul/include/desul/atomics/Adapt_SYCL.hpp:83:7: error: no template named 'sycl_memory_scope' + # - slate +sycl # blaspp: CMake Error at CMakeLists.txt:313 (find_package): ... set MKL_FOUND to FALSE so package "MKL" is considered to be NOT FOUND. + - sundials +sycl cxxstd=17 +examples-install # sundials@6.6.2 /cakfnxs: CMake: could NOT find MPI_CXX (missing: MPI_CXX_WORKS) (Required is at least version "2.0.0") - py-scipy ci: pipeline-gen: - build-job: - image: ghcr.io/spack/ubuntu20.04-runner-amd64-oneapi-2023.2.1:2023.08.01 + image: ghcr.io/spack/ubuntu22.04-runner-amd64-oneapi-2024.0.0:2024.01.16b cdash: build-group: E4S OneAPI diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml index 511f48e7459408..a8eefa4de71519 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml @@ -16,7 +16,7 @@ spack: binutils: variants: +ld +gold +headers +libiberty ~nls elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: @@ -202,6 +202,7 @@ spack: - exago +mpi +python +raja +hiop ~rocm +cuda cuda_arch=70 ~ipopt ^hiop@1.0.0 ~sparse +mpi +raja ~rocm +cuda cuda_arch=70 #^raja@0.14.0 - flecsi +cuda cuda_arch=70 - ginkgo +cuda cuda_arch=70 + - gromacs +cuda cuda_arch=70 - heffte +cuda cuda_arch=70 - hpx +cuda cuda_arch=70 - hypre +cuda cuda_arch=70 diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml index 8f902aa6a8d4f4..1f63578998e365 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml @@ -15,7 +15,7 @@ spack: binutils: variants: +ld +gold +headers +libiberty ~nls elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: @@ -91,7 +91,7 @@ spack: miopen-hip: buildable: false externals: - - spec: hip-rocclr@5.4.3 + - spec: miopen-hip@5.4.3 prefix: /opt/rocm-5.4.3/ miopengemm: buildable: false diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 11396a768f7cb1..e905ea3f2a163e 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -15,7 +15,7 @@ spack: binutils: variants: +ld +gold +headers +libiberty ~nls elfutils: - variants: +bzip2 ~nls +xz + variants: ~nls hdf5: variants: +fortran +hl +shared libfabric: @@ -103,6 +103,7 @@ spack: - hpctoolkit - hpx networking=mpi - hypre + - julia ^llvm ~clang ~gold ~polly targets=amdgpu,bpf,nvptx,webassembly - kokkos +openmp - kokkos-kernels +openmp - lammps @@ -210,6 +211,7 @@ spack: - exago +mpi +python +raja +hiop ~rocm +cuda cuda_arch=80 ~ipopt ^hiop@1.0.0 ~sparse +mpi +raja ~rocm +cuda cuda_arch=80 #^raja@0.14.0 - flecsi +cuda cuda_arch=80 - ginkgo +cuda cuda_arch=80 + - gromacs +cuda cuda_arch=80 - heffte +cuda cuda_arch=80 - hpx +cuda cuda_arch=80 - hypre +cuda cuda_arch=80 @@ -253,6 +255,7 @@ spack: - cusz +cuda cuda_arch=90 - flecsi +cuda cuda_arch=90 - ginkgo +cuda cuda_arch=90 + - gromacs +cuda cuda_arch=90 - heffte +cuda cuda_arch=90 - hpx +cuda cuda_arch=90 - kokkos +wrapper +cuda cuda_arch=90 diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml index 0905305113f083..0526a4a12f5954 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml @@ -24,7 +24,9 @@ spack: # Keras # Bazel codesign issues - # - py-keras + # - py-keras backend=tensorflow + # - py-keras backend=jax + - py-keras backend=torch - py-keras-applications - py-keras-preprocessing - py-keras2onnx diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml index 71670d5a91568d..fdce7f9bb4f840 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cpu/spack.yaml @@ -19,7 +19,9 @@ spack: - py-jaxlib # Keras - - py-keras + # - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch - py-keras-applications - py-keras-preprocessing - py-keras2onnx diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml index 88291690382784..1a64d838113b73 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-cuda/spack.yaml @@ -22,7 +22,9 @@ spack: - py-jaxlib # Keras - - py-keras + # - py-keras backend=tensorflow + - py-keras backend=jax + - py-keras backend=torch - py-keras-applications - py-keras-preprocessing - py-keras2onnx diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml index 620a95715b41e5..5633d9846a4c19 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-linux-x86_64-rocm/spack.yaml @@ -24,7 +24,9 @@ spack: - py-jaxlib # Keras - - py-keras + # - py-keras backend=tensorflow + - py-keras backend=jax + # - py-keras backend=torch - py-keras-applications - py-keras-preprocessing - py-keras2onnx diff --git a/share/spack/qa/completion-test.sh b/share/spack/qa/completion-test.sh index 1071ed36dbeac2..020f8a9c07964a 100755 --- a/share/spack/qa/completion-test.sh +++ b/share/spack/qa/completion-test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/run-build-tests b/share/spack/qa/run-build-tests index 4c159bd678b667..1f9d9c54f141c1 100755 --- a/share/spack/qa/run-build-tests +++ b/share/spack/qa/run-build-tests @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/run-shell-tests b/share/spack/qa/run-shell-tests index 898f6eebb42328..d7debc9f34f510 100755 --- a/share/spack/qa/run-shell-tests +++ b/share/spack/qa/run-shell-tests @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/run-style-tests b/share/spack/qa/run-style-tests index 9b372c205263b3..6a4cbb8c6d9be8 100755 --- a/share/spack/qa/run-style-tests +++ b/share/spack/qa/run-style-tests @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 61638a53e0f7e9..6808e18bdbe867 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/setup-env-test.csh b/share/spack/qa/setup-env-test.csh index f7a153ca3e188a..39eb8545321a7d 100755 --- a/share/spack/qa/setup-env-test.csh +++ b/share/spack/qa/setup-env-test.csh @@ -1,6 +1,6 @@ #!/bin/csh # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/setup-env-test.fish b/share/spack/qa/setup-env-test.fish index 589f4cbfa8c353..d57158f84221c7 100755 --- a/share/spack/qa/setup-env-test.fish +++ b/share/spack/qa/setup-env-test.fish @@ -1,6 +1,6 @@ #!/usr/bin/env fish # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/setup-env-test.sh b/share/spack/qa/setup-env-test.sh index b26619b9cde0a0..ec24166d52dae6 100755 --- a/share/spack/qa/setup-env-test.sh +++ b/share/spack/qa/setup-env-test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/setup.sh b/share/spack/qa/setup.sh index 13e8e25b157846..9e0083f982a155 100755 --- a/share/spack/qa/setup.sh +++ b/share/spack/qa/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/test-env-cfg.sh b/share/spack/qa/test-env-cfg.sh index 37f9affdf92906..f689f238d59d83 100755 --- a/share/spack/qa/test-env-cfg.sh +++ b/share/spack/qa/test-env-cfg.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/qa/test-framework.sh b/share/spack/qa/test-framework.sh index e18e95262138d6..173f27514ba98f 100755 --- a/share/spack/qa/test-framework.sh +++ b/share/spack/qa/test-framework.sh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index ad20d346d17607..14dcee56b79fca 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,38 +17,37 @@ if ($?_sp_initializing) then endif setenv _sp_initializing true -# If SPACK_ROOT is not set, we'll try to find it ourselves. +# find SPACK_ROOT. # csh/tcsh don't have a built-in way to do this, but both keep files # they are sourcing open. We use /proc on linux and lsof on macs to # find this script's full path in the current process's open files. -if (! $?SPACK_ROOT) then - # figure out a command to list open files - if (-d /proc/$$/fd) then - set _sp_lsof = "ls -l /proc/$$/fd" - else - which lsof > /dev/null - if ($? == 0) then - set _sp_lsof = "lsof -p $$" - endif - endif - # filter this script out of list of open files - if ( $?_sp_lsof ) then - set _sp_source_file = `$_sp_lsof | sed -e 's/^[^/]*//' | grep "/setup-env.csh"` +# figure out a command to list open files +if (-d /proc/$$/fd) then + set _sp_lsof = "ls -l /proc/$$/fd" +else + which lsof > /dev/null + if ($? == 0) then + set _sp_lsof = "lsof -p $$" endif +endif - # This script is in $SPACK_ROOT/share/spack; get the root with dirname - if ($?_sp_source_file) then - set _sp_share_spack = `dirname "$_sp_source_file"` - set _sp_share = `dirname "$_sp_share_spack"` - setenv SPACK_ROOT `dirname "$_sp_share"` - endif +# filter this script out of list of open files +if ( $?_sp_lsof ) then + set _sp_source_file = `$_sp_lsof | sed -e 's/^[^/]*//' | grep "/setup-env.csh"` +endif - if (! $?SPACK_ROOT) then - echo "==> Error: setup-env.csh couldn't figure out where spack lives." - echo " Set SPACK_ROOT to the root of your spack installation and try again." - exit 1 - endif +# This script is in $SPACK_ROOT/share/spack; get the root with dirname +if ($?_sp_source_file) then + set _sp_share_spack = `dirname "$_sp_source_file"` + set _sp_share = `dirname "$_sp_share_spack"` + setenv SPACK_ROOT `dirname "$_sp_share"` +endif + +if (! $?SPACK_ROOT) then + echo "==> Error: setup-env.csh couldn't figure out where spack lives." + echo " Set SPACK_ROOT to the root of your spack installation and try again." + exit 1 endif # Command aliases point at separate source files diff --git a/share/spack/setup-env.fish b/share/spack/setup-env.fish index 482c3eaa684c06..a7aac674309bcc 100755 --- a/share/spack/setup-env.fish +++ b/share/spack/setup-env.fish @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -648,10 +648,10 @@ function spack_pathadd -d "Add path to specified variable (defaults to PATH)" # passed to regular expression matching (`string match -r`) set -l _a "$pa_oldvalue" - # skip path if it is already contained in the variable + # skip path if it is already the first in the variable # note spaces in regular expression: we're matching to a space delimited # list of paths - if not echo $_a | string match -q -r " *$pa_new_path *" + if not echo $_a | string match -q -r "^$pa_new_path *" if test -n "$pa_oldvalue" set $pa_varname $pa_new_path $pa_oldvalue else diff --git a/share/spack/setup-env.ps1 b/share/spack/setup-env.ps1 index d3bed93d9ba3f2..d67e39f85bc471 100644 --- a/share/spack/setup-env.ps1 +++ b/share/spack/setup-env.ps1 @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index a42882266cf9fa..f3e87fe514b1c0 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -214,9 +214,9 @@ _spack_pathadd() { # Do the actual prepending here. eval "_pa_oldvalue=\${${_pa_varname}:-}" - _pa_canonical=":$_pa_oldvalue:" + _pa_canonical="$_pa_oldvalue:" if [ -d "$_pa_new_path" ] && \ - [ "${_pa_canonical#*:${_pa_new_path}:}" = "${_pa_canonical}" ]; + [ "${_pa_canonical#$_pa_new_path:}" = "$_pa_canonical" ]; then if [ -n "$_pa_oldvalue" ]; then eval "export $_pa_varname=\"$_pa_new_path:$_pa_oldvalue\"" diff --git a/share/spack/setup-tutorial-env.sh b/share/spack/setup-tutorial-env.sh index 13f181500d0840..6979da532979e4 100755 --- a/share/spack/setup-tutorial-env.sh +++ b/share/spack/setup-tutorial-env.sh @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash index a54f7db414e409..abc6db10d1e3c3 100755 --- a/share/spack/spack-completion.bash +++ b/share/spack/spack-completion.bash @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -571,7 +571,7 @@ _spack_buildcache() { _spack_buildcache_push() { if $list_options then - SPACK_COMPREPLY="-h --help -f --force --allow-root -a --unsigned -u --key -k --update-index --rebuild-index --spec-file --only --fail-fast --base-image -j --jobs" + SPACK_COMPREPLY="-h --help -f --force --allow-root -a --unsigned -u --signed --key -k --update-index --rebuild-index --spec-file --only --fail-fast --base-image --tag -t -j --jobs" else _mirrors fi @@ -580,7 +580,7 @@ _spack_buildcache_push() { _spack_buildcache_create() { if $list_options then - SPACK_COMPREPLY="-h --help -f --force --allow-root -a --unsigned -u --key -k --update-index --rebuild-index --spec-file --only --fail-fast --base-image -j --jobs" + SPACK_COMPREPLY="-h --help -f --force --allow-root -a --unsigned -u --signed --key -k --update-index --rebuild-index --spec-file --only --fail-fast --base-image --tag -t -j --jobs" else _mirrors fi @@ -618,7 +618,12 @@ _spack_buildcache_preview() { } _spack_buildcache_check() { - SPACK_COMPREPLY="-h --help -m --mirror-url -o --output-file --scope -s --spec --spec-file" + if $list_options + then + SPACK_COMPREPLY="-h --help -m --mirror-url -o --output-file --scope -s --spec --spec-file" + else + _all_packages + fi } _spack_buildcache_download() { @@ -819,7 +824,7 @@ _spack_config() { then SPACK_COMPREPLY="-h --help --scope" else - SPACK_COMPREPLY="get blame edit list add prefer-upstream remove rm update revert" + SPACK_COMPREPLY="get blame edit list add change prefer-upstream remove rm update revert" fi } @@ -863,6 +868,15 @@ _spack_config_add() { fi } +_spack_config_change() { + if $list_options + then + SPACK_COMPREPLY="-h --help --match-spec" + else + SPACK_COMPREPLY="" + fi +} + _spack_config_prefer_upstream() { SPACK_COMPREPLY="-h --help --local" } @@ -994,7 +1008,7 @@ _spack_develop() { _spack_diff() { if $list_options then - SPACK_COMPREPLY="-h --help --json --first -a --attribute" + SPACK_COMPREPLY="-h --help --json --first -a --attribute --ignore" else _all_packages fi @@ -1025,7 +1039,7 @@ _spack_env() { _spack_env_activate() { if $list_options then - SPACK_COMPREPLY="-h --help --sh --csh --fish --bat --pwsh --with-view -v --without-view -V -p --prompt --temp -d --dir" + SPACK_COMPREPLY="-h --help --sh --csh --fish --bat --pwsh --with-view -v --without-view -V -p --prompt --temp --create --envfile --keep-relative -d --dir" else _environments fi @@ -1172,7 +1186,7 @@ _spack_find() { } _spack_gc() { - SPACK_COMPREPLY="-h --help -y --yes-to-all" + SPACK_COMPREPLY="-h --help -E --except-any-environment -e --except-environment -b --keep-build-dependencies -y --yes-to-all" } _spack_gpg() { @@ -1315,7 +1329,7 @@ _spack_license_update_copyright_year() { _spack_list() { if $list_options then - SPACK_COMPREPLY="-h --help -d --search-description --format -v --virtuals -t --tag --count --update" + SPACK_COMPREPLY="-h --help -r --repo -N --namespace -d --search-description --format -v --virtuals -t --tag --count --update" else _all_packages fi @@ -1400,7 +1414,7 @@ _spack_mirror_destroy() { _spack_mirror_add() { if $list_options then - SPACK_COMPREPLY="-h --help --scope --type --s3-access-key-id --s3-access-key-secret --s3-access-token --s3-profile --s3-endpoint-url --oci-username --oci-password" + SPACK_COMPREPLY="-h --help --scope --type --unsigned --signed --s3-access-key-id --s3-access-key-secret --s3-access-token --s3-profile --s3-endpoint-url --oci-username --oci-password" else _mirrors fi @@ -1436,7 +1450,7 @@ _spack_mirror_set_url() { _spack_mirror_set() { if $list_options then - SPACK_COMPREPLY="-h --help --push --fetch --type --url --scope --s3-access-key-id --s3-access-key-secret --s3-access-token --s3-profile --s3-endpoint-url --oci-username --oci-password" + SPACK_COMPREPLY="-h --help --push --fetch --type --url --unsigned --signed --scope --s3-access-key-id --s3-access-key-secret --s3-access-token --s3-profile --s3-endpoint-url --oci-username --oci-password" else _mirrors fi diff --git a/share/spack/spack-completion.fish b/share/spack/spack-completion.fish index 1029fa6b45e06c..5a12414d7633aa 100755 --- a/share/spack/spack-completion.fish +++ b/share/spack/spack-completion.fish @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -697,7 +697,7 @@ complete -c spack -n '__fish_spack_using_command buildcache' -s h -l help -f -a complete -c spack -n '__fish_spack_using_command buildcache' -s h -l help -d 'show this help message and exit' # spack buildcache push -set -g __fish_spack_optspecs_spack_buildcache_push h/help f/force a/allow-root u/unsigned k/key= update-index spec-file= only= fail-fast base-image= j/jobs= +set -g __fish_spack_optspecs_spack_buildcache_push h/help f/force a/allow-root u/unsigned signed k/key= update-index spec-file= only= fail-fast base-image= t/tag= j/jobs= complete -c spack -n '__fish_spack_using_command_pos_remainder 1 buildcache push' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command buildcache push' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command buildcache push' -s h -l help -d 'show this help message and exit' @@ -705,8 +705,10 @@ complete -c spack -n '__fish_spack_using_command buildcache push' -s f -l force complete -c spack -n '__fish_spack_using_command buildcache push' -s f -l force -d 'overwrite tarball if it exists' complete -c spack -n '__fish_spack_using_command buildcache push' -l allow-root -s a -f -a allow_root complete -c spack -n '__fish_spack_using_command buildcache push' -l allow-root -s a -d 'allow install root string in binary files after RPATH substitution' -complete -c spack -n '__fish_spack_using_command buildcache push' -l unsigned -s u -f -a unsigned +complete -c spack -n '__fish_spack_using_command buildcache push' -l unsigned -s u -f -a signed complete -c spack -n '__fish_spack_using_command buildcache push' -l unsigned -s u -d 'push unsigned buildcache tarballs' +complete -c spack -n '__fish_spack_using_command buildcache push' -l signed -f -a signed +complete -c spack -n '__fish_spack_using_command buildcache push' -l signed -d 'push signed buildcache tarballs' complete -c spack -n '__fish_spack_using_command buildcache push' -l key -s k -r -f -a key complete -c spack -n '__fish_spack_using_command buildcache push' -l key -s k -r -d 'key for signing' complete -c spack -n '__fish_spack_using_command buildcache push' -l update-index -l rebuild-index -f -a update_index @@ -718,12 +720,14 @@ complete -c spack -n '__fish_spack_using_command buildcache push' -l only -r -d complete -c spack -n '__fish_spack_using_command buildcache push' -l fail-fast -f -a fail_fast complete -c spack -n '__fish_spack_using_command buildcache push' -l fail-fast -d 'stop pushing on first failure (default is best effort)' complete -c spack -n '__fish_spack_using_command buildcache push' -l base-image -r -f -a base_image -complete -c spack -n '__fish_spack_using_command buildcache push' -l base-image -r -d 'specify the base image for the buildcache. ' +complete -c spack -n '__fish_spack_using_command buildcache push' -l base-image -r -d 'specify the base image for the buildcache' +complete -c spack -n '__fish_spack_using_command buildcache push' -l tag -s t -r -f -a tag +complete -c spack -n '__fish_spack_using_command buildcache push' -l tag -s t -r -d 'when pushing to an OCI registry, tag an image containing all root specs and their runtime dependencies' complete -c spack -n '__fish_spack_using_command buildcache push' -s j -l jobs -r -f -a jobs complete -c spack -n '__fish_spack_using_command buildcache push' -s j -l jobs -r -d 'explicitly set number of parallel jobs' # spack buildcache create -set -g __fish_spack_optspecs_spack_buildcache_create h/help f/force a/allow-root u/unsigned k/key= update-index spec-file= only= fail-fast base-image= j/jobs= +set -g __fish_spack_optspecs_spack_buildcache_create h/help f/force a/allow-root u/unsigned signed k/key= update-index spec-file= only= fail-fast base-image= t/tag= j/jobs= complete -c spack -n '__fish_spack_using_command_pos_remainder 1 buildcache create' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command buildcache create' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command buildcache create' -s h -l help -d 'show this help message and exit' @@ -731,8 +735,10 @@ complete -c spack -n '__fish_spack_using_command buildcache create' -s f -l forc complete -c spack -n '__fish_spack_using_command buildcache create' -s f -l force -d 'overwrite tarball if it exists' complete -c spack -n '__fish_spack_using_command buildcache create' -l allow-root -s a -f -a allow_root complete -c spack -n '__fish_spack_using_command buildcache create' -l allow-root -s a -d 'allow install root string in binary files after RPATH substitution' -complete -c spack -n '__fish_spack_using_command buildcache create' -l unsigned -s u -f -a unsigned +complete -c spack -n '__fish_spack_using_command buildcache create' -l unsigned -s u -f -a signed complete -c spack -n '__fish_spack_using_command buildcache create' -l unsigned -s u -d 'push unsigned buildcache tarballs' +complete -c spack -n '__fish_spack_using_command buildcache create' -l signed -f -a signed +complete -c spack -n '__fish_spack_using_command buildcache create' -l signed -d 'push signed buildcache tarballs' complete -c spack -n '__fish_spack_using_command buildcache create' -l key -s k -r -f -a key complete -c spack -n '__fish_spack_using_command buildcache create' -l key -s k -r -d 'key for signing' complete -c spack -n '__fish_spack_using_command buildcache create' -l update-index -l rebuild-index -f -a update_index @@ -744,7 +750,9 @@ complete -c spack -n '__fish_spack_using_command buildcache create' -l only -r - complete -c spack -n '__fish_spack_using_command buildcache create' -l fail-fast -f -a fail_fast complete -c spack -n '__fish_spack_using_command buildcache create' -l fail-fast -d 'stop pushing on first failure (default is best effort)' complete -c spack -n '__fish_spack_using_command buildcache create' -l base-image -r -f -a base_image -complete -c spack -n '__fish_spack_using_command buildcache create' -l base-image -r -d 'specify the base image for the buildcache. ' +complete -c spack -n '__fish_spack_using_command buildcache create' -l base-image -r -d 'specify the base image for the buildcache' +complete -c spack -n '__fish_spack_using_command buildcache create' -l tag -s t -r -f -a tag +complete -c spack -n '__fish_spack_using_command buildcache create' -l tag -s t -r -d 'when pushing to an OCI registry, tag an image containing all root specs and their runtime dependencies' complete -c spack -n '__fish_spack_using_command buildcache create' -s j -l jobs -r -f -a jobs complete -c spack -n '__fish_spack_using_command buildcache create' -s j -l jobs -r -d 'explicitly set number of parallel jobs' @@ -797,6 +805,7 @@ complete -c spack -n '__fish_spack_using_command buildcache preview' -s h -l hel # spack buildcache check set -g __fish_spack_optspecs_spack_buildcache_check h/help m/mirror-url= o/output-file= scope= s/spec= spec-file= +complete -c spack -n '__fish_spack_using_command_pos_remainder 0 buildcache check' -f -k -a '(__fish_spack_specs)' complete -c spack -n '__fish_spack_using_command buildcache check' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command buildcache check' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command buildcache check' -s m -l mirror-url -r -f -a mirror_url @@ -1156,6 +1165,7 @@ complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a blame -d 'p complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a edit -d 'edit configuration file' complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a list -d 'list configuration sections' complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a add -d 'add configuration parameters' +complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a change -d 'swap variants etc. on specs in config' complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a prefer-upstream -d 'set package preferences from upstream' complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a remove -d 'remove configuration parameters' complete -c spack -n '__fish_spack_using_command_pos 0 config' -f -a rm -d 'remove configuration parameters' @@ -1168,19 +1178,19 @@ complete -c spack -n '__fish_spack_using_command config' -l scope -r -d 'configu # spack config get set -g __fish_spack_optspecs_spack_config_get h/help -complete -c spack -n '__fish_spack_using_command_pos 0 config get' -f -a 'bootstrap cdash ci compilers concretizer config definitions mirrors modules packages repos upstreams' +complete -c spack -n '__fish_spack_using_command_pos 0 config get' -f -a 'bootstrap cdash ci compilers concretizer config definitions develop mirrors modules packages repos upstreams' complete -c spack -n '__fish_spack_using_command config get' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command config get' -s h -l help -d 'show this help message and exit' # spack config blame set -g __fish_spack_optspecs_spack_config_blame h/help -complete -c spack -n '__fish_spack_using_command_pos 0 config blame' -f -a 'bootstrap cdash ci compilers concretizer config definitions mirrors modules packages repos upstreams' +complete -c spack -n '__fish_spack_using_command_pos 0 config blame' -f -a 'bootstrap cdash ci compilers concretizer config definitions develop mirrors modules packages repos upstreams' complete -c spack -n '__fish_spack_using_command config blame' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command config blame' -s h -l help -d 'show this help message and exit' # spack config edit set -g __fish_spack_optspecs_spack_config_edit h/help print-file -complete -c spack -n '__fish_spack_using_command_pos 0 config edit' -f -a 'bootstrap cdash ci compilers concretizer config definitions mirrors modules packages repos upstreams' +complete -c spack -n '__fish_spack_using_command_pos 0 config edit' -f -a 'bootstrap cdash ci compilers concretizer config definitions develop mirrors modules packages repos upstreams' complete -c spack -n '__fish_spack_using_command config edit' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command config edit' -s h -l help -d 'show this help message and exit' complete -c spack -n '__fish_spack_using_command config edit' -l print-file -f -a print_file @@ -1199,6 +1209,14 @@ complete -c spack -n '__fish_spack_using_command config add' -s h -l help -d 'sh complete -c spack -n '__fish_spack_using_command config add' -s f -l file -r -f -a file complete -c spack -n '__fish_spack_using_command config add' -s f -l file -r -d 'file from which to set all config values' +# spack config change +set -g __fish_spack_optspecs_spack_config_change h/help match-spec= +complete -c spack -n '__fish_spack_using_command_pos 0 config change' -f -a '(__fish_spack_colon_path)' +complete -c spack -n '__fish_spack_using_command config change' -s h -l help -f -a help +complete -c spack -n '__fish_spack_using_command config change' -s h -l help -d 'show this help message and exit' +complete -c spack -n '__fish_spack_using_command config change' -l match-spec -r -f -a match_spec +complete -c spack -n '__fish_spack_using_command config change' -l match-spec -r -d 'only change constraints that match this' + # spack config prefer-upstream set -g __fish_spack_optspecs_spack_config_prefer_upstream h/help local complete -c spack -n '__fish_spack_using_command config prefer-upstream' -s h -l help -f -a help @@ -1261,7 +1279,7 @@ complete -c spack -n '__fish_spack_using_command create' -l keep-stage -f -a kee complete -c spack -n '__fish_spack_using_command create' -l keep-stage -d 'don\'t clean up staging area when command completes' complete -c spack -n '__fish_spack_using_command create' -s n -l name -r -f -a name complete -c spack -n '__fish_spack_using_command create' -s n -l name -r -d 'name of the package to create' -complete -c spack -n '__fish_spack_using_command create' -s t -l template -r -f -a 'autoreconf autotools bazel bundle cmake generic intel lua makefile maven meson octave perlbuild perlmake python qmake r racket ruby scons sip waf' +complete -c spack -n '__fish_spack_using_command create' -s t -l template -r -f -a 'autoreconf autotools bazel bundle cargo cmake generic go intel lua makefile maven meson octave perlbuild perlmake python qmake r racket ruby scons sip waf' complete -c spack -n '__fish_spack_using_command create' -s t -l template -r -d 'build system template to use' complete -c spack -n '__fish_spack_using_command create' -s r -l repo -r -f -a repo complete -c spack -n '__fish_spack_using_command create' -s r -l repo -r -d 'path to a repository where the package should be created' @@ -1400,7 +1418,7 @@ complete -c spack -n '__fish_spack_using_command develop' -s f -l force -r -f -a complete -c spack -n '__fish_spack_using_command develop' -s f -l force -r -d 'remove any files or directories that block cloning source code' # spack diff -set -g __fish_spack_optspecs_spack_diff h/help json first a/attribute= +set -g __fish_spack_optspecs_spack_diff h/help json first a/attribute= ignore= complete -c spack -n '__fish_spack_using_command_pos_remainder 0 diff' -f -a '(__fish_spack_installed_specs)' complete -c spack -n '__fish_spack_using_command diff' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command diff' -s h -l help -d 'show this help message and exit' @@ -1410,6 +1428,8 @@ complete -c spack -n '__fish_spack_using_command diff' -l first -f -a load_first complete -c spack -n '__fish_spack_using_command diff' -l first -d 'load the first match if multiple packages match the spec' complete -c spack -n '__fish_spack_using_command diff' -s a -l attribute -r -f -a attribute complete -c spack -n '__fish_spack_using_command diff' -s a -l attribute -r -d 'select the attributes to show (defaults to all)' +complete -c spack -n '__fish_spack_using_command diff' -l ignore -r -f -a ignore +complete -c spack -n '__fish_spack_using_command diff' -l ignore -r -d 'omit diffs related to these dependencies' # spack docs set -g __fish_spack_optspecs_spack_docs h/help @@ -1456,7 +1476,7 @@ complete -c spack -n '__fish_spack_using_command env' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command env' -s h -l help -d 'show this help message and exit' # spack env activate -set -g __fish_spack_optspecs_spack_env_activate h/help sh csh fish bat pwsh v/with-view= V/without-view p/prompt temp d/dir= +set -g __fish_spack_optspecs_spack_env_activate h/help sh csh fish bat pwsh v/with-view= V/without-view p/prompt temp create envfile= keep-relative d/dir complete -c spack -n '__fish_spack_using_command_pos 0 env activate' -f -a '(__fish_spack_environments)' complete -c spack -n '__fish_spack_using_command env activate' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command env activate' -s h -l help -d 'show this help message and exit' @@ -1478,8 +1498,14 @@ complete -c spack -n '__fish_spack_using_command env activate' -s p -l prompt -f complete -c spack -n '__fish_spack_using_command env activate' -s p -l prompt -d 'decorate the command line prompt when activating' complete -c spack -n '__fish_spack_using_command env activate' -l temp -f -a temp complete -c spack -n '__fish_spack_using_command env activate' -l temp -d 'create and activate an environment in a temporary directory' -complete -c spack -n '__fish_spack_using_command env activate' -s d -l dir -r -f -a dir -complete -c spack -n '__fish_spack_using_command env activate' -s d -l dir -r -d 'activate the environment in this directory' +complete -c spack -n '__fish_spack_using_command env activate' -l create -f -a create +complete -c spack -n '__fish_spack_using_command env activate' -l create -d 'create and activate the environment if it doesn\'t exist' +complete -c spack -n '__fish_spack_using_command env activate' -l envfile -r -f -a envfile +complete -c spack -n '__fish_spack_using_command env activate' -l envfile -r -d 'either a lockfile (must end with \'.json\' or \'.lock\') or a manifest file' +complete -c spack -n '__fish_spack_using_command env activate' -l keep-relative -f -a keep_relative +complete -c spack -n '__fish_spack_using_command env activate' -l keep-relative -d 'copy relative develop paths verbatim into the new environment when initializing from envfile' +complete -c spack -n '__fish_spack_using_command env activate' -s d -l dir -f -a dir +complete -c spack -n '__fish_spack_using_command env activate' -s d -l dir -d 'activate environment based on the directory supplied' # spack env deactivate set -g __fish_spack_optspecs_spack_env_deactivate h/help sh csh fish bat pwsh @@ -1736,9 +1762,15 @@ complete -c spack -n '__fish_spack_using_command find' -l end-date -r -f -a end_ complete -c spack -n '__fish_spack_using_command find' -l end-date -r -d 'latest date of installation [YYYY-MM-DD]' # spack gc -set -g __fish_spack_optspecs_spack_gc h/help y/yes-to-all +set -g __fish_spack_optspecs_spack_gc h/help E/except-any-environment e/except-environment= b/keep-build-dependencies y/yes-to-all complete -c spack -n '__fish_spack_using_command gc' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command gc' -s h -l help -d 'show this help message and exit' +complete -c spack -n '__fish_spack_using_command gc' -s E -l except-any-environment -f -a except_any_environment +complete -c spack -n '__fish_spack_using_command gc' -s E -l except-any-environment -d 'remove everything unless needed by an environment' +complete -c spack -n '__fish_spack_using_command gc' -s e -l except-environment -r -f -a except_environment +complete -c spack -n '__fish_spack_using_command gc' -s e -l except-environment -r -d 'remove everything unless needed by specified environment' +complete -c spack -n '__fish_spack_using_command gc' -s b -l keep-build-dependencies -f -a keep_build_dependencies +complete -c spack -n '__fish_spack_using_command gc' -s b -l keep-build-dependencies -d 'do not remove installed build-only dependencies of roots' complete -c spack -n '__fish_spack_using_command gc' -s y -l yes-to-all -f -a yes_to_all complete -c spack -n '__fish_spack_using_command gc' -s y -l yes-to-all -d 'assume "yes" is the answer to every confirmation request' @@ -1853,7 +1885,7 @@ complete -c spack -n '__fish_spack_using_command graph' -s s -l static -d 'graph complete -c spack -n '__fish_spack_using_command graph' -s c -l color -f -a color complete -c spack -n '__fish_spack_using_command graph' -s c -l color -d 'use different colors for different dependency types' complete -c spack -n '__fish_spack_using_command graph' -s i -l installed -f -a installed -complete -c spack -n '__fish_spack_using_command graph' -s i -l installed -d 'graph installed specs, or specs in the active env (implies --dot)' +complete -c spack -n '__fish_spack_using_command graph' -s i -l installed -d 'graph specs from the DB' complete -c spack -n '__fish_spack_using_command graph' -l deptype -r -f -a deptype complete -c spack -n '__fish_spack_using_command graph' -l deptype -r -d 'comma-separated list of deptypes to traverse (default=build,link,run,test)' @@ -1927,7 +1959,7 @@ complete -c spack -n '__fish_spack_using_command install' -l use-buildcache -r - complete -c spack -n '__fish_spack_using_command install' -l include-build-deps -f -a include_build_deps complete -c spack -n '__fish_spack_using_command install' -l include-build-deps -d 'include build deps when installing from cache, useful for CI pipeline troubleshooting' complete -c spack -n '__fish_spack_using_command install' -l no-check-signature -f -a unsigned -complete -c spack -n '__fish_spack_using_command install' -l no-check-signature -d 'do not check signatures of binary packages' +complete -c spack -n '__fish_spack_using_command install' -l no-check-signature -d 'do not check signatures of binary packages (override mirror config)' complete -c spack -n '__fish_spack_using_command install' -l show-log-on-error -f -a show_log_on_error complete -c spack -n '__fish_spack_using_command install' -l show-log-on-error -d 'print full build log to stderr if build fails' complete -c spack -n '__fish_spack_using_command install' -l source -f -a install_source @@ -2000,10 +2032,12 @@ complete -c spack -n '__fish_spack_using_command license update-copyright-year' complete -c spack -n '__fish_spack_using_command license update-copyright-year' -s h -l help -d 'show this help message and exit' # spack list -set -g __fish_spack_optspecs_spack_list h/help d/search-description format= v/virtuals t/tag= count update= +set -g __fish_spack_optspecs_spack_list h/help r/repo= d/search-description format= v/virtuals t/tag= count update= complete -c spack -n '__fish_spack_using_command_pos_remainder 0 list' -f -a '(__fish_spack_packages)' complete -c spack -n '__fish_spack_using_command list' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command list' -s h -l help -d 'show this help message and exit' +complete -c spack -n '__fish_spack_using_command list' -s r -l repo -s N -l namespace -r -f -a repos +complete -c spack -n '__fish_spack_using_command list' -s r -l repo -s N -l namespace -r -d 'only list packages from the specified repo/namespace' complete -c spack -n '__fish_spack_using_command list' -s d -l search-description -f -a search_description complete -c spack -n '__fish_spack_using_command list' -s d -l search-description -d 'filtering will also search the description for a match' complete -c spack -n '__fish_spack_using_command list' -l format -r -f -a 'name_only version_json html' @@ -2170,7 +2204,7 @@ complete -c spack -n '__fish_spack_using_command mirror destroy' -l mirror-url - complete -c spack -n '__fish_spack_using_command mirror destroy' -l mirror-url -r -d 'find mirror to destroy by url' # spack mirror add -set -g __fish_spack_optspecs_spack_mirror_add h/help scope= type= s3-access-key-id= s3-access-key-secret= s3-access-token= s3-profile= s3-endpoint-url= oci-username= oci-password= +set -g __fish_spack_optspecs_spack_mirror_add h/help scope= type= unsigned signed s3-access-key-id= s3-access-key-secret= s3-access-token= s3-profile= s3-endpoint-url= oci-username= oci-password= complete -c spack -n '__fish_spack_using_command_pos 0 mirror add' -f complete -c spack -n '__fish_spack_using_command mirror add' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command mirror add' -s h -l help -d 'show this help message and exit' @@ -2178,6 +2212,10 @@ complete -c spack -n '__fish_spack_using_command mirror add' -l scope -r -f -a ' complete -c spack -n '__fish_spack_using_command mirror add' -l scope -r -d 'configuration scope to modify' complete -c spack -n '__fish_spack_using_command mirror add' -l type -r -f -a 'binary source' complete -c spack -n '__fish_spack_using_command mirror add' -l type -r -d 'specify the mirror type: for both binary and source use `--type binary --type source` (default)' +complete -c spack -n '__fish_spack_using_command mirror add' -l unsigned -f -a signed +complete -c spack -n '__fish_spack_using_command mirror add' -l unsigned -d 'do not require signing and signature verification when pushing and installing from this build cache' +complete -c spack -n '__fish_spack_using_command mirror add' -l signed -f -a signed +complete -c spack -n '__fish_spack_using_command mirror add' -l signed -d 'require signing and signature verification when pushing and installing from this build cache' complete -c spack -n '__fish_spack_using_command mirror add' -l s3-access-key-id -r -f -a s3_access_key_id complete -c spack -n '__fish_spack_using_command mirror add' -l s3-access-key-id -r -d 'ID string to use to connect to this S3 mirror' complete -c spack -n '__fish_spack_using_command mirror add' -l s3-access-key-secret -r -f -a s3_access_key_secret @@ -2236,7 +2274,7 @@ complete -c spack -n '__fish_spack_using_command mirror set-url' -l oci-password complete -c spack -n '__fish_spack_using_command mirror set-url' -l oci-password -r -d 'password to use to connect to this OCI mirror' # spack mirror set -set -g __fish_spack_optspecs_spack_mirror_set h/help push fetch type= url= scope= s3-access-key-id= s3-access-key-secret= s3-access-token= s3-profile= s3-endpoint-url= oci-username= oci-password= +set -g __fish_spack_optspecs_spack_mirror_set h/help push fetch type= url= unsigned signed scope= s3-access-key-id= s3-access-key-secret= s3-access-token= s3-profile= s3-endpoint-url= oci-username= oci-password= complete -c spack -n '__fish_spack_using_command_pos 0 mirror set' -f -a '(__fish_spack_mirrors)' complete -c spack -n '__fish_spack_using_command mirror set' -s h -l help -f -a help complete -c spack -n '__fish_spack_using_command mirror set' -s h -l help -d 'show this help message and exit' @@ -2248,6 +2286,10 @@ complete -c spack -n '__fish_spack_using_command mirror set' -l type -r -f -a 'b complete -c spack -n '__fish_spack_using_command mirror set' -l type -r -d 'specify the mirror type: for both binary and source use `--type binary --type source`' complete -c spack -n '__fish_spack_using_command mirror set' -l url -r -f -a url complete -c spack -n '__fish_spack_using_command mirror set' -l url -r -d 'url of mirror directory from \'spack mirror create\'' +complete -c spack -n '__fish_spack_using_command mirror set' -l unsigned -f -a signed +complete -c spack -n '__fish_spack_using_command mirror set' -l unsigned -d 'do not require signing and signature verification when pushing and installing from this build cache' +complete -c spack -n '__fish_spack_using_command mirror set' -l signed -f -a signed +complete -c spack -n '__fish_spack_using_command mirror set' -l signed -d 'require signing and signature verification when pushing and installing from this build cache' complete -c spack -n '__fish_spack_using_command mirror set' -l scope -r -f -a '_builtin defaults system site user command_line' complete -c spack -n '__fish_spack_using_command mirror set' -l scope -r -d 'configuration scope to modify' complete -c spack -n '__fish_spack_using_command mirror set' -l s3-access-key-id -r -f -a s3_access_key_id diff --git a/share/spack/templates/bootstrap/spack.yaml b/share/spack/templates/bootstrap/spack.yaml index 251977d0c5b4e3..8a178d03620459 100644 --- a/share/spack/templates/bootstrap/spack.yaml +++ b/share/spack/templates/bootstrap/spack.yaml @@ -17,6 +17,8 @@ spack: root: {{ store_path }} padded_length: 0 + install_status: false + packages: python: buildable: false diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile index ee9ad6ffae03be..58d11d0a73daf0 100644 --- a/share/spack/templates/container/Dockerfile +++ b/share/spack/templates/container/Dockerfile @@ -20,7 +20,8 @@ RUN {% if os_package_update %}{{ os_packages_build.update }} \ # What we want to install and how we want to install it # is specified in a manifest file (spack.yaml) -RUN mkdir {{ paths.environment }} \ +RUN mkdir -p {{ paths.environment }} && \ +set -o noclobber \ {{ manifest }} > {{ paths.environment }}/spack.yaml # Install the software, remove unnecessary deps diff --git a/share/spack/templates/container/singularity.def b/share/spack/templates/container/singularity.def index 4d9fdd617c912d..3b8f57dfb1b86e 100644 --- a/share/spack/templates/container/singularity.def +++ b/share/spack/templates/container/singularity.def @@ -13,11 +13,6 @@ Stage: build {{ os_packages_build.clean }} {% endif %} - - {% if extra_instructions.pre_build %} - {{ extra_instructions.pre_build }} - {% endif %} - # Create the manifest file for the installation in /opt/spack-environment mkdir {{ paths.environment }} && cd {{ paths.environment }} cat << EOF > spack.yaml @@ -72,9 +67,6 @@ Stage: final ln -s {{ paths.view }} {{ paths.former_view }} {% block final_stage %} -{% if extra_instructions.pre_final %} - {{ extra_instructions.pre_final }} -{% endif %} {% if os_packages_final.list %} # Update, install and cleanup of system packages needed at run-time {% if os_package_update %} diff --git a/share/spack/templates/modules/modulefile.tcl b/share/spack/templates/modules/modulefile.tcl index d1593b88280e65..b162e3f62eb863 100644 --- a/share/spack/templates/modules/modulefile.tcl +++ b/share/spack/templates/modules/modulefile.tcl @@ -4,7 +4,7 @@ ## {{ spec.short_spec }} ## {% if configure_options %} -## Configure options: {{ configure_options }} +## Configure options: {{ configure_options | wordwrap(8192 - 23, True, "\n## ", 0) }} ## {% endif %} diff --git a/var/spack/repos/builder.test/packages/callbacks/package.py b/var/spack/repos/builder.test/packages/callbacks/package.py index 1e5fa97ef2f3fe..cbb4ce6896817c 100644 --- a/var/spack/repos/builder.test/packages/callbacks/package.py +++ b/var/spack/repos/builder.test/packages/callbacks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/custom-phases/package.py b/var/spack/repos/builder.test/packages/custom-phases/package.py index cc63250a04b395..feb50248fccfb6 100644 --- a/var/spack/repos/builder.test/packages/custom-phases/package.py +++ b/var/spack/repos/builder.test/packages/custom-phases/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/gmake/package.py b/var/spack/repos/builder.test/packages/gmake/package.py index b3d5c50086e291..5fc2748deec17e 100644 --- a/var/spack/repos/builder.test/packages/gmake/package.py +++ b/var/spack/repos/builder.test/packages/gmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/gnuconfig/package.py b/var/spack/repos/builder.test/packages/gnuconfig/package.py index ecf32e21374166..02b56896dd8af2 100644 --- a/var/spack/repos/builder.test/packages/gnuconfig/package.py +++ b/var/spack/repos/builder.test/packages/gnuconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/inheritance/package.py b/var/spack/repos/builder.test/packages/inheritance/package.py index a3028ac412f93a..241cb895a0acd3 100644 --- a/var/spack/repos/builder.test/packages/inheritance/package.py +++ b/var/spack/repos/builder.test/packages/inheritance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/old-style-autotools/package.py b/var/spack/repos/builder.test/packages/old-style-autotools/package.py index 4ace87076802f5..847be1f5672d4f 100644 --- a/var/spack/repos/builder.test/packages/old-style-autotools/package.py +++ b/var/spack/repos/builder.test/packages/old-style-autotools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py b/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py index a2f2040d1f23d1..dda28ba9ea8574 100644 --- a/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py +++ b/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builder.test/packages/old-style-derived/package.py b/var/spack/repos/builder.test/packages/old-style-derived/package.py index 352ddae0759038..2f4c1e19e406ff 100644 --- a/var/spack/repos/builder.test/packages/old-style-derived/package.py +++ b/var/spack/repos/builder.test/packages/old-style-derived/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py index ba6064bd594233..3cc214461074c5 100644 --- a/var/spack/repos/builtin.mock/packages/a/package.py +++ b/var/spack/repos/builtin.mock/packages/a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/adios2/package.py b/var/spack/repos/builtin.mock/packages/adios2/package.py index fb2f43ea0e154a..89d1a8d81c03c8 100644 --- a/var/spack/repos/builtin.mock/packages/adios2/package.py +++ b/var/spack/repos/builtin.mock/packages/adios2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py index 9c6fe207df06b6..457df3b5ddfcd0 100644 --- a/var/spack/repos/builtin.mock/packages/archive-files/package.py +++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/ascent/package.py b/var/spack/repos/builtin.mock/packages/ascent/package.py index 9a8db472dc07ab..cebedba94851f2 100644 --- a/var/spack/repos/builtin.mock/packages/ascent/package.py +++ b/var/spack/repos/builtin.mock/packages/ascent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py b/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py index 890b06807d0949..fbc44c2cf3c3a8 100644 --- a/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py +++ b/var/spack/repos/builtin.mock/packages/attributes-foo-app/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/attributes-foo/package.py b/var/spack/repos/builtin.mock/packages/attributes-foo/package.py index 5ae2c2c387f2d5..31c88f4b08564a 100644 --- a/var/spack/repos/builtin.mock/packages/attributes-foo/package.py +++ b/var/spack/repos/builtin.mock/packages/attributes-foo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py index 67e22a5591b687..736506bee791a3 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-conditional-variants-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py index ab2dc017f3c2d4..d07edd9ea8f0ae 100644 --- a/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py +++ b/var/spack/repos/builtin.mock/packages/autotools-config-replacement/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py index 1685711825f9ea..f5d212d3d439ed 100644 --- a/var/spack/repos/builtin.mock/packages/b/package.py +++ b/var/spack/repos/builtin.mock/packages/b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py index b0717a0dc8153c..7959105e956482 100644 --- a/var/spack/repos/builtin.mock/packages/boost/package.py +++ b/var/spack/repos/builtin.mock/packages/boost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py index 1366b99b37ba24..a6c623081d150e 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py index 1636f27fb874b5..c913cf9f8d3370 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py index bfb33eac6d1736..1c642a4e78e202 100644 --- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py +++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/bowtie/package.py b/var/spack/repos/builtin.mock/packages/bowtie/package.py index 91a0d148bf366e..ba5c60223bf3f5 100644 --- a/var/spack/repos/builtin.mock/packages/bowtie/package.py +++ b/var/spack/repos/builtin.mock/packages/bowtie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/brillig/package.py b/var/spack/repos/builtin.mock/packages/brillig/package.py index 56ff394c7dbd0e..6b141f2e7f3629 100644 --- a/var/spack/repos/builtin.mock/packages/brillig/package.py +++ b/var/spack/repos/builtin.mock/packages/brillig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/build-env-compiler-var-a/package.py b/var/spack/repos/builtin.mock/packages/build-env-compiler-var-a/package.py index ea6f0f34e8ee6d..001f32469de86e 100644 --- a/var/spack/repos/builtin.mock/packages/build-env-compiler-var-a/package.py +++ b/var/spack/repos/builtin.mock/packages/build-env-compiler-var-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/build-env-compiler-var-b/package.py b/var/spack/repos/builtin.mock/packages/build-env-compiler-var-b/package.py index 7905869b344de6..6854daa9331799 100644 --- a/var/spack/repos/builtin.mock/packages/build-env-compiler-var-b/package.py +++ b/var/spack/repos/builtin.mock/packages/build-env-compiler-var-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py index 2df3699822640f..71ad84a10b7fba 100644 --- a/var/spack/repos/builtin.mock/packages/build-error/package.py +++ b/var/spack/repos/builtin.mock/packages/build-error/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py index ce4af309b93e0e..55152ddfeab4da 100644 --- a/var/spack/repos/builtin.mock/packages/build-warnings/package.py +++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/bzip2/package.py b/var/spack/repos/builtin.mock/packages/bzip2/package.py index 326533ac5ea117..c703594de19f61 100644 --- a/var/spack/repos/builtin.mock/packages/bzip2/package.py +++ b/var/spack/repos/builtin.mock/packages/bzip2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py index 0ef4e2f80ac69a..2e066242af60e5 100644 --- a/var/spack/repos/builtin.mock/packages/c/package.py +++ b/var/spack/repos/builtin.mock/packages/c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py index b3343fb69255ce..a960f9866a0f44 100644 --- a/var/spack/repos/builtin.mock/packages/callpath/package.py +++ b/var/spack/repos/builtin.mock/packages/callpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py index 70125ec1cb3dfe..965e57d0e93c5e 100644 --- a/var/spack/repos/builtin.mock/packages/canfail/package.py +++ b/var/spack/repos/builtin.mock/packages/canfail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/client-not-foo/package.py b/var/spack/repos/builtin.mock/packages/client-not-foo/package.py index 03c9374b3acce1..95b60d873233f9 100644 --- a/var/spack/repos/builtin.mock/packages/client-not-foo/package.py +++ b/var/spack/repos/builtin.mock/packages/client-not-foo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cmake-client-inheritor/package.py b/var/spack/repos/builtin.mock/packages/cmake-client-inheritor/package.py index 51c56da50f78ba..b5714a23ed3a9d 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client-inheritor/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client-inheritor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py index a0694f2d6d7221..b196e089911f89 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py index a024086438633d..54cd8bc5322360 100644 --- a/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake-conditional-variants-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py index a9e21a63eeffc6..670c170eebb7a8 100644 --- a/var/spack/repos/builtin.mock/packages/cmake/package.py +++ b/var/spack/repos/builtin.mock/packages/cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py index fe87ae39c40dcb..2d9109b91e3491 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-constrained-dependencies/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py index d55f7ad694a0fc..25d3d69f371a88 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-provider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py index 52bb12d6a16d25..c955b8b8b122c2 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-values-in-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py index 76a1abd08fb41d..3b664bed99324f 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py index c975acf8a30bb5..b01000163f973e 100644 --- a/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditional-virtual-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py index 7c0b1f7d627ef5..320d47c8cb261d 100644 --- a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/configure-warning/package.py b/var/spack/repos/builtin.mock/packages/configure-warning/package.py index 9c4b349f6cb367..492025c13df480 100644 --- a/var/spack/repos/builtin.mock/packages/configure-warning/package.py +++ b/var/spack/repos/builtin.mock/packages/configure-warning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py index 58f581e477b2db..65179dd59f9e55 100644 --- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py index 9897cec4b32db2..a2b6bacae9aeb5 100644 --- a/var/spack/repos/builtin.mock/packages/conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/conflict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py index c62144a09b5973..06e9cedb671c53 100644 --- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/corge/package.py b/var/spack/repos/builtin.mock/packages/corge/package.py index 3321e9bba14d4a..1da5d31850420e 100644 --- a/var/spack/repos/builtin.mock/packages/corge/package.py +++ b/var/spack/repos/builtin.mock/packages/corge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py index fc04be3c1d6f9a..27722541ac8733 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py index b3deb4bda2e720..93c2382094fb06 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py index 95e4c7827c0291..0648b1de12b552 100644 --- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py +++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/cvs-test/package.py b/var/spack/repos/builtin.mock/packages/cvs-test/package.py index 84a616c359622d..7edd3437108011 100644 --- a/var/spack/repos/builtin.mock/packages/cvs-test/package.py +++ b/var/spack/repos/builtin.mock/packages/cvs-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py b/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py index a3f68b6a3d82c5..5996ea4a5cefd7 100644 --- a/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py +++ b/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py index 0f2330584a809f..2310c23f18c51a 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py index 725897a78abe2d..a373a0bdf4be5f 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py index 58a8c4222c6c23..3b71266e1f7892 100644 --- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py index 8b8532b10acc7f..8a1ccc5c6da425 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop-root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py index 012deca6d2d5f7..46a4d6af21e1eb 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants-if-develop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py index 84637c22719268..a769416439c11a 100644 --- a/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py +++ b/var/spack/repos/builtin.mock/packages/dep-with-variants/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/depb/package.py b/var/spack/repos/builtin.mock/packages/depb/package.py index 1d9a12ad835263..7022e3472b408e 100644 --- a/var/spack/repos/builtin.mock/packages/depb/package.py +++ b/var/spack/repos/builtin.mock/packages/depb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dependency-foo-bar/package.py b/var/spack/repos/builtin.mock/packages/dependency-foo-bar/package.py index 21e67f8a61bc12..5d7f5e98170c78 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-foo-bar/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-foo-bar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py index 790163b9a87611..6e373654674b84 100644 --- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py index c51ad7bd686d75..0bcee77d1b9f3e 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py index e987b9258c145a..ba587837d3c9c1 100644 --- a/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py +++ b/var/spack/repos/builtin.mock/packages/dependent-of-dev-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py b/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py index 51fec539904ee2..accaa6b220c661 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/depends-on-develop/package.py b/var/spack/repos/builtin.mock/packages/depends-on-develop/package.py index 8f221c98343a89..b11ce555224f3f 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-develop/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-develop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py index c269e0ff452e34..c80b3dcdebb350 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-openmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py index 8e5cd9d20a4ebc..b5a40e526d2856 100644 --- a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py index 1d0c562bc6b7ab..909da5c0264787 100644 --- a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,5 +11,9 @@ class DeprecatedVersions(Package): homepage = "http://www.example.com" url = "http://www.example.com/c-1.0.tar.gz" - version("1.1.0", md5="0123456789abcdef0123456789abcdef", deprecated=True) - version("1.0.0", md5="0123456789abcdef0123456789abcdef") + version( + "1.1.0", + sha256="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890", + deprecated=True, + ) + version("1.0.0", sha256="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890") diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py index 9bb02d0fd23043..c1932a1d1576c0 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-dependent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py index f67a39551636b1..223945e6b9b5de 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install-phases/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py index 1e0927620f7600..66490f531e0bd7 100644 --- a/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py +++ b/var/spack/repos/builtin.mock/packages/dev-build-test-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py b/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py index 16d94ec34f5f2e..a81cc8f70c6944 100644 --- a/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py index 9d1665725183a8..da986b3116b552 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/develop-test2/package.py b/var/spack/repos/builtin.mock/packages/develop-test2/package.py index 81a299c58a19b5..9cdc139d44718b 100644 --- a/var/spack/repos/builtin.mock/packages/develop-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/develop-test2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py index ba3d2d339725f9..9af8aab5389d62 100644 --- a/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py index 4d0f310d22c34b..f4d141ea254727 100644 --- a/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py +++ b/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py index f12213248cf762..84a02c336c8d82 100644 --- a/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py +++ b/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py index e40d70f5bcb5be..916fbcd098d41b 100644 --- a/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py +++ b/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py index 3a960bc830462c..e6280d9d8a2f2f 100644 --- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dla-future/package.py b/var/spack/repos/builtin.mock/packages/dla-future/package.py new file mode 100644 index 00000000000000..03a22544deb1ba --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/dla-future/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class DlaFuture(Package): + """A package that depends on 3 different virtuals, that might or might not be provided + by the same node. + """ + + homepage = "http://www.example.com" + url = "http://www.example.com/dla-1.0.tar.gz" + + version("1.0", md5="0123456789abcdef0123456789abcdef") + + depends_on("blas") + depends_on("lapack") + depends_on("scalapack") diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py index 18156fcfdcc88f..43ee6ee605de8c 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py index 5f8c494631f2a0..5ec1d3d880d065 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py index 676b4dda934864..ed07cb222fa6ca 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py index ad487e5f5e09e3..580b06682f6692 100644 --- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py index 0ba47a6ffcab2b..0f9c6e2e99ebfc 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py index 8a6bc689a41244..7aae2109ceb570 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py index 0d4bd4659ce19d..f66005cd190b69 100644 --- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py index 5cccc1e245fafb..5caf934edf0541 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py index c4f086f5fbbd65..983ec6800dc9ed 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py index 8a7f8c328529b0..08dd47a3f8317a 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py index c3d5a0d2bf4b94..3e6461eedaae87 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py index ec6c59e2e740f2..a4c9c31ca4868e 100644 --- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py +++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py index c11af01b1d4009..924f33afc763e0 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py index 7bfb3c615b892b..072ffd0bdf0d3b 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py index c71724115a75cf..9f12d17ed2dffb 100644 --- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py +++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py index 64c088e7790855..fede702bd2b4d6 100644 --- a/var/spack/repos/builtin.mock/packages/dttop/package.py +++ b/var/spack/repos/builtin.mock/packages/dttop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py index 0f3afb8d9fa6e9..e0a85120c38ec1 100644 --- a/var/spack/repos/builtin.mock/packages/dtuse/package.py +++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py index b3b36b6cfe2d9d..a7a45f2ab10e55 100644 --- a/var/spack/repos/builtin.mock/packages/dyninst/package.py +++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py index a1ed6834bd9fe8..eb0fb0e2ce8a98 100644 --- a/var/spack/repos/builtin.mock/packages/e/package.py +++ b/var/spack/repos/builtin.mock/packages/e/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py index 551783fb1a9542..c9347e66d99799 100644 --- a/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py +++ b/var/spack/repos/builtin.mock/packages/ecp-viz-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py index b8531657d3ee3f..ee91252bb80c76 100644 --- a/var/spack/repos/builtin.mock/packages/extendee/package.py +++ b/var/spack/repos/builtin.mock/packages/extendee/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/extends-spec/package.py b/var/spack/repos/builtin.mock/packages/extends-spec/package.py index d5f36010512744..74ffd9178993aa 100644 --- a/var/spack/repos/builtin.mock/packages/extends-spec/package.py +++ b/var/spack/repos/builtin.mock/packages/extends-spec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py index 3d2daf1ab8a21e..96ac127a2e86a5 100644 --- a/var/spack/repos/builtin.mock/packages/extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/extension1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py index 749154f582bdab..05e832cae544aa 100644 --- a/var/spack/repos/builtin.mock/packages/extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/extension2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py index afedaadba3eb42..1ec1561a679c9a 100644 --- a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py index 7d0976cf41529b..c2618c1773fbab 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py index c0c40b04c8eaae..a9608cc55d4ed1 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py index fc3d92ff2d16e9..eba5f24352ffdb 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-common-python/package.py b/var/spack/repos/builtin.mock/packages/external-common-python/package.py index 54aa3529ba00de..0ba169644bcc1b 100644 --- a/var/spack/repos/builtin.mock/packages/external-common-python/package.py +++ b/var/spack/repos/builtin.mock/packages/external-common-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py index 0d3baf63030a84..64543581b68961 100644 --- a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py index 4ace7a4399b3af..fb6f2e7a30f243 100644 --- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py +++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py index 15e5774a2cda30..d1f4e4fb7cf8ba 100644 --- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py +++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py index da2fe7fcdee331..2230a6c83673b8 100644 --- a/var/spack/repos/builtin.mock/packages/externaltest/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py index 7cb1ddf8369900..55bfc686b8d8e7 100644 --- a/var/spack/repos/builtin.mock/packages/externaltool/package.py +++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py index 7019240eb07346..b04f86d0d0730f 100644 --- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py b/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py index 3869d4ac684aae..54b63ed79bc7cb 100644 --- a/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py +++ b/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py index a94a65def167eb..f3a1f6fb72d305 100644 --- a/var/spack/repos/builtin.mock/packages/failing-build/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py index 4be59a332521de..84fa5686d87cfe 100644 --- a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py +++ b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py index 103e684b0527df..d20f1c28171178 100644 --- a/var/spack/repos/builtin.mock/packages/fake/package.py +++ b/var/spack/repos/builtin.mock/packages/fake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/fetch-options/package.py b/var/spack/repos/builtin.mock/packages/fetch-options/package.py index 74a1215074000d..9c6e1b966406bd 100644 --- a/var/spack/repos/builtin.mock/packages/fetch-options/package.py +++ b/var/spack/repos/builtin.mock/packages/fetch-options/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/fftw/package.py b/var/spack/repos/builtin.mock/packages/fftw/package.py index 0e25e4de81703e..e4d63aa93ea0c4 100644 --- a/var/spack/repos/builtin.mock/packages/fftw/package.py +++ b/var/spack/repos/builtin.mock/packages/fftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/find-externals1/package.py b/var/spack/repos/builtin.mock/packages/find-externals1/package.py index 495657a8074f9c..2a82fad9b552ae 100644 --- a/var/spack/repos/builtin.mock/packages/find-externals1/package.py +++ b/var/spack/repos/builtin.mock/packages/find-externals1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/flake8/package.py b/var/spack/repos/builtin.mock/packages/flake8/package.py index a7c754b83e6563..5857719552f853 100644 --- a/var/spack/repos/builtin.mock/packages/flake8/package.py +++ b/var/spack/repos/builtin.mock/packages/flake8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py index 88dd965d9e3d48..a4e32b93345c58 100644 --- a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py +++ b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/garply/package.py b/var/spack/repos/builtin.mock/packages/garply/package.py index 8070a09f1af157..7e87d563417928 100644 --- a/var/spack/repos/builtin.mock/packages/garply/package.py +++ b/var/spack/repos/builtin.mock/packages/garply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/gcc/package.py b/var/spack/repos/builtin.mock/packages/gcc/package.py index b1db22e7eb7224..31f7c95b53684b 100644 --- a/var/spack/repos/builtin.mock/packages/gcc/package.py +++ b/var/spack/repos/builtin.mock/packages/gcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py index eecbbce5633293..94054bcae6a4ea 100644 --- a/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-svn-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py index 5bdac9f3982322..66eb64e5436d09 100644 --- a/var/spack/repos/builtin.mock/packages/git-test-commit/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test-commit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index 71bb56ca5362f3..c3d216c9edc892 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-top-level/package.py index 6ec4ddf9a8dbfa..3794c664b83b3c 100644 --- a/var/spack/repos/builtin.mock/packages/git-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py index 162cc2f49b2276..0aea9493a2e58c 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-svn-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py index c7309595ddb6bd..7e3009d7dc9f8b 100644 --- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/gmake/package.py b/var/spack/repos/builtin.mock/packages/gmake/package.py index b3d5c50086e291..4ab856a3add92b 100644 --- a/var/spack/repos/builtin.mock/packages/gmake/package.py +++ b/var/spack/repos/builtin.mock/packages/gmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,7 @@ class Gmake(Package): url = "https://ftpmirror.gnu.org/make/make-4.4.tar.gz" version("4.4", sha256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed") + version("3.0", sha256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed") def do_stage(self): mkdirp(self.stage.source_path) diff --git a/var/spack/repos/builtin.mock/packages/gmt/package.py b/var/spack/repos/builtin.mock/packages/gmt/package.py index ebd37eec4828e5..b4ea55e71fdfec 100644 --- a/var/spack/repos/builtin.mock/packages/gmt/package.py +++ b/var/spack/repos/builtin.mock/packages/gmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py index 5d8bd6358d464f..6f084900bb91c3 100644 --- a/var/spack/repos/builtin.mock/packages/gnuconfig/package.py +++ b/var/spack/repos/builtin.mock/packages/gnuconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py index d59a5dbe3d4c53..403ad5918864e0 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test1/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py index ca4cf441d81246..773370e5a197aa 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test2/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hash-test3/package.py b/var/spack/repos/builtin.mock/packages/hash-test3/package.py index 0f56f5a5cb2810..3e7b79419affb1 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test3/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hash-test4/package.py b/var/spack/repos/builtin.mock/packages/hash-test4/package.py index 2008fa143a148c..e3b0557df1abba 100644 --- a/var/spack/repos/builtin.mock/packages/hash-test4/package.py +++ b/var/spack/repos/builtin.mock/packages/hash-test4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hdf5/package.py b/var/spack/repos/builtin.mock/packages/hdf5/package.py index 8df155f0601557..eeee725a67f59e 100644 --- a/var/spack/repos/builtin.mock/packages/hdf5/package.py +++ b/var/spack/repos/builtin.mock/packages/hdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hg-test/package.py b/var/spack/repos/builtin.mock/packages/hg-test/package.py index 5adb9e17e8d999..26d6a05055a9c1 100644 --- a/var/spack/repos/builtin.mock/packages/hg-test/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py index 424386f7addc04..15f64b81fd0ceb 100644 --- a/var/spack/repos/builtin.mock/packages/hg-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/hg-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py index 0b761dbedd1963..f519e24db115ca 100644 --- a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hwloc/package.py b/var/spack/repos/builtin.mock/packages/hwloc/package.py index 21b600b2f82747..e3d374ed961d6c 100644 --- a/var/spack/repos/builtin.mock/packages/hwloc/package.py +++ b/var/spack/repos/builtin.mock/packages/hwloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py index 1e7bf744f17e9b..dba700030a33db 100644 --- a/var/spack/repos/builtin.mock/packages/hypre/package.py +++ b/var/spack/repos/builtin.mock/packages/hypre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py index 8d98462a259eab..68c933e657a451 100644 --- a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py +++ b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index 7454bc45acd177..25d603cda73786 100644 --- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py index abb2fc6db6bccb..0698b5e8625f69 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py index 89f71efa67a454..c1ac8c6cc02ebc 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py index 96c2ed0ff63717..e65e1f509bdc34 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py index 88b3666bbb91b0..4fb74da427c7f6 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py index 07ecb9647f317a..e16d0fdbac3950 100644 --- a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py +++ b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py index 35ad46fd96dffa..f7c7dd67e522a7 100644 --- a/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin.mock/packages/intel-parallel-studio/package.py index 1ec5cf6932619e..88836087b14394 100644 --- a/var/spack/repos/builtin.mock/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin.mock/packages/intel-parallel-studio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py index 5799e334a1e79f..77e5e8af5c661e 100644 --- a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py +++ b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/invalid-gitlab-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-gitlab-patch-url/package.py index 527a1815e62863..a9766909ec8223 100644 --- a/var/spack/repos/builtin.mock/packages/invalid-gitlab-patch-url/package.py +++ b/var/spack/repos/builtin.mock/packages/invalid-gitlab-patch-url/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/invalid-selfhosted-gitlab-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-selfhosted-gitlab-patch-url/package.py index 818876405c26f6..5b0fe0d061cabb 100644 --- a/var/spack/repos/builtin.mock/packages/invalid-selfhosted-gitlab-patch-url/package.py +++ b/var/spack/repos/builtin.mock/packages/invalid-selfhosted-gitlab-patch-url/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py index 6552c12fe85adc..53efcb6c26b932 100644 --- a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py index 6a904a289c858f..1d460bc6ea6d82 100644 --- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py +++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py index 51703ebfce7542..31b46164ae21ef 100644 --- a/var/spack/repos/builtin.mock/packages/libelf/package.py +++ b/var/spack/repos/builtin.mock/packages/libelf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py index 1598e4bd4c6bc5..2afdb8f6d49294 100644 --- a/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py +++ b/var/spack/repos/builtin.mock/packages/libtool-deletion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/libtool-installation/package.py b/var/spack/repos/builtin.mock/packages/libtool-installation/package.py index e94fd13b7a704d..c254a6f85893e6 100644 --- a/var/spack/repos/builtin.mock/packages/libtool-installation/package.py +++ b/var/spack/repos/builtin.mock/packages/libtool-installation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/licenses-1/package.py b/var/spack/repos/builtin.mock/packages/licenses-1/package.py index d5c67830c98f2e..c298e013bf3961 100644 --- a/var/spack/repos/builtin.mock/packages/licenses-1/package.py +++ b/var/spack/repos/builtin.mock/packages/licenses-1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py index 940dea3dafc13c..4a463e443bd026 100644 --- a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py index 911bad5301d933..7ed76ea9c103cb 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py index e711cf997274dd..5f5e4ebae28605 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/maintainers-3/package.py b/var/spack/repos/builtin.mock/packages/maintainers-3/package.py index d6911c0cec7e92..371fe8a6ac6ea7 100644 --- a/var/spack/repos/builtin.mock/packages/maintainers-3/package.py +++ b/var/spack/repos/builtin.mock/packages/maintainers-3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py index 087cfb77cccac1..f9095165fe2d6f 100644 --- a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py +++ b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py index 0feb5e80014957..1da33c392486b9 100644 --- a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py index 803b844b11ccf5..2a84145ae5222f 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu-broken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py index 016f585abd7ca9..0c32f335fe9013 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-gnu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py index 86a266c8d2d7b7..d28d555e3eabd8 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge-broken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py index cfeece6a4b29b7..c74264a9034138 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceforge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py index 803b844b11ccf5..2a84145ae5222f 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/mirror-gnu-broken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py index 60515ddaabb8b2..e6cc2d0cae2fed 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware-broken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py index 8d4a601ddce775..fbceb24e7debe1 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-sourceware/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py index 26e4f64a99ca0f..00b73534a7f09b 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg-broken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py index 14c5f8e936b7a6..439eea0d3eed9d 100644 --- a/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py +++ b/var/spack/repos/builtin.mock/packages/mirror-xorg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py index 668df13978d447..043ab7981366da 100644 --- a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py index d640b32e2302a1..c2806a6188df25 100644 --- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py +++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py index 7029cef38d1bb5..669531bf44bcc4 100644 --- a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py +++ b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-long-help/package.py b/var/spack/repos/builtin.mock/packages/module-long-help/package.py index 43a0da412a8d43..8efb5fcc694d0b 100644 --- a/var/spack/repos/builtin.mock/packages/module-long-help/package.py +++ b/var/spack/repos/builtin.mock/packages/module-long-help/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-manpath-append/package.py b/var/spack/repos/builtin.mock/packages/module-manpath-append/package.py index 5f31d17a8f6a18..ec85f013895d26 100644 --- a/var/spack/repos/builtin.mock/packages/module-manpath-append/package.py +++ b/var/spack/repos/builtin.mock/packages/module-manpath-append/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-manpath-prepend/package.py b/var/spack/repos/builtin.mock/packages/module-manpath-prepend/package.py index f72a280a8e8155..9a2e2217935d80 100644 --- a/var/spack/repos/builtin.mock/packages/module-manpath-prepend/package.py +++ b/var/spack/repos/builtin.mock/packages/module-manpath-prepend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-manpath-setenv/package.py b/var/spack/repos/builtin.mock/packages/module-manpath-setenv/package.py index a3ffe1c02ef92a..722c86c6b6ce81 100644 --- a/var/spack/repos/builtin.mock/packages/module-manpath-setenv/package.py +++ b/var/spack/repos/builtin.mock/packages/module-manpath-setenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py index 981e909d19c68f..40bdc81b6808ef 100644 --- a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py +++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/module-setenv-raw/package.py b/var/spack/repos/builtin.mock/packages/module-setenv-raw/package.py index 106ff2da22a371..3c8809d13a4a52 100644 --- a/var/spack/repos/builtin.mock/packages/module-setenv-raw/package.py +++ b/var/spack/repos/builtin.mock/packages/module-setenv-raw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mpi/package.py b/var/spack/repos/builtin.mock/packages/mpi/package.py index 2568bfef2d0ca1..1e050ce247a826 100644 --- a/var/spack/repos/builtin.mock/packages/mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py index 3bfe41ab6a3de7..08338033a9847c 100644 --- a/var/spack/repos/builtin.mock/packages/mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py index 9b800d122d2b38..51b78de2a3df80 100644 --- a/var/spack/repos/builtin.mock/packages/mpich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mpileaks/package.py b/var/spack/repos/builtin.mock/packages/mpileaks/package.py index f8a08415656528..fe1c6adce9ce10 100644 --- a/var/spack/repos/builtin.mock/packages/mpileaks/package.py +++ b/var/spack/repos/builtin.mock/packages/mpileaks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py index 66ad7728be2f9d..b3c7e213035d99 100644 --- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py +++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py index 97cd5d15d9c960..fabfbce2d8c392 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-base/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py index a61640755a4fc6..8aa60faca1eb5a 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond-parent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py index 58c0afc5cf6b97..dac49f7d71c6d2 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-diamond/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py index 50448bbcc9a2d8..956ae251ccb5fe 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod-inheritor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index 2853b872848a9a..ad58ffd81906a8 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py index 52838dfce03ed5..27e44a507ce09f 100644 --- a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py index b0f7ac9501cd18..1921cfd810f32b 100644 --- a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mvapich2/package.py b/var/spack/repos/builtin.mock/packages/mvapich2/package.py index 19e630acbc8554..c9a1189377e230 100644 --- a/var/spack/repos/builtin.mock/packages/mvapich2/package.py +++ b/var/spack/repos/builtin.mock/packages/mvapich2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py index fa7d61a8f0bfe1..54ce3d19056ba3 100644 --- a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py +++ b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py index 8e0dbf351f5719..8ac037876fe2c8 100644 --- a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py +++ b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py index f1dd4148c24570..bd0d9277da9c6c 100644 --- a/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py +++ b/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py index cf40c10feef375..1c17d3e13fbb2e 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py index dd6a24ee5ec80d..50dbef4a0b1c1f 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/netlib-scalapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-scalapack/package.py index fe5d7f90a1f27d..ecf6fbcece12c7 100644 --- a/var/spack/repos/builtin.mock/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin.mock/packages/netlib-scalapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/ninja/package.py b/var/spack/repos/builtin.mock/packages/ninja/package.py index 5f19b8c5b7da4f..1da107f30fafea 100644 --- a/var/spack/repos/builtin.mock/packages/ninja/package.py +++ b/var/spack/repos/builtin.mock/packages/ninja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py b/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py index 634a661ebdfac7..d37acbddfcf925 100644 --- a/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py +++ b/var/spack/repos/builtin.mock/packages/non-existing-conditional-dep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py b/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py index bc0159fdee061c..1dfcee7d1e4492 100644 --- a/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource-bundle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/nosource-install/package.py b/var/spack/repos/builtin.mock/packages/nosource-install/package.py index 424f1577ce0bb0..5f3a4c2252f711 100644 --- a/var/spack/repos/builtin.mock/packages/nosource-install/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/nosource/package.py b/var/spack/repos/builtin.mock/packages/nosource/package.py index 2b44cf28cfc86c..3634886f23bf7e 100644 --- a/var/spack/repos/builtin.mock/packages/nosource/package.py +++ b/var/spack/repos/builtin.mock/packages/nosource/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py index ec3932f4ab2629..981ce417c61f53 100644 --- a/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion-bundle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/noversion/package.py b/var/spack/repos/builtin.mock/packages/noversion/package.py index 0f139f60559d53..9677b1003891be 100644 --- a/var/spack/repos/builtin.mock/packages/noversion/package.py +++ b/var/spack/repos/builtin.mock/packages/noversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/old-external/package.py b/var/spack/repos/builtin.mock/packages/old-external/package.py index db6419c17dde06..a03380d641f547 100644 --- a/var/spack/repos/builtin.mock/packages/old-external/package.py +++ b/var/spack/repos/builtin.mock/packages/old-external/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/old-sbang/package.py b/var/spack/repos/builtin.mock/packages/old-sbang/package.py index 2f7e8505b0efb3..dc590e1120722f 100644 --- a/var/spack/repos/builtin.mock/packages/old-sbang/package.py +++ b/var/spack/repos/builtin.mock/packages/old-sbang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py index 1273b70def2127..fa275b8d386181 100644 --- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index 33a6e20d514d63..db288b9a3b62e5 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/openmpi/package.py b/var/spack/repos/builtin.mock/packages/openmpi/package.py index ea4cb42f7a1c50..438d92aa20ecc5 100644 --- a/var/spack/repos/builtin.mock/packages/openmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/openmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py index 8d94e50524c75b..398576d6804d87 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py index 4b89ef6750b905..48fa846fdde9fe 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py index 4037623cdd035c..ae807650461ddd 100644 --- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py +++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py index 0d661cc168ebf1..8c88dbd98df647 100644 --- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py +++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py index d6d79aabb069ab..e05439272f5668 100644 --- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py index 77b3be80419ab2..e50c3ea6dcb24a 100644 --- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py +++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/parent-foo-bar/package.py b/var/spack/repos/builtin.mock/packages/parent-foo-bar/package.py index 14516566a9f7d4..064c5740571140 100644 --- a/var/spack/repos/builtin.mock/packages/parent-foo-bar/package.py +++ b/var/spack/repos/builtin.mock/packages/parent-foo-bar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/parent-foo/package.py b/var/spack/repos/builtin.mock/packages/parent-foo/package.py index 61d15231f70822..a9663566b5904d 100644 --- a/var/spack/repos/builtin.mock/packages/parent-foo/package.py +++ b/var/spack/repos/builtin.mock/packages/parent-foo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py index fb1c71033ba303..99a6f3cf087592 100644 --- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py b/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py index 17e4d522d58623..08176a63baea07 100644 --- a/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-inheritance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py index f23a8e40a002e9..dcfbe6dc47214c 100644 --- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py +++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py index 56e735eea6647d..d8a3a852a099c7 100644 --- a/var/spack/repos/builtin.mock/packages/patch/package.py +++ b/var/spack/repos/builtin.mock/packages/patch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/patchelf/package.py b/var/spack/repos/builtin.mock/packages/patchelf/package.py index 20d5892eb3f8bd..c5d4239efe7bbf 100644 --- a/var/spack/repos/builtin.mock/packages/patchelf/package.py +++ b/var/spack/repos/builtin.mock/packages/patchelf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/perl-extension/package.py b/var/spack/repos/builtin.mock/packages/perl-extension/package.py index e5675ebe1fd8fe..1ac0c5a3bf19bc 100644 --- a/var/spack/repos/builtin.mock/packages/perl-extension/package.py +++ b/var/spack/repos/builtin.mock/packages/perl-extension/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/perl/package.py b/var/spack/repos/builtin.mock/packages/perl/package.py index 1025efb2e9316b..8d86dec8f32017 100644 --- a/var/spack/repos/builtin.mock/packages/perl/package.py +++ b/var/spack/repos/builtin.mock/packages/perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/preferred-test/package.py b/var/spack/repos/builtin.mock/packages/preferred-test/package.py index 371b19d16d05cd..e63ed3016d6f30 100644 --- a/var/spack/repos/builtin.mock/packages/preferred-test/package.py +++ b/var/spack/repos/builtin.mock/packages/preferred-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,6 @@ class PreferredTest(Package): version("develop", git="https://github.com/LLNL/mpileaks.git") version( "1.0", - sha256="2e34cc4505556d1c1f085758e26f2f8eea0972db9382f051b2dcfb1d7d9e1825", + sha256="abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890", preferred=True, ) diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py index 999b78a09536ee..a6be00983db836 100644 --- a/var/spack/repos/builtin.mock/packages/printing-package/package.py +++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-extension1/package.py b/var/spack/repos/builtin.mock/packages/py-extension1/package.py index 8310500a48f4b4..428c5726e873cc 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension1/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-extension2/package.py b/var/spack/repos/builtin.mock/packages/py-extension2/package.py index c3f5211e717123..60f90e35235c6a 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension2/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-extension3/package.py b/var/spack/repos/builtin.mock/packages/py-extension3/package.py index 936639b488537f..e47bcff5542d15 100644 --- a/var/spack/repos/builtin.mock/packages/py-extension3/package.py +++ b/var/spack/repos/builtin.mock/packages/py-extension3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-pip/package.py b/var/spack/repos/builtin.mock/packages/py-pip/package.py index 13a4aed9b74a84..0e39be034dbc76 100644 --- a/var/spack/repos/builtin.mock/packages/py-pip/package.py +++ b/var/spack/repos/builtin.mock/packages/py-pip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-test-callback/package.py b/var/spack/repos/builtin.mock/packages/py-test-callback/package.py index 936772717aad64..46a16a465fca61 100644 --- a/var/spack/repos/builtin.mock/packages/py-test-callback/package.py +++ b/var/spack/repos/builtin.mock/packages/py-test-callback/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/py-wheel/package.py b/var/spack/repos/builtin.mock/packages/py-wheel/package.py index 49fcf26a56cb74..728b8aa827cbc5 100644 --- a/var/spack/repos/builtin.mock/packages/py-wheel/package.py +++ b/var/spack/repos/builtin.mock/packages/py-wheel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py index 9fbee0ec2ed45b..68cb66ae489dd7 100644 --- a/var/spack/repos/builtin.mock/packages/python/package.py +++ b/var/spack/repos/builtin.mock/packages/python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py index 6606fb73c35a79..d56c4f26428aa1 100644 --- a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/quux/package.py b/var/spack/repos/builtin.mock/packages/quux/package.py index b9159c125b4c85..61ae0283c7ef85 100644 --- a/var/spack/repos/builtin.mock/packages/quux/package.py +++ b/var/spack/repos/builtin.mock/packages/quux/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index b9e68fa11dba2c..4edbf4602ef168 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py index a031977ae23931..9f17269416ecb7 100644 --- a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/requires_clang/package.py b/var/spack/repos/builtin.mock/packages/requires_clang/package.py index 9f1c2d0ba488d5..72c00e6c10461d 100644 --- a/var/spack/repos/builtin.mock/packages/requires_clang/package.py +++ b/var/spack/repos/builtin.mock/packages/requires_clang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/requires_clang_or_gcc/package.py b/var/spack/repos/builtin.mock/packages/requires_clang_or_gcc/package.py index 18f924e92faaea..956f025e4cf671 100644 --- a/var/spack/repos/builtin.mock/packages/requires_clang_or_gcc/package.py +++ b/var/spack/repos/builtin.mock/packages/requires_clang_or_gcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py index f04dbb63d9e337..920267c136591c 100644 --- a/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py +++ b/var/spack/repos/builtin.mock/packages/root-adds-virtual/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/root/package.py b/var/spack/repos/builtin.mock/packages/root/package.py index d1a8016beaa9f1..4d71a911e91343 100644 --- a/var/spack/repos/builtin.mock/packages/root/package.py +++ b/var/spack/repos/builtin.mock/packages/root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/shell-a/package.py b/var/spack/repos/builtin.mock/packages/shell-a/package.py index 3ff34102bfd628..79b3a49c63cd93 100644 --- a/var/spack/repos/builtin.mock/packages/shell-a/package.py +++ b/var/spack/repos/builtin.mock/packages/shell-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/shell-b/package.py b/var/spack/repos/builtin.mock/packages/shell-b/package.py index 3db70f12189bcc..c65d7aea01efec 100644 --- a/var/spack/repos/builtin.mock/packages/shell-b/package.py +++ b/var/spack/repos/builtin.mock/packages/shell-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py index a6676ba5dc7c20..67042671bab85e 100644 --- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py index 1adfb9507a72b2..a68a4ffd018a80 100644 --- a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py +++ b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py index 67991f3ee638b2..f10e7daf4b3c0d 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py index a78c9aac172c5f..8c2d5854691d0c 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py index 9a58116f98d2c3..105611c2fc4711 100644 --- a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py index 33016bb815fd68..59a0b15fbf41b3 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py index 33e109fe9c25d0..4d93e03e186faa 100644 --- a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/splice-a/package.py b/var/spack/repos/builtin.mock/packages/splice-a/package.py index 43ad6e343470ad..c7e0aff6e36e4f 100644 --- a/var/spack/repos/builtin.mock/packages/splice-a/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/splice-h/package.py b/var/spack/repos/builtin.mock/packages/splice-h/package.py index 0bc30aede120b4..a54f1e7f7d683a 100644 --- a/var/spack/repos/builtin.mock/packages/splice-h/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-h/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/splice-t/package.py b/var/spack/repos/builtin.mock/packages/splice-t/package.py index f61e985b2e3718..ac4d6a452390de 100644 --- a/var/spack/repos/builtin.mock/packages/splice-t/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-t/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/splice-vh/package.py b/var/spack/repos/builtin.mock/packages/splice-vh/package.py index 729c541fe86334..23aed58c2f6ec2 100644 --- a/var/spack/repos/builtin.mock/packages/splice-vh/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-vh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/splice-z/package.py b/var/spack/repos/builtin.mock/packages/splice-z/package.py index 9143050547d0e8..ff73fbaa03701e 100644 --- a/var/spack/repos/builtin.mock/packages/splice-z/package.py +++ b/var/spack/repos/builtin.mock/packages/splice-z/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/sticky-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/sticky-variant-dependent/package.py new file mode 100644 index 00000000000000..2036a31b2878c7 --- /dev/null +++ b/var/spack/repos/builtin.mock/packages/sticky-variant-dependent/package.py @@ -0,0 +1,17 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + +class StickyVariantDependent(AutotoolsPackage): + """Package with a sticky variant and a conflict""" + + homepage = "http://www.example.com" + url = "http://www.example.com/a-1.0.tar.gz" + + version("1.0", md5="0123456789abcdef0123456789abcdef") + + depends_on("sticky-variant") + conflicts("%gcc", when="^sticky-variant~allow-gcc") diff --git a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py index 3a99e0436a552f..334b4a44bbe394 100644 --- a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/svn-test/package.py b/var/spack/repos/builtin.mock/packages/svn-test/package.py index 111217c8d77f31..d83813ef836f3f 100644 --- a/var/spack/repos/builtin.mock/packages/svn-test/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py index c913982b29839e..f6bd404efc4a0a 100644 --- a/var/spack/repos/builtin.mock/packages/svn-top-level/package.py +++ b/var/spack/repos/builtin.mock/packages/svn-top-level/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/symly/package.py b/var/spack/repos/builtin.mock/packages/symly/package.py index 89c9e9c4ebed90..c9ed28aa8a70f5 100644 --- a/var/spack/repos/builtin.mock/packages/symly/package.py +++ b/var/spack/repos/builtin.mock/packages/symly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py index fa8e48c74569c9..1214422eb6b2b6 100644 --- a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py index aadd47e335398d..bcea98c52920ef 100644 --- a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-dependency/package.py b/var/spack/repos/builtin.mock/packages/test-dependency/package.py index c6420f75fd3ad5..54f62772f64388 100644 --- a/var/spack/repos/builtin.mock/packages/test-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/test-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-error/package.py b/var/spack/repos/builtin.mock/packages/test-error/package.py index b8f37b47192daa..5974493a861dd3 100644 --- a/var/spack/repos/builtin.mock/packages/test-error/package.py +++ b/var/spack/repos/builtin.mock/packages/test-error/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-fail/package.py b/var/spack/repos/builtin.mock/packages/test-fail/package.py index 6f0416498b19ab..909af08b5977e0 100644 --- a/var/spack/repos/builtin.mock/packages/test-fail/package.py +++ b/var/spack/repos/builtin.mock/packages/test-fail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py index ed318926587057..70e888936fc160 100644 --- a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py +++ b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py index 07042a9d028da2..34b2d57b3d3920 100644 --- a/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/transitive-conditional-virtual-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py index 608e5e927045b9..44ad2ee8d5e401 100644 --- a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py +++ b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py index 4d984d22abab27..a30521003e671a 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py index f8ab1ba7c4566f..6fabda8be7cea3 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py index 694d682cff4d7d..9b877c5ef4c06e 100644 --- a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py +++ b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py index 774cf39650f8d6..19be98b3a52122 100644 --- a/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py +++ b/var/spack/repos/builtin.mock/packages/unconstrainable-conflict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py index dc56b347657f48..63f58433c141a6 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-provider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py index 84947db488c0bd..bf27f55adec7b8 100644 --- a/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py +++ b/var/spack/repos/builtin.mock/packages/unsat-virtual-dependency/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py index bf9d3dfcce34af..0beae47abcb0ca 100644 --- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py index 0e224515a77ae1..706c869522d35d 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py index 6f37b79e5ae100..7afc510e2718f8 100644 --- a/var/spack/repos/builtin.mock/packages/url-only-override/package.py +++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/url-test/package.py b/var/spack/repos/builtin.mock/packages/url-test/package.py index aedf69edf414f0..5f28f283ab1229 100644 --- a/var/spack/repos/builtin.mock/packages/url-test/package.py +++ b/var/spack/repos/builtin.mock/packages/url-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py index f8e1382fdf600c..a3ea42f6107504 100644 --- a/var/spack/repos/builtin.mock/packages/url_override/package.py +++ b/var/spack/repos/builtin.mock/packages/url_override/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/v1-consumer/package.py b/var/spack/repos/builtin.mock/packages/v1-consumer/package.py index cdf23e0ee54b55..fa4bbb8556debe 100644 --- a/var/spack/repos/builtin.mock/packages/v1-consumer/package.py +++ b/var/spack/repos/builtin.mock/packages/v1-consumer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/v1-provider/package.py b/var/spack/repos/builtin.mock/packages/v1-provider/package.py index 1aad92bd838ca0..35c5e369d31d65 100644 --- a/var/spack/repos/builtin.mock/packages/v1-provider/package.py +++ b/var/spack/repos/builtin.mock/packages/v1-provider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py index 556a2d0c1e85fd..de50002ba7dbd4 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py index 1d5c84148c05ff..31120ef3ae4b8e 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py index a573064cc657f6..8ba874292f6464 100644 --- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py +++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py index 1bb50388b2faff..fc85c778c33891 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py index 74c35eb4bc38ad..20954d90fbfcef 100644 --- a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py +++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/vendorsb/package.py b/var/spack/repos/builtin.mock/packages/vendorsb/package.py index fbf14236a10be2..ebf9c92e5590eb 100644 --- a/var/spack/repos/builtin.mock/packages/vendorsb/package.py +++ b/var/spack/repos/builtin.mock/packages/vendorsb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py index 8861bdd55a4a1c..d3562310ef70ca 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-dependency-preferred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py index d5d12ab570d358..fb2ce0a26497eb 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-pkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/version-test-root/package.py b/var/spack/repos/builtin.mock/packages/version-test-root/package.py index 941348ad7d3e62..2eed9200c1cefb 100644 --- a/var/spack/repos/builtin.mock/packages/version-test-root/package.py +++ b/var/spack/repos/builtin.mock/packages/version-test-root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py index 38b4b71b2f2db9..545735cec52684 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py index 737b4f839712f6..55e94ac4981f50 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py index a3ab6c699d9c11..249e7766061fca 100644 --- a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py +++ b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py b/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py index afe43c422b2745..8b60b5021b8586 100644 --- a/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py +++ b/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py index 3ab20787a27429..5f8bf744f823c4 100644 --- a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py +++ b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/vtk-m/package.py b/var/spack/repos/builtin.mock/packages/vtk-m/package.py index 9c1eadf4c666d8..2677ec45618ed5 100644 --- a/var/spack/repos/builtin.mock/packages/vtk-m/package.py +++ b/var/spack/repos/builtin.mock/packages/vtk-m/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py index 94ec3f7e3080f2..d29d9d83a7b605 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py index 7aa0047e2c8295..3681b02687ef57 100644 --- a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py +++ b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py index cf431ae5ec24cd..a4f6e916bb2dbd 100644 --- a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py +++ b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py index 1b88078ea95a60..00907f93256de9 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py index 8cb8b61508c66e..cef5aafe472b5f 100644 --- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py +++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/zlib/package.py b/var/spack/repos/builtin.mock/packages/zlib/package.py index fa45ad87e45ed7..30bec012543f71 100644 --- a/var/spack/repos/builtin.mock/packages/zlib/package.py +++ b/var/spack/repos/builtin.mock/packages/zlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py index 1e27b35c29a940..0a71e47038e2a9 100644 --- a/var/spack/repos/builtin.mock/packages/zmpi/package.py +++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/3dtk/package.py b/var/spack/repos/builtin/packages/3dtk/package.py index a3bac5bb6771b3..d606757286b663 100644 --- a/var/spack/repos/builtin/packages/3dtk/package.py +++ b/var/spack/repos/builtin/packages/3dtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/3proxy/package.py b/var/spack/repos/builtin/packages/3proxy/package.py index 78e52895145b65..ed6f19609493f1 100644 --- a/var/spack/repos/builtin/packages/3proxy/package.py +++ b/var/spack/repos/builtin/packages/3proxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/7zip/package.py b/var/spack/repos/builtin/packages/7zip/package.py index 123e233ab188d2..d404510a3f9297 100644 --- a/var/spack/repos/builtin/packages/7zip/package.py +++ b/var/spack/repos/builtin/packages/7zip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class _7zip(SourceforgePackage, Package): executables = ["7z"] + license("LGPL-2.0-only") + version("21.07", sha256="213d594407cb8efcba36610b152ca4921eda14163310b43903d13e68313e1e39") variant( diff --git a/var/spack/repos/builtin/packages/abacus/package.py b/var/spack/repos/builtin/packages/abacus/package.py index ccf89f82b8db66..68cfbfea75ff49 100644 --- a/var/spack/repos/builtin/packages/abacus/package.py +++ b/var/spack/repos/builtin/packages/abacus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Abacus(MakefilePackage): git = "https://github.com/abacusmodeling/abacus-develop.git" url = "https://github.com/abacusmodeling/abacus-develop/archive/refs/tags/v2.2.1.tar.gz" + license("LGPL-3.0-or-later") + version("develop", branch="develop") version("2.2.3", sha256="88dbf6a3bdd907df3e097637ec8e51fde13e2f5e0b44f3667443195481320edf") version("2.2.2", sha256="4a7cf2ec6e43dd5c53d5f877a941367074f4714d93c1977a719782957916169e") diff --git a/var/spack/repos/builtin/packages/abduco/package.py b/var/spack/repos/builtin/packages/abduco/package.py index 9c3ea0c4487961..21a075e0f513e8 100644 --- a/var/spack/repos/builtin/packages/abduco/package.py +++ b/var/spack/repos/builtin/packages/abduco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Abduco(MakefilePackage): homepage = "https://github.com/martanne/abduco" url = "https://github.com/martanne/abduco/archive/v0.6.tar.gz" + license("ISC") + version("0.6", sha256="647d0381418f43a38f861d151b0efb2e3458ec651914e7d477956768b0af9bb7") version("0.5", sha256="bf22226a4488355a7001a5dabbd1e8e3b7e7645efd1519274b956fcb8bcff086") version("0.4", sha256="bda3729df116ce41f9a087188d71d934da2693ffb1ebcf33b803055eb478bcbb") diff --git a/var/spack/repos/builtin/packages/abi-compliance-checker/package.py b/var/spack/repos/builtin/packages/abi-compliance-checker/package.py index 6f575badd208dc..ef2f01b4297197 100644 --- a/var/spack/repos/builtin/packages/abi-compliance-checker/package.py +++ b/var/spack/repos/builtin/packages/abi-compliance-checker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class AbiComplianceChecker(MakefilePackage): homepage = "https://github.com/lvc/abi-compliance-checker" url = "https://github.com/lvc/abi-compliance-checker/archive/2.3.tar.gz" + license("LGPL-2.1-or-later") + version("2.3", sha256="b1e32a484211ec05d7f265ab4d2c1c52dcdb610708cb3f74d8aaeb7fe9685d64") version("2.2", sha256="9fb7b17e33d49e301d02a6374fbd2596feb53ecc77194879a4e1c2d1e24b4ddb") version("2.1", sha256="0e19ea16b6c6aa6c7b222063127427bef3b835adbbd9e6606a972a912599d014") diff --git a/var/spack/repos/builtin/packages/abi-dumper/package.py b/var/spack/repos/builtin/packages/abi-dumper/package.py index 584eed3664cdd0..a462a3678181ce 100644 --- a/var/spack/repos/builtin/packages/abi-dumper/package.py +++ b/var/spack/repos/builtin/packages/abi-dumper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class AbiDumper(Package): homepage = "https://github.com/lvc/abi-dumper" url = "https://github.com/lvc/abi-dumper/archive/1.2.tar.gz" + license("LGPL-2.1-or-later") + version("1.2", sha256="8a9858c91b4e9222c89b676d59422053ad560fa005a39443053568049bd4d27e") version("1.1", sha256="ef63201368e0d76a29d2f7aed98c488f6fb71898126762d65baed1e762988083") version("1.0", sha256="bfa0189a172fa788afc603b1ae675808a57556a77a008e4af8f643d396c34bbb") diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py index 9f0938daf1433b..37ff8afb9c0074 100644 --- a/var/spack/repos/builtin/packages/abinit/package.py +++ b/var/spack/repos/builtin/packages/abinit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,10 @@ class Abinit(AutotoolsPackage): homepage = "https://www.abinit.org/" url = "https://www.abinit.org/sites/default/files/packages/abinit-8.6.3.tar.gz" + license("Apache-2.0") + + maintainers("downloadico") + version("9.10.3", sha256="3f2a9aebbf1fee9855a09dd687f88d2317b8b8e04f97b2628ab96fb898dce49b") version("9.8.4", sha256="a086d5045f0093b432e6a044d5f71f7edf5a41a62d67b3677cb0751d330c564a") version("9.8.3", sha256="de823878aea2c20098f177524fbb4b60de9b1b5971b2e835ec244dfa3724589b") version("9.6.1", sha256="b6a12760fd728eb4aacca431ae12150609565bedbaa89763f219fcd869f79ac6") @@ -143,19 +147,27 @@ def configure_args(self): oapp(f"--with-optim-flavor={self.spec.variants['optimization-flavor'].value}") if "+wannier90" in spec: - if "@:8" in spec: + if spec.satisfies("@:8"): oapp(f"--with-wannier90-libs=-L{spec['wannier90'].prefix.lib} -lwannier -lm") oapp(f"--with-wannier90-incs=-I{spec['wannier90'].prefix.modules}") oapp(f"--with-wannier90-bins={spec['wannier90'].prefix.bin}") oapp("--enable-connectors") oapp("--with-dft-flavor=atompaw+libxc+wannier90") - else: + elif spec.satisfies("@:9.8"): options.extend( [ f"WANNIER90_CPPFLAGS=-I{spec['wannier90'].prefix.modules}", f"WANNIER90_LIBS=-L{spec['wannier90'].prefix.lib} -lwannier", ] ) + else: + options.extend( + [ + f"WANNIER90_CPPFLAGS=-I{spec['wannier90'].prefix.modules}", + f"WANNIER90_LIBS=-L{spec['wannier90'].prefix.lib}", + "WANNIER90_LDFLAGS=-lwannier", + ] + ) else: if "@:9.8" in spec: oapp(f"--with-fftw={spec['fftw-api'].prefix}") @@ -169,7 +181,10 @@ def configure_args(self): if "+mpi" in spec: oapp(f"CC={spec['mpi'].mpicc}") oapp(f"CXX={spec['mpi'].mpicxx}") - oapp(f"FC={spec['mpi'].mpifc}") + if spec.satisfies("@9.8:"): + oapp(f"F90={spec['mpi'].mpifc}") + else: + oapp(f"FC={spec['mpi'].mpifc}") # MPI version: # let the configure script auto-detect MPI support from mpi_prefix diff --git a/var/spack/repos/builtin/packages/abseil-cpp/package.py b/var/spack/repos/builtin/packages/abseil-cpp/package.py index a6b69015f8d9f2..1bc0955a0f0817 100644 --- a/var/spack/repos/builtin/packages/abseil-cpp/package.py +++ b/var/spack/repos/builtin/packages/abseil-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class AbseilCpp(CMakePackage): maintainers("jcftang") tags = ["windows"] + license("Apache-2.0") + + version( + "20230802.1", sha256="987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed" + ) version( "20230125.3", sha256="5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36" ) diff --git a/var/spack/repos/builtin/packages/abyss/package.py b/var/spack/repos/builtin/packages/abyss/package.py index 1cb46a8957eed1..ec7af42fada492 100644 --- a/var/spack/repos/builtin/packages/abyss/package.py +++ b/var/spack/repos/builtin/packages/abyss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/accfft/package.py b/var/spack/repos/builtin/packages/accfft/package.py index eb99aec48492d9..d3a4b91c035239 100644 --- a/var/spack/repos/builtin/packages/accfft/package.py +++ b/var/spack/repos/builtin/packages/accfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Accfft(CMakePackage, CudaPackage): homepage = "http://accfft.org" git = "https://github.com/amirgholami/accfft.git" + license("GPL-2.0-only") + version("develop", branch="master") variant("pnetcdf", default=True, description="Add support for parallel NetCDF") diff --git a/var/spack/repos/builtin/packages/acct/package.py b/var/spack/repos/builtin/packages/acct/package.py index b9a77e270d2d0a..2f0181bd085114 100644 --- a/var/spack/repos/builtin/packages/acct/package.py +++ b/var/spack/repos/builtin/packages/acct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Acct(AutotoolsPackage): homepage = "https://www.gnu.org/software/acct" url = "https://ftp.gnu.org/gnu/acct/acct-6.6.4.tar.gz" + license("GPL-3.0-or-later") + version("6.6.4", sha256="4c15bf2b58b16378bcc83f70e77d4d40ab0b194acf2ebeefdb507f151faa663f") version("6.6.3", sha256="5eae79323bf1ce403704d2b70483c46e7c853276ee7b5ad561ec3ccae9fca093") version("6.6.2", sha256="8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101") diff --git a/var/spack/repos/builtin/packages/accumulo/package.py b/var/spack/repos/builtin/packages/accumulo/package.py index 85c4eb82033baa..dea471e673d70c 100644 --- a/var/spack/repos/builtin/packages/accumulo/package.py +++ b/var/spack/repos/builtin/packages/accumulo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Accumulo(MavenPackage): homepage = "https://accumulo.apache.org/" url = "https://github.com/apache/accumulo/archive/rel/2.0.1.tar.gz" + license("Apache-2.0") + version("2.0.1", sha256="2756ac14e850b30ad9bd1043418d621b93307d083f84904cd8fac5c8beec751b") version("2.0.0", sha256="2564056dc24398aa464763c21bae10ef09356fe3261600d27744071cf965c265") version("1.9.3", sha256="d9548d5b9cf9f494f027f0fe59d5d6d45d09064359d7761cade62991ce2a5d0c") diff --git a/var/spack/repos/builtin/packages/ace/package.py b/var/spack/repos/builtin/packages/ace/package.py index afd164fc31527c..3ca7cbf6d140d1 100644 --- a/var/spack/repos/builtin/packages/ace/package.py +++ b/var/spack/repos/builtin/packages/ace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ace(MakefilePackage): homepage = "https://www.dre.vanderbilt.edu/~schmidt/ACE.html" url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.1.tar.gz" + license("DOC") + version("7.1.0", sha256="d78d9f3f2dee6ccb46a8c296367369349054fd475dff3c5b36e2dff3dee0bf8f") version("6.5.12", sha256="de96c68a6262d6b9ba76b5057c02c7e6964c070b1328a63bf70259e9530a7996") version("6.5.6", sha256="7717cad84d4a9c3d6b2c47963eb555d96de0be657870bcab6fcef4c0423af0de") diff --git a/var/spack/repos/builtin/packages/acfl/package.py b/var/spack/repos/builtin/packages/acfl/package.py index bbe476a0198770..fefab9b5742275 100644 --- a/var/spack/repos/builtin/packages/acfl/package.py +++ b/var/spack/repos/builtin/packages/acfl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ack/package.py b/var/spack/repos/builtin/packages/ack/package.py index 320f9e818cc60a..0dc6d399d97b5d 100644 --- a/var/spack/repos/builtin/packages/ack/package.py +++ b/var/spack/repos/builtin/packages/ack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ack(Package): homepage = "https://beyondgrep.com/" url = "https://beyondgrep.com/ack-2.14-single-file" + license("Artistic-2.0") + version( "2.22", sha256="fd0617585b88517a3d41d3d206c1dc38058c57b90dfd88c278049a41aeb5be38", diff --git a/var/spack/repos/builtin/packages/acl/package.py b/var/spack/repos/builtin/packages/acl/package.py index 1dbb16dfbafc48..ba30afbf22548a 100644 --- a/var/spack/repos/builtin/packages/acl/package.py +++ b/var/spack/repos/builtin/packages/acl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Acl(AutotoolsPackage): homepage = "https://savannah.nongnu.org/projects/acl" url = "https://git.savannah.nongnu.org/cgit/acl.git/snapshot/acl-2.2.53.tar.gz" + license("LGPL-2.1-or-later AND GPL-2.0-or-later", checked_by="tgamblin") + version("2.2.53", sha256="9e905397ac10d06768c63edd0579c34b8431555f2ea8e8f2cee337b31f856805") version("2.2.52", sha256="f3f31d2229c903184ff877aa0ee658b87ec20fec8aebb51e65eaa68d7b24e629") version("2.2.51", sha256="31a43d96a274a39bfcb805fb903d45840515344884d224cef166b482693a9f48") diff --git a/var/spack/repos/builtin/packages/acpica-tools/package.py b/var/spack/repos/builtin/packages/acpica-tools/package.py index c9d063a5a975f1..5c0dc148470de1 100644 --- a/var/spack/repos/builtin/packages/acpica-tools/package.py +++ b/var/spack/repos/builtin/packages/acpica-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/acpid/package.py b/var/spack/repos/builtin/packages/acpid/package.py index 7b73b2fe8f0d53..00af2a543ee051 100644 --- a/var/spack/repos/builtin/packages/acpid/package.py +++ b/var/spack/repos/builtin/packages/acpid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Acpid(AutotoolsPackage): homepage = "http://www.tedfelix.com" url = "https://github.com/Distrotech/acpid/archive/2.0.28.tar.gz" + license("GPL-2.0-or-later") + version("2.0.28", sha256="cb5709b96f85e1bfee7a3fc17e56bef7244caa1b0ad762a4813fe731ef3c8438") version("2.0.27", sha256="da4691f408d9ef201937eaab7c894072ee8aa0ba35794f2388b606b3208fab07") version("2.0.26", sha256="ac7238dc5ecc9a915e95d5b54be12b6221d0a0ad09109f9024e50946ecd3c602") diff --git a/var/spack/repos/builtin/packages/activeharmony/package.py b/var/spack/repos/builtin/packages/activeharmony/package.py index 62af3515b9051c..caaaafa58534e8 100644 --- a/var/spack/repos/builtin/packages/activeharmony/package.py +++ b/var/spack/repos/builtin/packages/activeharmony/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Activeharmony(MakefilePackage): homepage = "https://www.dyninst.org/harmony" url = "https://www.dyninst.org/sites/default/files/downloads/harmony/ah-4.5.tar.gz" + license("LGPL-3.0-only") + version("4.6.0", sha256="9ce5009cfd8e2f4cf5f3536e1fea9993414fc25920fc90d0a2cb56f044787dbb") version("4.5", sha256="31d9990c8dd36724d336707d260aa4d976e11eaa899c4c7cc11f80a56cdac684") diff --git a/var/spack/repos/builtin/packages/activemq/package.py b/var/spack/repos/builtin/packages/activemq/package.py index 68d856f1997f38..7b1add648ad08c 100644 --- a/var/spack/repos/builtin/packages/activemq/package.py +++ b/var/spack/repos/builtin/packages/activemq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Activemq(Package): homepage = "https://archive.apache.org/dist/activemq" url = "https://archive.apache.org/dist/activemq/5.14.0/apache-activemq-5.14.0-bin.tar.gz" + license("Apache-2.0") + version("5.17.3", sha256="a4cc4c3a2f136707c2c696f3bb3ee2a86dbeff1b9eb5e237b14edc0c5e5a328f") # https://nvd.nist.gov/vuln/detail/CVE-2018-11775 diff --git a/var/spack/repos/builtin/packages/acts-dd4hep/package.py b/var/spack/repos/builtin/packages/acts-dd4hep/package.py index d782160d43720a..5aa29c7c20c0b1 100644 --- a/var/spack/repos/builtin/packages/acts-dd4hep/package.py +++ b/var/spack/repos/builtin/packages/acts-dd4hep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index f474b92cc98c99..9e51a1806ccf0b 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -37,9 +37,15 @@ class Acts(CMakePackage, CudaPackage): tags = ["hep"] + license("MPL-2.0") + # Supported Acts versions version("main", branch="main") version("master", branch="main", deprecated=True) # For compatibility + version("32.0.0", commit="9385e36691bb2687437c39ad02ddb2ac21acccdc", submodules=True) + version("31.2.0", commit="1d2e90f534ff2c9bf1c40914980b426f4b5d3096", submodules=True) + version("31.1.0", commit="95c3ceef79a7b68fcfc7fd558c3134d0c7529dac", submodules=True) + version("31.0.0", commit="2cf3fe0254d2bf9434899fdcfbe316366a970956", submodules=True) version("30.3.2", commit="76826f208f5929d8326798c87263f2563d0ae7e9", submodules=True) version("30.3.1", commit="bbee459dd93855417d5717d53cbbb2bace7de2bb", submodules=True) version("30.3.0", commit="311acb9ab41c2d79a4b90b193e5b25297182d670", submodules=True) @@ -223,7 +229,7 @@ class Acts(CMakePackage, CudaPackage): variant("identification", default=False, description="Build the Identification plugin") variant("json", default=False, description="Build the Json plugin") variant("legacy", default=False, description="Build the Legacy package") - variant("mlpack", default=False, description="Build MLpack plugin", when="@25:") + variant("mlpack", default=False, description="Build MLpack plugin", when="@25:31") variant("onnx", default=False, description="Build ONNX plugin") variant("odd", default=False, description="Build the Open Data Detector", when="@19.1:") variant("podio", default=False, description="Build Podio plugin", when="@30.3:") @@ -287,12 +293,14 @@ class Acts(CMakePackage, CudaPackage): # Build dependencies depends_on("acts-dd4hep", when="@19 +dd4hep") - depends_on("actsvg@0.4.20:", when="@20.1: +svg") - depends_on("actsvg@0.4.28:", when="@23.2: +svg") - depends_on("actsvg@0.4.29:", when="@23.4: +svg") - depends_on("actsvg@0.4.30:", when="@23.5: +svg") - depends_on("actsvg@0.4.33:", when="@25:27 +svg") - depends_on("actsvg@0.4.35:", when="@28: +svg") + with when("+svg"): + depends_on("actsvg@0.4.20:", when="@20.1:") + depends_on("actsvg@0.4.28:", when="@23.2:") + depends_on("actsvg@0.4.29:", when="@23.4:") + depends_on("actsvg@0.4.30:", when="@23.5:") + depends_on("actsvg@0.4.33:", when="@25:27") + depends_on("actsvg@0.4.35:", when="@28:") + depends_on("actsvg@0.4.39:", when="@32:") depends_on("autodiff @0.6:", when="@17: +autodiff") depends_on("autodiff @0.5.11:0.5.99", when="@1.2:16 +autodiff") depends_on("boost @1.62:1.69 +program_options +test", when="@:0.10.3") @@ -453,10 +461,6 @@ def plugin_cmake_variant(plugin_name, spack_variant): if cuda_arch != "none": args.append(f"-DCUDA_FLAGS=-arch=sm_{cuda_arch[0]}") - if "+python" in spec: - python = spec["python"].command.path - args.append(f"-DPython_EXECUTABLE={python}") - args.append(self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd")) return args diff --git a/var/spack/repos/builtin/packages/actsvg/package.py b/var/spack/repos/builtin/packages/actsvg/package.py index ccf603ed13ea64..78eaa5597aeb73 100644 --- a/var/spack/repos/builtin/packages/actsvg/package.py +++ b/var/spack/repos/builtin/packages/actsvg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,9 @@ class Actsvg(CMakePackage): maintainers("HadrienG2", "wdconinc") + license("MPL-2.0") + + version("0.4.39", sha256="2d9605ecf8c9975d600cafb6d076969d77c634fa92844bd9586c38066da31739") version("0.4.35", sha256="693a4cc0e702842072a478c913895ed3596350ffdfa87f5d296ddd6ea36b61c6") version("0.4.33", sha256="25c93b8382bdb1864b4d8de64b146fe8ea86eec84048d594c375700d2fff1d1d") version("0.4.30", sha256="f7ffea39b3132914fcbb0fac6ab7395bef295cd6078dfd1c2509fd2d9aab0acb") @@ -28,6 +31,9 @@ class Actsvg(CMakePackage): variant("examples", default=False, description="Build the example applications") variant("meta", default=True, description="Build the meta level interface") + variant( + "web", default=True, when="@0.4.36:", description="Build the webpage builder interface" + ) depends_on("boost +program_options", type="test") depends_on("boost +program_options", when="+examples") @@ -37,6 +43,7 @@ def cmake_args(self): args = [ self.define_from_variant("ACTSVG_BUILD_EXAMPLES", "examples"), self.define_from_variant("ACTSVG_BUILD_META", "meta"), + self.define_from_variant("ACTSVG_BUILD_WEB", "web"), self.define("ACTSVG_BUILD_TESTING", self.run_tests), ] return args diff --git a/var/spack/repos/builtin/packages/additivefoam/package.py b/var/spack/repos/builtin/packages/additivefoam/package.py index 3141c4b6ee8a8b..7e7d3735ef6b43 100644 --- a/var/spack/repos/builtin/packages/additivefoam/package.py +++ b/var/spack/repos/builtin/packages/additivefoam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Additivefoam(Package): tags = ["ecp"] + license("GPL-3.0-only") + version("main", branch="main") version("1.0.0", sha256="abbdf1b0230cd2f26f526be76e973f508978611f404fe8ec4ecdd7d5df88724c") diff --git a/var/spack/repos/builtin/packages/addrwatch/package.py b/var/spack/repos/builtin/packages/addrwatch/package.py index 82711722ee347a..e04575b2e2a4f7 100644 --- a/var/spack/repos/builtin/packages/addrwatch/package.py +++ b/var/spack/repos/builtin/packages/addrwatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Addrwatch(AutotoolsPackage): homepage = "https://github.com/fln/addrwatch" url = "https://github.com/fln/addrwatch/releases/download/v1.0.2/addrwatch-1.0.2.tar.gz" + license("GPL-3.0-or-later") + version("1.0.2", sha256="f04e143da881cd63c299125b592cfb85e4812abbd146f419a1894c00f2ae6208") version("1.0.1", sha256="f772b62b1c6570b577473e7c98614dad1124352b377324cbebb36360d8f4ce5a") diff --git a/var/spack/repos/builtin/packages/adept-utils/package.py b/var/spack/repos/builtin/packages/adept-utils/package.py index c836e21c5045fa..5a542e3ab81d73 100644 --- a/var/spack/repos/builtin/packages/adept-utils/package.py +++ b/var/spack/repos/builtin/packages/adept-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/adf/package.py b/var/spack/repos/builtin/packages/adf/package.py index 244087f1116027..c95ca95fa528df 100644 --- a/var/spack/repos/builtin/packages/adf/package.py +++ b/var/spack/repos/builtin/packages/adf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/adiak/package.py b/var/spack/repos/builtin/packages/adiak/package.py index 05f936e3f92c5a..c9640c586e6e95 100644 --- a/var/spack/repos/builtin/packages/adiak/package.py +++ b/var/spack/repos/builtin/packages/adiak/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,9 +19,12 @@ class Adiak(CMakePackage): variant("mpi", default=True, description="Build with MPI support") variant("shared", default=True, description="Build dynamic libraries") + license("MIT") + version( - "0.2.2", commit="3aedd494c81c01df1183af28bc09bade2fabfcd3", submodules=True, preferred=True + "0.4.0", commit="7e8b7233f8a148b402128ed46b2f0c643e3b397e", submodules=True, preferred=True ) + version("0.2.2", commit="3aedd494c81c01df1183af28bc09bade2fabfcd3", submodules=True) version( "0.3.0-alpha", commit="054d2693a977ed0e1f16c665b4966bb90924779e", diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 86bc26e89e9046..3b5e3bcbe19072 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch b/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch new file mode 100644 index 00000000000000..01586c734a0c67 --- /dev/null +++ b/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch @@ -0,0 +1,23 @@ +From 5aed0d5c3ecb7afbd56a786243b2bc8811e0fbdd Mon Sep 17 00:00:00 2001 +From: Axel Huebl +Date: Fri, 14 May 2021 18:22:19 -0700 +Subject: [PATCH] Fix Broken Endinage Reverse Compile + +Add right type in comparison. +--- + source/adios2/helper/adiosMemory.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/adios2/helper/adiosMemory.cpp b/source/adios2/helper/adiosMemory.cpp +index c3a4246a91..3bf8c89adc 100644 +--- a/source/adios2/helper/adiosMemory.cpp ++++ b/source/adios2/helper/adiosMemory.cpp +@@ -29,7 +29,7 @@ void CopyPayloadStride(const char *src, const size_t payloadStride, char *dest, + #ifdef ADIOS2_HAVE_ENDIAN_REVERSE + if (endianReverse) + { +- if (destType == "") ++ if (destType == DataType::None) + { + } + #define declare_type(T) \ diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 4a038ddcacafc5..2f70cd0582c624 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,7 +22,12 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage): tags = ["e4s"] + license("Apache-2.0") + version("master", branch="master") + version( + "2.10.0-rc1", sha256="8b72142bd5aabfb80c7963f524df11b8721c09ef20caea6df5fb00c31a7747c0" + ) version( "2.9.2", sha256="78309297c82a95ee38ed3224c98b93d330128c753a43893f63bbe969320e4979", @@ -212,6 +217,10 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage): sha256="8221073d1b2f8944395a88a5d60a15c7370646b62f5fc6309867bbb6a8c2096c", ) + # Fix mismatched datatypes in comparison + # See https://github.com/ornladios/ADIOS2/pull/2701 + patch("2.7.1-fix-broken-endian-reverse-compile.patch", when="@2.7.1") + # cmake: find threads package first # https://github.com/ornladios/ADIOS2/pull/3893 patch("2.9.2-cmake-find-threads-package-first.patch", when="@2.9.2:") @@ -283,10 +292,6 @@ def cmake_args(self): if "%fj" in spec: args.extend(["-DCMAKE_Fortran_SUBMODULE_EXT=.smod", "-DCMAKE_Fortran_SUBMODULE_SEP=."]) - if "+python" in spec or self.run_tests: - args.append(f"-DPYTHON_EXECUTABLE:FILEPATH={spec['python'].command.path}") - args.append(f"-DPython_EXECUTABLE:FILEPATH={spec['python'].command.path}") - # hip support if "+cuda" in spec: args.append(self.builder.define_cuda_architectures(self)) diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index dcc87b6d1adc83..8e8bddbfd80793 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/admixtools/package.py b/var/spack/repos/builtin/packages/admixtools/package.py index f0461d8c3487cc..434ee26ecf3f35 100644 --- a/var/spack/repos/builtin/packages/admixtools/package.py +++ b/var/spack/repos/builtin/packages/admixtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/adms/package.py b/var/spack/repos/builtin/packages/adms/package.py index 3da07c53a884cc..fac47fa602c0eb 100644 --- a/var/spack/repos/builtin/packages/adms/package.py +++ b/var/spack/repos/builtin/packages/adms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Adms(AutotoolsPackage): maintainers("cessenat") + license("GPL-3.0-only") + version("master", branch="master") version("2.3.7", sha256="3a78e1283ecdc3f356410474b3ff44c4dcc82cb89772087fd3bbde8a1038ce08") diff --git a/var/spack/repos/builtin/packages/adol-c/package.py b/var/spack/repos/builtin/packages/adol-c/package.py index 475edbd088e715..749adc5e3ed98e 100644 --- a/var/spack/repos/builtin/packages/adol-c/package.py +++ b/var/spack/repos/builtin/packages/adol-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class AdolC(AutotoolsPackage): git = "https://github.com/coin-or/ADOL-C.git" maintainers("jppelteret") + license("EPL-1.0") + version("master", branch="master") version("2.7.2", sha256="701e0856baae91b98397960d5e0a87a549988de9d4002d0e9a56fa08f5455f6e") version("2.7.1", sha256="a05422cc7faff5700e134e113822d1934fb540ad247e63778524d5d6d75bb0ef") diff --git a/var/spack/repos/builtin/packages/advancecomp/package.py b/var/spack/repos/builtin/packages/advancecomp/package.py index 176ce547c17e40..362de3ab527816 100644 --- a/var/spack/repos/builtin/packages/advancecomp/package.py +++ b/var/spack/repos/builtin/packages/advancecomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Advancecomp(AutotoolsPackage): homepage = "https://www.advancemame.it" url = "https://github.com/amadvance/advancecomp/archive/v2.1.tar.gz" + license("GPL-3.0-or-later") + version("2.5", sha256="b6b4333453f028565896dd3547bc930f062df82832d7992cc130ca951c2890a1") version("2.1", sha256="6113c2b6272334af710ba486e8312faa3cee5bd6dc8ca422d00437725e2b602a") version("2.0", sha256="caa63332cd141db17988eb89c662cf76bdde72f60d4de7cb0fe8c7e51eb40eb7") diff --git a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py index 817b1fdfb4494f..636d8bff45bea4 100644 --- a/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py +++ b/var/spack/repos/builtin/packages/adwaita-icon-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class AdwaitaIconTheme(AutotoolsPackage): homepage = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" url = "https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.38/adwaita-icon-theme-3.38.0.tar.xz" + license("LGPL-3.0-or-later OR CC-BY-SA-3.0") + version("3.38.0", sha256="6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97") depends_on("gdk-pixbuf", type="build") diff --git a/var/spack/repos/builtin/packages/aegean/package.py b/var/spack/repos/builtin/packages/aegean/package.py index cb3cb11c492453..90d89a635fe8b2 100644 --- a/var/spack/repos/builtin/packages/aegean/package.py +++ b/var/spack/repos/builtin/packages/aegean/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Aegean(MakefilePackage): homepage = "https://brendelgroup.github.io/AEGeAn/" url = "https://github.com/BrendelGroup/AEGeAn/archive/v0.15.2.tar.gz" + license("0BSD") + version("0.15.2", sha256="734c9dd23ab3415c3966083bfde5fb72c81e6ace84e08ee3fe0d4c338331d975") depends_on("genometools") diff --git a/var/spack/repos/builtin/packages/aeskeyfind/package.py b/var/spack/repos/builtin/packages/aeskeyfind/package.py index b4f76f17021d9a..5b8912c52d7e28 100644 --- a/var/spack/repos/builtin/packages/aeskeyfind/package.py +++ b/var/spack/repos/builtin/packages/aeskeyfind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aespipe/package.py b/var/spack/repos/builtin/packages/aespipe/package.py index d81d45908b9f27..66580750f04d2f 100644 --- a/var/spack/repos/builtin/packages/aespipe/package.py +++ b/var/spack/repos/builtin/packages/aespipe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Aespipe(AutotoolsPackage): homepage = "http://loop-aes.sourceforge.net/" url = "https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4f/aespipe-v2.4f.tar.bz2" + license("Intel") + version("2.4f", sha256="b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96") version("2.4e", sha256="bad5abb8678c2a6062d22b893171623e0c8e6163b5c1e6e5086e2140e606b93a") version("2.4d", sha256="c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f") diff --git a/var/spack/repos/builtin/packages/agile/package.py b/var/spack/repos/builtin/packages/agile/package.py index 1b8774c3839763..e2f31ed2a4d4ce 100644 --- a/var/spack/repos/builtin/packages/agile/package.py +++ b/var/spack/repos/builtin/packages/agile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Agile(AutotoolsPackage): maintainers("vvolkl") + license("GPL-2.0-only") + version("1.5.1", sha256="e38536300060e4b845ccaaed824c7495944f9117a0d7e4ee74a18bf278e2012f") depends_on("hepmc") diff --git a/var/spack/repos/builtin/packages/agrep/package.py b/var/spack/repos/builtin/packages/agrep/package.py index 5615723596381c..505a248f11edce 100644 --- a/var/spack/repos/builtin/packages/agrep/package.py +++ b/var/spack/repos/builtin/packages/agrep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Agrep(MakefilePackage): homepage = "https://www.tgries.de/agrep" url = "https://www.tgries.de/agrep/agrep-3.41.tgz" + license("GPL-2.0-or-later") + version("3.41", sha256="0508eafaf9725fc67cc955eb6d32ba4f50138443a4fea4275508d2c3f67a234e") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/aida/package.py b/var/spack/repos/builtin/packages/aida/package.py index a9c2a329f3f7ef..d6dabd67af6c59 100644 --- a/var/spack/repos/builtin/packages/aida/package.py +++ b/var/spack/repos/builtin/packages/aida/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/akantu/package.py b/var/spack/repos/builtin/packages/akantu/package.py index bba92edcc8e396..46ebb5cec19aac 100644 --- a/var/spack/repos/builtin/packages/akantu/package.py +++ b/var/spack/repos/builtin/packages/akantu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Akantu(CMakePackage): maintainers("nrichart") + license("LGPL-3.0-or-later") + version("master", branch="master") version("3.0.0", sha256="7e8f64e25956eba44def1b2d891f6db8ba824e4a82ff0d51d6b585b60ab465db") diff --git a/var/spack/repos/builtin/packages/alan/package.py b/var/spack/repos/builtin/packages/alan/package.py index 5e702ddfa8eae3..31607dae32fab6 100644 --- a/var/spack/repos/builtin/packages/alan/package.py +++ b/var/spack/repos/builtin/packages/alan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py index 748cf2bb42020f..db7e3dbb02a45a 100644 --- a/var/spack/repos/builtin/packages/albany/package.py +++ b/var/spack/repos/builtin/packages/albany/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/albert/package.py b/var/spack/repos/builtin/packages/albert/package.py index 49d254fb4a9218..796a45fdf3fb24 100644 --- a/var/spack/repos/builtin/packages/albert/package.py +++ b/var/spack/repos/builtin/packages/albert/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/alembic/package.py b/var/spack/repos/builtin/packages/alembic/package.py index 31a653c0c8d9d5..4b081a988d3804 100644 --- a/var/spack/repos/builtin/packages/alembic/package.py +++ b/var/spack/repos/builtin/packages/alembic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Alembic(CMakePackage): homepage = "https://www.alembic.io" url = "https://github.com/alembic/alembic/archive/1.7.16.tar.gz" + license("BSD-3-Clause") + version("1.8.5", sha256="180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9") version("1.7.16", sha256="2529586c89459af34d27a36ab114ad1d43dafd44061e65cfcfc73b7457379e7c") diff --git a/var/spack/repos/builtin/packages/alglib/package.py b/var/spack/repos/builtin/packages/alglib/package.py index 98ade340fd2e11..2b2c39698dd07c 100644 --- a/var/spack/repos/builtin/packages/alglib/package.py +++ b/var/spack/repos/builtin/packages/alglib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/allpaths-lg/package.py b/var/spack/repos/builtin/packages/allpaths-lg/package.py index 3cd98a5a3bdef5..f3be71e7a1e4b9 100644 --- a/var/spack/repos/builtin/packages/allpaths-lg/package.py +++ b/var/spack/repos/builtin/packages/allpaths-lg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/alluxio/package.py b/var/spack/repos/builtin/packages/alluxio/package.py index 37c4b41ae72a39..dd266b9a6b6326 100644 --- a/var/spack/repos/builtin/packages/alluxio/package.py +++ b/var/spack/repos/builtin/packages/alluxio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Alluxio(Package): list_url = "https://downloads.alluxio.io/downloads/files" list_depth = 1 + license("CC0-1.0") + version("2.9.3", sha256="c71abc5e852d37cfd6b1dea076f056c6997e3f60fbb940bf005acb3a6354a369") version("2.9.1", sha256="e9456db7a08488af22dee3a44e4135bc03a0444e31c7753bf00f72465f68ffb9") diff --git a/var/spack/repos/builtin/packages/alpaka/package.py b/var/spack/repos/builtin/packages/alpaka/package.py index d90dcba4a36cc8..7a4b22c42065c8 100644 --- a/var/spack/repos/builtin/packages/alpaka/package.py +++ b/var/spack/repos/builtin/packages/alpaka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Alpaka(CMakePackage, CudaPackage): maintainers("vvolkl") + license("MPL-2.0-no-copyleft-exception") + version("develop", branch="develop") version("0.8.0", sha256="e01bc377a7657d9a3e0c5f8d3f83dffbd7d0b830283c59efcbc1fb98cf88de43") version("0.7.0", sha256="4b61119a7b3b073f281ba15b63430db98b77dbd9420bc290a114f80121fbdd97") diff --git a/var/spack/repos/builtin/packages/alpgen/package.py b/var/spack/repos/builtin/packages/alpgen/package.py index 52b47adebf6ff0..67542d530c2fef 100644 --- a/var/spack/repos/builtin/packages/alpgen/package.py +++ b/var/spack/repos/builtin/packages/alpgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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") diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index d2b33d8524473d..5fb67270a82f61 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Alquimia(CMakePackage): maintainers("smolins", "balay") + license("BSD-3-Clause-LBNL") + version("master") version("1.1.0", commit="211931c3e76b1ae7cdb48c46885b248412d6fe3d") # tag v1.1.0 version("1.0.10", commit="b2c11b6cde321f4a495ef9fcf267cb4c7a9858a0") # tag v.1.0.10 @@ -34,7 +36,7 @@ class Alquimia(CMakePackage): depends_on("pflotran@develop", when="@develop") depends_on("petsc@3.10:", when="@develop") - @when("@1.0.10") + @when("@1.0.10:1.1.0") def patch(self): filter_file( "use iso_[cC]_binding", diff --git a/var/spack/repos/builtin/packages/alsa-lib/package.py b/var/spack/repos/builtin/packages/alsa-lib/package.py index 46e3d2f1bfa672..d9624e0dd46465 100644 --- a/var/spack/repos/builtin/packages/alsa-lib/package.py +++ b/var/spack/repos/builtin/packages/alsa-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class AlsaLib(AutotoolsPackage): homepage = "https://www.alsa-project.org" url = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.3.2.tar.bz2" + license("LGPL-2.1-or-later") + version("1.2.3.2", sha256="e81fc5b7afcaee8c9fd7f64a1e3043e88d62e9ad2c4cff55f578df6b0a9abe15") version("1.2.2", sha256="d8e853d8805574777bbe40937812ad1419c9ea7210e176f0def3e6ed255ab3ec") version("1.1.4.1", sha256="91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76") diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index bb085f8681044b..63275c66ed9c5f 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,7 +9,7 @@ from spack.package import * -class Aluminum(CMakePackage, CudaPackage, ROCmPackage): +class Aluminum(CachedCMakePackage, CudaPackage, ROCmPackage): """Aluminum provides a generic interface to high-performance communication libraries, with a focus on allreduce algorithms. Blocking and non-blocking algorithms and GPU-aware @@ -22,208 +22,209 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/LLNL/Aluminum.git" tags = ["ecp", "radiuss"] - maintainers("bvanessen") + maintainers("benson31", "bvanessen") + + license("Apache-2.0") version("master", branch="master") + version("1.4.1", sha256="d130a67fef1cb7a9cb3bbec1d0de426f020fe68c9df6e172c83ba42281cd90e3") + version("1.4.0", sha256="ac54de058f38cead895ec8163f7b1fa7674e4dc5aacba683a660a61babbfe0c6") version("1.3.1", sha256="28ce0af6c6f29f97b7f19c5e45184bd2f8a0b1428f1e898b027d96d47cb74b0b") version("1.3.0", sha256="d0442efbebfdfb89eec793ae65eceb8f1ba65afa9f2e48df009f81985a4c27e3") version("1.2.3", sha256="9b214bdf30f9b7e8e017f83e6615db6be2631f5be3dd186205dbe3aa62f4018a") - version( - "1.2.2", - sha256="c01d9dd98be4cab9b944bae99b403abe76d65e9e1750e7f23bf0105636ad5485", - deprecated=True, - ) - version( - "1.2.1", - sha256="869402708c8a102a67667b83527b4057644a32b8cdf4990bcd1a5c4e5f0e30af", - deprecated=True, - ) - version( - "1.2.0", - sha256="2f3725147f4dbc045b945af68d3d747f5dffbe2b8e928deed64136785210bc9a", - deprecated=True, - ) - version( - "1.1.0", - sha256="78b03e36e5422e8651f400feb4d8a527f87302db025d77aa37e223be6b9bdfc9", - deprecated=True, - ) - version("1.0.0-lbann", tag="v1.0.0-lbann", commit="40a062b1f63e84e074489c0f926f36b806c6b8f3") - version("1.0.0", sha256="028d12e271817214db5c07c77b0528f88862139c3e442e1b12f58717290f414a") - version( - "0.7.0", - sha256="bbb73d2847c56efbe6f99e46b41d837763938483f2e2d1982ccf8350d1148caa", - deprecated=True, - ) - version( - "0.6.0", - sha256="6ca329951f4c7ea52670e46e5020e7e7879d9b56fed5ff8c5df6e624b313e925", - deprecated=True, - ) - version( - "0.5.0", - sha256="dc365a5849eaba925355a8efb27005c5f22bcd1dca94aaed8d0d29c265c064c1", - deprecated=True, - ) - version( - "0.4.0", - sha256="4d6fab5481cc7c994b32fb23a37e9ee44041a9f91acf78f981a97cb8ef57bb7d", - deprecated=True, - ) - version( - "0.3.3", - sha256="26e7f263f53c6c6ee0fe216e981a558dfdd7ec997d0dd2a24285a609a6c68f3b", - deprecated=True, - ) - version( - "0.3.2", - sha256="09b6d1bcc02ac54ba269b1123eee7be20f0104b93596956c014b794ba96b037f", - deprecated=True, - ) - version( - "0.2.1-1", - sha256="066b750e9d1134871709a3e2414b96b166e0e24773efc7d512df2f1d96ee8eef", - deprecated=True, - ) - version( - "0.2.1", - sha256="3d5d15853cccc718f60df68205e56a2831de65be4d96e7f7e8497097e7905f89", - deprecated=True, - ) - version( - "0.2", - sha256="fc8f06c6d8faab17a2aedd408d3fe924043bf857da1094d5553f35c4d2af893b", - deprecated=True, - ) - version( - "0.1", - sha256="3880b736866e439dd94e6a61eeeb5bb2abccebbac82b82d52033bc6c94950bdb", - deprecated=True, - ) - variant("nccl", default=False, description="Builds with support for NCCL communication lib") + # Library capabilities + variant( + "cuda_rma", + default=False, + when="+cuda", + description="Builds with support for CUDA intra-node " + " Put/Get and IPC RMA functionality", + ) variant( "ht", default=False, description="Builds with support for host-enabled MPI" " communication of accelerator data", ) + variant("nccl", default=False, description="Builds with support for NCCL communication lib") + variant("shared", default=True, description="Build Aluminum as a shared library") + + # Debugging features + variant("hang_check", default=False, description="Enable hang checking") + variant("trace", default=False, description="Enable runtime tracing") + + # Profiler support + variant("nvtx", default=False, when="+cuda", description="Enable profiling via nvprof/NVTX") variant( - "cuda_rma", + "roctracer", default=False, when="+rocm", description="Enable profiling via rocprof/roctx" + ) + + # Advanced options + variant("mpi_serialize", default=False, description="Serialize MPI operations") + variant("stream_mem_ops", default=False, description="Enable stream memory operations") + variant( + "thread_multiple", default=False, - description="Builds with support for CUDA intra-node " - " Put/Get and IPC RMA functionality", + description="Allow multiple threads to call Aluminum concurrently", ) - variant("rccl", default=False, description="Builds with support for RCCL communication lib") + + # Benchmark/testing support variant( - "ofi_libfabric_plugin", - default=spack.platforms.cray.slingshot_network(), - when="+rccl", - sticky=True, - description="Builds with support for OFI libfabric enhanced RCCL/NCCL communication lib", + "benchmarks", + default=False, + description="Build the Aluminum benchmarking drivers " + "(warning: may significantly increase build time!)", ) variant( - "ofi_libfabric_plugin", - default=spack.platforms.cray.slingshot_network(), - when="+nccl", - sticky=True, - description="Builds with support for OFI libfabric enhanced RCCL/NCCL communication lib", + "tests", + default=False, + description="Build the Aluminum test drivers " + "(warning: may moderately increase build time!)", ) - depends_on("cmake@3.21.0:", type="build", when="@1.0.1:") - depends_on("cmake@3.17.0:", type="build", when="@:1.0.0") - depends_on("mpi") - depends_on("nccl@2.7.0-0:", when="+nccl") - depends_on("hwloc@1.11:") - depends_on("hwloc +cuda +nvml", when="+cuda") - depends_on("hwloc@2.3.0:", when="+rocm") - depends_on("cub", when="@:0.1,0.6.0: +cuda ^cuda@:10") - depends_on("hipcub", when="@:0.1,0.6.0: +rocm") - - depends_on("rccl", when="+rccl") - depends_on("aws-ofi-rccl", when="+rccl +ofi_libfabric_plugin") - depends_on("aws-ofi-nccl", when="+nccl +ofi_libfabric_plugin") + # FIXME: Do we want to expose tuning parameters to the Spack + # recipe? Some are numeric values, some are on/off switches. conflicts("~cuda", when="+cuda_rma", msg="CUDA RMA support requires CUDA") conflicts("+cuda", when="+rocm", msg="CUDA and ROCm support are mutually exclusive") - conflicts("+nccl", when="+rccl", msg="NCCL and RCCL support are mutually exclusive") - generator("ninja") + depends_on("mpi") - def cmake_args(self): - spec = self.spec - args = [ - "-DCMAKE_CXX_STANDARD:STRING=17", - "-DALUMINUM_ENABLE_CUDA:BOOL=%s" % ("+cuda" in spec), - "-DALUMINUM_ENABLE_NCCL:BOOL=%s" % ("+nccl" in spec or "+rccl" in spec), - "-DALUMINUM_ENABLE_ROCM:BOOL=%s" % ("+rocm" in spec), - ] - - if not spec.satisfies("^cmake@3.23.0"): - # There is a bug with using Ninja generator in this version - # of CMake - args.append("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON") - - if "+cuda" in spec: - if self.spec.satisfies("%clang"): - for flag in self.spec.compiler_flags["cxxflags"]: - if "gcc-toolchain" in flag: - args.append("-DCMAKE_CUDA_FLAGS=-Xcompiler={0}".format(flag)) - if spec.satisfies("^cuda@11.0:"): - args.append("-DCMAKE_CUDA_STANDARD=17") - else: - args.append("-DCMAKE_CUDA_STANDARD=14") - archs = spec.variants["cuda_arch"].value - if archs != "none": - arch_str = ";".join(archs) - args.append("-DCMAKE_CUDA_ARCHITECTURES=%s" % arch_str) - - if spec.satisfies("%cce") and spec.satisfies("^cuda+allow-unsupported-compilers"): - args.append("-DCMAKE_CUDA_FLAGS=-allow-unsupported-compiler") - - if spec.satisfies("@0.5:"): - args.extend( - [ - "-DALUMINUM_ENABLE_HOST_TRANSFER:BOOL=%s" % ("+ht" in spec), - "-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s" % ("+cuda_rma" in spec), - "-DALUMINUM_ENABLE_MPI_CUDA_RMA:BOOL=%s" % ("+cuda_rma" in spec), - ] + depends_on("cmake@3.21.0:", type="build", when="@1.0.1:") + depends_on("hwloc@1.11:") + + with when("+cuda"): + depends_on("cub", when="^cuda@:10") + depends_on("hwloc +cuda +nvml") + with when("+nccl"): + depends_on("nccl@2.7.0-0:") + for arch in CudaPackage.cuda_arch_values: + depends_on( + "nccl +cuda cuda_arch={0}".format(arch), + when="+cuda cuda_arch={0}".format(arch), + ) + if spack.platforms.cray.slingshot_network(): + depends_on("aws-ofi-nccl") # Note: NOT a CudaPackage + + with when("+rocm"): + for val in ROCmPackage.amdgpu_targets: + depends_on( + "hipcub +rocm amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) ) - else: - args.append("-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s" % ("+ht" in spec)) - - if spec.satisfies("@:0.1,0.6.0: +cuda ^cuda@:10"): - args.append("-DCUB_DIR:FILEPATH=%s" % spec["cub"].prefix) - - # Add support for OS X to find OpenMP (LLVM installed via brew) - if self.spec.satisfies("%clang platform=darwin"): - clang = self.compiler.cc - clang_bin = os.path.dirname(clang) - clang_root = os.path.dirname(clang_bin) - args.extend(["-DOpenMP_DIR={0}".format(clang_root)]) - - if "+rocm" in spec: - args.extend( - [ - "-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix), - "-DHIP_CXX_COMPILER={0}".format(self.spec["hip"].hipcc), - "-DCMAKE_CXX_FLAGS=-std=c++17", - ] + depends_on( + "hwloc@2.3.0: +rocm amdgpu_target={0}".format(val), + when="amdgpu_target={0}".format(val), ) - archs = self.spec.variants["amdgpu_target"].value - if archs != "none": - arch_str = ",".join(archs) - if spec.satisfies("%rocmcc@:5"): - args.append( - "-DHIP_HIPCC_FLAGS=--amdgpu-target={0}" - " -g -fsized-deallocation -fPIC -std=c++17".format(arch_str) - ) - args.extend( - [ - "-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str, - "-DAMDGPU_TARGETS=%s" % arch_str, - "-DGPU_TARGETS=%s" % arch_str, - ] - ) + # RCCL is *NOT* implented as a ROCmPackage + depends_on( + "rccl amdgpu_target={0}".format(val), when="+nccl amdgpu_target={0}".format(val) + ) + depends_on( + "roctracer-dev +rocm amdgpu_target={0}".format(val), + when="+roctracer amdgpu_target={0}".format(val), + ) + if spack.platforms.cray.slingshot_network(): + depends_on("aws-ofi-rccl", when="+nccl") + + def cmake_args(self): + args = [] + return args + def get_cuda_flags(self): + spec = self.spec + args = [] + if spec.satisfies("^cuda+allow-unsupported-compilers"): + args.append("-allow-unsupported-compiler") + + if spec.satisfies("%clang"): + for flag in spec.compiler_flags["cxxflags"]: + if "gcc-toolchain" in flag: + args.append("-Xcompiler={0}".format(flag)) return args + + def std_initconfig_entries(self): + entries = super(Aluminum, self).std_initconfig_entries() + + # CMAKE_PREFIX_PATH, in CMake types, is a "STRING", not a "PATH". :/ + entries = [x for x in entries if "CMAKE_PREFIX_PATH" not in x] + cmake_prefix_path = os.environ["CMAKE_PREFIX_PATH"].replace(":", ";") + entries.append(cmake_cache_string("CMAKE_PREFIX_PATH", cmake_prefix_path)) + return entries + + def initconfig_compiler_entries(self): + spec = self.spec + entries = super(Aluminum, self).initconfig_compiler_entries() + + # FIXME: Enforce this better in the actual CMake. + entries.append(cmake_cache_string("CMAKE_CXX_STANDARD", "17")) + entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec)) + entries.append(cmake_cache_option("CMAKE_EXPORT_COMPILE_COMMANDS", True)) + entries.append(cmake_cache_option("MPI_ASSUME_NO_BUILTIN_MPI", True)) + + return entries + + def initconfig_hardware_entries(self): + spec = self.spec + entries = super(Aluminum, self).initconfig_hardware_entries() + + entries.append(cmake_cache_option("ALUMINUM_ENABLE_CUDA", "+cuda" in spec)) + if spec.satisfies("+cuda"): + entries.append(cmake_cache_string("CMAKE_CUDA_STANDARD", "17")) + if not spec.satisfies("cuda_arch=none"): + archs = spec.variants["cuda_arch"].value + arch_str = ";".join(archs) + entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", arch_str)) + + # FIXME: Should this use the "cuda_flags" function of the + # CudaPackage class or something? There might be other + # flags in play, and we need to be sure to get them all. + cuda_flags = self.get_cuda_flags() + if len(cuda_flags) > 0: + entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", " ".join(cuda_flags))) + + entries.append(cmake_cache_option("ALUMINUM_ENABLE_ROCM", "+rocm" in spec)) + if spec.satisfies("+rocm"): + entries.append(cmake_cache_string("CMAKE_HIP_STANDARD", "17")) + if not spec.satisfies("amdgpu_target=none"): + archs = self.spec.variants["amdgpu_target"].value + arch_str = ";".join(archs) + entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) + entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) + entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) + entries.append(cmake_cache_path("HIP_ROOT_DIR", spec["hip"].prefix)) + + return entries + + def initconfig_package_entries(self): + spec = self.spec + entries = super(Aluminum, self).initconfig_package_entries() + + # Library capabilities + entries.append(cmake_cache_option("ALUMINUM_ENABLE_MPI_CUDA", "+cuda_rma" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_MPI_CUDA_RMA", "+cuda_rma" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_HOST_TRANSFER", "+ht" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_NCCL", "+nccl" in spec)) + + # Debugging features + entries.append(cmake_cache_option("ALUMINUM_DEBUG_HANG_CHECK", "+hang_check" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_TRACE", "+trace" in spec)) + + # Profiler support + entries.append(cmake_cache_option("ALUMINUM_ENABLE_NVPROF", "+nvtx" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_ROCTRACER", "+roctracer" in spec)) + + # Advanced options + entries.append(cmake_cache_option("ALUMINUM_MPI_SERIALIZE", "+mpi_serialize" in spec)) + entries.append( + cmake_cache_option("ALUMINUM_ENABLE_STREAM_MEM_OPS", "+stream_mem_ops" in spec) + ) + entries.append( + cmake_cache_option("ALUMINUM_ENABLE_THREAD_MULTIPLE", "+thread_multiple" in spec) + ) + + # Benchmark/testing support + entries.append(cmake_cache_option("ALUMINUM_ENABLE_BENCHMARKS", "+benchmarks" in spec)) + entries.append(cmake_cache_option("ALUMINUM_ENABLE_TESTS", "+tests" in spec)) + + return entries diff --git a/var/spack/repos/builtin/packages/amber/package.py b/var/spack/repos/builtin/packages/amber/package.py index e647a74cd42443..f72ce9bc4da690 100644 --- a/var/spack/repos/builtin/packages/amber/package.py +++ b/var/spack/repos/builtin/packages/amber/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/amd-aocl/package.py b/var/spack/repos/builtin/packages/amd-aocl/package.py index a1fb1cb061f9cf..b37da1b9cb7eb9 100644 --- a/var/spack/repos/builtin/packages/amd-aocl/package.py +++ b/var/spack/repos/builtin/packages/amd-aocl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,21 +32,22 @@ class AmdAocl(BundlePackage): version("2.2") variant("openmp", default=False, description="Enable OpenMP support.") - for vers in ["2.2", "3.0", "3.1", "3.2", "4.0", "4.1"]: - depends_on("amdblis@{0} threads=openmp".format(vers), when="@{0} +openmp".format(vers)) - depends_on("amdblis@{0} threads=none".format(vers), when="@{0} ~openmp".format(vers)) - depends_on("amdfftw@{0} +openmp".format(vers), when="@{0} +openmp".format(vers)) - depends_on("amdfftw@{0} ~openmp".format(vers), when="@{0} ~openmp".format(vers)) - depends_on("amdlibflame@{0}".format(vers), when="@{0}".format(vers)) - depends_on("amdlibm@{0}".format(vers), when="@{0}".format(vers)) - depends_on( - "amdscalapack@{0} ^amdblis@{0} ^amdlibflame@{0} threads=none".format(vers), - when="@{0} ~openmp".format(vers), - ) - depends_on( - "amdscalapack@{0} ^amdblis@{0} ^amdlibflame@{0} threads=openmp".format(vers), - when="@{0} +openmp".format(vers), - ) - depends_on( - "aocl-sparse@{0} ^amdblis@{0} ^amdlibflame@{0}".format(vers), when="@{0}".format(vers) - ) + + with when("+openmp"): + depends_on("amdblis threads=openmp") + depends_on("amdfftw +openmp") + depends_on("amdlibflame threads=openmp") + + with when("~openmp"): + depends_on("amdblis threads=none") + depends_on("amdfftw ~openmp") + depends_on("amdlibflame threads=none") + + for vers in ("2.2", "3.0", "3.1", "3.2", "4.0", "4.1"): + with when(f"@{vers}"): + depends_on(f"amdblis@{vers}") + depends_on(f"amdfftw@{vers}") + depends_on(f"amdlibflame@{vers}") + depends_on(f"amdlibm@{vers}") + depends_on(f"amdscalapack@{vers}") + depends_on(f"aocl-sparse@{vers}") diff --git a/var/spack/repos/builtin/packages/amdblis/package.py b/var/spack/repos/builtin/packages/amdblis/package.py index 5d8bb376f3a9f9..5492f54b4b94f5 100644 --- a/var/spack/repos/builtin/packages/amdblis/package.py +++ b/var/spack/repos/builtin/packages/amdblis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -34,6 +34,10 @@ class Amdblis(BlisBase): maintainers("amd-toolchain-support") + requires("target=x86_64:", msg="AMD blis available only on x86_64") + + license("BSD-3-Clause") + version("4.1", sha256="a05c6c7d359232580d1d599696053ad0beeedf50f3b88d5d22ee7d34375ab577") version("4.0", sha256="cddd31176834a932753ac0fc4c76332868feab3e9ac607fa197d8b44c1e74a41") version("3.2", sha256="5a400ee4fc324e224e12f73cc37b915a00f92b400443b15ce3350278ad46fff6") diff --git a/var/spack/repos/builtin/packages/amdfftw/package.py b/var/spack/repos/builtin/packages/amdfftw/package.py index 475327e3359d0a..93ca30265dcc6e 100644 --- a/var/spack/repos/builtin/packages/amdfftw/package.py +++ b/var/spack/repos/builtin/packages/amdfftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -39,6 +39,8 @@ class Amdfftw(FftwBase): maintainers("amd-toolchain-support") + license("GPL-2.0-only") + version("4.1", sha256="f1cfecfcc0729f96a5bd61c6b26f3fa43bb0662d3fff370d4f73490c60cf4e59") version("4.0", sha256="5f02cb05f224bd86bd88ec6272b294c26dba3b1d22c7fb298745fd7b9d2271c0") version("3.2", sha256="31cab17a93e03b5b606e88dd6116a1055b8f49542d7d0890dbfcca057087b8d0") @@ -145,6 +147,8 @@ class Amdfftw(FftwBase): ) conflicts("precision=quad", msg="Quad precision is not supported with amd-app-opt") + requires("target=x86_64:", msg="AMD FFTW available only on x86_64") + def configure(self, spec, prefix): """Configure function""" # Base options diff --git a/var/spack/repos/builtin/packages/amdlibflame/package.py b/var/spack/repos/builtin/packages/amdlibflame/package.py index e1b96e042e02a9..8dd7aa57f25d9e 100644 --- a/var/spack/repos/builtin/packages/amdlibflame/package.py +++ b/var/spack/repos/builtin/packages/amdlibflame/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -47,6 +47,8 @@ class Amdlibflame(LibflameBase): maintainers("amd-toolchain-support") + license("BSD-3-Clause") + version("4.1", sha256="8aed69c60d11cc17e058cabcb8a931cee4f343064ade3e73d3392b7214624b61") version("4.0", sha256="bcb05763aa1df1e88f0da5e43ff86d956826cbea1d9c5ff591d78a3e091c66a4") version("3.2", sha256="6b5337fb668b82d0ed0a4ab4b5af4e2f72e4cedbeeb4a8b6eb9a3ef057fb749a") @@ -60,6 +62,7 @@ class Amdlibflame(LibflameBase): conflicts("+ilp64", when="@:3.0.0", msg="ILP64 is supported from 3.0.1 onwards") conflicts("threads=pthreads", msg="pthread is not supported") conflicts("threads=openmp", when="@:3", msg="openmp is not supported by amdlibflame < 4.0") + requires("target=x86_64:", msg="AMD libflame available only on x86_64") patch("aocc-2.2.0.patch", when="@:2", level=1) patch("cray-compiler-wrapper.patch", when="@:3.0.0", level=1) diff --git a/var/spack/repos/builtin/packages/amdlibm/package.py b/var/spack/repos/builtin/packages/amdlibm/package.py index 9a988b49624b84..05b37883366ed9 100644 --- a/var/spack/repos/builtin/packages/amdlibm/package.py +++ b/var/spack/repos/builtin/packages/amdlibm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class Amdlibm(SConsPackage): url = "https://github.com/amd/aocl-libm-ose/archive/refs/tags/3.0.tar.gz" maintainers("amd-toolchain-support") + license("BSD-3-Clause") + version("4.1", sha256="5bbbbc6bc721d9a775822eab60fbc11eb245e77d9f105b4fcb26a54d01456122") version("4.0", sha256="038c1eab544be77598eccda791b26553d3b9e2ee4ab3f5ad85fdd2a77d015a7d") version("3.2", sha256="c75b287c38a3ce997066af1f5c8d2b19fc460d5e56678ea81f3ac33eb79ec890") diff --git a/var/spack/repos/builtin/packages/amdscalapack/package.py b/var/spack/repos/builtin/packages/amdscalapack/package.py index 0213da5c97dcca..3ccf2260893abd 100644 --- a/var/spack/repos/builtin/packages/amdscalapack/package.py +++ b/var/spack/repos/builtin/packages/amdscalapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class Amdscalapack(ScalapackBase): maintainers("amd-toolchain-support") + license("BSD-3-Clause-Open-MPI") + version("4.1", sha256="b2e51c3604e5869d1faaef2e52c92071fcb3de1345aebb2ea172206622067ad9") version("4.0", sha256="f02913b5984597b22cdb9a36198ed61039a1bf130308e778dc31b2a7eb88b33b") version("3.2", sha256="9e00979bb1be39d627bdacb01774bc043029840d542fafc934d16fec3e3b0892") @@ -42,6 +44,7 @@ class Amdscalapack(ScalapackBase): variant("ilp64", default=False, description="Build with ILP64 support") conflicts("+ilp64", when="@:3.0", msg="ILP64 is supported from 3.1 onwards") + requires("target=x86_64:", msg="AMD scalapack available only on x86_64") def url_for_version(self, version): vers = "https://github.com/amd/{0}/archive/{1}.tar.gz" diff --git a/var/spack/repos/builtin/packages/amdsmi/package.py b/var/spack/repos/builtin/packages/amdsmi/package.py index 5c293799b80a2e..e7543fdb8bb5e8 100644 --- a/var/spack/repos/builtin/packages/amdsmi/package.py +++ b/var/spack/repos/builtin/packages/amdsmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,24 +12,27 @@ class Amdsmi(CMakePackage): is a C library for Linux that provides a user space interface for applications to monitor and control AMD device.""" - homepage = "https://github.com/RadeonOpenCompute/amdsmi" - url = "https://github.com/RadeonOpenCompute/amdsmi/archive/refs/tags/rocm-5.6.0.tar.gz" + homepage = "https://github.com/ROCm/amdsmi" + url = "https://github.com/ROCm/amdsmi/archive/refs/tags/rocm-5.6.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["libamd_smi"] + license("MIT") + + version("5.7.0", sha256="144391d537710dafa9ef69571dd76203e56db6142ab61a1375346b5733137e23") version("5.6.0", sha256="595c9d6d79d9071290b2f19ab4ef9222c8d2983b4322b3143fcd9d0b1ce0f6d8") version("5.5.1", sha256="b794c7fd562fd92f2c9f2bbdc2d5dded7486101fcd4598f2e8c3484c9a939281") version("5.5.0", sha256="dcfbd96e93afcf86b1261464e008e9ef7e521670871a1885e6eaffc7cdc8f555") - depends_on("cmake@3.11:", type="build") - depends_on("python@3.6:", type="run") - depends_on("py-virtualenv", type="build") - depends_on("llvm@14:", type="build") - depends_on("pkgconfig", type="build") - depends_on("libdrm", type="build") - depends_on("py-pyyaml", type="build") + depends_on("cmake@3.11:") + depends_on("python@3.6:") + depends_on("py-virtualenv") + depends_on("llvm@14:") + depends_on("pkgconfig") + depends_on("libdrm") + depends_on("py-pyyaml") @classmethod def determine_version(cls, lib): diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py index def0b495a83aac..dbb5ded532cbfd 100644 --- a/var/spack/repos/builtin/packages/amg2013/package.py +++ b/var/spack/repos/builtin/packages/amg2013/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Amg2013(MakefilePackage): homepage = "https://computing.llnl.gov/projects/co-design/amg2013" git = "https://github.com/LLNL/AMG.git" + license("LGPL-2.1-or-later") + version("develop", branch="master") version("1.2", tag="1.2", commit="3ada8a128e311543e84d9d66344ece77924127a8") version("1.1", tag="1.1", commit="09fe8a78baf6ba5eaef7d2804f7b653885d60fee") diff --git a/var/spack/repos/builtin/packages/amg2023/package.py b/var/spack/repos/builtin/packages/amg2023/package.py index a2e8b676e9a9c9..60bf0f337d04f5 100644 --- a/var/spack/repos/builtin/packages/amg2023/package.py +++ b/var/spack/repos/builtin/packages/amg2023/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,8 +17,9 @@ class Amg2023(CMakePackage, CudaPackage, ROCmPackage): homepage = "https://github.com/LLNL/AMG2023" git = "https://github.com/LLNL/AMG2023.git" + license("Apache-2.0") + version("develop", branch="main") - version("cmake-build", git="https://github.com/dyokelson/AMG2023.git", branch="cmake") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=False, description="Enable OpenMP support") diff --git a/var/spack/repos/builtin/packages/amgx/package.py b/var/spack/repos/builtin/packages/amgx/package.py index 226a853b7f76de..1e91250708515e 100644 --- a/var/spack/repos/builtin/packages/amgx/package.py +++ b/var/spack/repos/builtin/packages/amgx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Amgx(CMakePackage, CudaPackage): maintainers("js947") + license("BSD-3-Clause") + version("2.3.0", sha256="419b3cd5bd3eb3469cbef79d64a8d19d5db88dd5cce809e49cac6fc4fc2edff1") version("2.2.0", sha256="dac78516bb528135cad903399fe0093aa0904e304565ef2d3da4fae05eda7928") version("2.1.0", sha256="6245112b768a1dc3486b2b3c049342e232eb6281a6021fffa8b20c11631f63cc") diff --git a/var/spack/repos/builtin/packages/aml/package.py b/var/spack/repos/builtin/packages/aml/package.py index 88e012562271a2..dee1c1ca0e8dd9 100644 --- a/var/spack/repos/builtin/packages/aml/package.py +++ b/var/spack/repos/builtin/packages/aml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Aml(AutotoolsPackage): url = "https://github.com/anlsys/aml/releases/download/v0.2.0/aml-0.2.0.tar.gz" git = "https://github.com/anlsys/aml.git" + license("ISC") + # version string is generated from git tags, requires entire repo version("master", branch="master", submodules=True, get_full_repo=True) diff --git a/var/spack/repos/builtin/packages/amp/package.py b/var/spack/repos/builtin/packages/amp/package.py index f0ec4071ce14a4..340b473bac03c1 100644 --- a/var/spack/repos/builtin/packages/amp/package.py +++ b/var/spack/repos/builtin/packages/amp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ampl/package.py b/var/spack/repos/builtin/packages/ampl/package.py index c71b3256c14bcd..f074245357bdc8 100644 --- a/var/spack/repos/builtin/packages/ampl/package.py +++ b/var/spack/repos/builtin/packages/ampl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ampliconnoise/package.py b/var/spack/repos/builtin/packages/ampliconnoise/package.py index 6046e795b0d05e..0bc5e2cc190c1b 100644 --- a/var/spack/repos/builtin/packages/ampliconnoise/package.py +++ b/var/spack/repos/builtin/packages/ampliconnoise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ampt/package.py b/var/spack/repos/builtin/packages/ampt/package.py index b441b6369c6af6..bbbbf33e9d7fc4 100644 --- a/var/spack/repos/builtin/packages/ampt/package.py +++ b/var/spack/repos/builtin/packages/ampt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/amqp-cpp/package.py b/var/spack/repos/builtin/packages/amqp-cpp/package.py index 522547277609c8..714169e1d61275 100644 --- a/var/spack/repos/builtin/packages/amqp-cpp/package.py +++ b/var/spack/repos/builtin/packages/amqp-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class AmqpCpp(CMakePackage): maintainers("lpottier") + license("Apache-2.0") + version("4.3.24", sha256="c3312f8af813cacabf6c257dfaf41bf9e66606bbf7d62d085a9b7da695355245") version("4.3.19", sha256="ca29bb349c498948576a4604bed5fd3c27d87240b271a4441ccf04ba3797b31d") diff --git a/var/spack/repos/builtin/packages/amr-wind/package.py b/var/spack/repos/builtin/packages/amr-wind/package.py index 835f1c96fab688..cdd01679469ae2 100644 --- a/var/spack/repos/builtin/packages/amr-wind/package.py +++ b/var/spack/repos/builtin/packages/amr-wind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class AmrWind(CMakePackage, CudaPackage, ROCmPackage): tags = ["ecp", "ecp-apps"] + license("BSD-3-Clause") + version("main", branch="main", submodules=True) variant("hypre", default=True, description="Enable Hypre integration") diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 8f14d508ad0085..2c18dbf86d42e9 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,9 +21,13 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): tags = ["ecp", "e4s"] - maintainers("WeiqunZhang", "asalmgren", "etpalmer63") + maintainers("WeiqunZhang", "asalmgren", "atmyers") + + license("BSD-3-Clause") version("develop", branch="development") + version("24.01", sha256="83dbd4dad6dc51fa4a80aad0347b15ee5a6d816cf4abcd87f7b0e2987d8131b7") + version("23.12", sha256="90e00410833d7a82bf6d9e71a70ce85d2bfb89770da7e34d0dda940f2bf5384a") version("23.11", sha256="49b9fea10cd2a2b6cb0fedf7eac8f7889eacc68a05ae5ac7c5702bc0eb1b3848") version("23.10", sha256="3c85aa0ad5f96303e797960a6e0aa37c427f6483f39cdd61dbc2f7ca16357714") version("23.09", sha256="1a539c2628041b17ad910afd9270332060251c8e346b1482764fdb87a4f25053") diff --git a/var/spack/repos/builtin/packages/amrfinder/package.py b/var/spack/repos/builtin/packages/amrfinder/package.py index 43a7bf371e6a80..bca43c520c9fbe 100644 --- a/var/spack/repos/builtin/packages/amrfinder/package.py +++ b/var/spack/repos/builtin/packages/amrfinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index ba25d7dff9f65f..16bfd5a732c0f2 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ams/package.py b/var/spack/repos/builtin/packages/ams/package.py index ba75a25e63f6c3..4cf123a848eed0 100644 --- a/var/spack/repos/builtin/packages/ams/package.py +++ b/var/spack/repos/builtin/packages/ams/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,12 @@ class Ams(CMakePackage, CudaPackage): maintainers("koparasy", "lpottier") version("develop", branch="develop", submodules=False) + version( + "11.08.23.alpha", + tag="11.08.23.alpha", + commit="1a42b29268bb916dae301654ca0b92fdfe288732", + submodules=False, + ) version( "07.25.23-alpha", tag="07.25.23-alpha", diff --git a/var/spack/repos/builtin/packages/anaconda2/package.py b/var/spack/repos/builtin/packages/anaconda2/package.py deleted file mode 100644 index 765a90505b5a5c..00000000000000 --- a/var/spack/repos/builtin/packages/anaconda2/package.py +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from os.path import split - -from spack.package import * -from spack.util.environment import EnvironmentModifications - - -class Anaconda2(Package): - """Anaconda is a free and open-source distribution of the Python and - R programming languages for scientific computing, that aims to - simplify package management and deployment. Package versions are - managed by the package management system conda. - """ - - homepage = "https://www.anaconda.com" - url = "https://repo.anaconda.com/archive/Anaconda2-2019.10-Linux-x86_64.sh" - - maintainers("ajkotobi") - - version( - "2019.10", - sha256="8b2e7dea2da7d8cc18e822e8ec1804052102f4eefb94c1b3d0e586e126e8cd2f", - expand=False, - deprecated=True, - ) - version( - "2019.07", - sha256="189e16e7adf9ba4b7b7d06ecdc10ce4ad4153e5e3505b9331f3d142243e18e97", - expand=False, - deprecated=True, - ) - version( - "2019.03", - sha256="cedfee5b5a3f62fcdac0a1d2d12396d0f232d2213d24d6dc893df5d8e64b8773", - expand=False, - deprecated=True, - ) - version( - "2018.12", - sha256="1821d4b623ed449e0acb6df3ecbabd3944cffa98f96a5234b7a102a7c0853dc6", - expand=False, - deprecated=True, - ) - version( - "5.3.1", - sha256="f0650ad2f9ca4ae3f3162d7204a32950bc794f37f322eb47b5ad9412454f998c", - expand=False, - deprecated=True, - ) - version( - "5.3.0", - sha256="50eeaab24bfa2472bc6485fe8f0e612ed67e561eda1ff9fbf07b62c96443c1be", - expand=False, - deprecated=True, - ) - version( - "5.2.0", - sha256="cb0d7a08b0e2cec4372033d3269979b4e72e2353ffd1444f57cb38bc9621219f", - expand=False, - deprecated=True, - ) - version( - "5.1.0", - sha256="5f26ee92860d1dffdcd20910ff2cf75572c39d2892d365f4e867a611cca2af5b", - expand=False, - deprecated=True, - ) - version( - "5.0.1", - sha256="23c676510bc87c95184ecaeb327c0b2c88007278e0d698622e2dd8fb14d9faa4", - expand=False, - deprecated=True, - ) - version( - "5.0.0.1", - sha256="18730808d863a5c194ab3f59dd395c1a63cbd769c9bfb1df65efe61ee62fc6d6", - expand=False, - deprecated=True, - ) - version( - "5.0.0", - sha256="58a7117f89c40275114bf7e824a613a963da2b0fe63f2ec3c1175fea785b468e", - expand=False, - deprecated=True, - ) - version( - "4.4.0", - sha256="2d30b91ed4d215b6b4a15162a3389e9057b15445a0c02da71bd7bd272e7b824e", - expand=False, - deprecated=True, - ) - version( - "4.3.1", - sha256="e9b8f2645df6b1527ba56d61343162e0794acc3ee8dde2a6bba353719e2d878d", - expand=False, - deprecated=True, - ) - version( - "4.3.0", - sha256="7c52e6e99aabb24a49880130615a48e685da444c3c14eb48d6a65f3313bf745c", - expand=False, - deprecated=True, - ) - version( - "4.2.0", - sha256="beee286d24fb37dd6555281bba39b3deb5804baec509a9dc5c69185098cf661a", - expand=False, - deprecated=True, - ) - version( - "4.1.1", - sha256="9413b1d3ca9498ba6f53913df9c43d685dd973440ff10b7fe0c45b1cbdcb582e", - expand=False, - deprecated=True, - ) - version( - "4.1.0", - sha256="3b7e504ca0132fb555d1f10e174cae07007f1bc6898cad0f7d416a68aca01f45", - expand=False, - deprecated=True, - ) - version( - "4.0.0", - sha256="ae312143952ca00e061a656c2080e0e4fd3532721282ba8e2978177cad71a5f0", - expand=False, - deprecated=True, - ) - version( - "2.5.0", - sha256="e10abf459cde4a838bd6fc5ca03023c3401b81ad470627acde5a298d56715321", - expand=False, - deprecated=True, - ) - version( - "2.4.1", - sha256="2de682c96edf8cca2852071a84ff860025fbe8c502218e1995acd5ab47e8c9ac", - expand=False, - deprecated=True, - ) - version( - "2.4.0", - sha256="49d19834da06b1b82b6fa85bc647d2e78fa5957d0cbae3ccd6c695a541befa6b", - expand=False, - deprecated=True, - ) - - def install(self, spec, prefix): - dir, anaconda_script = split(self.stage.archive_file) - bash = which("bash") - bash(anaconda_script, "-b", "-f", "-p", self.prefix) - - def setup_run_environment(self, env): - filename = self.prefix.etc.join("profile.d").join("conda.sh") - env.extend(EnvironmentModifications.from_sourcing_file(filename)) diff --git a/var/spack/repos/builtin/packages/anaconda3/package.py b/var/spack/repos/builtin/packages/anaconda3/package.py index c405e9d9034197..79b1074bb7da3a 100644 --- a/var/spack/repos/builtin/packages/anaconda3/package.py +++ b/var/spack/repos/builtin/packages/anaconda3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/andi/package.py b/var/spack/repos/builtin/packages/andi/package.py index 2fafd5e562d8ae..e7a2052c75fe5b 100644 --- a/var/spack/repos/builtin/packages/andi/package.py +++ b/var/spack/repos/builtin/packages/andi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Andi(AutotoolsPackage): url = "https://github.com/EvolBioInf/andi/archive/v0.10.tar.gz" maintainers("snehring") + license("GPL-3.0-or-later") + version("0.14", sha256="2c9e11524f38e74fe3f981e6acd9527c1a1ca30994a30c5e86808ba5165a25b7") version("0.10", sha256="1ff371de0b6db4080e402ded2687947dc2d6913e28626edec21dcf5149489ee8") diff --git a/var/spack/repos/builtin/packages/angsd/package.py b/var/spack/repos/builtin/packages/angsd/package.py index 4e8caed26ba27f..a682aaf4dcb84e 100644 --- a/var/spack/repos/builtin/packages/angsd/package.py +++ b/var/spack/repos/builtin/packages/angsd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/anicalculator/package.py b/var/spack/repos/builtin/packages/anicalculator/package.py index 9d002975d98485..00f7c757786d74 100644 --- a/var/spack/repos/builtin/packages/anicalculator/package.py +++ b/var/spack/repos/builtin/packages/anicalculator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ant/package.py b/var/spack/repos/builtin/packages/ant/package.py index f76255073062e4..5a5d1fa6f6f754 100644 --- a/var/spack/repos/builtin/packages/ant/package.py +++ b/var/spack/repos/builtin/packages/ant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Ant(Package): homepage = "https://ant.apache.org/" url = "https://archive.apache.org/dist/ant/source/apache-ant-1.9.7-src.tar.gz" + license("Apache-2.0") + version("1.10.13", sha256="da006f4c888d41d0f3f213565e48aeff73e4d8a6196e494121d8da1e567a8406") # https://nvd.nist.gov/vuln/detail/CVE-2020-1945 diff --git a/var/spack/repos/builtin/packages/antimony/package.py b/var/spack/repos/builtin/packages/antimony/package.py index 498789ba601367..dfcc478f9368bf 100644 --- a/var/spack/repos/builtin/packages/antimony/package.py +++ b/var/spack/repos/builtin/packages/antimony/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Antimony(CMakePackage): maintainers("rblake-llnl") + license("BSD-3-Clause") + version("2.8", sha256="7e3e38706c074b72e241ac56ef4ce23e87ef8c718c70f29b2207f1847c43770f") version("2.7", sha256="7ad181cac632282ae77ced09388dd92db87ea4683eed8c45f2b43861ae2acad4") version("2.6", sha256="afc8dc5ec6bc2cd3085038f80362327456f219171b09a13f775b50550c8b1d87") diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py index c38c02baf117bb..87cab3ca5b8e4c 100644 --- a/var/spack/repos/builtin/packages/antlr/package.py +++ b/var/spack/repos/builtin/packages/antlr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Antlr(AutotoolsPackage): homepage = "https://www.antlr2.org/" url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz" + license("ANTLR-PD") + version("2.7.7", sha256="853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9") # Fixes build with recent versions of GCC diff --git a/var/spack/repos/builtin/packages/antlr4-complete/package.py b/var/spack/repos/builtin/packages/antlr4-complete/package.py new file mode 100644 index 00000000000000..ed4c92b94d318f --- /dev/null +++ b/var/spack/repos/builtin/packages/antlr4-complete/package.py @@ -0,0 +1,63 @@ +# 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 glob + +from spack.package import * + + +class Antlr4Complete(Package): + """ + This package provides complete ANTLR tool, Java runtime and ST, + which lets you run the tool and the generated code by + version 4 of ANTLR (ANother Tool for Language Recognition). + """ + + homepage = "https://www.antlr.org" + url = "https://www.antlr.org/download/antlr-4.13.1-complete.jar" + + version( + "4.13.1", + sha256="bc13a9c57a8dd7d5196888211e5ede657cb64a3ce968608697e4f668251a8487", + expand=False, + ) + version( + "4.12.0", + sha256="88f18a2bfac0dde1009eda5c7dce358a52877faef7868f56223a5bcc15329e43", + expand=False, + ) + version( + "4.11.1", + sha256="62975e192b4af2622b72b5f0131553ee3cbce97f76dc2a41632dcc55e25473e1", + expand=False, + ) + version( + "4.10.1", + sha256="41949d41f20d31d5b8277187735dd755108df52b38db6c865108d3382040f918", + expand=False, + ) + version( + "4.9.3", + sha256="afcd40946d3de4d81e28d7c88d467289e0587285d27adb172aecc5494a17df36", + expand=False, + ) + version( + "4.7.2", + sha256="6852386d7975eff29171dae002cc223251510d35f291ae277948f381a7b380b4", + expand=False, + ) + + depends_on("java@8.0:", type="run", when="@4.10.0:") + depends_on("java@7.0:", type="run", when="@:4.9.3") + + def install(self, spec, prefix): + mkdirp(prefix.bin) + rename(glob.glob("antlr-*-complete.jar")[0], "antlr-complete.jar") + install("antlr-complete.jar", prefix.bin) + + def setup_run_environment(self, env): + env.set("ANTLR4_JAR_LOCATION", join_path(self.prefix.bin, "antlr-complete.jar")) + env.set("ANTLR_JAR_LOCATION", join_path(self.prefix.bin, "antlr-complete.jar")) + env.set("ANTLR_EXECUTABLE", join_path(self.prefix.bin, "antlr-complete.jar")) diff --git a/var/spack/repos/builtin/packages/antlr4-cpp-runtime/package.py b/var/spack/repos/builtin/packages/antlr4-cpp-runtime/package.py new file mode 100644 index 00000000000000..281433c33f2d53 --- /dev/null +++ b/var/spack/repos/builtin/packages/antlr4-cpp-runtime/package.py @@ -0,0 +1,39 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Antlr4CppRuntime(CMakePackage): + """ + This package provides runtime libraries required to use parsers + generated for the Cpp language by version 4 of ANTLR (ANother Tool + for Language Recognition). + """ + + homepage = "https://www.antlr.org" + url = "https://www.antlr.org/download/antlr4-cpp-runtime-4.13.1-source.zip" + version("4.13.1", sha256="d350e09917a633b738c68e1d6dc7d7710e91f4d6543e154a78bb964cfd8eb4de") + version("4.12.0", sha256="642d59854ddc0cebb5b23b2233ad0a8723eef20e66ef78b5b898d0a67556893b") + version("4.11.1", sha256="8018c335316e61bb768e5bd4a743a9303070af4e1a8577fa902cd053c17249da") + version("4.10.1", sha256="2a6e602fd593e0a65d8d310c0952bbdfff34ef361362ae87b2a850b62d36f0b6") + version("4.9.3", sha256="5f0af6efd81f476c3e775c486eb0a71c25d6bbc14373e88a64690e2738d68e03") + version("4.7.2", sha256="8631a39116684638168663d295a969ad544cead3e6089605a44fea34ec01f31a") + + variant( + "clanglibcpp", default=False, description="Compile with clang libc++ instead of libstdc++" + ) + + depends_on("libuuid", type=["build", "link"], when="@:4.10.1") + + def cmake_args(self): + args = [ + self.define("ANTLR4_INSTALL", "On"), + self.define("ANTLR_BUILD_CPP_TESTS", "Off"), + self.define("WITH_DEMO", "Off"), + self.define("WITH_LIBCXX", "On" if "+clanglibcpp" in self.spec else "Off"), + self.define("WITH_STATIC_CRT", "Off"), + ] + return args diff --git a/var/spack/repos/builtin/packages/ants/package.py b/var/spack/repos/builtin/packages/ants/package.py index 8e5001dddeb49c..7903536777049d 100644 --- a/var/spack/repos/builtin/packages/ants/package.py +++ b/var/spack/repos/builtin/packages/ants/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/any2fasta/package.py b/var/spack/repos/builtin/packages/any2fasta/package.py index 690bfc3ed1b3b9..8574bb3ae592fb 100644 --- a/var/spack/repos/builtin/packages/any2fasta/package.py +++ b/var/spack/repos/builtin/packages/any2fasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Any2fasta(Package): homepage = "https://github.com/tseemann/any2fasta" url = "https://github.com/tseemann/any2fasta/archive/refs/tags/v0.4.2.tar.gz" + license("GPL-3.0-only") + version("0.4.2", sha256="e4cb2ddccda6298f5b0aee0c10184a75307a08b584d2abbfbf0d59d37b197e73") version("0.2.3", sha256="197cd1e18adebe28b71a1448c5107804b7093b2aa83c4bcfd8edd3fc4ed485df") version("0.1.2", sha256="ef035595756df7dca1f8a503ee26f8479393953bc67d8870c9965b6d5ade2674") diff --git a/var/spack/repos/builtin/packages/aocc/package.py b/var/spack/repos/builtin/packages/aocc/package.py index 229a37bb5375c5..8514400ae7a44e 100644 --- a/var/spack/repos/builtin/packages/aocc/package.py +++ b/var/spack/repos/builtin/packages/aocc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -91,3 +91,13 @@ def license_reminder(self): def install(self, spec, prefix): print("Installing AOCC Compiler ... ") install_tree(".", prefix) + + @run_after("install") + def cfg_files(self): + # Add path to gcc/g++ such that clang/clang++ can always find a full gcc installation + # including libstdc++.so and header files. + if self.spec.satisfies("%gcc") and self.compiler.cxx is not None: + compiler_options = "--gcc-toolchain={}".format(self.compiler.prefix) + for compiler in ["clang", "clang++"]: + with open(join_path(self.prefix.bin, "{}.cfg".format(compiler)), "w") as f: + f.write(compiler_options) diff --git a/var/spack/repos/builtin/packages/aocl-sparse/package.py b/var/spack/repos/builtin/packages/aocl-sparse/package.py index 7adf7edaef6a1f..a3f82377dd94cd 100644 --- a/var/spack/repos/builtin/packages/aocl-sparse/package.py +++ b/var/spack/repos/builtin/packages/aocl-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class AoclSparse(CMakePackage): maintainers("amd-toolchain-support") + license("MIT") + version("4.1", sha256="35ef437210bc25fdd802b462eaca830bfd928f962569b91b592f2866033ef2bb") version("4.0", sha256="68524e441fdc7bb923333b98151005bed39154d9f4b5e8310b5c37de1d69c2c3") version("3.2", sha256="db7d681a8697d6ef49acf3e97e8bec35b048ce0ad74549c3b738bbdff496618f") diff --git a/var/spack/repos/builtin/packages/aocl-utils/package.py b/var/spack/repos/builtin/packages/aocl-utils/package.py index cc0e8ff4d61853..7b279e8e4758ee 100644 --- a/var/spack/repos/builtin/packages/aocl-utils/package.py +++ b/var/spack/repos/builtin/packages/aocl-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class AoclUtils(CMakePackage): maintainers("amd-toolchain-support") + license("BSD-3-Clause") + version("4.1", sha256="a2f271f5eef07da366dae421af3c89286ebb6239047a31a46451758d4a06bc85") variant("doc", default=False, description="enable documentation") diff --git a/var/spack/repos/builtin/packages/aoflagger/package.py b/var/spack/repos/builtin/packages/aoflagger/package.py index 00938bf009a315..66309bf9fd9589 100644 --- a/var/spack/repos/builtin/packages/aoflagger/package.py +++ b/var/spack/repos/builtin/packages/aoflagger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Aoflagger(CMakePackage): homepage = "https://sourceforge.net/projects/aoflagger/" url = "https://downloads.sourceforge.net/project/aoflagger/aoflagger-2.10.0/aoflagger-2.10.0.tar.bz2" + license("GPL-3.0-or-later") + version("2.10.0", sha256="3ec1188d37101acf2029575ebc09c50b19c158c88a12b55ac5d25a96bd8fc18d") depends_on("casacore+python~fftpack@1.10:") diff --git a/var/spack/repos/builtin/packages/aom/package.py b/var/spack/repos/builtin/packages/aom/package.py index 3139e58d28dbf6..2862b40edca617 100644 --- a/var/spack/repos/builtin/packages/aom/package.py +++ b/var/spack/repos/builtin/packages/aom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,9 @@ class Aom(CMakePackage): homepage = "https://aomedia.googlesource.com/aom" git = "https://aomedia.googlesource.com/aom" + + license("BSD-2-Clause AND AOM-Patent-License-1.0", checked_by="tgamblin") + version("v1.0.0-errata1", commit="29d8ce4836630df5cc7ab58f1afc4836765fc212") depends_on("yasm") diff --git a/var/spack/repos/builtin/packages/aomp/package.py b/var/spack/repos/builtin/packages/aomp/package.py index e1bb094214b2da..6a9603a9deb912 100644 --- a/var/spack/repos/builtin/packages/aomp/package.py +++ b/var/spack/repos/builtin/packages/aomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,8 +7,8 @@ from spack.package import * -tools_url = "https://github.com/ROCm-Developer-Tools" -compute_url = "https://github.com/RadeonOpenCompute" +tools_url = "https://github.com/ROCm" +compute_url = "https://github.com/ROCm" aomp = [ @@ -368,7 +368,7 @@ def install(self, spec, prefix): "-DCMAKE_C_COMPILER={0}".format(self.compiler.cc), "-DCMAKE_CXX_COMPILER={0}".format(self.compiler.cxx), "-DCMAKE_ASM_COMPILER={0}".format(self.compiler.cc), - "-DBUG_REPORT_URL=https://github.com/ROCm-Developer-Tools/aomp", + "-DBUG_REPORT_URL=https://github.com/ROCm/aomp", "-DLLVM_ENABLE_BINDINGS=OFF", "-DLLVM_INCLUDE_BENCHMARKS=OFF", "-DLLVM_BUILD_TESTS=OFF", diff --git a/var/spack/repos/builtin/packages/apachetop/package.py b/var/spack/repos/builtin/packages/apachetop/package.py index bb6459077a8441..060c5e1f878c1c 100644 --- a/var/spack/repos/builtin/packages/apachetop/package.py +++ b/var/spack/repos/builtin/packages/apachetop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apcomp/package.py b/var/spack/repos/builtin/packages/apcomp/package.py index b7352188e6d160..b98f324b77e692 100644 --- a/var/spack/repos/builtin/packages/apcomp/package.py +++ b/var/spack/repos/builtin/packages/apcomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ape/package.py b/var/spack/repos/builtin/packages/ape/package.py index 39b833ab0e10d6..0164ef29f1ecd6 100644 --- a/var/spack/repos/builtin/packages/ape/package.py +++ b/var/spack/repos/builtin/packages/ape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aperture-photometry/package.py b/var/spack/repos/builtin/packages/aperture-photometry/package.py index 2d74720cbe6561..cb32ba52a75025 100644 --- a/var/spack/repos/builtin/packages/aperture-photometry/package.py +++ b/var/spack/repos/builtin/packages/aperture-photometry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apex/package.py b/var/spack/repos/builtin/packages/apex/package.py index bf6ea039acbf2f..dd3223f00ef9e4 100644 --- a/var/spack/repos/builtin/packages/apex/package.py +++ b/var/spack/repos/builtin/packages/apex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -115,6 +115,9 @@ class Apex(CMakePackage): # Conflicts conflicts("+jemalloc", when="+gperftools") conflicts("+plugins", when="~activeharmony") + # Compatibility fixed in 2.6.0 with + # https://github.com/UO-OACISS/apex/commit/4a7bdbb93367c3b1172ccb978825c67316f8bf4a + conflicts("^otf2@3:", when="@:2.5") # https://github.com/UO-OACISS/apex/pull/177#issuecomment-1726322959 conflicts("+openmp", when="%gcc") diff --git a/var/spack/repos/builtin/packages/apfel/package.py b/var/spack/repos/builtin/packages/apfel/package.py index e5be0af541b375..e5a797024e3451 100644 --- a/var/spack/repos/builtin/packages/apfel/package.py +++ b/var/spack/repos/builtin/packages/apfel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Apfel(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("3.0.6", sha256="7063c9eee457e030b97926ac166cdaedd84625b31397e1dfd01ae47371fb9f61") version("3.0.4", sha256="c7bfae7fe2dc0185981850f2fe6ae4842749339d064c25bf525b4ef412bbb224") diff --git a/var/spack/repos/builtin/packages/apktool/package.py b/var/spack/repos/builtin/packages/apktool/package.py index d991d3696119dc..b57cbf3d9c5807 100644 --- a/var/spack/repos/builtin/packages/apktool/package.py +++ b/var/spack/repos/builtin/packages/apktool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Apktool(Package): homepage = "https://ibotpeaches.github.io/Apktool/" url = "https://github.com/iBotPeaches/Apktool/archive/refs/tags/v2.6.0.tar.gz" + license("Apache-2.0") + version("2.7.0", sha256="17d12a2955a46c48afb9b6855651016ac17626512216c91e8b2adab0013d3056") version("2.6.1", sha256="8932e77d963b9e0e07227422d82ed4a355e8aa268bad1361e5cfaffa8e4d52ee") version("2.6.0", sha256="74739cdb1434ca35ec34e51ca7272ad3f378ae3ed0a2d5805d9a2fab5016037f") diff --git a/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml b/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml new file mode 100644 index 00000000000000..dc5b7106ec50f4 --- /dev/null +++ b/var/spack/repos/builtin/packages/apple-clang/detection_test.yaml @@ -0,0 +1,35 @@ +paths: + # Apple Clang on MacBook Pro (Catalina) + - layout: + - executables: + - "bin/clang" + - "bin/clang++" + script: | + echo "Apple clang version 11.0.0 (clang-1100.0.33.8)" + echo "Target: x86_64-apple-darwin19.5.0" + echo "Thread model: posix" + echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin" + results: + - spec: 'apple-clang@11.0.0' + # Apple Clang on Apple M1 (Ventura) + - layout: + - executables: + - "bin/clang" + - "bin/clang++" + script: | + echo "Apple clang version 15.0.0 (clang-1500.0.40.1)" + echo "Target: arm64-apple-darwin22.6.0" + echo "Thread model: posix" + echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin" + results: + - spec: 'apple-clang@15.0.0' + # Test that missing a compiler prevents the package from being detected + - layout: + - executables: + - "bin/clang" + script: | + echo "Apple clang version 11.0.0 (clang-1100.0.33.8)" + echo "Target: x86_64-apple-darwin19.5.0" + echo "Thread model: posix" + echo "InstalledDir: /Library/Developer/CommandLineTools/usr/bin" + results: [ ] diff --git a/var/spack/repos/builtin/packages/apple-clang/package.py b/var/spack/repos/builtin/packages/apple-clang/package.py new file mode 100644 index 00000000000000..634aedf4ebc812 --- /dev/null +++ b/var/spack/repos/builtin/packages/apple-clang/package.py @@ -0,0 +1,76 @@ +# 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 re + +from spack.package import * + + +class AppleClang(BundlePackage): + """Apple's Clang compiler""" + + homepage = "https://developer.apple.com/videos/developer-tools/compiler-and-llvm" + has_code = False + + maintainers("alalazo") + + executables = ["^clang$", r"^clang\+\+$", "^ld.lld$", "^lldb$"] + + @classmethod + def determine_version(cls, exe): + version_regex = re.compile( + # Apple's LLVM compiler has its own versions, which are + # different from vanilla LLVM + r"^Apple (?:LLVM|clang) version ([^ )]+)", + # Multi-line, since 'Apple clang' may not be on the first line + # in particular, when run as gcc, it seems to output + # "Configured with: --prefix=..." as the first line + re.M, + ) + try: + compiler = Executable(exe) + output = compiler("--version", output=str, error=str) + match = version_regex.search(output) + if match: + return match.group(match.lastindex) + except Exception: + pass + + return None + + @classmethod + def determine_variants(cls, exes, version_str): + compilers = {} + for exe in exes: + if "clang++" in exe: + compilers["cxx"] = exe + elif "clang" in exe: + compilers["c"] = exe + elif "ld.lld" in exe: + compilers["ld"] = exe + elif "lldb" in exe: + compilers["lldb"] = exe + + return "", {"compilers": compilers} + + @classmethod + def validate_detected_spec(cls, spec, extra_attributes): + msg = f'the extra attribute "compilers" must be set for the detected spec "{spec}"' + assert "compilers" in extra_attributes, msg + compilers = extra_attributes["compilers"] + for key in ("c", "cxx"): + msg = f"{key} compiler not found for {spec}" + assert key in compilers, msg + + @property + def cc(self): + msg = "apple-clang is expected to be an external spec" + assert self.spec.concrete and self.spec.external, msg + return self.spec.extra_attributes["compilers"].get("c", None) + + @property + def cxx(self): + msg = "apple-clang is expected to be an external spec" + assert self.spec.concrete and self.spec.external, msg + return self.spec.extra_attributes["compilers"].get("cxx", None) diff --git a/var/spack/repos/builtin/packages/apple-gl/package.py b/var/spack/repos/builtin/packages/apple-gl/package.py index 49c764cbb37e33..f0140bc2d74c30 100644 --- a/var/spack/repos/builtin/packages/apple-gl/package.py +++ b/var/spack/repos/builtin/packages/apple-gl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apple-glu/package.py b/var/spack/repos/builtin/packages/apple-glu/package.py index ba20061d3f6fe2..2ccf686cf9ef80 100644 --- a/var/spack/repos/builtin/packages/apple-glu/package.py +++ b/var/spack/repos/builtin/packages/apple-glu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apple-libunwind/package.py b/var/spack/repos/builtin/packages/apple-libunwind/package.py index 214782a7a69362..d549ddab36232e 100644 --- a/var/spack/repos/builtin/packages/apple-libunwind/package.py +++ b/var/spack/repos/builtin/packages/apple-libunwind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apple-libuuid/package.py b/var/spack/repos/builtin/packages/apple-libuuid/package.py index 4c7526d6118537..612f1c6f42bf27 100644 --- a/var/spack/repos/builtin/packages/apple-libuuid/package.py +++ b/var/spack/repos/builtin/packages/apple-libuuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,28 +18,14 @@ class AppleLibuuid(BundlePackage): # Only supported on 'platform=darwin' conflicts("platform=linux") conflicts("platform=cray") + conflicts("platform=windows") @property - def libs(self): - """Export the Apple libuuid library. - - According to https://bugs.freedesktop.org/show_bug.cgi?id=105366, - libuuid is provided as part of libsystem_c. The Apple libsystem_c - library cannot be linked to directly using an absolute path; doing so - will cause the linker to throw an error 'cannot link directly with - /usr/lib/system/libsystem_c.dylib' and the linker will suggest linking - with System.framework instead. Linking to this framework is equivalent - to linking with libSystem.dylib, which can be confirmed on a macOS - system by executing at a terminal the command `ls -l - /System/Library/Frameworks/System.Framework` -- the file "System" is a - symlink to `/usr/lib/libSystem.B.dylib`, and `/usr/lib/libSystem.dylib` - also symlinks to this file. Running `otool -L /usr/lib/libSystem.dylib` - confirms that it will link dynamically to - `/usr/lib/system/libsystem_c.dylib`.""" - - return LibraryList("/usr/lib/libSystem.dylib") + def headers(self): + return HeaderList( + join_path(self.prefix, "System/Library/Frameworks/Kernel.framework/Headers") + ) @property - def headers(self): - """Export the Apple libuuid header.""" - return HeaderList(self.prefix.include.uuid.join("uuid.h")) + def libs(self): + return LibraryList(join_path(self.prefix, "System/Library/Frameworks/Kernel.framework")) diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py index 7133da2c39426a..4acc315b65da49 100644 --- a/var/spack/repos/builtin/packages/applewmproto/package.py +++ b/var/spack/repos/builtin/packages/applewmproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Applewmproto(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/applewmproto" xorg_mirror_path = "proto/applewmproto-1.4.2.tar.gz" + license("MIT") + version("1.4.2", sha256="ff8ac07d263a23357af2d6ff0cca3c1d56b043ddf7797a5a92ec624f4704df2e") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py index 0f13fa402d2032..588af73fbb15c6 100644 --- a/var/spack/repos/builtin/packages/appres/package.py +++ b/var/spack/repos/builtin/packages/appres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/apptainer/package.py b/var/spack/repos/builtin/packages/apptainer/package.py index d1b9ed71e39365..2fbe795b7702ea 100644 --- a/var/spack/repos/builtin/packages/apptainer/package.py +++ b/var/spack/repos/builtin/packages/apptainer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,12 @@ class Apptainer(SingularityBase): url = "https://github.com/apptainer/apptainer/releases/download/v1.0.2/apptainer-1.0.2.tar.gz" git = "https://github.com/apptainer/apptainer.git" + license( + "BSD-3-Clause AND BSD-3-Clause-LBNL" + " AND BSD-2-Clause AND Apache-2.0 AND MIT AND MPL-2.0 AND Unlicense", + checked_by="tgamblin", + ) + version("main", branch="main") version("1.1.9", sha256="c615777539154288542cf393d3fd44c04ccb3260bc6330dc324d4e4ebe902bfa") version("1.1.7", sha256="e6d3956a26c3965703402e17f153ba07f59bf710068806462b314d2d04e825e7") diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index dc0fad53d225d9..8638f880c0085e 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class AprUtil(AutotoolsPackage): homepage = "https://apr.apache.org/" url = "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.gz" + license("Apache-2.0") + version("1.6.3", sha256="2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983") version("1.6.1", sha256="b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459") version("1.6.0", sha256="483ef4d59e6ac9a36c7d3fd87ad7b9db7ad8ae29c06b9dd8ff22dda1cc416389") diff --git a/var/spack/repos/builtin/packages/apr/package.py b/var/spack/repos/builtin/packages/apr/package.py index 45de21e3ee02af..c56f4eb7a143a0 100644 --- a/var/spack/repos/builtin/packages/apr/package.py +++ b/var/spack/repos/builtin/packages/apr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Apr(AutotoolsPackage): homepage = "https://apr.apache.org/" url = "https://archive.apache.org/dist/apr/apr-1.7.0.tar.gz" + license("Apache-2.0") + version("1.7.4", sha256="a4137dd82a185076fa50ba54232d920a17c6469c30b0876569e1c2a05ff311d9") version("1.7.3", sha256="af9bfd5b8a04425d6b419673f3e0a7656fade226aae78180d93f8a6f2d3d1c09") version("1.7.2", sha256="3d8999b216f7b6235343a4e3d456ce9379aa9a380ffb308512f133f0c5eb2db9") diff --git a/var/spack/repos/builtin/packages/aragorn/package.py b/var/spack/repos/builtin/packages/aragorn/package.py index 8ac7894192f457..47446378dbefab 100644 --- a/var/spack/repos/builtin/packages/aragorn/package.py +++ b/var/spack/repos/builtin/packages/aragorn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/arbor/package.py b/var/spack/repos/builtin/packages/arbor/package.py index 1215ee4fc50076..c212d0247ec61c 100644 --- a/var/spack/repos/builtin/packages/arbor/package.py +++ b/var/spack/repos/builtin/packages/arbor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Arbor(CMakePackage, CudaPackage): url = "https://github.com/arbor-sim/arbor/releases/download/v0.8.1/arbor-v0.8.1-full.tar.gz" maintainers = ["thorstenhater", "brenthuisman"] + license("BSD-3-Clause") + version("master", branch="master") version("develop") version( diff --git a/var/spack/repos/builtin/packages/arborx/0001-update-major-version-required-for-rocm-6.0.patch b/var/spack/repos/builtin/packages/arborx/0001-update-major-version-required-for-rocm-6.0.patch new file mode 100644 index 00000000000000..009a40f9844c5f --- /dev/null +++ b/var/spack/repos/builtin/packages/arborx/0001-update-major-version-required-for-rocm-6.0.patch @@ -0,0 +1,24 @@ +From a31d3766f5a7a3a3e20d5bc0c315ad6295a82298 Mon Sep 17 00:00:00 2001 +From: Afzal Patel +Date: Wed, 17 Jan 2024 11:50:18 -0800 +Subject: [PATCH] Changed required version of rocthrust to 3 for rocm 6.0 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c3c99a..1af6d13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ if(Kokkos_ENABLE_HIP AND ARBORX_ENABLE_ROCTHRUST) + # Require at least rocThrust-2.10.5 (that comes with ROCm 3.9) because + # rocPRIM dependency is not set properly in exported configuration for + # earlier versions +- find_package(rocthrust 2.10.5 REQUIRED CONFIG) ++ find_package(rocthrust 3 REQUIRED CONFIG) + target_link_libraries(ArborX INTERFACE roc::rocthrust) + endif() + +-- +2.25.1 diff --git a/var/spack/repos/builtin/packages/arborx/package.py b/var/spack/repos/builtin/packages/arborx/package.py index e766d8897b3b15..1414a22d7a657c 100644 --- a/var/spack/repos/builtin/packages/arborx/package.py +++ b/var/spack/repos/builtin/packages/arborx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,7 +20,10 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): test_requires_compiler = True + license("BSD-3-Clause") + version("master", branch="master") + version("1.5", sha256="c26f23c17e749ccf3e2d353a68969aa54d31b8e720dbfdbc2cef16c5d8477e9e") version("1.4.1", sha256="2ca828ef6615859654b233a7df17017e7cfd904982b80026ec7409eb46b77a95") version("1.4", sha256="803a1018a6305cf3fea161172b3ada49537f59261279d91c2abbcce9492ee7af") version("1.3", sha256="3f1e17f029a460ab99f8396e2772cec908eefc4bf3868c8828907624a2d0ce5d") @@ -68,6 +71,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos@3.4.00:", when="@1.2~trilinos") 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") for backend in kokkos_backends: depends_on("kokkos+%s" % backend.lower(), when="~trilinos+%s" % backend.lower()) @@ -92,6 +96,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage): depends_on("trilinos@13.4.0:", when="@1.3+trilinos") depends_on("trilinos@14.0.0:", when="@1.4:+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") diff --git a/var/spack/repos/builtin/packages/arc/package.py b/var/spack/repos/builtin/packages/arc/package.py index 958c9a26b15930..afcad0a0beedd3 100644 --- a/var/spack/repos/builtin/packages/arc/package.py +++ b/var/spack/repos/builtin/packages/arc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py index 52011bebd46f26..731d318365d310 100644 --- a/var/spack/repos/builtin/packages/archer/package.py +++ b/var/spack/repos/builtin/packages/archer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py index 69a34bf2222ebc..7fc669553065b8 100644 --- a/var/spack/repos/builtin/packages/argobots/package.py +++ b/var/spack/repos/builtin/packages/argobots/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/argon2/package.py b/var/spack/repos/builtin/packages/argon2/package.py index d41ba9761c1366..4484e1eb52a4c9 100644 --- a/var/spack/repos/builtin/packages/argon2/package.py +++ b/var/spack/repos/builtin/packages/argon2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Argon2(MakefilePackage): homepage = "https://password-hashing.net/" url = "https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz" + license("Apache-2.0 OR CC0-1.0") + version("20190702", sha256="daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c") version("20171227", sha256="eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8") version("20161029", sha256="fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7") diff --git a/var/spack/repos/builtin/packages/argp-standalone/package.py b/var/spack/repos/builtin/packages/argp-standalone/package.py index e15fd49a01c0d4..9cdfdc81384458 100644 --- a/var/spack/repos/builtin/packages/argp-standalone/package.py +++ b/var/spack/repos/builtin/packages/argp-standalone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class ArgpStandalone(AutotoolsPackage): homepage = "https://www.lysator.liu.se/~nisse/misc" url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz" + license("LGPL-2.1-or-later") + version("1.3", sha256="dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be") # Homebrew (https://github.com/Homebrew/homebrew-core) patches diff --git a/var/spack/repos/builtin/packages/args/package.py b/var/spack/repos/builtin/packages/args/package.py index 95a58f363474e6..27c739b1684536 100644 --- a/var/spack/repos/builtin/packages/args/package.py +++ b/var/spack/repos/builtin/packages/args/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Args(CMakePackage): homepage = "https://taywee.github.io/args" url = "https://github.com/Taywee/args/archive/6.2.3.tar.gz" + license("MIT") + version("6.4.6", sha256="41ed136bf9b216bf5f18b1de2a8d22a870381657e8427d6621918520b6e2239c") version("6.2.3", sha256="c202d15fc4b30519a08bae7df9e6f4fdc40ac2434ba65d83a108ebbf6e4822c2") version("6.2.2", sha256="8016fb0fc079d746433be3df9cf662e3e931e730aaf9f69f2287eac79ac643c1") diff --git a/var/spack/repos/builtin/packages/argtable/package.py b/var/spack/repos/builtin/packages/argtable/package.py index 2b4e53a369f017..88604bbe50af3e 100644 --- a/var/spack/repos/builtin/packages/argtable/package.py +++ b/var/spack/repos/builtin/packages/argtable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Argtable(AutotoolsPackage): homepage = "http://argtable.sourceforge.net/" url = "https://sourceforge.net/projects/argtable/files/argtable/argtable-2.13/argtable2-13.tar.gz/download" + license("LGPL-2.0-or-later") + version("2-13", sha256="8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf") diff --git a/var/spack/repos/builtin/packages/aria2/package.py b/var/spack/repos/builtin/packages/aria2/package.py index 176fe9048747e2..a1bcca28e7a70b 100644 --- a/var/spack/repos/builtin/packages/aria2/package.py +++ b/var/spack/repos/builtin/packages/aria2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Aria2(AutotoolsPackage): homepage = "https://aria2.github.io" url = "https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0.tar.gz" + license("GPL-2.0-or-later") + version("1.36.0", sha256="b593b2fd382489909c96c62c6e180054c3332b950be3d73e0cb0d21ea8afb3c5") version("1.35.0", sha256="fd85589416f8246cefc4e6ba2fa52da54fdf11fd5602a2db4b6749f7c33b5b2d") version("1.34.0", sha256="ec4866985760b506aa36dc9021dbdc69551c1a647823cae328c30a4f3affaa6c") diff --git a/var/spack/repos/builtin/packages/arm-forge/package.py b/var/spack/repos/builtin/packages/arm-forge/package.py index 16d842bd1e6e77..74dbbe5563c462 100644 --- a/var/spack/repos/builtin/packages/arm-forge/package.py +++ b/var/spack/repos/builtin/packages/arm-forge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 78794086f91b7c..194b75d383f419 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Armadillo(CMakePackage): homepage = "http://arma.sourceforge.net/" url = "http://sourceforge.net/projects/arma/files/armadillo-8.100.1.tar.xz" + license("Apache-2.0") + version("12.4.0", sha256="9905282781ced3f99769b0e45a705ecb50192ca1622300707b3302ea167dc883") version("12.2.0", sha256="b0dce042297e865add3351dad77f78c2c7638d6632f58357b015e50edcbd2186") version("12.0.1", sha256="230a5c75daad52dc47e1adce8f5a50f9aa4e4354e0f1bb18ea84efa2e70e20df") diff --git a/var/spack/repos/builtin/packages/armcomputelibrary/package.py b/var/spack/repos/builtin/packages/armcomputelibrary/package.py index 991e430ef6e280..d3d0e62928a47c 100644 --- a/var/spack/repos/builtin/packages/armcomputelibrary/package.py +++ b/var/spack/repos/builtin/packages/armcomputelibrary/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class Armcomputelibrary(SConsPackage): maintainers("annop-w") + license("MIT") + version("23.02", sha256="bed1b24047ce00155e552204bc3983e86f46775414c554a34a7ece931d67ec62") version("22.11", sha256="2f70f54d84390625222503ea38650c00c49d4b70bc86a6b9aeeebee9d243865f") version("22.08", sha256="5d76d07406b105f0bdf74ef80263236cb03baf0ade882f2bf8446bbc239e0079") diff --git a/var/spack/repos/builtin/packages/armpl-gcc/package.py b/var/spack/repos/builtin/packages/armpl-gcc/package.py index f0157ae551ffe1..880f1267d7550d 100644 --- a/var/spack/repos/builtin/packages/armpl-gcc/package.py +++ b/var/spack/repos/builtin/packages/armpl-gcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/arpack-ng/package.py b/var/spack/repos/builtin/packages/arpack-ng/package.py index c50b90d6d10f45..df345e65a75d1d 100644 --- a/var/spack/repos/builtin/packages/arpack-ng/package.py +++ b/var/spack/repos/builtin/packages/arpack-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/arrayfire/package.py b/var/spack/repos/builtin/packages/arrayfire/package.py index 9befc618417835..23f7ad63e8e2e3 100644 --- a/var/spack/repos/builtin/packages/arrayfire/package.py +++ b/var/spack/repos/builtin/packages/arrayfire/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Arrayfire(CMakePackage, CudaPackage): git = "https://github.com/arrayfire/arrayfire.git" maintainers("umar456") + license("FreeImage") + version("master") version("3.8.1", commit="823e8e399fe8c120c6ec7ec75f09e6106b3074ca", tag="v3.8.1") version( @@ -35,7 +37,10 @@ class Arrayfire(CMakePackage, CudaPackage): depends_on("blas") depends_on("cuda@7.5:", when="+cuda") depends_on("cudnn", when="+cuda") - depends_on("opencl +icd", when="+opencl") + + depends_on("opencl", when="+opencl") + depends_on("pocl+icd", when="^[virtuals=opencl] pocl") + # TODO add more opencl backends: # currently only Cuda backend is enabled # https://github.com/arrayfire/arrayfire/wiki/Build-Instructions-for-Linux#opencl-backend-dependencies diff --git a/var/spack/repos/builtin/packages/arrow/package.py b/var/spack/repos/builtin/packages/arrow/package.py index 8a499fbec2709e..19e4cf1baaf6f7 100644 --- a/var/spack/repos/builtin/packages/arrow/package.py +++ b/var/spack/repos/builtin/packages/arrow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,15 @@ class Arrow(CMakePackage, CudaPackage): homepage = "https://arrow.apache.org" url = "https://github.com/apache/arrow/archive/apache-arrow-0.9.0.tar.gz" + license("Apache-2.0") + + version("14.0.2", sha256="07cdb4da6795487c800526b2865c150ab7d80b8512a31793e6a7147c8ccd270f") + version("14.0.1", sha256="a48e54a09d58168bc04d86b13e7dab04f0aaba18a6f7e4dadf3e9c7bb835c8f1") + version("14.0.0", sha256="39e3388bbaba23faa7a5e8a82ebba7fe4c38ace2c394d6a3f26559715b30f401") + version("13.0.0", sha256="99c27e6a517c750f29c3e6b264836e31251bb8e978dbbf11316680ca3eb8ebda") + version("12.0.1", sha256="f01b76a42ceb30409e7b1953ef64379297dd0c08502547cae6aaafd2c4a4d92e") + version("12.0.0", sha256="f25901c486e1e79cde8b78b3e7b1d889919f942549996003a7341a8ee86addaa") + version("11.0.0", sha256="4a8c0c3d5b39ca81f4a636a41863f1cf5e0ed199f994bf5ead0854ca037eb741") version("10.0.1", sha256="28c3e0402bc1c3c1e047b6e26cedb8d1d89b2b9497d576af24b0b700eef11701") version("9.0.0", sha256="bb187b4b0af8dcc027fffed3700a7b891c9f76c9b63ad8925b4afb8257a2bb1b") version("8.0.0", sha256="19ece12de48e51ce4287d2dee00dc358fbc5ff02f41629d16076f77b8579e272") diff --git a/var/spack/repos/builtin/packages/asagi/package.py b/var/spack/repos/builtin/packages/asagi/package.py index 9ae444580dab86..603cd0ad198a59 100644 --- a/var/spack/repos/builtin/packages/asagi/package.py +++ b/var/spack/repos/builtin/packages/asagi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Asagi(CMakePackage): homepage = "https://github.com/TUM-I5/ASAGI" git = "https://github.com/TUM-I5/ASAGI.git" + license("LGPL-3.0-only") + # fetching the package via git with submodules # is preferred to satisfy internal-dependencies version("1.0.1", commit="f633f96931ae00805f599078d5a1a6a830881554", submodules=True) diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 566be6b632de3f..b8ab20f8132fa2 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,6 +50,8 @@ class Ascent(CMakePackage, CudaPackage): maintainers("cyrush") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=True) version( @@ -195,7 +197,10 @@ class Ascent(CMakePackage, CudaPackage): # VTK-m ####################### depends_on("vtk-m@2.0:", when="@0.9.2: +vtkh") - depends_on("vtk-m@1.9:1.9", when="@0.9.0: +vtkh") + # 2.1 support needs commit e52b7bb8c9fd131f2fd49edf58037cc5ef77a166 + depends_on("vtk-m@:2.0", when="@:0.9.2 +vtkh") + depends_on("vtk-m@1.9", when="@0.9.0:0.9.1 +vtkh") + depends_on("vtk-m +doubleprecision ~64bitids", when="+vtkh ^vtk-m") depends_on("vtk-m~tbb", when="@0.9.0: +vtkh") depends_on("vtk-m+openmp", when="@0.9.0: +vtkh+openmp") diff --git a/var/spack/repos/builtin/packages/asciidoc-py3/package.py b/var/spack/repos/builtin/packages/asciidoc-py3/package.py index a421920d947b27..515e6921072825 100644 --- a/var/spack/repos/builtin/packages/asciidoc-py3/package.py +++ b/var/spack/repos/builtin/packages/asciidoc-py3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 73e7ca3f9fa6f8..2492052f570e5c 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,11 +10,13 @@ class Asciidoc(AutotoolsPackage): """A presentable text document format for writing articles, UNIX man pages and other small to medium sized documents.""" - homepage = "https://asciidoc.org/" + homepage = "https://asciidoc-py.org/" # Always working URL but strangely with another checksum url = "https://github.com/asciidoc-py/asciidoc-py/archive/8.6.10.tar.gz" git = "https://github.com/asciidoc-py/asciidoc-py.git" + license("GPL-2.0-only", checked_by="tgamblin") + version("master", branch="master") version("9.1.0", sha256="5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7") version("9.0.5", sha256="edc8328c3682a8568172656f6fc309b189f65219a49517966c7ea144cb25f8b2") diff --git a/var/spack/repos/builtin/packages/asdcplib/package.py b/var/spack/repos/builtin/packages/asdcplib/package.py index 5aec849ee59480..d0c37005d13e35 100644 --- a/var/spack/repos/builtin/packages/asdcplib/package.py +++ b/var/spack/repos/builtin/packages/asdcplib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Asdcplib(AutotoolsPackage): homepage = "https://github.com/cinecert/asdcplib" url = "https://github.com/cinecert/asdcplib/archive/rel_2_10_35.tar.gz" + license("AMPAS") + version("2_10_38", sha256="f8cb3b1fecfe18f1a64e12e96e5696480631509e9088e29f5a259eb25b1b1656") version("2_10_35", sha256="a68eec9ae0cc363f75331dc279c6dd6d3a9999a9e5f0a4405fd9afa8a29ca27b") version("2_10_34", sha256="faa54ee407c1afceb141e08dae9ebf83b3f839e9c49a1793ac741ec6cdee5c3c") diff --git a/var/spack/repos/builtin/packages/asdf-cxx/package.py b/var/spack/repos/builtin/packages/asdf-cxx/package.py index 01e83e1923070e..b2d15a98142c78 100644 --- a/var/spack/repos/builtin/packages/asdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/asdf-cxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class AsdfCxx(CMakePackage): maintainers("eschnett") + license("MIT") + version("7.2.1", sha256="40864f4f27d3ce8acb5169b57211ce6ac3805f0a6de9c1dfd5f994f4a5beccda") version("7.2.0", sha256="faded85d44288afb83f13634d2139adee07e06f7ea60960c6f2ef8d898c0aa09") version("7.1.0", sha256="81fd8c7f91f8daf0f85a1486480ae9e736b9712e82ccb858271f7ee2c2b425f7") diff --git a/var/spack/repos/builtin/packages/asio/package.py b/var/spack/repos/builtin/packages/asio/package.py index 3c66d7df9e3ba1..c3b52d02ccf07c 100644 --- a/var/spack/repos/builtin/packages/asio/package.py +++ b/var/spack/repos/builtin/packages/asio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Asio(AutotoolsPackage): git = "https://github.com/chriskohlhoff/asio.git" maintainers("msimberg", "pauleonix") + license("BSL-1.0") + # As uneven minor versions of asio are not considered stable, they wont be added anymore version("1.28.0", sha256="226438b0798099ad2a202563a83571ce06dd13b570d8fded4840dbc1f97fa328") version("1.26.0", sha256="935583f86825b7b212479277d03543e0f419a55677fa8cb73a79a927b858a72d") diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py index 8219a46b004bd3..2356a09bd6b538 100644 --- a/var/spack/repos/builtin/packages/aspa/package.py +++ b/var/spack/repos/builtin/packages/aspa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aspcud/package.py b/var/spack/repos/builtin/packages/aspcud/package.py index 8233dcaba0e058..fcd2675ac3bf36 100644 --- a/var/spack/repos/builtin/packages/aspcud/package.py +++ b/var/spack/repos/builtin/packages/aspcud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Aspcud(CMakePackage): homepage = "https://potassco.org/aspcud" url = "https://github.com/potassco/aspcud/archive/v1.9.4.tar.gz" + license("MIT") + version("1.9.6", sha256="4dddfd4a74e4324887a1ddd7f8ff36231774fc1aa78b383256546e83acdf516c") version("1.9.5", sha256="9cd3a9490d377163d87b16fa1a10cc7254bc2dbb9f60e846961ac8233f3835cf") version("1.9.4", sha256="3645f08b079e1cc80e24cd2d7ae5172a52476d84e3ec5e6a6c0034492a6ea885") diff --git a/var/spack/repos/builtin/packages/aspect/package.py b/var/spack/repos/builtin/packages/aspect/package.py index 14ca9da62f6497..914869a2e5e2ed 100644 --- a/var/spack/repos/builtin/packages/aspect/package.py +++ b/var/spack/repos/builtin/packages/aspect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Aspect(CMakePackage): maintainers("tjhei") + license("GPL-2.0-only") + version("develop", branch="main") version("2.3.0", sha256="d97885e502e99ca22af3933c3b1c0b30b0b5e4dc0421e7f6e4d6b378e997faf8") version("2.2.0", sha256="6dc31c4b991c8a96495ba0e9a3c92e57f9305ba94b8dbed3c8c5cfbab91ec5c1") diff --git a/var/spack/repos/builtin/packages/aspell/package.py b/var/spack/repos/builtin/packages/aspell/package.py index a8f5e0abf59341..2cda1b9ac045de 100644 --- a/var/spack/repos/builtin/packages/aspell/package.py +++ b/var/spack/repos/builtin/packages/aspell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Aspell(AutotoolsPackage, GNUMirrorPackage): extendable = True # support activating dictionaries + license("LGPL-2.1-or-later") + version("0.60.8", sha256="f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2") version("0.60.6.1", sha256="f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1") diff --git a/var/spack/repos/builtin/packages/aspell6-de/package.py b/var/spack/repos/builtin/packages/aspell6-de/package.py index c9cd99dd97c555..4bb759b5199f66 100644 --- a/var/spack/repos/builtin/packages/aspell6-de/package.py +++ b/var/spack/repos/builtin/packages/aspell6-de/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Aspell6De(AspellDictPackage, GNUMirrorPackage): homepage = "http://aspell.net/" gnu_mirror_path = "aspell/dict/de/aspell6-de-20030222-1.tar.bz2" + license("GPL-2.0-or-later") + version( "6-de-20030222-1", sha256="ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906", diff --git a/var/spack/repos/builtin/packages/aspell6-en/package.py b/var/spack/repos/builtin/packages/aspell6-en/package.py index d86854456321b8..afd3bdbfb6ef1f 100644 --- a/var/spack/repos/builtin/packages/aspell6-en/package.py +++ b/var/spack/repos/builtin/packages/aspell6-en/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aspell6-es/package.py b/var/spack/repos/builtin/packages/aspell6-es/package.py index 8a21bece14c464..1bec8abf9162bf 100644 --- a/var/spack/repos/builtin/packages/aspell6-es/package.py +++ b/var/spack/repos/builtin/packages/aspell6-es/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Aspell6Es(AspellDictPackage, GNUMirrorPackage): homepage = "http://aspell.net/" gnu_mirror_path = "aspell/dict/es/aspell6-es-1.11-2.tar.bz2" + license("GPL-2.0-or-later") + version("1.11-2", sha256="ad367fa1e7069c72eb7ae37e4d39c30a44d32a6aa73cedccbd0d06a69018afcc") diff --git a/var/spack/repos/builtin/packages/aspera-cli/package.py b/var/spack/repos/builtin/packages/aspera-cli/package.py index 91aa1e19e47818..37fc512d383e07 100644 --- a/var/spack/repos/builtin/packages/aspera-cli/package.py +++ b/var/spack/repos/builtin/packages/aspera-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 96dda57b817d75..d8eb67bc57f544 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Assimp(CMakePackage): maintainers("wdconinc") + license("BSD-3-Clause") + version("master", branch="master") version("5.3.1", sha256="a07666be71afe1ad4bc008c2336b7c688aca391271188eb9108d0c6db1be53f1") version("5.2.5", sha256="b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a") diff --git a/var/spack/repos/builtin/packages/astra/package.py b/var/spack/repos/builtin/packages/astra/package.py index 26e81005d92882..876b21aa15f64b 100644 --- a/var/spack/repos/builtin/packages/astra/package.py +++ b/var/spack/repos/builtin/packages/astra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/astral/package.py b/var/spack/repos/builtin/packages/astral/package.py index af196ab9c391c4..4a06d3658a0eca 100644 --- a/var/spack/repos/builtin/packages/astral/package.py +++ b/var/spack/repos/builtin/packages/astral/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Astral(Package): homepage = "https://github.com/smirarab/ASTRAL" url = "https://github.com/smirarab/ASTRAL/archive/v4.10.7.tar.gz" + license("Apache-2.0") + version("5.7.1", sha256="8aa6fd4324efca325d3dde432517090fac314bea95f407b1dd59977181fec77e") version( "5.6.1", diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index ef4fe29378ffa0..8c0e6a11cc2aeb 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Astyle(MakefilePackage): # Gentoo alternative # url = "https://distfiles.gentoo.org/distfiles/astyle_3.0.1_linux.tar.gz" + license("MIT") + version("3.1", sha256="cbcc4cf996294534bb56f025d6f199ebfde81aa4c271ccbd5ee1c1a3192745d7") version("3.0.1", sha256="6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd") version("2.06", sha256="3b7212210dc139e8f648e004b758c0be1b3ceb1694b22a879202d2b833db7c7e") diff --git a/var/spack/repos/builtin/packages/at-spi2-atk/package.py b/var/spack/repos/builtin/packages/at-spi2-atk/package.py index 6e2f492112ce25..5d421477584255 100644 --- a/var/spack/repos/builtin/packages/at-spi2-atk/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-atk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class AtSpi2Atk(MesonPackage): list_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk" list_depth = 1 + license("LGPL-2.1-or-later") + version("2.38.0", sha256="cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f") version("2.34.2", sha256="901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0") version("2.26.2", sha256="61891f0abae1689f6617a963105a3f1dcdab5970c4a36ded9c79a7a544b16a6e") diff --git a/var/spack/repos/builtin/packages/at-spi2-core/package.py b/var/spack/repos/builtin/packages/at-spi2-core/package.py index ec8cbd5e23c68b..911e05085a022e 100644 --- a/var/spack/repos/builtin/packages/at-spi2-core/package.py +++ b/var/spack/repos/builtin/packages/at-spi2-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class AtSpi2Core(MesonPackage): list_url = "http://ftp.gnome.org/pub/gnome/sources/at-spi2-core" list_depth = 1 + license("LGPL-2.1-or-later") + version("2.48.3", sha256="37316df43ca9989ce539d54cf429a768c28bb38a0b34950beadd0421827edf55") version("2.48.0", sha256="905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30") version("2.47.90", sha256="71189c21af7bd084a12ab85b229c2d798936470b12fb0c3f177e37181fb6c00c") diff --git a/var/spack/repos/builtin/packages/atf/package.py b/var/spack/repos/builtin/packages/atf/package.py index 3ab73623446ea8..a0916aec82a495 100644 --- a/var/spack/repos/builtin/packages/atf/package.py +++ b/var/spack/repos/builtin/packages/atf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Atf(AutotoolsPackage): homepage = "https://github.com/jmmv/atf" url = "https://github.com/jmmv/atf/archive/atf-0.21.tar.gz" + license("BSD-2-Clause AND BSD-3-Clause", checked_by="tgamblin") + version("0.21", sha256="da6b02d6e7242f768a7aaa7b7e52378680456e4bd9a913b6636187079c98f3cd") version("0.20", sha256="3677cf957d7f574835b8bdd385984ba928d5695b3ff28f958e4227f810483ab7") version("0.19", sha256="f9b1d76dad7c34ae61a75638edc517fc05b10fa4c8f97b1d13d739bffee79b16") diff --git a/var/spack/repos/builtin/packages/athena/package.py b/var/spack/repos/builtin/packages/athena/package.py index bf091ba61b58d4..cf4da42d09283a 100644 --- a/var/spack/repos/builtin/packages/athena/package.py +++ b/var/spack/repos/builtin/packages/athena/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/atk/package.py b/var/spack/repos/builtin/packages/atk/package.py index 52849669ecca01..bcb6425b081521 100644 --- a/var/spack/repos/builtin/packages/atk/package.py +++ b/var/spack/repos/builtin/packages/atk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Atk(Package): list_url = "https://ftp.gnome.org/pub/gnome/sources/atk" list_depth = 1 + license("LGPL-2.0-or-later") + version("2.38.0", sha256="ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36") version("2.36.0", sha256="fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788") version("2.30.0", sha256="dd4d90d4217f2a0c1fee708a555596c2c19d26fef0952e1ead1938ab632c027b") diff --git a/var/spack/repos/builtin/packages/atlas/package.py b/var/spack/repos/builtin/packages/atlas/package.py index ecc6379b570c62..89e65bc878f6f1 100644 --- a/var/spack/repos/builtin/packages/atlas/package.py +++ b/var/spack/repos/builtin/packages/atlas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Atlas(Package): homepage = "http://math-atlas.sourceforge.net/" + license("Apache-2.0") + # Developer (unstable) version("3.11.41", sha256="477d567a8d683e891d786e9e8bb6ad6659daa9ba18e8dd0e2f70b7a54095f8de") version("3.11.39", sha256="584bd44572746142bf19348139530c18f4538ce41d94330ff86ede38c36eddc9") diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 8d57098d3cac7b..96c588174f5edb 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,11 +13,13 @@ class Atmi(CMakePackage): consistent, declarative API to create task graphs on CPUs and GPUs (integrated and discrete).""" - homepage = "https://github.com/RadeonOpenCompute/atmi" - git = "https://github.com/RadeonOpenCompute/atmi.git" - url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/atmi" + git = "https://github.com/ROCm/atmi.git" + url = "https://github.com/ROCm/atmi/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("MIT") + maintainers("srekolam", "renjithravindrankannath") version("5.5.1", sha256="6b3ee68433506315b55d093a4b47463916874fb6f3f602098eaff2ec283e69ab") version("5.5.0", sha256="b8bfd32e5c386f5169da62172964343f9b7fad207e0e74dd1093c7acf06d9811") diff --git a/var/spack/repos/builtin/packages/atom-dft/package.py b/var/spack/repos/builtin/packages/atom-dft/package.py index 3f8c5e7756303a..dec2d07b1b0626 100644 --- a/var/spack/repos/builtin/packages/atom-dft/package.py +++ b/var/spack/repos/builtin/packages/atom-dft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/atompaw/package.py b/var/spack/repos/builtin/packages/atompaw/package.py index f0ea750583910a..2028645bd8a05d 100644 --- a/var/spack/repos/builtin/packages/atompaw/package.py +++ b/var/spack/repos/builtin/packages/atompaw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Atompaw(AutotoolsPackage): homepage = "https://users.wfu.edu/natalie/papers/pwpaw/man.html" url = "https://users.wfu.edu/natalie/papers/pwpaw/atompaw-4.0.0.13.tar.gz" + license("GPL-3.0-only") + version("4.2.0.2", sha256="c16648611f5798b8e1781fb2229854c54fa63f085bd11440fdc4ecacbf0ad93e") version("4.2.0.1", sha256="d3476a5aa5f80f9430b81f28273c2c2a9b6e7d9c3d08c65544247bb76cd5a114") version("4.2.0.0", sha256="9ab4f4ab78a720fbcd95bbbc1403e8ff348d15570e7c694932a56be15985e93d") diff --git a/var/spack/repos/builtin/packages/atop/package.py b/var/spack/repos/builtin/packages/atop/package.py index 670b7e37c7538d..f87d6c0c6ada94 100644 --- a/var/spack/repos/builtin/packages/atop/package.py +++ b/var/spack/repos/builtin/packages/atop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Atop(Package): homepage = "https://www.atoptool.nl/index.php" url = "https://www.atoptool.nl/download/atop-2.2-3.tar.gz" + license("GPL-2.0-or-later") + version("2.5.0", sha256="4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33") version("2.4.0", sha256="be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69") version("2.3.0", sha256="73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264") diff --git a/var/spack/repos/builtin/packages/attr/package.py b/var/spack/repos/builtin/packages/attr/package.py index 76a78b280470a0..3ab1244986fcc2 100644 --- a/var/spack/repos/builtin/packages/attr/package.py +++ b/var/spack/repos/builtin/packages/attr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Attr(AutotoolsPackage): homepage = "https://savannah.nongnu.org/projects/attr" url = "http://download.savannah.gnu.org/releases/attr/attr-2.4.47.src.tar.gz" + license("LGPL-2.1-or-later") + version("2.4.48", sha256="5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7") version("2.4.47", sha256="25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859") version("2.4.46", sha256="dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f") diff --git a/var/spack/repos/builtin/packages/audacious/package.py b/var/spack/repos/builtin/packages/audacious/package.py index 1d6634780b5870..d6737186f5ee1c 100644 --- a/var/spack/repos/builtin/packages/audacious/package.py +++ b/var/spack/repos/builtin/packages/audacious/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Audacious(AutotoolsPackage): homepage = "https://audacious-media-player.org/" url = "https://github.com/audacious-media-player/audacious/archive/audacious-4.0.2.tar.gz" + license("BSD-2-Clause AND BSD-3-Clause", checked_by="tgamblin") + version("4.0.2", sha256="92f30a78353c50f99b536061b9d94b6b9128760d546fddbf863e3591c4ac5a8d") version("4.0.1", sha256="203195cf0d3c2e40d23c9895269ca0ace639c4a2b4dceb624169d75337059985") version("4.0", sha256="cdfffd0eb966856980328ebb0fff9cbce57f99db9bda15e7e839d26c89e953e6") diff --git a/var/spack/repos/builtin/packages/audacity/package.py b/var/spack/repos/builtin/packages/audacity/package.py index 4215b1c2589b50..9e3332032ceaf9 100644 --- a/var/spack/repos/builtin/packages/audacity/package.py +++ b/var/spack/repos/builtin/packages/audacity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Audacity(CMakePackage): homepage = "http://audacity.sourceforge.net" url = "https://github.com/audacity/audacity/archive/Audacity-2.4.2.tar.gz" + license("GPL-3.0-or-later") + version("2.4.2", sha256="cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099") version("2.4.1", sha256="50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f") version("2.4.0", sha256="5d1c096d7b04ff8d5dbca3dca5b9d9f8e62093b5ea6e57ae5f821ae3132dc88f") diff --git a/var/spack/repos/builtin/packages/audit-userspace/package.py b/var/spack/repos/builtin/packages/audit-userspace/package.py index e5d39866b7548a..b38e3aee291578 100644 --- a/var/spack/repos/builtin/packages/audit-userspace/package.py +++ b/var/spack/repos/builtin/packages/audit-userspace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class AuditUserspace(AutotoolsPackage): homepage = "https://github.com/linux-audit/audit-userspace" url = "https://github.com/linux-audit/audit-userspace/archive/v2.8.5.tar.gz" + license("LGPL-2.1-or-later") + version("3.1.1", sha256="6a97cc472920639d736e9927353be05e323f351067fcf6e5d34439cafa0e9006") version("2.8.5", sha256="835ffdd65056ba0c26509dbf48882713b00dbe70e1d8cf25d538501136c2e3e9") version("2.8.4", sha256="089dfdceb38edf056202a6de4892fd0c9aaa964c08bd7806c5d0c7c33f09e18d") diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index 2c5cfa5c0d531e..a80de62d02f479 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Augustus(MakefilePackage): homepage = "https://bioinf.uni-greifswald.de/augustus/" url = "https://github.com/Gaius-Augustus/Augustus/archive/v3.3.4.tar.gz" + license("Artistic-1.0") + # Releases have moved to github version("3.5.0", sha256="5ed6ce6106303b800c5e91d37a250baff43b20824657b853ae04d11ad8bdd686") version("3.4.0", sha256="2c06cf5953da5afdce1478fa10fcd3c280a3b050f1b2367bf3e731d7374d9bb8") diff --git a/var/spack/repos/builtin/packages/authd/package.py b/var/spack/repos/builtin/packages/authd/package.py index dbb290839bc916..230d32196ef88e 100644 --- a/var/spack/repos/builtin/packages/authd/package.py +++ b/var/spack/repos/builtin/packages/authd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Authd(MakefilePackage): homepage = "https://github.com/InfrastructureServices/authd" url = "https://github.com/InfrastructureServices/authd/releases/download/v1.4.4/authd-1.4.4.tar.gz" + license("GPL-2.0-only") + version("1.4.4", sha256="71ee3d1c3e107c93e082148f75ee460c949b203c861dd20d48f7c5cfdc272bf8") def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/authselect/package.py b/var/spack/repos/builtin/packages/authselect/package.py index 230722beb67a7c..fb61a06610ece3 100644 --- a/var/spack/repos/builtin/packages/authselect/package.py +++ b/var/spack/repos/builtin/packages/authselect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Authselect(AutotoolsPackage): homepage = "https://github.com/authselect/authselect" url = "https://github.com/authselect/authselect/archive/1.2.1.tar.gz" + license("GPL-3.0-or-later") + version("1.2.1", sha256="6f58c36d8b405da836dc9d1f44c1a22660c60f9e7ece327138d1b2492cb57749") version("1.2", sha256="c354c87a0115612cb51b09b5157f151569e16384cdd69f32b8515209036531b4") version("1.1", sha256="39b888575980c1ecac7022dfe5a5452eef59cef850b8544ed5f928e2e8a335dd") diff --git a/var/spack/repos/builtin/packages/autoconf-archive/package.py b/var/spack/repos/builtin/packages/autoconf-archive/package.py index 0c51708635f829..0f611eef2fbf43 100644 --- a/var/spack/repos/builtin/packages/autoconf-archive/package.py +++ b/var/spack/repos/builtin/packages/autoconf-archive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class AutoconfArchive(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/autoconf-archive/" gnu_mirror_path = "autoconf-archive/autoconf-archive-2019.01.06.tar.xz" + license("GPL-3.0-or-later") + version( "2023.02.20", sha256="71d4048479ae28f1f5794619c3d72df9c01df49b1c628ef85fde37596dc31a33" ) diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index 9ae244bfbed6b7..44a1e98d4e5840 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,13 +14,13 @@ class Autoconf(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/autoconf/" gnu_mirror_path = "autoconf/autoconf-2.69.tar.gz" + license("GPL-3.0-or-later WITH Autoconf-exception-3.0", when="@2.62:", checked_by="tgamblin") + license("GPL-2.0-or-later WITH Autoconf-exception-2.0", when="@:2.59", checked_by="tgamblin") + + version("2.72", sha256="afb181a76e1ee72832f6581c0eddf8df032b83e2e0239ef79ebedc4467d92d6e") version("2.71", sha256="431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c") version("2.70", sha256="f05f410fda74323ada4bdc4610db37f8dbd556602ba65bc843edb4d4d4a1b2b7") - version( - "2.69", - sha256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969", - preferred=True, - ) + version("2.69", sha256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969") version("2.62", sha256="83aa747e6443def0ebd1882509c53f5a2133f502ddefa21b3de141c433914bdd") version("2.59", sha256="9cd05c73c5fcb1f5ccae53dd6cac36bb8cb9c7b3e97ffae5a7c05c72594c88d8") @@ -52,7 +52,8 @@ class Autoconf(AutotoolsPackage, GNUMirrorPackage): # Note: m4 is not a pure build-time dependency of autoconf. m4 is # needed when autoconf runs, not only when autoconf is built. - depends_on("m4@1.4.6:", type=("build", "run")) + depends_on("m4@1.4.8:", type=("build", "run"), when="@1.72:") + depends_on("m4@1.4.6:", type=("build", "run"), when="@:1.71") depends_on("perl", type=("build", "run")) build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/autodiff/package.py b/var/spack/repos/builtin/packages/autodiff/package.py index ec4c09bad5b39a..ac7b50477e43be 100644 --- a/var/spack/repos/builtin/packages/autodiff/package.py +++ b/var/spack/repos/builtin/packages/autodiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Autodiff(CMakePackage): maintainers("wdconinc", "HadrienG2") + license("MIT") + version("1.0.1", sha256="63f2c8aaf940fbb1d1e7098b1d6c08794da0194eec3faf773f3123dc7233838c") version("1.0.0", sha256="112c6f5740071786b3f212c96896abc2089a74bca16b57bb46ebf4cec79dca43") version("0.6.12", sha256="3e9d667b81bba8e43bbe240a0321e25f4be248d1761097718664445306882dcc") diff --git a/var/spack/repos/builtin/packages/autodock-gpu/package.py b/var/spack/repos/builtin/packages/autodock-gpu/package.py index fc25e9ff4bff85..e687cfd4ce73b3 100644 --- a/var/spack/repos/builtin/packages/autodock-gpu/package.py +++ b/var/spack/repos/builtin/packages/autodock-gpu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ from spack.package import * -class AutodockGpu(MakefilePackage): +class AutodockGpu(MakefilePackage, CudaPackage): """AutoDock-GPU: AutoDock for GPUs and other accelerators. OpenCL and Cuda accelerated version of AutoDock 4.2.6. It leverages its embarrasingly parallelizable LGA by processing @@ -18,6 +18,8 @@ class AutodockGpu(MakefilePackage): maintainers("RemiLacroix-IDRIS") + license("LGPL-2.1-or-later") + version("develop", branch="develop") variant( @@ -28,14 +30,19 @@ class AutodockGpu(MakefilePackage): multi=False, ) variant("overlap", default=False, description="Overlap CPU and GPU operations") + variant("cuda", default=True, description="Build with CUDA") depends_on("cuda") + conflicts("~cuda") # the cuda variant is mandatory + conflicts("+cuda", when="cuda_arch=none") + @property def build_targets(self): spec = self.spec return [ "DEVICE={0}".format(spec.variants["device"].value.upper()), + "TARGETS={0}".format(" ".join(spec.variants["cuda_arch"].value)), "GPU_INCLUDE_PATH={0}".format(spec["cuda"].prefix.include), "GPU_LIBRARY_PATH={0}".format(spec["cuda"].libs.directories[0]), "OVERLAP={0}".format("ON" if "+overlap" in spec else "OFF"), diff --git a/var/spack/repos/builtin/packages/autodock-vina/package.py b/var/spack/repos/builtin/packages/autodock-vina/package.py index 8ca01804d8c0dc..f1cfa5694c303e 100644 --- a/var/spack/repos/builtin/packages/autodock-vina/package.py +++ b/var/spack/repos/builtin/packages/autodock-vina/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class AutodockVina(MakefilePackage): homepage = "http://vina.scripps.edu/" url = "https://github.com/ccsb-scripps/AutoDock-Vina/archive/refs/tags/v1.2.3.tar.gz" + license("Apache-2.0") + version("1.2.3", sha256="22f85b2e770b6acc363429153b9551f56e0a0d88d25f747a40d2f55a263608e0") version("1.2.2", sha256="b9c28df478f90d64dbbb5f4a53972bddffffb017b7bb58581a1a0034fff1b400") version("1.2.1", sha256="2d8d9871a5a95265c03c621c0584d9f06b202303116e6c87e23c935f7b694f74") diff --git a/var/spack/repos/builtin/packages/autofact/package.py b/var/spack/repos/builtin/packages/autofact/package.py index ee06562cb26940..4de86283e72ceb 100644 --- a/var/spack/repos/builtin/packages/autofact/package.py +++ b/var/spack/repos/builtin/packages/autofact/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/autogen/package.py b/var/spack/repos/builtin/packages/autogen/package.py index 54b088beb599c6..895970b374eb66 100644 --- a/var/spack/repos/builtin/packages/autogen/package.py +++ b/var/spack/repos/builtin/packages/autogen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Autogen(AutotoolsPackage, GNUMirrorPackage): list_url = "https://ftp.gnu.org/gnu/autogen" list_depth = 1 + license("GPL-3.0-only") + version("5.18.12", sha256="805c20182f3cb0ebf1571d3b01972851c56fb34348dfdc38799fd0ec3b2badbe") variant("xml", default=True, description="Enable XML support") diff --git a/var/spack/repos/builtin/packages/automaded/package.py b/var/spack/repos/builtin/packages/automaded/package.py index 922fece704f2ea..bd488830d08934 100644 --- a/var/spack/repos/builtin/packages/automaded/package.py +++ b/var/spack/repos/builtin/packages/automaded/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/automake/package.py b/var/spack/repos/builtin/packages/automake/package.py index 65046406063268..d0ae1456edcacf 100644 --- a/var/spack/repos/builtin/packages/automake/package.py +++ b/var/spack/repos/builtin/packages/automake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Automake(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/automake/" gnu_mirror_path = "automake/automake-1.15.tar.gz" + license("GPL-2.0-or-later") + version("1.16.5", sha256="07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605") version("1.16.3", sha256="ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f") version("1.16.2", sha256="b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1") diff --git a/var/spack/repos/builtin/packages/avizo/package.py b/var/spack/repos/builtin/packages/avizo/package.py index 43364919cd757f..405d84cc179872 100644 --- a/var/spack/repos/builtin/packages/avizo/package.py +++ b/var/spack/repos/builtin/packages/avizo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Avizo(Package): manual_download = True + license("GPL-3.0") + version( "2020.1", sha256="9321aaa276567eebf116e268353c33a4c930d768d22793f921338e1d8cefe991", diff --git a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py index 30c6b6145e5fd6..d064393199db5d 100644 --- a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py +++ b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py index d21a1600d615e5..f831c885375434 100644 --- a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py +++ b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,15 @@ class AwsOfiRccl(AutotoolsPackage): libfabric as a network provider while running AMD's RCCL based applications.""" - homepage = "https://github.com/ROCmSoftwarePlatform/aws-ofi-rccl" - git = "https://github.com/ROCmSoftwarePlatform/aws-ofi-rccl.git" - url = "https://github.com/ROCmSoftwarePlatform/aws-ofi-rccl.git" + homepage = "https://github.com/ROCm/aws-ofi-rccl" + git = "https://github.com/ROCm/aws-ofi-rccl.git" + url = "https://github.com/ROCm/aws-ofi-rccl.git" tags = ["rocm"] maintainers("bvanessen") + license("Apache-2.0") + version("cxi", branch="cxi", preferred=True) version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py index 2356e72e520dd2..178527503bff33 100644 --- a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py +++ b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py b/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py index 114cb4b2b41e53..cdea77da7e8ef4 100644 --- a/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py +++ b/var/spack/repos/builtin/packages/aws-sdk-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class AwsSdkCpp(CMakePackage): homepage = "https://github.com/aws/aws-sdk-cpp" git = "https://github.com/aws/aws-sdk-cpp.git" + license("Apache-2.0") + version( "1.11.144", tag="1.11.144", diff --git a/var/spack/repos/builtin/packages/awscli-v2/package.py b/var/spack/repos/builtin/packages/awscli-v2/package.py index 49436945f9956e..821321e6227776 100644 --- a/var/spack/repos/builtin/packages/awscli-v2/package.py +++ b/var/spack/repos/builtin/packages/awscli-v2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py index dc024638bd9576..550f713ad7a5e5 100644 --- a/var/spack/repos/builtin/packages/awscli/package.py +++ b/var/spack/repos/builtin/packages/awscli/package.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/axel/package.py b/var/spack/repos/builtin/packages/axel/package.py index ef9225ed73767a..e25ab8f192526a 100644 --- a/var/spack/repos/builtin/packages/axel/package.py +++ b/var/spack/repos/builtin/packages/axel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Axel(AutotoolsPackage): homepage = "https://github.com/axel-download-accelerator/axel" url = "https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.bz2" + license("GPL-2.0-or-later WITH OpenSSL-Exception") + version("2.17.10", sha256="c0d26eba6b94945cd98c5b69ca6df2744639d17bfd49047ef51a8a48f067de10") version("2.16.1", sha256="763066efc61e4f7be2eb59afa049bdbc520837e01c95a78f403e542ad82f2719") diff --git a/var/spack/repos/builtin/packages/axl/package.py b/var/spack/repos/builtin/packages/axl/package.py index 169f7afaacbd70..381d47578b06a6 100644 --- a/var/spack/repos/builtin/packages/axl/package.py +++ b/var/spack/repos/builtin/packages/axl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Axl(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.8.0", sha256="9fcd4eae143a67ff02622feda2a541b85e9a108749c039faeb473cbbc2330459") version("0.7.1", sha256="526a055c072c85cc989beca656717e06b128f148fda8eb19d1d9b43a3325b399") diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index ab3ca1d9c00109..1c64ad709328bf 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,6 +8,7 @@ from os.path import join as pjoin from spack.package import * +from spack.util.executable import which_string def get_spec_path(spec, package_name, path_replacements={}, use_bin=False): @@ -38,6 +39,8 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/LLNL/axom.git" tags = ["radiuss"] + license("BSD-3-Clause") + version("main", branch="main") version("develop", branch="develop") version("0.8.1", tag="v0.8.1", commit="0da8a5b1be596887158ac2fcd321524ba5259e15") @@ -57,6 +60,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): patch("examples-oneapi.patch", when="@0.6.1 +examples %oneapi") patch("scr_examples_gtest.patch", when="@0.6.0:0.6.1") + patch("umpire_camp_blt_targets.patch", when="@=0.8.0 ^umpire@2023.06.0") root_cmakelists_dir = "src" @@ -94,10 +98,11 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): # ----------------------------------------------------------------------- # Basics depends_on("cmake@3.14:", type="build") + depends_on("cmake@3.18:", type="build", when="@0.7.0:") depends_on("cmake@3.21:", type="build", when="+rocm") depends_on("blt", type="build") - depends_on("blt@0.5.1:", type="build", when="@0.6.2:") + depends_on("blt@0.5.1:", type="build", when="@0.6.1:") depends_on("mpi", when="+mpi") @@ -139,8 +144,12 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on(raja_rocm, when="+{0}".format(raja_rocm)) depends_on(umpire_rocm, when="+{0}".format(umpire_rocm)) - depends_on("mfem", when="+mfem") - depends_on("mfem~mpi", when="+mfem~mpi") + depends_on("rocprim", when="+rocm") + + with when("+mfem"): + depends_on("mfem+mpi", when="+mpi") + depends_on("mfem~mpi", when="~mpi") + depends_on("mfem@4.5.0:", when="@0.7.0:") depends_on("python", when="+python") @@ -151,6 +160,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("python", when="+devtools") depends_on("py-sphinx", when="+devtools") depends_on("py-shroud", when="+devtools") + depends_on("py-jsonschema", when="+devtools") depends_on("llvm+clang@10.0.0", when="+devtools", type="build") # Hard requirement after Axom 0.6.1 @@ -219,7 +229,10 @@ def initconfig_compiler_entries(self): flags = "" for _libpath in [libdir, libdir + "64"]: if os.path.exists(_libpath): - flags += " -Wl,-rpath,{0}".format(_libpath) + if spec.satisfies("^cuda"): + flags += " -Xlinker -rpath -Xlinker {0}".format(_libpath) + else: + flags += " -Wl,-rpath,{0}".format(_libpath) description = "Adds a missing libstdc++ rpath" if flags: entries.append(cmake_cache_string("BLT_EXE_LINKER_FLAGS", flags, description)) @@ -229,6 +242,12 @@ def initconfig_compiler_entries(self): if "+cpp14" in spec and spec.satisfies("@:0.6.1"): entries.append(cmake_cache_string("BLT_CXX_STD", "c++14", "")) + # Add optimization flag workaround for Debug builds with + # cray compiler or newer HIP + if "+rocm" in spec: + if spec.satisfies("%cce") or spec.satisfies("%clang@16"): + entries.append(cmake_cache_string("CMAKE_CXX_FLAGS_DEBUG", "-O1 -g -DNDEBUG")) + return entries def initconfig_hardware_entries(self): @@ -237,21 +256,24 @@ def initconfig_hardware_entries(self): if "+cuda" in spec: entries.append(cmake_cache_option("ENABLE_CUDA", True)) - entries.append(cmake_cache_option("CUDA_SEPARABLE_COMPILATION", True)) + entries.append(cmake_cache_option("CMAKE_CUDA_SEPARABLE_COMPILATION", True)) entries.append(cmake_cache_option("AXOM_ENABLE_ANNOTATIONS", True)) # CUDA_FLAGS cudaflags = "-restrict --expt-extended-lambda " + # Pass through any cxxflags to the host compiler via nvcc's Xcompiler flag + host_cxx_flags = spec.compiler_flags["cxxflags"] + cudaflags += " ".join(["-Xcompiler=%s " % flag for flag in host_cxx_flags]) + if not spec.satisfies("cuda_arch=none"): cuda_arch = spec.variants["cuda_arch"].value[0] entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", cuda_arch)) - cudaflags += "-arch sm_${CMAKE_CUDA_ARCHITECTURES} " else: entries.append("# cuda_arch could not be determined\n\n") - if spec.satisfies("^blt@:0.6.1"): + if spec.satisfies("^blt@:0.5.1"): # This is handled internally by BLT now if "+cpp14" in spec: cudaflags += " -std=c++14" @@ -264,7 +286,7 @@ def initconfig_hardware_entries(self): if "+rocm" in spec: entries.append("#------------------{0}\n".format("-" * 60)) - entries.append("# HIP\n") + entries.append("# Axom ROCm specifics\n") entries.append("#------------------{0}\n\n".format("-" * 60)) entries.append(cmake_cache_option("ENABLE_HIP", True)) @@ -272,13 +294,20 @@ def initconfig_hardware_entries(self): hip_root = spec["hip"].prefix rocm_root = hip_root + "/.." - entries.append(cmake_cache_string("HIP_ROOT_DIR", hip_root)) - entries.append(cmake_cache_string("HIP_CLANG_PATH", rocm_root + "/llvm/bin")) - - archs = self.spec.variants["amdgpu_target"].value - if archs != "none": - arch_str = ",".join(archs) - entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) + # Fix blt_hip getting HIP_CLANG_INCLUDE_PATH-NOTFOUND bad include directory + # TODO: verify that this is still needed and is indeed specific to LC + if ( + self.spec.satisfies("%cce") or self.spec.satisfies("%clang") + ) and "toss_4" in self._get_sys_type(spec): + # Set the patch version to 0 if not already + clang_version = str(self.compiler.version)[:-1] + "0" + hip_clang_include_path = ( + rocm_root + "/llvm/lib/clang/" + clang_version + "/include" + ) + if os.path.isdir(hip_clang_include_path): + entries.append( + cmake_cache_path("HIP_CLANG_INCLUDE_PATH", hip_clang_include_path) + ) # Fixes for mpi for rocm until wrapper paths are fixed # These flags are already part of the wrapped compilers on TOSS4 systems @@ -289,9 +318,16 @@ def initconfig_hardware_entries(self): hip_link_flags += "-Wl,-rpath,{0}/../llvm/lib:{0}/lib ".format(hip_root) hip_link_flags += "-lpgmath -lflang -lflangrti -lompstub -lamdhip64 " + # Remove extra link library for crayftn + if "+fortran" in spec and self.is_fortran_compiler("crayftn"): + entries.append( + cmake_cache_string("BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE", "unwind") + ) + # Additional libraries for TOSS4 hip_link_flags += " -L{0}/../lib64 -Wl,-rpath,{0}/../lib64 ".format(hip_root) - hip_link_flags += "-lhsakmt -lamd_comgr " + hip_link_flags += " -L{0}/../lib -Wl,-rpath,{0}/../lib ".format(hip_root) + hip_link_flags += "-lamd_comgr -lhsa-runtime64 " entries.append(cmake_cache_string("CMAKE_EXE_LINKER_FLAGS", hip_link_flags)) @@ -326,13 +362,30 @@ def initconfig_hardware_entries(self): cmake_cache_string("CMAKE_SHARED_LINKER_FLAGS", linker_flags, description) ) - description = "Converts C-style comments to Fortran style " "in preprocessed files" + description = "Converts C-style comments to Fortran style in preprocessed files" entries.append( cmake_cache_string( "BLT_FORTRAN_FLAGS", "-WF,-C! -qxlf2003=polymorphic", description ) ) + if ( + "+openmp" in spec + and "clang" in self.compiler.cxx + and "+fortran" in spec + and self.is_fortran_compiler("xlf") + ): + openmp_gen_exp = ( + "$<$>:" + "-fopenmp=libomp>;$<$:-qsmp=omp>" + ) + + description = "Different OpenMP linker flag between CXX and Fortran" + entries.append( + cmake_cache_string("BLT_OPENMP_LINK_FLAGS", openmp_gen_exp, description) + ) + if spec.satisfies("target=ppc64le:"): # Fix for working around CMake adding implicit link directories # returned by the BlueOS compilers to link executables with @@ -365,28 +418,43 @@ def initconfig_mpi_entries(self): else: entries.append(cmake_cache_option("ENABLE_MPI", False)) + # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 + # TODO: Remove this logic by adding `using_flux` case in + # spack/lib/spack/spack/build_systems/cached_cmake.py:196 and remove hard-coded + # path to srun in same file. + if "toss_4" in self._get_sys_type(spec): + srun_wrapper = which_string("srun") + mpi_exec_index = [ + index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry + ] + del entries[mpi_exec_index[0]] + entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) + return entries + def find_path_replacement(self, path1, path2, path_replacements, name, entries): + root = os.path.commonprefix([path1, path2]) + if root.endswith(os.path.sep): + root = root[: -len(os.path.sep)] + if root: + path_replacements[root] = "${" + name + "}" + entries.append(cmake_cache_path(name, root)) + def initconfig_package_entries(self): spec = self.spec entries = [] + path_replacements = {} # TPL locations entries.append("#------------------{0}".format("-" * 60)) entries.append("# TPLs") entries.append("#------------------{0}\n".format("-" * 60)) - # Try to find the common prefix of the TPL directory, including the - # compiler. If found, we will use this in the TPL paths - compiler_str = str(spec.compiler).replace("@", "-") - prefix_paths = prefix.split(compiler_str) - path_replacements = {} - - if len(prefix_paths) == 2: - tpl_root = os.path.realpath(pjoin(prefix_paths[0], compiler_str)) - path_replacements[tpl_root] = "${TPL_ROOT}" - entries.append("# Root directory for generated TPLs\n") - entries.append(cmake_cache_path("TPL_ROOT", tpl_root)) + # Try to find the common prefix of the TPL directory. + # If found, we will use this in the TPL paths + path1 = os.path.realpath(spec["conduit"].prefix) + path2 = os.path.realpath(self.prefix) + self.find_path_replacement(path1, path2, path_replacements, "TPL_ROOT", entries) conduit_dir = get_spec_path(spec, "conduit", path_replacements) entries.append(cmake_cache_path("CONDUIT_DIR", conduit_dir)) @@ -441,17 +509,13 @@ def initconfig_package_entries(self): # Grab common devtools root and strip the trailing slash path1 = os.path.realpath(spec["cppcheck"].prefix) path2 = os.path.realpath(spec["doxygen"].prefix) - devtools_root = os.path.commonprefix([path1, path2])[:-1] - path_replacements[devtools_root] = "${DEVTOOLS_ROOT}" - entries.append("# Root directory for generated developer tools\n") - entries.append(cmake_cache_path("DEVTOOLS_ROOT", devtools_root)) + self.find_path_replacement(path1, path2, path_replacements, "DEVTOOLS_ROOT", entries) - if "+devtools" in spec and "toss_4" not in self._get_sys_type(spec): - # Only turn on clangformat support if devtools is on and not TOSS4 + if "+devtools" in spec and spec.satisfies("^llvm"): clang_fmt_path = spec["llvm"].prefix.bin.join("clang-format") entries.append(cmake_cache_path("CLANGFORMAT_EXECUTABLE", clang_fmt_path)) else: - entries.append("# ClangFormat disabled due to disabled devtools\n") + entries.append("# ClangFormat disabled due to llvm and devtools not in spec\n") entries.append(cmake_cache_option("ENABLE_CLANGFORMAT", False)) if "+python" in spec or "+devtools" in spec: @@ -460,6 +524,11 @@ def initconfig_package_entries(self): python_path = python_path.replace(key, path_replacements[key]) entries.append(cmake_cache_path("PYTHON_EXECUTABLE", python_path)) + if spec.satisfies("^py-jsonschema"): + jsonschema_dir = get_spec_path(spec, "py-jsonschema", path_replacements, use_bin=True) + jsonschema_path = os.path.join(jsonschema_dir, "jsonschema") + entries.append(cmake_cache_path("JSONSCHEMA_EXECUTABLE", jsonschema_path)) + enable_docs = spec.satisfies("^doxygen") or spec.satisfies("^py-sphinx") entries.append(cmake_cache_option("ENABLE_DOCS", enable_docs)) diff --git a/var/spack/repos/builtin/packages/axom/umpire_camp_blt_targets.patch b/var/spack/repos/builtin/packages/axom/umpire_camp_blt_targets.patch new file mode 100644 index 00000000000000..c82c53168c6d18 --- /dev/null +++ b/var/spack/repos/builtin/packages/axom/umpire_camp_blt_targets.patch @@ -0,0 +1,38 @@ +diff --git a/src/cmake/thirdparty/SetupAxomThirdParty.cmake b/src/cmake/thirdparty/SetupAxomThirdParty.cmake +index d4d25d50e..a7ba6e59d 100644 +--- a/src/cmake/thirdparty/SetupAxomThirdParty.cmake ++++ b/src/cmake/thirdparty/SetupAxomThirdParty.cmake +@@ -32,31 +32,8 @@ if ((RAJA_DIR OR UMPIRE_DIR) AND NOT CAMP_DIR) + message(FATAL_ERROR "CAMP_DIR is required if RAJA_DIR or UMPIRE_DIR is provided.") + endif() + +-if (CAMP_DIR) +- if (NOT EXISTS "${CAMP_DIR}") +- message(FATAL_ERROR "Given CAMP_DIR does not exist: ${CAMP_DIR}") +- endif() +- +- if (NOT IS_DIRECTORY "${CAMP_DIR}") +- message(FATAL_ERROR "Given CAMP_DIR is not a directory: ${CAMP_DIR}") +- endif() +- +- find_package(camp REQUIRED PATHS ${CAMP_DIR}) +- +- message(STATUS "Checking for expected Camp target 'camp'") +- if (NOT TARGET camp) +- message(FATAL_ERROR "Camp failed to load: ${CAMP_DIR}") +- else() +- message(STATUS "Camp loaded: ${CAMP_DIR}") +- set(CAMP_FOUND TRUE CACHE BOOL "") +- endif() +- +- # Note: camp sets a compile feature that is not available on XL +- set_target_properties(camp PROPERTIES INTERFACE_COMPILE_FEATURES "") +-else() +- message(STATUS "Camp support is OFF") +- set(CAMP_FOUND FALSE CACHE BOOL "") +-endif() ++# Note: Let Umpire find Camp via camp_DIR, don't find it ourselves ++set(camp_DIR ${CAMP_DIR}) + + #------------------------------------------------------------------------------ + # UMPIRE diff --git a/var/spack/repos/builtin/packages/azcopy/package.py b/var/spack/repos/builtin/packages/azcopy/package.py index 2f513212b80021..9aad1f4d9d6914 100644 --- a/var/spack/repos/builtin/packages/azcopy/package.py +++ b/var/spack/repos/builtin/packages/azcopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Azcopy(Package): homepage = "https://github.com/Azure/azure-storage-azcopy" url = "https://github.com/Azure/azure-storage-azcopy/archive/refs/tags/v10.18.1.tar.gz" + license("MIT") + version("10.19.0", sha256="33ce1539b56a4e9a38140374630bd9640157bb44d0c57b3224a5e5f592ab5399") version("10.18.1", sha256="80292625d7f1a6fc41688c5948b3a20cfdae872464d37d831e20999430819c3f") diff --git a/var/spack/repos/builtin/packages/babelflow/package.py b/var/spack/repos/builtin/packages/babelflow/package.py index b52917fca12f7d..7be4ce4d726c22 100644 --- a/var/spack/repos/builtin/packages/babelflow/package.py +++ b/var/spack/repos/builtin/packages/babelflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Babelflow(CMakePackage): maintainers("spetruzza") + license("BSD-3-Clause") + version("1.1.0", sha256="6436b0e6b2f57fbe0cb9127dc9e7f513167de89de2a8c145055434013714989f") version("1.0.1", sha256="b7817870b7a1d7ae7ae2eff1a1acec2824675fb856f666d5dc95c41ce453ae91") version("1.0.0", sha256="4c4d7ddf60e25e8d3550c07875dba3e46e7c9e61b309cc47a409461b7ffa405e") diff --git a/var/spack/repos/builtin/packages/babelstream/package.py b/var/spack/repos/builtin/packages/babelstream/package.py index c96b486245aabd..4b2a1c58571eb0 100644 --- a/var/spack/repos/builtin/packages/babelstream/package.py +++ b/var/spack/repos/builtin/packages/babelstream/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -157,7 +157,7 @@ class Babelstream(CMakePackage, CudaPackage, ROCmPackage): when="+thrust", msg="Which Thrust implementation to use, supported options include:\ - CUDA (via https://github.com/NVIDIA/thrust)\ - - ROCM (via https://github.com/ROCmSoftwarePlatform/rocThrust)", + - ROCM (via https://github.com/ROCm/rocThrust)", ) # This applies to all diff --git a/var/spack/repos/builtin/packages/babeltrace/package.py b/var/spack/repos/builtin/packages/babeltrace/package.py index eff81092b2e164..af0552d6a01f90 100644 --- a/var/spack/repos/builtin/packages/babeltrace/package.py +++ b/var/spack/repos/builtin/packages/babeltrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Babeltrace(AutotoolsPackage): homepage = "https://www.efficios.com/babeltrace" url = "https://www.efficios.com/files/babeltrace/babeltrace-1.2.4.tar.bz2" + license("MIT") + version("1.2.4", sha256="666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1") depends_on("glib@2.22:", type=("build", "link")) diff --git a/var/spack/repos/builtin/packages/babl/package.py b/var/spack/repos/builtin/packages/babl/package.py index e141bd0ff74a30..dc9b480eaed07a 100644 --- a/var/spack/repos/builtin/packages/babl/package.py +++ b/var/spack/repos/builtin/packages/babl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Babl(MesonPackage): maintainers("benkirk") + license("LGPL-3.0-or-later") + version("0.1.106", sha256="d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f") version("0.1.102", sha256="a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0") version("0.1.98", sha256="f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1") diff --git a/var/spack/repos/builtin/packages/bacio/package.py b/var/spack/repos/builtin/packages/bacio/package.py index f872fc339127c3..2cb6528c4f6a5e 100644 --- a/var/spack/repos/builtin/packages/bacio/package.py +++ b/var/spack/repos/builtin/packages/bacio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/backupninja/package.py b/var/spack/repos/builtin/packages/backupninja/package.py index 8fc51d1776d77d..32fe1f8ebd5e42 100644 --- a/var/spack/repos/builtin/packages/backupninja/package.py +++ b/var/spack/repos/builtin/packages/backupninja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Backupninja(AutotoolsPackage): homepage = "https://github.com/lelutin/backupninja" git = "https://github.com/lelutin/backupninja.git" + license("GPL-2.0-or-later") + version("master", branch="master") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/backward-cpp/package.py b/var/spack/repos/builtin/packages/backward-cpp/package.py new file mode 100644 index 00000000000000..05e7a5ae32324c --- /dev/null +++ b/var/spack/repos/builtin/packages/backward-cpp/package.py @@ -0,0 +1,32 @@ +# 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 BackwardCpp(CMakePackage): + """A beautiful stack trace pretty printer for C++.""" + + homepage = "https://github.com/bombela/backward-cpp" + git = "https://github.com/bombela/backward-cpp.git" + url = "https://github.com/bombela/backward-cpp/archive/refs/tags/v1.6.tar.gz" + + license("MIT") + + version("master", branch="master") + version("1.6", sha256="c654d0923d43f1cea23d086729673498e4741fb2457e806cfaeaea7b20c97c10") + version("1.5", sha256="faf7d4fe7ca65117ed4fe7be9bff9628927bd95b49f71df63d5f99af233d1915") + version("1.4", sha256="ad73be31c5cfcbffbde7d34dba18158a42043a109e7f41946f0b0abd589ed55e") + version("1.3", sha256="4bf3fb7029ff551acda6578d9d8e13d438ebdd82a787a82b157728e3af6b5dec") + version("1.2", sha256="0a44fdad126cf2c53f93c33fd6418abaf99672048c98a5a57e2a2e43a38d5f84") + version("1.1", sha256="36139e98b8b6a8ff84b28c50fd6443054ccee93cf63231fdd1db0036093553c4") + + variant("dwarf", default=False, description="Use libdwarf/libelf to read debug info") + + depends_on("libdwarf", when="+dwarf") + + def cmake_args(self): + return ["-DBACKWARD_SHARED=ON"] diff --git a/var/spack/repos/builtin/packages/bam-readcount/package.py b/var/spack/repos/builtin/packages/bam-readcount/package.py index b895bfcbb18197..3a5bb85905da8d 100644 --- a/var/spack/repos/builtin/packages/bam-readcount/package.py +++ b/var/spack/repos/builtin/packages/bam-readcount/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class BamReadcount(CMakePackage): homepage = "https://github.com/genome/bam-readcount" url = "https://github.com/genome/bam-readcount/archive/v0.8.0.tar.gz" + license("MIT") + version("1.0.1", sha256="8ebf84d9efee0f2d3b43f0452dbf16b27337c960e25128f6a7173119e62588b8") version("0.8.0", sha256="4f4dd558e3c6bfb24d6a57ec441568f7524be6639b24f13ea6f2bb350c7ea65f") diff --git a/var/spack/repos/builtin/packages/bamaddrg/package.py b/var/spack/repos/builtin/packages/bamaddrg/package.py index eed427a22c4a75..ae30012e3ab737 100644 --- a/var/spack/repos/builtin/packages/bamaddrg/package.py +++ b/var/spack/repos/builtin/packages/bamaddrg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bamdst/package.py b/var/spack/repos/builtin/packages/bamdst/package.py index fdd01f2b65450a..9080d471e20c98 100644 --- a/var/spack/repos/builtin/packages/bamdst/package.py +++ b/var/spack/repos/builtin/packages/bamdst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index c45a07e61ef244..f6007ae761f816 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bamtools(CMakePackage): homepage = "https://github.com/pezmaster31/bamtools" url = "https://github.com/pezmaster31/bamtools/archive/v2.5.2.tar.gz" + license("MIT") + version("2.5.2", sha256="4d8b84bd07b673d0ed41031348f10ca98dd6fa6a4460f9b9668d6f1d4084dfc8") version("2.5.1", sha256="4abd76cbe1ca89d51abc26bf43a92359e5677f34a8258b901a01f38c897873fc") version("2.5.0", sha256="85e02e04998a67cbda7ab68cdab36cee133db024e814b34e06bb617b627caf9c") diff --git a/var/spack/repos/builtin/packages/bamutil/package.py b/var/spack/repos/builtin/packages/bamutil/package.py index ffa9c2a2695bb5..b568cb8385d554 100644 --- a/var/spack/repos/builtin/packages/bamutil/package.py +++ b/var/spack/repos/builtin/packages/bamutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/banner/package.py b/var/spack/repos/builtin/packages/banner/package.py index 246f51c548e4d5..c997b5a18c7ff6 100644 --- a/var/spack/repos/builtin/packages/banner/package.py +++ b/var/spack/repos/builtin/packages/banner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Banner(AutotoolsPackage): maintainers("cessenat") + license("GPL-2.0-only") + version("1.3.5", sha256="fb21c42620a0a668334b5732a6216b23b3990ca5d87cf3b15f0689dc617e7fdc") def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/bannergrab/package.py b/var/spack/repos/builtin/packages/bannergrab/package.py index 73952244045b1d..7bd7abbb4d12b3 100644 --- a/var/spack/repos/builtin/packages/bannergrab/package.py +++ b/var/spack/repos/builtin/packages/bannergrab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bannergrab(MakefilePackage): homepage = "https://github.com/johanburati/bannergrab" git = "https://github.com/johanburati/bannergrab.git" + license("GPL-3.0-or-later") + version("master", branch="master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/barrnap/package.py b/var/spack/repos/builtin/packages/barrnap/package.py index a6f7c440dd3efe..7f0dd882761d86 100644 --- a/var/spack/repos/builtin/packages/barrnap/package.py +++ b/var/spack/repos/builtin/packages/barrnap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Barrnap(Package): homepage = "https://github.com/tseemann/barrnap" url = "https://github.com/tseemann/barrnap/archive/0.8.tar.gz" + license("CC0-1.0") + version("0.9", sha256="36c27cd4350531d98b3b2fb7d294a2d35c15b7365771476456d7873ba33cce15") version("0.8", sha256="82004930767e92b61539c0de27ff837b8b7af01236e565f1473c63668cf0370f") version("0.7", sha256="ef2173e250f06cca7569c03404c9d4ab6a908ef7643e28901fbe9a732d20c09b") diff --git a/var/spack/repos/builtin/packages/bart/package.py b/var/spack/repos/builtin/packages/bart/package.py index 9fa0baa01833d4..d3920734349605 100644 --- a/var/spack/repos/builtin/packages/bart/package.py +++ b/var/spack/repos/builtin/packages/bart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bart(MakefilePackage, CudaPackage): homepage = "https://mrirecon.github.io/bart/" url = "https://github.com/mrirecon/bart/archive/v0.5.00.tar.gz" + license("BSD-3-Clause") + version("0.7.00", sha256="a16afc4b632c703d95b5c34e47acd82fafc19f51f9aff442373eecfef08bfc41") version("0.6.00", sha256="dbbd33d1e3ed3324fe21f90a3b62cb51765fe369f21df100b46a32004928f18d") version("0.5.00", sha256="30eedcda0f0ef3808157542e0d67df5be49ee41e4f41487af5c850632788f643") diff --git a/var/spack/repos/builtin/packages/barvinok/package.py b/var/spack/repos/builtin/packages/barvinok/package.py index f39215d9953aab..867025f02cdf02 100644 --- a/var/spack/repos/builtin/packages/barvinok/package.py +++ b/var/spack/repos/builtin/packages/barvinok/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bash-completion/package.py b/var/spack/repos/builtin/packages/bash-completion/package.py index 7458f7eb8dd959..1943a45342c1e8 100644 --- a/var/spack/repos/builtin/packages/bash-completion/package.py +++ b/var/spack/repos/builtin/packages/bash-completion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class BashCompletion(AutotoolsPackage): url = "https://github.com/scop/bash-completion/archive/2.3.tar.gz" git = "https://github.com/scop/bash-completion.git" + license("GPL-2.0-or-later") + version("develop", branch="master") version("2.7", sha256="dba2b88c363178622b61258f35d82df64dc8d279359f599e3b93eac0375a416c") version("2.3", sha256="d92fcef5f6e3bbc68a84f0a7b063a1cd07b4000cc6e275cd1ff83863ab3b322a") diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 3d992a0ffd274c..52a55e26bf70dc 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/bash/" gnu_mirror_path = "bash/bash-5.0.tar.gz" + license("GPL-3.0-or-later") + version("5.2", sha256="a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb") version("5.1", sha256="cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa") version("5.0", sha256="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d") diff --git a/var/spack/repos/builtin/packages/bashtop/package.py b/var/spack/repos/builtin/packages/bashtop/package.py index 1cb458d781bd57..75a0319b4b4a3e 100644 --- a/var/spack/repos/builtin/packages/bashtop/package.py +++ b/var/spack/repos/builtin/packages/bashtop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bashtop(Package): homepage = "https://github.com/aristocratos/bashtop" url = "https://github.com/aristocratos/bashtop/archive/v0.8.17.tar.gz" + license("Apache-2.0") + version("0.8.17", sha256="853a7143de533437cc1654b853bc89da54ff91c629820ac45b7c8708dababf1f") version("0.8.16", sha256="6249e5c678fdb0a2a87d6fa13b9fe1f6bd56f7dbcaba0066d2a5275a7f9a9355") version("0.8.15", sha256="617aab0a23b1a9430f2ef7d51e4f89eb06c5b3f2ff40768cb6849fc2899ffc6a") diff --git a/var/spack/repos/builtin/packages/bat/package.py b/var/spack/repos/builtin/packages/bat/package.py index d06e89368bfc03..1718b778c6d2a2 100644 --- a/var/spack/repos/builtin/packages/bat/package.py +++ b/var/spack/repos/builtin/packages/bat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,19 +6,16 @@ from spack.package import * -class Bat(Package): +class Bat(CargoPackage): """A cat(1) clone with wings.""" homepage = "https://github.com/sharkdp/bat" url = "https://github.com/sharkdp/bat/archive/v0.13.0.tar.gz" + license("Apache-2.0") + + version("0.24.0", sha256="907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb") version("0.23.0", sha256="30b6256bea0143caebd08256e0a605280afbbc5eef7ce692f84621eb232a9b31") version("0.21.0", sha256="3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee") version("0.13.0", sha256="f4aee370013e2a3bc84c405738ed0ab6e334d3a9f22c18031a7ea008cd5abd2a") version("0.12.1", sha256="1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2") - - depends_on("rust") - - def install(self, spec, prefix): - cargo = which("cargo") - cargo("install", "--root", prefix, "--path", ".") diff --git a/var/spack/repos/builtin/packages/batchedblas/package.py b/var/spack/repos/builtin/packages/batchedblas/package.py index 712f270e8cf8fc..283e7e23a37857 100644 --- a/var/spack/repos/builtin/packages/batchedblas/package.py +++ b/var/spack/repos/builtin/packages/batchedblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Batchedblas(MakefilePackage): homepage = "https://www.r-ccs.riken.jp/labs/lpnctrt/projects/batchedblas/index.html" url = "https://www.r-ccs.riken.jp/labs/lpnctrt/projects/batchedblas/BatchedBLAS-1.0.tar.gz" + license("BSD-2-Clause") + version("1.0", sha256="798ae4e7cc4ad5c3d5f3479f3d001da566d7d5205779103aaf10cd5b956ba433") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/batctl/package.py b/var/spack/repos/builtin/packages/batctl/package.py index cfd12f367d2dc5..84a5cb3aa310e0 100644 --- a/var/spack/repos/builtin/packages/batctl/package.py +++ b/var/spack/repos/builtin/packages/batctl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Batctl(MakefilePackage): homepage = "https://github.com/open-mesh-mirror/batctl" url = "https://github.com/open-mesh-mirror/batctl/archive/v2019.5.tar.gz" + license("GPL-2.0-only AND MIT AND ISC", checked_by="tgamblin") + version("2019.5", sha256="ffe5857a33068ec174140c154610d76d833524d840a2fc2d1a15e16686213cad") version("2019.4", sha256="a3564eb9727335352dc0cfa2f2b29474c2c837384689ac5fcb387784a56e7685") version("2019.3", sha256="2bd93fa14925a8dc63a67e64266c8ccd2fa3ac44b10253d93e6f8a630350070c") diff --git a/var/spack/repos/builtin/packages/bats/package.py b/var/spack/repos/builtin/packages/bats/package.py index 9370ed834e118a..ca35c75d76b02f 100644 --- a/var/spack/repos/builtin/packages/bats/package.py +++ b/var/spack/repos/builtin/packages/bats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bats(Package): homepage = "https://github.com/bats-core/bats-core" url = "https://github.com/bats-core/bats-core/archive/refs/tags/v1.10.0.tar.gz" + license("MIT") + version("1.10.0", sha256="a1a9f7875aa4b6a9480ca384d5865f1ccf1b0b1faead6b47aa47d79709a5c5fd") version( "0.4.0", diff --git a/var/spack/repos/builtin/packages/baurmc/package.py b/var/spack/repos/builtin/packages/baurmc/package.py index 218e05f2187243..3fff20bcb00d11 100644 --- a/var/spack/repos/builtin/packages/baurmc/package.py +++ b/var/spack/repos/builtin/packages/baurmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch b/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch deleted file mode 100644 index e6a974a98a9cbb..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/bazelconfiguration-0.3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java -@@ -150,6 +150,13 @@ - builder.put("PATH", null); - builder.put("LD_LIBRARY_PATH", null); - } -+ -+ Map spackEnv = System.getenv(); -+ for (String envName : spackEnv.keySet()) { -+ if (envName.startsWith("SPACK_")) { -+ builder.put(envName, spackEnv.get(envName)); -+ } -+ } - } - - private static PathFragment determineShellExecutable(OS os, PathFragment fromOption) { diff --git a/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch b/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch deleted file mode 100644 index b0aebdf359b6cd..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/bazelruleclassprovider-0.14.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java -+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java -@@ -168,6 +168,13 @@ public class BazelRuleClassProvider { - env.put("PATH", null); - } - -+ Map spackEnv = System.getenv(); -+ for (String envName : spackEnv.keySet()) { -+ if (envName.startsWith("SPACK_")) { -+ env.put(envName, spackEnv.get(envName)); -+ } -+ } -+ - // Shell environment variables specified via options take precedence over the - // ones inherited from the fragments. In the long run, these fragments will - // be replaced by appropriate default rc files anyway. diff --git a/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch b/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch deleted file mode 100644 index c3ed9ab254b253..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/build-0.29.1.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9c9d27561780bc56d9f0867e325c7421a94ee1cb Mon Sep 17 00:00:00 2001 -From: Harsh Bhatia -Date: Tue, 15 Dec 2020 15:56:10 -0800 -Subject: [PATCH] https://github.com/bazelbuild/bazel/commit/ab62a6e097590dac5ec946ad7a796ea0e8593ae0 - ---- - src/conditions/BUILD | 6 ++++++ - third_party/BUILD | 8 ++++++-- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/src/conditions/BUILD b/src/conditions/BUILD -index 2b28e28057..faa41a439d 100644 ---- a/src/conditions/BUILD -+++ b/src/conditions/BUILD -@@ -10,6 +10,12 @@ filegroup( - visibility = ["//src:__pkg__"], - ) - -+config_setting( -+ name = "linux_ppc", -+ values = {"cpu": "ppc"}, -+ visibility = ["//visibility:public"], -+) -+ - config_setting( - name = "linux_x86_64", - values = {"cpu": "k8"}, -diff --git a/third_party/BUILD b/third_party/BUILD -index 159006d741..4fcae54c00 100644 ---- a/third_party/BUILD -+++ b/third_party/BUILD -@@ -523,12 +523,13 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({ - "//src/conditions:darwin": "*.so *.dll", - "//src/conditions:darwin_x86_64": "*.so *.dll", - "//src/conditions:linux_x86_64": "*.jnilib *.dll", -+ "//src/conditions:linux_ppc": "*.so *.jnilib *.dll", - # The .so file is an x86 one, so we can just remove it if the CPU is not x86 - "//src/conditions:arm": "*.so *.jnilib *.dll", - "//src/conditions:linux_aarch64": "*.so *.jnilib *.dll", - # Play it safe -- better have a big binary than a slow binary - # zip -d does require an argument. Supply something bogus. -- "//conditions:default": "*.bogusextension", -+ "//conditions:default": "", - }) - - # Remove native libraries that are for a platform different from the one we are -@@ -537,7 +538,10 @@ genrule( - name = "filter_netty_dynamic_libs", - srcs = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.24.Final.jar"], - outs = ["netty_tcnative/netty-tcnative-filtered.jar"], -- cmd = "cp $< $@ && zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES, -+ cmd = "cp $< $@ && " + -+ # End successfully if there is nothing to be deleted from the archive -+ "if [ -n '" + UNNECESSARY_DYNAMIC_LIBRARIES + "' ]; then " + -+ "zip -qd $@ " + UNNECESSARY_DYNAMIC_LIBRARIES + "; fi", - ) - - java_import( --- -2.21.0 (Apple Git-122.2) - diff --git a/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch b/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch deleted file mode 100644 index 79e12269a6bfeb..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/cc_configure-0.3.0.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tools/cpp/cc_configure.bzl -+++ b/tools/cpp/cc_configure.bzl -@@ -173,8 +173,19 @@ - else: - inc_dirs = result.stderr[index1 + 1:index2].strip() - -- return [repository_ctx.path(_cxx_inc_convert(p)) -- for p in inc_dirs.split("\n")] -+ default_inc_directories = [ -+ repository_ctx.path(_cxx_inc_convert(p)) -+ for p in inc_dirs.split("\n") -+ ] -+ -+ env = repository_ctx.os.environ -+ if "SPACK_INCLUDE_DIRS" in env: -+ for path in env["SPACK_INCLUDE_DIRS"].split(":"): -+ default_inc_directories.append( -+ repository_ctx.path(_cxx_inc_convert(path)) -+ ) -+ -+ return default_inc_directories - - def _add_option_if_supported(repository_ctx, cc, option): - """Checks that `option` is supported by the C compiler.""" diff --git a/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch b/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch deleted file mode 100644 index 470986bec66505..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/cc_configure-0.5.0.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tools/cpp/cc_configure.bzl -+++ b/tools/cpp/cc_configure.bzl -@@ -200,8 +200,19 @@ - else: - inc_dirs = result.stderr[index1 + 1:index2].strip() - -- return [_escape_string(repository_ctx.path(_cxx_inc_convert(p))) -- for p in inc_dirs.split("\n")] -+ default_inc_directories = [ -+ _escape_string(repository_ctx.path(_cxx_inc_convert(p))) -+ for p in inc_dirs.split("\n") -+ ] -+ -+ env = repository_ctx.os.environ -+ if "SPACK_INCLUDE_DIRS" in env: -+ for path in env["SPACK_INCLUDE_DIRS"].split(":"): -+ default_inc_directories.append( -+ repository_ctx.path(_cxx_inc_convert(path)) -+ ) -+ -+ return default_inc_directories - - - def _add_option_if_supported(repository_ctx, cc, option): diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.13.patch b/var/spack/repos/builtin/packages/bazel/compile-0.13.patch deleted file mode 100644 index 13c82e7631bbcd..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -92,7 +92,7 @@ - log "Building output/bazel" - # We set host and target platform directly since the defaults in @bazel_tools - # have not yet been generated. --bazel_build "src:bazel${EXE_EXT}" \ -+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \ - --host_platform=@bazel_tools//platforms:host_platform \ - --platforms=@bazel_tools//platforms:target_platform \ - || fail "Could not build Bazel" diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.16.patch b/var/spack/repos/builtin/packages/bazel/compile-0.16.patch deleted file mode 100644 index f61f521a15b9af..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.16.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -92,7 +92,7 @@ display "." - log "Building output/bazel" - # We set host and target platform directly since the defaults in @bazel_tools - # have not yet been generated. --bazel_build "src:bazel_nojdk${EXE_EXT}" \ -+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel_nojdk${EXE_EXT}" \ - --host_platform=@bazel_tools//platforms:host_platform \ - --platforms=@bazel_tools//platforms:target_platform \ - || fail "Could not build Bazel" diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.21.patch b/var/spack/repos/builtin/packages/bazel/compile-0.21.patch deleted file mode 100644 index d666a0f055ca04..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.21.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -92,7 +92,7 @@ display "." - log "Building output/bazel" - # We set host and target platform directly since the defaults in @bazel_tools - # have not yet been generated. --bazel_build "src:bazel_nojdk${EXE_EXT}" \ -+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel_nojdk${EXE_EXT}" \ - --action_env=PATH \ - --host_platform=@bazel_tools//platforms:host_platform \ - --platforms=@bazel_tools//platforms:target_platform \ diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.3.patch b/var/spack/repos/builtin/packages/bazel/compile-0.3.patch deleted file mode 100644 index 82db6efb6e86f7..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -99,7 +99,7 @@ - new_step 'Building Bazel with Bazel' - display "." - log "Building output/bazel" -- bazel_build "src:bazel${EXE_EXT}" -+ CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" - cp -f "bazel-bin/src/bazel${EXE_EXT}" "output/bazel${EXE_EXT}" - chmod 0755 "output/bazel${EXE_EXT}" - BAZEL="$(pwd)/output/bazel${EXE_EXT}" diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.4.patch b/var/spack/repos/builtin/packages/bazel/compile-0.4.patch deleted file mode 100644 index 80eab26a882797..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -124,7 +124,7 @@ - new_step 'Building Bazel with Bazel' - display "." - log "Building output/bazel" -- bazel_build "src:bazel${EXE_EXT}" \ -+ CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \ - || fail "Could not build Bazel" - bazel_bin_path="$(get_bazel_bin_path)/src/bazel${EXE_EXT}" - [ -e "$bazel_bin_path" ] \ diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.6.patch b/var/spack/repos/builtin/packages/bazel/compile-0.6.patch deleted file mode 100644 index 64eb408e5df874..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -85,7 +85,7 @@ - log "Building output/bazel" - # We set host and target platform directly since the defaults in @bazel_tools - # have not yet been generated. --bazel_build "src:bazel${EXE_EXT}" \ -+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \ - --experimental_host_platform=//tools/platforms:host_platform \ - --experimental_platforms=//tools/platforms:target_platform \ - || fail "Could not build Bazel" diff --git a/var/spack/repos/builtin/packages/bazel/compile-0.9.patch b/var/spack/repos/builtin/packages/bazel/compile-0.9.patch deleted file mode 100644 index 135de3a00fdadc..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/compile-0.9.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/compile.sh -+++ b/compile.sh -@@ -92,7 +92,7 @@ - log "Building output/bazel" - # We set host and target platform directly since the defaults in @bazel_tools - # have not yet been generated. --bazel_build "src:bazel${EXE_EXT}" \ -+CC=$SPACK_CC CXX=$SPACK_CXX bazel_build "src:bazel${EXE_EXT}" \ - --host_platform=//tools/platforms:host_platform \ - --platforms=//tools/platforms:target_platform \ - || fail "Could not build Bazel" diff --git a/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch b/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch deleted file mode 100644 index dd23972d9925de..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/cppcompileaction-0.3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java.orig 2020-06-08 13:42:14.035342560 -0400 -+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java 2020-06-08 13:42:25.149375458 -0400 -@@ -963,7 +963,7 @@ - // are, it's probably due to a non-hermetic #include, & we should stop - // the build with an error. - if (execPath.startsWith(execRoot)) { -- execPathFragment = execPath.relativeTo(execRoot); // funky but tolerable path -+ // execPathFragment = execPath.relativeTo(execRoot); // funky but tolerable path - } else { - problems.add(execPathFragment.getPathString()); - continue; diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 705eef43b94064..4f76e8e7bb24be 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Bazel(Package): tags = ["build-tools"] + license("Apache-2.0") + version("6.1.1", sha256="6b900f26d676c7eca1d2e7dff9b71890dabd3ff59cab2a2d2178bc8a0395342a") version("6.1.0", sha256="c4b85675541cf66ee7cb71514097fdd6c5fc0e02527243617a4f20ca6b4f2932") version("6.0.0", sha256="7bc0c5145c19a56d82a08fce6908c5e1a0e75e4fbfb3b6f12b4deae7f4b38cbc") @@ -55,356 +57,6 @@ class Bazel(Package): version("2.1.0", sha256="3371cd9050989173a3b27364668328653a65653a50a85c320adc53953b4d5f46") version("2.0.1", sha256="a863ed9e6fc420fbd92e63a12fe1a5b9be1a7a36f11f61f1fdc582c813bbe543") version("2.0.0", sha256="724da3c656f68e787a86ebb9844773aa1c2e3a873cc39462a8f1b336153d6cbb") - version( - "1.2.1", - sha256="255da49d0f012bc4f2c1d6d3ccdbe578e22fe97b8d124e1629a486fe2a09d3e1", - deprecated=True, - ) - version( - "1.2.0", - sha256="9cb46b0a18b9166730307a0e82bf4c02281a1cc6da0fb11239e6fe4147bdee6e", - deprecated=True, - ) - version( - "1.1.0", - sha256="4b66a8c93af7832ed32e7236cf454a05f3aa06d25a8576fc3f83114f142f95ab", - deprecated=True, - ) - version( - "1.0.1", - sha256="f4d2dfad011ff03a5fae41b9b02cd96cd7297c1205d496603d66516934fbcfee", - deprecated=True, - ) - version( - "1.0.0", - sha256="c61daf0b69dd95205c695b2f9022d296d052c727062cfd396d54ffb2154f8cac", - deprecated=True, - ) - version( - "0.29.1", - sha256="872a52cff208676e1169b3e1cae71b1fe572c4109cbd66eab107d8607c378de5", - deprecated=True, - ) - version( - "0.29.0", - sha256="01cb6f2e808bd016cf0e217e12373c9efb808123e58b37885be8364458d3a40a", - deprecated=True, - ) - version( - "0.28.1", - sha256="2cea463d611f5255d2f3d41c8de5dcc0961adccb39cf0ac036f07070ba720314", - deprecated=True, - ) - version( - "0.28.0", - sha256="26ad8cdadd413b8432cf46d9fc3801e8db85d9922f85dd8a7f5a92fec876557f", - deprecated=True, - ) - version( - "0.27.2", - sha256="5e1bf2b48e54eb7e518430667d29aef53695d6dd7c718665a52131ab27aadab2", - deprecated=True, - ) - version( - "0.27.1", - sha256="8051d77da4ec338acd91770f853e4c25f4407115ed86fd35a6de25921673e779", - deprecated=True, - ) - version( - "0.27.0", - sha256="c3080d3b959ac08502ad5c84a51608c291accb1481baad88a628bbf79b30c67a", - deprecated=True, - ) - version( - "0.26.1", - sha256="c0e94f8f818759f3f67af798c38683520c540f469cb41aea8f5e5a0e43f11600", - deprecated=True, - ) - version( - "0.26.0", - sha256="d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2", - deprecated=True, - ) - version( - "0.25.3", - sha256="23eafd3e439bc71baba9c592b52cb742dabc8640a13b9da1751fec090a2dda99", - deprecated=True, - ) - version( - "0.25.2", - sha256="7456032199852c043e6c5b3e4c71dd8089c1158f72ec554e6ec1c77007f0ab51", - deprecated=True, - ) - version( - "0.25.1", - sha256="a52bb31aeb1f821e649d25ef48023cfb54a12887aff875c6349ebcac36c2f056", - deprecated=True, - ) - version( - "0.25.0", - sha256="f624fe9ca8d51de192655369ac538c420afb7cde16e1ad052554b582fff09287", - deprecated=True, - ) - version( - "0.24.1", - sha256="56ea1b199003ad832813621744178e42b39e6206d34fbae342562c287da0cd54", - deprecated=True, - ) - version( - "0.24.0", - sha256="621d2a97899a88850a913eabf9285778331a309fd4658b225b1377f80060fa85", - deprecated=True, - ) - version( - "0.23.2", - sha256="293a5a7d851e0618eeb5e6958d94a11d45b6a00f2ba9376de61ac2bd5f917439", - deprecated=True, - ) - version( - "0.23.1", - sha256="dd47199f92452bf67b2c5d60ad4b7143554eaf2c6196ab6e8713449d81a0491d", - deprecated=True, - ) - version( - "0.23.0", - sha256="2daf9c2c6498836ed4ebae7706abb809748b1350cacd35b9f89452f31ac0acc1", - deprecated=True, - ) - version( - "0.22.0", - sha256="6860a226c8123770b122189636fb0c156c6e5c9027b5b245ac3b2315b7b55641", - deprecated=True, - ) - version( - "0.21.0", - sha256="6ccb831e683179e0cfb351cb11ea297b4db48f9eab987601c038aa0f83037db4", - deprecated=True, - ) - version( - "0.20.0", - sha256="1945afa84fd8858b0a3c68c09915a4bc81065c61df2591387b2985e2297d30bd", - deprecated=True, - ) - version( - "0.19.2", - sha256="11234cce4f6bdc62c3ac688f41c7b5c178eecb6f7e2c4ba0bcf00ba8565b1d19", - deprecated=True, - ) - version( - "0.19.1", - sha256="c9405f7b8c79ebc81f9f0e49bb656df4a0da246771d010c2cdd6bb30e2500ac0", - deprecated=True, - ) - version( - "0.19.0", - sha256="ee6135c5c47306c8421d43ad83aabc4f219cb065376ee37797f2c8ba9a615315", - deprecated=True, - ) - version( - "0.18.1", - sha256="baed9f28c317000a4ec1ad2571b3939356d22746ca945ac2109148d7abb860d4", - deprecated=True, - ) - version( - "0.18.0", - sha256="d0e86d2f7881ec8742a9823a986017452d2da0dfe4e989111da787cb89257155", - deprecated=True, - ) - version( - "0.17.2", - sha256="b6e87acfa0a405bb8b3417c58477b66d5bc27dc0d31ba6fa12bc255b9278d33b", - deprecated=True, - ) - version( - "0.17.1", - sha256="23e4281c3628cbd746da3f51330109bbf69780bd64461b63b386efae37203f20", - deprecated=True, - ) - version( - "0.16.1", - sha256="09c66b94356c82c52f212af52a81ac28eb06de1313755a2f23eeef84d167b36c", - deprecated=True, - ) - version( - "0.16.0", - sha256="c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1", - deprecated=True, - ) - version( - "0.15.2", - sha256="bf53ec73be3a6d412d85ef612cec6e9c85db45da42001fab0cf1dad44cfc03f1", - deprecated=True, - ) - version( - "0.15.1", - sha256="c62b351fa4c1ba5aeb34d0a137176f8e8f1d89a32f548a10e96c11df176ffc6c", - deprecated=True, - ) - version( - "0.15.0", - sha256="c3b716e6625e6b8c323350c95cd3ae0f56aeb00458dddd10544d5bead8a7b602", - deprecated=True, - ) - version( - "0.14.1", - sha256="d49cdcd82618ae7a7a190e6f0a80d9bf85c1a66b732f994f37732dc14ffb0025", - deprecated=True, - ) - version( - "0.14.0", - sha256="259627de8b9d415cc80904523facf3d50e6e8e68448ab968eb1c9cb8ca1ef843", - deprecated=True, - ) - version( - "0.13.1", - sha256="b0269e75b40d87ff87886e5f3432cbf88f70c96f907ab588e6c21b2922d72db0", - deprecated=True, - ) - version( - "0.13.0", - sha256="82e9035084660b9c683187618a29aa896f8b05b5f16ae4be42a80b5e5b6a7690", - deprecated=True, - ) - version( - "0.12.0", - sha256="3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754", - deprecated=True, - ) - version( - "0.11.1", - sha256="e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f", - deprecated=True, - ) - version( - "0.11.0", - sha256="abfeccc94728cb46be8dbb3507a23ccffbacef9fbda96a977ef4ea8d6ab0d384", - deprecated=True, - ) - version( - "0.10.1", - sha256="708248f6d92f2f4d6342006c520f22dffa2f8adb0a9dc06a058e3effe7fee667", - deprecated=True, - ) - version( - "0.10.0", - sha256="47e0798caaac4df499bce5fe554a914abd884a855a27085a4473de1d737d9548", - deprecated=True, - ) - version( - "0.9.0", - sha256="efb28fed4ffcfaee653e0657f6500fc4cbac61e32104f4208da385676e76312a", - deprecated=True, - ) - version( - "0.8.1", - sha256="dfd0761e0b7e36c1d74c928ad986500c905be5ebcfbc29914d574af1db7218cf", - deprecated=True, - ) - version( - "0.8.0", - sha256="aa840321d056abd3c6be10c4a1e98a64f9f73fff9aa89c468dae8c003974a078", - deprecated=True, - ) - version( - "0.7.0", - sha256="a084a9c5d843e2343bf3f319154a48abe3d35d52feb0ad45dec427a1c4ffc416", - deprecated=True, - ) - version( - "0.6.1", - sha256="dada1f60a512789747011184b2767d2b44136ef3b036d86947f1896d200d2ba7", - deprecated=True, - ) - version( - "0.6.0", - sha256="a0e53728a9541ef87934831f3d05f2ccfdc3b8aeffe3e037be2b92b12400598e", - deprecated=True, - ) - version( - "0.5.4", - sha256="2157b05309614d6af0e4bbc6065987aede590822634a0522161f3af5d647abc9", - deprecated=True, - ) - version( - "0.5.3", - sha256="76b5c5880a0b15f5b91f7d626c5bc3b76ce7e5d21456963c117ab711bf1c5333", - deprecated=True, - ) - version( - "0.5.2", - sha256="2418c619bdd44257a170b85b9d2ecb75def29e751b725e27186468ada2e009ea", - deprecated=True, - ) - version( - "0.5.1", - sha256="85e6a18b111afeea2e475fe991db2a441ec3824211d659bee7b0012c36be9a40", - deprecated=True, - ) - version( - "0.5.0", - sha256="ebba7330a8715e96a6d6dc0aa085125d529d0740d788f0544c6169d892e4f861", - deprecated=True, - ) - version( - "0.4.5", - sha256="2b737be42678900470ae9e48c975ac5b2296d9ae23c007bf118350dbe7c0552b", - deprecated=True, - ) - version( - "0.4.4", - sha256="d52a21dda271ae645711ce99c70cf44c5d3a809138e656bbff00998827548ebb", - deprecated=True, - ) - version( - "0.4.3", - sha256="cbd2ab580181c17317cf18b2bf825bcded2d97cab01cd5b5fe4f4d520b64f90f", - deprecated=True, - ) - version( - "0.4.2", - sha256="8e6f41252abadcdb2cc7a07f910ec4b45fb12c46f0a578672c6a186c7efcdb36", - deprecated=True, - ) - version( - "0.4.1", - sha256="008c648d3c46ece063ae8b5008480d8ae6d359d35967356685d1c09da07e1064", - deprecated=True, - ) - version( - "0.4.0", - sha256="6474714eee72ba2d4e271ed00ce8c05d67a9d15327bc03962b821b2af2c5ca36", - deprecated=True, - ) - version( - "0.3.2", - sha256="ca5caf7b2b48c7639f45d815b32e76d69650f3199eb8caa541d402722e3f6c10", - deprecated=True, - ) - version( - "0.3.1", - sha256="218d0e28b4d1ee34585f2ac6b18d169c81404d93958815e73e60cc0368efcbb7", - deprecated=True, - ) - version( - "0.3.0", - sha256="357fd8bdf86034b93902616f0844bd52e9304cccca22971ab7007588bf9d5fb3", - deprecated=True, - ) - version( - "0.2.0", - sha256="e9ba2740d9727ae6d0f9b1ac0c5df331814fd03518fe4b511396ed10780d5272", - deprecated=True, - ) - version( - "0.1.4", - sha256="f3c395f5cd78cfef96f4008fe842f327bc8b03b77f46999387bc0ad223b5d970", - deprecated=True, - ) - version( - "0.1.1", - sha256="c6ae19610b936a0aa940b44a3626d6e660fc457a8187d295cdf0b21169453d20", - deprecated=True, - ) variant( "nodepfail", @@ -418,39 +70,24 @@ class Bazel(Package): depends_on("java@11", when="@5.3:", type=("build", "run")) depends_on("java@8,11", when="@3.3:5.2", type=("build", "run")) depends_on("java@8", when="@0.6:3.2", type=("build", "run")) - depends_on("java@7:8", when="@:0.5", type=("build", "run")) depends_on("python+pythoncmd", type=("build", "run")) depends_on("zip", when="platform=linux", type=("build", "run")) # Pass Spack environment variables to the build - patch("bazelruleclassprovider-0.25.patch", when="@0.25:") - patch("bazelruleclassprovider-0.14.patch", when="@0.14:0.24") - patch("bazelconfiguration-0.3.patch", when="@:0.13") + patch("bazelruleclassprovider-0.25.patch") # Inject include paths patch("unix_cc_configure-3.0.patch", when="@3:") - patch("unix_cc_configure-0.15.patch", when="@0.15:2") - patch("unix_cc_configure-0.10.patch", when="@0.10:0.14") - patch("unix_cc_configure-0.5.3.patch", when="@0.5.3:0.9") - patch("cc_configure-0.5.0.patch", when="@0.5.0:0.5.2") - patch("cc_configure-0.3.0.patch", when="@0.3:0.4") + patch("unix_cc_configure-0.15.patch", when="@:2") # Set CC and CXX - patch("compile-0.29.patch", when="@0.29:") - patch("compile-0.21.patch", when="@0.21:0.28") - patch("compile-0.16.patch", when="@0.16:0.20") - patch("compile-0.13.patch", when="@0.13:0.15") - patch("compile-0.9.patch", when="@0.9:0.12") - patch("compile-0.6.patch", when="@0.6:0.8") - patch("compile-0.4.patch", when="@0.4:0.5") - patch("compile-0.3.patch", when="@0.2:0.3") + patch("compile-0.29.patch") # Disable dependency search - patch("cppcompileaction-0.3.2.patch", when="@0.3.2:+nodepfail") - patch("cppcompileaction-0.3.0.patch", when="@0.3.0:0.3.1+nodepfail") + patch("cppcompileaction-0.3.2.patch", when="+nodepfail") # https://github.com/bazelbuild/bazel/issues/17956 - patch("apple-clang-14.0.3.patch", when="@0.3:5.4.0,6.0:6.1") + patch("apple-clang-14.0.3.patch", when="@:5.4.0,6.0:6.1") # https://github.com/bazelbuild/bazel/issues/17958 patch( @@ -459,39 +96,27 @@ class Bazel(Package): when="@5.0:5.4.0,6.0", ) - # Fix build on power9 (2x commits) - # https://github.com/bazelbuild/bazel/commit/5cff4f1edf8b95bf0612791632255852332f72b5 - # https://github.com/bazelbuild/bazel/commit/ab62a6e097590dac5ec946ad7a796ea0e8593ae0 - patch("build-0.29.1.patch", when="@0.29.1") - # Fix build with Fujitsu compiler - patch("blaze_util_posix-0.29.1.patch", when="@0.29.1:%fj") + patch("blaze_util_posix-0.29.1.patch", when="%fj") patch("unix_cc_configure_fj-5.2.patch", when="@5.2:%fj") patch("unix_cc_configure_fj-5.0.patch", when="@5.0:5.1%fj") - patch("unix_cc_configure_fj-0.29.1.patch", when="@0.29.1:4%fj") - patch("bazelruleclassprovider_fj-0.25.patch", when="@0.25:%fj") - conflicts( - "%fj", - when="@:0.24.1", - msg="Fujitsu Compiler cannot build 0.24.1 or less, " "please use a newer release.", - ) + patch("unix_cc_configure_fj-0.29.1.patch", when="@:4%fj") + patch("bazelruleclassprovider_fj-0.25.patch", when="%fj") # https://blog.bazel.build/2021/05/21/bazel-4-1.html conflicts("platform=darwin target=aarch64:", when="@:4.0") - # patches for compiling various older bazels which had ICWYU - # violations revealed by (but not unique to) GCC 11 header changes. - # these are derived from + # Patches for compiling various older bazels which had ICWYU violations revealed by + # (but not unique to) GCC 11 header changes. These are derived from # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/29084/ - patch("gcc11_1.patch", when="@0.3.2:4") - patch("gcc11_2.patch", when="@0.3.2:4") - patch("gcc11_3.patch", when="@0.3:4") + patch("gcc11_1.patch", when="@:4") + patch("gcc11_2.patch", when="@:4") + patch("gcc11_3.patch", when="@:4") patch("gcc11_4.patch", when="@4.1:4") - # bazel-4.0.0 does not compile with gcc-11 - # newer versions of grpc and abseil dependencies are needed but are not in - # bazel-4.0.0 - conflicts("@:0.2,4.0.0", when="%gcc@11:") + # Bazel-4.0.0 does not compile with gcc-11 + # Newer versions of grpc and abseil dependencies are needed but are not in bazel-4.0.0 + conflicts("@4.0.0", when="%gcc@11:") executables = ["^bazel$"] @@ -501,14 +126,6 @@ def determine_version(cls, exe): match = re.search(r"Build label: ([\d.]+)", output) return match.group(1) if match else None - def url_for_version(self, version): - if version >= Version("0.4.1"): - url = "https://github.com/bazelbuild/bazel/releases/download/{0}/bazel-{0}-dist.zip" - else: - url = "https://github.com/bazelbuild/bazel/archive/{0}.tar.gz" - - return url.format(version) - def setup_build_environment(self, env): # fix the broken linking (on power9) # https://github.com/bazelbuild/bazel/issues/10327 diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch deleted file mode 100644 index bdd24e1152b5ac..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.10.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/tools/cpp/unix_cc_configure.bzl -+++ b/tools/cpp/unix_cc_configure.bzl -@@ -147,9 +147,18 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc, additional_flags = []): - else: - inc_dirs = result.stderr[index1 + 1:index2].strip() - -- return [_prepare_include_path(repository_ctx, _cxx_inc_convert(p)) -- for p in inc_dirs.split("\n")] -+ default_inc_directories = [ -+ _prepare_include_path(repository_ctx, _cxx_inc_convert(p)) -+ for p in inc_dirs.split("\n") -+ ] -+ -+ env = repository_ctx.os.environ -+ if "SPACK_INCLUDE_DIRS" in env: -+ for path in env["SPACK_INCLUDE_DIRS"].split(":"): -+ default_inc_directories.append(path) -+ -+ return default_inc_directories - - - def _is_option_supported(repository_ctx, cc, option): diff --git a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch b/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch deleted file mode 100644 index 79b583ba84606d..00000000000000 --- a/var/spack/repos/builtin/packages/bazel/unix_cc_configure-0.5.3.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/tools/cpp/unix_cc_configure.bzl -+++ b/tools/cpp/unix_cc_configure.bzl -@@ -117,9 +117,19 @@ def get_escaped_cxx_inc_directories(repository_ctx, cc): - else: - inc_dirs = result.stderr[index1 + 1:index2].strip() - -- return [escape_string(repository_ctx.path(_cxx_inc_convert(p))) -- for p in inc_dirs.split("\n")] -+ default_inc_directories = [ -+ escape_string(repository_ctx.path(_cxx_inc_convert(p))) -+ for p in inc_dirs.split("\n") -+ ] - -+ env = repository_ctx.os.environ -+ if "SPACK_INCLUDE_DIRS" in env: -+ for path in env["SPACK_INCLUDE_DIRS"].split(":"): -+ default_inc_directories.append( -+ repository_ctx.path(_cxx_inc_convert(path)) -+ ) -+ -+ return default_inc_directories - - def _add_option_if_supported(repository_ctx, cc, option): - """Checks that `option` is supported by the C compiler. Doesn't %-escape the option.""" diff --git a/var/spack/repos/builtin/packages/bbcp/package.py b/var/spack/repos/builtin/packages/bbcp/package.py index fc329aa0660c76..f668df284e3e40 100644 --- a/var/spack/repos/builtin/packages/bbcp/package.py +++ b/var/spack/repos/builtin/packages/bbcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bbmap/package.py b/var/spack/repos/builtin/packages/bbmap/package.py index 3a323a36635a12..f45c473e023eda 100644 --- a/var/spack/repos/builtin/packages/bbmap/package.py +++ b/var/spack/repos/builtin/packages/bbmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bbmap(Package, SourceforgePackage): homepage = "https://sourceforge.net/projects/bbmap/" sourceforge_mirror_path = "bbmap/BBMap_38.63.tar.gz" + license("BSD-3-Clause-LBNL") + version("39.01", sha256="98608da50130c47f3abd095b889cc87f60beeb8b96169b664bc9d849abe093e6") version("38.63", sha256="089064104526c8d696164aefa067f935b888bc71ef95527c72a98c17ee90a01f") version("37.78", sha256="f2da19f64d2bfb7db4c0392212668b425c96a27c77bd9d88d8f0aea90a193509") diff --git a/var/spack/repos/builtin/packages/bc/package.py b/var/spack/repos/builtin/packages/bc/package.py index 29ee1c79267935..7ab944d91ea140 100644 --- a/var/spack/repos/builtin/packages/bc/package.py +++ b/var/spack/repos/builtin/packages/bc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bc(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/bc" gnu_mirror_path = "bc/bc-1.07.tar.gz" + license("GPL-3.0-or-later") + version("1.07.1", sha256="62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a") version("1.07", sha256="55cf1fc33a728d7c3d386cc7b0cb556eb5bacf8e0cb5a3fcca7f109fc61205ad") diff --git a/var/spack/repos/builtin/packages/bcache/package.py b/var/spack/repos/builtin/packages/bcache/package.py index 724e4dff195fb2..598c50f09ef076 100644 --- a/var/spack/repos/builtin/packages/bcache/package.py +++ b/var/spack/repos/builtin/packages/bcache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Bcache(MakefilePackage): homepage = "https://bcache.evilpiepirate.org/" url = "https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz" + license("GPL-2.0-only") + version("1.0.8", sha256="d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c") version("1.0.7", sha256="64d76d1085afba8c3d5037beb67bf9d69ee163f357016e267bf328c0b1807abd") version("1.0.6", sha256="9677c6da3ceac4e1799d560617c4d00ea7e9d26031928f8f94b8ab327496d4e0") diff --git a/var/spack/repos/builtin/packages/bcftools/package.py b/var/spack/repos/builtin/packages/bcftools/package.py index 057d384b1a3ff3..e1867c3cebaa80 100644 --- a/var/spack/repos/builtin/packages/bcftools/package.py +++ b/var/spack/repos/builtin/packages/bcftools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,16 @@ class Bcftools(AutotoolsPackage): commands work transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.""" + maintainers("jbeal-work") + homepage = "https://samtools.github.io/bcftools/" url = "https://github.com/samtools/bcftools/releases/download/1.3.1/bcftools-1.3.1.tar.bz2" + license("GPL-3.0-or-later") + + version("1.19", sha256="782b5f1bc690415192231e82213b3493b047f45e630dc8ef6f154d6126ab3e68") + version("1.18", sha256="d9b9d36293e4cc62ab7473aa2539389d4e1de79b1a927d483f6e91f3c3ceac7e") + version("1.17", sha256="01f75d8e701d85b2c759172412009cc04f29b61616ace2fa75116123de4596cc") version("1.16", sha256="293010736b076cf684d2873928924fcc3d2c231a091084c2ac23a8045c7df982") version("1.15.1", sha256="f21f9564873eb27ccf22d13b91a64acb8fbbfe4f9e4c37933a54b9a95857f2d7") version("1.14", sha256="b7ef88ae89fcb55658c5bea2e8cb8e756b055e13860036d6be13756782aa19cb") @@ -48,6 +55,9 @@ class Bcftools(AutotoolsPackage): depends_on("perl", when="@1.8:~perl-filters", type="run") depends_on("perl", when="@1.8:+perl-filters", type=("build", "run")) + depends_on("htslib@1.19", when="@1.19") + depends_on("htslib@1.18", when="@1.18") + depends_on("htslib@1.17", when="@1.17") depends_on("htslib@1.16", when="@1.16") depends_on("htslib@1.15", when="@1.15") depends_on("htslib@1.14", when="@1.14") diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index 65695f04f43c56..ef420969d97f80 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Bcl2fastq2(Package): homepage = "https://support.illumina.com/downloads/bcl2fastq-conversion-software-v2-20.html" + license("BSD-3-Clause") + version( "2.20.0.422", sha256="8dd3044767d044aa4ce46de0de562b111c44e5b8b7348e04e665eb1b4f101fe3" ) diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py index 94ede4fda676de..bd190c5e46a644 100644 --- a/var/spack/repos/builtin/packages/bdftopcf/package.py +++ b/var/spack/repos/builtin/packages/bdftopcf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Bdftopcf(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/bdftopcf" xorg_mirror_path = "app/bdftopcf-1.0.5.tar.gz" + license("MIT") + version("1.1", sha256="699d1a62012035b1461c7f8e3f05a51c8bd6f28f348983249fb89bbff7309b47") version("1.0.5", sha256="78a5ec945de1d33e6812167b1383554fda36e38576849e74a9039dc7364ff2c3") diff --git a/var/spack/repos/builtin/packages/bdii/package.py b/var/spack/repos/builtin/packages/bdii/package.py index 5fe6375ccc6b4f..74e6e375a1a922 100644 --- a/var/spack/repos/builtin/packages/bdii/package.py +++ b/var/spack/repos/builtin/packages/bdii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Bdii(MakefilePackage): homepage = "https://github.com/EGI-Foundation/bdii" url = "https://github.com/EGI-Foundation/bdii/archive/v5.2.25.tar.gz" + license("Apache-2.0") + version("6.0.1", sha256="ac292559004881c4d5254517207a5da82d7a48af746194a380145dcedef507ce") version("5.2.25", sha256="6abc3ed872538a12dc470a1d30bf4ae1ca4d6302eb6b50370413940f9e9259ca") version("5.2.24", sha256="5d09ed06b8b09ce372b3489fab93e25302f68ca80d8fcc600c2535648c861a3a") diff --git a/var/spack/repos/builtin/packages/bdsim/package.py b/var/spack/repos/builtin/packages/bdsim/package.py index c5c978da5d9e89..61eddbc92d56e3 100644 --- a/var/spack/repos/builtin/packages/bdsim/package.py +++ b/var/spack/repos/builtin/packages/bdsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Bdsim(CMakePackage): maintainers("gganis") + license("GPL-3.0-or-later") + version("develop", branch="develop") version("1.6.0", sha256="e3241d2d097cb4e22249e315c1474da9b3657b9c6893232d9f9e543a5323f717") diff --git a/var/spack/repos/builtin/packages/bdw-gc/package.py b/var/spack/repos/builtin/packages/bdw-gc/package.py index 17210c705e15a5..07565c4e67a6b5 100644 --- a/var/spack/repos/builtin/packages/bdw-gc/package.py +++ b/var/spack/repos/builtin/packages/bdw-gc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class BdwGc(AutotoolsPackage): homepage = "https://www.hboehm.info/gc/" url = "https://github.com/ivmai/bdwgc/releases/download/v8.2.4/gc-8.2.4.tar.gz" + license("Xerox") + version("8.2.4", sha256="3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2") version("8.2.2", sha256="f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0") version("8.0.6", sha256="3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11") diff --git a/var/spack/repos/builtin/packages/beagle/package.py b/var/spack/repos/builtin/packages/beagle/package.py index d029aa9d4b48ca..d6949c91146d28 100644 --- a/var/spack/repos/builtin/packages/beagle/package.py +++ b/var/spack/repos/builtin/packages/beagle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/beakerlib/package.py b/var/spack/repos/builtin/packages/beakerlib/package.py index 2c2793ce95b301..d207293d5793c4 100644 --- a/var/spack/repos/builtin/packages/beakerlib/package.py +++ b/var/spack/repos/builtin/packages/beakerlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Beakerlib(MakefilePackage): homepage = "https://github.com/beakerlib/beakerlib" url = "https://github.com/beakerlib/beakerlib/archive/1.20.tar.gz" + license("GPL-2.0-only") + version("1.29.3", sha256="f792b86bac8be1a4593dd096c32c1a061102c802c6f5760259a5753b13f6caa1") version("1.20", sha256="81f39a0b67adff4c3f4c051ffd26bcf45e19068dee7e81e3b00ee4698587f4e9") version("1.19", sha256="4dcaddf70a057ea5810c967cf5194d11850c8b5263ca25533e9e381067288460") diff --git a/var/spack/repos/builtin/packages/bear/package.py b/var/spack/repos/builtin/packages/bear/package.py index becb364a2c2d99..a5d98cc024d0f9 100644 --- a/var/spack/repos/builtin/packages/bear/package.py +++ b/var/spack/repos/builtin/packages/bear/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bear(CMakePackage): url = "https://github.com/rizsotto/Bear/archive/2.0.4.tar.gz" maintainers("vmiheer", "trws") + license("GPL-3.0-or-later") + version("3.0.20", sha256="45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7") version("3.0.19", sha256="2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431") version("3.0.18", sha256="ae94047c79b4f48462b66981f66a67b6a833d75d4c40e7afead491b1865f1142") diff --git a/var/spack/repos/builtin/packages/beast-tracer/package.py b/var/spack/repos/builtin/packages/beast-tracer/package.py index 6cede6c0cee581..1ed549a8a0ff55 100644 --- a/var/spack/repos/builtin/packages/beast-tracer/package.py +++ b/var/spack/repos/builtin/packages/beast-tracer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/beast1/package.py b/var/spack/repos/builtin/packages/beast1/package.py index 8aa34e237649de..9e557fde3abe9f 100644 --- a/var/spack/repos/builtin/packages/beast1/package.py +++ b/var/spack/repos/builtin/packages/beast1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/beast2/package.py b/var/spack/repos/builtin/packages/beast2/package.py index 25b729455cd7a9..062c452310654b 100644 --- a/var/spack/repos/builtin/packages/beast2/package.py +++ b/var/spack/repos/builtin/packages/beast2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Beast2(Package): maintainers("snehring") + license("LGPL-2.1-or-later") + version( "2.7.4", sha256="f5086c74a0337190ae3459ef018468fc6b2eff68ae2b53fb5c96eb7b5df84004", diff --git a/var/spack/repos/builtin/packages/beatnik/package.py b/var/spack/repos/builtin/packages/beatnik/package.py index 9afa9afa3825ce..d16ec01a24af58 100644 --- a/var/spack/repos/builtin/packages/beatnik/package.py +++ b/var/spack/repos/builtin/packages/beatnik/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage): maintainers("patrickb314", "JStewart28") + license("BSD-3-Clause") + version("1.0", commit="ae31ef9cb44678d5ace77994b45b0778defa3d2f") version("develop", branch="develop") version("main", branch="main") @@ -25,8 +27,16 @@ class Beatnik(CMakePackage, CudaPackage, ROCmPackage): # Dependencies for all Beatnik versions depends_on("mpi") - depends_on("mpi +cuda", when="+cuda") - depends_on("mpi +rocm", when="+rocm") + with when("+cuda"): + depends_on("mpich +cuda", when="^[virtuals=mpi] mpich") + depends_on("mvapich +cuda", when="^[virtuals=mpi] mvapich") + depends_on("mvapich2 +cuda", when="^[virtuals=mpi] mvapich2") + depends_on("mvapich2-gdr +cuda", when="^[virtuals=mpi] mvapich2-gdr") + depends_on("openmpi +cuda", when="^[virtuals=mpi] openmpi") + + with when("+rocm"): + depends_on("mpich +rocm", when="^[virtuals=mpi] mpich") + depends_on("mvapich2-gdr +rocm", when="^[virtuals=mpi] mvapich2-gdr") # Kokkos dependencies depends_on("kokkos @4:") diff --git a/var/spack/repos/builtin/packages/bedops/package.py b/var/spack/repos/builtin/packages/bedops/package.py index 8844d0ed010e9f..9d49dfd649b51e 100644 --- a/var/spack/repos/builtin/packages/bedops/package.py +++ b/var/spack/repos/builtin/packages/bedops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Bedops(MakefilePackage): maintainers("jacorvar") + license("bzip2-1.0.6") + version("2.4.41", sha256="3b868c820d59dd38372417efc31e9be3fbdca8cf0a6b39f13fb2b822607d6194") version("2.4.40", sha256="8c01db76669dc58c595e2e1b9bdb6d462f3363fc569b15c460a63a63b8b6bf30") version("2.4.39", sha256="f8bae10c6e1ccfb873be13446c67fc3a54658515fb5071663883f788fc0e4912") diff --git a/var/spack/repos/builtin/packages/bedtools2/package.py b/var/spack/repos/builtin/packages/bedtools2/package.py index 9a3fb8bec4941d..472cfa4bb9df87 100644 --- a/var/spack/repos/builtin/packages/bedtools2/package.py +++ b/var/spack/repos/builtin/packages/bedtools2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bedtools2(Package): homepage = "https://github.com/arq5x/bedtools2" url = "https://github.com/arq5x/bedtools2/archive/v2.30.0.tar.gz" + license("MIT") + version("2.31.0", sha256="183cf9a96aabc50ef4bd557a53fd01557a123c05a0dc87651371878f357439ec") version("2.30.0", sha256="c575861ec746322961cd15d8c0b532bb2a19333f1cf167bbff73230a7d67302f") version("2.29.2", sha256="bc2f36b5d4fc9890c69f607d54da873032628462e88c545dd633d2c787a544a5") diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py index 9d6987fca0ae1c..321805e4b652d2 100644 --- a/var/spack/repos/builtin/packages/beforelight/package.py +++ b/var/spack/repos/builtin/packages/beforelight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Beforelight(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/beforelight" xorg_mirror_path = "app/beforelight-1.0.5.tar.gz" + license("X11") + version("1.0.6", sha256="735579a7671a9f9de16b7211cf0ba39027183bdc3e82a937fbccfdd893e64a2e") version("1.0.5", sha256="93bb3c457d6d5e8def3180fdee07bc84d1b7f0e5378a95812e2193cd51455cdc") diff --git a/var/spack/repos/builtin/packages/benchmark/package.py b/var/spack/repos/builtin/packages/benchmark/package.py index fe0b286352fcd1..31b0ee915b893f 100644 --- a/var/spack/repos/builtin/packages/benchmark/package.py +++ b/var/spack/repos/builtin/packages/benchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Benchmark(CMakePackage): url = "https://github.com/google/benchmark/archive/v1.6.0.tar.gz" git = "https://github.com/google/benchmark.git" + license("Apache-2.0") + # first properly installed CMake config packages in # 1.2.0 release: https://github.com/google/benchmark/issues/363 version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/berkeley-db/package.py b/var/spack/repos/builtin/packages/berkeley-db/package.py index 1f14d0ef2a84dc..c549ed24b99cb7 100644 --- a/var/spack/repos/builtin/packages/berkeley-db/package.py +++ b/var/spack/repos/builtin/packages/berkeley-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class BerkeleyDb(AutotoolsPackage): executables = [r"^db_load$"] # One should be sufficient + license("UPL-1.0") + version("18.1.40", sha256="0cecb2ef0c67b166de93732769abdeba0555086d51de1090df325e18ee8da9c8") version( "18.1.32", diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index 4f68fd439a1170..0980bf5a85a163 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -60,8 +60,34 @@ class Berkeleygw(MakefilePackage): depends_on("hdf5+fortran+hl+mpi", when="+hdf5+mpi") depends_on("elpa+openmp", when="+elpa+openmp") depends_on("elpa~openmp", when="+elpa~openmp") - depends_on("fftw-api@3+openmp", when="+openmp") - depends_on("fftw-api@3~openmp", when="~openmp") + + depends_on("fftw-api@3") + with when("+openmp"): + depends_on("acfl threads=openmp", when="^[virtuals=fftw-api] acfl") + depends_on("amdfftw+openmp", when="^[virtuals=fftw-api] amdfftw") + depends_on("armpl-gcc threads=openmp", when="^[virtuals=fftw-api] armpl-gcc") + depends_on("cray-fftw+openmp", when="^[virtuals=fftw-api] cray-fftw") + depends_on("fftw+openmp", when="^[virtuals=fftw-api] fftw") + depends_on("fujitsu-fftw+openmp", when="^[virtuals=fftw-api] fujitsu-fftw") + depends_on("intel-mkl threads=openmp", when="^[virtuals=fftw-api] intel-mkl") + depends_on("intel-oneapi-mkl threads=openmp", when="^[virtuals=fftw-api] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio threads=openmp", + when="^[virtuals=fftw-api] intel-parallel-studio", + ) + + with when("~openmp"): + depends_on("acfl threads=none", when="^[virtuals=fftw-api] acfl") + depends_on("amdfftw~openmp", when="^[virtuals=fftw-api] amdfftw") + depends_on("armpl-gcc threads=none", when="^[virtuals=fftw-api] armpl-gcc") + depends_on("cray-fftw~openmp", when="^[virtuals=fftw-api] cray-fftw") + depends_on("fftw~openmp", when="^[virtuals=fftw-api] fftw") + depends_on("fujitsu-fftw~openmp", when="^[virtuals=fftw-api] fujitsu-fftw") + depends_on("intel-mkl threads=none", when="^[virtuals=fftw-api] intel-mkl") + depends_on("intel-oneapi-mkl threads=none", when="^[virtuals=fftw-api] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio threads=none", when="^[virtuals=fftw-api] intel-parallel-studio" + ) # in order to run the installed python scripts depends_on("python", type=("build", "run"), when="+python") diff --git a/var/spack/repos/builtin/packages/bertini/package.py b/var/spack/repos/builtin/packages/bertini/package.py index 162f0e8810b9ee..68b52246a882d5 100644 --- a/var/spack/repos/builtin/packages/bertini/package.py +++ b/var/spack/repos/builtin/packages/bertini/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bertini(AutotoolsPackage): homepage = "https://bertini.nd.edu/" url = "https://bertini.nd.edu/BertiniSource_v1.5.tar.gz" + license("GPL-3.0-or-later") + version("1.5", sha256="a9a68a96e180fe6a93ba1bc1d61f522784c9a053b049b2cbd98008b5b6deec3c") variant("mpi", default=True, description="Compile in parallel") diff --git a/var/spack/repos/builtin/packages/bfs/package.py b/var/spack/repos/builtin/packages/bfs/package.py index f90c882648c1a7..5b6e87845e04af 100644 --- a/var/spack/repos/builtin/packages/bfs/package.py +++ b/var/spack/repos/builtin/packages/bfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class Bfs(MakefilePackage): maintainers("alecbcs") + license("0BSD") + + version("3.0.4", sha256="7196f5a624871c91ad051752ea21043c198a875189e08c70ab3167567a72889d") version("3.0.2", sha256="d3456a9aeecc031064db0dbe012e55a11eb97be88d0ab33a90e570fe66457f92") version("3.0.1", sha256="a38bb704201ed29f4e0b989fb2ab3791ca51c3eff90acfc31fff424579bbf962") diff --git a/var/spack/repos/builtin/packages/bgpdump/package.py b/var/spack/repos/builtin/packages/bgpdump/package.py index 55f7fd95962ada..334769aca16f92 100644 --- a/var/spack/repos/builtin/packages/bgpdump/package.py +++ b/var/spack/repos/builtin/packages/bgpdump/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bib2xhtml/package.py b/var/spack/repos/builtin/packages/bib2xhtml/package.py index 9cc7f8b1b71afb..bb9c1faf61c5b5 100644 --- a/var/spack/repos/builtin/packages/bib2xhtml/package.py +++ b/var/spack/repos/builtin/packages/bib2xhtml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Bib2xhtml(Package): homepage = "https://www.spinellis.gr/sw/textproc/bib2xhtml/" url = "https://www.spinellis.gr/sw/textproc/bib2xhtml/bib2xhtml-v3.0-79-ge935.tar.gz" + license("GPL-2.0-only") + version( "3.0-79-ge935", sha256="4a2d2d89dd2f3fed1c735055b806809b5cc1cde32dee1aa5987097ec5bf2181f" ) diff --git a/var/spack/repos/builtin/packages/bigdft-atlab/package.py b/var/spack/repos/builtin/packages/bigdft-atlab/package.py index e44c1d0ee26ca9..c74113c0dcb77e 100644 --- a/var/spack/repos/builtin/packages/bigdft-atlab/package.py +++ b/var/spack/repos/builtin/packages/bigdft-atlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,9 @@ class BigdftAtlab(AutotoolsPackage): variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("openbabel", default=False, description="Enable detection of openbabel compilation") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("autoconf", type="build") depends_on("automake", type="build") @@ -30,7 +33,7 @@ class BigdftAtlab(AutotoolsPackage): depends_on("openbabel", when="+openbabel") for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") configure_directory = "atlab" @@ -39,27 +42,38 @@ def configure_args(self): prefix = self.prefix fcflags = [] + cflags = [] + cxxflags = [] + if "+openmp" in spec: fcflags.append(self.compiler.openmp_flag) + if spec.satisfies("+shared"): + fcflags.append("-fPIC") + cflags.append("-fPIC") + cxxflags.append("-fPIC") if self.spec.satisfies("%gcc@10:"): fcflags.append("-fallow-argument-mismatch") args = [ - "FCFLAGS=%s" % " ".join(fcflags), - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags + "/futile", - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(fcflags)}", + f"CFLAGS={' '.join(cflags)}", + f"CXXFLAGS={' '.join(cxxflags)}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}/futile", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", "--without-etsf-io", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") @@ -70,8 +84,8 @@ def configure_args(self): if "+openbabel" in spec: args.append("--enable-openbabel") - args.append("--with-openbabel-libs=%s" % spec["openbabel"].prefix.lib) - args.append("--with-openbabel-incs=%s" % spec["openbabel"].prefix.include) + args.append(f"--with-openbabel-libs={spec['openbabel'].prefix.lib}") + args.append(f"--with-openbabel-incs={spec['openbabel'].prefix.include}") return args diff --git a/var/spack/repos/builtin/packages/bigdft-chess/package.py b/var/spack/repos/builtin/packages/bigdft-chess/package.py index c2731de7b5c7b3..dc5ba9362a37e5 100644 --- a/var/spack/repos/builtin/packages/bigdft-chess/package.py +++ b/var/spack/repos/builtin/packages/bigdft-chess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,9 @@ class BigdftChess(AutotoolsPackage, CudaPackage): variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") variant("ntpoly", default=False, description="Option to use NTPoly") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation # variant('minpack', default=False, description='Give the link-line for MINPACK') depends_on("autoconf", type="build") @@ -40,8 +43,8 @@ class BigdftChess(AutotoolsPackage, CudaPackage): # depends_on('netlib-minpack', when='+minpack') for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-atlab@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") + depends_on(f"bigdft-atlab@{vers}", when=f"@{vers}") configure_directory = "chess" @@ -50,7 +53,7 @@ def configure_args(self): prefix = self.prefix python_version = spec["python"].version.up_to(2) - pyyaml = join_path(spec["py-pyyaml"].prefix.lib, "python{0}".format(python_version)) + pyyaml = join_path(spec["py-pyyaml"].prefix.lib, f"python{python_version}") openmp_flag = [] if "+openmp" in spec: @@ -63,23 +66,25 @@ def configure_args(self): linalg.append(spec["blas"].libs.ld_flags) args = [ - "FCFLAGS=%s" % " ".join(openmp_flag), - "LDFLAGS=%s" % " ".join(linalg), - "--with-ext-linalg=%s" % " ".join(linalg), - "--with-pyyaml-path=%s" % pyyaml, - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags, - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(openmp_flag)}", + f"LDFLAGS={' '.join(linalg)}", + f"--with-ext-linalg={' '.join(linalg)}", + f"--with-pyyaml-path={pyyaml}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", "--without-etsf-io", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") @@ -88,12 +93,12 @@ def configure_args(self): else: args.append("--without-openmp") - args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) + args.append(f"--with-atlab-libs={spec['bigdft-atlab'].prefix.lib}") if "+cuda" in spec: args.append("--enable-cuda-gpu") - args.append("--with-cuda-path=%s" % spec["cuda"].prefix) - args.append("--with-cuda-libs=%s" % spec["cuda"].libs.link_flags) + args.append(f"--with-cuda-path={spec['cuda'].prefix}") + args.append(f"--with-cuda-libs={spec['cuda'].libs.link_flags}") if "+minpack" in spec: args.append("--with-minpack") diff --git a/var/spack/repos/builtin/packages/bigdft-core/package.py b/var/spack/repos/builtin/packages/bigdft-core/package.py index 40d76442c8f346..834b65f3777c24 100644 --- a/var/spack/repos/builtin/packages/bigdft-core/package.py +++ b/var/spack/repos/builtin/packages/bigdft-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,9 @@ class BigdftCore(AutotoolsPackage, CudaPackage): variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") variant("openbabel", default=False, description="Enable detection of openbabel compilation") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("autoconf", type="build") depends_on("automake", type="build") @@ -42,10 +45,10 @@ class BigdftCore(AutotoolsPackage, CudaPackage): depends_on("libxc@:4.3.4", when="@develop") for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-chess@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-psolver@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-libabinit@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") + depends_on(f"bigdft-chess@{vers}", when=f"@{vers}") + depends_on(f"bigdft-psolver@{vers}", when=f"@{vers}") + depends_on(f"bigdft-libabinit@{vers}", when=f"@{vers}") configure_directory = "bigdft" @@ -54,7 +57,7 @@ def configure_args(self): prefix = self.prefix python_version = spec["python"].version.up_to(2) - pyyaml = join_path(spec["py-pyyaml"].prefix.lib, "python{0}".format(python_version)) + pyyaml = join_path(spec["py-pyyaml"].prefix.lib, f"python{python_version}") openmp_flag = [] if "+openmp" in spec: @@ -67,33 +70,34 @@ def configure_args(self): linalg.append(spec["blas"].libs.ld_flags) args = [ - "FCFLAGS=%s" % " ".join(openmp_flag), - "--with-ext-linalg=%s" % " ".join(linalg), - "--with-pyyaml-path=%s" % pyyaml, - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags, - "--with-chess-libs=%s" % spec["bigdft-chess"].libs.ld_flags, - "--with-chess-incs=%s" % spec["bigdft-chess"].headers.include_flags, - "--with-psolver-libs=%s" % spec["bigdft-psolver"].libs.ld_flags, - "--with-psolver-incs=%s" % spec["bigdft-psolver"].headers.include_flags, - "--with-libABINIT-libs=%s" % spec["bigdft-libabinit"].libs.ld_flags, - "--with-libABINIT-incs=%s" % spec["bigdft-libabinit"].headers.include_flags, - "--with-libgain-libs=%s" % spec["libgain"].libs.ld_flags, - "--with-libgain-incs=%s" % spec["libgain"].headers.include_flags, - "--with-libxc-libs=%s %s" - % (spec["libxc"].libs.ld_flags, spec["libxc"].libs.ld_flags + "f90"), - "--with-libxc-incs=%s" % spec["libxc"].headers.include_flags, - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(openmp_flag)}", + f"--with-ext-linalg={' '.join(linalg)}", + f"--with-pyyaml-path={pyyaml}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}", + f"--with-chess-libs={spec['bigdft-chess'].libs.ld_flags}", + f"--with-chess-incs={spec['bigdft-chess'].headers.include_flags}", + f"--with-psolver-libs={spec['bigdft-psolver'].libs.ld_flags}", + f"--with-psolver-incs={spec['bigdft-psolver'].headers.include_flags}", + f"--with-libABINIT-libs={spec['bigdft-libabinit'].libs.ld_flags}", + f"--with-libABINIT-incs={spec['bigdft-libabinit'].headers.include_flags}", + f"--with-libgain-libs={spec['libgain'].libs.ld_flags}", + f"--with-libgain-incs={spec['libgain'].headers.include_flags}", + f"--with-libxc-libs={spec['libxc'].libs.ld_flags} {spec['libxc'].libs.ld_flags}f90", + f"--with-libxc-incs={spec['libxc'].headers.include_flags}", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", "--without-etsf-io", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") @@ -104,15 +108,15 @@ def configure_args(self): if "+cuda" in spec: args.append("--enable-opencl") - args.append("--with-ocl-path=%s" % spec["cuda"].prefix) + args.append(f"--with-ocl-path={spec['cuda'].prefix}") args.append("--enable-cuda-gpu") - args.append("--with-cuda-path=%s" % spec["cuda"].prefix) - args.append("--with-cuda-libs=%s" % spec["cuda"].libs.link_flags) + args.append(f"--with-cuda-path={spec['cuda'].prefix}") + args.append(f"--with-cuda-libs={spec['cuda'].libs.link_flags}") if "+openbabel" in spec: args.append("--enable-openbabel") - args.append("--with-openbabel-libs=%s" % spec["openbabel"].prefix.lib) - args.append("--with-openbabel-incs=%s" % spec["openbabel"].prefix.include) + args.append(f"--with-openbabel-libs={spec['openbabel'].prefix.lib}") + args.append(f"--with-openbabel-incs={spec['openbabel'].prefix.include}") return args diff --git a/var/spack/repos/builtin/packages/bigdft-futile/package.py b/var/spack/repos/builtin/packages/bigdft-futile/package.py index 51002308817a2f..13c2e694959453 100644 --- a/var/spack/repos/builtin/packages/bigdft-futile/package.py +++ b/var/spack/repos/builtin/packages/bigdft-futile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,9 @@ class BigdftFutile(AutotoolsPackage, CudaPackage): variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("autoconf", type="build") depends_on("automake", type="build") @@ -46,19 +49,21 @@ def configure_args(self): linalg = [spec["blas"].libs.ld_flags, spec["lapack"].libs.ld_flags] python_version = spec["python"].version.up_to(2) - pyyaml = join_path(spec["py-pyyaml"].prefix.lib, "python{0}".format(python_version)) + pyyaml = join_path(spec["py-pyyaml"].prefix.lib, f"python{python_version}") openmp_flag = [] if "+openmp" in spec: openmp_flag.append(self.compiler.openmp_flag) args = [ - "FCFLAGS=%s" % " ".join(openmp_flag), - "--with-ext-linalg=%s" % " ".join(linalg), - "--with-yaml-path=%s" % spec["libyaml"].prefix, - "--with-pyyaml-path=%s" % pyyaml, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(openmp_flag)}", + f"--with-ext-linalg={' '.join(linalg)}", + f"--with-yaml-path={spec['libyaml'].prefix}", + f"--with-pyyaml-path={pyyaml}", + f"--prefix={prefix}", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+openmp" in spec: args.append("--with-openmp") @@ -66,19 +71,19 @@ def configure_args(self): args.append("--without-openmp") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") if "+cuda" in spec: args.append("--enable-opencl") - args.append("--with-ocl-path=%s" % spec["cuda"].prefix) + args.append(f"--with-ocl-path={spec['cuda'].prefix}") args.append("--enable-cuda-gpu") - args.append("--with-cuda-path=%s" % spec["cuda"].prefix) + args.append(f"--with-cuda-path={spec['cuda'].prefix}") return args diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py index 49a4d2b9816d87..c88763946b2aaa 100644 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py +++ b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,9 @@ class BigdftLibabinit(AutotoolsPackage): depends_on("libtool", type="build") variant("mpi", default=True, description="Enable MPI support") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("python@3.0:", type=("build", "run")) @@ -34,7 +37,7 @@ class BigdftLibabinit(AutotoolsPackage): depends_on("libxc@:4.3.4", when="@1.9.1:") for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") configure_directory = "libABINIT" @@ -47,22 +50,28 @@ def configure_args(self): fcflags.append("-fallow-argument-mismatch") args = [ - "FCFLAGS=%s" % " ".join(fcflags), - "--with-libxc-libs=%s %s" - % (spec["libxc"].libs.ld_flags, spec["libxc"].libs.ld_flags + "f90"), - "--with-libxc-incs=%s" % spec["libxc"].headers.include_flags, - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags, - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(fcflags)}", + f"--with-libxc-libs={spec['libxc'].libs.ld_flags} " + f"{spec['libxc'].libs.ld_flags + 'f90'}", + f"--with-libxc-incs={spec['libxc'].headers.include_flags}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.extend( + [ + f"CC={spec['mpi'].mpicc}", + f"CXX={spec['mpi'].mpicxx}", + f"FC={spec['mpi'].mpifc}", + f"F90={spec['mpi'].mpifc}", + f"F77={spec['mpi'].mpif77}", + ] + ) else: args.append("--disable-mpi") diff --git a/var/spack/repos/builtin/packages/bigdft-psolver/package.py b/var/spack/repos/builtin/packages/bigdft-psolver/package.py index 494d614468ee38..2ee1ab488f32d0 100644 --- a/var/spack/repos/builtin/packages/bigdft-psolver/package.py +++ b/var/spack/repos/builtin/packages/bigdft-psolver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,9 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("autoconf", type="build") depends_on("automake", type="build") @@ -37,8 +40,8 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): depends_on("scalapack", when="+scalapack") for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-atlab@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") + depends_on(f"bigdft-atlab@{vers}", when=f"@{vers}") configure_directory = "psolver" @@ -47,7 +50,7 @@ def configure_args(self): prefix = self.prefix python_version = spec["python"].version.up_to(2) - pyyaml = join_path(spec["py-pyyaml"].prefix.lib, "python{0}".format(python_version)) + pyyaml = join_path(spec["py-pyyaml"].prefix.lib, f"python{python_version}") openmp_flag = [] if "+openmp" in spec: @@ -60,22 +63,24 @@ def configure_args(self): linalg.append(spec["blas"].libs.ld_flags) args = [ - "FCFLAGS=%s" % " ".join(openmp_flag), - "--with-ext-linalg=%s" % " ".join(linalg), - "--with-pyyaml-path=%s" % pyyaml, - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags, - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(openmp_flag)}", + f"--with-ext-linalg={' '.join(linalg)}", + f"--with-pyyaml-path={pyyaml}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", "--without-etsf-io", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") @@ -84,12 +89,12 @@ def configure_args(self): else: args.append("--without-openmp") - args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) + args.append(f"--with-atlab-libs={spec['bigdft-atlab'].prefix.lib}") if "+cuda" in spec: args.append("--enable-cuda-gpu") - args.append("--with-cuda-path=%s" % spec["cuda"].prefix) - args.append("--with-cuda-libs=%s" % spec["cuda"].libs.link_flags) + args.append(f"--with-cuda-path={spec['cuda'].prefix}") + args.append(f"--with-cuda-libs={spec['cuda'].libs.link_flags}") return args diff --git a/var/spack/repos/builtin/packages/bigdft-spred/package.py b/var/spack/repos/builtin/packages/bigdft-spred/package.py index fe9a917d607933..14215c3f7fe47a 100644 --- a/var/spack/repos/builtin/packages/bigdft-spred/package.py +++ b/var/spack/repos/builtin/packages/bigdft-spred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,9 @@ class BigdftSpred(AutotoolsPackage): variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") + variant( + "shared", default=True, description="Build shared libraries" + ) # Not default in bigdft, but is typically the default expectation depends_on("python@3.0:", type=("build", "run")) @@ -36,9 +39,9 @@ class BigdftSpred(AutotoolsPackage): depends_on("scalapack", when="+scalapack") for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: - depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-psolver@{0}".format(vers), when="@{0}".format(vers)) - depends_on("bigdft-core@{0}".format(vers), when="@{0}".format(vers)) + depends_on(f"bigdft-futile@{vers}", when=f"@{vers}") + depends_on(f"bigdft-psolver@{vers}", when=f"@{vers}") + depends_on(f"bigdft-core@{vers}", when=f"@{vers}") configure_directory = "spred" @@ -47,7 +50,7 @@ def configure_args(self): prefix = self.prefix python_version = spec["python"].version.up_to(2) - pyyaml = join_path(spec["py-pyyaml"].prefix.lib, "python{0}".format(python_version)) + pyyaml = join_path(spec["py-pyyaml"].prefix.lib, f"python{python_version}") openmp_flag = [] if "+openmp" in spec: @@ -60,25 +63,27 @@ def configure_args(self): linalg.append(spec["blas"].libs.ld_flags) args = [ - "FCFLAGS=%s" % " ".join(openmp_flag), - "--with-ext-linalg=%s" % " ".join(linalg), - "--with-pyyaml-path=%s" % pyyaml, - "--with-futile-libs=%s" % spec["bigdft-futile"].libs.ld_flags, - "--with-futile-incs=%s" % spec["bigdft-futile"].headers.include_flags, - "--with-psolver-libs=%s" % spec["bigdft-psolver"].prefix.lib, - "--with-psolver-incs=%s" % spec["bigdft-psolver"].headers.include_flags, - "--with-core-libs=%s" % spec["bigdft-core"].prefix.lib, - "--with-core-incs=%s" % spec["bigdft-core"].headers.include_flags, - "--with-moduledir=%s" % prefix.include, - "--prefix=%s" % prefix, + f"FCFLAGS={' '.join(openmp_flag)}", + f"--with-ext-linalg={' '.join(linalg)}", + f"--with-pyyaml-path={pyyaml}", + f"--with-futile-libs={spec['bigdft-futile'].libs.ld_flags}", + f"--with-futile-incs={spec['bigdft-futile'].headers.include_flags}", + f"--with-psolver-libs={spec['bigdft-psolver'].prefix.lib}", + f"--with-psolver-incs={spec['bigdft-psolver'].headers.include_flags}", + f"--with-core-libs={spec['bigdft-core'].prefix.lib}", + f"--with-core-incs={spec['bigdft-core'].headers.include_flags}", + f"--with-moduledir={prefix.include}", + f"--prefix={prefix}", ] + if spec.satisfies("+shared"): + args.append("--enable-dynamic-libraries") if "+mpi" in spec: - args.append("CC=%s" % spec["mpi"].mpicc) - args.append("CXX=%s" % spec["mpi"].mpicxx) - args.append("FC=%s" % spec["mpi"].mpifc) - args.append("F90=%s" % spec["mpi"].mpifc) - args.append("F77=%s" % spec["mpi"].mpif77) + args.append(f"CC={spec['mpi'].mpicc}") + args.append(f"CXX={spec['mpi'].mpicxx}") + args.append(f"FC={spec['mpi'].mpifc}") + args.append(f"F90={spec['mpi'].mpifc}") + args.append(f"F77={spec['mpi'].mpif77}") else: args.append("--disable-mpi") diff --git a/var/spack/repos/builtin/packages/bigdft-suite/package.py b/var/spack/repos/builtin/packages/bigdft-suite/package.py index b4785b0e17a4ec..7c2abb0c43d85c 100644 --- a/var/spack/repos/builtin/packages/bigdft-suite/package.py +++ b/var/spack/repos/builtin/packages/bigdft-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py index 51dcda701e7c2a..effdc50b41a9c0 100644 --- a/var/spack/repos/builtin/packages/bigreqsproto/package.py +++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bind9/package.py b/var/spack/repos/builtin/packages/bind9/package.py index 68b1e9da4447e9..c80109971bf27b 100644 --- a/var/spack/repos/builtin/packages/bind9/package.py +++ b/var/spack/repos/builtin/packages/bind9/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bind9(AutotoolsPackage): homepage = "https://github.com/isc-projects/bind9" url = "https://github.com/isc-projects/bind9/archive/v9_14_6.tar.gz" + license("Apache-2.0") + version("9_14_6", sha256="98be7a7b6d614b519f6c8d6ec7a8a39759ae9604d87228d9dc7c034471e5433e") depends_on("libuv", type="link") diff --git a/var/spack/repos/builtin/packages/binder/package.py b/var/spack/repos/builtin/packages/binder/package.py index 7ae8fe7f515ffc..0b08dd0c290d2e 100644 --- a/var/spack/repos/builtin/packages/binder/package.py +++ b/var/spack/repos/builtin/packages/binder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Binder(CMakePackage): maintainers("lyskov", "kliegeois") + license("MIT") + version("master", branch="master") version("1.3.0", tag="v1.3.0", commit="e9b55985af297ca161d615058e4a5da07c22bc77") version("1.2.0", tag="v1.2.0", commit="90cf5b31b6f4ecad3fe87518ca2b949dc9e8ed1a") @@ -49,6 +51,6 @@ def cmake_args(self): def setup_dependent_package(self, module, dependent_spec): llvm_dir = self.spec["llvm"].prefix self.spec.clang_include_dirs = llvm_dir.include - self.spec.LibClang_include_dir = llvm_dir.lib.clang.join( + self.spec.libclang_include_dir = llvm_dir.lib.clang.join( format(self.spec["llvm"].version) ).include diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 30aee917e0125f..f71ebf8366d5f5 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,11 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): executables = ["^nm$", "^readelf$"] + license( + "GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later", + checked_by="tgamblin", + ) + version("2.41", sha256="a4c4bec052f7b8370024e60389e194377f3f48b56618418ea51067f67aaab30b") version("2.40", sha256="f8298eb153a4b37d112e945aa5cb2850040bcf26a3ea65b5a715c83afe05e48a") version("2.39", sha256="da24a84fef220102dd24042df06fdea851c2614a5377f86effa28f33b7b16148") diff --git a/var/spack/repos/builtin/packages/bioawk/package.py b/var/spack/repos/builtin/packages/bioawk/package.py index 6754a660b1c036..0aff26fa5d6e1f 100644 --- a/var/spack/repos/builtin/packages/bioawk/package.py +++ b/var/spack/repos/builtin/packages/bioawk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/biobambam2/package.py b/var/spack/repos/builtin/packages/biobambam2/package.py index 718030f85ea4c9..83f0293a2d5c8b 100644 --- a/var/spack/repos/builtin/packages/biobambam2/package.py +++ b/var/spack/repos/builtin/packages/biobambam2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/biobloom/package.py b/var/spack/repos/builtin/packages/biobloom/package.py index aacf157428fedf..e89488f9ef99eb 100644 --- a/var/spack/repos/builtin/packages/biobloom/package.py +++ b/var/spack/repos/builtin/packages/biobloom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bioconductor-dupradar/package.py b/var/spack/repos/builtin/packages/bioconductor-dupradar/package.py index d92d43d27763f0..3eae761c401de1 100644 --- a/var/spack/repos/builtin/packages/bioconductor-dupradar/package.py +++ b/var/spack/repos/builtin/packages/bioconductor-dupradar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,11 @@ class BioconductorDupradar(RPackage): bioc = "dupradar" - version("1.30.0", sha256="a299d7a4578047dfc19237e34255b0f50f70ce41d29762ef9f5a7741ba35aa3d") + version( + "1.30.0", + sha256="a299d7a4578047dfc19237e34255b0f50f70ce41d29762ef9f5a7741ba35aa3d", + deprecated=True, + ) depends_on("r-kernsmooth") depends_on("subread") diff --git a/var/spack/repos/builtin/packages/bioconductor-ebseq/package.py b/var/spack/repos/builtin/packages/bioconductor-ebseq/package.py index 9a14a95c924092..7d54296fd42517 100644 --- a/var/spack/repos/builtin/packages/bioconductor-ebseq/package.py +++ b/var/spack/repos/builtin/packages/bioconductor-ebseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,7 +23,11 @@ class BioconductorEbseq(RPackage): bioc = "ebseq" - version("1.40.0", sha256="a5d3a88743d61062c6d68a426b19c53a4afd2fa216abc884d42c187780994378") + version( + "1.40.0", + sha256="a5d3a88743d61062c6d68a426b19c53a4afd2fa216abc884d42c187780994378", + deprecated=True, + ) depends_on("r-blockmodeling") depends_on("r-gplots") diff --git a/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py b/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py index 657473676ae6e9..8ae22b208be0b4 100644 --- a/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py +++ b/var/spack/repos/builtin/packages/bioconductor-rsubread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,4 +17,8 @@ class BioconductorRsubread(RPackage): depends_on("r-matrix") depends_on("zlib-api") - version("2.14.2", sha256="ac8be0fad0eb2743443e3a60a9a94eec78c746638aaccca70e7166d034dcebb5") + version( + "2.14.2", + sha256="ac8be0fad0eb2743443e3a60a9a94eec78c746638aaccca70e7166d034dcebb5", + deprecated=True, + ) diff --git a/var/spack/repos/builtin/packages/bioconductor-tximeta/package.py b/var/spack/repos/builtin/packages/bioconductor-tximeta/package.py index fd1206a2c020ef..cafc8dccb49e56 100644 --- a/var/spack/repos/builtin/packages/bioconductor-tximeta/package.py +++ b/var/spack/repos/builtin/packages/bioconductor-tximeta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,11 @@ class BioconductorTximeta(RPackage): bioc = "tximeta" - version("1.18.1", sha256="ee486fc4b2352e2998a3c0c2064449ebcf09b5815f982597ea58311dc8064408") + version( + "1.18.1", + sha256="ee486fc4b2352e2998a3c0c2064449ebcf09b5815f982597ea58311dc8064408", + deprecated=True, + ) depends_on("r", type=("build", "run")) depends_on("r-annotationdbi") diff --git a/var/spack/repos/builtin/packages/biopieces/package.py b/var/spack/repos/builtin/packages/biopieces/package.py index 28a5402f3bd6e6..3b36ee0b5862fc 100644 --- a/var/spack/repos/builtin/packages/biopieces/package.py +++ b/var/spack/repos/builtin/packages/biopieces/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Biopieces(Package): homepage = "https://maasha.github.io/biopieces/" git = "https://github.com/maasha/biopieces.git" + license("GPL-2.0-only") + version("2016-04-12", commit="982f80f7c55e2cae67737d80fe35a4e784762856", submodules=True) depends_on("perl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/bird/package.py b/var/spack/repos/builtin/packages/bird/package.py index 3a522976b0b35f..b9ed84e0c3d3b1 100644 --- a/var/spack/repos/builtin/packages/bird/package.py +++ b/var/spack/repos/builtin/packages/bird/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Bird(AutotoolsPackage): homepage = "https://bird.network.cz/" url = "https://github.com/BIRD/bird/archive/v2.0.2.tar.gz" + license("GPL-2.0-or-later") + version("2.0.2", sha256="bd42d48fbcc2c0046d544f1183cd98193ff15b792d332ff45f386b0180b09335") version("2.0.1", sha256="cd6ea4a39ca97ad16d364bf80f919f0e75eba02dd7fe46be40f55d78d022244a") diff --git a/var/spack/repos/builtin/packages/bismark/package.py b/var/spack/repos/builtin/packages/bismark/package.py index 5a5c7d6cc02193..93cd8f2cd0502e 100644 --- a/var/spack/repos/builtin/packages/bismark/package.py +++ b/var/spack/repos/builtin/packages/bismark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Bismark(Package): homepage = "https://www.bioinformatics.babraham.ac.uk/projects/bismark" url = "https://github.com/FelixKrueger/Bismark/archive/0.23.0.tar.gz" + license("GPL-3.0-only") + version("0.24.1", sha256="c5409f5fa470ea5ac07327ced28c60b793f5ef88c5a7bc75b71dde0f52f39894") version("0.23.0", sha256="ea1625808487c1442dbf825d9cbe5c0cbc37ea5bd1460f59e1e0ccc80cc01c9e") version("0.19.0", sha256="91707737f96a0574956a282b635abad7560e7d90bee188a67a7807b2470deae2") diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index 1ad363f747a667..838dd47a3fbad3 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Bison(AutotoolsPackage, GNUMirrorPackage): executables = ["^bison$"] + license("GPL-3.0-or-later") + version("3.8.2", sha256="06c9e13bdf7eb24d4ceb6b59205a4f67c2c7e7213119644430fe82fbd14a0abb") version("3.8.1", sha256="ce318a47196155fb7c26912b513102f3d0e14757c2e495e34608757b61339c5c") version("3.8", sha256="d5d184d421aee15603939973a6b0f372f908edfb24c5bc740697497021ad9458") @@ -65,6 +67,13 @@ class Bison(AutotoolsPackage, GNUMirrorPackage): patch("nvhpc-3.7.patch", when="@3.7.0:3.7 %nvhpc") conflicts("%intel@:14", when="@3.4.2:", msg="Intel 14 has immature C11 support") + conflicts( + "%oneapi", + msg=( + "bison is likely miscompiled by oneapi compilers, " + "see https://github.com/spack/spack/issues/37172" + ), + ) if sys.platform == "darwin" and macos_version() >= Version("10.13"): patch("secure_snprintf.patch", level=0, when="@3.0.4") diff --git a/var/spack/repos/builtin/packages/bitgroomingz/package.py b/var/spack/repos/builtin/packages/bitgroomingz/package.py index f501e70bac1ea3..ec6fdfd17f844e 100644 --- a/var/spack/repos/builtin/packages/bitgroomingz/package.py +++ b/var/spack/repos/builtin/packages/bitgroomingz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bitlbee/package.py b/var/spack/repos/builtin/packages/bitlbee/package.py index 1354e46a3eaf34..1ffdd1b9b5babb 100644 --- a/var/spack/repos/builtin/packages/bitlbee/package.py +++ b/var/spack/repos/builtin/packages/bitlbee/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bitlbee(AutotoolsPackage): homepage = "https://www.bitlbee.org/" url = "https://github.com/bitlbee/bitlbee/archive/3.5.1.tar.gz" + license("GPL-2.0-or-later") + version("3.6-1", sha256="81c6357fe08a8941221472e3790e2b351e3a8a41f9af0cf35395fdadbc8ac6cb") version("3.6", sha256="6ec3a1054eaa98eaaabe6159cb4912cfd6286f71adcfa970419b273b38fdfe0c") version("3.5-2", sha256="cdcf3ed829d1905b73687b6aa189bbfaf9194f886d9fc7156646827dc0384fdb") diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py index cc1c495dccab41..095bac8af0dcfa 100644 --- a/var/spack/repos/builtin/packages/bitmap/package.py +++ b/var/spack/repos/builtin/packages/bitmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bitsery/package.py b/var/spack/repos/builtin/packages/bitsery/package.py index 847baaa7729621..f3695651b61d91 100644 --- a/var/spack/repos/builtin/packages/bitsery/package.py +++ b/var/spack/repos/builtin/packages/bitsery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Bitsery(CMakePackage): homepage = "https://github.com/fraillt/bitsery" url = "https://github.com/fraillt/bitsery/archive/v5.1.0.tar.gz" + license("MIT") + version("5.1.0", sha256="8f46667db5d0b62fdaab33612108498bcbcbe9cfa48d2cd220b2129734440a8d") diff --git a/var/spack/repos/builtin/packages/blackhat/package.py b/var/spack/repos/builtin/packages/blackhat/package.py index 5e8c1d81104128..6ed4a4a42c84e9 100644 --- a/var/spack/repos/builtin/packages/blackhat/package.py +++ b/var/spack/repos/builtin/packages/blackhat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blaspp/0001-fix-blaspp-build-error-with-rocm-6.0.0.patch b/var/spack/repos/builtin/packages/blaspp/0001-fix-blaspp-build-error-with-rocm-6.0.0.patch new file mode 100644 index 00000000000000..3ce15f0859d24b --- /dev/null +++ b/var/spack/repos/builtin/packages/blaspp/0001-fix-blaspp-build-error-with-rocm-6.0.0.patch @@ -0,0 +1,50 @@ +From a75f399bfa77680e7736d126ef3e5a520e1a1702 Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Wed, 17 Jan 2024 12:55:06 +0000 +Subject: [PATCH] fix build error with rocm-6.0.0 by adding extra parameters + for rocblas function calls rocblas_ztrmm() ,rocblas_strmm(), + rocblas_ctrmm(),rocblas_dtrmm() + +--- + src/rocblas_wrappers.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rocblas_wrappers.cc b/src/rocblas_wrappers.cc +index 0e01a95..44ab150 100644 +--- a/src/rocblas_wrappers.cc ++++ b/src/rocblas_wrappers.cc +@@ -667,6 +667,7 @@ void trmm( + m, n, + &alpha, + dA, ldda, ++ dB, lddb, + dB, lddb ) ); + } + +@@ -686,6 +687,7 @@ void trmm( + m, n, + &alpha, + dA, ldda, ++ dB, lddb, + dB, lddb ) ); + } + +@@ -705,6 +707,7 @@ void trmm( + m, n, + (rocblas_float_complex*) &alpha, + (rocblas_float_complex*) dA, ldda, ++ (rocblas_float_complex*) dB, lddb, + (rocblas_float_complex*) dB, lddb ) ); + } + +@@ -724,6 +727,7 @@ void trmm( + m, n, + (rocblas_double_complex*) &alpha, + (rocblas_double_complex*) dA, ldda, ++ (rocblas_double_complex*) dB, lddb, + (rocblas_double_complex*) dB, lddb ) ); + } + +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/blaspp/package.py b/var/spack/repos/builtin/packages/blaspp/package.py index d43ab4de6bb269..78a2fce1d66ef4 100644 --- a/var/spack/repos/builtin/packages/blaspp/package.py +++ b/var/spack/repos/builtin/packages/blaspp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,12 @@ class Blaspp(CMakePackage, CudaPackage, ROCmPackage): url = "https://github.com/icl-utk-edu/blaspp/releases/download/v2023.01.00/blaspp-2023.01.00.tar.gz" maintainers("teonnik", "Sely85", "G-Ragghianti", "mgates3") + license("BSD-3-Clause") + version("master", branch="master") + version( + "2023.11.05", sha256="62dfc03ec07c0826e0466dc2c204b460caa929d53ad4f050cb132d92670be7ce" + ) version( "2023.08.25", sha256="1d9c7227a6d8776944aa866592142b7b51c6e4ba5529d168eb8ae2b329c47401" ) @@ -74,6 +79,10 @@ class Blaspp(CMakePackage, CudaPackage, ROCmPackage): requires("%oneapi", when="+sycl", msg="blaspp+sycl must be compiled with %oneapi") + patch( + "0001-fix-blaspp-build-error-with-rocm-6.0.0.patch", when="@2023.06.00: ^hip@6.0.0 +rocm" + ) + def cmake_args(self): spec = self.spec backend_config = "-Duse_cuda=%s" % ("+cuda" in spec) diff --git a/var/spack/repos/builtin/packages/blast-legacy/package.py b/var/spack/repos/builtin/packages/blast-legacy/package.py index 8b6df2ff85265d..bad9bdd26995d1 100644 --- a/var/spack/repos/builtin/packages/blast-legacy/package.py +++ b/var/spack/repos/builtin/packages/blast-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blast-plus/package.py b/var/spack/repos/builtin/packages/blast-plus/package.py index 8febe7d5f3a4dd..0506a4188316e6 100644 --- a/var/spack/repos/builtin/packages/blast-plus/package.py +++ b/var/spack/repos/builtin/packages/blast-plus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blast2go/package.py b/var/spack/repos/builtin/packages/blast2go/package.py index e277e34d5a6430..c099a7da6c8c83 100644 --- a/var/spack/repos/builtin/packages/blast2go/package.py +++ b/var/spack/repos/builtin/packages/blast2go/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blat/package.py b/var/spack/repos/builtin/packages/blat/package.py index 477cd21ad8ed28..5246c0eee7c927 100644 --- a/var/spack/repos/builtin/packages/blat/package.py +++ b/var/spack/repos/builtin/packages/blat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blaze/package.py b/var/spack/repos/builtin/packages/blaze/package.py index 0dfef19fe16f3d..e2762147f5c0e4 100644 --- a/var/spack/repos/builtin/packages/blaze/package.py +++ b/var/spack/repos/builtin/packages/blaze/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blis/package.py b/var/spack/repos/builtin/packages/blis/package.py index c3c10f59992ed0..da25f4e2c33a0a 100644 --- a/var/spack/repos/builtin/packages/blis/package.py +++ b/var/spack/repos/builtin/packages/blis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -113,6 +113,8 @@ class Blis(BlisBase): url = "https://github.com/flame/blis/archive/0.7.0.tar.gz" git = "https://github.com/flame/blis.git" + license("BSD-3-Clause") + version("master", branch="master") version("0.9.0", sha256="1135f664be7355427b91025075562805cdc6cc730d3173f83533b2c5dcc2f308") version("0.8.1", sha256="729694128719801e82fae7b5f2489ab73e4a467f46271beff09588c9265a697b") diff --git a/var/spack/repos/builtin/packages/bliss/package.py b/var/spack/repos/builtin/packages/bliss/package.py index b3cf80ffb87a70..664d5a14a6b574 100644 --- a/var/spack/repos/builtin/packages/bliss/package.py +++ b/var/spack/repos/builtin/packages/bliss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bliss(Package): homepage = "http://www.tcs.hut.fi/Software/bliss/" url = "http://www.tcs.hut.fi/Software/bliss/bliss-0.73.zip" + license("LGPL-3.0-only") + version("0.73", sha256="f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84") # Note: Bliss can also be built without gmp, but we don't support this yet diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 444f24889ecc61..5cba944af75bda 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Blitz(AutotoolsPackage): homepage = "https://github.com/blitzpp/blitz" url = "https://github.com/blitzpp/blitz/archive/1.0.2.tar.gz" + license("LGPL-3.0-only") + version("1.0.2", sha256="500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2") depends_on("python@3:", type="build") diff --git a/var/spack/repos/builtin/packages/blktrace/package.py b/var/spack/repos/builtin/packages/blktrace/package.py index d4e10bd0cbf371..99cbdd772543a4 100644 --- a/var/spack/repos/builtin/packages/blktrace/package.py +++ b/var/spack/repos/builtin/packages/blktrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Blktrace(MakefilePackage): homepage = "https://brick.kernel.dk" url = "https://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz" + license("GPL-2.0-only") + version("1.3.0", sha256="88c25b3bb3254ab029d4c62df5a9ab863a5c70918a604040da8fe39873c6bacb") version("1.2.0", sha256="d14029bc096026dacb206bf115c912dcdb795320b5aba6dff3e46d7f94c5242d") version("1.1.0", sha256="dc1e5da64b8fef454ec24aa4fcc760112b4ea7c973e2485961aa5668b3a8ce1d") diff --git a/var/spack/repos/builtin/packages/bloaty/package.py b/var/spack/repos/builtin/packages/bloaty/package.py index b1dab96806eded..ed940950b27b00 100644 --- a/var/spack/repos/builtin/packages/bloaty/package.py +++ b/var/spack/repos/builtin/packages/bloaty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Bloaty(CMakePackage): maintiners = ["cyrush"] + license("Apache-2.0") + version("1.1", sha256="a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f") diff --git a/var/spack/repos/builtin/packages/blogbench/package.py b/var/spack/repos/builtin/packages/blogbench/package.py index ba49da867f8ce1..3f03391b157290 100644 --- a/var/spack/repos/builtin/packages/blogbench/package.py +++ b/var/spack/repos/builtin/packages/blogbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/blt/package.py b/var/spack/repos/builtin/packages/blt/package.py index 95b78f923a910c..09331a9c036d40 100644 --- a/var/spack/repos/builtin/packages/blt/package.py +++ b/var/spack/repos/builtin/packages/blt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Blt(Package): maintainers("white238", "davidbeckingsale") + license("BSD-3-Clause") + version("develop", branch="develop") version("main", branch="main") # Note: 0.4.0+ contains a breaking change to BLT created targets diff --git a/var/spack/repos/builtin/packages/bmake/package.py b/var/spack/repos/builtin/packages/bmake/package.py index bccb1f1968a5d2..95558244604d34 100644 --- a/var/spack/repos/builtin/packages/bmake/package.py +++ b/var/spack/repos/builtin/packages/bmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bmake(Package): homepage = "https://www.crufty.net/help/sjg/bmake.htm" url = "https://www.crufty.net/ftp/pub/sjg/bmake-20180512.tar.gz" + license("BSD-2-Clause") + version("20230303", sha256="e8698724ac68c63f8e6682a93c3154c1d93dc6a9072f13c8cef07ece4ccd0ed6") version("20220330", sha256="4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092") version("20200710", sha256="6538fc4319ef79d178dca76d3b869f7aa93a9bb7b510df08a7d872c01a56b76c") diff --git a/var/spack/repos/builtin/packages/bmi/package.py b/var/spack/repos/builtin/packages/bmi/package.py index f8876dbefa3fd2..5ae430148c2c09 100644 --- a/var/spack/repos/builtin/packages/bmi/package.py +++ b/var/spack/repos/builtin/packages/bmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bmi(AutotoolsPackage): maintainers("carns") + license("LGPL-2.1-or-later") + version("main", branch="main") version("2.8.1", sha256="28aa4341f0456cf20ee762f712d7c749ab8f864003329f9327c18ea03fc7ffdb") diff --git a/var/spack/repos/builtin/packages/bml/package.py b/var/spack/repos/builtin/packages/bml/package.py index ae42974be33ac8..2822968fc63e5d 100644 --- a/var/spack/repos/builtin/packages/bml/package.py +++ b/var/spack/repos/builtin/packages/bml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Bml(CMakePackage): maintainers("jeanlucf22") + license("BSD-3-Clause") + version("master", branch="master") version("2.2.0", sha256="41703eee605bcb0ce3bcb5dde5914363aaa382393138ab24f02acf84f670fad0") version("2.1.2", sha256="d5bb4726759eb35ec66fae7b6ce8b4978cee33fa879aed314bf7aa1fa7eece91") diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 6cb3fbfc670775..64ad8c100e0acc 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Bohrium(CMakePackage, CudaPackage): maintainers("mfherbst") + license("LGPL-3.0-only") + # # Versions # @@ -117,8 +119,6 @@ def cmake_args(self): # different hosts. args = [ - # Choose a particular python version - "-DPYTHON_EXECUTABLE:FILEPATH=" + spec["python"].command.path, # # Hard-disable Jupyter, since this would override a config # file in the user's home directory in some cases during diff --git a/var/spack/repos/builtin/packages/boinc-client/package.py b/var/spack/repos/builtin/packages/boinc-client/package.py index f767bfd108da76..4b4ec8d7c369d8 100644 --- a/var/spack/repos/builtin/packages/boinc-client/package.py +++ b/var/spack/repos/builtin/packages/boinc-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class BoincClient(AutotoolsPackage): homepage = "https://boinc.berkeley.edu/" url = "https://github.com/BOINC/boinc/archive/client_release/7.16/7.16.5.tar.gz" + license("LGPL-3.0-only") + version("7.16.5", sha256="33db60991b253e717c6124cce4750ae7729eaab4e54ec718b9e37f87012d668a") variant("manager", default=False, description="Builds the client manager") diff --git a/var/spack/repos/builtin/packages/bolt/package.py b/var/spack/repos/builtin/packages/bolt/package.py index e575ee6cfd67de..0c37acc5538656 100644 --- a/var/spack/repos/builtin/packages/bolt/package.py +++ b/var/spack/repos/builtin/packages/bolt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Bolt(CMakePackage): tags = ["e4s"] + license("LGPL-2.1-or-later") + version("main", branch="main") version("2.0", sha256="f84b6a525953edbaa5d28748ef3ab172a3b6f6899b07092065ba7d1ccc6eb5ac") version("1.0.1", sha256="769e30dfc4042cee7ebbdadd23cf08796c03bcd8b335f516dc8cbc3f8adfa597") diff --git a/var/spack/repos/builtin/packages/bonniepp/package.py b/var/spack/repos/builtin/packages/bonniepp/package.py index 397c081a1f2e25..55dba48278ae5e 100644 --- a/var/spack/repos/builtin/packages/bonniepp/package.py +++ b/var/spack/repos/builtin/packages/bonniepp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py index d701ad89dc64a5..6a145c30de43bf 100644 --- a/var/spack/repos/builtin/packages/bookleaf-cpp/package.py +++ b/var/spack/repos/builtin/packages/bookleaf-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class BookleafCpp(CMakePackage): url = "https://github.com/UK-MAC/BookLeaf_Cpp/archive/v2.0.tar.gz" git = "https://github.com/UK-MAC/BookLeaf_Cpp.git" + license("GPL-3.0-or-later") + version("develop", branch="develop") version("2.0.2", sha256="787ade5045415d71d9bad55fe9f93598f3a0548d13e2ff80e752cc99f62fe6d3") diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index d236c5c5524c72..7369b0e8b5bed4 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,8 +26,11 @@ class Boost(Package): list_depth = 1 maintainers("hainest") + license("BSL-1.0") + version("develop", branch="develop", submodules=True) version("1.83.0", sha256="6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e") + version("1.84.0", sha256="cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454") version("1.82.0", sha256="a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6") version("1.81.0", sha256="71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa") version("1.80.0", sha256="1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0") @@ -169,7 +172,7 @@ def libs(self): variant( "cxxstd", - default="98", + default="11", values=( "98", "11", @@ -185,6 +188,10 @@ def libs(self): multi=False, description="Use the specified C++ standard when building.", ) + + # 1.84.0 dropped support for 98/03 + conflicts("cxxstd=98", when="@1.84.0:") + variant("debug", default=False, description="Switch to the debug version of Boost") variant("shared", default=True, description="Additionally build shared libraries") variant( diff --git a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py index b4f8acb0eec924..e940d648b3bb7f 100644 --- a/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py +++ b/var/spack/repos/builtin/packages/boostmplcartesianproduct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/botan/package.py b/var/spack/repos/builtin/packages/botan/package.py index 0967c8b032d7ca..e768fa7395c17d 100644 --- a/var/spack/repos/builtin/packages/botan/package.py +++ b/var/spack/repos/builtin/packages/botan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Botan(MakefilePackage): maintainers("aumuell") + license("BSD-2-Clause") + version("3.2.0", sha256="049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3") version("3.1.1", sha256="30c84fe919936a98fef5331f246c62aa2c0e4d2085b2d4511207f6a20afa3a6b") version("3.1.0", sha256="4e18e755a8bbc6bf96fac916fbf072ecd06740c72a72017c27162e4c0b4725fe") diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index 55e6f53cb52b1a..2df76062168e41 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Bowtie(MakefilePackage): homepage = "https://sourceforge.net/projects/bowtie-bio/" url = "https://github.com/BenLangmead/bowtie/archive/v1.2.0.tar.gz" + license("Artistic-2.0") + version("1.3.1", sha256="147d9fe9652f7c5f351bfc0eb012e06981986fb43bd6bdfe88a95c02eabc6573") version("1.3.0", sha256="d7c2d982a67884909f284a0ff150b56b20127cd7a1ced461c3c4c03e6a6374c5") version("1.2.3", sha256="86402114caeacbb3a3030509cb59f0b7e96361c7b3ee2dd50e2cd68200898823") diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py index 4a26602a742c01..a17d6749abf67a 100644 --- a/var/spack/repos/builtin/packages/bowtie2/package.py +++ b/var/spack/repos/builtin/packages/bowtie2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class Bowtie2(MakefilePackage): homepage = "http://bowtie-bio.sourceforge.net/bowtie2/index.shtml" url = "http://downloads.sourceforge.net/project/bowtie-bio/bowtie2/2.3.1/bowtie2-2.3.1-source.zip" + license("GPL-3.0-or-later") + + version("2.5.2", sha256="2c47a7da0a507c68319b307cdd15dee385127cc817d6bbf1d357af8d8af578ef") version("2.5.1", sha256="cb6cbbbb5a7167a2f21a3d63cb9774336361f540e1ec3d8ff907f955c35f71b8") version("2.4.5", sha256="d3cbd5f323393b5649aea10325d7c4b77f02035a8b204e5ac18eba95236e076a") version("2.4.2", sha256="4cc555eeeeb8ae2d47aaa1551f3f01b57f567a013e4e0d1f30e90f462865027e") diff --git a/var/spack/repos/builtin/packages/boxlib/package.py b/var/spack/repos/builtin/packages/boxlib/package.py index aa82407333a665..4d67b338e21f7a 100644 --- a/var/spack/repos/builtin/packages/boxlib/package.py +++ b/var/spack/repos/builtin/packages/boxlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Boxlib(CMakePackage): homepage = "https://ccse.lbl.gov/BoxLib/" url = "https://github.com/BoxLib-Codes/BoxLib/archive/16.12.2.tar.gz" + license("BSD-3-Clause-LBNL") + version("16.12.2", sha256="e87faeccfcb14b3436d36c45fcd9f46ea20f65298d35c6db2a80d6332b036dd2") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/bpp-core/package.py b/var/spack/repos/builtin/packages/bpp-core/package.py index 6a64270dc299a3..c1bd5c19d9f8a7 100644 --- a/var/spack/repos/builtin/packages/bpp-core/package.py +++ b/var/spack/repos/builtin/packages/bpp-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class BppCore(CMakePackage): maintainers("snehring") + license("CECILL-2.0") + version("2.4.1", sha256="1150b8ced22cff23dd4770d7c23fad11239070b44007740e77407f0d746c0af6") version( "2.2.0", diff --git a/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py b/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py index eea8227236a618..bdcd4c186bba8e 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl-omics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class BppPhylOmics(CMakePackage): homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Installation" url = "https://github.com/BioPP/bpp-phyl-omics/archive/v2.4.1.tar.gz" + license("CECILL-2.0") + version("2.4.1", sha256="fb0908422e59c71065db874e68d5c71acddf66d8a51776f7e04a5f8d5f0f6577") version("2.4.0", sha256="56cc0da613e72dbb8d0ed10d8209e182804a850fd96df1481e4710df97f18435") version("2.3.2", sha256="2320e2d33f7bc66bd1a1f0771a8d85e41ad3cec0347cef0f09463ba86f6efa96") diff --git a/var/spack/repos/builtin/packages/bpp-phyl/package.py b/var/spack/repos/builtin/packages/bpp-phyl/package.py index 62468fe869b4a2..78c9d3aab95d36 100644 --- a/var/spack/repos/builtin/packages/bpp-phyl/package.py +++ b/var/spack/repos/builtin/packages/bpp-phyl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class BppPhyl(CMakePackage): maintainers("snehring") + license("CECILL-2.0") + version("2.4.1", sha256="e7bf7d4570f756b7773904ffa600ffcd77c965553ddb5cbc252092d1da962ff2") version( "2.2.0", diff --git a/var/spack/repos/builtin/packages/bpp-popgen/package.py b/var/spack/repos/builtin/packages/bpp-popgen/package.py index cd22a5115d1ec8..6aa6a9a2ca7a80 100644 --- a/var/spack/repos/builtin/packages/bpp-popgen/package.py +++ b/var/spack/repos/builtin/packages/bpp-popgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class BppPopgen(CMakePackage): maintainers("snehring") + license("CECILL-2.0") + version("2.4.1", sha256="03b57d71a63c8fa7f11c085e531d0d691fc1d40d4ea541070dabde0ab3baf413") depends_on("bpp-seq") diff --git a/var/spack/repos/builtin/packages/bpp-seq-omics/package.py b/var/spack/repos/builtin/packages/bpp-seq-omics/package.py index 21a32a86735c73..5051043206154b 100644 --- a/var/spack/repos/builtin/packages/bpp-seq-omics/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq-omics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class BppSeqOmics(CMakePackage): homepage = "http://biopp.univ-montp2.fr/wiki/index.php/Installation" url = "https://github.com/BioPP/bpp-seq-omics/archive/v2.4.1.tar.gz" + license("CECILL-2.0") + version("2.4.1", sha256="200da925b42065998d825f0b2a37e26b00a865883c85bc332beb3a94cae1e08b") version("2.4.0", sha256="3217c7d6253f32c101d628aa039f2b3c49c3990de46c6842f2b88637da408e21") version("2.3.2", sha256="2254ffe181bb7582b73ca186cd366c321423177ea07866fd7c04c8a4bbcf5ac3") diff --git a/var/spack/repos/builtin/packages/bpp-seq/package.py b/var/spack/repos/builtin/packages/bpp-seq/package.py index 16c747fc0fb2dd..9d6351508e1ec3 100644 --- a/var/spack/repos/builtin/packages/bpp-seq/package.py +++ b/var/spack/repos/builtin/packages/bpp-seq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class BppSeq(CMakePackage): maintainers("snehring") + license("CECILL-2.0") + version("2.4.1", sha256="dbfcb04803e4b7f08f9f159da8a947c91906c3ca8b20683ac193f6dc524d4655") version( "2.2.0", diff --git a/var/spack/repos/builtin/packages/bpp-suite/package.py b/var/spack/repos/builtin/packages/bpp-suite/package.py index 4e6630dd903521..81e213fd050aa8 100644 --- a/var/spack/repos/builtin/packages/bpp-suite/package.py +++ b/var/spack/repos/builtin/packages/bpp-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class BppSuite(CMakePackage): maintainers("snehring") + license("CECILL-2.0") + version("2.4.1", sha256="0485adcc17e37439069d27e4fac144e5ae38036ba21f31e6d21f070ce4ea5199") version( "2.2.0", diff --git a/var/spack/repos/builtin/packages/bracken/package.py b/var/spack/repos/builtin/packages/bracken/package.py index b12d7bf75ac50c..e265fa3188909f 100644 --- a/var/spack/repos/builtin/packages/bracken/package.py +++ b/var/spack/repos/builtin/packages/bracken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Bracken(Package): homepage = "https://ccb.jhu.edu/software/bracken" url = "https://github.com/jenniferlu717/Bracken/archive/v2.7.tar.gz" + license("GPL-3.0-only") + version("2.8", sha256="b0c8a803cc020b7d1cbca47b53e71e874d9688b836911e4a4b71b0e4b826b61a") version("2.7", sha256="1795ecd9f9e5582f37549795ba68854780936110a2f6f285c3e626d448cd1532") diff --git a/var/spack/repos/builtin/packages/brahma/package.py b/var/spack/repos/builtin/packages/brahma/package.py index 3932de204f7c92..303a6b4e0c8110 100644 --- a/var/spack/repos/builtin/packages/brahma/package.py +++ b/var/spack/repos/builtin/packages/brahma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,13 +13,18 @@ class Brahma(CMakePackage): git = "https://github.com/hariharan-devarajan/brahma.git" maintainers("hariharan-devarajan") + license("MIT") + version("develop", branch="dev") version("master", branch="master") + version("0.0.2", tag="v0.0.2", commit="4a36d5c08787d41c939fa1b987344b69d9ef97a6") version("0.0.1", tag="v0.0.1", commit="15156036f14e36511dfc3f3751dc953540526a2b") variant("mpi", default=False, description="Enable MPI support") - depends_on("cpp-logger@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("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("mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index efba756b2d41db..d9db1868840b0f 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Braker(Package): url = "https://github.com/Gaius-Augustus/BRAKER/archive/v2.1.4.tar.gz" list_url = "http://bioinf.uni-greifswald.de/augustus/binaries/old" + license("Artistic-1.0") + version("2.1.6", sha256="eef3c4037364472988a010322cbd79b5171158f9c016f4383809adade4866c06") version("2.1.4", sha256="d48af5649cc879343046f9ddf180fe2c709b5810e0b78cf314bf298514d31d52") version( diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py index fd28bd3fb79e20..327a8d9c1696b1 100644 --- a/var/spack/repos/builtin/packages/branson/package.py +++ b/var/spack/repos/builtin/packages/branson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Branson(CMakePackage): tags = ["proxy-app"] + license("MIT") + version("develop", branch="develop") version( diff --git a/var/spack/repos/builtin/packages/breakdancer/package.py b/var/spack/repos/builtin/packages/breakdancer/package.py index 743e7ed81ca27a..3b5d4147260973 100644 --- a/var/spack/repos/builtin/packages/breakdancer/package.py +++ b/var/spack/repos/builtin/packages/breakdancer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bref3/package.py b/var/spack/repos/builtin/packages/bref3/package.py index c7e80500b83031..dfa74ecc2fe6c3 100644 --- a/var/spack/repos/builtin/packages/bref3/package.py +++ b/var/spack/repos/builtin/packages/bref3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/breseq/package.py b/var/spack/repos/builtin/packages/breseq/package.py index 865c1f333dc3d2..acf0bb71bc7e2b 100644 --- a/var/spack/repos/builtin/packages/breseq/package.py +++ b/var/spack/repos/builtin/packages/breseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Breseq(AutotoolsPackage): homepage = "https://barricklab.org/breseq" url = "https://github.com/barricklab/breseq/archive/v0.31.1.tar.gz" + license("GPL-2.0-or-later") + version("0.38.1", sha256="2b5d0aa9c751881c3ee31c0384953156b848b80d2d2d9c451763d74da0465902") version("0.33.2", sha256="c698d2d25cc7ed251ff916343a8c04f79b5540281288cb7c955f458255ac21de") version("0.33.1", sha256="e24a50e254ad026c519747313b9e42bbeb32bd766a6a06ed369bd5b9dc50e84d") diff --git a/var/spack/repos/builtin/packages/bricks/package.py b/var/spack/repos/builtin/packages/bricks/package.py index ccbaccdf51cde4..af1bfa1c04ba54 100644 --- a/var/spack/repos/builtin/packages/bricks/package.py +++ b/var/spack/repos/builtin/packages/bricks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Bricks(CMakePackage): # List of GitHub accounts to notify when the package is updated. maintainers("ztuowen", "drhansj") + license("MIT") + version("r0.1", branch="r0.1") version("2023.08.25", commit="d81725055c117c4b63a1b3835c6b634768b5bea7") # no official release diff --git a/var/spack/repos/builtin/packages/bridger/package.py b/var/spack/repos/builtin/packages/bridger/package.py index 8461474d1efa51..d1c607238f741e 100644 --- a/var/spack/repos/builtin/packages/bridger/package.py +++ b/var/spack/repos/builtin/packages/bridger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bridger(MakefilePackage, SourceforgePackage): homepage = "https://sourceforge.net/projects/rnaseqassembly/" sourceforge_mirror_path = "rnaseqassembly/Bridger_r2014-12-01.tar.gz" + license("GPL-2.0-only") + version( "2014-12-01", sha256="8fbec8603ea8ad2162cbd0c658e4e0a4af6453bdb53310b4b7e0d112e40b5737" ) diff --git a/var/spack/repos/builtin/packages/brigand/package.py b/var/spack/repos/builtin/packages/brigand/package.py index 694d613b6a097a..0bb8f27abfa63d 100644 --- a/var/spack/repos/builtin/packages/brigand/package.py +++ b/var/spack/repos/builtin/packages/brigand/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Brigand(CMakePackage): maintainers("nilsvu") + license("BSL-1.0") + version("master", branch="master") version("1.3.0", sha256="2468107c5b9ab0b56d84797dfc6636d0aae0507ae9cd6cb1acc1de85e5787acd") version("1.2.0", sha256="4287fa7278cc000a63e90f1a1b903952b7f606b1a3cf95c23a422d2fe96ca50d") diff --git a/var/spack/repos/builtin/packages/brltty/package.py b/var/spack/repos/builtin/packages/brltty/package.py index 5e29e6ed2d498a..4e94ef3651afc5 100644 --- a/var/spack/repos/builtin/packages/brltty/package.py +++ b/var/spack/repos/builtin/packages/brltty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Brltty(AutotoolsPackage): homepage = "https://brltty.app/" url = "https://github.com/brltty/brltty/archive/BRLTTY-6.0.tar.gz" + license("LGPL-2.1-or-later") + version("6.0", sha256="acfea5274bdc9230b0ea1a87f8796e241615d4d2c1ba08d87601b9d116c7804c") version("5.6", sha256="74f35043943525396b340b9f65f0d73c3cc4054a8f63d1c685f27ccf59f46c5d") version("5.5", sha256="cd80a0d225f13779791dc3a72d7f137c06c48e5f2c9600e80a565d2378422207") diff --git a/var/spack/repos/builtin/packages/brotli/package.py b/var/spack/repos/builtin/packages/brotli/package.py index 0456fba3fe16f8..6b78c6c9642c42 100644 --- a/var/spack/repos/builtin/packages/brotli/package.py +++ b/var/spack/repos/builtin/packages/brotli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Brotli(CMakePackage): homepage = "https://github.com/google/brotli" url = "https://github.com/google/brotli/archive/v1.0.7.tar.gz" + license("MIT") + version("1.0.9", sha256="f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46") version("1.0.7", sha256="4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c") diff --git a/var/spack/repos/builtin/packages/brpc/package.py b/var/spack/repos/builtin/packages/brpc/package.py index da2ea3480b927e..299622b7df7f54 100644 --- a/var/spack/repos/builtin/packages/brpc/package.py +++ b/var/spack/repos/builtin/packages/brpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Brpc(CMakePackage): homepage = "https://github.com/apache/incubator-brpc" url = "https://github.com/apache/incubator-brpc/archive/0.9.7.tar.gz" + license("BSL-1.0") + version("0.9.7", sha256="722cd342baf3b05189ca78ecf6c56ea6ffec22e62fc2938335e4e5bab545a49c") version("0.9.6", sha256="b872ca844999e0ba768acd823b409761f126590fb34cb0183da915a595161446") version("0.9.5", sha256="11ca8942242a4c542c11345b7463a4aea33a11ca33e91d9a2f64f126df8c70e9") diff --git a/var/spack/repos/builtin/packages/brunsli/package.py b/var/spack/repos/builtin/packages/brunsli/package.py index 126da9bbae69fa..c0ce3de05d65a3 100644 --- a/var/spack/repos/builtin/packages/brunsli/package.py +++ b/var/spack/repos/builtin/packages/brunsli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Brunsli(CMakePackage): homepage = "https://github.com/google/brunsli" git = "https://github.com/google/brunsli.git" + license("MIT") + version("0.1", tag="v0.1", commit="8a0e9b8ca2e3e089731c95a1da7ce8a3180e667c", submodules=True) depends_on("cmake@3.1:", type="build") diff --git a/var/spack/repos/builtin/packages/brynet/package.py b/var/spack/repos/builtin/packages/brynet/package.py index daf83463e18f97..a6a81363b5e44d 100644 --- a/var/spack/repos/builtin/packages/brynet/package.py +++ b/var/spack/repos/builtin/packages/brynet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Brynet(CMakePackage): homepage = "https://github.com/IronsDu/brynet" url = "https://github.com/IronsDu/brynet/archive/v1.0.8.tar.gz" + license("MIT") + version("1.12.2", sha256="b8b740cae39804d1e7037866046321065856c0ea9f565d26f67aeccc7ccd3d51") version("1.10.0", sha256="a7bc20c4a2cc2f0f29af56e9355b8769256785850ddedcef226e9562e97d05cf") version("1.0.8", sha256="e37dee5fa14acec99bdd7ce8530a00ff5116f608f0a5401cd2e32e10f23975fc") diff --git a/var/spack/repos/builtin/packages/bsseeker2/package.py b/var/spack/repos/builtin/packages/bsseeker2/package.py index c34f19bb1f5a6f..dca7a8b9422e7d 100644 --- a/var/spack/repos/builtin/packages/bsseeker2/package.py +++ b/var/spack/repos/builtin/packages/bsseeker2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bsseeker2(Package): homepage = "http://pellegrini.mcdb.ucla.edu/BS_Seeker2" url = "https://github.com/BSSeeker/BSseeker2/archive/BSseeker2-v2.1.8.tar.gz" + license("MIT") + version("2.1.8", sha256="34ebedce36a0fca9e22405d4c2c20bc978439d4a34d1d543657fbc53ff847934") version( "2.1.7", diff --git a/var/spack/repos/builtin/packages/btop/link-dl.patch b/var/spack/repos/builtin/packages/btop/link-dl.patch new file mode 100644 index 00000000000000..ff4d56949ec3e4 --- /dev/null +++ b/var/spack/repos/builtin/packages/btop/link-dl.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt 2024-01-07 15:23:01.000000000 +0100 ++++ b/CMakeLists.txt 2024-01-18 10:55:06.245357111 +0100 +@@ -150,6 +150,9 @@ + + target_link_libraries(btop ROCm) + endif() ++ if(NOT BTOP_STATIC) ++ target_link_libraries(btop ${CMAKE_DL_LIBS}) ++ endif() + endif() + + if(BTOP_USE_MOLD) diff --git a/var/spack/repos/builtin/packages/btop/package.py b/var/spack/repos/builtin/packages/btop/package.py index 75021afed947aa..18d9fea669390a 100644 --- a/var/spack/repos/builtin/packages/btop/package.py +++ b/var/spack/repos/builtin/packages/btop/package.py @@ -1,11 +1,12 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.build_systems import cmake, makefile from spack.package import * -class Btop(MakefilePackage): +class Btop(MakefilePackage, CMakePackage): """Resource monitor that shows usage and stats for processor, memory, disks, network and processes. """ @@ -15,12 +16,29 @@ class Btop(MakefilePackage): maintainers("alalazo") + license("Apache-2.0") + + version("1.3.0", sha256="375e078ce2091969f0cd14030620bd1a94987451cf7a73859127a786006a32cf") version("1.2.13", sha256="668dc4782432564c35ad0d32748f972248cc5c5448c9009faeb3445282920e02") - conflicts("%gcc@:9", msg="C++ 20 is required") + build_system("makefile", conditional("cmake", when="@1.3.0:"), default="cmake") + + variant("gpu", default=False, description="Enable GPU support", when="build_system=cmake") + + # Fix linking GPU support, by adding an explicit "target_link_libraries" to ${CMAKE_DL_LIBS} + patch("link-dl.patch", when="+gpu") + + requires("%gcc@10:", "%clang@16:", policy="one_of", msg="C++ 20 is required") + +class MakefileBuilder(makefile.MakefileBuilder): build_targets = ["STATIC=true", "VERBOSE=true"] @property def install_targets(self): return [f"PREFIX={self.prefix}", "install"] + + +class CMakeBuilder(cmake.CMakeBuilder): + def cmake_args(self): + return [self.define_from_variant("BTOP_GPU", "gpu")] diff --git a/var/spack/repos/builtin/packages/bubblewrap/package.py b/var/spack/repos/builtin/packages/bubblewrap/package.py index e7da5a1cdf8ed2..5925aee4de499c 100644 --- a/var/spack/repos/builtin/packages/bubblewrap/package.py +++ b/var/spack/repos/builtin/packages/bubblewrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bubblewrap(AutotoolsPackage): ) maintainers("haampie") + license("LGPL-2.0-or-later") + version("0.8.0", sha256="957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a") version("0.7.0", sha256="764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc") version("0.6.2", sha256="8a0ec802d1b3e956c5bb0a40a81c9ce0b055a31bf30a8efa547433603b8af20b") diff --git a/var/spack/repos/builtin/packages/bucky/package.py b/var/spack/repos/builtin/packages/bucky/package.py index 601729e82e9679..ab28873ebb936e 100644 --- a/var/spack/repos/builtin/packages/bucky/package.py +++ b/var/spack/repos/builtin/packages/bucky/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/buddy/package.py b/var/spack/repos/builtin/packages/buddy/package.py index 243d8a21f19acc..3a9a6982f27a25 100644 --- a/var/spack/repos/builtin/packages/buddy/package.py +++ b/var/spack/repos/builtin/packages/buddy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bueno/package.py b/var/spack/repos/builtin/packages/bueno/package.py index 2fbb843251d1a1..f08d719ef8ecf2 100644 --- a/var/spack/repos/builtin/packages/bueno/package.py +++ b/var/spack/repos/builtin/packages/bueno/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Bueno(PythonPackage): maintainers("rbberger") + license("BSD-3-Clause") + version("master", branch="master") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/bufr/package.py b/var/spack/repos/builtin/packages/bufr/package.py index aa7c43229e1d36..cfc9c9d33209cb 100644 --- a/var/spack/repos/builtin/packages/bufr/package.py +++ b/var/spack/repos/builtin/packages/bufr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/bulker/package.py b/var/spack/repos/builtin/packages/bulker/package.py index 5e3afd3985eeb7..cefc429629e23e 100644 --- a/var/spack/repos/builtin/packages/bulker/package.py +++ b/var/spack/repos/builtin/packages/bulker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Bulker(PythonPackage): homepage = "https://bulker.databio.org/" pypi = "bulker/bulker-0.7.3.tar.gz" + license("BSD-2-Clause") + version("0.7.3", sha256="a7a3a97184d50d2247dc3b116f31f90c27435d9872c6845152ff46f5c4e39d50") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/bump2version/package.py b/var/spack/repos/builtin/packages/bump2version/package.py index 15094a35b07052..6a58bda6ec86ec 100644 --- a/var/spack/repos/builtin/packages/bump2version/package.py +++ b/var/spack/repos/builtin/packages/bump2version/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Bump2version(PythonPackage): depends_on("py-setuptools", type="build") + license("MIT") + version("1.0.1", sha256="762cb2bfad61f4ec8e2bdf452c7c267416f8c70dd9ecb1653fd0bbb01fa936e6") diff --git a/var/spack/repos/builtin/packages/bumpversion/package.py b/var/spack/repos/builtin/packages/bumpversion/package.py index 116c38a451e0ba..3d99571a745fa0 100644 --- a/var/spack/repos/builtin/packages/bumpversion/package.py +++ b/var/spack/repos/builtin/packages/bumpversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Bumpversion(PythonPackage): pypi = "bumpversion/bumpversion-0.5.0.tar.gz" + license("MIT") + version("0.6.0", sha256="4ba55e4080d373f80177b4dabef146c07ce73c7d1377aabf9d3c3ae1f94584a6") version("0.5.3", sha256="6744c873dd7aafc24453d8b6a1a0d6d109faf63cd0cd19cb78fd46e74932c77e") version("0.5.0", sha256="030832b9b46848e1c1ac6678dba8242a021e35e908b65565800c9650291117dc") diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py index 5f6a6b7cf0e664..608806c15caae1 100644 --- a/var/spack/repos/builtin/packages/busco/package.py +++ b/var/spack/repos/builtin/packages/busco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Busco(PythonPackage): git = "https://gitlab.com/ezlab/busco.git" maintainers("snehring") + license("MIT") + version("5.4.3", sha256="8b92dcc32691f7c1629aaaa7bd54f96073273ba7de5a3a8586fe552c51a9d36a") version("4.1.3", sha256="08ded26aeb4f6aef791cd88524c3c00792a054c7672ea05219f468d495e7b072") diff --git a/var/spack/repos/builtin/packages/busybox/package.py b/var/spack/repos/builtin/packages/busybox/package.py index a71e28907fae8b..d65a74730c9197 100644 --- a/var/spack/repos/builtin/packages/busybox/package.py +++ b/var/spack/repos/builtin/packages/busybox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Busybox(MakefilePackage): homepage = "https://busybox.net" url = "https://busybox.net/downloads/busybox-1.31.0.tar.bz2" + license("GPL-2.0-only") + version("1.36.0", sha256="542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5") version("1.31.1", sha256="d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998") version("1.31.0", sha256="0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99") diff --git a/var/spack/repos/builtin/packages/butter/package.py b/var/spack/repos/builtin/packages/butter/package.py index b2d8d8a6facd7b..94a78aa46425f5 100644 --- a/var/spack/repos/builtin/packages/butter/package.py +++ b/var/spack/repos/builtin/packages/butter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Butter(Package): homepage = "https://github.com/MikeAxtell/butter" url = "https://github.com/MikeAxtell/butter/archive/v0.3.3.tar.gz" + license("GPL-3.0-only") + version("0.3.3", sha256="862cbe06d51fdefca18e5fe4cfa8e4df6ce92686ccbc389affe05b199ea9243b") depends_on("perl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/butterflypack/package.py b/var/spack/repos/builtin/packages/butterflypack/package.py index 746fa32082d894..048b0a02431eca 100644 --- a/var/spack/repos/builtin/packages/butterflypack/package.py +++ b/var/spack/repos/builtin/packages/butterflypack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Butterflypack(CMakePackage): url = "https://github.com/liuyangzhuan/ButterflyPACK/archive/v2.2.0.tar.gz" maintainers("liuyangzhuan") + license("BSD-3-Clause-LBNL") + version("master", branch="master") version("2.4.0", sha256="12d04e7101b2c8292b5c62d9f42b5cd1e8a3c5af639d2665596e3e4255fd0804") version("2.2.2", sha256="73f67073e4291877f1eee19483a8a7b3c761eaf79a75805d52105ceedead85ea") diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 49e7f40269b69f..ad003282995649 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Bwa(Package): homepage = "https://github.com/lh3/bwa" url = "https://github.com/lh3/bwa/releases/download/v0.7.15/bwa-0.7.15.tar.bz2" + license("GPL-3.0-only") + version("0.7.17", sha256="de1b4d4e745c0b7fc3e107b5155a51ac063011d33a5d82696331ecf4bed8d0fd") version("0.7.15", sha256="2f56afefa49acc9bf45f12edb58e412565086cc20be098b8bf15ec07de8c0515") version("0.7.13", sha256="559b3c63266e5d5351f7665268263dbb9592f3c1c4569e7a4a75a15f17f0aedc") diff --git a/var/spack/repos/builtin/packages/bwtool/package.py b/var/spack/repos/builtin/packages/bwtool/package.py index 16ec70d0655607..a966b41a34a33b 100644 --- a/var/spack/repos/builtin/packages/bwtool/package.py +++ b/var/spack/repos/builtin/packages/bwtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/byacc/package.py b/var/spack/repos/builtin/packages/byacc/package.py index 5d82e2b5ac8365..3499a9db6d1016 100644 --- a/var/spack/repos/builtin/packages/byacc/package.py +++ b/var/spack/repos/builtin/packages/byacc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Byacc(AutotoolsPackage): homepage = "https://invisible-island.net/byacc/byacc.html" url = "ftp://ftp.invisible-island.net/pub/byacc/byacc-20210808.tgz" + license("Public-Domain") + # Check FTP directory ftp://ftp.invisible-island.net/byacc/ to find the latest version version("20210808", sha256="f158529be9d0594263c7f11a87616a49ea23e55ac63691252a2304fbbc7d3a83") diff --git a/var/spack/repos/builtin/packages/byobu/package.py b/var/spack/repos/builtin/packages/byobu/package.py index 5383042722390d..8fecfdcfb7c616 100644 --- a/var/spack/repos/builtin/packages/byobu/package.py +++ b/var/spack/repos/builtin/packages/byobu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Byobu(AutotoolsPackage): maintainers("matthiasdiener") + license("GPL-3.0-or-later") + version("5.131", sha256="77ac751ae79d8e3f0377ac64b64bc9738fa68d68466b8d2ff652b63b1d985e52") version("5.127", sha256="4bafc7cb69ff5b0ab6998816d58cd1ef7175e5de75abc1dd7ffd6d5288a4f63b") version("5.125", sha256="5022c82705a5d57f1d4e8dcb1819fd04628af2d4b4618b7d44fa27ebfcdda9db") diff --git a/var/spack/repos/builtin/packages/byte-unixbench/package.py b/var/spack/repos/builtin/packages/byte-unixbench/package.py index 6cd3ec223bd6ec..f9332bf853cae3 100644 --- a/var/spack/repos/builtin/packages/byte-unixbench/package.py +++ b/var/spack/repos/builtin/packages/byte-unixbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/byteman/package.py b/var/spack/repos/builtin/packages/byteman/package.py index a36e26e1991c31..eed7dba2de0be6 100644 --- a/var/spack/repos/builtin/packages/byteman/package.py +++ b/var/spack/repos/builtin/packages/byteman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Byteman(MavenPackage): homepage = "https://www.jboss.org/byteman" url = "https://github.com/bytemanproject/byteman/archive/4.0.12.tar.gz" + license("BSD-3-Clause") + version("4.0.12", sha256="72fdc904d7b8df9e743fbb5ae84e51ffc81d32b6e0b0b80fc7ac165dd8c9c7c2") version("4.0.11", sha256="8e4af6019702c8b22f354962f35f197f9ba2c8699235aac77ebd9263ac12261b") version("4.0.10", sha256="1b3c9e66fc3f230e407904db1ac43eb5cd4c33620f0d0f9f6c0cb23e4d28784e") diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index 58f598ac15286d..e9d56f124f49da 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Bzip2(Package, SourcewarePackage): executables = [r"^bzip2$"] tags = ["windows"] + license("bzip2-1.0.6") + version("1.0.8", sha256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269") version("1.0.7", sha256="e768a87c5b1a79511499beb41500bcc4caf203726fff46a6f5f9ad27fe08ab2b") version("1.0.6", sha256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd") @@ -44,6 +46,10 @@ class Bzip2(Package, SourcewarePackage): if sys.platform != "win32": depends_on("diffutils", type="build") + depends_on("gmake", type="build", when="platform=linux") + depends_on("gmake", type="build", when="platform=cray") + depends_on("gmake", type="build", when="platform=darwin") + @classmethod def determine_version(cls, exe): output = Executable(exe)("--help", output=str, error=str) diff --git a/var/spack/repos/builtin/packages/c-ares/package.py b/var/spack/repos/builtin/packages/c-ares/package.py index f65fff2dacc1bd..ec3d832848db3b 100644 --- a/var/spack/repos/builtin/packages/c-ares/package.py +++ b/var/spack/repos/builtin/packages/c-ares/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class CAres(CMakePackage): url = "https://github.com/c-ares/c-ares/archive/cares-1_15_0.tar.gz" git = "https://github.com/c-ares/c-ares.git" + license("MIT") + version("master", branch="master") version("1.15.0", sha256="7deb7872cbd876c29036d5f37e30c4cbc3cc068d59d8b749ef85bb0736649f04") version("1.13.0", sha256="7c48c57706a38691041920e705d2a04426ad9c68d40edd600685323f214b2d57") diff --git a/var/spack/repos/builtin/packages/c-blosc/package.py b/var/spack/repos/builtin/packages/c-blosc/package.py index 31de7ef7ae35b1..ba6381f31786d6 100644 --- a/var/spack/repos/builtin/packages/c-blosc/package.py +++ b/var/spack/repos/builtin/packages/c-blosc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class CBlosc(CMakePackage): homepage = "https://www.blosc.org" url = "https://github.com/Blosc/c-blosc/archive/v1.11.1.tar.gz" + license("BSD-3-Clause") + version("1.21.5", sha256="32e61961bbf81ffea6ff30e9d70fca36c86178afd3e3cfa13376adec8c687509") version("1.21.4", sha256="e72bd03827b8564bbb3dc3ea0d0e689b4863871ce3861d946f2efd7a186ecf3e") version("1.21.2", sha256="e5b4ddb4403cbbad7aab6e9ff55762ef298729c8a793c6147160c771959ea2aa") diff --git a/var/spack/repos/builtin/packages/c-blosc2/package.py b/var/spack/repos/builtin/packages/c-blosc2/package.py index 4b745f426f1093..b90382cc120321 100644 --- a/var/spack/repos/builtin/packages/c-blosc2/package.py +++ b/var/spack/repos/builtin/packages/c-blosc2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class CBlosc2(CMakePackage): maintainers("ax3l", "robert-mijakovic") + license("BSD-3-Clause") + version("develop", branch="master") version("2.11.1", sha256="1e9923e0f026eb6e6caee608b4b9a523837806076fc79409055a6386cf5de1ea") version("2.10.5", sha256="a88f94bf839c1371aab8207a6a43698ceb92c72f65d0d7fe5b6e59f24c138b4d") diff --git a/var/spack/repos/builtin/packages/c-lime/package.py b/var/spack/repos/builtin/packages/c-lime/package.py index 058f809388de16..b4b2ee31ada224 100644 --- a/var/spack/repos/builtin/packages/c-lime/package.py +++ b/var/spack/repos/builtin/packages/c-lime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class CLime(AutotoolsPackage): homepage = "https://usqcd-software.github.io/c-lime/" url = "https://github.com/usqcd-software/c-lime/archive/qio2-3-9.tar.gz" + license("GPL-2.0-or-later") + version("2-3-9", sha256="7b9aeadd4dfec50e24da3e7e729f56abf95c9192612c41515fe27b2158773aac") diff --git a/var/spack/repos/builtin/packages/c-raft/package.py b/var/spack/repos/builtin/packages/c-raft/package.py index dcb22d1a6518bb..4e4480ba9c79c9 100644 --- a/var/spack/repos/builtin/packages/c-raft/package.py +++ b/var/spack/repos/builtin/packages/c-raft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/c/package.py b/var/spack/repos/builtin/packages/c/package.py index b44acfbc67a56b..d36fbd9ffe047c 100644 --- a/var/spack/repos/builtin/packages/c/package.py +++ b/var/spack/repos/builtin/packages/c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/c3d/package.py b/var/spack/repos/builtin/packages/c3d/package.py index d7f55d47d12fdc..ab4b2872ec8252 100644 --- a/var/spack/repos/builtin/packages/c3d/package.py +++ b/var/spack/repos/builtin/packages/c3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class C3d(CMakePackage): git = "https://github.com/pyushkevich/c3d.git" url = "https://github.com/pyushkevich/c3d/archive/refs/tags/v1.3.0.tar.gz" + license("GPL-3.0-or-later") + version("1.3.0", sha256="bd45482247fa4ac5ab98b3a775b5438390671e3e224a42f73967904b3895050d") depends_on("itk") diff --git a/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py b/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py index 8bc297fc91f422..2931508d84c787 100644 --- a/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py +++ b/var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cabana/package.py b/var/spack/repos/builtin/packages/cabana/package.py index ae4d4e9fca35aa..2327939bbbe7ff 100644 --- a/var/spack/repos/builtin/packages/cabana/package.py +++ b/var/spack/repos/builtin/packages/cabana/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cachefilesd/package.py b/var/spack/repos/builtin/packages/cachefilesd/package.py index 2e90c690c82536..d92ae8d6803936 100644 --- a/var/spack/repos/builtin/packages/cachefilesd/package.py +++ b/var/spack/repos/builtin/packages/cachefilesd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index b374931a84c802..5103368b1fa848 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Caffe(CMakePackage, CudaPackage): homepage = "https://caffe.berkeleyvision.org" url = "https://github.com/BVLC/caffe/archive/1.0.tar.gz" + license("BSD-2-Clause") + version("1.0", sha256="71d3c9eb8a183150f965a465824d01fe82826c22505f7aa314f700ace03fa77f") version("rc5", sha256="06592aa8f5254335df3e244dafacc15765e2c60479b4bf2e7c887e8e023802fb") version("rc4", sha256="018792411d75ee34b6107216550cca2a1d668d45cb366033ba3c647e6a3018df") diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index 530b4d49042d2c..e38fa1ff1b7e10 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cairo(AutotoolsPackage): homepage = "https://www.cairographics.org/" url = "https://www.cairographics.org/releases/cairo-1.16.0.tar.xz" + license("LGPL-2.1-or-later OR MPL-1.1", checked_by="tgamblin") + version( "1.17.4", sha256="74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705", diff --git a/var/spack/repos/builtin/packages/cairomm/package.py b/var/spack/repos/builtin/packages/cairomm/package.py index bdeabc9ecc091c..8812da63e61e58 100644 --- a/var/spack/repos/builtin/packages/cairomm/package.py +++ b/var/spack/repos/builtin/packages/cairomm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cairomm(AutotoolsPackage): homepage = "https://www.cairographics.org/cairomm/" url = "https://cairographics.org/releases/cairomm-1.6.4.tar.gz" + license("LGPL-2.0-or-later AND MPL-1.1") + version("1.6.4", sha256="3cb2c898d0ceb94ad2deb722b50a3a6ee46abdda741ecd6e5a40517c85ecea4c") version("1.6.2", sha256="068edc1743d92ff1d102141ba7597ba02a47379f9cb97799b0c3310848b56eff") diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 66bd9cc84cd0ad..f1ae9a92ccb96d 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Caliper(CMakePackage, CudaPackage, ROCmPackage): test_requires_compiler = True + license("BSD-3-Clause") + version("master", branch="master") version("2.10.0", sha256="14c4fb5edd5e67808d581523b4f8f05ace8549698c0e90d84b53171a77f58565") version("2.9.1", sha256="4771d630de505eff9227e0ec498d0da33ae6f9c34df23cb201b56181b8759e9e") @@ -127,7 +129,6 @@ def cmake_args(self): spec = self.spec args = [ - ("-DPYTHON_EXECUTABLE=%s" % spec["python"].command.path), "-DBUILD_TESTING=Off", "-DBUILD_DOCS=Off", self.define_from_variant("BUILD_SHARED_LIBS", "shared"), diff --git a/var/spack/repos/builtin/packages/callflow/package.py b/var/spack/repos/builtin/packages/callflow/package.py index 3c4d70f059b8e9..52fe1e4ef39002 100644 --- a/var/spack/repos/builtin/packages/callflow/package.py +++ b/var/spack/repos/builtin/packages/callflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Callflow(PythonPackage): maintainers("bhatiaharsh", "jarusified") + license("MIT") + version("develop", branch="develop") version("1.1.2", sha256="60d2327843469f42be9366ff31d7a6afc85021af4e38b7d6704b2d8c3da7ed36") version("1.1.1", sha256="a52e6e0697a406dfe391225d3cc3c5c5a12a6c86b68f0f8e47777c79fd45cb28") diff --git a/var/spack/repos/builtin/packages/callpath/package.py b/var/spack/repos/builtin/packages/callpath/package.py index f35eb8e8b5932f..29566c512f3f64 100644 --- a/var/spack/repos/builtin/packages/callpath/package.py +++ b/var/spack/repos/builtin/packages/callpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py index 85ce4b118c2d11..e9a80de93bc11a 100644 --- a/var/spack/repos/builtin/packages/camellia/package.py +++ b/var/spack/repos/builtin/packages/camellia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/camp/gcc-13-missing-header.patch b/var/spack/repos/builtin/packages/camp/gcc-13-missing-header.patch new file mode 100644 index 00000000000000..d3c642abe6c5fa --- /dev/null +++ b/var/spack/repos/builtin/packages/camp/gcc-13-missing-header.patch @@ -0,0 +1,24 @@ +diff --git a/include/camp/resource.hpp b/include/camp/resource.hpp +index 58df206..763aa20 100644 +--- a/include/camp/resource.hpp ++++ b/include/camp/resource.hpp +@@ -12,6 +12,7 @@ http://github.com/llnl/camp + #define __CAMP_RESOURCE_HPP + + #include ++#include + #include + #include + #include +diff --git a/include/camp/resource/host.hpp b/include/camp/resource/host.hpp +index c765175..4428c57 100644 +--- a/include/camp/resource/host.hpp ++++ b/include/camp/resource/host.hpp +@@ -13,6 +13,7 @@ http://github.com/llnl/camp + + #include "camp/resource/event.hpp" + #include "camp/resource/platform.hpp" ++#include + + namespace camp + { diff --git a/var/spack/repos/builtin/packages/camp/package.py b/var/spack/repos/builtin/packages/camp/package.py index a1bdc830d36eab..ec2f741173ab0c 100644 --- a/var/spack/repos/builtin/packages/camp/package.py +++ b/var/spack/repos/builtin/packages/camp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -38,6 +38,8 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage): maintainers("trws") + license("BSD-3-Clause") + version("main", branch="main", submodules="True") version("2022.10.1", sha256="2d12f1a46f5a6d01880fc075cfbd332e2cf296816a7c1aa12d4ee5644d386f02") version("2022.03.2", sha256="bc4aaeacfe8f2912e28f7a36fc731ab9e481bee15f2c6daf0cb208eed3f201eb") @@ -55,6 +57,8 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage): depends_on("blt", type="build") + patch("gcc-13-missing-header.patch", when="@:2022.10 %gcc@13:") + conflicts("^blt@:0.3.6", when="+rocm") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/camx/package.py b/var/spack/repos/builtin/packages/camx/package.py index ebc95911561b75..92b995dd736df5 100644 --- a/var/spack/repos/builtin/packages/camx/package.py +++ b/var/spack/repos/builtin/packages/camx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/canal/package.py b/var/spack/repos/builtin/packages/canal/package.py index c540e024b50425..c3e9bab96a7fab 100644 --- a/var/spack/repos/builtin/packages/canal/package.py +++ b/var/spack/repos/builtin/packages/canal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Canal(MavenPackage): homepage = "https://github.com/alibaba/canal/wiki" url = "https://github.com/alibaba/canal/archive/canal-1.1.4.tar.gz" + license("Apache-2.0") + version("1.1.6", sha256="2dd0997a69811a464e3d963e444760696931beb9326726b0064ad42f8a00c71b") version("1.1.4", sha256="740e0adac56d7f281cba21eca173eef3e8d42aa3e0fb49709f92cb6a1451dfbc") version("1.1.3", sha256="3fe75ca5eb5cb97eb35818426c1427542ccddb0de052cf154e948ef321822cbc") diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py index 388eeba853af2a..87ebe30b18e4ee 100644 --- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class CandleBenchmarks(Package): tags = ["proxy-app", "ecp-proxy-app"] + license("MIT") + version("0.1", sha256="767f74f43ee3a5d4e0f26750f2a96b8433e25a9cd4f2d29938ac8acf263ab58d") version("0.0", sha256="faa0d24355071de0e375d72ed1a39dcf30006602210cf8cf09db568b5d0b679f") diff --git a/var/spack/repos/builtin/packages/cans/package.py b/var/spack/repos/builtin/packages/cans/package.py index 6d561493aee2fd..8827ff9d6a87ea 100644 --- a/var/spack/repos/builtin/packages/cans/package.py +++ b/var/spack/repos/builtin/packages/cans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Cans(MakefilePackage): maintainers("lhxone", "p-costa", "nscapin", "GabrieleBoga") + license("MIT") + version("1.1.4", sha256="8334c67810472edc18d5403a0bcb27fd57a620722c1e8c317518db4506867b81") version("1.1.3", sha256="01fa42e51ddcf6161fb63a124a0f2218c67f85ff4cc5236b995a5650d85e7615") version("1.1.2", sha256="31c8d6c1f619fb60b7919922c7a3a64dd614a1a2f89f38560184f75ed0526171") diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index 09ee90e6274729..efb9d7fcbe225d 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 2f138736b9a7bf..75094e70f0de8f 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Canu(MakefilePackage): homepage = "https://canu.readthedocs.io/" url = "https://github.com/marbl/canu/archive/v1.5.tar.gz" + license("GPL-2.0-only") + version( "2.2", sha256="e4d0c7b82149114f442ccd39e18f7fe2061c63b28d53700ad896e022b73b7404", diff --git a/var/spack/repos/builtin/packages/cap3/package.py b/var/spack/repos/builtin/packages/cap3/package.py index 35e8261360af42..d9f6f0698f3e7f 100644 --- a/var/spack/repos/builtin/packages/cap3/package.py +++ b/var/spack/repos/builtin/packages/cap3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/capnproto/package.py b/var/spack/repos/builtin/packages/capnproto/package.py index cec409eed9c5f9..8552fbd9b4f5c5 100644 --- a/var/spack/repos/builtin/packages/capnproto/package.py +++ b/var/spack/repos/builtin/packages/capnproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Capnproto(AutotoolsPackage): maintainers("alexrobomind") + license("MIT") + version("master", branch="master") version("0.10.2", sha256="756262841fa66260c9969e900701cc86720c2548584fb96c8153348fd7edfe69") diff --git a/var/spack/repos/builtin/packages/capstone/package.py b/var/spack/repos/builtin/packages/capstone/package.py index 0ed097d0622895..cfb392da1b220f 100644 --- a/var/spack/repos/builtin/packages/capstone/package.py +++ b/var/spack/repos/builtin/packages/capstone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Capstone(CMakePackage): url = "https://github.com/capstone-engine/capstone/archive/4.0.1.tar.gz" git = "https://github.com/capstone-engine/capstone.git" + license("BSD-3-Clause-Clear") + version("next", branch="next") version("4.0.2", sha256="7c81d798022f81e7507f1a60d6817f63aa76e489aa4e7055255f21a22f5e526a") version("4.0.1", sha256="79bbea8dbe466bd7d051e037db5961fdb34f67c9fac5c3471dd105cfb1e05dc7") diff --git a/var/spack/repos/builtin/packages/cardioid/package.py b/var/spack/repos/builtin/packages/cardioid/package.py index 1cff449740f670..f14aa1c9c4d55f 100644 --- a/var/spack/repos/builtin/packages/cardioid/package.py +++ b/var/spack/repos/builtin/packages/cardioid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cardioid(CMakePackage): git = "https://github.com/LLNL/cardioid.git" maintainers("rblake-llnl") + license("MIT") + version("develop", branch="master") version("elecfem", branch="elec-fem") diff --git a/var/spack/repos/builtin/packages/care/package.py b/var/spack/repos/builtin/packages/care/package.py index 683b480088e25a..01b11ed3ac0e97 100644 --- a/var/spack/repos/builtin/packages/care/package.py +++ b/var/spack/repos/builtin/packages/care/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Care(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/LLNL/CARE.git" tags = ["radiuss"] + license("GPL-2.0-or-later") + version("develop", branch="develop", submodules="True") version("master", branch="main", submodules="True") version( diff --git a/var/spack/repos/builtin/packages/cargs/package.py b/var/spack/repos/builtin/packages/cargs/package.py index e14ef71151e19d..abd30b1d92e49e 100644 --- a/var/spack/repos/builtin/packages/cargs/package.py +++ b/var/spack/repos/builtin/packages/cargs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cargs(CMakePackage): url = "https://github.com/likle/cargs/archive/refs/tags/v1.0.3.tar.gz" git = "https://github.com/likle/cargs.git" + license("MIT") + version("1.0.3", sha256="ddba25bd35e9c6c75bc706c126001b8ce8e084d40ef37050e6aa6963e836eb8b") depends_on("cmake@3.14.7:", type=("build")) diff --git a/var/spack/repos/builtin/packages/casacore/package.py b/var/spack/repos/builtin/packages/casacore/package.py index 731288afd71612..870146b258a69e 100644 --- a/var/spack/repos/builtin/packages/casacore/package.py +++ b/var/spack/repos/builtin/packages/casacore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Casacore(CMakePackage): maintainers("mpokorny") + license("LGPL-2.0-only") + version("3.5.0", sha256="63f1c8eff932b0fcbd38c598a5811e6e5397b72835b637d6f426105a183b3f91") version("3.4.0", sha256="31f02ad2e26f29bab4a47a2a69e049d7bc511084a0b8263360e6157356f92ae1") version("3.3.0", sha256="3a714644b908ef6e81489b792cc9b80f6d8267a275e15d38a42a6a5137d39d3d") diff --git a/var/spack/repos/builtin/packages/cask/package.py b/var/spack/repos/builtin/packages/cask/package.py index a1a8f9df0fcaf0..2133fc26ae1039 100644 --- a/var/spack/repos/builtin/packages/cask/package.py +++ b/var/spack/repos/builtin/packages/cask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Cask(Package): homepage = "https://cask.readthedocs.io/en/latest/" url = "https://github.com/cask/cask/archive/v0.7.4.tar.gz" + license("GPL-3.0-only") + version("0.8.1", sha256="8739ba608f23c79b3426faa8b068d5d1bc096c7305ce30b1163babd354be821c") # version 0.8.0 is broken version("0.7.4", sha256="b183ea1c50fc215c9040f402b758ecc335901fbc2c3afd4a7302386c888d437d") diff --git a/var/spack/repos/builtin/packages/casper/package.py b/var/spack/repos/builtin/packages/casper/package.py index 19473501a19b86..ff4c4e7f129183 100644 --- a/var/spack/repos/builtin/packages/casper/package.py +++ b/var/spack/repos/builtin/packages/casper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cassandra/package.py b/var/spack/repos/builtin/packages/cassandra/package.py index a5fe38e5175f40..36f89c148d8b91 100644 --- a/var/spack/repos/builtin/packages/cassandra/package.py +++ b/var/spack/repos/builtin/packages/cassandra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cassandra(Package): homepage = "https://github.com/apache/cassandra" url = "https://archive.apache.org/dist/cassandra/4.0.1/apache-cassandra-4.0.1-bin.tar.gz" + license("Apache-2.0") + version("4.0.1", sha256="ed7022e30d9b77d9ce1072f8de95ab01ef7c5c6ed30f304e413dd5a3f92a52f8") version("3.11.11", sha256="a5639af781005410995a96f512d505c1def7b70cf5bbbec52e7cd5ff31b6cea3") version( diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py deleted file mode 100644 index a513f2ee13fae1..00000000000000 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os -import subprocess -import sys - -import llnl.util.tty as tty - -from spack.package import * - - -class Catalyst(CMakePackage): - """Catalyst is an in situ library, with an adaptable application - programming interface (API), that orchestrates the alliance - between simulation and analysis and/or visualization tasks. For - versions 5.7 and greater use the paraview package. - - """ - - homepage = "http://www.paraview.org" - url = "https://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz" - - maintainers("danlipsa") - - version("5.6.0", sha256="5b49cb96ab78eee0427e25200530ac892f9a3da7725109ce1790f8010cb5b377") - - variant("python", default=False, description="Enable Python support") - variant("essentials", default=False, description="Enable Essentials support") - variant("extras", default=False, description="Enable Extras support. Implies Essentials.") - variant( - "rendering", - default=True, - description="Enable Rendering support. Implies Extras and Essentials.", - ) - variant("osmesa", default=True, description="Use offscreen rendering") - conflicts("+osmesa", when="~rendering") - - extends("python", when="+python") - # VTK < 8.2.1 can't handle Python 3.8 - # This affects Paraview <= 5.7 (VTK 8.2.0) - # https://gitlab.kitware.com/vtk/vtk/-/issues/17670 - depends_on("python@3:3.7", when="@:5.7 +python", type=("build", "run")) - depends_on("python@3:", when="@5.8:+python", type=("build", "run")) - - depends_on("git", type="build") - depends_on("mpi") - - depends_on("py-numpy", when="+python", type=("build", "run")) - depends_on("py-mpi4py", when="+python", type=("build", "run")) - - depends_on("gl@3.2:", when="+rendering") - depends_on("osmesa", when="+osmesa") - depends_on("glx", when="~osmesa") - depends_on("cmake@3.3:", type="build") - - @property - def paraview_subdir(self): - """The paraview subdirectory name as paraview-major.minor""" - return "paraview-{0}".format(self.spec.version.up_to(2)) - - @property - def editions(self): - """Transcribe spack variants into names of Catalyst Editions""" - selected = ["Base"] # Always required - - if "+python" in self.spec: - selected.append("Enable-Python") - - if "+essentials" in self.spec: - selected.append("Essentials") - - if "+extras" in self.spec: - selected.append("Essentials") - selected.append("Extras") - - if "+rendering" in self.spec: - selected.append("Essentials") - selected.append("Extras") - selected.append("Rendering-Base") - - return selected - - def do_stage(self, mirror_only=False): - """Unpacks and expands the fetched tarball. - Then, generate the catalyst source files.""" - super().do_stage(mirror_only) - - # extract the catalyst part - catalyst_script = os.path.join(self.stage.source_path, "Catalyst", "catalyze.py") - editions_dir = os.path.join(self.stage.source_path, "Catalyst", "Editions") - catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir) - - python_path = os.path.realpath( - self.spec["python"].command.path if "+python" in self.spec else sys.executable - ) - - command = [ - python_path, - catalyst_script, - "-r", - self.stage.source_path, - "-o", - catalyst_source_dir, - ] - - for edition in self.editions: - command.extend(["-i", os.path.join(editions_dir, edition)]) - - if not os.path.isdir(catalyst_source_dir): - os.mkdir(catalyst_source_dir) - subprocess.check_call(command) - tty.msg("Generated catalyst source in %s" % self.stage.source_path) - else: - tty.msg("Already generated %s in %s" % (self.name, self.stage.source_path)) - - def setup_run_environment(self, env): - # paraview 5.5 and later - # - cmake under lib/cmake/paraview-5.5 - # - libs under lib - # - python bits under lib/python2.8/site-packages - if os.path.isdir(self.prefix.lib64): - lib_dir = self.prefix.lib64 - else: - lib_dir = self.prefix.lib - - env.set("ParaView_DIR", self.prefix) - env.prepend_path("LIBRARY_PATH", lib_dir) - env.prepend_path("LD_LIBRARY_PATH", lib_dir) - - if "+python" in self.spec: - python_version = self.spec["python"].version.up_to(2) - env.prepend_path( - "PYTHONPATH", - join_path(lib_dir, "python{0}".format(python_version), "site-packages"), - ) - - def setup_dependent_build_environment(self, env, dependent_spec): - env.set("ParaView_DIR", self.prefix) - - @property - def root_cmakelists_dir(self): - """The relative path to the directory containing CMakeLists.txt - - This path is relative to the root of the extracted tarball, - not to the ``build_directory``. Defaults to the current directory. - - :return: directory containing CMakeLists.txt - """ - return os.path.join(self.stage.source_path, "Catalyst-v" + str(self.version)) - - @property - def build_directory(self): - """Returns the directory to use when building the package - - :return: directory where to build the package - """ - return join_path(os.path.abspath(self.root_cmakelists_dir), "spack-build") - - def cmake_args(self): - """Populate cmake arguments for Catalyst.""" - spec = self.spec - - def variant_bool(feature, on="ON", off="OFF"): - """Ternary for spec variant to ON/OFF string""" - if feature in spec: - return on - return off - - def nvariant_bool(feature): - """Negated ternary for spec variant to OFF/ON string""" - return variant_bool(feature, on="OFF", off="ON") - - cmake_args = [ - "-DPARAVIEW_GIT_DESCRIBE=v%s" % str(self.version), - "-DVTK_USE_SYSTEM_EXPAT:BOOL=ON", - "-DVTK_USE_X:BOOL=%s" % nvariant_bool("+osmesa"), - "-DVTK_USE_OFFSCREEN:BOOL=%s" % variant_bool("+osmesa"), - "-DVTK_OPENGL_HAS_OSMESA:BOOL=%s" % variant_bool("+osmesa"), - ] - if "+python" in spec: - cmake_args.extend( - [ - "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON", - "-DPYTHON_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path, - "-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON", - ] - ) - else: - cmake_args.append("-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF") - - if spec.platform == "linux" and spec.target.family == "aarch64": - cmake_args.append("-DCMAKE_CXX_FLAGS=-DPNG_ARM_NEON_OPT=0") - cmake_args.append("-DCMAKE_C_FLAGS=-DPNG_ARM_NEON_OPT=0") - - return cmake_args - - def cmake(self, spec, prefix): - """Runs ``cmake`` in the build directory through the cmake.sh script""" - cmake_script_path = os.path.join(os.path.abspath(self.root_cmakelists_dir), "cmake.sh") - with working_dir(self.build_directory, create=True): - subprocess.check_call( - [cmake_script_path, os.path.abspath(self.root_cmakelists_dir)] - + self.cmake_args() - + self.std_cmake_args - ) diff --git a/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch b/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch deleted file mode 100644 index fa610722af0af1..00000000000000 --- a/var/spack/repos/builtin/packages/catalyst/vtkm-catalyst-pv551.patch +++ /dev/null @@ -1,487 +0,0 @@ -# The catalyst changes (the working directory for output) are slated for -# paraview-5.6. -# They are API-compatible with paraview-5.5 but not ABI compatible. -# -# https://gitlab.kitware.com/paraview/paraview/merge_requests/2433 -# https://gitlab.kitware.com/paraview/paraview/merge_requests/2436 -# ---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.cxx.orig 2018-04-06 22:03:33.000000000 +0200 -+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.cxx 2018-05-11 12:02:26.894772713 +0200 -@@ -38,6 +38,7 @@ - #include "vtkStringArray.h" - - #include -+#include - - struct vtkCPProcessorInternals - { -@@ -47,12 +48,13 @@ - }; - - vtkStandardNewMacro(vtkCPProcessor); --vtkMultiProcessController* vtkCPProcessor::Controller = NULL; -+vtkMultiProcessController* vtkCPProcessor::Controller = nullptr; - //---------------------------------------------------------------------------- - vtkCPProcessor::vtkCPProcessor() - { - this->Internal = new vtkCPProcessorInternals; -- this->InitializationHelper = NULL; -+ this->InitializationHelper = nullptr; -+ this->WorkingDirectory = nullptr; - } - - //---------------------------------------------------------------------------- -@@ -61,14 +63,15 @@ - if (this->Internal) - { - delete this->Internal; -- this->Internal = NULL; -+ this->Internal = nullptr; - } - - if (this->InitializationHelper) - { - this->InitializationHelper->Delete(); -- this->InitializationHelper = NULL; -+ this->InitializationHelper = nullptr; - } -+ this->SetWorkingDirectory(nullptr); - } - - //---------------------------------------------------------------------------- -@@ -95,7 +98,7 @@ - { - if (which < 0 || which >= this->GetNumberOfPipelines()) - { -- return NULL; -+ return nullptr; - } - int counter = 0; - vtkCPProcessorInternals::PipelineListIterator iter = this->Internal->Pipelines.begin(); -@@ -108,7 +111,7 @@ - counter++; - iter++; - } -- return NULL; -+ return nullptr; - } - - //---------------------------------------------------------------------------- -@@ -130,17 +133,41 @@ - } - - //---------------------------------------------------------------------------- --int vtkCPProcessor::Initialize() -+int vtkCPProcessor::Initialize(const char* workingDirectory) - { -- if (this->InitializationHelper == NULL) -+ if (this->InitializationHelper == nullptr) - { - this->InitializationHelper = this->NewInitializationHelper(); - } -+ // make sure the directory exists here so that we only do it once -+ if (workingDirectory) -+ { -+ vtkMultiProcessController* controller = vtkMultiProcessController::GetGlobalController(); -+ int success = 1; -+ if (controller == nullptr || controller->GetLocalProcessId() == 0) -+ { -+ success = vtksys::SystemTools::MakeDirectory(workingDirectory) == true ? 1 : 0; -+ if (success == 0) -+ { -+ vtkWarningMacro("Could not make " -+ << workingDirectory << " directory. " -+ << "Results will be generated in current working directory instead."); -+ } -+ } -+ if (controller) -+ { -+ controller->Broadcast(&success, 1, 0); -+ } -+ if (success) -+ { -+ this->SetWorkingDirectory(workingDirectory); -+ } -+ } - return 1; - } - - //---------------------------------------------------------------------------- --int vtkCPProcessor::Initialize(vtkMPICommunicatorOpaqueComm& comm) -+int vtkCPProcessor::Initialize(vtkMPICommunicatorOpaqueComm& comm, const char* workingDirectory) - { - #ifdef PARAVIEW_USE_MPI - if (vtkCPProcessor::Controller) -@@ -148,7 +175,7 @@ - vtkErrorMacro("Can only initialize with a communicator once per process."); - return 0; - } -- if (this->InitializationHelper == NULL) -+ if (this->InitializationHelper == nullptr) - { - vtkMPICommunicator* communicator = vtkMPICommunicator::New(); - communicator->InitializeExternal(&comm); -@@ -157,12 +184,12 @@ - this->Controller = controller; - this->Controller->SetGlobalController(controller); - communicator->Delete(); -- return this->Initialize(); -+ return this->Initialize(workingDirectory); - } - return 1; - #else - static_cast(&comm); // get rid of variable not used warning -- return this->Initialize(); -+ return this->Initialize(workingDirectory); - #endif - } - -@@ -225,6 +252,13 @@ - input->GetFieldData()->AddArray(catalystChannel); - } - } -+ -+ std::string originalWorkingDirectory; -+ if (this->WorkingDirectory) -+ { -+ originalWorkingDirectory = vtksys::SystemTools::GetCurrentWorkingDirectory(); -+ vtksys::SystemTools::ChangeDirectory(this->WorkingDirectory); -+ } - for (vtkCPProcessorInternals::PipelineListIterator iter = this->Internal->Pipelines.begin(); - iter != this->Internal->Pipelines.end(); iter++) - { -@@ -248,6 +282,10 @@ - } - } - } -+ if (originalWorkingDirectory.empty() == false) -+ { -+ vtksys::SystemTools::ChangeDirectory(originalWorkingDirectory); -+ } - // we want to reset everything here to make sure that new information - // is properly passed in the next time. - dataDescription->ResetAll(); -@@ -259,7 +297,7 @@ - { - if (this->Controller) - { -- this->Controller->SetGlobalController(NULL); -+ this->Controller->SetGlobalController(nullptr); - this->Controller->Finalize(1); - this->Controller->Delete(); - } ---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.h.orig 2018-04-06 22:03:33.000000000 +0200 -+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPProcessor.h 2018-05-11 12:02:26.894772713 +0200 -@@ -76,14 +76,16 @@ - virtual void RemoveAllPipelines(); - - /// Initialize the co-processor. Returns 1 if successful and 0 -- /// otherwise. - /// otherwise. If Catalyst is built with MPI then Initialize() - /// can also be called with a specific MPI communicator if - /// MPI_COMM_WORLD isn't the proper one. Catalyst is initialized -- /// to use MPI_COMM_WORLD by default. -- virtual int Initialize(); -+ /// to use MPI_COMM_WORLD by default. Both methods have an optional -+ /// workingDirectory argument which will set *WorkingDirectory* so -+ /// that files will be put relative to this directory. -+ virtual int Initialize(const char* workingDirectory = nullptr); - #ifndef __WRAP__ -- virtual int Initialize(vtkMPICommunicatorOpaqueComm& comm); -+ virtual int Initialize( -+ vtkMPICommunicatorOpaqueComm& comm, const char* workingDirectory = nullptr); - #endif - - /// The Catalyst input field data string array name. This array will -@@ -111,6 +113,13 @@ - /// implementation an opportunity to clean up, before it is destroyed. - virtual int Finalize(); - -+ /// Get the current working directory for outputting Catalyst files. -+ /// If not set then Catalyst output files will be relative to the -+ /// current working directory. This will not affect where Catalyst -+ /// looks for Python scripts. *WorkingDirectory* gets set through -+ /// the *Initialize()* methods. -+ vtkGetStringMacro(WorkingDirectory); -+ - protected: - vtkCPProcessor(); - virtual ~vtkCPProcessor(); -@@ -118,6 +127,11 @@ - /// Create a new instance of the InitializationHelper. - virtual vtkObject* NewInitializationHelper(); - -+ /// Set the current working directory for outputting Catalyst files. -+ /// This is a protected method since simulation code adaptors should -+ /// set this through the *Initialize()* methods. -+ vtkSetStringMacro(WorkingDirectory); -+ - private: - vtkCPProcessor(const vtkCPProcessor&) = delete; - void operator=(const vtkCPProcessor&) = delete; -@@ -125,6 +139,7 @@ - vtkCPProcessorInternals* Internal; - vtkObject* InitializationHelper; - static vtkMultiProcessController* Controller; -+ char* WorkingDirectory; - }; - - #endif ---- Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPXMLPWriterPipeline.cxx.orig 2018-04-06 22:03:33.000000000 +0200 -+++ Catalyst-v5.5.0/CoProcessing/Catalyst/vtkCPXMLPWriterPipeline.cxx 2018-05-11 12:02:26.894772713 +0200 -@@ -31,6 +31,7 @@ - #include - #include - -+#include - #include - #include - -@@ -174,7 +175,7 @@ - - for (unsigned int i = 0; i < dataDescription->GetNumberOfInputDescriptions(); i++) - { -- const char* inputName = dataDescription->GetInputDescriptionName(i); -+ std::string inputName = dataDescription->GetInputDescriptionName(i); - vtkCPInputDataDescription* idd = dataDescription->GetInputDescription(i); - vtkDataObject* grid = idd->GetGrid(); - if (grid == nullptr) -@@ -206,6 +207,8 @@ - vtkSMStringVectorProperty* fileName = - vtkSMStringVectorProperty::SafeDownCast(writer->GetProperty("FileName")); - -+ // If we have a / in the channel name we take it out of the filename we're going to write to -+ inputName.erase(std::remove(inputName.begin(), inputName.end(), '/'), inputName.end()); - std::ostringstream o; - if (this->Path.empty() == false) - { ---- Catalyst-v5.5.0/Wrapping/Python/paraview/coprocessing.py.orig 2018-04-06 22:03:33.000000000 +0200 -+++ Catalyst-v5.5.0/Wrapping/Python/paraview/coprocessing.py 2018-05-11 12:02:27.038772408 +0200 -@@ -11,22 +11,12 @@ - from paraview.vtk.vtkPVVTKExtensionsCore import * - import math - --# ----------------------------------------------------------------------------- --def IsInModulo(timestep, frequencyArray): -- """ -- Return True if the given timestep is in one of the provided frequency. -- This can be interpreted as follow:: -- -- isFM = IsInModulo(timestep, [2,3,7]) -- -- is similar to:: -+# If the user created a filename in a location that doesn't exist by default we'll -+# make the directory for them. This can be changed though by setting createDirectoriesIfNeeded -+# to False. -+createDirectoriesIfNeeded = True - -- isFM = (timestep % 2 == 0) or (timestep % 3 == 0) or (timestep % 7 == 0) -- """ -- for frequency in frequencyArray: -- if frequency > 0 and (timestep % frequency == 0): -- return True -- return False -+# ----------------------------------------------------------------------------- - - class CoProcessor(object): - """Base class for co-processing Pipelines. -@@ -68,6 +58,9 @@ - self.__CinemaTracks = {} - self.__InitialFrequencies = {} - self.__PrintEnsightFormatString = False -+ self.__TimeStepToStartOutputAt=0 -+ self.__ForceOutputAtFirstCall=False -+ self.__FirstTimeStepIndex = None - - def SetPrintEnsightFormatString(self, enable): - """If outputting ExodusII files with the purpose of reading them into -@@ -87,6 +80,17 @@ - "Incorrect argument type: %s, must be a dict" % type(frequencies)) - self.__InitialFrequencies = frequencies - -+ def SetInitialOutputOptions(self, timeStepToStartOutputAt, forceOutputAtFirstCall): -+ """Set the frequencies at which the pipeline needs to be updated. -+ Typically, this is called by the subclass once it has determined what -+ timesteps co-processing will be needed to be done. -+ frequencies is a map, with key->string name of for the simulation -+ input, and value is a list of frequencies. -+ """ -+ -+ self.__TimeStepToStartOutputAt=timeStepToStartOutputAt -+ self.__ForceOutputAtFirstCall=forceOutputAtFirstCall -+ - def EnableLiveVisualization(self, enable, frequency = 1): - """Call this method to enable live-visualization. When enabled, - DoLiveVisualization() will communicate with ParaView server if possible -@@ -115,7 +119,7 @@ - # if this is a time step to do live then all of the inputs - # must be made available. note that we want the pipeline built - # before we do the actual first live connection. -- if self.__EnableLiveVisualization and timestep % self.__LiveVisualizationFrequency == 0 \ -+ if self.__EnableLiveVisualization and self.NeedToOutput(timestep, self.__LiveVisualizationFrequency) \ - and self.__LiveVisualizationLink: - if self.__LiveVisualizationLink.Initialize(servermanager.ActiveConnection.Session.GetSessionProxyManager()): - num_inputs = datadescription.GetNumberOfInputDescriptions() -@@ -132,13 +136,13 @@ - # hasn't been set up yet). If we don't have live enabled - # we know that the output frequencies aren't changed and can - # just use the initial frequencies. -- if self.__InitialFrequencies or not self.__EnableLiveVisualization: -+ if self.__ForceOutputAtFirstCall or self.__InitialFrequencies or not self.__EnableLiveVisualization: - num_inputs = datadescription.GetNumberOfInputDescriptions() - for cc in range(num_inputs): - input_name = datadescription.GetInputDescriptionName(cc) - - freqs = self.__InitialFrequencies.get(input_name, []) -- if self.__EnableLiveVisualization or ( self and IsInModulo(timestep, freqs) ): -+ if self.__EnableLiveVisualization or ( self and self.IsInModulo(timestep, freqs) ): - datadescription.GetInputDescription(cc).AllFieldsOn() - datadescription.GetInputDescription(cc).GenerateMeshOn() - else: -@@ -149,15 +153,14 @@ - for writer in self.__WritersList: - frequency = writer.parameters.GetProperty( - "WriteFrequency").GetElement(0) -- if (timestep % frequency) == 0 or \ -- datadescription.GetForceOutput() == True: -+ if self.NeedToOutput(timestep, frequency) or datadescription.GetForceOutput() == True: - writerinputs = cpstate.locate_simulation_inputs(writer) - for writerinput in writerinputs: - datadescription.GetInputDescriptionByName(writerinput).AllFieldsOn() - datadescription.GetInputDescriptionByName(writerinput).GenerateMeshOn() - - for view in self.__ViewsList: -- if (view.cpFrequency and timestep % view.cpFrequency == 0) or \ -+ if (view.cpFrequency and self.NeedToOutput(timestep, view.cpFrequency)) or \ - datadescription.GetForceOutput() == True: - viewinputs = cpstate.locate_simulation_inputs_for_view(view) - for viewinput in viewinputs: -@@ -192,8 +195,7 @@ - for writer in self.__WritersList: - frequency = writer.parameters.GetProperty( - "WriteFrequency").GetElement(0) -- if (timestep % frequency) == 0 or \ -- datadescription.GetForceOutput() == True: -+ if self.NeedToOutput(timestep, frequency) or datadescription.GetForceOutput() == True: - fileName = writer.parameters.GetProperty("FileName").GetElement(0) - paddingamount = writer.parameters.GetProperty("PaddingAmount").GetElement(0) - helperName = writer.GetXMLName() -@@ -203,6 +205,23 @@ - else: - ts = str(timestep).rjust(paddingamount, '0') - writer.FileName = fileName.replace("%t", ts) -+ if '/' in writer.FileName and createDirectoriesIfNeeded: -+ oktowrite = [1.] -+ import vtk -+ comm = vtk.vtkMultiProcessController.GetGlobalController() -+ if comm.GetLocalProcessId() == 0: -+ import os -+ newDir = writer.FileName[0:writer.FileName.rfind('/')] -+ try: -+ os.makedirs(newDir) -+ except OSError: -+ if not os.path.isdir(newDir): -+ print ("ERROR: Cannot make directory for", writer.FileName, ". No data will be written.") -+ oktowrite[0] = 0. -+ comm.Broadcast(oktowrite, 1, 0) -+ if oktowrite[0] == 0: -+ # we can't make the directory so no reason to update the pipeline -+ return - writer.UpdatePipeline(datadescription.GetTime()) - - def WriteImages(self, datadescription, rescale_lookuptable=False, -@@ -240,7 +259,7 @@ - - cinema_dirs = [] - for view in self.__ViewsList: -- if (view.cpFrequency and timestep % view.cpFrequency == 0) or \ -+ if (view.cpFrequency and self.NeedToOutput(timestep, view.cpFrequency)) or \ - datadescription.GetForceOutput() == True: - fname = view.cpFileName - ts = str(timestep).rjust(padding_amount, '0') -@@ -267,6 +286,24 @@ - if dirname: - cinema_dirs.append(dirname) - else: -+ if '/' in fname and createDirectoriesIfNeeded: -+ oktowrite = [1.] -+ import vtk -+ comm = vtk.vtkMultiProcessController.GetGlobalController() -+ if comm.GetLocalProcessId() == 0: -+ import os -+ newDir = fname[0:fname.rfind('/')] -+ try: -+ os.makedirs(newDir) -+ except OSError: -+ if not os.path.isdir(newDir): -+ print ("ERROR: Cannot make directory for", fname, ". No image will be output.") -+ oktowrite[0] = 0. -+ comm.Broadcast(oktowrite, 1, 0) -+ if oktowrite[0] == 0: -+ # we can't make the directory so no reason to update the pipeline -+ return -+ - if image_quality is None and fname.endswith('png'): - # for png quality = 0 means no compression. compression can be a potentially - # very costly serial operation on process 0 -@@ -307,7 +344,7 @@ - - - timeStep = datadescription.GetTimeStep() -- if self.__EnableLiveVisualization and timeStep % self.__LiveVisualizationFrequency == 0: -+ if self.__EnableLiveVisualization and self.NeedToOutput(timeStep, self.__LiveVisualizationFrequency): - if not self.__LiveVisualizationLink.Initialize(servermanager.ActiveConnection.Session.GetSessionProxyManager()): - return - -@@ -412,7 +449,7 @@ - """ - controller = servermanager.ParaViewPipelineController() - # assume that a client only proxy with the same name as a writer -- # is available in "insitu_writer_paramters" -+ # is available in "insitu_writer_parameters" - - # Since coprocessor sometimes pass writer as a custom object and not - # a proxy, we need to handle that. Just creating any arbitrary writer -@@ -666,3 +703,42 @@ - #restore what we showed - pv_introspect.restore_visibility(pxystate) - return os.path.basename(vfname) -+ -+ def IsInModulo(self, timestep, frequencies): -+ """ -+ Return True if the given timestep is in one of the provided frequency. -+ This can be interpreted as follow:: -+ -+ isFM = IsInModulo(timestep-timeStepToStartOutputAt, [2,3,7]) -+ -+ is similar to:: -+ -+ isFM = (timestep-timeStepToStartOutputAt % 2 == 0) or (timestep-timeStepToStartOutputAt % 3 == 0) or (timestep-timeStepToStartOutputAt % 7 == 0) -+ -+ The timeStepToStartOutputAt is the first timestep that will potentially be output. -+ """ -+ if timestep < self.__TimeStepToStartOutputAt and not self.__ForceOutputAtFirstCall: -+ return False -+ for frequency in frequencies: -+ if frequency > 0 and self.NeedToOutput(timestep, frequency): -+ return True -+ -+ return False -+ -+ -+ def NeedToOutput(self, timestep, frequency): -+ """ -+ Return True if we need to output based on the input timestep and frequency. Checks based -+ __FirstTimeStepIndex, __FirstTimeStepIndex, __ForceOutputAtFirstCall and __TimeStepToStartOutputAt -+ member variables. -+ """ -+ if self.__FirstTimeStepIndex == None: -+ self.__FirstTimeStepIndex = timestep -+ -+ if self.__ForceOutputAtFirstCall and self.__FirstTimeStepIndex == timestep: -+ return True -+ -+ if self.__TimeStepToStartOutputAt <= timestep and (timestep-self.__TimeStepToStartOutputAt) % frequency == 0: -+ return True -+ -+ return False diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py index 82eb629bb82661..604dd3956538c0 100644 --- a/var/spack/repos/builtin/packages/catch2/package.py +++ b/var/spack/repos/builtin/packages/catch2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,9 +11,12 @@ class Catch2(CMakePackage): supports Objective-C (and maybe C).""" homepage = "https://github.com/catchorg/Catch2" - url = "https://github.com/catchorg/Catch2/archive/v2.13.10.tar.gz" + url = "https://github.com/catchorg/Catch2/archive/refs/tags/v3.3.1.tar.gz" + list_url = "https://github.com/catchorg/Catch2/releases/" git = "https://github.com/catchorg/Catch2.git" - maintainers("ax3l") + maintainers("ax3l", "greenc-FNAL") + + license("BSL-1.0") # In-Development version("develop", branch="devel") @@ -105,11 +108,38 @@ class Catch2(CMakePackage): version("1.3.5", sha256="f15730d81b4173fb860ce3561768de7d41bbefb67dc031d7d1f5ae2c07f0a472") version("1.3.0", sha256="245f6ee73e2fea66311afa1da59e5087ddab8b37ce64994ad88506e8af28c6ac") + variant( + "cxxstd", + when="@3:", + default="17", + values=("17", "20", "23"), + multi=False, + sticky=True, + description="C++ standard", + ) variant( "pic", when="@3: ~shared", default=True, description="Build with position-independent code" ) variant("shared", when="@3:", default=False, description="Build shared library") + @when("@3:") + def patch(self): + filter_file( + r"#include \\n#include ", + "#include \n#include ", + "src/catch2/catch_test_case_info.hpp", + ) + filter_file( + r"#include ", + "#include \n#include ", + "src/catch2/internal/catch_xmlwriter.cpp", + ) + def cmake_args(self): spec = self.spec args = [] @@ -119,6 +149,18 @@ def cmake_args(self): elif spec.satisfies("@2.1.1:"): args.append(self.define("BUILD_TESTING", self.run_tests)) if spec.satisfies("@3:"): + args.extend( + [ + self.define("BUILD_TESTING", self.run_tests), + self.define("CATCH_BUILD_EXAMPLES", True), + self.define("CATCH_BUILD_EXTRA_TESTS", self.run_tests), + self.define("CATCH_BUILD_TESTING", self.run_tests), + self.define("CATCH_ENABLE_WERROR", True), + self.define("CATCH_INSTALL_EXTRAS", True), + self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"), + self.define("CMAKE_CXX_STANDARD_REQUIRED", True), + ] + ) args.append(self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")) args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared")) diff --git a/var/spack/repos/builtin/packages/cbc/package.py b/var/spack/repos/builtin/packages/cbc/package.py index c67cfaa6cc3b52..191310a756fe14 100644 --- a/var/spack/repos/builtin/packages/cbc/package.py +++ b/var/spack/repos/builtin/packages/cbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cbc(AutotoolsPackage): depends_on("osi") depends_on("cgl") + license("EPL-2.0") + version("2.10.9", sha256="96d02593b01fd1460d421f002734384e4eb1e93ebe1fb3570dc2b7600f20a27e") version("2.10.8", sha256="8525abb541ee1b8e6ff03b00411b66e98bbc58f95be1aefd49d2bca571be2eaf") version("2.10.5", sha256="cc44c1950ff4615e7791d7e03ea34318ca001d3cac6dc3f7f5ee392459ce6719") diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py index e0f08b1f35e3b1..609e5bba5416ad 100644 --- a/var/spack/repos/builtin/packages/cbench/package.py +++ b/var/spack/repos/builtin/packages/cbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbflib/package.py b/var/spack/repos/builtin/packages/cbflib/package.py index 4ec7b02a33d27f..7e313acece0698 100644 --- a/var/spack/repos/builtin/packages/cbflib/package.py +++ b/var/spack/repos/builtin/packages/cbflib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cbflib(MakefilePackage): "https://downloads.sourceforge.net/project/cbflib/cbflib/CBFlib_0.9.2/CBFlib-0.9.2.tar.gz" ) + license("Unlicense") + version("0.9.2", sha256="367e37e1908a65d5472e921150291332823a751206804866e752b793bca17afc") depends_on("m4", type="build") diff --git a/var/spack/repos/builtin/packages/cblas/package.py b/var/spack/repos/builtin/packages/cblas/package.py index 7ddf14d3775d08..86b50b7c5e2fe9 100644 --- a/var/spack/repos/builtin/packages/cblas/package.py +++ b/var/spack/repos/builtin/packages/cblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 2b0aa739242615..36549c6063000f 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index a34c682a1d9486..96b3679b18bc8a 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 78999b9d334363..3196840a934d54 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 694ddb87bda9f9..371c1dd63889b6 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index bd09138a61fc12..92166c5286e8eb 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Cbtf(CMakePackage): maintainers("jgalarowicz") + license("GPL-2.0-only") + version("develop", branch="master") version("1.9.4.1", branch="1.9.4.1") version("1.9.4", branch="1.9.4") diff --git a/var/spack/repos/builtin/packages/cc65/package.py b/var/spack/repos/builtin/packages/cc65/package.py index 9dedc0057feb4f..1f4998ed545742 100644 --- a/var/spack/repos/builtin/packages/cc65/package.py +++ b/var/spack/repos/builtin/packages/cc65/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cc65(MakefilePackage): homepage = "https://cc65.github.io/" url = "https://github.com/cc65/cc65/archive/V2.18.tar.gz" + license("Zlib") + version("2.18", sha256="d14a22fb87c7bcbecd8a83d5362d5d317b19c6ce2433421f2512f28293a6eaab") version("2.17", sha256="73b89634655bfc6cef9aa0b8950f19657a902ee5ef0c045886e418bb116d2eac") version("2.16", sha256="fdbbf1efbf2324658a5774fdceef4a1b202322a04f895688d95694843df76792") diff --git a/var/spack/repos/builtin/packages/ccache/fix-gcc-12.patch b/var/spack/repos/builtin/packages/ccache/fix-gcc-12.patch new file mode 100644 index 00000000000000..638d76a2c3440a --- /dev/null +++ b/var/spack/repos/builtin/packages/ccache/fix-gcc-12.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/906310 +https://bugs.gentoo.org/906942 +https://github.com/ccache/ccache/issues/1289 +https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 + +From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl +Date: Tue, 1 Aug 2023 12:30:12 +0200 +Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 + +See also #1289. +--- a/src/storage/local/LocalStorage.cpp ++++ b/src/storage/local/LocalStorage.cpp +@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, + auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); + l2_content_lock.make_long_lived(lock_manager); + if (!l2_content_lock.acquire()) { +- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); ++ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 ++ LOG_RAW(fmt::format( ++ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); + return; + } diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index 06b1eb09685026..c785ca663c0cda 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Ccache(CMakePackage): executables = ["^ccache$"] + license("GPL-3.0-or-later") + version("4.8.2", sha256="75eef15b8b9da48db9c91e1d0ff58b3645fc70c0e4ca2ef1b6825a12f21f217d") version("4.8.1", sha256="869903c1891beb8bee87f1ec94d8a0dad18c2add4072c456acbc85cdfc23ca63") version("4.8", sha256="ac4b01748fd59cfe07e070c34432b91bdd0fd8640e1e653a80b01d6a523186b0") @@ -72,6 +74,8 @@ class Ccache(CMakePackage): conflicts("%clang@:7", when="@4.7:") conflicts("%clang@:4", when="@4.4:") + patch("fix-gcc-12.patch", when="%gcc@12") + def cmake_args(self): return [ self.define("ENABLE_TESTING", False), diff --git a/var/spack/repos/builtin/packages/ccfits/package.py b/var/spack/repos/builtin/packages/ccfits/package.py index 54d1b4fbe36e7b..1b2a98f8686680 100644 --- a/var/spack/repos/builtin/packages/ccfits/package.py +++ b/var/spack/repos/builtin/packages/ccfits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ccls/package.py b/var/spack/repos/builtin/packages/ccls/package.py index 04a82cda1fc739..08f5a5059ad05c 100644 --- a/var/spack/repos/builtin/packages/ccls/package.py +++ b/var/spack/repos/builtin/packages/ccls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Ccls(CMakePackage): maintainers("jacobmerson") + license("Apache-2.0") + version( "0.20220729", sha256="af19be36597c2a38b526ce7138c72a64c7fb63827830c4cff92256151fc7a6f4" ) diff --git a/var/spack/repos/builtin/packages/ccs-qcd/package.py b/var/spack/repos/builtin/packages/ccs-qcd/package.py index 901519f802c41e..bd404445ccd823 100644 --- a/var/spack/repos/builtin/packages/ccs-qcd/package.py +++ b/var/spack/repos/builtin/packages/ccs-qcd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class CcsQcd(MakefilePackage): tags = ["hep"] + license("BSD-3-Clause") + version("master", branch="master") version("1.2.1", commit="d7c6b6923f35a824e997ba8db5bd12dc20dda45c") diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index a8e990b783ed45..d3244d76b61fca 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cdbfasta/package.py b/var/spack/repos/builtin/packages/cdbfasta/package.py index adac5de886c965..24ab2790e6723b 100644 --- a/var/spack/repos/builtin/packages/cdbfasta/package.py +++ b/var/spack/repos/builtin/packages/cdbfasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cdbfasta(MakefilePackage): homepage = "https://github.com/gpertea/cdbfasta" git = "https://github.com/gpertea/cdbfasta.git" + license("Artistic-2.0") + version("2017-03-16", commit="b3e481fe02dfbc767a3842bcb1b687c60376a5e8") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/cdd/package.py b/var/spack/repos/builtin/packages/cdd/package.py index 73a66f9dd53d18..8a1940261f56ed 100644 --- a/var/spack/repos/builtin/packages/cdd/package.py +++ b/var/spack/repos/builtin/packages/cdd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Cdd(Package): homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/cdd.html" url = "https://www.cs.mcgill.ca/~fukuda/download/cdd/cdd-061a.tar.gz" + license("GPL-2.0-or-later") + version("0.61a", sha256="637a1909bbd8aa4d32667da08f9e9ac687bf7d3ef1b8af5bd227e91a3cd4019b") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/cddlib/package.py b/var/spack/repos/builtin/packages/cddlib/package.py index 1f6966f7bf6406..fbf3e0b33b141c 100644 --- a/var/spack/repos/builtin/packages/cddlib/package.py +++ b/var/spack/repos/builtin/packages/cddlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class Cddlib(AutotoolsPackage): homepage = "https://people.inf.ethz.ch/fukudak/cdd_home" url = "https://github.com/cddlib/cddlib/archive/refs/tags/0.94m.tar.gz" + + license("GPL-2.0-or-later") + maintainers("NessieCanCode") version("0.94m", sha256="70dffdb3369b8704dc75428a1b3c42ab9047b81ce039f12f427e2eb2b1b0dee2") version("0.94h", sha256="7382782c3834214b022c8b2898ed775a7bf915f2cb2acb73fa045d6fd9a3de33") diff --git a/var/spack/repos/builtin/packages/cdecimal/package.py b/var/spack/repos/builtin/packages/cdecimal/package.py index 7fe641184f56ea..a725b726ca0881 100644 --- a/var/spack/repos/builtin/packages/cdecimal/package.py +++ b/var/spack/repos/builtin/packages/cdecimal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cdecimal(AutotoolsPackage): homepage = "https://www.bytereef.org/mpdecimal/" url = "https://www.bytereef.org/software/mpdecimal/releases/cdecimal-2.3.tar.gz" + license("BSD-2-Clause") + version("2.3", sha256="d737cbe43ed1f6ad9874fb86c3db1e9bbe20c0c750868fde5be3f379ade83d8b") patch("darwin_install_name.patch", when="platform=darwin") diff --git a/var/spack/repos/builtin/packages/cdhit/package.py b/var/spack/repos/builtin/packages/cdhit/package.py index fb9db33107d8c3..1d6bdf304b5668 100644 --- a/var/spack/repos/builtin/packages/cdhit/package.py +++ b/var/spack/repos/builtin/packages/cdhit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cdhit(MakefilePackage): homepage = "http://cd-hit.org/" url = "https://github.com/weizhongli/cdhit/archive/V4.6.8.tar.gz" + license("GPL-2.0-only") + version("4.8.1", sha256="f8bc3cdd7aebb432fcd35eed0093e7a6413f1e36bbd2a837ebc06e57cdb20b70") version("4.6.8", sha256="37d685e4aa849314401805fe4d4db707e1d06070368475e313d6f3cb8fb65949") diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 051a499d45793e..f3e27754df7143 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,11 @@ class Cdo(AutotoolsPackage): maintainers("skosukhin", "Try2Code") + version( + "2.3.0", + sha256="10c878227baf718a6917837527d4426c2d0022cfac4457c65155b9c57f091f6b", + url="https://code.mpimet.mpg.de/attachments/download/29019/cdo-2.3.0.tar.gz", + ) version( "2.2.2", sha256="419c77315244019af41a296c05066f474cccbf94debfaae9e2106da51bc7c937", diff --git a/var/spack/repos/builtin/packages/cdt/package.py b/var/spack/repos/builtin/packages/cdt/package.py index 559fd82ee53ada..4e73a052863391 100644 --- a/var/spack/repos/builtin/packages/cdt/package.py +++ b/var/spack/repos/builtin/packages/cdt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,10 @@ class Cdt(CMakePackage): maintainers("jcortial-safran") + license("MPL-2.0-no-copyleft-exception") + + version("1.4.0", sha256="cb5a95a39b417f5a4d170c7ebe97232d0ed36ea64069339b14964dd52dea95ab") + version("1.3.6", sha256="15881e4c451f3b7cceade9b11884b3813ff674dff3edae4fb7c440634f8d4c33") version("1.3.0", sha256="7e8feadf9534cf79f9bf188365510fd6bc68ea997758e1c68d1569f98da924da") variant( diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index a93649587b5811..fd72aa13019723 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/celeritas/package.py b/var/spack/repos/builtin/packages/celeritas/package.py index 83690862bfdf9f..89b273e29631c2 100644 --- a/var/spack/repos/builtin/packages/celeritas/package.py +++ b/var/spack/repos/builtin/packages/celeritas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,9 +17,25 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage): maintainers("sethrj") + license("Apache-2.0") + + version("0.4.1", sha256="24e5c15eb9eec45f52d94a6719ae3505388b49d409cb7e26c875c70ac409bd2c") + version( + "0.4.0", + sha256="8b8eaef84641eeca0fc40321d358205fc9d51e3c6dc7bd1bf03218c1919c774e", + deprecated=True, + ) version("0.3.2", sha256="65a33de2518716638375df259d9dfc4d68b821ba1110f56b24c823ef5c5df249") - version("0.3.1", sha256="0f1effab306856d66f5079e8cadcb63e8c1f8a79245b94bf44b89251b3fb0cf0") - version("0.3.0", sha256="f9620b6bcd8c9b5324ef215f8e44461f915c3fff47bf85ae442c9dafacaa79ac") + version( + "0.3.1", + sha256="0f1effab306856d66f5079e8cadcb63e8c1f8a79245b94bf44b89251b3fb0cf0", + deprecated=True, + ) + version( + "0.3.0", + sha256="f9620b6bcd8c9b5324ef215f8e44461f915c3fff47bf85ae442c9dafacaa79ac", + deprecated=True, + ) version("0.2.2", sha256="ba5e341d636e00e3d7dbac13a2016b97014917489f46b8b387a2adf9d9563872") version( "0.2.1", @@ -89,7 +105,7 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage): depends_on("geant4@10.7:11.0", when="@:0.2.0 +geant4") depends_on("hepmc3", when="+hepmc3") depends_on("root", when="+root") - depends_on("swig", when="+swig") + depends_on("swig@4.1:", when="+swig") depends_on("vecgeom", when="+vecgeom") depends_on("python", type="build") @@ -102,7 +118,8 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage): depends_on("root cxxstd=" + _std, when="+root cxxstd=" + _std) depends_on("vecgeom cxxstd=" + _std, when="+vecgeom cxxstd=" + _std) - depends_on("vecgeom +gdml@1.1.17:", when="+vecgeom") + depends_on("vecgeom@1.2.5:", when="+vecgeom @0.4:") + depends_on("vecgeom +gdml@1.1.17:1", when="+vecgeom @:0.3") depends_on("vecgeom +cuda", when="+vecgeom +cuda") conflicts("cxxstd=14", when="@0.3:") diff --git a/var/spack/repos/builtin/packages/centrifuge/package.py b/var/spack/repos/builtin/packages/centrifuge/package.py new file mode 100644 index 00000000000000..2b1cf86d3a850b --- /dev/null +++ b/var/spack/repos/builtin/packages/centrifuge/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Centrifuge(MakefilePackage): + """Classifier for metagenomic sequences.""" + + homepage = "https://ccb.jhu.edu/software/centrifuge/index.shtml" + url = "https://github.com/DaehwanKimLab/centrifuge/archive/refs/tags/v1.0.4.tar.gz" + + version("1.0.4", sha256="929daed0f84739f7636cc1ea2757527e83373f107107ffeb5937a403ba5201bc") + + def build(self, spec, prefix): + make() + + def install(self, spec, prefix): + make("install", "prefix=" + prefix) diff --git a/var/spack/repos/builtin/packages/cepgen/package.py b/var/spack/repos/builtin/packages/cepgen/package.py index 5058964d46bfad..c6a79f3fcb4377 100644 --- a/var/spack/repos/builtin/packages/cepgen/package.py +++ b/var/spack/repos/builtin/packages/cepgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cepgen(CMakePackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("1.1.0", sha256="2a4eaed161f007269516cbfb6e90421e657ab1922d4509de0165f08dde91bf3d") version( "1.0.2patch1", sha256="333bba0cb1965a98dec127e00c150eab1a515cd348a90f7b1d66d5cd8d206d21" diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index a001efca0484ba..d7a5cc9aa17c30 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Cereal(CMakePackage): homepage = "https://uscilab.github.io/cereal/" url = "https://github.com/USCiLab/cereal/archive/v1.3.2.tar.gz" + license("BSD-3-Clause") + version("1.3.2", sha256="16a7ad9b31ba5880dac55d62b5d6f243c3ebc8d46a3514149e56b5e7ea81f85f") version("1.3.1", sha256="65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976") version("1.3.0", sha256="329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5") diff --git a/var/spack/repos/builtin/packages/ceres-solver/package.py b/var/spack/repos/builtin/packages/ceres-solver/package.py index c9cdecc07e1f4f..5a8ac5db62d000 100644 --- a/var/spack/repos/builtin/packages/ceres-solver/package.py +++ b/var/spack/repos/builtin/packages/ceres-solver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class CeresSolver(CMakePackage): homepage = "http://ceres-solver.org" url = "http://ceres-solver.org/ceres-solver-1.12.0.tar.gz" + license("Apache-2.0") + version("2.2.0", sha256="48b2302a7986ece172898477c3bcd6deb8fb5cf19b3327bc49969aad4cede82d") version("2.0.0", sha256="10298a1d75ca884aa0507d1abb0e0f04800a92871cd400d4c361b56a777a7603") version("1.14.0", sha256="4744005fc3b902fed886ea418df70690caa8e2ff6b5a90f3dd88a3d291ef8e8e") diff --git a/var/spack/repos/builtin/packages/cernlib/package.py b/var/spack/repos/builtin/packages/cernlib/package.py index bf6fc22115c4e8..8e69d753c762f9 100644 --- a/var/spack/repos/builtin/packages/cernlib/package.py +++ b/var/spack/repos/builtin/packages/cernlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index 708461b2e2d35f..e8d89e46ae7cbf 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cfitsio(AutotoolsPackage): homepage = "https://heasarc.gsfc.nasa.gov/fitsio/" url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz" + license("custom") + version("4.3.0", sha256="fdadc01d09cf9f54253802c5ec87eb10de51ce4130411415ae88c30940621b8b") version("4.2.0", sha256="eba53d1b3f6e345632bb09a7b752ec7ced3d63ec5153a848380f3880c5d61889") version("4.1.0", sha256="b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a") diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py index ecdd759d1770e5..1a20720cc691af 100644 --- a/var/spack/repos/builtin/packages/cgal/package.py +++ b/var/spack/repos/builtin/packages/cgal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Cgal(CMakePackage): homepage = "https://www.cgal.org/" url = "https://github.com/CGAL/cgal/releases/download/v5.4.1/CGAL-5.4.1.tar.xz" + version("5.6", sha256="dcab9b08a50a06a7cc2cc69a8a12200f8d8f391b9b8013ae476965c10b45161f") version("5.5.2", sha256="b2b05d5616ecc69facdc24417cce0b04fb4321491d107db45103add520e3d8c3") version("5.4.1", sha256="4c3dd7ee4d36d237111a4d72b6e14170093271595d5b695148532daa95323d76") version("5.1.5", sha256="b1bb8a6053aa12baa5981aef20a542cd3e617a86826963fb8fb6852b1a0da97c") diff --git a/var/spack/repos/builtin/packages/cgdb/package.py b/var/spack/repos/builtin/packages/cgdb/package.py index 8632cfb3a1ddc3..73a8ff07eaf68e 100644 --- a/var/spack/repos/builtin/packages/cgdb/package.py +++ b/var/spack/repos/builtin/packages/cgdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cgdb(AutotoolsPackage): url = "https://cgdb.me/files/cgdb-0.7.1.tar.gz" git = "https://github.com/cgdb/cgdb.git" + license("GPL-2.0-or-later") + version("master", branch="master", submodules=False, preferred=True) version("0.7.1", sha256="bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198") version("0.7.0", sha256="bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423") diff --git a/var/spack/repos/builtin/packages/cgdcbxd/package.py b/var/spack/repos/builtin/packages/cgdcbxd/package.py index babbff74ab3889..c372afeed1b8f9 100644 --- a/var/spack/repos/builtin/packages/cgdcbxd/package.py +++ b/var/spack/repos/builtin/packages/cgdcbxd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cgdcbxd(AutotoolsPackage): homepage = "https://github.com/jrfastab/cgdcbxd" url = "https://github.com/jrfastab/cgdcbxd/archive/v1.0.2.tar.gz" + license("GPL-2.0-only") + version("1.0.2", sha256="ef626c60e27005d3cae1e19a60d0133be0d1f0a012b695f7f1f6ad5a2afa4166") version("1.0.1", sha256="663b87a5ab4a760e2446e479fec36f6300d53e6113af1408efc156325219900c") diff --git a/var/spack/repos/builtin/packages/cget/package.py b/var/spack/repos/builtin/packages/cget/package.py index b27d74cbc8d34a..fdb77f944dd075 100644 --- a/var/spack/repos/builtin/packages/cget/package.py +++ b/var/spack/repos/builtin/packages/cget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cget(PythonPackage): homepage = "https://github.com/pfultz2/cget" pypi = "cget/cget-0.1.9.tar.gz" + license("BSL-1.0") + version("0.2.0", sha256="835009ba6d623a36eee8056975d7cdbeebb0e0091a058b572ed433fb12ae18e8") version("0.1.9", sha256="2a7913b601bec615208585eda7e69998a43cc17080d36c2ff2ce8742c9794bf6") diff --git a/var/spack/repos/builtin/packages/cgl/package.py b/var/spack/repos/builtin/packages/cgl/package.py index a124eab19fd13d..75a1f586c3f45f 100644 --- a/var/spack/repos/builtin/packages/cgl/package.py +++ b/var/spack/repos/builtin/packages/cgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Cgl(AutotoolsPackage): depends_on("osi") depends_on("clp") + license("EPL-2.0") + version("0.60.7", sha256="93b30a80b5d2880c2e72d5877c64bdeaf4d7c1928b3194ea2f88b1aa4517fb1b") version("0.60.6", sha256="9e2c51ffad816ab408763d6b931e2a3060482ee4bf1983148969de96d4b2c9ce") version("0.60.3", sha256="cfeeedd68feab7c0ce377eb9c7b61715120478f12c4dd0064b05ad640e20f3fb") diff --git a/var/spack/repos/builtin/packages/cgm/package.py b/var/spack/repos/builtin/packages/cgm/package.py index f911193052fd4f..88d9335db698bb 100644 --- a/var/spack/repos/builtin/packages/cgm/package.py +++ b/var/spack/repos/builtin/packages/cgm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index 563dffd2875772..2036a78098bd1d 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Cgns(CMakePackage): parallel = False + license("Zlib") + version("develop", branch="develop") version("master", branch="master") version("4.4.0", sha256="3b0615d1e6b566aa8772616ba5fd9ca4eca1a600720e36eadd914be348925fe2") diff --git a/var/spack/repos/builtin/packages/chaco/package.py b/var/spack/repos/builtin/packages/chaco/package.py index a778dc817ead4f..08f4ade01309b5 100644 --- a/var/spack/repos/builtin/packages/chaco/package.py +++ b/var/spack/repos/builtin/packages/chaco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Chaco(CMakePackage): maintainers("pbrady", "zjibben") + license("LGPL-2.1-or-later") + version("develop", branch="truchas") version("2020-07-16", commit="92a877b381933d12b02507413897f696d81b4682", preferred=True) diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py index 9cde5d950733ca..2c07aee32cd698 100644 --- a/var/spack/repos/builtin/packages/chai/package.py +++ b/var/spack/repos/builtin/packages/chai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage): maintainers("davidbeckingsale") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=False) version("main", branch="main", submodules=False) version( @@ -60,6 +62,11 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage): version("1.0", tag="v1.0", commit="501a098ad879dc8deb4a74fcfe8c08c283a10627", submodules=True) variant("enable_pick", default=False, description="Enable pick method") + variant( + "separable_compilation", + default=True, + description="Build with CUDA_SEPARABLE_COMPILATION flag on ", + ) variant("shared", default=True, description="Build Shared Libs") variant("raja", default=False, description="Build plugin for RAJA") variant("benchmarks", default=False, description="Build benchmarks.") @@ -153,8 +160,9 @@ def initconfig_hardware_entries(self): if "+cuda" in spec: entries.append(cmake_cache_option("ENABLE_CUDA", True)) - entries.append(cmake_cache_option("CMAKE_CUDA_SEPARABLE_COMPILATION", True)) - entries.append(cmake_cache_option("CUDA_SEPARABLE_COMPILATION", True)) + if "+separable_compilation" in spec: + entries.append(cmake_cache_option("CMAKE_CUDA_SEPARABLE_COMPILATION", True)) + entries.append(cmake_cache_option("CUDA_SEPARABLE_COMPILATION", True)) if not spec.satisfies("cuda_arch=none"): cuda_arch = spec.variants["cuda_arch"].value diff --git a/var/spack/repos/builtin/packages/chameleon/package.py b/var/spack/repos/builtin/packages/chameleon/package.py index 7d6239ffb09bce..5f9c8451ab32b2 100644 --- a/var/spack/repos/builtin/packages/chameleon/package.py +++ b/var/spack/repos/builtin/packages/chameleon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/changa/package.py b/var/spack/repos/builtin/packages/changa/package.py index 25a54bf7fe2f31..43b55a6a85c2bf 100644 --- a/var/spack/repos/builtin/packages/changa/package.py +++ b/var/spack/repos/builtin/packages/changa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Changa(AutotoolsPackage): url = "https://github.com/N-BodyShop/changa/archive/v3.4.tar.gz" git = "https://github.com/N-BodyShop/changa.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("3.4", sha256="c2bceb6ac00025dfd704bb6960bc17c6df7c746872185845d1e75f47e6ce2a94") patch("fix_configure_path.patch") diff --git a/var/spack/repos/builtin/packages/channelflow/package.py b/var/spack/repos/builtin/packages/channelflow/package.py index 4dc26d43cdb21e..1f0cb9fa898bd6 100644 --- a/var/spack/repos/builtin/packages/channelflow/package.py +++ b/var/spack/repos/builtin/packages/channelflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Channelflow(CMakePackage): homepage = "https://github.com/epfl-ecps/channelflow" git = "https://github.com/epfl-ecps/channelflow.git" + license("GPL-2.0-only") + version("master", branch="master") variant("shared", default=True, description="Build shared libs") diff --git a/var/spack/repos/builtin/packages/chaparral/package.py b/var/spack/repos/builtin/packages/chaparral/package.py index eabee9836a8860..050ca651d4f5d7 100644 --- a/var/spack/repos/builtin/packages/chaparral/package.py +++ b/var/spack/repos/builtin/packages/chaparral/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Chaparral(CMakePackage): maintainers("pbrady", "zjibben") + license("LGPL-2.1-or-later") + version("develop", branch="truchas") version("2020-08-28", commit="c8a190bb74ef33ad8b2f7b67d20590f393fde32a", preferred=True) diff --git a/var/spack/repos/builtin/packages/chapel/package.py b/var/spack/repos/builtin/packages/chapel/package.py index 37970c6de915ab..feedd735d15e27 100644 --- a/var/spack/repos/builtin/packages/chapel/package.py +++ b/var/spack/repos/builtin/packages/chapel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Chapel(AutotoolsPackage): homepage = "https://chapel-lang.org/" url = "https://github.com/chapel-lang/chapel/releases/download/1.24.1/chapel-1.24.1.tar.gz" + license("Apache-2.0") + version("1.24.1", sha256="f898f266fccaa34d937b38730a361d42efb20753ba43a95e5682816e008ce5e4") version("1.24.0", sha256="77c6087f3e0837268470915f2ad260d49cf7ac4adf16f5b44862ae624c1be801") version("1.23.0", sha256="7ae2c8f17a7b98ac68378e94a842cf16d4ab0bcfeabc0fee5ab4aaa07b205661") diff --git a/var/spack/repos/builtin/packages/chaplin/package.py b/var/spack/repos/builtin/packages/chaplin/package.py index f19729a406e731..78244802438992 100644 --- a/var/spack/repos/builtin/packages/chaplin/package.py +++ b/var/spack/repos/builtin/packages/chaplin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/charliecloud/package.py b/var/spack/repos/builtin/packages/charliecloud/package.py index 88cca7d6e2a88a..0e8f9835454d97 100644 --- a/var/spack/repos/builtin/packages/charliecloud/package.py +++ b/var/spack/repos/builtin/packages/charliecloud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Charliecloud(AutotoolsPackage): tags = ["e4s"] + license("Apache-2.0") + version("master", branch="master") version("0.35", sha256="042f5be5ed8eda95f45230b4647510780142a50adb4e748be57e8dd8926b310e") version( diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index 43ef0d5bbc0ad2..637b111dac7a21 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/chatterbug/package.py b/var/spack/repos/builtin/packages/chatterbug/package.py index d92da3cda2d94d..eddb9e3a9b8964 100644 --- a/var/spack/repos/builtin/packages/chatterbug/package.py +++ b/var/spack/repos/builtin/packages/chatterbug/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Chatterbug(MakefilePackage): homepage = "https://chatterbug.readthedocs.io" git = "https://github.com/LLNL/chatterbug.git" + license("MIT") + version("develop", branch="master") version("1.0", tag="v1.0", commit="ee1b13c634943dbe32ac22f5e2154b00eab8c574") diff --git a/var/spack/repos/builtin/packages/check/package.py b/var/spack/repos/builtin/packages/check/package.py index 424f8854358c1e..b2c2900fd7600b 100644 --- a/var/spack/repos/builtin/packages/check/package.py +++ b/var/spack/repos/builtin/packages/check/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Check(AutotoolsPackage): homepage = "https://libcheck.github.io/check/index.html" url = "https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz" + license("LGPL-2.1-or-later") + version("0.15.2", sha256="a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a") version("0.12.0", sha256="464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234") version("0.11.0", sha256="24f7a48aae6b74755bcbe964ce8bc7240f6ced2141f8d9cf480bc3b3de0d5616") diff --git a/var/spack/repos/builtin/packages/chemfiles/package.py b/var/spack/repos/builtin/packages/chemfiles/package.py index 22594ed75411a8..148e806d6a456a 100644 --- a/var/spack/repos/builtin/packages/chemfiles/package.py +++ b/var/spack/repos/builtin/packages/chemfiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Chemfiles(CMakePackage): maintainers("RMeli") + license("BSD-3-Clause") + version("0.10.4", sha256="b8232ddaae2953538274982838aa6c2df87d300f7e2f80e92c171581e06325ba") version("0.10.3", sha256="5f53d87a668a85bebf04e0e8ace0f1db984573de1c54891ba7d37d31cced0408") diff --git a/var/spack/repos/builtin/packages/chexmix/package.py b/var/spack/repos/builtin/packages/chexmix/package.py index 6654102f4f11bf..280321a5a59e3c 100644 --- a/var/spack/repos/builtin/packages/chexmix/package.py +++ b/var/spack/repos/builtin/packages/chexmix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/chgcentre/package.py b/var/spack/repos/builtin/packages/chgcentre/package.py index 78d8ceaea7a659..4ad3cbffa3801c 100644 --- a/var/spack/repos/builtin/packages/chgcentre/package.py +++ b/var/spack/repos/builtin/packages/chgcentre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py index c01f9af296f610..d408749f5dfeeb 100644 --- a/var/spack/repos/builtin/packages/chlorop/package.py +++ b/var/spack/repos/builtin/packages/chlorop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index 9ee703bd9043e8..f28606aad3b02d 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Chombo(MakefilePackage): tags = ["ecp", "ecp-apps"] + license("BSD-3-Clause-LBNL") + # Use whatever path Brian V. and Terry L. agreed upon, but preserve version version("3.2", commit="71d856c2f469e96755a606db1e5151067da0f54a") version("develop", branch="master") diff --git a/var/spack/repos/builtin/packages/chrony/package.py b/var/spack/repos/builtin/packages/chrony/package.py index a6795b3064351f..1219b0c0cbc83f 100644 --- a/var/spack/repos/builtin/packages/chrony/package.py +++ b/var/spack/repos/builtin/packages/chrony/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Chrony(AutotoolsPackage): homepage = "https://chrony.tuxfamily.org/" url = "https://github.com/mlichvar/chrony/archive/3.5.1.tar.gz" + license("GPL-2.0-or-later") + version("3.5.1", sha256="881085b944a14853402e1c5cff4de5d815ff104ec6e12eea51c12e42f32f71bd") version("3.5", sha256="145a270fe4df42931f175e37dd3771a7e714122ae361921a4b93082e648a08c5") version("3.4", sha256="85fbe433f5a3ee961a20c47a72367760b074448587a9e2d3a6788a95750ed77e") diff --git a/var/spack/repos/builtin/packages/chrpath/package.py b/var/spack/repos/builtin/packages/chrpath/package.py index e0a50dc59e56a1..fe0c081d7faa6e 100644 --- a/var/spack/repos/builtin/packages/chrpath/package.py +++ b/var/spack/repos/builtin/packages/chrpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Chrpath(AutotoolsPackage): homepage = "https://directory.fsf.org/wiki/Chrpath" url = "https://cfhcable.dl.sourceforge.net/project/pisilinux/source/chrpath-0.16.tar.gz" + license("GPL-2.0-or-later") + version("0.16", sha256="bb0d4c54bac2990e1bdf8132f2c9477ae752859d523e141e72b3b11a12c26e7b") diff --git a/var/spack/repos/builtin/packages/cinch/package.py b/var/spack/repos/builtin/packages/cinch/package.py index 26e33f0b95361a..7f80855b936c21 100644 --- a/var/spack/repos/builtin/packages/cinch/package.py +++ b/var/spack/repos/builtin/packages/cinch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Cinch(Package): url = "https://github.com/laristra/cinch/archive/1.0.zip" git = "https://github.com/laristra/cinch.git" + license("Unlicense") + version("master", branch="master", submodules=False) version("1.0", sha256="98b73473829b478191481621d84c3d63c662da6e951321f858a032eae3ca07b7") diff --git a/var/spack/repos/builtin/packages/circe2/package.py b/var/spack/repos/builtin/packages/circe2/package.py index 21ae748bbab8b0..5b42f60d607e15 100644 --- a/var/spack/repos/builtin/packages/circe2/package.py +++ b/var/spack/repos/builtin/packages/circe2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Circe2(AutotoolsPackage): maintainers("tmadlener") + license("GPL-2.0-or-later") + version("3.1.2.1", sha256="8bb09e6f566adefcf7b5b1cf9d9fe4536dd3dd11ed3674861de29e177ee0bb04") variant("doc", default=False, description="Create the latex documentation") diff --git a/var/spack/repos/builtin/packages/circos/package.py b/var/spack/repos/builtin/packages/circos/package.py index 47097fea8e1dbf..5642fb854cbb1c 100644 --- a/var/spack/repos/builtin/packages/circos/package.py +++ b/var/spack/repos/builtin/packages/circos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Circos(Package): homepage = "http://circos.ca/" url = "http://circos.ca/distribution/circos-0.69-6.tgz" + license("GPL-3.0-only") + version("0.69-9", sha256="34d8d7ebebf3f553d62820f8f4a0a57814b610341f836b4740c46c3057f789d2") version("0.69-6", sha256="52d29bfd294992199f738a8d546a49754b0125319a1685a28daca71348291566") diff --git a/var/spack/repos/builtin/packages/cistem/package.py b/var/spack/repos/builtin/packages/cistem/package.py index 693a9290b0e017..41a94c291133d4 100644 --- a/var/spack/repos/builtin/packages/cistem/package.py +++ b/var/spack/repos/builtin/packages/cistem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cistem(AutotoolsPackage): homepage = "https://cistem.org/" url = "https://cistem.org/system/tdf/upload3/cistem-1.0.0-beta-source-code.tar.gz?file=1&type=cistem_details&id=37&force=0" + license("GPL-2.0-only") + version( "1.0.0-beta", sha256="c62068f53d0a269ffa1bfff34641597d3795989a930686437fba9eed7a991af6" ) diff --git a/var/spack/repos/builtin/packages/citcoms/package.py b/var/spack/repos/builtin/packages/citcoms/package.py index 6ebe2584f28c2e..0e83ec33cd644b 100644 --- a/var/spack/repos/builtin/packages/citcoms/package.py +++ b/var/spack/repos/builtin/packages/citcoms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Citcoms(AutotoolsPackage): maintainers("adamjstewart") + license("GPL-2.0-or-later") + version("master", branch="master", submodules=True) version("3.3.1", sha256="e3520e0a933e4699d31e86fe309b8c154ea6ecb0f42a1cf6f25e8d13d825a4b3") version("3.2.0", sha256="773a14d91ecbb4a4d1e04317635fab79819d83c57b47f19380ff30b9b19cb07a") diff --git a/var/spack/repos/builtin/packages/cityhash/package.py b/var/spack/repos/builtin/packages/cityhash/package.py index a8e549eb196ef8..2929bf09771c11 100644 --- a/var/spack/repos/builtin/packages/cityhash/package.py +++ b/var/spack/repos/builtin/packages/cityhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cjson/package.py b/var/spack/repos/builtin/packages/cjson/package.py index 11a6e1834249ec..937044baa5c470 100644 --- a/var/spack/repos/builtin/packages/cjson/package.py +++ b/var/spack/repos/builtin/packages/cjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Cjson(CMakePackage): git = "https://github.com/DaveGamble/cJSON" url = "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.zip" + license("MIT") + version("1.7.15", sha256="c55519316d940757ef93a779f1db1ca809dbf979c551861f339d35aaea1c907c") diff --git a/var/spack/repos/builtin/packages/ck/package.py b/var/spack/repos/builtin/packages/ck/package.py index 3f2994eba1be03..82562782543ff1 100644 --- a/var/spack/repos/builtin/packages/ck/package.py +++ b/var/spack/repos/builtin/packages/ck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ck(MavenPackage): homepage = "https://github.com/mauricioaniche/ck" url = "https://github.com/mauricioaniche/ck/archive/ck-0.6.2.tar.gz" + license("BSD-2-Clause AND Apache-2.0") + version("0.6.2", sha256="ee16d209f05852230504dea1af39cdb1cfc8e9b56f4708ed1afcd5ce44af76eb") version("0.6.1", sha256="1db1fef7111bb485d5554d5927611761a102133a41b88e8fb20cd44494411ac4") version("0.6.0", sha256="8a1affad047fbefda5d2dad1a795204ffd06c50e2fba830f87cf6c7518423137") diff --git a/var/spack/repos/builtin/packages/clamav/package.py b/var/spack/repos/builtin/packages/clamav/package.py index a93511f0a6f2e6..14e3b0c11b159d 100644 --- a/var/spack/repos/builtin/packages/clamav/package.py +++ b/var/spack/repos/builtin/packages/clamav/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Clamav(AutotoolsPackage): homepage = "https://www.clamav.net/" url = "https://www.clamav.net/downloads/production/clamav-0.101.2.tar.gz" + license("GPL-2.0-only") + version("0.101.2", sha256="0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/clamr/package.py b/var/spack/repos/builtin/packages/clamr/package.py index 261d34cbad01e1..cba0c2cab81a52 100644 --- a/var/spack/repos/builtin/packages/clamr/package.py +++ b/var/spack/repos/builtin/packages/clamr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Clamr(CMakePackage): git = "https://github.com/lanl/CLAMR.git" tags = ["proxy-app"] + license("Unlicense") + version("master") variant( diff --git a/var/spack/repos/builtin/packages/clapack/package.py b/var/spack/repos/builtin/packages/clapack/package.py index d4b9fed30ac3f8..10e1ce2652656a 100644 --- a/var/spack/repos/builtin/packages/clapack/package.py +++ b/var/spack/repos/builtin/packages/clapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Clapack(MakefilePackage): homepage = "https://www.netlib.org/clapack/" url = "https://www.netlib.org/clapack/clapack.tgz" + license("BSD-3-Clause") + version("3.2.1", sha256="6dc4c382164beec8aaed8fd2acc36ad24232c406eda6db462bd4c41d5e455fac") variant("external-blas", default=True, description="Build with external BLAS (ATLAS here).") diff --git a/var/spack/repos/builtin/packages/clara/package.py b/var/spack/repos/builtin/packages/clara/package.py index 1840b42d596b2c..812ec40305e7b4 100644 --- a/var/spack/repos/builtin/packages/clara/package.py +++ b/var/spack/repos/builtin/packages/clara/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Clara(CMakePackage, Package): variant("single_header", default=True, description="Install a single header only.") + license("BSL-1.0") + version("1.1.5", sha256="767dc1718e53678cbea00977adcd0a8a195802a505aec3c537664cf25a173142") version("1.1.4", sha256="ed3f9cc32e4ea6075c26caff63ee14a87e43dee1f3010c02bd041b9a0c86f72d") version("1.1.3", sha256="a8132befb6b32bf447a74f7e758ac0b63e7bab86974aeb55ee2fd1cd77385f9e") diff --git a/var/spack/repos/builtin/packages/claw/package.py b/var/spack/repos/builtin/packages/claw/package.py index bceab8345a62d6..025f216a44b954 100644 --- a/var/spack/repos/builtin/packages/claw/package.py +++ b/var/spack/repos/builtin/packages/claw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Claw(CMakePackage): git = "https://github.com/claw-project/claw-compiler.git" maintainers("clementval", "skosukhin") + license("BSD-2-Clause") + version( "2.0.3", tag="v2.0.3", commit="4d8bc7a794af3651b8b61501388fc00096b23a85", submodules=True ) diff --git a/var/spack/repos/builtin/packages/clblast/package.py b/var/spack/repos/builtin/packages/clblast/package.py index 92e23e223c17c4..59146265f48250 100644 --- a/var/spack/repos/builtin/packages/clblast/package.py +++ b/var/spack/repos/builtin/packages/clblast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Clblast(CMakePackage): maintainers("umar456") + license("Apache-2.0") + version("master", branch="master") version("1.5.2", sha256="0e3a017c3aa352e0bf94ea65cfc9609beb2c22204d31c2ef43d0478178cfee00") version("1.5.1", sha256="a0f0cb7308b59a495c23beaef1674093ed26996f66d439623808755dbf568c3f") @@ -33,7 +35,8 @@ class Clblast(CMakePackage): version("1.0.1", sha256="6c9415a1394c554debce85c47349ecaaebdc9d5baa187d3ecb84be00ae9c70f0") version("1.0.0", sha256="230a55a868bdd21425867cbd0dcb7ec046aa5ca522fb5694e42740b5b16d0f59") - depends_on("opencl +icd") + depends_on("opencl") + depends_on("pocl+icd", when="^[virtuals=opencl] pocl") variant("shared", description="Build a shared libraries", default=True) variant("tuners", description="Enable compilation of the tuners", default=False) diff --git a/var/spack/repos/builtin/packages/cleaveland4/package.py b/var/spack/repos/builtin/packages/cleaveland4/package.py index 518da2d520fbd7..84bb60f4e66ea7 100644 --- a/var/spack/repos/builtin/packages/cleaveland4/package.py +++ b/var/spack/repos/builtin/packages/cleaveland4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cleaveland4(Package): homepage = "https://github.com/MikeAxtell/CleaveLand4" url = "https://github.com/MikeAxtell/CleaveLand4/archive/v4.4.tar.gz" + license("GPL-3.0-or-later") + version("4.5", sha256="d0ad584a8bc2391cdee5f6279b2351f7db972362669467564e6bd3f94dcd9dd1") version("4.4", sha256="bf7fe6ad730ea2bfb2e0c0f863734f189073a69b1754532012f1261b368b24e7") diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index b330d78d7168a8..8f16ba94d24f83 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cleverleaf(CMakePackage): homepage = "https://uk-mac.github.io/CleverLeaf/" git = "https://github.com/UK-MAC/CleverLeaf_ref.git" + license("LGPL-3.0-or-later") + version("develop", branch="develop") depends_on("samrai@3.8.0:") diff --git a/var/spack/repos/builtin/packages/clfft/package.py b/var/spack/repos/builtin/packages/clfft/package.py index 473ac1b09622e7..38deb524c7796d 100644 --- a/var/spack/repos/builtin/packages/clfft/package.py +++ b/var/spack/repos/builtin/packages/clfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Clfft(CMakePackage): homepage = "https://github.com/clMathLibraries/clFFT" url = "https://github.com/clMathLibraries/clFFT/archive/v2.12.2.tar.gz" + license("Apache-2.0") + version("2.12.2", sha256="e7348c146ad48c6a3e6997b7702202ad3ee3b5df99edf7ef00bbacc21e897b12") variant("client", default=True, description="build client and callback client") diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 43165ef8b7292d..56796d9433ce24 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Clhep(CMakePackage): maintainers("drbenmorgan") + version("2.4.7.1", sha256="1c8304a7772ac6b99195f1300378c6e3ddf4ad07c85d64a04505652abb8a55f9") + version("2.4.7.0", sha256="7fa460030bc1a804ea7da8cce7611b93261493bbb66c3cfd3ceec935d7e1b8d3") version("2.4.6.4", sha256="49c89330f1903ef707d3c5d79c16a7c5a6f2c90fc290e2034ee3834809489e57") version("2.4.6.3", sha256="fcd007f11b10ba4af28d027222b63148d0eb44ff7a082eee353bdf921f9c684a") version("2.4.6.2", sha256="aded73e49bac85a5b4e86f64a0ee3d6f3cfe5551b0f7731c78b6d8f9dac6e8dc") @@ -49,6 +51,7 @@ class Clhep(CMakePackage): version("2.2.0.8", sha256="f735e236b1f023ba7399269733b2e84eaed4de615081555b1ab3af25a1e92112") version("2.2.0.5", sha256="92e8b5d32ae96154edd27d0c641ba048ad33cb69dd4f1cfb72fc578770a34818") version("2.2.0.4", sha256="9bf7fcd9892313c8d1436bc4a4a285a016c4f8e81e1fc65bdf6783207ae57550") + version("2.1.2.3", sha256="4353231be09c134507092161cd3ced27a065ca0ebb31ee0256e60a8163c47c3b") variant( "cxxstd", diff --git a/var/spack/repos/builtin/packages/cli11/package.py b/var/spack/repos/builtin/packages/cli11/package.py index 014b304363d737..f909bd0e5874b9 100644 --- a/var/spack/repos/builtin/packages/cli11/package.py +++ b/var/spack/repos/builtin/packages/cli11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cli11(CMakePackage): url = "https://github.com/CLIUtils/CLI11/archive/v1.9.1.tar.gz" maintainers("nightlark") + license("BitTorrent-1.0") + version("2.3.2", sha256="aac0ab42108131ac5d3344a9db0fdf25c4db652296641955720a4fbe52334e22") version("2.3.1", sha256="378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2") version("2.1.1", sha256="d69023d1d0ab6a22be86b4f59d449422bc5efd9121868f4e284d6042e52f682e") diff --git a/var/spack/repos/builtin/packages/clinfo/package.py b/var/spack/repos/builtin/packages/clinfo/package.py index 69fa778fda022b..8dc7876d0f4a96 100644 --- a/var/spack/repos/builtin/packages/clinfo/package.py +++ b/var/spack/repos/builtin/packages/clinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Clinfo(MakefilePackage): maintainers("matthiasdiener") + license("CC0-1.0") + version( "3.0.21.02.21", sha256="e52f5c374a10364999d57a1be30219b47fb0b4f090e418f2ca19a0c037c1e694" ) diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 77027c4ba5f317..a11ff0a0484146 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/clingo/clingo_msc_1938_native_handle.patch b/var/spack/repos/builtin/packages/clingo/clingo_msc_1938_native_handle.patch new file mode 100644 index 00000000000000..774169557c58cc --- /dev/null +++ b/var/spack/repos/builtin/packages/clingo/clingo_msc_1938_native_handle.patch @@ -0,0 +1,30 @@ +From c84b07de81cc24e9ac411fc404c54a9a5120029c Mon Sep 17 00:00:00 2001 +From: Benjamin Kaufmann +Date: Wed, 22 Nov 2023 08:13:46 +0100 +Subject: [PATCH] mt: Make condition_variable::native_handle() conditional. + +* According to the C++ standard, the presence and semantics of + std::condition_variable::native_handle (and native_handle_type) is + implementation-defined. E.g., starting with VS 2022 17.8, Microsoft's + implementation no longer provides them at all. +--- + clasp/mt/mutex.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/clasp/clasp/mt/mutex.h b/clasp/clasp/mt/mutex.h +index 2439888..ade899c 100644 +--- a/clasp/clasp/mt/mutex.h ++++ b/clasp/clasp/mt/mutex.h +@@ -39,7 +39,11 @@ struct condition_variable : private std::condition_variable { + using base_type::notify_one; + using base_type::notify_all; + using base_type::wait; +- using base_type::native_handle; ++ ++ template ++ inline auto native_handle() -> typename X::native_handle_type { ++ return X::native_handle(); ++ } + + inline bool wait_for(unique_lock& lock, double timeInSecs) { + return base_type::wait_for(lock, std::chrono::duration_cast(std::chrono::duration(timeInSecs))) diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index f64dc6e8121dcd..ac242c57cd3a93 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Clingo(CMakePackage): tags = ["windows"] maintainers("tgamblin", "alalazo") + license("MIT") + version("master", branch="master", submodules=True) version("spack", commit="2a025667090d71b2c9dce60fe924feb6bde8f667", submodules=True) version("5.6.2", sha256="81eb7b14977ac57c97c905bd570f30be2859eabc7fe534da3cdc65eaca44f5be") @@ -50,6 +52,7 @@ class Clingo(CMakePackage): depends_on("re2c@0.13:", type="build") depends_on("bison@2.5:", type="build", when="platform=linux") depends_on("bison@2.5:", type="build", when="platform=darwin") + depends_on("bison@2.5:", type="build", when="platform=freebsd") depends_on("bison@2.5:", type="build", when="platform=cray") with when("platform=windows"): @@ -61,13 +64,15 @@ class Clingo(CMakePackage): depends_on("python", type=("build", "link", "run")) # Clingo 5.5.0 supports Python 3.6 or later and needs CFFI depends_on("python@3.6.0:", type=("build", "link", "run"), when="@5.5.0:") - depends_on("py-cffi", type=("build", "run"), when="@5.5.0: platform=darwin") depends_on("py-cffi", type=("build", "run"), when="@5.5.0: platform=linux") + depends_on("py-cffi", type=("build", "run"), when="@5.5.0: platform=darwin") + depends_on("py-cffi", type=("build", "run"), when="@5.5.0: platform=freebsd") depends_on("py-cffi", type=("build", "run"), when="@5.5.0: platform=cray") patch("python38.patch", when="@5.3:5.4.0") patch("size-t.patch", when="%msvc") patch("vs2022.patch", when="%msvc@19.30:") + patch("clingo_msc_1938_native_handle.patch", when="%msvc@19.38:") # TODO: Simplify this after Spack 0.21 release. The old concretizer has problems with # py-setuptools ^python@3.6, so we only apply the distutils -> setuptools patch for Python 3.12 @@ -86,22 +91,6 @@ def patch(self): "clasp/libpotassco/CMakeLists.txt", ) - @property - def cmake_python_hints(self): - """Return standard CMake defines to ensure that the - current spec is the one found by CMake find_package(Python, ...) - """ - python = self.spec["python"] - return [ - self.define("Python_EXECUTABLE", python.command.path), - self.define("Python_INCLUDE_DIR", python.headers.directories[0]), - self.define("Python_LIBRARIES", python.libs[0]), - # XCode command line tools on macOS has no python-config executable, and - # CMake assumes you have python 2 if it does not find a python-config, - # so we set the version explicitly so that it's passed to FindPython. - self.define("CLINGO_PYTHON_VERSION", python.version.up_to(2)), - ] - @property def cmake_py_shared(self): return self.define("CLINGO_BUILD_PY_SHARED", "ON") @@ -122,8 +111,6 @@ def cmake_args(self): "-DPYCLINGO_USE_INSTALL_PREFIX=ON", self.cmake_py_shared, ] - if self.spec["cmake"].satisfies("@3.16.0:"): - args += self.cmake_python_hints else: args += ["-DCLINGO_BUILD_WITH_PYTHON=OFF"] diff --git a/var/spack/repos/builtin/packages/cln/package.py b/var/spack/repos/builtin/packages/cln/package.py index 9214270a9d9bd8..b5ce6793e9340a 100644 --- a/var/spack/repos/builtin/packages/cln/package.py +++ b/var/spack/repos/builtin/packages/cln/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Cln(AutotoolsPackage): url = "https://www.ginac.de/CLN/cln-1.3.6.tar.bz2" git = "git://www.ginac.de/cln.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("1.3.6", commit="d4ba1cc869be2c647c4ab48ac571b1fc9c2021a9") version("1.3.5", commit="b221c033c082b462455502b7e63702a9c466aede") diff --git a/var/spack/repos/builtin/packages/cloc/package.py b/var/spack/repos/builtin/packages/cloc/package.py index 146f2de9a8faaf..ea565a768e6f81 100644 --- a/var/spack/repos/builtin/packages/cloc/package.py +++ b/var/spack/repos/builtin/packages/cloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cloog/package.py b/var/spack/repos/builtin/packages/cloog/package.py index 58dcb8715e2ff6..f18ba78ebc0b8c 100644 --- a/var/spack/repos/builtin/packages/cloog/package.py +++ b/var/spack/repos/builtin/packages/cloog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cloverleaf-ref/package.py b/var/spack/repos/builtin/packages/cloverleaf-ref/package.py index 70c0daaf9154cd..77456edb165562 100644 --- a/var/spack/repos/builtin/packages/cloverleaf-ref/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf-ref/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cloverleaf/package.py b/var/spack/repos/builtin/packages/cloverleaf/package.py index e30667b37a3af0..4848130837c1b9 100644 --- a/var/spack/repos/builtin/packages/cloverleaf/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Cloverleaf(MakefilePackage): tags = ["proxy-app"] + license("LGPL-3.0-or-later") + version("master", branch="master", submodules=True) version("1.1", sha256="de87f7ee6b917e6b3d243ccbbe620370c62df890e3ef7bdbab46569b57be132f") diff --git a/var/spack/repos/builtin/packages/cloverleaf3d/package.py b/var/spack/repos/builtin/packages/cloverleaf3d/package.py index cf3502bfdfb1bf..5eb8bcef88046a 100644 --- a/var/spack/repos/builtin/packages/cloverleaf3d/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Cloverleaf3d(MakefilePackage): maintainers("s1913388") + license("LGPL-3.0-or-later") + version("1.0", sha256="78d591728c61bdfd6175b3930df7652e09ed04fbcd01b3fc86fb2aa0f237a8ef") variant("opencl", default=False, description="Enable OpenCL Support") diff --git a/var/spack/repos/builtin/packages/clp/package.py b/var/spack/repos/builtin/packages/clp/package.py index e1c39d18c4be28..f245a386571113 100644 --- a/var/spack/repos/builtin/packages/clp/package.py +++ b/var/spack/repos/builtin/packages/clp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Clp(AutotoolsPackage): depends_on("osi") depends_on("pkgconfig", type="build") + license("EPL-2.0") + version("1.17.7", sha256="c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5") version("1.17.6", sha256="afff465b1620cfcbb7b7c17b5d331d412039650ff471c4160c7eb24ae01284c9") version("1.17.4", sha256="ef412cde00cb1313d9041115a700d8d59d4b8b8b5e4dde43e9deb5108fcfbea8") diff --git a/var/spack/repos/builtin/packages/clustal-omega/package.py b/var/spack/repos/builtin/packages/clustal-omega/package.py index 5ce93aa61cb9d4..3cafd307e6c13d 100644 --- a/var/spack/repos/builtin/packages/clustal-omega/package.py +++ b/var/spack/repos/builtin/packages/clustal-omega/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class ClustalOmega(AutotoolsPackage): homepage = "http://www.clustal.org/omega/" url = "http://www.clustal.org/omega/clustal-omega-1.2.4.tar.gz" + license("GPL-2.0-or-later") + version("1.2.4", sha256="8683d2286d663a46412c12a0c789e755e7fd77088fb3bc0342bb71667f05a3ee") depends_on("argtable") diff --git a/var/spack/repos/builtin/packages/clustalw/package.py b/var/spack/repos/builtin/packages/clustalw/package.py index cedd144faad40f..ece7896b687db4 100644 --- a/var/spack/repos/builtin/packages/clustalw/package.py +++ b/var/spack/repos/builtin/packages/clustalw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Clustalw(AutotoolsPackage): homepage = "http://www.clustal.org/clustal2/" url = "http://www.clustal.org/download/2.1/clustalw-2.1.tar.gz" + license("LGPL-3.0-only") + version("2.1", sha256="e052059b87abfd8c9e695c280bfba86a65899138c82abccd5b00478a80f49486") diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 16f3fc8d618ccd..b9460331cc1840 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,13 +20,17 @@ class Cmake(Package): url = "https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0.tar.gz" git = "https://gitlab.kitware.com/cmake/cmake.git" - maintainers("alalazo") + maintainers("alalazo", "johnwparent") tags = ["build-tools", "windows"] executables = ["^cmake[0-9]*$"] + license("BSD-3-Clause") + version("master", branch="master") + version("3.27.9", sha256="609a9b98572a6a5ea477f912cffb973109ed4d0a6a6b3f9e2353d2cdc048708e") + version("3.27.8", sha256="fece24563f697870fbb982ea8bf17482c9d5f855d8c9bf0b82463d76c9e8d0cc") version("3.27.7", sha256="08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e") version("3.27.6", sha256="ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb") version("3.27.4", sha256="0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af") @@ -34,6 +38,7 @@ class Cmake(Package): version("3.27.2", sha256="798e50085d423816fe96c9ef8bee5e50002c9eca09fed13e300de8a91d35c211") version("3.27.1", sha256="b1a6b0135fa11b94476e90f5b32c4c8fad480bf91cf22d0ded98ce22c5132004") version("3.27.0", sha256="aaeddb6b28b993d0a6e32c88123d728a17561336ab90e0bf45032383564d3cb8") + version("3.26.6", sha256="070b9a2422e666d2c1437e2dab239a236e8a63622d0a8d0ffe9e389613d2b76a") version("3.26.5", sha256="c0970b1e44a7fbca4322997ce05dac521b04748fe424922152faf22d20782bf9") version("3.26.4", sha256="313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208") version("3.26.3", sha256="bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659") @@ -195,7 +200,6 @@ class Cmake(Package): # a build dependency, and its libs will not interfere with others in # the build. variant("ownlibs", default=True, description="Use CMake-provided third-party libraries") - variant("owncurl", default=False, description="Use CMake-provided curl library") variant( "doc", default=False, @@ -226,7 +230,7 @@ class Cmake(Package): # provide Spack's TLS libs anyways, which is not flexible, and actually # leads to issues where we have to keep track of the vendored curl version # and its conflicts with OpenSSL. - depends_on("curl", when="~owncurl") + depends_on("curl") # When using curl, cmake defaults to using system zlib too, probably because # curl already depends on zlib. Therefore, also unconditionaly depend on zlib. @@ -235,13 +239,15 @@ class Cmake(Package): with when("~ownlibs"): depends_on("expat") # expat/zlib are used in CMake/CTest, so why not require them in libarchive. - depends_on("libarchive@3.1.0: xar=expat compression=zlib") - depends_on("libarchive@3.3.3:", when="@3.15.0:") - depends_on("libuv@1.0.0:1.10", when="@3.7.0:3.10.3") - depends_on("libuv@1.10.0:1.10", when="@3.11.0:3.11") - depends_on("libuv@1.10.0:", when="@3.12.0:") - depends_on("rhash", when="@3.8.0:") - depends_on("jsoncpp build_system=meson", when="@3.2:") + for plat in ["darwin", "cray", "linux"]: + with when("platform=%s" % plat): + depends_on("libarchive@3.1.0: xar=expat compression=zlib") + depends_on("libarchive@3.3.3:", when="@3.15.0:") + depends_on("libuv@1.0.0:1.10", when="@3.7.0:3.10.3") + depends_on("libuv@1.10.0:1.10", when="@3.11.0:3.11") + depends_on("libuv@1.10.0:", when="@3.12.0:") + depends_on("rhash", when="@3.8.0:") + depends_on("jsoncpp build_system=meson", when="@3.2:") depends_on("ncurses", when="+ncurses") @@ -249,14 +255,6 @@ class Cmake(Package): depends_on("python@2.7.11:", type="build") depends_on("py-sphinx", type="build") - for plat in ["darwin", "linux", "cray"]: - with when("~ownlibs platform=%s" % plat): - depends_on("openssl") - depends_on("openssl@:1.0", when="@:3.6.9") - - # TODO: update curl package to build with Windows SSL implementation - # at which point we can build with +ownlibs on Windows - conflicts("~ownlibs", when="platform=windows") # Cannot build with Intel, should be fixed in 3.6.2 # https://gitlab.kitware.com/cmake/cmake/issues/16226 patch("intel-c-gnu11.patch", when="@3.6.0:3.6.1") @@ -368,8 +366,7 @@ def bootstrap_args(self): args.append("--no-system-cppdap") # Whatever +/~ownlibs, use system curl. - if "~owncurl" in spec: - args.append("--system-curl") + args.append("--system-curl") args.append("--no-qt-gui") if "+doc" in spec: diff --git a/var/spack/repos/builtin/packages/cmaq/package.py b/var/spack/repos/builtin/packages/cmaq/package.py index 87733158ec170b..911fa288943842 100644 --- a/var/spack/repos/builtin/packages/cmaq/package.py +++ b/var/spack/repos/builtin/packages/cmaq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cmaq(Package): homepage = "https://www.epa.gov/CMAQ" url = "https://github.com/USEPA/CMAQ/archive/CMAQv5.3.1_19Dec2019.tar.gz" + license("CC0-1.0") + version( "5.3.1", sha256="659156bba27f33010e0fdc157a8d33f3b5b779b95511e2ade870284b6bcb4bc8", diff --git a/var/spack/repos/builtin/packages/cmark/package.py b/var/spack/repos/builtin/packages/cmark/package.py index c35fb532e90e6c..dbfed121ba741c 100644 --- a/var/spack/repos/builtin/packages/cmark/package.py +++ b/var/spack/repos/builtin/packages/cmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cmark(CMakePackage): homepage = "https://commonmark.org/" url = "https://github.com/commonmark/cmark/archive/0.29.0.tar.gz" + license("BSD-2-Clause") + version("0.29.0", sha256="2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6") version("0.28.3", sha256="acc98685d3c1b515ff787ac7c994188dadaf28a2d700c10c1221da4199bae1fc") version("0.28.2", sha256="fe4b04fcccb2dc72641096de02a8eefb53059e85f9dd904f0386dc86326cc414") diff --git a/var/spack/repos/builtin/packages/cmdlime/package.py b/var/spack/repos/builtin/packages/cmdlime/package.py index 3f1045c8cea4bf..853d997b8049ae 100644 --- a/var/spack/repos/builtin/packages/cmdlime/package.py +++ b/var/spack/repos/builtin/packages/cmdlime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Cmdlime(CMakePackage): homepage = "https://github.com/kamchatka-volcano/cmdlime" url = "https://github.com/kamchatka-volcano/cmdlime/archive/refs/tags/v2.5.0.tar.gz" + license("MS-PL") + version("2.5.0", sha256="d5188d7f075142fcb546099a4ee2a967f8248109c0bee8c084e0e00f37603481") diff --git a/var/spack/repos/builtin/packages/cmdstan/package.py b/var/spack/repos/builtin/packages/cmdstan/package.py index 38474f5a844d09..ad2e799d21874c 100644 --- a/var/spack/repos/builtin/packages/cmdstan/package.py +++ b/var/spack/repos/builtin/packages/cmdstan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cmdstan(MakefilePackage): homepage = "https://mc-stan.org/users/interfaces/cmdstan" url = "https://github.com/stan-dev/cmdstan/releases/download/v2.30.1/cmdstan-2.30.1.tar.gz" + license("BSD-3-Clause") + version("2.30.1", sha256="bab76dcefa7f4c955595c0bf0496770507fc6ab0df5896e8cf8c2db0a17eedb9") variant("threads", default=True, description="enable thread support") diff --git a/var/spack/repos/builtin/packages/cminpack/package.py b/var/spack/repos/builtin/packages/cminpack/package.py index ff93b3a422540c..735a39fbea8d93 100644 --- a/var/spack/repos/builtin/packages/cminpack/package.py +++ b/var/spack/repos/builtin/packages/cminpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cmocka/package.py b/var/spack/repos/builtin/packages/cmocka/package.py index c11c973828677c..2046ada5d72f06 100644 --- a/var/spack/repos/builtin/packages/cmocka/package.py +++ b/var/spack/repos/builtin/packages/cmocka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cmocka(CMakePackage): homepage = "https://cmocka.org/" url = "https://cmocka.org/files/1.1/cmocka-1.1.1.tar.xz" + license("Apache-2.0") + version("1.1.7", sha256="810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82") version("1.1.1", sha256="f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389") version("1.1.0", sha256="e960d3bf1be618634a4b924f18bb4d6f20a825c109a8ad6d1af03913ba421330") diff --git a/var/spack/repos/builtin/packages/cmockery/package.py b/var/spack/repos/builtin/packages/cmockery/package.py index d34e9b245810b2..55c531a9800f2c 100644 --- a/var/spack/repos/builtin/packages/cmockery/package.py +++ b/var/spack/repos/builtin/packages/cmockery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cmockery(AutotoolsPackage): homepage = "https://github.com/google/cmockery" url = "https://github.com/google/cmockery/archive/v0.1.2.tar.gz" + license("BSD-3-Clause") + version("0.1.2", sha256="d40135ae9179201c01bde725fa64fc32d86b5899972e0ce4ad51668d261edbae") version("0.1.1", sha256="a801d17976f781fff6dc49042ff109e55ca4ebe8efb13757fa1a511ca52316be") version("0.1.0", sha256="9e017d48e56ab9d2ebcf5286fa54e37d42fe308d3c01fbc367793da2b9ad95e7") diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 93b0eba41cc769..bb6e6b9689e84d 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cmor(AutotoolsPackage): homepage = "https://cmor.llnl.gov" url = "https://github.com/PCMDI/cmor/archive/3.6.1.tar.gz" + license("BSD-3-Clause") + version("3.7.2", sha256="5e19a9be8e6a8bd18a2035772732c34b87b3448319bf0b8fa12ccd4a351b8e86") version("3.6.1", sha256="991035a41424f72ea6f0f85653fc13730eb035e63c7dff6ca740aa7a70976fb4") version("3.6.0", sha256="1608904a35106e83d365f27522209c325bd4bfc19d022b1a8abfb12cdf85fe20") diff --git a/var/spack/repos/builtin/packages/cni-plugins/package.py b/var/spack/repos/builtin/packages/cni-plugins/package.py index fae4704a59d3ee..baaec3a7a73eeb 100644 --- a/var/spack/repos/builtin/packages/cni-plugins/package.py +++ b/var/spack/repos/builtin/packages/cni-plugins/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class CniPlugins(Package): url = "https://github.com/containernetworking/plugins/archive/v1.0.1.tar.gz" maintainers("bernhardkaindl") + license("Apache-2.0") + version("1.3.0", sha256="f9871b9f6ccb51d2b264532e96521e44f926928f91434b56ce135c95becf2901") version("1.2.0", sha256="f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7") version("1.1.1", sha256="c86c44877c47f69cd23611e22029ab26b613f620195b76b3ec20f589367a7962") diff --git a/var/spack/repos/builtin/packages/cnmem/package.py b/var/spack/repos/builtin/packages/cnmem/package.py index d0302e46b772db..16d2066fc55166 100644 --- a/var/spack/repos/builtin/packages/cnmem/package.py +++ b/var/spack/repos/builtin/packages/cnmem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cnmem(CMakePackage): homepage = "https://github.com/NVIDIA/cnmem" git = "https://github.com/NVIDIA/cnmem.git" + license("BSD-3-Clause") + version("git", branch="master") depends_on("cmake@2.8.8:", type="build") diff --git a/var/spack/repos/builtin/packages/cnpy/package.py b/var/spack/repos/builtin/packages/cnpy/package.py index fd01cdd3d94cdd..b49556c659718e 100644 --- a/var/spack/repos/builtin/packages/cnpy/package.py +++ b/var/spack/repos/builtin/packages/cnpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cnpy(CMakePackage): homepage = "https://github.com/rogersce/cnpy" git = "https://github.com/rogersce/cnpy.git" + license("MIT") + version("master", branch="master") depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py index 82741a74fbb602..03130fa0b4f634 100644 --- a/var/spack/repos/builtin/packages/cntk/package.py +++ b/var/spack/repos/builtin/packages/cntk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py index ffb7a6e198df40..feccadb01cdd99 100644 --- a/var/spack/repos/builtin/packages/cntk1bitsgd/package.py +++ b/var/spack/repos/builtin/packages/cntk1bitsgd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cnvnator/package.py b/var/spack/repos/builtin/packages/cnvnator/package.py index 01489a2d7539e4..e4348104db4c02 100644 --- a/var/spack/repos/builtin/packages/cnvnator/package.py +++ b/var/spack/repos/builtin/packages/cnvnator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py index 7ffd3b73540f26..f1a97d842b398a 100644 --- a/var/spack/repos/builtin/packages/codar-cheetah/package.py +++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/code-server/package.py b/var/spack/repos/builtin/packages/code-server/package.py index 6d32b4dedaf047..e208405387efeb 100644 --- a/var/spack/repos/builtin/packages/code-server/package.py +++ b/var/spack/repos/builtin/packages/code-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/codec2/package.py b/var/spack/repos/builtin/packages/codec2/package.py index c0d21543818898..5639ee6d5dcc2e 100644 --- a/var/spack/repos/builtin/packages/codec2/package.py +++ b/var/spack/repos/builtin/packages/codec2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Codec2(CMakePackage): homepage = "https://www.rowetel.com/?page_id=452" url = "https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz" + license("LGPL-2.1-or-later") + version("1.1.0", sha256="d56ba661008a780b823d576a5a2742c94d0b0507574643a7d4f54c76134826a3") version("1.0.5", sha256="cd9a065dd1c3477f6172a0156294f767688847e4d170103d1f08b3a075f82826") version("0.9.2", sha256="19181a446f4df3e6d616b50cabdac4485abb9cd3242cf312a0785f892ed4c76c") diff --git a/var/spack/repos/builtin/packages/codecov/package.py b/var/spack/repos/builtin/packages/codecov/package.py index f8594ed04bab45..071af19ba35707 100644 --- a/var/spack/repos/builtin/packages/codecov/package.py +++ b/var/spack/repos/builtin/packages/codecov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/codes/package.py b/var/spack/repos/builtin/packages/codes/package.py index e2b7374f62ee4c..1614166e288975 100644 --- a/var/spack/repos/builtin/packages/codes/package.py +++ b/var/spack/repos/builtin/packages/codes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/coevp/package.py b/var/spack/repos/builtin/packages/coevp/package.py index 85e5c4f1b8fd6a..589a9253a32c38 100644 --- a/var/spack/repos/builtin/packages/coevp/package.py +++ b/var/spack/repos/builtin/packages/coevp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cohmm/package.py b/var/spack/repos/builtin/packages/cohmm/package.py index 87b4f10b895d08..feb7881e3f0981 100644 --- a/var/spack/repos/builtin/packages/cohmm/package.py +++ b/var/spack/repos/builtin/packages/cohmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/coin3d/package.py b/var/spack/repos/builtin/packages/coin3d/package.py index a7aaea76b98feb..a184e68e2c8e2e 100644 --- a/var/spack/repos/builtin/packages/coin3d/package.py +++ b/var/spack/repos/builtin/packages/coin3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Coin3d(AutotoolsPackage, CMakePackage): homepage = "https://github.com/coin3d/coin" url = "https://github.com/coin3d/coin/releases/download/Coin-4.0.0/coin-4.0.0-src.tar.gz" + license("BSD-3-Clause") + version("4.0.0", sha256="e4f4bd57804b8ed0e017424ad2e45c112912a928b83f86c89963df9015251476") version("3.1.0", sha256="70dd5ef39406e1d9e05eeadd54a5b51884a143e127530876a97744ca54173dc3") version("3.0.0", sha256="d5c2eb0ecaa5c83d93daf0e9e275e58a6a8dfadc74c873d51b0c939011f81bfa") diff --git a/var/spack/repos/builtin/packages/coinhsl/package.py b/var/spack/repos/builtin/packages/coinhsl/package.py index 52193a71264b39..9c2706318165c0 100644 --- a/var/spack/repos/builtin/packages/coinhsl/package.py +++ b/var/spack/repos/builtin/packages/coinhsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/coinutils/package.py b/var/spack/repos/builtin/packages/coinutils/package.py index d860db2fe8da8d..8635fc11bb176b 100644 --- a/var/spack/repos/builtin/packages/coinutils/package.py +++ b/var/spack/repos/builtin/packages/coinutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Coinutils(AutotoolsPackage): homepage = "https://projects.coin-or.org/Coinutils" url = "https://github.com/coin-or/CoinUtils/archive/releases/2.11.4.tar.gz" + license("EPL-2.0") + version("2.11.9", sha256="15d572ace4cd3b7c8ce117081b65a2bd5b5a4ebaba54fadc99c7a244160f88b8") version("2.11.6", sha256="6ea31d5214f7eb27fa3ffb2bdad7ec96499dd2aaaeb4a7d0abd90ef852fc79ca") version("2.11.4", sha256="d4effff4452e73356eed9f889efd9c44fe9cd68bd37b608a5ebb2c58bd45ef81") diff --git a/var/spack/repos/builtin/packages/collectd/package.py b/var/spack/repos/builtin/packages/collectd/package.py index 167a1ba81a615c..50c4b1fa512891 100644 --- a/var/spack/repos/builtin/packages/collectd/package.py +++ b/var/spack/repos/builtin/packages/collectd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Collectd(AutotoolsPackage): homepage = "https://collectd.org/" url = "https://github.com/collectd/collectd/releases/download/collectd-5.11.0/collectd-5.11.0.tar.bz2" + license("GPL-2.0-or-later") + version("5.12.0", sha256="5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6") version("5.11.0", sha256="37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2") version("5.10.0", sha256="a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b") diff --git a/var/spack/repos/builtin/packages/collier/package.py b/var/spack/repos/builtin/packages/collier/package.py index 98407d7c22076a..a15ee75b9c13ec 100644 --- a/var/spack/repos/builtin/packages/collier/package.py +++ b/var/spack/repos/builtin/packages/collier/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Collier(CMakePackage): maintainers("vvolkl") + license("GPL-3.0-only") + version("1.2.8", sha256="5cb24ce24ba1f62b7a96c655b31e9fddccc603eff31e60f9033b16354a6afd89") version("1.2.7", sha256="fde4b144a17c1bf5aa2ceaa86c71c79da10c9de8fec7bd33c8bffb4198acd5ca") version("1.2.6", sha256="b0d517868c71d2d1b8b6d3e0c370a43c9eb18ea8393a6e80070a5a2206f7de36") diff --git a/var/spack/repos/builtin/packages/colm/package.py b/var/spack/repos/builtin/packages/colm/package.py index 10408604a061ae..500337d3bd120f 100644 --- a/var/spack/repos/builtin/packages/colm/package.py +++ b/var/spack/repos/builtin/packages/colm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class Colm(AutotoolsPackage): homepage = "https://www.colm.net/open-source/colm" url = "https://www.colm.net/files/colm/colm-0.12.0.tar.gz" + license("GPL-2.0-only") + version("0.12.0", sha256="7b545d74bd139f5c622975d243c575310af1e4985059a1427b6fdbb1fb8d6e4d") diff --git a/var/spack/repos/builtin/packages/colordiff/package.py b/var/spack/repos/builtin/packages/colordiff/package.py index 7c4deebdd80d5d..8b7750aa8a4d94 100644 --- a/var/spack/repos/builtin/packages/colordiff/package.py +++ b/var/spack/repos/builtin/packages/colordiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Colordiff(Package): homepage = "https://www.colordiff.org" url = "https://www.colordiff.org/archive/colordiff-1.0.18.tar.gz" + license("GPL-2.0-or-later") + version("1.0.21", sha256="9b30f4257ef0f0806dea5a27c9ad8edc3f7999f05ddaff6f0627064dc927e615") version("1.0.19", sha256="46e8c14d87f6c4b77a273cdd97020fda88d5b2be42cf015d5d84aca3dfff3b19") version("1.0.18", sha256="29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0") diff --git a/var/spack/repos/builtin/packages/comd/package.py b/var/spack/repos/builtin/packages/comd/package.py index d6991b3b890bcb..f6c846325942f0 100644 --- a/var/spack/repos/builtin/packages/comd/package.py +++ b/var/spack/repos/builtin/packages/comd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index a17bcc7e9426a6..f8bbd4e526980d 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,15 +12,20 @@ class Comgr(CMakePackage): """This provides various Lightning Compiler related services. It currently contains one library, the Code Object Manager (Comgr)""" - homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" - git = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git" - url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCm-CompilerSupport" + git = "https://github.com/ROCm/ROCm-CompilerSupport.git" + url = "https://github.com/ROCm/ROCm-CompilerSupport/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "haampie") libraries = ["libamd_comgr"] + license("NCSA") + version("master", branch="amd-stg-open") + version("6.0.0", sha256="04353d27a512642a5e5339532a39d0aabe44e0964985de37b150a2550385800a") + version("5.7.1", sha256="3b9433b4a0527167c3e9dfc37a3c54e0550744b8d4a8e1be298c8d4bcedfee7c") + version("5.7.0", sha256="e234bcb93d602377cfaaacb59aeac5796edcd842a618162867b7e670c3a2c42c") version("5.6.1", sha256="0a85d84619f98be26ca7a32c71f94ed3c4e9866133789eabb451be64ce739300") version("5.6.0", sha256="9396a7238b547ee68146c669b10b9d5de8f1d76527c649133c75d8076a185a72") version("5.5.1", sha256="0fbb15fe5a95c2e141ccd360bc413e1feda283334781540a6e5095ab27fd8019") @@ -146,6 +151,9 @@ class Comgr(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: # llvm libs are linked statically, so this *could* be a build dep @@ -157,7 +165,7 @@ class Comgr(CMakePackage): "rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver) ) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) root_cmakelists_dir = join_path("lib", "comgr") diff --git a/var/spack/repos/builtin/packages/commons-lang/package.py b/var/spack/repos/builtin/packages/commons-lang/package.py index b00abffb935319..e40f0edcb901d5 100644 --- a/var/spack/repos/builtin/packages/commons-lang/package.py +++ b/var/spack/repos/builtin/packages/commons-lang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class CommonsLang(Package): homepage = "https://commons.apache.org/proper/commons-lang/" url = "https://archive.apache.org/dist/commons/lang/binaries/commons-lang-2.6-bin.tar.gz" + license("Apache-2.0") + version("2.6", sha256="ff6a244bb71a9a1c859e81cb744d0ce698c20e04f13a7ef7dbffb99c8122752c") version("2.4", sha256="00e6b3174e31196d726c14302c8e7e9ba9b8409d57a8a9821c7648beeda31c5e") diff --git a/var/spack/repos/builtin/packages/commons-lang3/package.py b/var/spack/repos/builtin/packages/commons-lang3/package.py index 6b03aea6ca1c05..ef05a2e8546608 100644 --- a/var/spack/repos/builtin/packages/commons-lang3/package.py +++ b/var/spack/repos/builtin/packages/commons-lang3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class CommonsLang3(Package): homepage = "https://commons.apache.org/proper/commons-lang/" url = "https://archive.apache.org/dist/commons/lang/binaries/commons-lang3-3.7-bin.tar.gz" + license("Apache-2.0") + version("3.12.0", sha256="33012465dfcb7f790aca333e09ebf105e2a5fb95c2c638b3df790d3efa908e28") version("3.7", sha256="94dc8289ce90b77b507d9257784d9a43b402786de40c164f6e3990e221a2a4d2") diff --git a/var/spack/repos/builtin/packages/commons-logging/package.py b/var/spack/repos/builtin/packages/commons-logging/package.py index ddae06d5c32637..fcca2ba17851f8 100644 --- a/var/spack/repos/builtin/packages/commons-logging/package.py +++ b/var/spack/repos/builtin/packages/commons-logging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class CommonsLogging(Package): homepage = "https://commons.apache.org/proper/commons-logging/" url = "https://archive.apache.org/dist/commons/logging/binaries/commons-logging-1.2-bin.tar.gz" + license("Apache-2.0") + version("1.2", sha256="3f758805c7290d9c6d22d1451587c9f7232744aef4c984e88aa683cdea0587bd") version("1.1.3", sha256="9e7093c93529792563b5c19ab5cccb73ef4ca7d82b886bdec6d0af182ba9908a") version("1.1.1", sha256="88c721d66f570a87f710a2449f0e3bffea86489d9dd2fa70b805104c4f8d69e6") diff --git a/var/spack/repos/builtin/packages/compadre/package.py b/var/spack/repos/builtin/packages/compadre/package.py index 74a17dd10af8b8..9897f7958aea80 100644 --- a/var/spack/repos/builtin/packages/compadre/package.py +++ b/var/spack/repos/builtin/packages/compadre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/compiz/package.py b/var/spack/repos/builtin/packages/compiz/package.py index a94f5214a5af91..a6805d07487ebb 100644 --- a/var/spack/repos/builtin/packages/compiz/package.py +++ b/var/spack/repos/builtin/packages/compiz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Compiz(AutotoolsPackage, XorgPackage): homepage = "http://www.compiz.org/" xorg_mirror_path = "app/compiz-0.7.8.tar.gz" + license("MIT") + version("0.7.8", sha256="b46f52b776cc78e85357a07688d04b36ec19c65eadeaf6f6cfcca7b8515e6503") depends_on("libxcb") diff --git a/var/spack/repos/builtin/packages/composable-kernel/package.py b/var/spack/repos/builtin/packages/composable-kernel/package.py index 85b383896a8af9..10bdf7183cc1bf 100644 --- a/var/spack/repos/builtin/packages/composable-kernel/package.py +++ b/var/spack/repos/builtin/packages/composable-kernel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,14 +11,19 @@ class ComposableKernel(CMakePackage): """Composable Kernel: Performance Portable Programming Model for Machine Learning Tensor Operators.""" - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel" - git = "https://github.com/ROCmSoftwarePlatform/composable_kernel.git" - + homepage = "https://github.com/ROCm/composable_kernel" + git = "https://github.com/ROCm/composable_kernel.git" + url = "https://github.com/ROCm/composable_kernel/archive/refs/tags/rocm-5.7.1.tar.gz" maintainers("srekolam", "afzpatel") + license("MIT") + version("master", branch="develop") + version("6.0.0", sha256="a8f736f2f2a8afa4cddd06301205be27774d85f545429049b4a2bbbe6fcd67df") + version("5.7.1", sha256="75f66e023c2e31948e91fa26366eaeac72d871fc2e5188361d4465179f13876e") + version("5.7.0", sha256="d9624dbaef04e0138f9f73596c49b4fe9ded69974bae7236354baa32649bf21a") version("5.6.1", commit="f5ec04f091fa5c48c67d7bacec36a414d0be06a5") - version("5.6.0", commit="f0fd02634c2f8f8c70f5a0ab2a8c84db5e36eeca") + version("5.6.0", commit="f5ec04f091fa5c48c67d7bacec36a414d0be06a5") version("5.5.1", commit="ac9e01e2cc3721be24619807adc444e1f59a9d25") version("5.5.0", commit="8b76b832420a3d69708401de6607a033163edcce") version("5.4.3", commit="bb3d9546f186e39cefedc3e7f01d88924ba20168") @@ -42,7 +47,18 @@ class ComposableKernel(CMakePackage): depends_on("pkgconfig", type="build") depends_on("cmake@3.16:", type="build") - for ver in ["master", "5.6.1", "5.6.0", "5.5.1", "5.5.0", "5.4.3", "5.4.0"]: + for ver in [ + "master", + "6.0.0", + "5.7.1", + "5.7.0", + "5.6.1", + "5.6.0", + "5.5.1", + "5.5.0", + "5.4.3", + "5.4.0", + ]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, when="@" + ver) depends_on("rocm-cmake@" + ver, when="@" + ver, type="build") @@ -64,14 +80,14 @@ def cmake_args(self): ] if "auto" not in self.spec.variants["amdgpu_target"]: args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target")) - if self.spec.satisfies("@5.6.1:"): + if self.spec.satisfies("@5.6.0:"): args.append(self.define("INSTANCES_ONLY", "ON")) return args def build(self, spec, prefix): with working_dir(self.build_directory): # only instances is necessary to build and install - if self.spec.satisfies("@5.6.1:"): + if self.spec.satisfies("@5.6.0:"): make() else: make("instances") diff --git a/var/spack/repos/builtin/packages/compose/package.py b/var/spack/repos/builtin/packages/compose/package.py index 61327b38503de1..59e00555fdf5ad 100644 --- a/var/spack/repos/builtin/packages/compose/package.py +++ b/var/spack/repos/builtin/packages/compose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py index ef341522fa8ced..9d65fd0e2cf414 100644 --- a/var/spack/repos/builtin/packages/compositeproto/package.py +++ b/var/spack/repos/builtin/packages/compositeproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/conda4aarch64/package.py b/var/spack/repos/builtin/packages/conda4aarch64/package.py index df01d2136a719b..3901cf91bd525f 100644 --- a/var/spack/repos/builtin/packages/conda4aarch64/package.py +++ b/var/spack/repos/builtin/packages/conda4aarch64/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 2762c5781d3db7..05f7d663b0f2c8 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -38,6 +38,8 @@ class Conduit(CMakePackage): git = "https://github.com/LLNL/conduit.git" tags = ["radiuss", "e4s"] + license("Apache-2.0") + version("develop", branch="develop", submodules=True) # note: the main branch in conduit was renamed to develop, this next entry # is to bridge any spack dependencies that are still using the name master diff --git a/var/spack/repos/builtin/packages/conmon/package.py b/var/spack/repos/builtin/packages/conmon/package.py index 5c7c4020cbcfe5..f15f3affbd6045 100644 --- a/var/spack/repos/builtin/packages/conmon/package.py +++ b/var/spack/repos/builtin/packages/conmon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Conmon(MakefilePackage): url = "https://github.com/containers/conmon/archive/v2.0.30.tar.gz" maintainers("bernhardkaindl") + license("Apache-2.0") + version("2.1.7", sha256="7d0f9a2f7cb8a76c51990128ac837aaf0cc89950b6ef9972e94417aa9cf901fe") version("2.1.5", sha256="ee3179ee2b9a9107acec00eb546062cf7deb847f135a3b81503d22b0d226b3ed") version("2.0.30", sha256="4b0a98fbe8a63c42f60edac25c19aa6606caa7b1e4fe7846fc7f7de0b566ba25") diff --git a/var/spack/repos/builtin/packages/connect-proxy/package.py b/var/spack/repos/builtin/packages/connect-proxy/package.py index e1fbb1391b78e5..8072fd34039549 100644 --- a/var/spack/repos/builtin/packages/connect-proxy/package.py +++ b/var/spack/repos/builtin/packages/connect-proxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/conquest/package.py b/var/spack/repos/builtin/packages/conquest/package.py index 29e9fa5777bc3f..32ab7d77792f4c 100644 --- a/var/spack/repos/builtin/packages/conquest/package.py +++ b/var/spack/repos/builtin/packages/conquest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Conquest(MakefilePackage): # notify when the package is updated. maintainers("davidbowler", "tkoskela", "ilectra") + license("MIT") + version("1.2", sha256="74d974f20ec15ff31d97cd42aae6dbe95288eedfa785896d5872b9ff44ee7ae2") version("1.1", sha256="772e058f073cccfee45521aa62bb13192ab07cb2979b6076ddbf21ba22f9ba5d") version("master", branch="master") @@ -49,6 +51,15 @@ class Conquest(MakefilePackage): build_directory = "src" + # The SYSTEM variable is required above version 1.2. + # Versions 1.2 and older should ignore it. + @property + def build_targets(self): + if self.version > Version("1.2"): + return ["SYSTEM = example", "Conquest"] + else: + return ["Conquest"] + def edit(self, spec, prefix): fflags = "-O3 -fallow-argument-mismatch" ldflags = "" @@ -63,12 +74,23 @@ def edit(self, spec, prefix): lapack_ld = self.spec["lapack"].libs.ld_flags blas_ld = self.spec["blas"].libs.ld_flags - - defs_file = FileFilter("./src/system.make") - - defs_file.filter("COMPFLAGS=.*", f"COMPFLAGS= {fflags}") - defs_file.filter("LINKFLAGS=.*", f"LINKFLAGS= {ldflags}") - defs_file.filter("# BLAS=.*", f"BLAS= {lapack_ld} -llapack {blas_ld} -lblas") + fftw_ld = self.spec["fftw"].libs.ld_flags + libxc_ld = self.spec["libxc"].libs.ld_flags + + # Starting from 1.3 there's automated logic in the Makefile that picks + # from a list of possible files for system/compiler-specific definitions. + # This is useful for manual builds, but since the spack will do its own + # automation of compiler-specific flags, we will override it. + if self.version > Version("1.2"): + defs_file = FileFilter("./src/system/system.example.make") + else: + defs_file = FileFilter("./src/system.make") + + defs_file.filter(".*COMPFLAGS=.*", f"COMPFLAGS= {fflags}") + defs_file.filter(".*LINKFLAGS=.*", f"LINKFLAGS= {ldflags}") + defs_file.filter(".*BLAS=.*", f"BLAS= {lapack_ld} {blas_ld}") + defs_file.filter(".*FFT_LIB=.*", f"FFT_LIB={fftw_ld}") + defs_file.filter(".*XC_LIB=.*", f"XC_LIB={libxc_ld} -lxcf90 -lxc") if "+openmp" in self.spec: defs_file.filter("OMP_DUMMY = DUMMY", "OMP_DUMMY = ") @@ -81,3 +103,5 @@ def edit(self, spec, prefix): def install(self, spec, prefix): mkdirp(prefix.bin) install("./bin/Conquest", prefix.bin) + if self.version > Version("1.2"): + install_tree("./benchmarks/", join_path(prefix, "benchmarks")) diff --git a/var/spack/repos/builtin/packages/conserver/package.py b/var/spack/repos/builtin/packages/conserver/package.py index 987bd959db66e7..599104957ca3b6 100644 --- a/var/spack/repos/builtin/packages/conserver/package.py +++ b/var/spack/repos/builtin/packages/conserver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Conserver(AutotoolsPackage): homepage = "https://www.conserver.com/" url = "https://github.com/bstansell/conserver/releases/download/v8.2.5/conserver-8.2.5.tar.gz" + license("BSD-3-Clause") + version("8.2.7", sha256="0607f2147a4d384f1e677fbe4e6c68b66a3f015136b21bcf83ef9575985273d8") version("8.2.5", sha256="7db192f304126d7e5c15421c4c83cd5c08039f2f2b3c61b2998e71881ae47eea") version("8.2.4", sha256="a591eabb4abb632322d2f3058a2f0bd6502754069a99a153efe2d6d05bd97f6f") diff --git a/var/spack/repos/builtin/packages/console-bridge/package.py b/var/spack/repos/builtin/packages/console-bridge/package.py index 322b4fe027c164..bff4b72b4ed9a7 100644 --- a/var/spack/repos/builtin/packages/console-bridge/package.py +++ b/var/spack/repos/builtin/packages/console-bridge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ConsoleBridge(CMakePackage): homepage = "https://github.com/ros/console_bridge/" url = "https://github.com/ros/console_bridge/archive/1.0.1.tar.gz" + license("BSD-3-Clause") + version("1.0.2", sha256="303a619c01a9e14a3c82eb9762b8a428ef5311a6d46353872ab9a904358be4a4") version("1.0.1", sha256="2ff175a9bb2b1849f12a6bf972ce7e4313d543a2bbc83b60fdae7db6e0ba353f") version("1.0.0", sha256="880bbded7fcdc71479e9b1efc3ba5353f08eed23f0009c93d6bea8ba3974d078") diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py index c542b487f2313f..0ed38e823589d0 100644 --- a/var/spack/repos/builtin/packages/constype/package.py +++ b/var/spack/repos/builtin/packages/constype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/consul/package.py b/var/spack/repos/builtin/packages/consul/package.py index 3a9363ce1c233f..9c3f30bf82caf6 100644 --- a/var/spack/repos/builtin/packages/consul/package.py +++ b/var/spack/repos/builtin/packages/consul/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Consul(MakefilePackage): homepage = "https://www.consul.io" url = "https://github.com/hashicorp/consul/archive/v1.8.1.tar.gz" + license("MPL-2.0") + version("1.15.3", sha256="5137e9831b4bc094c8ce5be64c661dc0d9a96ee9509d756030d60d4bcca42503") version("1.8.1", sha256="c173e9866e6181b3679a942233adade118976414f6ca2da8deaea0fa2bba9b06") version("1.8.0", sha256="a87925bde6aecddf532dfd050e907b6a0a6447cdd5dc4f49b46d97c9f73b58f9") diff --git a/var/spack/repos/builtin/packages/converge/package.py b/var/spack/repos/builtin/packages/converge/package.py index cf2d63c8a71dfe..1ae48070c19726 100644 --- a/var/spack/repos/builtin/packages/converge/package.py +++ b/var/spack/repos/builtin/packages/converge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cool/package.py b/var/spack/repos/builtin/packages/cool/package.py index 9418a16cbeb5d4..c849e48149d617 100644 --- a/var/spack/repos/builtin/packages/cool/package.py +++ b/var/spack/repos/builtin/packages/cool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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") diff --git a/var/spack/repos/builtin/packages/coordgen/package.py b/var/spack/repos/builtin/packages/coordgen/package.py index 4796408e4dafd0..b0a6f70675296e 100644 --- a/var/spack/repos/builtin/packages/coordgen/package.py +++ b/var/spack/repos/builtin/packages/coordgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Coordgen(CMakePackage): maintainers("RMeli") + license("BSD-3-Clause") + version("3.0.2", sha256="f67697434f7fec03bca150a6d84ea0e8409f6ec49d5aab43badc5833098ff4e3") variant("maeparser", default=True, description="Use MAE parser") diff --git a/var/spack/repos/builtin/packages/coral/package.py b/var/spack/repos/builtin/packages/coral/package.py index 8d1db303b06cb3..56e20a06391704 100644 --- a/var/spack/repos/builtin/packages/coral/package.py +++ b/var/spack/repos/builtin/packages/coral/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/corenlp/package.py b/var/spack/repos/builtin/packages/corenlp/package.py index 9aa82e1d6cb629..d834d95fb8c1dd 100644 --- a/var/spack/repos/builtin/packages/corenlp/package.py +++ b/var/spack/repos/builtin/packages/corenlp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Corenlp(Package): homepage = "https://stanfordnlp.github.io/CoreNLP/index.html" url = "https://github.com/stanfordnlp/CoreNLP/archive/v4.0.0.tar.gz" + license("GPL-3.0-only") + version("4.0.0", sha256="07195eed46dd39bdc364d3988da8ec6a5fc9fed8c17613cfe5a8b84d649c8f0f") resources = [("4.0.0", "f45bde062fb368d72f7d3c7ac1ddc6cfb61d3badc1152572bde17f1a5ed9ec94")] diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index 28b43c655bb556..c2f416d01c3eb4 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage): executables = [r"^md5sum$"] + license("GPL-3.0-or-later") + version("9.3", sha256="adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa") version("9.2", sha256="6885ff47b9cdb211de47d368c17853f406daaf98b148aaecdf10de29cc04b0b3") version("9.1", sha256="61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423") diff --git a/var/spack/repos/builtin/packages/corset/package.py b/var/spack/repos/builtin/packages/corset/package.py index 66428265dede82..51124253c158cc 100644 --- a/var/spack/repos/builtin/packages/corset/package.py +++ b/var/spack/repos/builtin/packages/corset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Corset(Package): homepage = "https://github.com/Oshlack/Corset/wiki" url = "https://github.com/Oshlack/Corset/releases/download/version-1.09/corset-1.09-linux64.tar.gz" + license("GPL-3.0-only") + version("1.09", sha256="9c349afc5a66c43e6b73c62f5d3166dac2fd06696aa40cff648226a5d0427a59") version("1.06", sha256="4aff83844461cea1edfce3d89776236c300650fc02b497cc9f11eba42d161b60") diff --git a/var/spack/repos/builtin/packages/cosbench/package.py b/var/spack/repos/builtin/packages/cosbench/package.py index a496b6b528714d..43da309ece80c1 100644 --- a/var/spack/repos/builtin/packages/cosbench/package.py +++ b/var/spack/repos/builtin/packages/cosbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cosbench(Package): homepage = "https://github.com/intel-cloud/cosbench" url = "https://github.com/intel-cloud/cosbench/releases/download/v0.4.2/0.4.2.zip" + license("Apache-2.0") + version("0.4.2", sha256="9e82518d4fac3c23cfac47c8a571d4a61bf8e5f11286606c79a0f923e983dc61") version("0.4.1.0", sha256="a044cd232b3cc376802aa6a4a697988ec690a8b1d70040641710066acd322c5a") version("0.4.0.1", sha256="384e4de218a9a61040f45cf9aa0a555e88ff25fb2b5cd11c540627cd604b4961") diff --git a/var/spack/repos/builtin/packages/cosign/package.py b/var/spack/repos/builtin/packages/cosign/package.py index 2805e91d0530cd..5320ab9fb013ef 100644 --- a/var/spack/repos/builtin/packages/cosign/package.py +++ b/var/spack/repos/builtin/packages/cosign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cosign(Package): url = "https://github.com/sigstore/cosign/archive/refs/tags/v1.3.1.tar.gz" git = "https://github.com/sigstore/cosign.git" + license("Apache-2.0") + version("main", branch="main") version("1.3.1", sha256="7f7e0af52ee8d795440e66dcc1a7a25783e22d30935f4f957779628b348f38af") diff --git a/var/spack/repos/builtin/packages/cosma/fj-ssl2.patch b/var/spack/repos/builtin/packages/cosma/fj-ssl2.patch new file mode 100644 index 00000000000000..3e09383d67a8eb --- /dev/null +++ b/var/spack/repos/builtin/packages/cosma/fj-ssl2.patch @@ -0,0 +1,104 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fd1e55..41a041b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS "YES") # always write compile_commands.json + + set(COSMA_GPU_BACKENDS_LIST "CUDA" "ROCM") + set(COSMA_SCALAPACK_LIST "OFF" "MKL" "CRAY_LIBSCI" "CUSTOM") +-set(COSMA_BLAS_LIST "auto" "MKL" "OPENBLAS" "CRAY_LIBSCI" "CUSTOM" "BLIS" "ATLAS" "CUDA" "ROCM" "OFF") ++set(COSMA_BLAS_LIST "auto" "MKL" "SSL2" "OPENBLAS" "CRAY_LIBSCI" "CUSTOM" "BLIS" "ATLAS" "CUDA" "ROCM" "OFF") + option(COSMA_WITH_TESTS "Generate the test target." ON) + option(COSMA_WITH_APPS "Generate the miniapp targets." ON) + option(COSMA_WITH_BENCHMARKS "Generate the benchmark targets." ON) +@@ -45,7 +45,7 @@ if (COSMA_BLAS MATCHES "CUDA|ROCM") + set(COSMA_GPU_BACKEND ${COSMA_BLAS}) + else() + if(COSMA_BLAS STREQUAL "OFF") +- message(FATAL_ERROR "A Blas implementation is needed when running on CPU only: choices are : auto, MKL, OPENBLAS, CRAY_LIBSCI, CUSTOM, BLIS, ATLAS, FLEXIBLAS, ARMPL, GenericBLAS") ++ message(FATAL_ERROR "A Blas implementation is needed when running on CPU only: choices are : auto, MKL, SSL2, OPENBLAS, CRAY_LIBSCI, CUSTOM, BLIS, ATLAS, FLEXIBLAS, ARMPL, GenericBLAS") + else() + set(COSMA_BLAS_VENDOR ${COSMA_BLAS}) + endif() +@@ -190,6 +190,7 @@ install(FILES "${cosma_BINARY_DIR}/cosmaConfig.cmake" + "${cosma_BINARY_DIR}/cosmaConfigVersion.cmake" + "${cosma_BINARY_DIR}/cosmaConfigVersion.cmake" + "${cosma_SOURCE_DIR}/cmake/FindMKL.cmake" ++ "${cosma_SOURCE_DIR}/cmake/FindSSL2.cmake" + "${cosma_SOURCE_DIR}/cmake/FindBlas.cmake" + "${cosma_SOURCE_DIR}/cmake/FindSCALAPACK.cmake" + "${cosma_SOURCE_DIR}/cmake/FindOPENBLAS.cmake" +diff --git a/cmake/FindBlas.cmake b/cmake/FindBlas.cmake +index aef956c..3c47561 100644 +--- a/cmake/FindBlas.cmake ++++ b/cmake/FindBlas.cmake +@@ -14,6 +14,7 @@ endif() + set(COSMA_BLAS_VENDOR_LIST + "auto" + "MKL" ++ "SSL2" + "OPENBLAS" + "FLEXIBLAS" + "ARMPL" +diff --git a/cmake/FindSSL2.cmake b/cmake/FindSSL2.cmake +new file mode 100644 +index 0000000..f0e11bf +--- /dev/null ++++ b/cmake/FindSSL2.cmake +@@ -0,0 +1,56 @@ ++#.rst: ++# FindSSL2 ++# ----------- ++# ++# This module tries to find the SSL2 library. ++# ++# The following variables are set ++# ++# :: ++# ++# SSL2_FOUND - True if ssl2 is found ++# SSL2_LIBRARIES - The required libraries ++# SSL2_INCLUDE_DIRS - The required include directory ++# ++# The following import target is created ++# ++# :: ++# ++# SSL2::ssl2 ++ ++#set paths to look for library from ROOT variables.If new policy is set, find_library() automatically uses them. ++# if(NOT POLICY CMP0074) ++set(_SSL2_PATHS ${SSL2_ROOT} ++ $ENV{SSL2_ROOT} ++ $ENV{SSL2ROOT} ++ $ENV{SSL2_DIR} ++ $ENV{SSL2DIR}) ++# endif() ++ ++find_library( ++ COSMA_SSL2_LINK_LIBRARIES ++ NAMES "fjlapackex" ++ HINTS ${_SSL2_PATHS} ++ PATH_SUFFIXES "lib64" ++) ++find_path( ++ COSMA_SSL2_INCLUDE_DIRS ++ NAMES "cblas.h" ++ HINTS ${_SSL2_PATHS} ++ PATH_SUFFIXES "include" ++) ++ ++# check if found ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(SSL2 REQUIRED_VARS COSMA_SSL2_INCLUDE_DIRS COSMA_SSL2_LINK_LIBRARIES) ++ ++# add target to link against ++if(NOT TARGET cosma::BLAS::SSL2::ssl2) ++ add_library(cosma::BLAS::SSL2::ssl2 INTERFACE IMPORTED) ++ add_library(cosma::BLAS::SSL2::blas ALIAS cosma::BLAS::SSL2::ssl2) ++endif() ++set_property(TARGET cosma::BLAS::SSL2::ssl2 PROPERTY INTERFACE_LINK_LIBRARIES ${COSMA_SSL2_LINK_LIBRARIES}) ++set_property(TARGET cosma::BLAS::SSL2::ssl2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${COSMA_SSL2_INCLUDE_DIRS}) ++ ++# prevent clutter in cache ++MARK_AS_ADVANCED(SSL2_FOUND SSL2_LIBRARIES SSL2_INCLUDE_DIRS) diff --git a/var/spack/repos/builtin/packages/cosma/package.py b/var/spack/repos/builtin/packages/cosma/package.py index 19db9a0531859c..77a9ba7b69a1c4 100644 --- a/var/spack/repos/builtin/packages/cosma/package.py +++ b/var/spack/repos/builtin/packages/cosma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,13 +17,15 @@ class Cosma(CMakePackage): url = "https://github.com/eth-cscs/COSMA/archive/refs/tags/v2.6.6.tar.gz" git = "https://github.com/eth-cscs/COSMA.git" + license("BSD-3-Clause") + # note: The default archives produced with github do not have the archives # of the submodules. version("master", branch="master", submodules=False) version("2.6.6", sha256="1604be101e77192fbcc5551236bc87888d336e402f5409bbdd9dea900401cc37") version("2.6.5", sha256="10d9b7ecc1ce44ec5b9e0c0bf89278a63029912ec3ea99661be8576b553ececf") version("2.6.4", sha256="6d7bd5e3005874af9542a329c93e7ccd29ca1a5573dae27618fac2704fa2b6ab") - version("2.6.3", sha256="8ca96ca41458f1e9d0da70d524c5a03c677dba7238d23a578f852163b6d45ac9") + version("2.6.3", sha256="c2a3735ea8f860930bea6706d968497d72a1be0498c689b5bc4a951ffc2d1146") version("2.6.2", sha256="2debb5123cc35aeebc5fd2f8a46cfd6356d1e27618c9bb57129ecd09aa400940") version("2.6.1", sha256="69aa6634a030674f0d9be61e7b0bf0dc17acf0fc9e7a90b40e3179e2254c8d67") version("2.5.1", sha256="085b7787597374244bbb1eb89bc69bf58c35f6c85be805e881e1c0b25166c3ce") @@ -39,7 +41,7 @@ class Cosma(CMakePackage): variant("cuda", default=False, description="Build with cuBLAS support") variant("rocm", default=False, description="Build with rocBLAS support") variant("scalapack", default=False, description="Build with ScaLAPACK API") - variant("shared", default=False, description="Build the shared library version") + variant("shared", default=True, description="Build the shared library version") variant("tests", default=False, description="Build tests") variant("apps", default=False, description="Build miniapp") variant("profiling", default=False, description="Enable profiling") @@ -57,6 +59,8 @@ class Cosma(CMakePackage): depends_on("scalapack", when="+scalapack") depends_on("cuda", when="+cuda") depends_on("rocblas", when="+rocm") + depends_on("nccl", when="+nccl") + depends_on("rccl", when="+rccl") with when("@2.6.3:"): depends_on("tiled-mm@2.2:+cuda", when="+cuda") @@ -74,6 +78,8 @@ class Cosma(CMakePackage): depends_on("semiprof", when="+profiling") depends_on("costa+profiling", when="+profiling") + patch("fj-ssl2.patch", when="^fujitsu-ssl2") + def setup_build_environment(self, env): if "+cuda" in self.spec: env.set("CUDA_PATH", self.spec["cuda"].prefix) @@ -87,6 +93,7 @@ def cosma_blas_cmake_arg(self): ("^cray-libsci", "CRAY_LIBSCI"), ("^netlib-lapack", "CUSTOM"), ("^openblas", "OPENBLAS"), + ("^fujitsu-ssl2", "SSL2"), ] if self.version >= Version("2.4.0"): diff --git a/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py b/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py index 2f626438e45509..e9b69678edf391 100644 --- a/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py +++ b/var/spack/repos/builtin/packages/cosmoflow-benchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index 619a58fe37558c..9e66b8938af2d8 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cosp2/package.py b/var/spack/repos/builtin/packages/cosp2/package.py index e4ee023d63676c..d16466bad6bf48 100644 --- a/var/spack/repos/builtin/packages/cosp2/package.py +++ b/var/spack/repos/builtin/packages/cosp2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/costa/package.py b/var/spack/repos/builtin/packages/costa/package.py index 62e001fc39375e..4e85387a88580a 100644 --- a/var/spack/repos/builtin/packages/costa/package.py +++ b/var/spack/repos/builtin/packages/costa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Costa(CMakePackage): homepage = "https://github.com/eth-cscs/COSTA" git = "https://github.com/eth-cscs/COSTA.git" + license("BSD-3-Clause") + # note: The default archives produced with github do not have the archives # of the submodules. version("master", branch="master", submodules=True) @@ -27,7 +29,7 @@ class Costa(CMakePackage): version("2.0", sha256="de250197f31f7d23226c6956a687c3ff46fb0ff6c621a932428236c3f7925fe4") variant("scalapack", default=False, description="Build with ScaLAPACK API") - variant("shared", default=False, description="Build shared libraries") + variant("shared", default=True, description="Build shared libraries") variant("profiling", default=False, description="Enable profiling") variant("tests", default=False, description="Enable tests") variant("apps", default=False, description="Enable miniapp") @@ -37,6 +39,7 @@ class Costa(CMakePackage): depends_on("mpi@3:") depends_on("scalapack", when="+scalapack") depends_on("cxxopts", when="+apps") + depends_on("cxxopts", when="+tests") depends_on("semiprof", when="+profiling") def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/cotter/package.py b/var/spack/repos/builtin/packages/cotter/package.py index e2427ebe0a3e2b..c38d5352e70e8b 100644 --- a/var/spack/repos/builtin/packages/cotter/package.py +++ b/var/spack/repos/builtin/packages/cotter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/countdown/package.py b/var/spack/repos/builtin/packages/countdown/package.py new file mode 100644 index 00000000000000..b2ba2aab72e163 --- /dev/null +++ b/var/spack/repos/builtin/packages/countdown/package.py @@ -0,0 +1,87 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Countdown(CMakePackage, CudaPackage): + """COUNTDOWN is a tool for identifying and automatically reducing the power + consumption of the computing elements, during communication and + synchronization primitives, filtering out phases which would detriment the + time to solution of the application.""" + + homepage = "https://github.com/EEESlab/countdown" + url = "https://github.com/EEESlab/countdown/archive/refs/tags/v1.1.1.tar.gz" + + license("BSD-3-Clause") + + maintainers("f-tesser", "danielecesarini") + + version("1.1.1", sha256="ee7f00ffc047f000a21a7a71f6ea6f4049afb1a8407608adc04993929ceba917") + + variant( + "acc_mpi", + default=True, + description="Enable the instrumentation of all accessory MPI functions", + ) + variant( + "coll_mpi", + default=True, + description="Enable the instrumentation of all collective MPI functions", + ) + variant("debug_mpi", default=False, description="Enable the debug prints on MPI functions") + variant( + "excl_all_mpi", + default=False, + description="Disable the instrumentation of all MPI functions, " + "except for initialization and finalization", + ) + variant("hwp_auto_discovery", default=True, description="Autodiscovery of hwp-states") + variant("mosquitto", default=False, description="Enable MQTT message passing") + variant("no_profiling", default=False, description="Disable MPI profiling") + variant("use_cpufreq", default=True, description="Manual set of cpufreq interface") + variant("use_hwp", default=False, description="Manual set if hwp-states are available") + variant( + "p2p_mpi", + default=True, + description="Enable the instrumentation of all point-to-point MPI functions", + ) + variant("shared", default=True, description="Build shared libraries") + + conflicts("+acc_mpi", when="+excl_all_mpi") + conflicts("+coll_mpi", when="+excl_all_mpi") + conflicts("+p2p_mpi", when="+excl_all_mpi") + conflicts("+excl_all_mpi", when="+acc_mpi") + conflicts("+excl_all_mpi", when="+coll_mpi") + conflicts("+excl_all_mpi", when="+p2p_mpi") + conflicts("+hwp_auto_discovery", when="+use_cpufreq") + conflicts("+hwp_auto_discovery", when="+use_hwp") + conflicts("+use_cpufreq", when="+hwp_auto_discovery") + conflicts("+use_cpufreq", when="+use_hwp") + conflicts("+use_hwp", when="+hwp_auto_discovery") + conflicts("+use_hwp", when="+use_cpufreq") + + depends_on("cmake@3.0.0:", type="build") + depends_on("hwloc", type="link") + depends_on("mpi@3.0.0:", type="link") + depends_on("mosquitto", when="+mosquitto", type="link") + + def cmake_args(self): + args = [ + self.define_from_variant("CNTD_ENABLE_CUDA", "cuda"), + self.define_from_variant("CNTD_DISABLE_ACCESSORY_MPI", "acc_mpi"), + self.define_from_variant("CNTD_ENABLE_COLLECTIVE_MPI", "coll_mpi"), + self.define_from_variant("CNTD_ENABLE_DEBUG_MPI", "debug_mpi"), + self.define_from_variant("CNTD_DISABLE_ALL_MPI_EXCEPT_INI_FIN", "excl_all_mpi"), + self.define_from_variant("CNTD_HWP_AUTO_DISCOVER", "hwp_auto_discovery"), + self.define_from_variant("CNTD_ENABLE_MOSQUITTO", "mosquitto"), + self.define_from_variant("CNTD_DISABLE_PROFILING_MPI", "no_profiling"), + self.define_from_variant("CNTD_USE_CPUFREQ", "use_cpufreq"), + self.define_from_variant("CNTD_HWP_DISCOVERED", "use_hwp"), + self.define_from_variant("CNTD_ENABLE_P2P_MPI", "p2p_mpi"), + self.define_from_variant("BUILD_SHARED_LIBS", "shared"), + ] + + return args diff --git a/var/spack/repos/builtin/packages/cowsay/package.py b/var/spack/repos/builtin/packages/cowsay/package.py index 9415e77010df81..a31c56098f3e63 100644 --- a/var/spack/repos/builtin/packages/cowsay/package.py +++ b/var/spack/repos/builtin/packages/cowsay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cowsay(Package): homepage = "https://github.com/tnalpgge/rank-amateur-cowsay" url = "https://github.com/tnalpgge/rank-amateur-cowsay/archive/cowsay-3.04.tar.gz" + license("Artistic-1.0-Perl OR GPL-2.0-or-later") + version("3.04", sha256="d8b871332cfc1f0b6c16832ecca413ca0ac14d58626491a6733829e3d655878b") depends_on("perl", type=("run")) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 2e765c7539fffb..ebca0a896fe336 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,16 +11,30 @@ import spack.util.environment import spack.util.executable from spack.build_environment import dso_suffix +from spack.build_systems import cmake, makefile from spack.package import * - -class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): +GPU_MAP = { + "35": "K40", + "37": "K80", + "60": "P100", + "70": "V100", + "80": "A100", + "gfx906": "Mi50", + "gfx908": "Mi100", + "gfx90a": "Mi250", + "gfx90a:xnack-": "Mi250", + "gfx90a:xnack+": "Mi250", +} + + +class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage): """CP2K is a quantum chemistry and solid state physics software package that can perform atomistic simulations of solid state, liquid, molecular, periodic, material, crystal, and biological systems """ - build_system(conditional("cmake", when="@2023.2:"), "makefile", default="makefile") + build_system(conditional("cmake", when="@2023.2:"), "makefile", default="cmake") homepage = "https://www.cp2k.org" url = "https://github.com/cp2k/cp2k/releases/download/v3.0.0/cp2k-3.0.tar.bz2" @@ -29,6 +43,9 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): maintainers("dev-zero", "mtaillefumier") + license("GPL-2.0-or-later") + + version("2024.1", sha256="a7abf149a278dfd5283dc592a2c4ae803b37d040df25d62a5e35af5c4557668f") version("2023.2", sha256="adbcc903c1a78cba98f49fe6905a62b49f12e3dfd7cedea00616d1a5f50550db") version("2023.1", sha256="dff343b4a80c3a79363b805429bdb3320d3e1db48e0ff7d20a3dfd1c946a51ce") version("2022.2", sha256="1a473dea512fe264bb45419f83de432d441f90404f829d89cbc3a03f723b8354") @@ -37,26 +54,6 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): version("8.2", sha256="2e24768720efed1a5a4a58e83e2aca502cd8b95544c21695eb0de71ed652f20a") version("8.1", sha256="7f37aead120730234a60b2989d0547ae5e5498d93b1e9b5eb548c041ee8e7772") version("7.1", sha256="ccd711a09a426145440e666310dd01cc5772ab103493c4ae6a3470898cd0addb") - version( - "6.1", - sha256="af803558e0a6b9e9d9ce8a3ab955ba32bacd179922455424e061c82c9fefa34b", - deprecated=True, - ) - version( - "5.1", - sha256="e23613b593354fa82e0b8410e17d94c607a0b8c6d9b5d843528403ab09904412", - deprecated=True, - ) - version( - "4.1", - sha256="4a3e4a101d8a35ebd80a9e9ecb02697fb8256364f1eccdbe4e5a85d31fe21343", - deprecated=True, - ) - version( - "3.0", - sha256="1acfacef643141045b7cbade7006f9b7538476d861eeecd9658c9e468dc61151", - deprecated=True, - ) version("master", branch="master", submodules="True") variant("mpi", default=True, description="Enable MPI support") @@ -76,30 +73,33 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): "pexsi", default=False, description="Enable the alternative PEXSI method for density matrix evaluation", + when="+mpi", ) variant( "elpa", default=False, description="Enable optimised diagonalisation routines from ELPA", - when="@6.1:", + when="+mpi", ) variant( "dlaf", default=False, description="Enable DLA-Future eigensolver and Cholesky decomposition", - # TODO: Pin version when integrated in a release - when="@master build_system=cmake", + when="@2024.1: build_system=cmake +mpi", ) + # sirius support was introduced in 7, but effectively usable starting from CP2K 9 variant( "sirius", default=False, description="Enable planewave electronic structure calculations via SIRIUS", + when="@9: +mpi", ) - variant("cosma", default=False, description="Use COSMA for p?gemm") + variant("cosma", default=False, description="Use COSMA for p?gemm", when="@8: +mpi") variant( "libvori", default=False, description="Enable support for Voronoi integration and BQB compression", + when="@8:", ) variant("spglib", default=False, description="Enable support for spglib") variant( @@ -131,15 +131,13 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): ), ) variant( - "cuda_fft", - default=False, - description=("Use CUDA also for FFTs in the PW part of CP2K"), + "cuda_fft", default=False, description="Use CUDA also for FFTs in the PW part of CP2K" ) variant( "cuda_blas", default=False, when="@:7", # req in CP2K v8+ - description=("Use CUBLAS for general matrix operations in DBCSR"), + description="Use CUBLAS for general matrix operations in DBCSR", ) HFX_LMAX_RANGE = range(4, 8) @@ -152,8 +150,7 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): multi=False, ) - depends_on("python", type="build") - depends_on("python@3:", when="@8:", type="build") + depends_on("python@3", type="build") depends_on("blas") depends_on("lapack") @@ -182,21 +179,15 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): conflicts("target=aarch64:", msg="libxsmm is not available on arm") with when("+libint"): - # ... and in CP2K 7.0+ for linking to libint2 depends_on("pkgconfig", type="build", when="@7.0:") - # libint & libxc are always statically linked - depends_on("libint@1.1.4:1.2", when="@3.0:6.9") for lmax in HFX_LMAX_RANGE: - # libint2 can be linked dynamically again depends_on( "libint@2.6.0:+fortran tune=cp2k-lmax-{0}".format(lmax), when="@7.0: lmax={0}".format(lmax), ) with when("+libxc"): - depends_on("pkgconfig", when="@7.0:") - depends_on("libxc@2.2.2:3", when="@:5") - depends_on("libxc@4.0.3:4", when="@6.0:6.9") + depends_on("pkgconfig", type="build", when="@7.0:") depends_on("libxc@4.0.3:4", when="@7.0:8.1") depends_on("libxc@5.1.3:5.1", when="@8.2:8") depends_on("libxc@5.1.7:5.1", when="@9:2022.2") @@ -221,24 +212,22 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): depends_on("cosma@2.6.3:", when="@2023.2:") depends_on("cosma+cuda", when="+cuda") depends_on("cosma+rocm", when="+rocm") - conflicts("~mpi") - # COSMA support was introduced in 8+ - conflicts("@:7") with when("+elpa"): - conflicts("~mpi", msg="elpa requires MPI") depends_on("elpa+openmp", when="+openmp") depends_on("elpa~openmp", when="~openmp") + depends_on("elpa+cuda", when="+cuda") + depends_on("elpa~cuda", when="~cuda") + depends_on("elpa+rocm", when="+rocm") + depends_on("elpa~rocm", when="~rocm") depends_on("elpa@2021.05:", when="@8.3:") depends_on("elpa@2021.11.001:", when="@9.1:") depends_on("elpa@2023.05.001:", when="@2023.2:") with when("+dlaf"): - conflicts( - "~mpi", msg="DLA-Future requires MPI. Only the distributed eigensolver is available." - ) depends_on("dla-future@0.2.1: +scalapack") - depends_on("dla-future ~cuda~rocm", when="~cuda~rocm") + depends_on("dla-future ~cuda", when="~cuda") + depends_on("dla-future ~rocm", when="~rocm") depends_on("dla-future +cuda", when="+cuda") depends_on("dla-future +rocm", when="+rocm") @@ -249,10 +238,7 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): # while we link statically against PEXSI, its own deps may be linked in # dynamically, therefore can't set this as pure build-type dependency. - with when("+pexsi"): - conflicts("~mpi", msg="pexsi requires MPI") - depends_on("pexsi+fortran@0.9.0:0.9", when="@:4") - depends_on("pexsi+fortran@0.10.0:", when="@5.0:") + depends_on("pexsi+fortran@0.10.0:", when="+pexsi") # only OpenMP should be consistently used, all other common things # like ELPA, SCALAPACK are independent and Spack will ensure that @@ -266,17 +252,13 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): depends_on("sirius@7.0.0:7.0", when="@8:8.2") depends_on("sirius@7.2", when="@8.3:8.9") depends_on("sirius@7.3:", when="@9.1") - depends_on("sirius@7.4:", when="@2023.2") - conflicts("~mpi", msg="SIRIUS requires MPI") - # sirius support was introduced in 7, but effectively usable starting from CP2K 9 - conflicts("@:8") + depends_on("sirius@7.4:7.5", when="@2023.2") + depends_on("sirius@7.5:", when="@2024.1:") with when("+libvori"): depends_on("libvori@201219:", when="@8.1") depends_on("libvori@210412:", when="@8.2:") depends_on("libvori@220621:", when="@2023.1:") - # libvori support was introduced in 8+ - conflicts("@:7") # the bundled libcusmm uses numpy in the parameter prediction (v7+) # which is written using Python 3 @@ -286,17 +268,19 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): depends_on("spglib", when="+spglib") - # Apparently cp2k@4.1 needs an "experimental" version of libwannier.a - # which is only available contacting the developer directly. See INSTALL - # in the stage of cp2k@4.1 - depends_on("wannier90", when="@3.0+mpi") - with when("build_system=cmake"): + depends_on("cmake@3.22:", type="build") + + # DBCSR as external dependency depends_on("dbcsr@2.6:") depends_on("dbcsr+openmp", when="+openmp") depends_on("dbcsr+cuda", when="+cuda") depends_on("dbcsr+rocm", when="+rocm") + with when("@2022: +rocm"): + depends_on("hipblas") + depends_on("hipfft") + # CP2K needs compiler specific compilation flags, e.g. optflags conflicts("%apple-clang") conflicts("%clang") @@ -315,18 +299,6 @@ class Cp2k(MakefilePackage, CudaPackage, CMakePackage, ROCmPackage): supported_cuda_arch_list = ("35", "37", "60", "70", "80") supported_rocm_arch_list = ("gfx906", "gfx908", "gfx90a", "gfx90a:xnack-", "gfx90a:xnack+") - gpu_map = { - "35": "K40", - "37": "K80", - "60": "P100", - "70": "V100", - "80": "A100", - "gfx906": "Mi50", - "gfx908": "Mi100", - "gfx90a": "Mi250", - "gfx90a:xnack-": "Mi250", - "gfx90a:xnack+": "Mi250", - } cuda_msg = "cp2k only supports cuda_arch {0}".format(supported_cuda_arch_list) rocm_msg = "cp2k only supports amdgpu_target {0}".format(supported_rocm_arch_list) @@ -382,27 +354,9 @@ def url_for_version(self, version): url = "https://github.com/cp2k/cp2k/releases/download/v{0}/cp2k-{0}.tar.bz2" return url.format(version) - @property - def makefile_architecture(self): - return "{0.architecture}-{0.compiler.name}".format(self.spec) - - @property - def makefile_version(self): - return "{prefix}{suffix}".format( - prefix="p" if "+mpi" in self.spec else "s", - suffix="smp" if "+openmp" in self.spec else "opt", - ) - - @property - def makefile(self): - makefile_basename = ".".join([self.makefile_architecture, self.makefile_version]) - return join_path("arch", makefile_basename) - - @property - def archive_files(self): - return [join_path(self.stage.source_path, self.makefile)] - def edit(self, spec, prefix): +class MakefileBuilder(makefile.MakefileBuilder): + def edit(self, pkg, spec, prefix): pkgconf = which("pkg-config") fftw = spec["fftw-api:openmp" if "+openmp" in spec else "fftw-api"] @@ -424,8 +378,11 @@ def edit(self, spec, prefix): "aocc": ["-O2"], } - dflags = ["-DNDEBUG"] - cppflags = ["-D__FFTW3", "-I{0}".format(fftw_header_dir)] + dflags = ["-DNDEBUG"] if spec.satisfies("@:2023.2") else [] + if spec["fftw-api"].name in ("intel-mkl", "intel-parallel-studio", "intel-oneapi-mkl"): + cppflags = ["-D__FFTW3_MKL", "-I{0}".format(fftw_header_dir)] + else: + cppflags = ["-D__FFTW3", "-I{0}".format(fftw_header_dir)] # CP2K requires MPI 3 starting at version 2023.1 # and __MPI_VERSION is not supported anymore. @@ -435,9 +392,9 @@ def edit(self, spec, prefix): elif "^mpi@2:" in spec: cppflags.append("-D__MPI_VERSION=2") - cflags = optimization_flags[self.spec.compiler.name][:] - cxxflags = optimization_flags[self.spec.compiler.name][:] - fcflags = optimization_flags[self.spec.compiler.name][:] + cflags = optimization_flags[spec.compiler.name][:] + cxxflags = optimization_flags[spec.compiler.name][:] + fcflags = optimization_flags[spec.compiler.name][:] nvflags = ["-O3"] ldflags = [] libs = [] @@ -445,10 +402,10 @@ def edit(self, spec, prefix): # CP2K Makefile doesn't set C standard if spec.satisfies("@2023.2:"): # Use of DBL_DECIMAL_DIG - cflags.append(self.compiler.c11_flag) + cflags.append(pkg.compiler.c11_flag) else: # C99-style for-loops with inline definition of iterating variable. - cflags.append(self.compiler.c99_flag) + cflags.append(pkg.compiler.c99_flag) if "%intel" in spec: cflags.append("-fp-model precise") @@ -478,11 +435,11 @@ def edit(self, spec, prefix): fcflags.append("-fallow-argument-mismatch") if "+openmp" in spec: - cflags.append(self.compiler.openmp_flag) - cxxflags.append(self.compiler.openmp_flag) - fcflags.append(self.compiler.openmp_flag) - ldflags.append(self.compiler.openmp_flag) - nvflags.append('-Xcompiler="{0}"'.format(self.compiler.openmp_flag)) + cflags.append(pkg.compiler.openmp_flag) + cxxflags.append(pkg.compiler.openmp_flag) + fcflags.append(pkg.compiler.openmp_flag) + ldflags.append(pkg.compiler.openmp_flag) + nvflags.append('-Xcompiler="{0}"'.format(pkg.compiler.openmp_flag)) elif "%cce" in spec: # Cray enables OpenMP by default cflags += ["-hnoomp"] cxxflags += ["-hnoomp"] @@ -490,20 +447,18 @@ def edit(self, spec, prefix): ldflags += ["-hnoomp"] if "@7:" in spec: # recent versions of CP2K use C++14 CUDA code - cxxflags.append(self.compiler.cxx14_flag) - nvflags.append(self.compiler.cxx14_flag) + cxxflags.append(pkg.compiler.cxx14_flag) + nvflags.append(pkg.compiler.cxx14_flag) ldflags.append(fftw.libs.search_flags) if "superlu-dist@4.3" in spec: ldflags.insert(0, "-Wl,--allow-multiple-definition") - if "+plumed" in self.spec: + if "+plumed" in spec: dflags.extend(["-D__PLUMED2"]) cppflags.extend(["-D__PLUMED2"]) - libs.extend( - [join_path(self.spec["plumed"].prefix.lib, "libplumed.{0}".format(dso_suffix))] - ) + libs.extend([join_path(spec["plumed"].prefix.lib, "libplumed.{0}".format(dso_suffix))]) cc = spack_cc if "~mpi" in spec else spec["mpi"].mpicc cxx = spack_cxx if "~mpi" in spec else spec["mpi"].mpicxx @@ -520,7 +475,7 @@ def edit(self, spec, prefix): ldflags.append((lapack + blas).search_flags) libs.extend([str(x) for x in (fftw.libs, lapack, blas)]) - if self.spec.satisfies("platform=darwin"): + if spec.satisfies("platform=darwin"): cppflags.extend(["-D__NO_STATM_ACCESS"]) if spec["blas"].name in ("intel-mkl", "intel-parallel-studio", "intel-oneapi-mkl"): @@ -546,7 +501,7 @@ def edit(self, spec, prefix): # while intel-mkl has a mpi variant and adds the scalapack # libs to its libs, intel-oneapi-mkl does not. if spec["scalapack"].name == "intel-oneapi-mkl": - mpi_impl = "openmpi" if spec["mpi"] == "openmpi" else "intelmpi" + mpi_impl = "openmpi" if spec["mpi"].name in ["openmpi", "hpcx-mpi"] else "intelmpi" scalapack = [ join_path( spec["intel-oneapi-mkl"].libs.directories[0], "libmkl_scalapack_lp64.so" @@ -562,7 +517,7 @@ def edit(self, spec, prefix): libs.extend(scalapack) libs.extend(mpi) - libs.extend(self.compiler.stdcxx_libs) + libs.extend(pkg.compiler.stdcxx_libs) if "+mpi_f08" in spec: cppflags.append("-D__MPI_F08") @@ -715,7 +670,7 @@ def edit(self, spec, prefix): libs += ["-lcufft", "-lcublas"] cuda_arch = spec.variants["cuda_arch"].value[0] - gpuver = gpu_map[cuda_arch] + gpuver = GPU_MAP[cuda_arch] if cuda_arch == "35" and spec.satisfies("+cuda_arch_35_k20x"): gpuver = "K20X" @@ -733,7 +688,7 @@ def edit(self, spec, prefix): acc_flags_var = "NVFLAGS" cppflags += ["-D__ACC"] cppflags += ["-D__DBCSR_ACC"] - gpuver = gpu_map[spec.variants["amdgpu_target"].value[0]] + gpuver = GPU_MAP[spec.variants["amdgpu_target"].value[0]] if "smm=libsmm" in spec: lib_dir = join_path("lib", self.makefile_architecture, self.makefile_version) @@ -792,7 +747,7 @@ def edit(self, spec, prefix): ) if "%intel" in spec: - intel_bin_dir = ancestor(self.compiler.cc) + intel_bin_dir = ancestor(pkg.compiler.cc) # CPP is a commented command in Intel arch of CP2K # This is the hack through which cp2k developers avoid doing : # @@ -832,11 +787,34 @@ def fflags(var, lst): mkf.write("# CP2K-specific flags\n\n") mkf.write("GPUVER = {0}\n".format(gpuver)) - mkf.write("DATA_DIR = {0}\n".format(self.prefix.share.data)) + mkf.write("DATA_DIR = {0}\n".format(prefix.share.data)) + + def build(self, pkg, spec, prefix): + if "+cuda" in spec and len(spec.variants["cuda_arch"].value) > 1: + raise InstallError("cp2k supports only one cuda_arch at a time") + + # Apparently the Makefile bases its paths on PWD + # so we need to set PWD = self.build_directory + with spack.util.environment.set_env(PWD=self.build_directory): + super().build(pkg, spec, prefix) + + with working_dir(self.build_directory): + make("libcp2k", *self.build_targets) + + def install(self, pkg, spec, prefix): + exe_dir = join_path("exe", self.makefile_architecture) + lib_dir = join_path("lib", self.makefile_architecture, self.makefile_version) + + install_tree(exe_dir, self.prefix.bin) + install_tree("data", self.prefix.share.data) + install_tree(lib_dir, self.prefix.lib) + + mkdirp(self.prefix.include) + install("src/start/libcp2k.h", join_path(self.prefix.include, "libcp2k.h")) @property def build_directory(self): - build_dir = self.stage.source_path + build_dir = self.pkg.stage.source_path if self.spec.satisfies("@:6"): # prior to version 7.1 was the Makefile located in makefiles/ @@ -851,30 +829,36 @@ def build_targets(self): "VERSION={0}".format(self.makefile_version), ] - def build(self, spec, prefix): - if "+cuda" in spec and len(spec.variants["cuda_arch"].value) > 1: - raise InstallError("cp2k supports only one cuda_arch at a time") + @property + def makefile(self): + makefile_basename = ".".join([self.makefile_architecture, self.makefile_version]) + return join_path("arch", makefile_basename) - # Apparently the Makefile bases its paths on PWD - # so we need to set PWD = self.build_directory - with spack.util.environment.set_env(PWD=self.build_directory): - super().build(spec, prefix) + @property + def makefile_architecture(self): + return "{0.architecture}-{0.compiler.name}".format(self.spec) - with working_dir(self.build_directory): - make("libcp2k", *self.build_targets) + @property + def makefile_version(self): + return "{prefix}{suffix}".format( + prefix="p" if "+mpi" in self.spec else "s", + suffix="smp" if "+openmp" in self.spec else "opt", + ) - def install(self, spec, prefix): - exe_dir = join_path("exe", self.makefile_architecture) - lib_dir = join_path("lib", self.makefile_architecture, self.makefile_version) + @property + def archive_files(self): + return [join_path(self.pkg.stage.source_path, self.makefile)] - install_tree(exe_dir, self.prefix.bin) - install_tree("data", self.prefix.share.data) - install_tree(lib_dir, self.prefix.lib) + def check(self): + data_dir = join_path(self.pkg.stage.source_path, "data") - mkdirp(self.prefix.include) - install("src/start/libcp2k.h", join_path(self.prefix.include, "libcp2k.h")) + # CP2K < 7 still uses $PWD to detect the current working dir + # and Makefile is in a subdir, account for both facts here: + with spack.util.environment.set_env(CP2K_DATA_DIR=data_dir, PWD=self.build_directory): + with working_dir(self.build_directory): + make("test", *self.build_targets) - @run_after("install") + @run_after("install", when="@9.1:") def fix_package_config(self): """ Default build procedure generates libcp2k.pc with invalid paths, @@ -888,61 +872,36 @@ def fix_package_config(self): In case such approach causes issues in the future, it might be necessary to generate and override entire libcp2k.pc. """ - if self.spec.satisfies("@9.1:"): - pkgconfig_file = join_path(self.prefix.lib.pkgconfig, "libcp2k.pc") - filter_file(r"(^includedir=).*", r"\1{0}".format(self.prefix.include), pkgconfig_file) - filter_file(r"(^libdir=).*", r"\1{0}".format(self.prefix.lib), pkgconfig_file) + pkgconfig_file = join_path(self.prefix.lib.pkgconfig, "libcp2k.pc") + filter_file(r"(^includedir=).*", r"\1{0}".format(self.prefix.include), pkgconfig_file) + filter_file(r"(^libdir=).*", r"\1{0}".format(self.prefix.lib), pkgconfig_file) - with open(pkgconfig_file, "r+") as handle: - content = handle.read().rstrip() + with open(pkgconfig_file, "r+") as handle: + content = handle.read().rstrip() - content += " " + self.spec["blas"].libs.ld_flags - content += " " + self.spec["lapack"].libs.ld_flags - content += " " + self.spec["fftw-api"].libs.ld_flags + content += " " + self.spec["blas"].libs.ld_flags + content += " " + self.spec["lapack"].libs.ld_flags + content += " " + self.spec["fftw-api"].libs.ld_flags - if (self.spec["fftw-api"].name == "fftw") and ("+openmp" in self.spec["fftw"]): - content += " -lfftw3_omp" + if (self.spec["fftw-api"].name == "fftw") and ("+openmp" in self.spec["fftw"]): + content += " -lfftw3_omp" - content += "\n" + content += "\n" - handle.seek(0) - handle.write(content) + handle.seek(0) + handle.write(content) - def check(self): - data_dir = join_path(self.stage.source_path, "data") - - # CP2K < 7 still uses $PWD to detect the current working dir - # and Makefile is in a subdir, account for both facts here: - with spack.util.environment.set_env(CP2K_DATA_DIR=data_dir, PWD=self.build_directory): - with working_dir(self.build_directory): - make("test", *self.build_targets) - - -class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder): - """Use the new CMake build system to build CP2K.""" +class CMakeBuilder(cmake.CMakeBuilder): def cmake_args(self): spec = self.spec args = [] - gpu_map = { - "35": "K40", - "37": "K80", - "60": "P100", - "70": "V100", - "80": "A100", - "gfx906": "Mi50", - "gfx908": "Mi100", - "gfx90a": "Mi250", - "gfx90a:xnack-": "Mi250", - "gfx90a:xnack+": "Mi250", - } - if "+cuda" in spec: if (len(spec.variants["cuda_arch"].value) > 1) or spec.satisfies("cuda_arch=none"): raise InstallError("CP2K supports only one cuda_arch at a time.") else: - gpu_ver = gpu_map[spec.variants["cuda_arch"].value[0]] + gpu_ver = GPU_MAP[spec.variants["cuda_arch"].value[0]] args += [ self.define("CP2K_USE_ACCEL", "CUDA"), self.define("CP2K_WITH_GPU", gpu_ver), @@ -952,7 +911,7 @@ def cmake_args(self): if len(spec.variants["amdgpu_target"].value) > 1: raise InstallError("CP2K supports only one amdgpu_target at a time.") else: - gpu_ver = gpu_map[spec.variants["amdgpu_target"].value[0]] + gpu_ver = GPU_MAP[spec.variants["amdgpu_target"].value[0]] args += [ self.define("CP2K_USE_ACCEL", "HIP"), self.define("CP2K_WITH_GPU", gpu_ver), @@ -1029,5 +988,3 @@ def cmake_args(self): ) return args - - pass diff --git a/var/spack/repos/builtin/packages/cpat/package.py b/var/spack/repos/builtin/packages/cpat/package.py index ef6415bfba84ea..116508d67a3de6 100644 --- a/var/spack/repos/builtin/packages/cpat/package.py +++ b/var/spack/repos/builtin/packages/cpat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cpio/package.py b/var/spack/repos/builtin/packages/cpio/package.py index 02875e3f51e673..0ae7ac02204072 100644 --- a/var/spack/repos/builtin/packages/cpio/package.py +++ b/var/spack/repos/builtin/packages/cpio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Cpio(AutotoolsPackage, GNUMirrorPackage): executables = ["^cpio$"] + license("GPL-3.0-or-later") + version("2.14", sha256="145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454") version("2.13", sha256="e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88") diff --git a/var/spack/repos/builtin/packages/cplex/package.py b/var/spack/repos/builtin/packages/cplex/package.py index 60d791d23f10b4..64e860d5fa2a56 100644 --- a/var/spack/repos/builtin/packages/cplex/package.py +++ b/var/spack/repos/builtin/packages/cplex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cpmd/package.py b/var/spack/repos/builtin/packages/cpmd/package.py index 1782d07b6b07f9..61977a370669a7 100644 --- a/var/spack/repos/builtin/packages/cpmd/package.py +++ b/var/spack/repos/builtin/packages/cpmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cpmd(MakefilePackage): homepage = "https://www.cpmd.org/wordpress/" url = "https://github.com/CPMD-code/CPMD/archive/refs/tags/4.3.tar.gz" + license("MIT") + version("4.3", sha256="e0290f9da0d255f90a612e60662b14a97ca53003f89073c6af84fa7bc8739f65") variant("omp", description="Enables the use of OMP instructions", default=False) diff --git a/var/spack/repos/builtin/packages/cpp-argparse/package.py b/var/spack/repos/builtin/packages/cpp-argparse/package.py index 8dbe13ac3bf93d..509724a3fc661f 100644 --- a/var/spack/repos/builtin/packages/cpp-argparse/package.py +++ b/var/spack/repos/builtin/packages/cpp-argparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class CppArgparse(CMakePackage): maintainers("qoelet") + license("MIT") + version("2.9", sha256="cd563293580b9dc592254df35b49cf8a19b4870ff5f611c7584cf967d9e6031e") version("2.2", sha256="f0fc6ab7e70ac24856c160f44ebb0dd79dc1f7f4a614ee2810d42bb73799872b") diff --git a/var/spack/repos/builtin/packages/cpp-httplib/package.py b/var/spack/repos/builtin/packages/cpp-httplib/package.py index 559bdb9cb63dfa..04874b3a9e62e3 100644 --- a/var/spack/repos/builtin/packages/cpp-httplib/package.py +++ b/var/spack/repos/builtin/packages/cpp-httplib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class CppHttplib(CMakePackage): homepage = "https://github.com/yhirose/cpp-httplib/" url = "https://github.com/yhirose/cpp-httplib/archive/v0.5.10.tar.gz" + license("MIT") + version("0.12.5", sha256="b488f3fa9c6bf35608c3d9a5b69be52e016bbf2fbfe67e5ee684eadb2655493e") version("0.12.3", sha256="175ced3c9cdaf221e9edf210297568d8f7d402a41d6db01254ac9e0b25487c54") version("0.5.9", sha256="c9e7aef3b0d4e80ee533d10413508d8a6e09a67d0d59646c43111f3993de006e") diff --git a/var/spack/repos/builtin/packages/cpp-logger/package.py b/var/spack/repos/builtin/packages/cpp-logger/package.py index f325fa09dfc2ba..2784ea219eef35 100644 --- a/var/spack/repos/builtin/packages/cpp-logger/package.py +++ b/var/spack/repos/builtin/packages/cpp-logger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class CppLogger(CMakePackage): git = "https://github.com/hariharan-devarajan/cpp-logger.git" maintainers("hariharan-devarajan") + license("MIT") + version("develop", branch="develop") version("master", branch="master") version("0.0.1", tag="v0.0.1", commit="d48b38ab14477bb7c53f8189b8b4be2ea214c28a") + version("0.0.2", tag="v0.0.2", commit="329a48401033d2d2a1f1196141763cab029220ae") diff --git a/var/spack/repos/builtin/packages/cpp-termcolor/package.py b/var/spack/repos/builtin/packages/cpp-termcolor/package.py index 8d7e30368b2d86..93954c23c997f1 100644 --- a/var/spack/repos/builtin/packages/cpp-termcolor/package.py +++ b/var/spack/repos/builtin/packages/cpp-termcolor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index dad968e7547203..dcc9e14cf9cbc5 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py index d0aaae8ac505e9..fbda439345b37c 100644 --- a/var/spack/repos/builtin/packages/cppcheck/package.py +++ b/var/spack/repos/builtin/packages/cppcheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cppcheck(CMakePackage): maintainers("white238") + license("GPL-3.0-or-later") + version("2.9", sha256="d89f3282c70814fa66669e1ea0323c0484563b3f8249c7a2dcaac2ad07651dc7") version("2.8", sha256="a5ed97a99173d2952cd93fcb028a3405a7b3b992e7168e2ae9d527b991770203") version("2.7", sha256="ac74c0973c46a052760f4ff7ca6a84616ca5795510542d195a6f122c53079291") diff --git a/var/spack/repos/builtin/packages/cppcodec/package.py b/var/spack/repos/builtin/packages/cppcodec/package.py index 8e5b58b58d9bf7..1cee1f9ad1e93f 100644 --- a/var/spack/repos/builtin/packages/cppcodec/package.py +++ b/var/spack/repos/builtin/packages/cppcodec/package.py @@ -1,20 +1,22 @@ -# 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 Cppcodec(CMakePackage): - """Header-only C++11 library to encode/decode base64, base64url, base32, - base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus - Crockford's base32. MIT licensed with consistent, flexible API.""" - - maintainers("vmiheer") - homepage = "https://github.com/tplgy/cppcodec" - url = "https://github.com/tplgy/cppcodec/archive/refs/tags/v0.2.tar.gz" - - version("0.2", sha256="0edaea2a9d9709d456aa99a1c3e17812ed130f9ef2b5c2d152c230a5cbc5c482") - - depends_on("cmake@2.8:", type="build") +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Cppcodec(CMakePackage): + """Header-only C++11 library to encode/decode base64, base64url, base32, + base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus + Crockford's base32. MIT licensed with consistent, flexible API.""" + + maintainers("vmiheer") + homepage = "https://github.com/tplgy/cppcodec" + url = "https://github.com/tplgy/cppcodec/archive/refs/tags/v0.2.tar.gz" + + license("MIT") + + version("0.2", sha256="0edaea2a9d9709d456aa99a1c3e17812ed130f9ef2b5c2d152c230a5cbc5c482") + + depends_on("cmake@2.8:", type="build") diff --git a/var/spack/repos/builtin/packages/cppcoro/package.py b/var/spack/repos/builtin/packages/cppcoro/package.py index 6677f44cb12184..ac998ace01c62e 100644 --- a/var/spack/repos/builtin/packages/cppcoro/package.py +++ b/var/spack/repos/builtin/packages/cppcoro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cppcoro(CMakePackage): maintainers("pbrady") + license("MIT") + version("develop", branch="master") version("2021-01-13", commit="7cc9433436fe8f2482138019cfaafce8e1d7a896") diff --git a/var/spack/repos/builtin/packages/cppgsl/package.py b/var/spack/repos/builtin/packages/cppgsl/package.py index aefd0ece08116b..a797e6eefc0cb7 100644 --- a/var/spack/repos/builtin/packages/cppgsl/package.py +++ b/var/spack/repos/builtin/packages/cppgsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cppgsl(CMakePackage): url = "https://github.com/Microsoft/GSL/archive/v2.0.0.tar.gz" git = "https://github.com/Microsoft/GSL.git" + license("MIT") + version("main", branch="main") version("4.0.0", sha256="f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9") version("3.1.0", sha256="d3234d7f94cea4389e3ca70619b82e8fb4c2f33bb3a070799f1e18eef500a083") diff --git a/var/spack/repos/builtin/packages/cpprestsdk/package.py b/var/spack/repos/builtin/packages/cpprestsdk/package.py index fbfca2bd0a353b..403e8bc42e98b5 100644 --- a/var/spack/repos/builtin/packages/cpprestsdk/package.py +++ b/var/spack/repos/builtin/packages/cpprestsdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cpprestsdk(CMakePackage): homepage = "https://github.com/Microsoft/cpprestsdk" url = "https://github.com/Microsoft/cpprestsdk/archive/v2.9.1.tar.gz" + license("MIT") + version( "2.10.16", git="https://github.com/Microsoft/cpprestsdk", diff --git a/var/spack/repos/builtin/packages/cppunit/package.py b/var/spack/repos/builtin/packages/cppunit/package.py index a06d07bc89a0a7..1fdba0c399cb54 100644 --- a/var/spack/repos/builtin/packages/cppunit/package.py +++ b/var/spack/repos/builtin/packages/cppunit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cppunit(AutotoolsPackage): url = "https://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz" git = "https://anongit.freedesktop.org/git/libreoffice/cppunit.git" + license("LGPL-2.1-or-later") + version("master", branch="master") version("1.15_20220904", commit="78e64f0edb4f3271a6ddbcdf9cba05138597bfca") version( diff --git a/var/spack/repos/builtin/packages/cppzmq/package.py b/var/spack/repos/builtin/packages/cppzmq/package.py index 6e52c55ef076ba..84ebbcf5359612 100644 --- a/var/spack/repos/builtin/packages/cppzmq/package.py +++ b/var/spack/repos/builtin/packages/cppzmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Cppzmq(CMakePackage): maintainers("wdconinc") + license("MIT") + version("master", branch="master") version("4.9.0", sha256="3fdf5b100206953f674c94d40599bdb3ea255244dcc42fab0d75855ee3645581") version("4.8.1", sha256="7a23639a45f3a0049e11a188e29aaedd10b2f4845f0000cf3e22d6774ebde0af") diff --git a/var/spack/repos/builtin/packages/cpr/package.py b/var/spack/repos/builtin/packages/cpr/package.py index 0d18a6a9199645..93cff509b40a2e 100644 --- a/var/spack/repos/builtin/packages/cpr/package.py +++ b/var/spack/repos/builtin/packages/cpr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cpr(CMakePackage): maintainers("sethrj") + license("MIT") + version("1.10.4", sha256="88462d059cd3df22c4d39ae04483ed50dfd2c808b3effddb65ac3b9aa60b542d") version("1.9.2", sha256="3bfbffb22c51f322780d10d3ca8f79424190d7ac4b5ad6ad896de08dbd06bf31") diff --git a/var/spack/repos/builtin/packages/cprnc/package.py b/var/spack/repos/builtin/packages/cprnc/package.py index e92919ab4aadae..9e4282879e05fd 100644 --- a/var/spack/repos/builtin/packages/cprnc/package.py +++ b/var/spack/repos/builtin/packages/cprnc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cpu-features/package.py b/var/spack/repos/builtin/packages/cpu-features/package.py index f8037c2b889e94..c0cb8bbfc93876 100644 --- a/var/spack/repos/builtin/packages/cpu-features/package.py +++ b/var/spack/repos/builtin/packages/cpu-features/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class CpuFeatures(CMakePackage): git = "https://github.com/google/cpu_features.git" url = "https://github.com/google/cpu_features/archive/refs/tags/v0.7.0.tar.gz" + license("Apache-2.0") + version("main", branch="main") version("develop", branch="main", deprecated=True) version("0.7.0", sha256="df80d9439abf741c7d2fdcdfd2d26528b136e6c52976be8bd0cd5e45a27262c0") diff --git a/var/spack/repos/builtin/packages/cpuinfo/package.py b/var/spack/repos/builtin/packages/cpuinfo/package.py index 73285b2e2e317b..bfae3aa4946dde 100644 --- a/var/spack/repos/builtin/packages/cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/cpuinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cpuinfo(CMakePackage): git = "https://github.com/pytorch/cpuinfo.git" tags = ["windows"] + license("BSD-2-Clause") + version("main", branch="main") version("2022-08-19", commit="8ec7bd91ad0470e61cf38f618cc1f270dede599c") # py-torch@1.13 version("2020-12-17", commit="5916273f79a21551890fd3d56fc5375a78d1598d") # py-torch@1.8:1.12 diff --git a/var/spack/repos/builtin/packages/cqrlib/package.py b/var/spack/repos/builtin/packages/cqrlib/package.py index 92af14027447eb..aaaf2264792381 100644 --- a/var/spack/repos/builtin/packages/cqrlib/package.py +++ b/var/spack/repos/builtin/packages/cqrlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cqrlib(MakefilePackage): "https://downloads.sourceforge.net/project/cqrlib/cqrlib/CQRlib-1.1.2/CQRlib-1.1.2.tar.gz" ) + license("LGPL-2.1-or-later") + version("1.1.2", sha256="af3cf2402974579f3c6efc6a6174a5da52786db4bfee9d38d504d93bc42410fd") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/cquery/package.py b/var/spack/repos/builtin/packages/cquery/package.py index b4bec9e73ed7e2..a00e3ea62ce639 100644 --- a/var/spack/repos/builtin/packages/cquery/package.py +++ b/var/spack/repos/builtin/packages/cquery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cquery(CMakePackage): homepage = "https://github.com/cquery-project/cquery" git = "https://github.com/cquery-project/cquery.git" + license("MIT") + version("2018-08-23", commit="70c755b2e390d3edfb594a84a7531beb26b2bc07", submodules=True) depends_on("llvm") diff --git a/var/spack/repos/builtin/packages/cracklib/package.py b/var/spack/repos/builtin/packages/cracklib/package.py index 82d8a411f31e21..b46217e554c9ee 100644 --- a/var/spack/repos/builtin/packages/cracklib/package.py +++ b/var/spack/repos/builtin/packages/cracklib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cracklib(AutotoolsPackage): homepage = "https://github.com/cracklib/cracklib" url = "https://github.com/cracklib/cracklib/archive/v2.9.7.tar.gz" + license("LGPL-2.1-or-later") + version("2.9.9", sha256="0a3fd72163512088c6f2add0f6cd6e34954ca0fa3f333ff9cced478b04e73ce1") version("2.9.7", sha256="ff4e6c3f86494c93719f5e4186e2c3ea9e265f41972ec21f7b87852aced704e6") version("2.9.6", sha256="7cd2c01365f199c466b490ad2585beccbe0108ccd606c1bcc6c1e52800e627fe") diff --git a/var/spack/repos/builtin/packages/cradl/package.py b/var/spack/repos/builtin/packages/cradl/package.py index 0b5e62b623a1ca..886a3208901e45 100644 --- a/var/spack/repos/builtin/packages/cradl/package.py +++ b/var/spack/repos/builtin/packages/cradl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Cradl(Package): tags = ["proxy-app"] + license("BSD-3-Clause") + version("master", branch="master") depends_on("py-pandas") diff --git a/var/spack/repos/builtin/packages/cram/package.py b/var/spack/repos/builtin/packages/cram/package.py index 0654b281453d0a..2aceaad214a891 100644 --- a/var/spack/repos/builtin/packages/cram/package.py +++ b/var/spack/repos/builtin/packages/cram/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cray-fftw/package.py b/var/spack/repos/builtin/packages/cray-fftw/package.py index fd29b14938ef0b..13526ecc61803b 100644 --- a/var/spack/repos/builtin/packages/cray-fftw/package.py +++ b/var/spack/repos/builtin/packages/cray-fftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cray-libsci/package.py b/var/spack/repos/builtin/packages/cray-libsci/package.py index ad24e669c2d3a2..e653aadc52f367 100644 --- a/var/spack/repos/builtin/packages/cray-libsci/package.py +++ b/var/spack/repos/builtin/packages/cray-libsci/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cray-mpich/package.py b/var/spack/repos/builtin/packages/cray-mpich/package.py index db0beaf085e835..66a75a874a5df7 100644 --- a/var/spack/repos/builtin/packages/cray-mpich/package.py +++ b/var/spack/repos/builtin/packages/cray-mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cray-mvapich2/package.py b/var/spack/repos/builtin/packages/cray-mvapich2/package.py index 988858a2ebda86..e2c6bdab1fe88c 100644 --- a/var/spack/repos/builtin/packages/cray-mvapich2/package.py +++ b/var/spack/repos/builtin/packages/cray-mvapich2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cray-pmi/package.py b/var/spack/repos/builtin/packages/cray-pmi/package.py index 3e8cb0d4db801b..736f8848f00212 100644 --- a/var/spack/repos/builtin/packages/cray-pmi/package.py +++ b/var/spack/repos/builtin/packages/cray-pmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/creduce/package.py b/var/spack/repos/builtin/packages/creduce/package.py index 2756a80a21b43d..d06a171995fb8b 100644 --- a/var/spack/repos/builtin/packages/creduce/package.py +++ b/var/spack/repos/builtin/packages/creduce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,7 @@ class Creduce(CMakePackage): depends_on("flex") depends_on("libxml2") + depends_on("llvm") depends_on("llvm@8.0.0", when="@:2.10") depends_on("perl") depends_on("perl-exporter-lite") diff --git a/var/spack/repos/builtin/packages/crmc/package.py b/var/spack/repos/builtin/packages/crmc/package.py index 44e5eef2410cde..0edb7bf18b53eb 100644 --- a/var/spack/repos/builtin/packages/crmc/package.py +++ b/var/spack/repos/builtin/packages/crmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cromwell-womtool/package.py b/var/spack/repos/builtin/packages/cromwell-womtool/package.py index 63d112ceafe63e..b20e3d2140e227 100644 --- a/var/spack/repos/builtin/packages/cromwell-womtool/package.py +++ b/var/spack/repos/builtin/packages/cromwell-womtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cromwell/package.py b/var/spack/repos/builtin/packages/cromwell/package.py index 1d731cab54ea5d..053ea5de5c7a29 100644 --- a/var/spack/repos/builtin/packages/cromwell/package.py +++ b/var/spack/repos/builtin/packages/cromwell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cronie/package.py b/var/spack/repos/builtin/packages/cronie/package.py index 3037fba6a9a501..d4caf6bee8548e 100644 --- a/var/spack/repos/builtin/packages/cronie/package.py +++ b/var/spack/repos/builtin/packages/cronie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cronie(AutotoolsPackage): homepage = "https://github.com/cronie-crond/cronie" url = "https://github.com/cronie-crond/cronie/archive/cronie-1.5.5.tar.gz" + license("ISC") + version("1.6.1", sha256="1ddbc8f8d07dfe1d45998b0a0cbd9a216cd4d7bc64d1626b2bc8b3a69e4641d1") version("1.5.5", sha256="22c2a2b22577c0f776c1268d0e0f305c5c041e10155022a345b43b665da0ffe9") diff --git a/var/spack/repos/builtin/packages/crosstool-ng/package.py b/var/spack/repos/builtin/packages/crosstool-ng/package.py index defc7095e48dfd..4c9865b35906f4 100644 --- a/var/spack/repos/builtin/packages/crosstool-ng/package.py +++ b/var/spack/repos/builtin/packages/crosstool-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/crtm-fix/package.py b/var/spack/repos/builtin/packages/crtm-fix/package.py index 2499c2e047fb2a..b5c1111c3f96bd 100644 --- a/var/spack/repos/builtin/packages/crtm-fix/package.py +++ b/var/spack/repos/builtin/packages/crtm-fix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/crtm/package.py b/var/spack/repos/builtin/packages/crtm/package.py index 608a6aa30d5ae4..d1dc42a7f34cd2 100644 --- a/var/spack/repos/builtin/packages/crtm/package.py +++ b/var/spack/repos/builtin/packages/crtm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -46,6 +46,8 @@ class Crtm(CMakePackage): depends_on("ecbuild", type=("build"), when="@v2.4.1-jedi") depends_on("ecbuild", type=("build"), when="@v3.0.0-rc.1") + license("CC0-1.0") + version( "v2.4.1-jedi", sha256="fd8bf4db4f2a3b420b4186de84483ba2a36660519dffcb1e0ff14bfe8c6f6a14" ) diff --git a/var/spack/repos/builtin/packages/crunch/package.py b/var/spack/repos/builtin/packages/crunch/package.py index 5652d5f0cd6af5..35c0195ef5a6bf 100644 --- a/var/spack/repos/builtin/packages/crunch/package.py +++ b/var/spack/repos/builtin/packages/crunch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Crunch(CMakePackage): # fix compilation bugs. If these commits are ever merged into upstream, we can switch to that. git = "https://github.com/rouault/crunch.git" + license("Zlib") + # No stable releases since 2012 version("master", branch="build_fixes") diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index 2465ab7dacd343..b0654740381ec4 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Cryptopp(MakefilePackage): homepage = "https://www.cryptopp.com" url = "https://www.cryptopp.com/cryptopp700.zip" + license("BSL-1.0") + version("8.7.0", sha256="d0d3a28fcb5a1f6ed66b3adf57ecfaed234a7e194e42be465c2ba70c744538dd") version("7.0.0", sha256="a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0") version("6.1.0", sha256="21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7") diff --git a/var/spack/repos/builtin/packages/cryptsetup/package.py b/var/spack/repos/builtin/packages/cryptsetup/package.py index 67c335974bc666..223726dc1ebfff 100644 --- a/var/spack/repos/builtin/packages/cryptsetup/package.py +++ b/var/spack/repos/builtin/packages/cryptsetup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/csa-c/package.py b/var/spack/repos/builtin/packages/csa-c/package.py index 9c5be7f65700da..ec189e26f9c011 100644 --- a/var/spack/repos/builtin/packages/csa-c/package.py +++ b/var/spack/repos/builtin/packages/csa-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cscope/package.py b/var/spack/repos/builtin/packages/cscope/package.py index 670cd1a9f56656..6b6ebfd0f5dee0 100644 --- a/var/spack/repos/builtin/packages/cscope/package.py +++ b/var/spack/repos/builtin/packages/cscope/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cscope(AutotoolsPackage): homepage = "http://cscope.sourceforge.net/" url = "https://sourceforge.net/projects/cscope/files/cscope/v15.9/cscope-15.9.tar.gz" + license("BSD-3-Clause") + version("15.9", sha256="c5505ae075a871a9cd8d9801859b0ff1c09782075df281c72c23e72115d9f159") version("15.8b", sha256="4889d091f05aa0845384b1e4965aa31d2b20911fb2c001b2cdcffbcb7212d3af") diff --git a/var/spack/repos/builtin/packages/csdp/package.py b/var/spack/repos/builtin/packages/csdp/package.py index 7189ead6a37370..22333049dd5b5c 100644 --- a/var/spack/repos/builtin/packages/csdp/package.py +++ b/var/spack/repos/builtin/packages/csdp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Csdp(MakefilePackage): homepage = "https://projects.coin-or.org/Csdp" url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz" + license("CPL-1.0") + version("6.1.1", sha256="0558a46ac534e846bf866b76a9a44e8a854d84558efa50988ffc092f99a138b9") depends_on("atlas") diff --git a/var/spack/repos/builtin/packages/ctffind/package.py b/var/spack/repos/builtin/packages/ctffind/package.py index ac7bc960c358fb..0cf000dfa22418 100644 --- a/var/spack/repos/builtin/packages/ctffind/package.py +++ b/var/spack/repos/builtin/packages/ctffind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ctffind(AutotoolsPackage): homepage = "https://grigoriefflab.umassmed.edu/ctffind4" url = "https://grigoriefflab.umassmed.edu/system/tdf?path=ctffind-4.1.8.tar.gz&file=1&type=node&id=26" + license("BSD-3-Clause") + version( "4.1.14", sha256="db17b2ebeb3c3b2b3764e42b820cd50d19ccccf6956c64257bfe5d5ba6b40cb5", diff --git a/var/spack/repos/builtin/packages/ctpl/package.py b/var/spack/repos/builtin/packages/ctpl/package.py index d8d6933b269069..0971f1decbda21 100644 --- a/var/spack/repos/builtin/packages/ctpl/package.py +++ b/var/spack/repos/builtin/packages/ctpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ctpl(AutotoolsPackage): homepage = "https://github.com/b4n/ctpl" url = "https://github.com/b4n/ctpl/archive/0.3.tar.gz" + license("GPL-3.0-only") + version("0.3", sha256="034875ba8e1ce87b7ee85bc7146a6a2b2a6ac0518482b36d65eb67dd09c03d0a") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/ctre/package.py b/var/spack/repos/builtin/packages/ctre/package.py index 91b14a3d38ec83..65e85edcfa9a42 100644 --- a/var/spack/repos/builtin/packages/ctre/package.py +++ b/var/spack/repos/builtin/packages/ctre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ctre(CMakePackage): url = "https://github.com/hanickadot/compile-time-regular-expressions/archive/v2.8.3.tar.gz" git = "https://github.com/hanickadot/compile-time-regular-expressions.git" + license("Apache-2.0") + version("master", branch="master") version("2.8.4", sha256="99b981857f1b66cab5e71161ae74deca268ed39a96ec6507def92d4f445cadd6") version("2.8.3", sha256="5833a9d0fbce39ee39bd6e29df2f7fcafc82e41c373e8675ed0774bcf76fdc7a") diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py index bc0aafab6fd31f..c4f9d304e968c9 100644 --- a/var/spack/repos/builtin/packages/cub/package.py +++ b/var/spack/repos/builtin/packages/cub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cub(Package): url = "https://github.com/NVIDIA/cub/archive/1.12.0.zip" git = "https://github.com/NVIDIA/cub.git" + license("BSD-3-Clause") + version("2.1.0", sha256="8ec47307f5e99379ac1cf6722cd5a24fc15b84b0f5361bebd453645a5e4bb34d") version("1.16.0", sha256="a9e327d46c82025d17ed3ab5a10da006bcdaef5dcbd294b332ef0a572f58445b") version("1.15.0", sha256="dcb75744650deb42e9123509482e0f84944c1dbd60d5cd909a416d953d3a6903") diff --git a/var/spack/repos/builtin/packages/cuba/package.py b/var/spack/repos/builtin/packages/cuba/package.py index 29358610679005..b70f294614b7db 100644 --- a/var/spack/repos/builtin/packages/cuba/package.py +++ b/var/spack/repos/builtin/packages/cuba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Cuba(AutotoolsPackage): maintainers("wdconinc") + license("LGPL-3.0-only") + version("4.2.2", sha256="8d9f532fd2b9561da2272c156ef7be5f3960953e4519c638759f1b52fe03ed52") parallel = False diff --git a/var/spack/repos/builtin/packages/cube-blade/package.py b/var/spack/repos/builtin/packages/cube-blade/package.py index 6002e2416ed768..7e1c8ae00caee0 100644 --- a/var/spack/repos/builtin/packages/cube-blade/package.py +++ b/var/spack/repos/builtin/packages/cube-blade/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class CubeBlade(AutotoolsPackage): homepage = "https://www.scalasca.org/software/cube-4.x/download.html" url = "https://apps.fz-juelich.de/scalasca/releases/cube/4.5/dist/blade-0.2.tar.gz" + license("BSD-3-Clause") + version("0.2", sha256="ab3c5bbca79e2ec599166e75b3c96a8f6a18b3064414fc39e56f78aaae9c165c") depends_on("cube@4.5:") diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index f3d91693230842..be571342821ed1 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,10 @@ class Cube(AutotoolsPackage): homepage = "https://www.scalasca.org/software/cube-4.x/download.html" url = "https://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubegui-4.4.2.tar.gz" + maintainers("swat-jsc") + version("4.8.2", sha256="bf2e02002bb2e5c4f61832ce37b62a440675c6453463014b33b2474aac78f86d") + version("4.8.1", sha256="a8a2a62b4e587c012d3d32385bed7c500db14232419795e0f4272d1dcefc55bc") version("4.8", sha256="1df8fcaea95323e7eaf0cc010784a41243532c2123a27ce93cb7e3241557ff76") version("4.7.1", sha256="7c96bf9ffb8cc132945f706657756fe6f88b7f7a5243ecd3741f599c2006d428") version("4.7", sha256="103fe00fa9846685746ce56231f64d850764a87737dc0407c9d0a24037590f68") diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 919a001fedaa4f..6c6f4036b3b7ae 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,7 @@ class Cubelib(AutotoolsPackage): maintainers = ("swat-jsc", "wrwilliams") version("4.8.2", sha256="d6fdef57b1bc9594f1450ba46cf08f431dd0d4ae595c47e2f3454e17e4ae74f4") + version("4.8.1", sha256="e4d974248963edab48c5d0fc5831146d391b0ae4632cccafe840bf5f12cd80a9") version("4.8", sha256="171c93ac5afd6bc74c50a9a58efdaf8589ff5cc1e5bd773ebdfb2347b77e2f68") version("4.7.1", sha256="62cf33a51acd9a723fff9a4a5411cd74203e24e0c4ffc5b9e82e011778ed4f2f") version("4.7", sha256="e44352c80a25a49b0fa0748792ccc9f1be31300a96c32de982b92477a8740938") diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index bcab0920fd1833..34a7fccbefea7e 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,7 @@ class Cubew(AutotoolsPackage): maintainers = ("swat-jsc", "wrwilliams") version("4.8.2", sha256="4f3bcf0622c2429b8972b5eb3f14d79ec89b8161e3c1cc5862ceda417d7975d2") + version("4.8.1", sha256="42cbd743d87c16e805c8e28e79292ab33de259f2cfba46f2682cb35c1bc032d6") version("4.8", sha256="73c7f9e9681ee45d71943b66c01cfe675b426e4816e751ed2e0b670563ca4cf3") version("4.7.1", sha256="0d364a4930ca876aa887ec40d12399d61a225dbab69e57379b293516d7b6db8d") version("4.7", sha256="a7c7fca13e6cb252f08d4380223d7c56a8e86a67de147bcc0279ebb849c884a5") diff --git a/var/spack/repos/builtin/packages/cubist/package.py b/var/spack/repos/builtin/packages/cubist/package.py index f058698b73a115..bd6fbc94bbf4ec 100644 --- a/var/spack/repos/builtin/packages/cubist/package.py +++ b/var/spack/repos/builtin/packages/cubist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Cubist(MakefilePackage): homepage = "https://www.rulequest.com" url = "https://www.rulequest.com/GPL/Cubist.tgz" + license("GPL-3.0-only") + version("2.07", sha256="f2b20807cd3275e775c42263a4efd3f50df6e495a8b6dc8989ea2d41b973ac1a") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py index a5100c829ba651..90e218b126b5b0 100644 --- a/var/spack/repos/builtin/packages/cuda-memtest/package.py +++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class CudaMemtest(CMakePackage): maintainers("ax3l") + license("Unlicense") + version("master", branch="dev") depends_on("cmake@2.8.5:", type="build") diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index e624acbaa9db8d..fbb99d47ad306a 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,20 @@ preferred_ver = "11.8.0" _versions = { + "12.3.0": { + "Linux-aarch64": ( + "9a8fb8acf46b88faf0d711bda3149e1706efbbae02fcb40ab72addfd0e9ce5df", + "https://developer.download.nvidia.com/compute/cuda/12.3.0/local_installers/cuda_12.3.0_545.23.06_linux_sbsa.run", + ), + "Linux-x86_64": ( + "7c13face3af64d6e1648d6e3101d31c8111e747143acb0077d973c1690820422", + "https://developer.download.nvidia.com/compute/cuda/12.3.0/local_installers/cuda_12.3.0_545.23.06_linux.run", + ), + "Linux-ppc64le": ( + "de15c04380ec35b194c07503bf434837bac5b427cf77b19a63962b1653d195d5", + "https://developer.download.nvidia.com/compute/cuda/12.3.0/local_installers/cuda_12.3.0_545.23.06_linux_ppc64le.run", + ), + }, "12.2.1": { "Linux-aarch64": ( "a9ae6bd02684c7acfb229484368bf2691d592767ce1aed10ae9aed92c81b9f09", diff --git a/var/spack/repos/builtin/packages/cudd/package.py b/var/spack/repos/builtin/packages/cudd/package.py new file mode 100644 index 00000000000000..8c89391f65c054 --- /dev/null +++ b/var/spack/repos/builtin/packages/cudd/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Cudd(AutotoolsPackage): + """ + The CUDD package is a package written in C for the manipulation of + decision diagrams. It supports binary decision diagrams (BDDs), + algebraic decision diagrams (ADDs), and Zero-Suppressed BDDs (ZDDs). + """ + + homepage = "https://cudd-mirror.sourceforge.io" + url = "https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz" + + maintainers("davekeeshan") + + version("3.0.0", sha256="b8e966b4562c96a03e7fbea239729587d7b395d53cadcc39a7203b49cf7eeb69") diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index 54d6708e40337a..99fa5ab887efaa 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,6 +9,44 @@ from spack.package import * _versions = { + # cuDNN 8.9.7 + "8.9.7.29-12": { + "Linux-x86_64": "475333625c7e42a7af3ca0b2f7506a106e30c93b1aa0081cd9c13efb6e21e3bb", + "Linux-ppc64le": "8574d291b299f9cc0134304473c9933bd098cc717e8d0876f4aba9f9eebe1b76", + }, + "8.9.7.29-11": { + "Linux-x86_64": "a3e2509028cecda0117ce5a0f42106346e82e86d390f4bb9475afc976c77402e", + "Linux-ppc64le": "f23fd7d59f9d4f743fa926f317dab0d37f6ea21edb2726ceb607bea45b0f9f36", + }, + # cuDNN 8.9.5 + "8.9.5.30-12": { + "Linux-x86_64": "2a2eb89a2ab51071151c6082f1e816c702167a711a9372f9f73a7b5c4b06e01a", + "Linux-ppc64le": "38388ec3c99c6646aaf5c707985cd35e25c67f653d780c4081c2df5557ab665f", + "Linux-aarch64": "0491f7b02f55c22077eb678bf314c1f917524bd507cf5b658239bf98a47233a1", + }, + "8.9.5.30-11": { + "Linux-x86_64": "bbe10e3c08cd7e4aea1012213781e4fe270e1c908263444f567cafefb2cc6525", + "Linux-ppc64le": "d678f8b2903b95de7eeaef38890c5674705864ea049b2b63e90565f2c0ea682f", + }, + # cuDNN 8.9.0 + "8.9.0.131-12": { + "Linux-x86_64": "477631002be61022b60961cba0a501271507a93f81d6b08384bc320cb8706c98", + "Linux-ppc64le": "ff239e4cbbf21fa18104b62a887686e2197f820ad58817d62e509c735a331829", + "Linux-aarch64": "fab70f4fb3b933ff502200a1d954d2c6fc205ff9c9b1d271ea4c41e980a66596", + }, + "8.9.0.131-11": { + "Linux-x86_64": "3cb82c50723f14b41d43523f222cd52cc9d50b3ad67c380f4be51bd1133daa2d", + "Linux-ppc64le": "18778de490550c5b584e96560208e5e37678397037946e10a1c2824174c69725", + }, + # cuDNN 8.8.1 + "8.8.1.3-12": { + "Linux-x86_64": "79d77a769c7e7175abc7b5c2ed5c494148c0618a864138722c887f95c623777c", + "Linux-ppc64le": "b0e89021a846952cad8cfc674edce2883f6e344ebd47a2394f706b1136715bc7", + }, + "8.8.1.3-11": { + "Linux-x86_64": "af7584cae0cc5524b5913ef08c29ba6154113c60eb0a37a0590a91b515a8a8f9", + "Linux-ppc64le": "d086003d09d5388aa42142f07483a773aa74b602478b0933e24fc63f56f1658f", + }, # cuDNN 8.7.0 "8.7.0.84-11.8": { "Linux-x86_64": "976c4cba7233c97ae74006afab5172976300ba40f5b250a21f8cf71f59c9f76d", @@ -262,6 +300,8 @@ class Cudnn(Package): skip_version_audit = ["platform=darwin"] + license("MIT") + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) @@ -287,7 +327,7 @@ def url_for_version(self, version): .replace("darwin", "osx") .replace("aarch64", "aarch64sbsa") ) - else: + elif version < Version("8.8.0"): sys_key = sys_key.replace("aarch64", "sbsa") if version >= Version("8.3.1"): @@ -318,8 +358,12 @@ def url_for_version(self, version): ver = version[:2] cuda = version[2:] + # 8.8.0 changed the base url again + if version >= Version("8.8.0"): + url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/{0}/cudnn-{0}-{1}_cuda{2}-archive.tar.xz" + return url.format(sys_key, ver, cuda.up_to(1)) # 8.5.0 removed minor from cuda version - if version >= Version("8.5.0"): + elif version >= Version("8.5.0"): url = "https://developer.download.nvidia.com/compute/redist/cudnn/v{0}/cudnn-{1}-{2}_cuda{3}-archive.tar.xz" return url.format(directory, sys_key, ver, cuda.up_to(1)) # 8.3.1 switched to xzip tarballs and reordered url parts. diff --git a/var/spack/repos/builtin/packages/cufflinks/package.py b/var/spack/repos/builtin/packages/cufflinks/package.py index bd9d0f295add70..37c1719563e90a 100644 --- a/var/spack/repos/builtin/packages/cufflinks/package.py +++ b/var/spack/repos/builtin/packages/cufflinks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cufflinks(Package): homepage = "https://cole-trapnell-lab.github.io/cufflinks" url = "https://cole-trapnell-lab.github.io/cufflinks/assets/downloads/cufflinks-2.2.1.Linux_x86_64.tar.gz" + license("BSL-1.0") + version("2.2.1", sha256="39f812452cae26462e5d2671d38104d9e8ef30aaf9ab6dea8ca57f50f46448e4") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/cunit/package.py b/var/spack/repos/builtin/packages/cunit/package.py index a4fd2b97e684fe..c1e7eec160e791 100644 --- a/var/spack/repos/builtin/packages/cunit/package.py +++ b/var/spack/repos/builtin/packages/cunit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cunit(AutotoolsPackage): homepage = "https://sourceforge.net/projects/cunit/" url = "https://sourceforge.net/projects/cunit/files/CUnit/2.1-3/CUnit-2.1-3.tar.bz2" + license("GPL-2.0-or-later") + version("2.1-3", sha256="f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/cupla/package.py b/var/spack/repos/builtin/packages/cupla/package.py index e2b5df889568ae..abfd480d5f7126 100644 --- a/var/spack/repos/builtin/packages/cupla/package.py +++ b/var/spack/repos/builtin/packages/cupla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cups/package.py b/var/spack/repos/builtin/packages/cups/package.py index 8e73296ea1558e..6d4bf76626876e 100644 --- a/var/spack/repos/builtin/packages/cups/package.py +++ b/var/spack/repos/builtin/packages/cups/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Cups(AutotoolsPackage): homepage = "https://www.cups.org/" url = "https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz" + license("Apache-2.0") + version("2.3.3", sha256="261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee") version("2.2.3", sha256="66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f") diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index f26247a44ad00d..121b7db5fcb57b 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class Curl(NMakePackage, AutotoolsPackage): maintainers("alecbcs") + license("curl") + version("8.4.0", sha256="e5250581a9c032b1b6ed3cf2f9c114c811fc41881069e9892d115cc73f9e88c6") # Deprecated versions due to CVEs diff --git a/var/spack/repos/builtin/packages/cusz/package.py b/var/spack/repos/builtin/packages/cusz/package.py index 0482f34812d611..666aec3f33df7c 100644 --- a/var/spack/repos/builtin/packages/cusz/package.py +++ b/var/spack/repos/builtin/packages/cusz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cutensor/package.py b/var/spack/repos/builtin/packages/cutensor/package.py index 9f42a27e9546f5..d80a8df332be64 100644 --- a/var/spack/repos/builtin/packages/cutensor/package.py +++ b/var/spack/repos/builtin/packages/cutensor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cutlang/package.py b/var/spack/repos/builtin/packages/cutlang/package.py index 5283ccd8be247f..4a675143ad4af2 100644 --- a/var/spack/repos/builtin/packages/cutlang/package.py +++ b/var/spack/repos/builtin/packages/cutlang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cutlass/package.py b/var/spack/repos/builtin/packages/cutlass/package.py index f511dc4e69f237..865523f4fcb748 100644 --- a/var/spack/repos/builtin/packages/cutlass/package.py +++ b/var/spack/repos/builtin/packages/cutlass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,11 +11,37 @@ class Cutlass(CMakePackage, CudaPackage): homepage = "https://github.com/NVIDIA/cutlass" git = homepage + ".git" - url = "https://github.com/NVIDIA/cutlass/archive/refs/tags/v2.9.0.tar.gz" + url = "https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.3.0.tar.gz" + version("main", branch="main") version("master", branch="master") + version("3.3.0", sha256="99876de94a04d0b9cdee81d4f29659bde1426b416926aef4d9a3a3a7869511a3") + version("3.2.2", sha256="aaa9719eb806b168695b34893faf4854bb6bc9e09f63f2d36772aaf35a8516e5") + version("3.2.1", sha256="da4081210d6699a547dbbe3d7cc18b4527df835518a3d0d3c85a373927c3a9b1") + version("3.2.0", sha256="9637961560a9d63a6bb3f407faf457c7dbc4246d3afb54ac7dc1e014dd7f172f") + version("3.1.0", sha256="821aa2e5b709a2e5d3922dcf2c5d445b4898a6ef8bac683cfb00125eafbca029") + version("3.0.0", sha256="ade959981d0937a26c758979dbc97c4df152a511176573ba2d976604de78a3e3") + version("2.11.0", sha256="b4394f1e080b63cfc54163069334096324c1262dfc66e67099880005d51b8af9") + version("2.10.0", sha256="8f56727c0c7ca59f67f6904972958a6e7e925f72e112056e6df7bb3fdeacefd7") version("2.9.1", sha256="2d6474576c08ee21d7f4f3a10fd1a47234fd9fd638efc8a2e0e64bb367f09bc1") version("2.9.0", sha256="ccca4685739a3185e3e518682845314b07a5d4e16d898b10a3c3a490fd742fb4") + version("2.8.0", sha256="1938f0e739646370a59ba1f5e365be4c701e8d9e0b9b725d306622e9aafa6b2a") + version("2.7.0", sha256="3f44d057d6f453f2ff320eb0b544b17b8ee72dbbda33823a6d600dd3859cd37e") + version("2.6.1", sha256="a3627869e36796a7b60b07a31305e344449ea8c1fb4f76e2573fea43398454ac") + version("2.6.0", sha256="2d9b977e5e8a0d0d96c117b5260497dba4f54032fd22f07fdc3ae80278262d01") + version("2.5.0", sha256="d499fc9c9429cf8dee017072312e350077f27d75187e5a83dbfaad26788f5f45") + version("2.4.0", sha256="28794a523420457e624e3054dea95d7f5834529c9f9794eb9745d4a3f0a1bc15") + version("2.3.0", sha256="62cb62f034d688ac586b92e381620fc940ef1bd43664b064ead5d59de5aace9e") + version("2.2.0", sha256="2d853378b186f85c952072f78f5e9533185a274fb7b2d10718527f15e12bfc7d") + version("2.1.0", sha256="c0b1cdd95703b07209fe14cd4d2bc28fa8d1ca3d6caa3a433ad1ba3438c83f5b") + version("2.0.0", sha256="92d5b1ac41738939902c2d16f44c42f6b4c996ab84e03c26159e70ace7048299") + version("1.3.3", sha256="12d5b4c913063625154019b0a03a253c5b9339c969939454b81f6baaf82b34ca") + version("1.3.2", sha256="b0223806a75a7aa4e5f404d08ee7a612f511e4fb1aad740be19ce8429c4cbe2e") + version("1.3.0", sha256="998657c88917ece065d2f9fc2ec977dbb5c117436b989721fc9a8b147e906ff3") + version("1.2.0", sha256="eb8fd9c3abdcd404003cf72087cabec668162a33de4fdbc34d6b2d59d24d98ad") + version("1.1.0", sha256="7ae0da2257efa7f4ad9c224bce0d10cb1a5580df6b7010d832cf0a11def4627d") + version("1.0.1", sha256="2adec90497141893ca53ac945b88d5881610ed3347166b36be4f72449b5342a0") + version("1.0.0", sha256="c7a16d349e11d85891cb91ece97d5bdbc4b140f614a0265732c2dc81a806bd98") variant("cuda", default=True, description="Build with CUDA") conflicts("~cuda", msg="Cutlass requires CUDA") conflicts( diff --git a/var/spack/repos/builtin/packages/cvector/package.py b/var/spack/repos/builtin/packages/cvector/package.py index 024ffbb9b6338e..9a65d39edf257e 100644 --- a/var/spack/repos/builtin/packages/cvector/package.py +++ b/var/spack/repos/builtin/packages/cvector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cvector(MakefilePackage): homepage = "http://cvector.sourceforge.net/" url = "https://downloads.sourceforge.net/project/cvector/cvector/CVector-1.0.3/CVector-1.0.3.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.3", sha256="d3fa92de3cd5ba8697abdbb52080248b2c252a81cf40a8ec639be301518d0ce3") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/cvise/package.py b/var/spack/repos/builtin/packages/cvise/package.py index 097d9f68149567..48def2cf00ae40 100644 --- a/var/spack/repos/builtin/packages/cvise/package.py +++ b/var/spack/repos/builtin/packages/cvise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cvise(CMakePackage): url = "https://github.com/marxin/cvise" git = "https://github.com/marxin/cvise.git" + license("NCSA") + version("master", branch="master") version("2.7.0", tag="v2.7.0", commit="d9e4a50514d9931b2a1293755a7e96e0f9520032") @@ -31,6 +33,3 @@ class Cvise(CMakePackage): depends_on("py-pytest", when="+pytest", type=("build", "run")) depends_on("colordiff", when="+colordiff", type=("build", "run")) - - def cmake_args(self): - return ["-DPYTHON_EXECUTABLE=" + self.spec["python"].command.path] diff --git a/var/spack/repos/builtin/packages/cvs/package.py b/var/spack/repos/builtin/packages/cvs/package.py index 7f0a2c1ae1c412..867da627895f17 100644 --- a/var/spack/repos/builtin/packages/cvs/package.py +++ b/var/spack/repos/builtin/packages/cvs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Cvs(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.nongnu.org/cvs/" gnu_mirror_path = "non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2" + license("GPL-2.0-or-later") + version("1.12.13", sha256="78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e") # To avoid the problem: The use of %n in format strings in writable memory diff --git a/var/spack/repos/builtin/packages/cxx/package.py b/var/spack/repos/builtin/packages/cxx/package.py index 481f2c83c037de..c34e8af7bb9082 100644 --- a/var/spack/repos/builtin/packages/cxx/package.py +++ b/var/spack/repos/builtin/packages/cxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/cxxopts/package.py b/var/spack/repos/builtin/packages/cxxopts/package.py index 1f7e90393184a0..be93b9631f1152 100644 --- a/var/spack/repos/builtin/packages/cxxopts/package.py +++ b/var/spack/repos/builtin/packages/cxxopts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Cxxopts(CMakePackage): url = "https://github.com/jarro2783/cxxopts/archive/v2.2.0.tar.gz" maintainers("haampie") + license("MIT") + version("3.1.1", sha256="523175f792eb0ff04f9e653c90746c12655f10cb70f1d5e6d6d9491420298a08") version("3.0.0", sha256="36f41fa2a46b3c1466613b63f3fa73dc24d912bc90d667147f1e43215a8c6d00") version("2.2.1", sha256="984aa3c8917d649b14d7f6277104ce38dd142ce378a9198ec926f03302399681") diff --git a/var/spack/repos/builtin/packages/cxxtest/package.py b/var/spack/repos/builtin/packages/cxxtest/package.py index a8e6448f6f90bc..162d85432656df 100644 --- a/var/spack/repos/builtin/packages/cxxtest/package.py +++ b/var/spack/repos/builtin/packages/cxxtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Cxxtest(Package): homepage = "https://cxxtest.com/" url = "https://sourceforge.net/projects/cxxtest/files/cxxtest/4.4/cxxtest-4.4.tar.gz/download" + license("LGPL-3.0-or-later") + version("4.4", sha256="1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/cyrus-sasl/package.py b/var/spack/repos/builtin/packages/cyrus-sasl/package.py index 3e5450eeb223e8..a464055d49aa68 100644 --- a/var/spack/repos/builtin/packages/cyrus-sasl/package.py +++ b/var/spack/repos/builtin/packages/cyrus-sasl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class CyrusSasl(AutotoolsPackage): homepage = "https://github.com/cyrusimap/cyrus-sasl" url = "https://github.com/cyrusimap/cyrus-sasl/archive/cyrus-sasl-2.1.27.tar.gz" + license("custom") + version("2.1.28", sha256="3e38933a30b9ce183a5488b4f6a5937a702549cde0d3287903d80968ad4ec341") version("2.1.27", sha256="b564d773803dc4cff42d2bdc04c80f2b105897a724c247817d4e4a99dd6b9976") version("2.1.26", sha256="7c14d1b5bd1434adf2dd79f70538617e6aa2a7bde447454b90b84ac5c4d034ba") diff --git a/var/spack/repos/builtin/packages/czmq/package.py b/var/spack/repos/builtin/packages/czmq/package.py index d46051d1bfbf7f..a26df3941696d5 100644 --- a/var/spack/repos/builtin/packages/czmq/package.py +++ b/var/spack/repos/builtin/packages/czmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Czmq(AutotoolsPackage): homepage = "http://czmq.zeromq.org" url = "https://github.com/zeromq/czmq/archive/v4.0.2.tar.gz" + license("MPL-2.0") + version("4.1.1", sha256="b7623433547aa4b6e79722796c27ebc7c0470fea4204e920fd05e717c648f889") version("4.0.2", sha256="794f80af7392ec8d361ad69646fc20aaa284d23fef92951334009771a732c810") version("3.0.2", sha256="e56f8498daf70310b31c42669b2f9b753c5e747eafaff6d4fdac26d72a474b27") diff --git a/var/spack/repos/builtin/packages/daemonize/package.py b/var/spack/repos/builtin/packages/daemonize/package.py index 8f900f78d7e388..05aefdc1e6b394 100644 --- a/var/spack/repos/builtin/packages/daemonize/package.py +++ b/var/spack/repos/builtin/packages/daemonize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dakota/package.py b/var/spack/repos/builtin/packages/dakota/package.py index e0374ad927880e..b8c46953a264b0 100644 --- a/var/spack/repos/builtin/packages/dakota/package.py +++ b/var/spack/repos/builtin/packages/dakota/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -40,6 +40,8 @@ class Dakota(CMakePackage): git = "https://github.com/snl-dakota/dakota.git" url = "https://dakota.sandia.gov/sites/default/files/distributions/public/dakota-6.12-release-public.src.tar.gz" + license("LGPL-2.1-or-later") + version( "6.18", tag="v6.18.0", diff --git a/var/spack/repos/builtin/packages/daligner/package.py b/var/spack/repos/builtin/packages/daligner/package.py index 8760ff72c5368d..d7763a0a0c013e 100644 --- a/var/spack/repos/builtin/packages/daligner/package.py +++ b/var/spack/repos/builtin/packages/daligner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dalton/package.py b/var/spack/repos/builtin/packages/dalton/package.py index c221a9aa2ad429..a911d5e18c286f 100644 --- a/var/spack/repos/builtin/packages/dalton/package.py +++ b/var/spack/repos/builtin/packages/dalton/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Dalton(CMakePackage): maintainers("foeroyingur") + license("LGPL-2.1-or-later") + version("master", branch="master", submodules=True) version( "2020.0", tag="2020.0", commit="66052b3af5ea7225e31178bf9a8b031913c72190", submodules=True diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py index da0df155ac7f71..6208f9261281a9 100644 --- a/var/spack/repos/builtin/packages/damageproto/package.py +++ b/var/spack/repos/builtin/packages/damageproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py index 3f8b6f156bead8..f85d1df76c75f8 100644 --- a/var/spack/repos/builtin/packages/damaris/package.py +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Damaris(CMakePackage): git = "https://gitlab.inria.fr/Damaris/damaris.git" maintainers("jcbowden") + license("LGPL-3.0-or-later") + version("master", branch="master") version("1.9.2", tag="v1.9.2", commit="22c146b4b4ca047d4d36fd904d248e0280b3c0ea") version("1.9.1", tag="v1.9.1", commit="2fe83f587837b7ad0b5c187b8ff453f7d3ad2c18") diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index f23f754c9070c0..68a973b09eb22b 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class DamaskGrid(CMakePackage): maintainers("MarDiehl") + license("AGPL-3.0-or-later") + + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +33,7 @@ class DamaskGrid(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.20.2:3.21", when="@3.0.0-alpha8") depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 893e72fa3ce0af..2e537477a27c92 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class DamaskMesh(CMakePackage): maintainers("MarDiehl") + license("AGPL-3.0-or-later") + + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +33,7 @@ class DamaskMesh(CMakePackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("petsc@3.20.2:3.21", when="@3.0.0-alpha8") depends_on("petsc@3.17.1:3.18", when="@3.0.0-alpha7") depends_on("petsc@3.16.5:3.16", when="@3.0.0-alpha6") depends_on("petsc@3.14.0:3.14,3.15.1:3.16", when="@3.0.0-alpha5") diff --git a/var/spack/repos/builtin/packages/damask/package.py b/var/spack/repos/builtin/packages/damask/package.py index bda1aac1f132c7..84bf0caff572a5 100644 --- a/var/spack/repos/builtin/packages/damask/package.py +++ b/var/spack/repos/builtin/packages/damask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,11 +28,16 @@ class Damask(BundlePackage): maintainers("MarDiehl") + version("3.0.0-alpha8") version("3.0.0-alpha7") version("3.0.0-alpha6") version("3.0.0-alpha5") version("3.0.0-alpha4") + depends_on("damask-grid@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") + depends_on("damask-mesh@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") + depends_on("py-damask@3.0.0-alpha8", when="@3.0.0-alpha8", type="run") + depends_on("damask-grid@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") depends_on("damask-mesh@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") depends_on("py-damask@3.0.0-alpha7", when="@3.0.0-alpha7", type="run") diff --git a/var/spack/repos/builtin/packages/damselfly/package.py b/var/spack/repos/builtin/packages/damselfly/package.py index 862ed23c99f66d..74b8a078ad95e0 100644 --- a/var/spack/repos/builtin/packages/damselfly/package.py +++ b/var/spack/repos/builtin/packages/damselfly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/daos/package.py b/var/spack/repos/builtin/packages/daos/package.py index 3b62ecd8052fdd..87bbfe86622247 100644 --- a/var/spack/repos/builtin/packages/daos/package.py +++ b/var/spack/repos/builtin/packages/daos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Daos(SConsPackage): git = "https://github.com/daos-stack/daos.git" maintainers("hyoklee") + license("BSD-2-Clause-Patent") + version("master", branch="master", submodules=True) version( "2.2.0", tag="v2.2.0", commit="d2a1f2790c946659c9398926254e6203fd957b7c", submodules=True diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py index 1b4e06b5919a04..5fee8c6801009b 100644 --- a/var/spack/repos/builtin/packages/darshan-runtime/package.py +++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -115,9 +115,9 @@ def configure_args(self): if "+apmpi" in spec: extra_args.append("--enable-apmpi-mod") if "+apmpi_sync" in spec: - extra_args.append(["--enable-apmpi-mod", "--enable-apmpi-coll-sync"]) + extra_args.extend(["--enable-apmpi-mod", "--enable-apmpi-coll-sync"]) if "+apxc" in spec: - extra_args.append(["--enable-apxc-mod"]) + extra_args.append("--enable-apxc-mod") extra_args.append("--with-mem-align=8") extra_args.append("--with-log-path-by-env=DARSHAN_LOG_DIR_PATH") diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index 56f85a9f006ec9..d83cbd2fbbe1dd 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dash/package.py b/var/spack/repos/builtin/packages/dash/package.py index 00e290bfdc11ee..b5fe8a7cd19830 100644 --- a/var/spack/repos/builtin/packages/dash/package.py +++ b/var/spack/repos/builtin/packages/dash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dash(AutotoolsPackage): url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/dash-0.5.9.1.tar.gz" list_url = homepage + license("BSD-3-Clause AND GPL-2.0-or-later") + version("0.5.12", sha256="0d632f6b945058d84809cac7805326775bd60cb4a316907d0bd4228ff7107154") version("0.5.9.1", sha256="3f747013a20a3a9d2932be1a6dd1b002ca5649849b649be0af8a8da80bd8a918") diff --git a/var/spack/repos/builtin/packages/datamash/package.py b/var/spack/repos/builtin/packages/datamash/package.py index 1091ea75f54e89..c36f9e83e6a104 100644 --- a/var/spack/repos/builtin/packages/datamash/package.py +++ b/var/spack/repos/builtin/packages/datamash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Datamash(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/datamash/" gnu_mirror_path = "datamash/datamash-1.0.5.tar.gz" + license("GPL-3.0-or-later") + version("1.8", sha256="7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd") version("1.3", sha256="eebb52171a4353aaad01921384098cf54eb96ebfaf99660e017f6d9fc96657a6") version("1.1.0", sha256="a9e5acc86af4dd64c7ac7f6554718b40271aa67f7ff6e9819bdd919a25904bb0") diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index d19e0f30d86e0f..a62d8eec05eece 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Dataspaces(AutotoolsPackage): homepage = "http://www.dataspaces.org" url = "https://dataspaces.rdi2.rutgers.edu/downloads/dataspaces-1.6.2.tar.gz" + license("BSD-3-Clause") + version("1.8.0", sha256="7f204bb3c03c2990f5a2d76a29185466b584793c63ada03e5e694627e6060605") version("1.6.2", sha256="3c43d551c1e8198a4ab269c83928e1dc6f8054e6d41ceaee45155d91a48cf9bf") diff --git a/var/spack/repos/builtin/packages/datatransferkit/package.py b/var/spack/repos/builtin/packages/datatransferkit/package.py index 7e0d050069d0cd..7f29a80ddfcae2 100644 --- a/var/spack/repos/builtin/packages/datatransferkit/package.py +++ b/var/spack/repos/builtin/packages/datatransferkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Datatransferkit(CMakePackage): maintainers("Rombur") + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version("3.1.1", commit="bfb7673cc233c26a6a541cbf096f37f26df1e5fb", submodules=True) version("3.1.0", commit="60a4cbd0a55505e0450f1ac979e1eef8966dc03f", submodules=True) diff --git a/var/spack/repos/builtin/packages/date/package.py b/var/spack/repos/builtin/packages/date/package.py index 8eedeb6dd46f3b..f9246f6da41c20 100644 --- a/var/spack/repos/builtin/packages/date/package.py +++ b/var/spack/repos/builtin/packages/date/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Date(CMakePackage): homepage = "https://github.com/HowardHinnant/date" url = "https://github.com/HowardHinnant/date/archive/v3.0.0.zip" + license("MIT") + version("3.0.1", sha256="f4300b96f7a304d4ef9bf6e0fa3ded72159f7f2d0f605bdde3e030a0dba7cf9f") version("3.0.0", sha256="ddbec664607bb6ec7dd4c7be1f9eefc3d8ce88293ffc9391486ce6ce887ec9b2") diff --git a/var/spack/repos/builtin/packages/dateutils/package.py b/var/spack/repos/builtin/packages/dateutils/package.py index fba86a5b6bc9eb..a6dff40a25643c 100644 --- a/var/spack/repos/builtin/packages/dateutils/package.py +++ b/var/spack/repos/builtin/packages/dateutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dateutils(AutotoolsPackage): homepage = "https://www.fresse.org/dateutils/" url = "https://github.com/hroptatyr/dateutils/releases/download/v0.4.6/dateutils-0.4.6.tar.xz" + license("BSD-3-Clause") + version("0.4.7", sha256="49725457f5bef45ea424baade8999a6e54496e357f64280474ff7134a54f599a") version("0.4.6", sha256="26a071317ae5710f226a3e6ba9a54d3764cd9efe3965aecc18e75372088757cd") version("0.4.5", sha256="16d6a0fe7b7d49ddbb303f33538dd7304a0d4af5a0369bcbf275db6a5060cbde") diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py index ea0eb7eb35dbc9..75dca8c2512f38 100644 --- a/var/spack/repos/builtin/packages/davix/package.py +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Davix(CMakePackage): maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb") + license("LGPL-2.1-or-later") + version("0.8.1", sha256="3f42f4eadaf560ab80984535ffa096d3e88287d631960b2193e84cf29a5fe3a6") version("0.8.0", sha256="2f108da0408a83fb5b9f0c68150d360ba733e4b3a0fe298d45b0d32d28ab7124") version("0.7.6", sha256="a2e7fdff29f7ba247a3bcdb08ab1db6d6ed745de2d3971b46526986caf360673") diff --git a/var/spack/repos/builtin/packages/dbcsr/package.py b/var/spack/repos/builtin/packages/dbcsr/package.py index 2a3251304f44c2..f8561aabc16ae5 100644 --- a/var/spack/repos/builtin/packages/dbcsr/package.py +++ b/var/spack/repos/builtin/packages/dbcsr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage): maintainers("dev-zero", "mtaillefumier") + license("GPL-2.0-or-later") + version("develop", branch="develop") version("2.6.0", sha256="c67b02ff9abc7c1f529af446a9f01f3ef9e5b0574f220259128da8d5ca7e9dc6") version("2.5.0", sha256="91fda9b2502e5d0a2a6cdd5a73ef096253cc7e75bd01ba5189a4726ad86aef08") diff --git a/var/spack/repos/builtin/packages/dbow2/package.py b/var/spack/repos/builtin/packages/dbow2/package.py index 3916711b2f3041..08af93657bb317 100644 --- a/var/spack/repos/builtin/packages/dbow2/package.py +++ b/var/spack/repos/builtin/packages/dbow2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dbus-glib/package.py b/var/spack/repos/builtin/packages/dbus-glib/package.py index 04fb2bec189b5a..cbee80b7ed8482 100644 --- a/var/spack/repos/builtin/packages/dbus-glib/package.py +++ b/var/spack/repos/builtin/packages/dbus-glib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class DbusGlib(AutotoolsPackage): homepage = "https://dbus.freedesktop.org" url = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz" + license("AFL-2.1 OR GPL-2.0-or-later") + version("0.112", sha256="7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a") version("0.110", sha256="7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825") diff --git a/var/spack/repos/builtin/packages/dbus/package.py b/var/spack/repos/builtin/packages/dbus/package.py index 37a1b8a694b907..1d7ec8fc8e07a4 100644 --- a/var/spack/repos/builtin/packages/dbus/package.py +++ b/var/spack/repos/builtin/packages/dbus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Dbus(AutotoolsPackage): homepage = "https://dbus.freedesktop.org/" url = "https://dbus.freedesktop.org/releases/dbus/dbus-1.8.8.tar.gz" + license("AFL-2.1 OR GPL-2.0-or-later") + version("1.13.6", sha256="b533693232d36d608a09f70c15440c1816319bac3055433300d88019166c1ae4") version("1.12.8", sha256="e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3") version("1.11.2", sha256="5abc4c57686fa82669ad0039830788f9b03fdc4fff487f0ccf6c9d56ba2645c9") diff --git a/var/spack/repos/builtin/packages/dbxtool/package.py b/var/spack/repos/builtin/packages/dbxtool/package.py index e31b75f538c9c8..94e9cb8b4de691 100644 --- a/var/spack/repos/builtin/packages/dbxtool/package.py +++ b/var/spack/repos/builtin/packages/dbxtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dbxtool(MakefilePackage): homepage = "https://github.com/rhboot/dbxtool" url = "https://github.com/rhboot/dbxtool/archive/dbxtool-8.tar.gz" + license("GPL-2.0-only") + version("8", sha256="196d9475f7cf3aa52d8e0c29c20affb7c903512e13895edb6296caf02d4a983b") version("7", sha256="486b8a7cf4e149ab9630783e5259d6af70a7022209e1e48fbee9b54c48535c5e") diff --git a/var/spack/repos/builtin/packages/dcap/package.py b/var/spack/repos/builtin/packages/dcap/package.py index 7540f8fe33e800..87c25a443dc886 100644 --- a/var/spack/repos/builtin/packages/dcap/package.py +++ b/var/spack/repos/builtin/packages/dcap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dcap(AutotoolsPackage): homepage = "https://github.com/dCache/dcap" url = "https://github.com/dCache/dcap/archive/2.47.12.tar.gz" + license("LGPL-2.0-or-later") + version("2.47.12", sha256="050a8d20c241abf358d5d72586f9abc43940e61d9ec9480040ac7da52ec804ac") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/dcm2niix/package.py b/var/spack/repos/builtin/packages/dcm2niix/package.py index af383c17f1c492..97bf5a422e2140 100644 --- a/var/spack/repos/builtin/packages/dcm2niix/package.py +++ b/var/spack/repos/builtin/packages/dcm2niix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dcm2niix(CMakePackage): homepage = "https://github.com/rordenlab/dcm2niix" url = "https://github.com/rordenlab/dcm2niix/archive/refs/tags/v1.0.20220720.tar.gz" + license("Zlib") + version( "1.0.20220720", sha256="a095545d6d70c5ce2efd90dcd58aebe536f135410c12165a9f231532ddab8991" ) diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py index 9a9c1ce98d116a..f6c14c642ed6e7 100644 --- a/var/spack/repos/builtin/packages/dcmtk/package.py +++ b/var/spack/repos/builtin/packages/dcmtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dcmtk(CMakePackage): homepage = "https://dicom.offis.de" url = "https://github.com/DCMTK/dcmtk/archive/DCMTK-3.6.3.tar.gz" + license("BSD-3-Clause") + version("3.6.7", sha256="17705dcdb2047d1266bb4e92dbf4aa6d4967819e8e3e94f39b7df697661b4860") version("3.6.6", sha256="117097da6d50ddbad0e48bb1e6cdc61468e82ba1d32001dd8e2366b445133a8c") version("3.6.5", sha256="37dad355d5513b4de4a86b5b7b0c3e9ec059860d88781b80916bba2a04e6d5b8") diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index 77c3934bdff7fd..0ea385deedcd7c 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,7 +23,11 @@ class Dd4hep(CMakePackage): tags = ["hep"] + license("LGPL-3.0-or-later") + version("master", branch="master") + version("1.27.2", sha256="09d8acd743d010274562b856d39e2a88aeaf89cf287a4148f52223b0cd960ab2") + version("1.27.1", sha256="e66ae726c0a9a55e5603024a7f8a48ffbc5613ea36e5f892e9a90d87833f92e0") version("1.27", sha256="51fbd0f91f2511261d9b01e4b3528c658bea1ea1b5d67b25b6812615e782a902") version("1.26", sha256="de2cc8d8e99217e23fdf0a55b879d3fd3a864690d6660e7808f1ff99eb47f384") version("1.25.1", sha256="6267e76c74fbb346aa881bc44de84434ebe788573f2997a189996252fc5b271b") @@ -189,6 +193,12 @@ class Dd4hep(CMakePackage): ) conflicts("~ddrec+dddetectors", msg="Need to enable +ddrec to build +dddetectors.") + # Geant4 needs to be (at least) the same version as DD4hep, but we don't + # have a very good handle on that at this stage, because we make that + # dependent on roots cxxstd. However, cxxstd=11 will never work + # See https://github.com/AIDASoft/DD4hep/pull/1191 + conflicts("^geant4 cxxstd=11", when="+ddg4") + @property def libs(self): # We need to override libs here, because we don't build a libdd4hep so @@ -223,7 +233,6 @@ def cmake_args(self): "-DBUILD_TESTING={0}".format(self.run_tests), "-DBOOST_ROOT={0}".format(spec["boost"].prefix), "-DBoost_NO_BOOST_CMAKE=ON", - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path), ] subpackages = [] if spec.satisfies("+ddg4"): @@ -254,7 +263,8 @@ def setup_run_environment(self, env): env.set("DD4HEP", self.prefix.examples) env.set("DD4hep_DIR", self.prefix) env.set("DD4hep_ROOT", self.prefix) - env.prepend_path("LD_LIBRARY_PATH", self.libs.directories[0]) + if len(self.libs.directories) > 0: + env.prepend_path("LD_LIBRARY_PATH", self.libs.directories[0]) def url_for_version(self, version): # dd4hep releases are dashes and padded with a leading zero diff --git a/var/spack/repos/builtin/packages/ddd/package.py b/var/spack/repos/builtin/packages/ddd/package.py index 88ee332628cd41..242aef33d7412d 100644 --- a/var/spack/repos/builtin/packages/ddd/package.py +++ b/var/spack/repos/builtin/packages/ddd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ddd(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/ddd" gnu_mirror_path = "ddd/ddd-3.3.12.tar.gz" + license("LGPL-3.0-only") + version("3.3.12", sha256="3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/ddt/package.py b/var/spack/repos/builtin/packages/ddt/package.py index 042657fefdcccd..11dd8fb2c947a4 100644 --- a/var/spack/repos/builtin/packages/ddt/package.py +++ b/var/spack/repos/builtin/packages/ddt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py index b0644eea2b76f9..fd5ebcf4e0d5c1 100644 --- a/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py +++ b/var/spack/repos/builtin/packages/dealii-parameter-gui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class DealiiParameterGui(CMakePackage): homepage = "https://github.com/dealii/parameter_gui" git = "https://github.com/dealii/parameter_gui.git" + license("LGPL-2.1-or-later") + version("develop", branch="master") depends_on("qt") diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index df6f514134a799..f9ec14adf3ad64 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,9 +23,13 @@ class Dealii(CMakePackage, CudaPackage): # only add for immediate deps. transitive_rpaths = False - generator("ninja") + # FIXME nvcc_wrapper (used for +clang) doesn't handle response files + # correctly when ninja is used. Those are used automatically if paths get too long. + generator("make") version("master", branch="master") + version("9.5.1", sha256="a818b535e6488d3aef7853311657c7b4fadc29a9abe91b7b202b131aad630f5e") + version("9.5.0", sha256="a81f41565f0d3a22d491ee687957dd48053225da72e8d6d628d210358f4a0464") version("9.4.2", sha256="45a76cb400bfcff25cc2d9093d9a5c91545c8367985e6798811c5e9d2a6a6fd4") version("9.4.1", sha256="bfe5e4bf069159f93feb0f78529498bfee3da35baf5a9c6852aa59d7ea7c7a48") version("9.4.0", sha256="238677006cd9173658e5b69cdd1861f800556982db6005a3cc5eb8329cc1e36c") @@ -70,10 +74,11 @@ class Dealii(CMakePackage, CudaPackage): values=("default", "11", "14", "17"), ) variant("doc", default=False, description="Compile with documentation") - variant("examples", default=True, description="Compile tutorial programs") + variant("examples", default=True, description="Compile and install tutorial programs") variant("int64", default=False, description="Compile with 64 bit indices support") variant("mpi", default=True, description="Compile with MPI") variant("optflags", default=False, description="Compile using additional optimization flags") + variant("platform-introspection", default=True, description="Enable platform introspection") variant("python", default=False, description="Compile with Python bindings") # Package variants @@ -81,11 +86,12 @@ class Dealii(CMakePackage, CudaPackage): variant("arborx", default=True, description="Compile with Arborx support") variant("arpack", default=True, description="Compile with Arpack and PArpack (only with MPI)") variant("adol-c", default=True, description="Compile with ADOL-C") - variant("cgal", default=True, when="@9.4:", description="Compile with CGAL") + variant("cgal", default=True, when="@9.4:~cuda", description="Compile with CGAL") variant("ginkgo", default=True, description="Compile with Ginkgo") variant("gmsh", default=True, description="Compile with GMSH") variant("gsl", default=True, description="Compile with GSL") variant("hdf5", default=True, description="Compile with HDF5 (only with MPI)") + variant("kokkos", default=True, when="@9.5:", description="Compile with Kokkos") variant("metis", default=True, description="Compile with Metis") variant("muparser", default=True, description="Compile with muParser") variant("nanoflann", default=False, description="Compile with Nanoflann") @@ -98,14 +104,15 @@ class Dealii(CMakePackage, CudaPackage): variant("slepc", default=True, description="Compile with Slepc (only with Petsc and MPI)") variant("symengine", default=True, description="Compile with SymEngine") variant("simplex", default=True, description="Compile with Simplex support") - # TODO @9.3: enable by default, when we know what to do - # variant('taskflow', default=False, - # description='Compile with multi-threading via Taskflow') - # TODO @9.3: disable by default - # (NB: only if tbb is removed in 9.3, as planned!!!) + variant( + "taskflow", + default=True, + when="@9.6:", + description="Compile with multi-threading via Taskflow", + ) variant("threads", default=True, description="Compile with multi-threading via TBB") variant("trilinos", default=True, description="Compile with Trilinos (only with MPI)") - variant("platform-introspection", default=True, description="Enable platform introspection") + variant("vtk", default=True, when="@9.6:", description="Compile with VTK") # Required dependencies: Light version depends_on("blas") @@ -179,6 +186,8 @@ class Dealii(CMakePackage, CudaPackage): # TODO: next line fixes concretization with petsc depends_on("hdf5+mpi+hl+fortran", when="+hdf5+mpi+petsc") depends_on("hdf5+mpi+hl", when="+hdf5+mpi~petsc") + depends_on("kokkos@3.7:", when="@9.5:+kokkos~trilinos") + depends_on("kokkos@3.7:+cuda+cuda_lambda+wrapper", when="@9.5:+kokkos~trilinos+cuda") # TODO: concretizer bug. The two lines mimic what comes from PETSc # but we should not need it depends_on("metis@5:+int64", when="+metis+int64") @@ -198,7 +207,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on("sundials@:3~pthread", when="@9.0:9.2+sundials") depends_on("sundials@5:5.8", when="@9.3:9.3.3+sundials") depends_on("sundials@5:", when="@9.3.4:+sundials") - # depends_on('taskflow', when='@9.3:+taskflow') + depends_on("taskflow@3.4:", when="@9.6:+taskflow") depends_on("trilinos gotype=int", when="+trilinos@12.18.1:") # TODO: next line fixes concretization with trilinos and adol-c depends_on("trilinos~exodus", when="@9.0:+adol-c+trilinos") @@ -222,12 +231,11 @@ class Dealii(CMakePackage, CudaPackage): # do not require +rol to make concretization of xsdk possible depends_on("trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado", when="+trilinos") depends_on("trilinos~hypre", when="+trilinos+int64") - # TODO: temporary disable Tpetra when using CUDA due to - # namespace "Kokkos::Impl" has no member "cuda_abort" - depends_on( - "trilinos@master+rol~amesos2~ifpack2~intrepid2~kokkos~tpetra~zoltan2", - when="+trilinos+cuda", - ) + for _arch in CudaPackage.cuda_arch_values: + arch_str = f"+cuda cuda_arch={_arch}" + trilinos_spec = f"trilinos +wrapper {arch_str}" + depends_on(trilinos_spec, when=f"@9.5:+trilinos {arch_str}") + depends_on("vtk", when="@9.6:+vtk") # Explicitly provide a destructor in BlockVector, # otherwise deal.II may fail to build with Intel compilers. @@ -296,44 +304,60 @@ class Dealii(CMakePackage, CudaPackage): msg="CGAL requires the C++ standard to be set explicitly to 17 or later.", ) + conflicts( + "cxxstd=14", + when="@9.6:", + msg="Deal.II 9.6 onwards requires the C++ standard to be set to 17 or later.", + ) + # Interfaces added in 8.5.0: - for p in ["gsl", "python"]: + for _package in ["gsl", "python"]: conflicts( - "+{0}".format(p), + "+{0}".format(_package), when="@:8.4.2", msg="The interface to {0} is supported from version 8.5.0 " "onwards. Please explicitly disable this variant " - "via ~{0}".format(p), + "via ~{0}".format(_package), ) # Interfaces added in 9.0.0: - for p in ["assimp", "gmsh", "nanoflann", "scalapack", "sundials", "adol-c"]: + for _package in ["assimp", "gmsh", "nanoflann", "scalapack", "sundials", "adol-c"]: conflicts( - "+{0}".format(p), + "+{0}".format(_package), when="@:8.5.1", msg="The interface to {0} is supported from version 9.0.0 " "onwards. Please explicitly disable this variant " - "via ~{0}".format(p), + "via ~{0}".format(_package), ) # interfaces added in 9.1.0: - for p in ["ginkgo", "symengine"]: + for _package in ["ginkgo", "symengine"]: conflicts( - "+{0}".format(p), + "+{0}".format(_package), when="@:9.0", msg="The interface to {0} is supported from version 9.1.0 " "onwards. Please explicitly disable this variant " - "via ~{0}".format(p), + "via ~{0}".format(_package), ) # interfaces added in 9.3.0: - for p in ["simplex", "arborx"]: # , 'taskflow']: + for _package in ["simplex", "arborx"]: conflicts( - "+{0}".format(p), + "+{0}".format(_package), when="@:9.2", msg="The interface to {0} is supported from version 9.3.0 " "onwards. Please explicitly disable this variant " - "via ~{0}".format(p), + "via ~{0}".format(_package), + ) + + # interfaces added after 9.5.0: + for _package in ["vtk", "taskflow"]: + conflicts( + "+{0}".format(_package), + when="@:9.5", + msg="The interface to {0} is supported from version 9.6.0 " + "onwards. Please explicitly disable this variant " + "via ~{0}".format(_package), ) # Interfaces removed in 9.3.0: @@ -346,18 +370,29 @@ class Dealii(CMakePackage, CudaPackage): # Check that the combination of variants makes sense # 64-bit BLAS: - for p in ["openblas", "intel-mkl", "intel-parallel-studio+mkl"]: + for _package in ["openblas", "intel-mkl", "intel-parallel-studio+mkl"]: conflicts( - "^{0}+ilp64".format(p), when="@:8.5.1", msg="64bit BLAS is only supported from 9.0.0" + "^{0}+ilp64".format(_package), + when="@:8.5.1", + msg="64bit BLAS is only supported from 9.0.0", ) # MPI requirements: - for p in ["arpack", "hdf5", "netcdf", "p4est", "petsc", "scalapack", "slepc", "trilinos"]: + for _package in [ + "arpack", + "hdf5", + "netcdf", + "p4est", + "petsc", + "scalapack", + "slepc", + "trilinos", + ]: conflicts( - "+{0}".format(p), + "+{0}".format(_package), when="~mpi", msg="To enable {0} it is necessary to build deal.II with " - "MPI support enabled.".format(p), + "MPI support enabled.".format(_package), ) # Optional dependencies: @@ -432,6 +467,7 @@ def cmake_args(self): # Examples / tutorial programs options.append(self.define_from_variant("DEAL_II_COMPONENT_EXAMPLES", "examples")) + options.append(self.define_from_variant("DEAL_II_COMPILE_EXAMPLES", "examples")) # Enforce the specified C++ standard if spec.variants["cxxstd"].value != "default": @@ -478,9 +514,6 @@ def cmake_args(self): if "+mpi" in spec: options.extend( [ - self.define("CMAKE_C_COMPILER", spec["mpi"].mpicc), - self.define("CMAKE_CXX_COMPILER", spec["mpi"].mpicxx), - self.define("CMAKE_Fortran_COMPILER", spec["mpi"].mpifc), self.define("MPI_C_COMPILER", spec["mpi"].mpicc), self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx), self.define("MPI_Fortran_COMPILER", spec["mpi"].mpifc), @@ -499,21 +532,13 @@ def cmake_args(self): self.define("CUDA_HOST_COMPILER", spec["mpi"].mpicxx), ] ) + # Make sure we use the same compiler that Trilinos uses + if "+trilinos" in spec: + options.extend([self.define("CMAKE_CXX_COMPILER", spec["trilinos"].kokkos_cxx)]) # Python bindings if spec.satisfies("@8.5.0:"): options.append(self.define_from_variant("DEAL_II_COMPONENT_PYTHON_BINDINGS", "python")) - if "+python" in spec: - python_exe = spec["python"].command.path - python_library = spec["python"].libs[0] - python_include = spec["python"].headers.directories[0] - options.extend( - [ - self.define("PYTHON_EXECUTABLE", python_exe), - self.define("PYTHON_INCLUDE_DIR", python_include), - self.define("PYTHON_LIBRARY", python_library), - ] - ) # Simplex support (no longer experimental) if spec.satisfies("@9.3.0:9.4.0"): @@ -542,23 +567,25 @@ def cmake_args(self): # Optional dependencies for which library names are the same as CMake # variables: for library in ( + "arborx", + "assimp", + "cgal", + "ginkgo", + "gmsh", "gsl", "hdf5", + "metis", + "muparser", + "nanoflann", "p4est", "petsc", "slepc", - "trilinos", - "metis", "sundials", - "nanoflann", - "assimp", - "gmsh", - "muparser", "symengine", - "ginkgo", - "arborx", - "cgal", - ): # 'taskflow'): + "taskflow", + "trilinos", + "vtk", + ): options.append( self.define_from_variant("DEAL_II_WITH_{0}".format(library.upper()), library) ) diff --git a/var/spack/repos/builtin/packages/debbuild/package.py b/var/spack/repos/builtin/packages/debbuild/package.py index b761e4a58e5d6b..6d3897dd1f9bcf 100644 --- a/var/spack/repos/builtin/packages/debbuild/package.py +++ b/var/spack/repos/builtin/packages/debbuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Debbuild(AutotoolsPackage): homepage = "https://github.com/debbuild/debbuild" url = "https://github.com/debbuild/debbuild/archive/20.04.0.tar.gz" + license("GPL-2.0-or-later") + version("20.04.0", sha256="e17c4f5b37e8c16592ebd99281884cabc053fb890af26531e9825417047d1430") depends_on("gettext") diff --git a/var/spack/repos/builtin/packages/debugedit/package.py b/var/spack/repos/builtin/packages/debugedit/package.py index fef1ac33532c0c..1c258d9fcef998 100644 --- a/var/spack/repos/builtin/packages/debugedit/package.py +++ b/var/spack/repos/builtin/packages/debugedit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Debugedit(AutotoolsPackage): git = "git://sourceware.org/git/debugedit.git" url = "https://sourceware.org/ftp/debugedit/0.2/debugedit-0.2.tar.xz" + license("LGPL-2.1-or-later") + version("develop", branch="main") version("0.2", sha256="b78258240bb7ec5bbff109495092dcc111aa0393f135f2d2a4b43887ba26a942") diff --git a/var/spack/repos/builtin/packages/decentralized-internet/package.py b/var/spack/repos/builtin/packages/decentralized-internet/package.py index 2bb611d45b7624..63eace559fd4ad 100644 --- a/var/spack/repos/builtin/packages/decentralized-internet/package.py +++ b/var/spack/repos/builtin/packages/decentralized-internet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,5 +11,8 @@ class DecentralizedInternet(MakefilePackage): homepage = "https://lonero.readthedocs.io" url = "https://github.com/Lonero-Team/Decentralized-Internet/releases/download/4.2.3/Decentralized.Internet.tar.gz" + + license("MIT") + maintainers("Lonero-Team", "Mentors4edu") version("4.2.3", sha256="2922b9128b411ece2f04d07942a453f1e772548aa27b3936c9f9bcfbc0737058") diff --git a/var/spack/repos/builtin/packages/deconseq-standalone/package.py b/var/spack/repos/builtin/packages/deconseq-standalone/package.py index f0904eb5440d0c..47314ef952136b 100644 --- a/var/spack/repos/builtin/packages/deconseq-standalone/package.py +++ b/var/spack/repos/builtin/packages/deconseq-standalone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class DeconseqStandalone(Package): homepage = "http://deconseq.sourceforge.net" url = "https://sourceforge.net/projects/deconseq/files/standalone/deconseq-standalone-0.4.3.tar.gz" + license("GPL-3.0-only") + version("0.4.3", sha256="fb4050418c26a5203220f6396263da554326657590cffd65053eb8adc465ac65") depends_on("perl@5:") diff --git a/var/spack/repos/builtin/packages/dejagnu/package.py b/var/spack/repos/builtin/packages/dejagnu/package.py index 99cd5aaedf8247..94d808fd36faca 100644 --- a/var/spack/repos/builtin/packages/dejagnu/package.py +++ b/var/spack/repos/builtin/packages/dejagnu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dejagnu(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/dejagnu/" gnu_mirror_path = "dejagnu/dejagnu-1.6.tar.gz" + license("GPL-3.0-or-later") + version("1.6.3", sha256="87daefacd7958b4a69f88c6856dbd1634261963c414079d0c371f589cd66a2e3") version("1.6", sha256="00b64a618e2b6b581b16eb9131ee80f721baa2669fa0cdee93c500d1a652d763") version("1.4.4", sha256="d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d") diff --git a/var/spack/repos/builtin/packages/delly2/package.py b/var/spack/repos/builtin/packages/delly2/package.py index 1005d5eddc437d..2b86dabc5d7423 100644 --- a/var/spack/repos/builtin/packages/delly2/package.py +++ b/var/spack/repos/builtin/packages/delly2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Delly2(MakefilePackage): git = "https://github.com/dellytools/delly.git" maintainers("snehring") + license("BSD-3-Clause") + version("1.1.6", sha256="08961e9c81431eb486476fa71eea94941ad24ec1970b71e5a7720623a39bfd2a") version("0.9.1", tag="v0.9.1", commit="ef1cd626a85cfd1c1b7acfca2b5fd5957f2a05f1") version("2017-08-03", commit="e32a9cd55c7e3df5a6ae4a91f31a0deb354529fc", deprecated=True) diff --git a/var/spack/repos/builtin/packages/delphes/package.py b/var/spack/repos/builtin/packages/delphes/package.py index 8937b88145f15d..40e790d61f4329 100644 --- a/var/spack/repos/builtin/packages/delphes/package.py +++ b/var/spack/repos/builtin/packages/delphes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Delphes(CMakePackage): maintainers("drbenmorgan", "vvolkl", "selvaggi") + license("CC-BY-SA-4.0") + version("master", branch="master") version("3.5.0", sha256="37685b945ef43aab09217d70b0ac7f9c5d3c2c27cf3b3f8d64c4e6eb5c5fd9aa") version("3.4.2", sha256="d46a7c5474de650befdb89377115feee31f1743107ceb3d8da699be9d48c097b") diff --git a/var/spack/repos/builtin/packages/delta/package.py b/var/spack/repos/builtin/packages/delta/package.py index 014203fbc4cb83..7df6f742f3378f 100644 --- a/var/spack/repos/builtin/packages/delta/package.py +++ b/var/spack/repos/builtin/packages/delta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Delta(Package): homepage = "https://delta.io/" url = "https://github.com/delta-io/delta/archive/v0.7.0.tar.gz" + license("MIT") + version("2.3.0", sha256="0c0ea5edb5e8f30fc56b5ab5c8fed50db93d75b047d8241fe1b2449858d9db1c") version("0.7.0", sha256="1fb01e36c1cf670f201c615e5fd7df88f72c27157b7d2780d146e21b266bdb64") version("0.6.1", sha256="c932eaf01ead08ff30ddb13ab5ad9cd43405ed8f12d5fff49bd27c59033b80df") diff --git a/var/spack/repos/builtin/packages/demuxlet/package.py b/var/spack/repos/builtin/packages/demuxlet/package.py index d87807fa2e562a..d0724e204ef6ee 100644 --- a/var/spack/repos/builtin/packages/demuxlet/package.py +++ b/var/spack/repos/builtin/packages/demuxlet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Demuxlet(AutotoolsPackage): maintainers("snehring") + license("Apache-2.0") + version("20210211", commit="f5044eb9ed5c6678aa3a80a8f2be7db7748ee732") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py index 63860f42205c32..b679b51cb06fc9 100644 --- a/var/spack/repos/builtin/packages/denovogear/package.py +++ b/var/spack/repos/builtin/packages/denovogear/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Denovogear(CMakePackage): homepage = "https://github.com/denovogear/denovogear" url = "https://github.com/denovogear/denovogear/archive/v1.1.1.tar.gz" + license("GPL-3.0-or-later") + version("1.1.1", sha256="799fe99193e9cf12320893cf020a3251022f60a49de8677a1c5a18c578fe4be2") version("1.1.0", sha256="f818f80cd67183294c8aae312cad8311e6a9abede1f687567bb079d29f79c005") diff --git a/var/spack/repos/builtin/packages/dftbplus/package.py b/var/spack/repos/builtin/packages/dftbplus/package.py index 0a219dd183be6a..d5d1b8232efa87 100644 --- a/var/spack/repos/builtin/packages/dftbplus/package.py +++ b/var/spack/repos/builtin/packages/dftbplus/package.py @@ -1,87 +1,165 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import os - from spack.package import * -class Dftbplus(MakefilePackage): +class Dftbplus(CMakePackage, MakefilePackage): """DFTB+ is an implementation of the Density Functional based Tight Binding (DFTB) method, containing many extensions to the original method.""" homepage = "https://www.dftbplus.org" - url = "https://github.com/dftbplus/dftbplus/archive/19.1.tar.gz" + url = "https://github.com/dftbplus/dftbplus/releases/download/22.1/dftbplus-22.1.tar.xz" + git = "https://github.com/dftbplus/dftbplus.git" - version("19.1", sha256="4d07f5c6102f06999d8cfdb1d17f5b59f9f2b804697f14b3bc562e3ea094b8a8") + maintainers = ["HaoZeke", "aradi", "iamashwin99"] + generator = "Ninja" - resource( - name="slakos", - url="https://github.com/dftbplus/testparams/archive/dftbplus-18.2.tar.gz", - sha256="bd191b3d240c1a81a8754a365e53a78b581fc92eb074dd5beb8b56a669a8d3d1", - destination="external/slakos", - when="@18.2:", + build_system( + conditional("cmake", when="@20.1:"), + conditional("makefile", when="@:19.1"), + default="cmake", ) - variant("mpi", default=True, description="Build an MPI-paralelised version of the code.") + license("CC-BY-SA-4.0") + + version("main", branch="main") + version("22.1", sha256="02daca6f4c6372656598f3ba0311110c8e473c87c8d934d7bb276feaa4cc1c82") + version("21.2", sha256="fbeb0e0ea93ab4dc4450f298ec712d2cf991f19f621badf57dae05f0e43b5906") + version("21.1", sha256="8c1eb8a38f72c421e2ae20118a6db3a656fa84e8b180ef387e549a73ae77f970") + version("20.2.1", sha256="95cc85fdb08bd57ca013bd09f4f902303720e17d015a5fab2d4db63fcb6d9cb3") + version("20.2", sha256="eafd219159d600624041658046c89db539ceb0c1d2988b72321c80d9b992c9bf") + version("20.1", sha256="04c2b906b8670937c8ddd9c5fb68e7e9921b464840cf54aa3d698db98167d0b7") + version( + "19.1", + deprecated=True, + sha256="78f45ef0571c78cf732a5493d32830455a832fa05ebcad43098895e46ad8d220", + ) variant( - "gpu", + "api", + default=True, + description="Whether public API should be included and the DFTB+ library installed.", + ) + variant( + "arpack", default=False, - description="Use the MAGMA library " "for GPU accelerated computation", + description="Whether the ARPACK library should be included (needed for TD-DFTB).", + when="~mpi", + ) + variant( + "chimes", + default=False, + when="@21.2:", + description="Whether repulsive corrections" "via the ChIMES library should be enabled.", ) - variant( "elsi", default=False, description="Use the ELSI library for large scale systems. " "Only has any effect if you build with '+mpi'", + when="+mpi", + ) + variant( + "gpu", + default=False, + description="Use the MAGMA library " "for GPU accelerated computation", + ) + variant( + "mbd", + default=False, + when="@21.1:", + description="Whether DFTB+ should be built with many-body-dispersion support.", + ) + variant("mpi", default=False, description="Whether DFTB+ should support MPI-parallelism.") + variant( + "openmp", + default=True, + description="Whether OpenMP thread parallisation should be enabled.", + ) + variant( + "plumed", + default=False, + when="@20.1:", + description="Whether metadynamics via the PLUMED2 library should be allowed.", + ) + variant("poisson", default=False, description="Whether the Poisson-solver should be included.") + variant( + "python", + default=False, + description="Whether the Python components of DFTB+ should be tested and installed.", + ) + variant( + "sdftd3", + default=False, + when="@21.2:", + description="Whether the s-dftd3 library should be included", ) - variant( "sockets", default=False, description="Whether the socket library " "(external control) should be linked", ) - - variant("arpack", default=False, description="Use ARPACK for excited state DFTB functionality") - variant( "transport", default=False, + when="+shared", description="Whether transport via libNEGF should be included. " "Only affects parallel build. " "(serial version is built without libNEGF/transport)", ) + variant( + "tblite", + default=False, + when="@21.2:", + description="Whether xTB support should be included via tblite.", + ) + + variant("shared", default=False, description="Most often for the Python wrappers.") variant( "dftd3", default=False, + when="@:19.1", description="Use DftD3 dispersion library " "(if you need this dispersion model)", ) - depends_on("lapack") - depends_on("blas") - depends_on("scalapack", when="+mpi") - depends_on("mpi", when="+mpi") + depends_on("cmake@3.16:", type="build", when="@20.1:") + depends_on("ninja@1.10", type="build", when="@20.1:") + + depends_on("blas", when="-mpi") + depends_on("lapack", when="-mpi") + + depends_on("arpack-ng", when="+arpack~mpi") + depends_on("simple-dftd3", when="+sdftd3") depends_on("elsi", when="+elsi") depends_on("magma", when="+gpu") - depends_on("arpack-ng", when="+arpack") + depends_on("mpi", when="+mpi") + depends_on("plumed", when="+plumed") + depends_on("scalapack", when="+mpi") + depends_on("python@3.2:", type=("build", "run")) + depends_on("py-numpy", type=("build", "run")) # for tests + # Only for 19.1 depends_on("dftd3-lib@0.9.2", when="+dftd3") + # Conflicts + conflicts("+python", when="~shared") + conflicts("-poisson", when="+transport") + + # Extensions + extends("python", when="+python") + + @when("@19.1") # Only version without CMake def edit(self, spec, prefix): """ First, change the ROOT variable, because, for some reason, the Makefile and the spack install script run in different directories - Then, if using GCC, rename the file 'sys/make.x86_64-linux-gnu' to make.arch. - After that, edit the make.arch to point to the dependencies - And the last thing we do here is to set the installdir """ dircwd = os.getcwd() @@ -160,3 +238,79 @@ def edit(self, spec, prefix): ) mconfig.filter("WITH_DFTD3 := .*", "WITH_DFTD3 := 1") + + def cmake_args(self): + args = [ + self.define_from_variant("WITH_OPENMP", "openmp"), + self.define_from_variant("WITH_API", "api"), + self.define_from_variant("WITH_ARPACK", "arpack"), + self.define_from_variant("WITH_CHIMES", "chimes"), + self.define_from_variant("WITH_ELSI", "elsi"), + self.define_from_variant("WITH_GPU", "gpu"), + self.define_from_variant("WITH_MBD", "mbd"), + self.define_from_variant("WITH_MPI", "mpi"), + self.define_from_variant("WITH_PLUMED", "plumed"), + self.define_from_variant("WITH_POISSON", "poisson"), + self.define_from_variant("WITH_PYTHON", "python"), + self.define_from_variant("WITH_SDFTD3", "sdftd3"), + self.define_from_variant("WITH_SOCKETS", "sockets"), + self.define_from_variant("WITH_TBLITE", "tblite"), + self.define_from_variant("WITH_TRANSPORT", "transport"), + self.define_from_variant("BUILD_SHARED_LIBS", "shared"), + ] + # SCALAPACK + # Note: dftbplus@20.1 uses plural form of the option names + # (e.g. -DSCALAPACK_LIBRARIES) + # but dftbplus@20.2 onwards uses singular + # (e.g. -DSCALAPACK_LIBRARY) + # and plural form is ignored. + # We set both inorder to be compatible with all versions. + if "+mpi" in self.spec: + # we use scalapack for linear algebra + args.extend( + [ + self.define("SCALAPACK_FOUND", "true"), + self.define("SCALAPACK_INCLUDE_DIRS", self.spec["scalapack"].prefix.include), + self.define("SCALAPACK_LIBRARIES", self.spec["scalapack"].libs.joined(";")), + self.define("SCALAPACK_LIBRARY", self.spec["scalapack"].libs.joined(";")), + ] + ) + else: + # we define the lapack and blas libraries + lapack_libs = self.spec["lapack"].libs.joined(";") + blas_libs = self.spec["blas"].libs.joined(";") + args.extend( + [ + self.define("LAPACK_FOUND", True), + self.define("LAPACK_INCLUDE_DIRS", self.spec["lapack"].prefix.include), + self.define("LAPACK_LIBRARIES", lapack_libs), + self.define("LAPACK_LIBRARY", lapack_libs), + self.define("BLAS_FOUND", True), + self.define("BLAS_INCLUDE_DIRS", self.spec["blas"].prefix.include), + self.define("BLAS_LIBRARIES", blas_libs), + self.define("BLAS_LIBRARY", blas_libs), + ] + ) + if "+python" in self.spec: + args.append(self.define("BUILD_SHARED_LIBS", True)) + if self.run_tests: + args.append("-DWITH_UNIT_TESTS=ON") + else: + args.append("-DWITH_UNIT_TESTS=OFF") + return args + + @run_after("build") + @on_package_attributes(run_tests=True) + def check_install(self): + """Run ctest after building binary. + only run the unit tests. If the unit tests fail, the installation throws + a warning.""" + + with working_dir(self.build_directory): + try: + ctest("") + except ProcessError: + warn = "Unit tests failed.\n" + warn += "Please report this failure to:\n" + warn += "https://github.com/dftbplus/dftbplus/issues" + tty.msg(warn) diff --git a/var/spack/repos/builtin/packages/dftd3-lib/package.py b/var/spack/repos/builtin/packages/dftd3-lib/package.py index 86ed5569a3721e..ff42d16ab86310 100644 --- a/var/spack/repos/builtin/packages/dftd3-lib/package.py +++ b/var/spack/repos/builtin/packages/dftd3-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dftd4/package.py b/var/spack/repos/builtin/packages/dftd4/package.py index 8fde62cc116093..8c2d5c62889f02 100644 --- a/var/spack/repos/builtin/packages/dftd4/package.py +++ b/var/spack/repos/builtin/packages/dftd4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dftd4(MesonPackage): maintainers("awvwgk") + license("LGPL-3.0-only") + version("main", branch="main") version("3.5.0", sha256="d2bab992b5ef999fd13fec8eb1da9e9e8d94b8727a2e624d176086197a00a46f") version("3.4.0", sha256="24fcb225cdd5c292ac26f7d3204ee3c4024174adb5272eeda9ae7bc57113ec8d") diff --git a/var/spack/repos/builtin/packages/dftfe/package.py b/var/spack/repos/builtin/packages/dftfe/package.py index 94a499fdc2598b..a4423d68197dbc 100644 --- a/var/spack/repos/builtin/packages/dftfe/package.py +++ b/var/spack/repos/builtin/packages/dftfe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dftfe(CMakePackage): maintainers("rmsds") + license("LGPL-2.1-or-later") + version("0.6.0", sha256="66b633a3aae2f557f241ee45b2faa41aa179e4a0bdf39c4ae2e679a2970845a1") version("0.5.2", sha256="9dc4fa9f16b00be6fb1890d8af4a1cd3e4a2f06a2539df999671a09f3d26ec64") version("0.5.1", sha256="e47272d3783cf675dcd8bc31da07765695164110bfebbbab29f5815531f148c1") diff --git a/var/spack/repos/builtin/packages/dhpmm-f/package.py b/var/spack/repos/builtin/packages/dhpmm-f/package.py index 6d35cfa2ed25ef..7efe193546b035 100644 --- a/var/spack/repos/builtin/packages/dhpmm-f/package.py +++ b/var/spack/repos/builtin/packages/dhpmm-f/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class DhpmmF(MakefilePackage): homepage = "http://www.math.twcu.ac.jp/ogita/post-k/" url = "http://www.math.twcu.ac.jp/ogita/post-k/software/DHPMM_F/DHPMM_F_alpha.tar.gz" + license("MIT") + version("alpha", sha256="35321ecbc749f2682775ffcd27833afc8c8eb4fa7753ce769727c9d1fe097848") depends_on("blas", type="link") diff --git a/var/spack/repos/builtin/packages/dhtest/package.py b/var/spack/repos/builtin/packages/dhtest/package.py index 803995df85d68e..e673ef2d4de572 100644 --- a/var/spack/repos/builtin/packages/dhtest/package.py +++ b/var/spack/repos/builtin/packages/dhtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dhtest(MakefilePackage): homepage = "https://github.com/saravana815/dhtest" url = "https://github.com/saravana815/dhtest/archive/v1.5.tar.gz" + license("GPL-2.0-or-later") + version("1.5", sha256="df66150429a59a3b6cea9b29e2687707d04ab10db5dfe1c893ba3e0b0531b151") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/dia/package.py b/var/spack/repos/builtin/packages/dia/package.py index c5b78a091a2701..9fe94c845255fe 100644 --- a/var/spack/repos/builtin/packages/dia/package.py +++ b/var/spack/repos/builtin/packages/dia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dia(Package): homepage = "https://wiki.gnome.org/Apps/Dia" url = "https://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-0.97.3.tar.xz" + license("GPL-2.0-or-later") + version("0.97.3", sha256="22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34") depends_on("intltool", type="build") diff --git a/var/spack/repos/builtin/packages/dialign-tx/package.py b/var/spack/repos/builtin/packages/dialign-tx/package.py index 76a2ca329a287a..83f96a6a7ec589 100644 --- a/var/spack/repos/builtin/packages/dialign-tx/package.py +++ b/var/spack/repos/builtin/packages/dialign-tx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class DialignTx(MakefilePackage): homepage = "https://dialign-tx.gobics.de/" url = "https://dialign-tx.gobics.de/DIALIGN-TX_1.0.2.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.2", sha256="fb3940a48a12875332752a298f619f0da62593189cd257d28932463c7cebcb8f") build_directory = "source" diff --git a/var/spack/repos/builtin/packages/dialign/package.py b/var/spack/repos/builtin/packages/dialign/package.py index 5da33591b262a8..7617794128d574 100644 --- a/var/spack/repos/builtin/packages/dialign/package.py +++ b/var/spack/repos/builtin/packages/dialign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dialign(MakefilePackage): homepage = "https://bibiserv.cebitec.uni-bielefeld.de/dialign" url = "https://bibiserv.cebitec.uni-bielefeld.de/applications/dialign/resources/downloads/dialign-2.2.1-src.tar.gz" + license("LGPL-2.1-or-later") + version("2.2.1", sha256="046361bb4ca6e4ab2ac5e634cfcd673f964a887006c09c1b8bd3310fac86f519") build_directory = "src" diff --git a/var/spack/repos/builtin/packages/diamond/package.py b/var/spack/repos/builtin/packages/diamond/package.py index a97a341eb17600..c0ea26edd5fba9 100644 --- a/var/spack/repos/builtin/packages/diamond/package.py +++ b/var/spack/repos/builtin/packages/diamond/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Diamond(CMakePackage): url = "https://github.com/bbuchfink/diamond/archive/v2.0.9.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("2.1.7", sha256="2dcaba0e79ecb02c3d2a6816d317e714767118a9a056721643abff4c586ca95b") version("2.1.6", sha256="852d27c7535d53f1ce59db0625ff23ac3bf17e57f7a3b1c46c08718f77e19c54") version("2.0.15", sha256="cc8e1f3fd357d286cf6585b21321bd25af69aae16ae1a8f605ea603c1886ffa4") diff --git a/var/spack/repos/builtin/packages/dicom3tools/package.py b/var/spack/repos/builtin/packages/dicom3tools/package.py index 7337d767d7ebc8..b49547f0b7c427 100644 --- a/var/spack/repos/builtin/packages/dicom3tools/package.py +++ b/var/spack/repos/builtin/packages/dicom3tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/diffmark/package.py b/var/spack/repos/builtin/packages/diffmark/package.py index 8222e8ede97a7c..73f405bf96e037 100644 --- a/var/spack/repos/builtin/packages/diffmark/package.py +++ b/var/spack/repos/builtin/packages/diffmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Diffmark(AutotoolsPackage): homepage = "https://github.com/vbar/diffmark" git = "https://github.com/vbar/diffmark.git" + license("diffmark") + version("master", branch="master") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/diffsplice/package.py b/var/spack/repos/builtin/packages/diffsplice/package.py index df637f7b4d370b..128663a98991a6 100644 --- a/var/spack/repos/builtin/packages/diffsplice/package.py +++ b/var/spack/repos/builtin/packages/diffsplice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Diffsplice(MakefilePackage): homepage = "http://www.netlab.uky.edu/p/bioinfo/DiffSplice" url = "https://protocols.netlab.uky.edu/~yin/download/diffsplice/diffsplice_0.1.1.tgz" + license("GPL-3.0-only") + version("0.1.2beta", sha256="cc06dcb9f8d98b2184f0dd5863b79bdd6a8cd33b9418e6549b7ea63e90ee1aa6") version("0.1.1", sha256="9740426692b0e5f92b943b127014c1d9815bed2938b5dd9e9d0c5b64abbb5da6") diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py index 72721095c6bb2c..df141501160773 100644 --- a/var/spack/repos/builtin/packages/diffutils/package.py +++ b/var/spack/repos/builtin/packages/diffutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Diffutils(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/diffutils/" gnu_mirror_path = "diffutils/diffutils-3.7.tar.xz" + license("GPL-3.0-or-later") + version("3.9", sha256="d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1") version("3.8", sha256="a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec") version("3.7", sha256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26") diff --git a/var/spack/repos/builtin/packages/digitrounding/package.py b/var/spack/repos/builtin/packages/digitrounding/package.py index 63c9632f0b2eeb..3697955ff66d58 100644 --- a/var/spack/repos/builtin/packages/digitrounding/package.py +++ b/var/spack/repos/builtin/packages/digitrounding/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Digitrounding(CMakePackage): maintainers("robertu94") + license("LGPL-3.0-or-later") + version("master", branch="master") version("2020-02-27", commit="7b18679aded7a85e6f221f7f5cd4f080f322bc33") diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index ca53a897654b33..ea48ff48fe91a6 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,7 +8,39 @@ from spack.package import * -class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): +# This is a hack to get around some deficiencies in Hydrogen. +def get_blas_entries(inspec): + entries = [] + spec = inspec["hydrogen"] + if "blas=openblas" in spec: + entries.append(cmake_cache_option("DiHydrogen_USE_OpenBLAS", True)) + elif "blas=mkl" in spec or spec.satisfies("^intel-mkl"): + entries.append(cmake_cache_option("DiHydrogen_USE_MKL", True)) + elif "blas=essl" in spec or spec.satisfies("^essl"): + entries.append(cmake_cache_string("BLA_VENDOR", "IBMESSL")) + # IF IBM ESSL is used it needs help finding the proper LAPACK libraries + entries.append( + cmake_cache_string( + "LAPACK_LIBRARIES", + "%s;-llapack;-lblas" + % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), + ) + ) + entries.append( + cmake_cache_string( + "BLAS_LIBRARIES", + "%s;-lblas" + % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), + ) + ) + elif "blas=accelerate" in spec: + entries.append(cmake_cache_option("DiHydrogen_USE_ACCELERATE", True)) + elif spec.satisfies("^netlib-lapack"): + entries.append(cmake_cache_string("BLA_VENDOR", "Generic")) + return entries + + +class Dihydrogen(CachedCMakePackage, CudaPackage, ROCmPackage): """DiHydrogen is the second version of the Hydrogen fork of the well-known distributed linear algebra library, Elemental. DiHydrogen aims to be a basic distributed @@ -20,117 +52,181 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/LLNL/DiHydrogen.git" tags = ["ecp", "radiuss"] - maintainers("bvanessen") + maintainers("benson31", "bvanessen") + + license("Apache-2.0") version("develop", branch="develop") version("master", branch="master") - version("0.2.1", sha256="11e2c0f8a94ffa22e816deff0357dde6f82cc8eac21b587c800a346afb5c49ac") - version("0.2.0", sha256="e1f597e80f93cf49a0cb2dbc079a1f348641178c49558b28438963bd4a0bdaa4") - version("0.1", sha256="171d4b8adda1e501c38177ec966e6f11f8980bf71345e5f6d87d0a988fef4c4e") + version("0.3.0", sha256="8dd143441a28e0c7662cd92694e9a4894b61fd48508ac1d77435f342bc226dcf") + + # Primary features + + variant("dace", default=False, sticky=True, description="Enable DaCe backend.") + + variant( + "distconv", + default=False, + sticky=True, + description="Enable (legacy) Distributed Convolution support.", + ) + + variant( + "nvshmem", + default=False, + sticky=True, + description="Enable support for NVSHMEM-based halo exchanges.", + when="+distconv", + ) + + variant( + "shared", default=True, sticky=True, description="Enables the build of shared libraries" + ) + + # Some features of developer interest - variant("al", default=True, description="Builds with Aluminum communication library") variant( "developer", default=False, description="Enable extra warnings and force tests to be enabled.", ) - variant("half", default=False, description="Enable FP16 support on the CPU.") + + variant("ci", default=False, description="Use default options for CI builds") + variant( - "distconv", + "coverage", default=False, - description="Support distributed convolutions: spatial, channel, " "filter.", + description="Decorate build with code coverage instrumentation options", + when="%gcc", ) - variant("nvshmem", default=False, description="Builds with support for NVSHMEM") - variant("openmp", default=False, description="Enable CPU acceleration with OpenMP threads.") - variant("rocm", default=False, description="Enable ROCm/HIP language features.") - variant("shared", default=True, description="Enables the build of shared libraries") - - # Variants related to BLAS variant( - "openmp_blas", default=False, description="Use OpenMP for threading in the BLAS library" + "coverage", + default=False, + description="Decorate build with code coverage instrumentation options", + when="%clang", ) - variant("int64_blas", default=False, description="Use 64bit integers for BLAS.") variant( - "blas", - default="openblas", - values=("openblas", "mkl", "accelerate", "essl", "libsci"), - description="Enable the use of OpenBlas/MKL/Accelerate/ESSL/LibSci", + "coverage", + default=False, + description="Decorate build with code coverage instrumentation options", + when="%rocmcc", ) - conflicts("~cuda", when="+nvshmem") + # Package conflicts and requirements - depends_on("mpi") - depends_on("catch2", type="test") + conflicts("+nvshmem", when="~cuda", msg="NVSHMEM requires CUDA support.") - # Specify the correct version of Aluminum - depends_on("aluminum@0.4.0:0.4", when="@0.1 +al") - depends_on("aluminum@0.5.0:0.5", when="@0.2.0 +al") - depends_on("aluminum@0.7.0:0.7", when="@0.2.1 +al") - depends_on("aluminum@0.7.0:", when="@:0.0,0.2.1: +al") + conflicts("+cuda", when="+rocm", msg="CUDA and ROCm are mutually exclusive.") - # Add Aluminum variants - depends_on("aluminum +cuda +nccl +cuda_rma", when="+al +cuda") - depends_on("aluminum +rocm +rccl", when="+al +rocm") - depends_on("aluminum +ht", when="+al +distconv") + requires( + "+cuda", + "+rocm", + when="+distconv", + policy="any_of", + msg="DistConv support requires CUDA or ROCm.", + ) - for arch in CudaPackage.cuda_arch_values: - depends_on("aluminum cuda_arch=%s" % arch, when="+al +cuda cuda_arch=%s" % arch) - depends_on("nvshmem cuda_arch=%s" % arch, when="+nvshmem +cuda cuda_arch=%s" % arch) + # Dependencies - # variants +rocm and amdgpu_targets are not automatically passed to - # dependencies, so do it manually. - for val in ROCmPackage.amdgpu_targets: - depends_on("aluminum amdgpu_target=%s" % val, when="amdgpu_target=%s" % val) + depends_on("catch2@3.0.1:", type=("build", "test"), when="+developer") + depends_on("cmake@3.21.0:", type="build") + depends_on("cuda@11.0:", when="+cuda") + depends_on("spdlog@1.11.0:1.12.0", when="@:0.1,0.2:") - depends_on("roctracer-dev", when="+rocm +distconv") + with when("@0.3.0:"): + depends_on("hydrogen +al") + for arch in CudaPackage.cuda_arch_values: + depends_on( + "hydrogen +cuda cuda_arch={0}".format(arch), + when="+cuda cuda_arch={0}".format(arch), + ) - depends_on("cudnn", when="+cuda") - depends_on("cub", when="^cuda@:10") + for val in ROCmPackage.amdgpu_targets: + depends_on( + "hydrogen amdgpu_target={0}".format(val), + when="+rocm amdgpu_target={0}".format(val), + ) - # Note that #1712 forces us to enumerate the different blas variants - depends_on("openblas", when="blas=openblas") - depends_on("openblas +ilp64", when="blas=openblas +int64_blas") - depends_on("openblas threads=openmp", when="blas=openblas +openmp_blas") + with when("+distconv"): + depends_on("mpi") - depends_on("intel-mkl", when="blas=mkl") - depends_on("intel-mkl +ilp64", when="blas=mkl +int64_blas") - depends_on("intel-mkl threads=openmp", when="blas=mkl +openmp_blas") + # All this nonsense for one silly little package. + depends_on("aluminum@1.4.1:") - depends_on("veclibfort", when="blas=accelerate") - conflicts("blas=accelerate +openmp_blas") + # Add Aluminum variants + depends_on("aluminum +cuda +nccl", when="+distconv +cuda") + depends_on("aluminum +rocm +nccl", when="+distconv +rocm") - depends_on("essl", when="blas=essl") - depends_on("essl +ilp64", when="blas=essl +int64_blas") - depends_on("essl threads=openmp", when="blas=essl +openmp_blas") - depends_on("netlib-lapack +external-blas", when="blas=essl") + # TODO: Debug linker errors when NVSHMEM is built with UCX + depends_on("nvshmem +nccl~ucx", when="+nvshmem") - depends_on("cray-libsci", when="blas=libsci") - depends_on("cray-libsci +openmp", when="blas=libsci +openmp_blas") + # OMP support is only used in DistConv, and only Apple needs + # hand-holding with it. + depends_on("llvm-openmp", when="%apple-clang") + # FIXME: when="platform=darwin"?? - # Distconv builds require cuda or rocm - conflicts("+distconv", when="~cuda ~rocm") + # CUDA/ROCm arch forwarding - conflicts("+distconv", when="+half") - conflicts("+rocm", when="+half") + for arch in CudaPackage.cuda_arch_values: + depends_on( + "aluminum +cuda cuda_arch={0}".format(arch), + when="+cuda cuda_arch={0}".format(arch), + ) - depends_on("half", when="+half") + # This is a workaround for a bug in the Aluminum package, + # as it should be responsible for its own NCCL dependency. + # Rather than failing to concretize, we help it along. + depends_on( + "nccl cuda_arch={0}".format(arch), + when="+distconv +cuda cuda_arch={0}".format(arch), + ) - generator("ninja") - depends_on("cmake@3.17.0:", type="build") + # NVSHMEM also needs arch forwarding + depends_on( + "nvshmem +cuda cuda_arch={0}".format(arch), + when="+nvshmem +cuda cuda_arch={0}".format(arch), + ) - depends_on("spdlog", when="@:0.1,0.2:") + # Idenfity versions of cuda_arch that are too old from + # lib/spack/spack/build_systems/cuda.py. We require >=60. + illegal_cuda_arch_values = [ + "10", + "11", + "12", + "13", + "20", + "21", + "30", + "32", + "35", + "37", + "50", + "52", + "53", + ] + for value in illegal_cuda_arch_values: + conflicts("cuda_arch=" + value) + + for val in ROCmPackage.amdgpu_targets: + depends_on( + "aluminum amdgpu_target={0}".format(val), + when="+rocm amdgpu_target={0}".format(val), + ) - depends_on("llvm-openmp", when="%apple-clang +openmp") + # CUDA-specific distconv dependencies + depends_on("cudnn", when="+cuda") - # TODO: Debug linker errors when NVSHMEM is built with UCX - depends_on("nvshmem +nccl~ucx", when="+nvshmem") + # ROCm-specific distconv dependencies + depends_on("hipcub", when="+rocm") + depends_on("miopen-hip", when="+rocm") + depends_on("roctracer-dev", when="+rocm") - # Idenfity versions of cuda_arch that are too old - # from lib/spack/spack/build_systems/cuda.py - illegal_cuda_arch_values = ["10", "11", "12", "13", "20", "21"] - for value in illegal_cuda_arch_values: - conflicts("cuda_arch=" + value) + with when("+ci+coverage"): + depends_on("lcov", type=("build", "run")) + depends_on("py-gcovr", type=("build", "run")) + # Technically it's not used in the build, but CMake sets up a + # target, so it needs to be found. @property def libs(self): @@ -138,104 +234,127 @@ def libs(self): return find_libraries("libH2Core", root=self.prefix, shared=shared, recursive=True) def cmake_args(self): + args = [] + return args + + def get_cuda_flags(self): spec = self.spec + args = [] + if spec.satisfies("^cuda+allow-unsupported-compilers"): + args.append("-allow-unsupported-compiler") + + if spec.satisfies("%clang"): + for flag in spec.compiler_flags["cxxflags"]: + if "gcc-toolchain" in flag: + args.append("-Xcompiler={0}".format(flag)) + return args - args = [ - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_INSTALL_MESSAGE:STRING=LAZY", - "-DBUILD_SHARED_LIBS:BOOL=%s" % ("+shared" in spec), - "-DH2_ENABLE_ALUMINUM=%s" % ("+al" in spec), - "-DH2_ENABLE_CUDA=%s" % ("+cuda" in spec), - "-DH2_ENABLE_DISTCONV_LEGACY=%s" % ("+distconv" in spec), - "-DH2_ENABLE_OPENMP=%s" % ("+openmp" in spec), - "-DH2_ENABLE_FP16=%s" % ("+half" in spec), - "-DH2_DEVELOPER_BUILD=%s" % ("+developer" in spec), - ] + def initconfig_compiler_entries(self): + spec = self.spec + entries = super(Dihydrogen, self).initconfig_compiler_entries() + + # FIXME: Enforce this better in the actual CMake. + entries.append(cmake_cache_string("CMAKE_CXX_STANDARD", "17")) + entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec)) + entries.append(cmake_cache_option("CMAKE_EXPORT_COMPILE_COMMANDS", True)) + + # It's possible this should have a `if "platform=cray" in + # spec:` in front of it, but it's not clear to me when this is + # set. In particular, I don't actually see this blurb showing + # up on Tioga builds. Which is causing the obvious problem + # (namely, the one this was added to supposedly solve in the + # first place. + entries.append(cmake_cache_option("MPI_ASSUME_NO_BUILTIN_MPI", True)) + + if spec.satisfies("%clang +distconv platform=darwin"): + clang = self.compiler.cc + clang_bin = os.path.dirname(clang) + clang_root = os.path.dirname(clang_bin) + entries.append(cmake_cache_string("OpenMP_CXX_FLAGS", "-fopenmp=libomp")) + entries.append(cmake_cache_string("OpenMP_CXX_LIB_NAMES", "libomp")) + entries.append( + cmake_cache_string( + "OpenMP_libomp_LIBRARY", "{0}/lib/libomp.dylib".format(clang_root) + ) + ) + + return entries + + def initconfig_hardware_entries(self): + spec = self.spec + entries = super(Dihydrogen, self).initconfig_hardware_entries() - if spec.version < Version("0.3"): - args.append("-DH2_ENABLE_HIP_ROCM=%s" % ("+rocm" in spec)) - else: - args.append("-DH2_ENABLE_ROCM=%s" % ("+rocm" in spec)) - - if not spec.satisfies("^cmake@3.23.0"): - # There is a bug with using Ninja generator in this version - # of CMake - args.append("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON") - - if "+cuda" in spec: - if self.spec.satisfies("%clang"): - for flag in self.spec.compiler_flags["cxxflags"]: - if "gcc-toolchain" in flag: - args.append("-DCMAKE_CUDA_FLAGS=-Xcompiler={0}".format(flag)) - if spec.satisfies("^cuda@11.0:"): - args.append("-DCMAKE_CUDA_STANDARD=17") - else: - args.append("-DCMAKE_CUDA_STANDARD=14") - archs = spec.variants["cuda_arch"].value - if archs != "none": + entries.append(cmake_cache_option("H2_ENABLE_CUDA", "+cuda" in spec)) + if spec.satisfies("+cuda"): + entries.append(cmake_cache_string("CMAKE_CUDA_STANDARD", "17")) + if not spec.satisfies("cuda_arch=none"): + archs = spec.variants["cuda_arch"].value arch_str = ";".join(archs) - args.append("-DCMAKE_CUDA_ARCHITECTURES=%s" % arch_str) + entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", arch_str)) + + # FIXME: Should this use the "cuda_flags" function of the + # CudaPackage class or something? There might be other + # flags in play, and we need to be sure to get them all. + cuda_flags = self.get_cuda_flags() + if len(cuda_flags) > 0: + entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", " ".join(cuda_flags))) + + enable_rocm_var = ( + "H2_ENABLE_ROCM" if spec.version < Version("0.3") else "H2_ENABLE_HIP_ROCM" + ) + entries.append(cmake_cache_option(enable_rocm_var, "+rocm" in spec)) + if spec.satisfies("+rocm"): + entries.append(cmake_cache_string("CMAKE_HIP_STANDARD", "17")) + if not spec.satisfies("amdgpu_target=none"): + archs = self.spec.variants["amdgpu_target"].value + arch_str = ";".join(archs) + entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) + entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) + entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) + entries.append(cmake_cache_path("HIP_ROOT_DIR", spec["hip"].prefix)) - if spec.satisfies("%cce") and spec.satisfies("^cuda+allow-unsupported-compilers"): - args.append("-DCMAKE_CUDA_FLAGS=-allow-unsupported-compiler") + return entries - if "+cuda" in spec: - args.append("-DcuDNN_DIR={0}".format(spec["cudnn"].prefix)) + def initconfig_package_entries(self): + spec = self.spec + entries = super(Dihydrogen, self).initconfig_package_entries() - if spec.satisfies("^cuda@:10"): - if "+cuda" in spec or "+distconv" in spec: - args.append("-DCUB_DIR={0}".format(spec["cub"].prefix)) + # Basic H2 options + entries.append(cmake_cache_option("H2_DEVELOPER_BUILD", "+developer" in spec)) + entries.append(cmake_cache_option("H2_ENABLE_TESTS", "+developer" in spec)) - # Add support for OpenMP with external (Brew) clang - if spec.satisfies("%clang +openmp platform=darwin"): - clang = self.compiler.cc - clang_bin = os.path.dirname(clang) - clang_root = os.path.dirname(clang_bin) - args.extend( - [ - "-DOpenMP_CXX_FLAGS=-fopenmp=libomp", - "-DOpenMP_CXX_LIB_NAMES=libomp", - "-DOpenMP_libomp_LIBRARY={0}/lib/libomp.dylib".format(clang_root), - ] - ) + entries.append(cmake_cache_option("H2_ENABLE_CODE_COVERAGE", "+coverage" in spec)) + entries.append(cmake_cache_option("H2_CI_BUILD", "+ci" in spec)) - if "+rocm" in spec: - args.extend( - [ - "-DCMAKE_CXX_FLAGS=-std=c++17", - "-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix), - "-DHIP_CXX_COMPILER={0}".format(self.spec["hip"].hipcc), - ] - ) - if "platform=cray" in spec: - args.extend(["-DMPI_ASSUME_NO_BUILTIN_MPI=ON"]) - archs = self.spec.variants["amdgpu_target"].value - if archs != "none": - arch_str = ",".join(archs) - args.append( - "-DHIP_HIPCC_FLAGS=--amdgpu-target={0}" - " -g -fsized-deallocation -fPIC -std=c++17".format(arch_str) - ) - args.extend( - [ - "-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str, - "-DAMDGPU_TARGETS=%s" % arch_str, - "-DGPU_TARGETS=%s" % arch_str, - ] - ) + entries.append(cmake_cache_option("H2_ENABLE_DACE", "+dace" in spec)) - if self.spec.satisfies("^essl"): - # IF IBM ESSL is used it needs help finding the proper LAPACK libraries - args.extend( - [ - "-DLAPACK_LIBRARIES=%s;-llapack;-lblas" - % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), - "-DBLAS_LIBRARIES=%s;-lblas" - % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), - ] - ) + # DistConv options + entries.append(cmake_cache_option("H2_ENABLE_ALUMINUM", "+distconv" in spec)) + entries.append(cmake_cache_option("H2_ENABLE_DISTCONV_LEGACY", "+distconv" in spec)) + entries.append(cmake_cache_option("H2_ENABLE_OPENMP", "+distconv" in spec)) - return args + # Paths to stuff, just in case. CMAKE_PREFIX_PATH should catch + # all this, but this shouldn't hurt to have. + entries.append(cmake_cache_path("spdlog_ROOT", spec["spdlog"].prefix)) + + if "+developer" in spec: + entries.append(cmake_cache_path("Catch2_ROOT", spec["catch2"].prefix)) + + if "+coverage" in spec: + entries.append(cmake_cache_path("lcov_ROOT", spec["lcov"].prefix)) + entries.append(cmake_cache_path("genhtml_ROOT", spec["lcov"].prefix)) + if "+ci" in spec: + entries.append(cmake_cache_path("gcovr_ROOT", spec["py-gcovr"].prefix)) + + if "+distconv" in spec: + entries.append(cmake_cache_path("Aluminum_ROOT", spec["aluminum"].prefix)) + if "+cuda" in spec: + entries.append(cmake_cache_path("cuDNN_ROOT", spec["cudnn"].prefix)) + + # Currently this is a hack for all Hydrogen versions. WIP to + # fix this at develop. + entries.extend(get_blas_entries(spec)) + return entries def setup_build_environment(self, env): if self.spec.satisfies("%apple-clang +openmp"): diff --git a/var/spack/repos/builtin/packages/dimemas/package.py b/var/spack/repos/builtin/packages/dimemas/package.py index 04efe269ec4ba3..8c5751fbc53377 100644 --- a/var/spack/repos/builtin/packages/dimemas/package.py +++ b/var/spack/repos/builtin/packages/dimemas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dimemas(AutotoolsPackage): homepage = "https://tools.bsc.es/dimemas" url = "https://github.com/bsc-performance-tools/dimemas/archive/5.4.1.tar.gz" + license("LGPL-2.1-or-later") + version("5.4.1", sha256="10ddca3745a56ebab5c1ba180f6f4bce5832c4deac50c1b1dc08271db5c7cafa") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/ding-libs/package.py b/var/spack/repos/builtin/packages/ding-libs/package.py index 9df273bfa7fcca..f8714e2f01ee40 100644 --- a/var/spack/repos/builtin/packages/ding-libs/package.py +++ b/var/spack/repos/builtin/packages/ding-libs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dire/package.py b/var/spack/repos/builtin/packages/dire/package.py index f2a76e88460ce8..1d7630754a7c58 100644 --- a/var/spack/repos/builtin/packages/dire/package.py +++ b/var/spack/repos/builtin/packages/dire/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/direnv/package.py b/var/spack/repos/builtin/packages/direnv/package.py index 76be39bdc9c6a2..98fdab72a2589f 100644 --- a/var/spack/repos/builtin/packages/direnv/package.py +++ b/var/spack/repos/builtin/packages/direnv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class Direnv(Package): maintainers("acastanedam", "alecbcs") + license("MIT") + + version("2.33.0", sha256="8ef18051aa6bdcd6b59f04f02acdd0b78849b8ddbdbd372d4957af7889c903ea") version("2.32.3", sha256="c66f6d1000f28f919c6106b5dcdd0a0e54fb553602c63c60bf59d9bbdf8bd33c") version("2.32.2", sha256="352b3a65e8945d13caba92e13e5666e1854d41749aca2e230938ac6c64fa8ef9") version("2.32.1", sha256="dc7df9a9e253e1124748aa74da94bf2b96f5a61d581c60d52d3f8e8dc86ecfde") diff --git a/var/spack/repos/builtin/packages/discotec/package.py b/var/spack/repos/builtin/packages/discotec/package.py index 7693f97c83c805..aa876aa1cd34a0 100644 --- a/var/spack/repos/builtin/packages/discotec/package.py +++ b/var/spack/repos/builtin/packages/discotec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,8 +16,11 @@ class Discotec(CMakePackage): maintainers("freifrauvonbleifrei", "pfluegdk") + license("LGPL-3.0-only") + version("main", branch="main") + variant("compression", default=False, description="Write sparse grid files compressed") variant("ft", default=False, description="DisCoTec with algorithm-based fault tolerance") variant("gene", default=False, description="Build for GENE (as task library)") variant("hdf5", default=True, description="Interpolation output with HDF5") @@ -31,6 +34,7 @@ class Discotec(CMakePackage): depends_on("cmake@3.24.2:", type="build") depends_on("glpk") depends_on("highfive+mpi+boost+ipo", when="+hdf5") + depends_on("lz4", when="+compression") depends_on("mpi") depends_on("selalib", when="+selalib") depends_on("vtk", when="+vtk") @@ -38,6 +42,7 @@ class Discotec(CMakePackage): def cmake_args(self): args = [ self.define("DISCOTEC_BUILD_MISSING_DEPS", False), + self.define_from_variant("DISCOTEC_WITH_COMPRESSION", "compression"), self.define_from_variant("DISCOTEC_ENABLEFT", "ft"), self.define_from_variant("DISCOTEC_GENE", "gene"), self.define_from_variant("DISCOTEC_OPENMP", "openmp"), diff --git a/var/spack/repos/builtin/packages/discovar/package.py b/var/spack/repos/builtin/packages/discovar/package.py index 220632e391d5d5..95c5bcdb1c530b 100644 --- a/var/spack/repos/builtin/packages/discovar/package.py +++ b/var/spack/repos/builtin/packages/discovar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Discovar(AutotoolsPackage): homepage = "https://software.broadinstitute.org/software/discovar/blog/" url = "ftp://ftp.broadinstitute.org/pub/crd/Discovar/latest_source_code/discovar-52488.tar.gz" + license("MIT") + version("52488", sha256="c46e8f5727b3c8116d715c02e20a83e6261c762e8964d00709abfb322a501d4e") conflicts("%gcc@6:") diff --git a/var/spack/repos/builtin/packages/discovardenovo/package.py b/var/spack/repos/builtin/packages/discovardenovo/package.py index c3f2ea3bd90318..a84709eba6ba63 100644 --- a/var/spack/repos/builtin/packages/discovardenovo/package.py +++ b/var/spack/repos/builtin/packages/discovardenovo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Discovardenovo(AutotoolsPackage): homepage = "https://software.broadinstitute.org/software/discovar/blog/" url = "ftp://ftp.broadinstitute.org/pub/crd/DiscovarDeNovo/latest_source_code/discovardenovo-52488.tar.gz" + license("MIT") + version("52488", sha256="445445a3b75e17e276a6119434f13784a5a661a9c7277f5e10f3b6b3b8ac5771") # lots of compiler errors with GCC7, works with 4.8.5 diff --git a/var/spack/repos/builtin/packages/disktype/package.py b/var/spack/repos/builtin/packages/disktype/package.py index ef5f19f4e3663c..3ca4692da967f6 100644 --- a/var/spack/repos/builtin/packages/disktype/package.py +++ b/var/spack/repos/builtin/packages/disktype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Disktype(MakefilePackage): homepage = "https://github.com/kamwoods/disktype" url = "https://github.com/kamwoods/disktype/archive/9.2.1.tar.gz" + license("MIT") + version("9.2.1", sha256="fb274d6ce6b69c0d36eb23fcc9f01db3c32c3996b404900d46bb743ce4fa8154") build_directory = "src" diff --git a/var/spack/repos/builtin/packages/dislin/package.py b/var/spack/repos/builtin/packages/dislin/package.py index 21fc4a9b0b1c47..ded925de995c7e 100644 --- a/var/spack/repos/builtin/packages/dislin/package.py +++ b/var/spack/repos/builtin/packages/dislin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/distbench/package.py b/var/spack/repos/builtin/packages/distbench/package.py index e2ee3e0cdc671e..02daf6b841b262 100644 --- a/var/spack/repos/builtin/packages/distbench/package.py +++ b/var/spack/repos/builtin/packages/distbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Distbench(MakefilePackage): homepage = "https://github.com/google/distbench" url = "https://github.com/google/distbench/archive/refs/tags/v1.0rc4.tar.gz" + license("Apache-2.0") + version("1.0rc4", sha256="adc8da85890219800207d0d4cd7ffd63193d2c4007dba7c44cf545cc13675ff7") depends_on("bazel", type="build") diff --git a/var/spack/repos/builtin/packages/distcc/package.py b/var/spack/repos/builtin/packages/distcc/package.py index 7b36276700999b..629cd3fc0ace1c 100644 --- a/var/spack/repos/builtin/packages/distcc/package.py +++ b/var/spack/repos/builtin/packages/distcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Distcc(AutotoolsPackage): homepage = "https://github.com/distcc/distcc" url = "https://github.com/distcc/distcc/archive/v3.3.3.tar.gz" + license("GPL-2.0-or-later") + version("3.3.5", sha256="13a4b3ce49dfc853a3de550f6ccac583413946b3a2fa778ddf503a9edc8059b0") version("3.3.3", sha256="b7f37d314704fbaf006d747514ff6e4d0d722102ef7d2aea132f97cf170f5169") diff --git a/var/spack/repos/builtin/packages/diy/package.py b/var/spack/repos/builtin/packages/diy/package.py index a4a876f1b38edd..6a08ab5de2ffb6 100644 --- a/var/spack/repos/builtin/packages/diy/package.py +++ b/var/spack/repos/builtin/packages/diy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Diy(CMakePackage): url = "https://github.com/diatomic/diy/archive/3.5.0.tar.gz" git = "https://github.com/diatomic/diy.git" + license("BSD-3-Clause-LBNL") + version("3.5.0", sha256="b3b5490441d521b6e9b33471c782948194bf95c7c3df3eb97bc5cf4530b91576") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/dla-future/package.py b/var/spack/repos/builtin/packages/dla-future/package.py index 8c0590d9f7b949..29007433df0d63 100644 --- a/var/spack/repos/builtin/packages/dla-future/package.py +++ b/var/spack/repos/builtin/packages/dla-future/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,11 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/eth-cscs/DLA-Future.git" maintainers = ["rasolca", "albestro", "msimberg", "aurianer"] + license("BSD-3-Clause") + + version("0.4.0", sha256="34fd0da0d1a72b6981bed0bba029ba0947e0d0d99beb3e0aad0a478095c9527d") + version("0.3.1", sha256="350a7fd216790182aa52639a3d574990a9d57843e02b92d87b854912f4812bfe") + version("0.3.0", sha256="9887ac0b466ca03d704a8738bc89e68550ed33509578c576390e98e76b64911b") version("0.2.1", sha256="4c2669d58f041304bd618a9d69d9879a42e6366612c2fc932df3894d0326b7fe") version("0.2.0", sha256="da73cbd1b88287c86d84b1045a05406b742be924e65c52588bbff200abd81a10") version("0.1.0", sha256="f7ffcde22edabb3dc24a624e2888f98829ee526da384cd752b2b271c731ca9b1") @@ -42,12 +47,15 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@3.22:", type="build") depends_on("doxygen", type="build", when="+doc") depends_on("mpi") - depends_on("blaspp@2022.05.00:") - depends_on("lapackpp@2022.05.00:") depends_on("blas") depends_on("lapack") depends_on("scalapack", when="+scalapack") + depends_on("blaspp@2022.05.00:") + depends_on("lapackpp@2022.05.00:") + depends_on("intel-oneapi-mkl +cluster", when="^[virtuals=scalapack] intel-oneapi-mkl") + + conflicts("intel-oneapi-mkl", when="@:0.3") depends_on("umpire~examples") depends_on("umpire~cuda", when="~cuda") @@ -58,8 +66,10 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("pika@0.15.1:", when="@0.1") depends_on("pika@0.16:", when="@0.2.0") - depends_on("pika@0.17:", when="@0.2.1:") - depends_on("pika-algorithms@0.1:") + depends_on("pika@0.17:", when="@0.2.1") + depends_on("pika@0.18:", when="@0.3") + depends_on("pika@0.19.1:", when="@0.4.0:") + depends_on("pika-algorithms@0.1:", when="@:0.2") depends_on("pika +mpi") depends_on("pika +cuda", when="+cuda") depends_on("pika +rocm", when="+rocm") @@ -70,38 +80,54 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage): depends_on("whip +rocm", when="+rocm") depends_on("rocblas", when="+rocm") - depends_on("rocprim", when="+rocm") depends_on("rocsolver", when="+rocm") - depends_on("rocthrust", when="+rocm") + + depends_on("rocprim", when="@:0.3 +rocm") + depends_on("rocthrust", when="@:0.3 +rocm") + + # nvcc 11.2 and older is unable to detect fmt::formatter specializations. + # DLA-Future 0.3.1 includes a workaround to avoid including fmt in device + # code: + # https://github.com/pika-org/pika/issues/870 + # https://github.com/eth-cscs/DLA-Future/pull/1045 + conflicts("^fmt@10:", when="@:0.3.0 +cuda ^cuda@:11.2") + + # Compilation problem triggered by the bundled fmt in Umpire together with + # fmt 10, which only happens with GCC 9 and nvcc 11.2 and older: + # https://github.com/eth-cscs/DLA-Future/issues/1044 + conflicts("^fmt@10:", when="@:0.3.0 %gcc@9 +cuda ^cuda@:11.2 ^umpire@2022.10:") + + # Pedantic warnings, triggered by GCC 9 and 10, are always errors until 0.3.1: + # https://github.com/eth-cscs/DLA-Future/pull/1043 + conflicts("%gcc@9:10", when="@:0.3.0") depends_on("hdf5 +cxx+mpi+threadsafe+shared", when="+hdf5") conflicts("+cuda", when="+rocm") with when("+rocm"): - for val in ROCmPackage.amdgpu_targets: - depends_on("pika amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) - depends_on( - "rocsolver amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) - depends_on( - "rocblas amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) - depends_on( - "rocprim amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) - depends_on( - "rocthrust amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) - depends_on("whip amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val)) - depends_on( - "umpire amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) + for arch in ROCmPackage.amdgpu_targets: + depends_on(f"pika amdgpu_target={arch}", when=f"amdgpu_target={arch}") + depends_on(f"rocsolver amdgpu_target={arch}", when=f"amdgpu_target={arch}") + depends_on(f"rocblas amdgpu_target={arch}", when=f"amdgpu_target={arch}") + depends_on(f"whip amdgpu_target={arch}", when=f"amdgpu_target={arch}") + depends_on(f"umpire amdgpu_target={arch}", when=f"amdgpu_target={arch}") + + with when("@:0.3 +rocm"): + for arch in ROCmPackage.amdgpu_targets: + depends_on(f"rocprim amdgpu_target={arch}", when=f"amdgpu_target={arch}") + depends_on(f"rocthrust amdgpu_target={arch}", when=f"amdgpu_target={arch}") with when("+cuda"): - for val in CudaPackage.cuda_arch_values: - depends_on("pika cuda_arch={0}".format(val), when="cuda_arch={0}".format(val)) - depends_on("umpire cuda_arch={0}".format(val), when="cuda_arch={0}".format(val)) + for arch in CudaPackage.cuda_arch_values: + depends_on(f"pika cuda_arch={arch}", when=f"cuda_arch={arch}") + depends_on(f"umpire cuda_arch={arch}", when=f"cuda_arch={arch}") + + patch( + "https://github.com/eth-cscs/DLA-Future/pull/1063/commits/efc9c176a7a8c512b3f37d079dec8c25ac1b7389.patch?full_index=1", + sha256="7f382c872d89f22da1ad499e85ffe9881cc7404c8465e42877a210a09382e2ea", + when="@:0.3 %gcc@13:", + ) def cmake_args(self): spec = self.spec @@ -110,35 +136,67 @@ def cmake_args(self): args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared")) # BLAS/LAPACK - if self.spec["lapack"].name in INTEL_MATH_LIBRARIES: + if spec["lapack"].name in INTEL_MATH_LIBRARIES: + mkl_provider = spec["lapack"].name + vmap = { - "none": "seq", - "openmp": "omp", - "tbb": "tbb", - } # Map MKL variants to LAPACK target name - mkl_threads = vmap[spec["intel-mkl"].variants["threads"].value] - # TODO: Generalise for intel-oneapi-mkl - args += [ - self.define("DLAF_WITH_MKL", True), - self.define("MKL_LAPACK_TARGET", f"mkl::mkl_intel_32bit_{mkl_threads}_dyn"), - ] + "intel-oneapi-mkl": { + "threading": { + "none": "sequential", + "openmp": "gnu_thread", + "tbb": "tbb_thread", + }, + "mpi": {"intel-mpi": "intelmpi", "mpich": "mpich", "openmpi": "openmpi"}, + }, + "intel-mkl": { + "threading": {"none": "seq", "openmp": "omp", "tbb": "tbb"}, + "mpi": {"intel-mpi": "mpich", "mpich": "mpich", "openmpi": "ompi"}, + }, + } + + if mkl_provider not in vmap.keys(): + raise RuntimeError( + f"dla-future does not support {mkl_provider} as lapack provider" + ) + mkl_mapper = vmap[mkl_provider] + + mkl_threads = mkl_mapper["threading"][spec[mkl_provider].variants["threads"].value] + if mkl_provider == "intel-oneapi-mkl": + args += [ + self.define("DLAF_WITH_MKL", True), + self.define("MKL_INTERFACE", "lp64"), + self.define("MKL_THREADING", mkl_threads), + ] + elif mkl_provider == "intel-mkl": + args += [ + self.define("DLAF_WITH_MKL", True) + if spec.version <= Version("0.3") + else self.define("DLAF_WITH_MKL_LEGACY", True), + self.define("MKL_LAPACK_TARGET", f"mkl::mkl_intel_32bit_{mkl_threads}_dyn"), + ] + if "+scalapack" in spec: - if ( - "^mpich" in spec - or "^cray-mpich" in spec - or "^intel-mpi" in spec - or "^mvapich" in spec - or "^mvapich2" in spec - ): - mkl_mpi = "mpich" - elif "^openmpi" in spec: - mkl_mpi = "ompi" - args.append( - self.define( - "MKL_SCALAPACK_TARGET", - f"mkl::scalapack_{mkl_mpi}_intel_32bit_{mkl_threads}_dyn", + try: + mpi_provider = spec["mpi"].name + if mpi_provider in ["mpich", "cray-mpich", "mvapich", "mvapich2"]: + mkl_mpi = mkl_mapper["mpi"]["mpich"] + else: + mkl_mpi = mkl_mapper["mpi"][mpi_provider] + except KeyError: + raise RuntimeError( + f"dla-future does not support {spec['mpi'].name} as mpi provider with " + f"the selected scalapack provider {mkl_provider}" + ) + + if mkl_provider == "intel-oneapi-mkl": + args.append(self.define("MKL_MPI", mkl_mpi)) + elif mkl_provider == "intel-mkl": + args.append( + self.define( + "MKL_SCALAPACK_TARGET", + f"mkl::scalapack_{mkl_mpi}_intel_32bit_{mkl_threads}_dyn", + ) ) - ) else: args.append(self.define("DLAF_WITH_MKL", False)) args.append( @@ -156,12 +214,12 @@ def cmake_args(self): args.append(self.define_from_variant("DLAF_WITH_CUDA", "cuda")) args.append(self.define_from_variant("DLAF_WITH_HIP", "rocm")) if "+rocm" in spec: - archs = self.spec.variants["amdgpu_target"].value + archs = spec.variants["amdgpu_target"].value if "none" not in archs: arch_str = ";".join(archs) args.append(self.define("CMAKE_HIP_ARCHITECTURES", arch_str)) if "+cuda" in spec: - archs = self.spec.variants["cuda_arch"].value + archs = spec.variants["cuda_arch"].value if "none" not in archs: arch_str = ";".join(archs) args.append(self.define("CMAKE_CUDA_ARCHITECTURES", arch_str)) diff --git a/var/spack/repos/builtin/packages/dlb/package.py b/var/spack/repos/builtin/packages/dlb/package.py index fc769e36bf069e..32dca653ee6ced 100644 --- a/var/spack/repos/builtin/packages/dlb/package.py +++ b/var/spack/repos/builtin/packages/dlb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Dlb(AutotoolsPackage): maintainers("vlopezh") + license("LGPL-3.0-or-later") + version("main", branch="main") version("3.3.1", sha256="1b245acad80b03eb83e815fd59dcfc598cfddd899de4504cf6a9572fe5359f40") version("3.3", sha256="55b87aea14f3954d8878912f3134938db235e6984fae26fdf5134148007eb722") diff --git a/var/spack/repos/builtin/packages/dlib/package.py b/var/spack/repos/builtin/packages/dlib/package.py index 0100a2379fc756..355d793656e9b8 100644 --- a/var/spack/repos/builtin/packages/dlib/package.py +++ b/var/spack/repos/builtin/packages/dlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dlib(CMakePackage): maintainer = ["robertu94"] + license("BSL-1.0") + version("master", branch="master") version("19.22", sha256="5f44b67f762691b92f3e41dcf9c95dd0f4525b59cacb478094e511fdacb5c096") version("19.21", sha256="116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0") diff --git a/var/spack/repos/builtin/packages/dlpack/package.py b/var/spack/repos/builtin/packages/dlpack/package.py index 6b69a1c40f871a..bfaec6a09210d0 100644 --- a/var/spack/repos/builtin/packages/dlpack/package.py +++ b/var/spack/repos/builtin/packages/dlpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Dlpack(Package): git = "https://github.com/dmlc/dlpack.git" url = "https://github.com/dmlc/dlpack/archive/refs/tags/v0.5.tar.gz" + license("Apache-2.0") + version("master", branch="master") version("0.5", sha256="9209ac194a175aaab4381313891fba047cb173b2bdd15ac934f83f567f9cd514") version("0.4", sha256="d0a533189ecd45a033b72e276fccaa2122cfd76de125e0a5e126bdea0fec2d24") diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py index 2e8cd84636cd81..04c247bdc66e09 100644 --- a/var/spack/repos/builtin/packages/dmd/package.py +++ b/var/spack/repos/builtin/packages/dmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Dmd(MakefilePackage): homepage = "https://github.com/dlang/dmd" url = "https://github.com/dlang/dmd/archive/v2.081.1.tar.gz" + license("BSL-1.0") + version("2.081.1", sha256="14f3aafe1c93c86646aaeb3ed7361a5fc5a24374cf25c8848c81942bfd9fae1a") version("2.081.0", sha256="29b9882ed424b744df83ac73182d4ae952251029ebd16117d18f9cc1e83542e2") diff --git a/var/spack/repos/builtin/packages/dmidecode/package.py b/var/spack/repos/builtin/packages/dmidecode/package.py index fb443c564208b8..37f964655e66b9 100644 --- a/var/spack/repos/builtin/packages/dmidecode/package.py +++ b/var/spack/repos/builtin/packages/dmidecode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dmidecode(MakefilePackage): homepage = "https://github.com/mirror/dmidecode" url = "https://github.com/mirror/dmidecode/archive/dmidecode-3-2.tar.gz" + license("GPL-2.0-or-later") + version("3-2", sha256="489d840d076785617a432649603aafa6358327f4376694c062b69dfa359bcc2d") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/dmlc-core/package.py b/var/spack/repos/builtin/packages/dmlc-core/package.py index 333e80d089eae9..60cc32da43ecd3 100644 --- a/var/spack/repos/builtin/packages/dmlc-core/package.py +++ b/var/spack/repos/builtin/packages/dmlc-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class DmlcCore(CMakePackage): homepage = "https://github.com/dmlc/dmlc-core" git = "https://github.com/dmlc/dmlc-core.git" + license("Apache-2.0") + version("master") version("20170508", commit="a6c5701219e635fea808d264aefc5b03c3aec314") diff --git a/var/spack/repos/builtin/packages/dmtcp/package.py b/var/spack/repos/builtin/packages/dmtcp/package.py index 1eff1e4c160065..ee31dcadc35ed3 100644 --- a/var/spack/repos/builtin/packages/dmtcp/package.py +++ b/var/spack/repos/builtin/packages/dmtcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dmtcp(AutotoolsPackage): url = "https://github.com/dmtcp/dmtcp/archive/refs/tags/3.0.0.tar.gz" git = "https://github.com/dmtcp/dmtcp.git" + license("LGPL-3.0-only") + maintainers("karya0") version("master", branch="master") version("3.0.0", sha256="2c7e95e1dbc55db33433bfee48a65f274298e98f246a36ab6dad1e0694750d37") diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py index f607d962a86895..565b066bd6a9b1 100644 --- a/var/spack/repos/builtin/packages/dmxproto/package.py +++ b/var/spack/repos/builtin/packages/dmxproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dnsmap/package.py b/var/spack/repos/builtin/packages/dnsmap/package.py index 13aafae2d3e781..f5e8ca90d02e9d 100644 --- a/var/spack/repos/builtin/packages/dnsmap/package.py +++ b/var/spack/repos/builtin/packages/dnsmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dnsmap(MakefilePackage): homepage = "https://github.com/makefu/dnsmap" git = "https://github.com/makefu/dnsmap.git" + license("GPL-2.0-or-later") + version("master", branch="master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/dnsmasq/package.py b/var/spack/repos/builtin/packages/dnsmasq/package.py index 3f16db13691fe1..4149405f2f7e4c 100644 --- a/var/spack/repos/builtin/packages/dnsmasq/package.py +++ b/var/spack/repos/builtin/packages/dnsmasq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dnsmasq(MakefilePackage): homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html" url = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.70.tar.gz" + license("GPL-2.0-or-later") + version("2.89", sha256="8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4") version("2.81", sha256="3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0") version("2.80", sha256="9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc") diff --git a/var/spack/repos/builtin/packages/dnstop/package.py b/var/spack/repos/builtin/packages/dnstop/package.py index b21e462fbb0207..088eb6aadf2db2 100644 --- a/var/spack/repos/builtin/packages/dnstop/package.py +++ b/var/spack/repos/builtin/packages/dnstop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dnstop(AutotoolsPackage): homepage = "https://github.com/measurement-factory/dnstop" git = "https://github.com/measurement-factory/dnstop.git" + license("BSD-3-Clause") + version("master", branch="master") depends_on("libpcap") diff --git a/var/spack/repos/builtin/packages/dnstracer/package.py b/var/spack/repos/builtin/packages/dnstracer/package.py index d87fc8c97aac17..c88435d527ff74 100644 --- a/var/spack/repos/builtin/packages/dnstracer/package.py +++ b/var/spack/repos/builtin/packages/dnstracer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dnstracer(MakefilePackage): homepage = "https://github.com/Orc/dnstracer" git = "https://github.com/Orc/dnstracer.git" + license("BSD-2-Clause") + version("master", branch="master") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index c5d4900ea5f88c..cc0c8027481e92 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class DocbookXml(Package): list_url = "https://www.oasis-open.org/docbook/xml/" list_depth = 1 + license("MIT") + version("4.5", sha256="4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4") version("4.4", sha256="02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090") version("4.3", sha256="23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464") diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py index a98f0d05dc0cfc..1775745e5b7d35 100644 --- a/var/spack/repos/builtin/packages/docbook-xsl/package.py +++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class DocbookXsl(Package): homepage = "https://github.com/docbook/xslt10-stylesheets" url = "https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F1.79.2/docbook-xsl-1.79.2.tar.bz2" + license("custom") + version("1.79.2", sha256="316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371") version( "1.78.1", diff --git a/var/spack/repos/builtin/packages/dock/package.py b/var/spack/repos/builtin/packages/dock/package.py index 3d69f99dc2281c..c97b3efe5eef1b 100644 --- a/var/spack/repos/builtin/packages/dock/package.py +++ b/var/spack/repos/builtin/packages/dock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dorado/cmake-htslib.patch b/var/spack/repos/builtin/packages/dorado/cmake-htslib.patch new file mode 100644 index 00000000000000..a918ee5a7826b2 --- /dev/null +++ b/var/spack/repos/builtin/packages/dorado/cmake-htslib.patch @@ -0,0 +1,111 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64d6091e..323412a4 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -316,10 +316,6 @@ target_link_libraries(dorado_lib + minimap2 + ) + +-if(NOT WIN32) +- add_dependencies(dorado_lib htslib_project) +-endif() +- + if(NOT DORADO_DISABLE_DORADO) + if(NOT WIN32) + # Set up RPATHs so we can find dependencies +diff --git a/cmake/Htslib.cmake b/cmake/Htslib.cmake +index caabc1a3..c72fe534 100644 +--- a/cmake/Htslib.cmake ++++ b/cmake/Htslib.cmake +@@ -1,68 +1,4 @@ +-if(NOT TARGET htslib) # lazy include guard +- if(WIN32) +- message(STATUS "Fetching htslib") +- download_and_extract(https://cdn.oxfordnanoportal.com/software/analysis/htslib-win.tar.gz htslib-win) +- set(HTSLIB_DIR ${DORADO_3RD_PARTY_DOWNLOAD}/htslib-win CACHE STRING +- "Path to htslib repo") +- add_library(htslib SHARED IMPORTED) +- set_target_properties(htslib PROPERTIES +- "IMPORTED_IMPLIB" ${HTSLIB_DIR}/hts-3.lib +- "IMPORTED_LOCATION" ${HTSLIB_DIR}/hts-3.dll +- "INTERFACE_INCLUDE_DIRECTORIES" ${HTSLIB_DIR}) +- target_link_directories(htslib INTERFACE ${HTSLIB_DIR}) +- else() +- message(STATUS "Setting up htslib build") +- set(HTSLIB_DIR ${DORADO_3RD_PARTY_SOURCE}/htslib CACHE STRING "Path to htslib repo") +- set(htslib_PREFIX ${CMAKE_BINARY_DIR}/3rdparty/htslib) ++include_directories(${HTSLIB_PREFIX}/include) + +- find_program(MAKE_COMMAND make REQUIRED) +- find_program(AUTOCONF_COMMAND autoconf REQUIRED) +- find_program(AUTOHEADER_COMMAND autoheader REQUIRED) +- execute_process(COMMAND bash -c "${AUTOCONF_COMMAND} -V | sed 's/.* //; q'" +- OUTPUT_VARIABLE AUTOCONF_VERS) +- if (AUTOCONF_VERS VERSION_GREATER_EQUAL 2.70 AND NOT CMAKE_GENERATOR STREQUAL "Xcode") +- set(AUTOCONF_COMMAND autoreconf --install) +- endif() +- +- # The Htslib build apparently requires BUILD_IN_SOURCE=1, which is a problem when +- # switching between build targets because htscodecs object files aren't regenerated. +- # To avoid this, copy the source tree to a build-specific directory and do the build there. +- set(HTSLIB_BUILD ${CMAKE_BINARY_DIR}/htslib_build) +- file(COPY ${HTSLIB_DIR} DESTINATION ${HTSLIB_BUILD}) +- +- if (CMAKE_SYSTEM_NAME STREQUAL "iOS") +- # We need cross-compilation mode for iOS builds. Otherwise we end up trying to link a MacOS library +- # into an iOS target. +- set(CONFIGURE_FLAGS --host=aarch64-apple-darwin "CFLAGS=-isysroot ${CMAKE_OSX_SYSROOT}" "CC=${CMAKE_C_COMPILER}" "LDFLAGS=-isysroot ${CMAKE_OSX_SYSROOT}") +- # By default the dylib install name will be some local path that won't work on the device. +- set(INSTALL_NAME ${CMAKE_INSTALL_NAME_TOOL} -id "@executable_path/Frameworks/libhts.3.dylib" ${htslib_PREFIX}/lib/libhts.3.dylib) +- endif() +- +- include(ExternalProject) +- ExternalProject_Add(htslib_project +- PREFIX ${HTSLIB_BUILD} +- SOURCE_DIR ${HTSLIB_BUILD}/htslib +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${AUTOHEADER_COMMAND} +- COMMAND ${AUTOCONF_COMMAND} +- COMMAND ./configure --disable-bz2 --disable-lzma --disable-libcurl --disable-s3 --disable-gcs ${CONFIGURE_FLAGS} +- BUILD_COMMAND ${MAKE_COMMAND} install prefix=${htslib_PREFIX} +- COMMAND ${INSTALL_NAME} +- INSTALL_COMMAND "" +- BUILD_BYPRODUCTS ${htslib_PREFIX}/lib/libhts.a +- LOG_CONFIGURE 0 +- LOG_BUILD 0 +- LOG_TEST 0 +- LOG_INSTALL 0 +- ) +- +- add_library(htslib STATIC IMPORTED) +- # Need to ensure this directory exists before we can add it to INTERFACE_INCLUDE_DIRECTORIES +- file(MAKE_DIRECTORY ${htslib_PREFIX}/include) +- set_target_properties(htslib +- PROPERTIES +- "IMPORTED_LOCATION" ${htslib_PREFIX}/lib/libhts.a +- "INTERFACE_INCLUDE_DIRECTORIES" ${htslib_PREFIX}/include) +- message(STATUS "Done Building htslib") +- endif() +-endif() ++add_library(htslib SHARED IMPORTED) ++set_target_properties(htslib PROPERTIES IMPORTED_LOCATION ${HTSLIB_PREFIX}/lib/libhts.so) +diff --git a/dorado/utils/CMakeLists.txt b/dorado/utils/CMakeLists.txt +index 9bbf7067..e78feabe 100644 +--- a/dorado/utils/CMakeLists.txt ++++ b/dorado/utils/CMakeLists.txt +@@ -117,13 +117,9 @@ if(APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") + target_link_libraries(dorado_utils PUBLIC ${IOKIT}) + endif() + +-if(NOT WIN32) +- add_dependencies(dorado_utils htslib_project) +-endif() +- + # GCC 8 ICEs trying to compile this file with ASAN+optimisations enabled, so knock down the optimisation to try and help it out. + if (ECM_ENABLE_SANITIZERS AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)) + set_source_files_properties(duplex_utils.cpp PROPERTIES COMPILE_OPTIONS "-O0") + endif() + +-enable_warnings_as_errors(dorado_utils) +\ No newline at end of file ++enable_warnings_as_errors(dorado_utils) diff --git a/var/spack/repos/builtin/packages/dorado/package.py b/var/spack/repos/builtin/packages/dorado/package.py new file mode 100644 index 00000000000000..70e3c49879bcb7 --- /dev/null +++ b/var/spack/repos/builtin/packages/dorado/package.py @@ -0,0 +1,42 @@ +# 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 Dorado(CMakePackage, CudaPackage): + """Dorado is a high-performance, easy-to-use, open source basecaller + for Oxford Nanopore reads.""" + + homepage = "https://github.com/nanoporetech/dorado" + git = "https://github.com/nanoporetech/dorado.git" + url = "https://github.com/nanoporetech/dorado/archive/refs/tags/v0.5.1.tar.gz" + + maintainers("snehring") + + version("0.5.1", commit="a7fb3e3d4afa7a11cb52422e7eecb1a2cdb7860f", submodules=True) + + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("git", type="build") + depends_on("curl", type="build") + depends_on("cuda") + depends_on("hdf5@1.17:+hl+cxx+szip") + depends_on("htslib@1.15.1") + depends_on("openssl") + depends_on("zstd") + depends_on("libdeflate") + depends_on("zlib-api") + + patch("cmake-htslib.patch") + + def setup_build_environment(self, env): + env.prepend_path("LD_LIBRARY_PATH", self.spec["libdeflate"].prefix.lib64) + env.prepend_path("LIBRARY_PATH", self.spec["libdeflate"].prefix.lib64) + + def cmake_args(self): + htslib_prefix = self.spec["htslib"].prefix + args = [f"-DHTSLIB_PREFIX={htslib_prefix}", f"-DDORADO_INSTALL_PATH={self.prefix}"] + return args diff --git a/var/spack/repos/builtin/packages/dorian3d-dlib/package.py b/var/spack/repos/builtin/packages/dorian3d-dlib/package.py index c4b6caaba7833c..74951a4a921e7e 100644 --- a/var/spack/repos/builtin/packages/dorian3d-dlib/package.py +++ b/var/spack/repos/builtin/packages/dorian3d-dlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dos2unix/package.py b/var/spack/repos/builtin/packages/dos2unix/package.py index 257b96a52b63ea..29465bff033dc0 100644 --- a/var/spack/repos/builtin/packages/dos2unix/package.py +++ b/var/spack/repos/builtin/packages/dos2unix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Dos2unix(MakefilePackage): maintainers("cessenat") + license("BSD-2-Clause") + version("7.4.4", sha256="28a841db0bd5827d645caba9d8015e3a71983dc6e398070b5287ee137ae4436e") version("7.4.2", sha256="6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01") version("7.3.4", sha256="8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5") diff --git a/var/spack/repos/builtin/packages/dosfstools/package.py b/var/spack/repos/builtin/packages/dosfstools/package.py index 938c2cc0cdcf91..6d89720b87d2f6 100644 --- a/var/spack/repos/builtin/packages/dosfstools/package.py +++ b/var/spack/repos/builtin/packages/dosfstools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dosfstools(AutotoolsPackage): homepage = "https://github.com/dosfstools/dosfstools" url = "https://github.com/dosfstools/dosfstools/archive/v4.1.tar.gz" + license("GPL-3.0-or-later") + version("4.1", sha256="8ff9c2dcc01551fe9de8888cb41eb1051fd58bdf1ab3a93d3d88916f0a4ffd1b") version("4.0", sha256="77975e289e695cb8c984a3c0a15a3bbf3af90be83c26983d43abcde9ec48eea5") diff --git a/var/spack/repos/builtin/packages/dotconf/package.py b/var/spack/repos/builtin/packages/dotconf/package.py index d0f048ee584878..43ddf559246700 100644 --- a/var/spack/repos/builtin/packages/dotconf/package.py +++ b/var/spack/repos/builtin/packages/dotconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dotconf(AutotoolsPackage): homepage = "https://github.com/williamh/dotconf" url = "https://github.com/williamh/dotconf/archive/v1.3.tar.gz" + license("LGPL-2.1-or-later") + version("1.3", sha256="7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py index 27e73d4445d514..b7b03738070943 100644 --- a/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py +++ b/var/spack/repos/builtin/packages/dotnet-core-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class DotnetCoreSdk(Package): homepage = "https://www.microsoft.com/net/" + license("MIT") + version( "6.0.2", url="https://download.visualstudio.microsoft.com/download/pr/e7acb87d-ab08-4620-9050-b3e80f688d36/e93bbadc19b12f81e3a6761719f28b47/dotnet-sdk-6.0.102-linux-x64.tar.gz", diff --git a/var/spack/repos/builtin/packages/double-batched-fft-library/package.py b/var/spack/repos/builtin/packages/double-batched-fft-library/package.py index 7f9154ca7b3d8a..2c9675363c96eb 100644 --- a/var/spack/repos/builtin/packages/double-batched-fft-library/package.py +++ b/var/spack/repos/builtin/packages/double-batched-fft-library/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class DoubleBatchedFftLibrary(CMakePackage): maintainers("uphoffc") + license("BSD-3-Clause") + version("main", branch="main") version("develop", branch="develop") version("0.4.0", sha256="f3518012b632c92c2a933d70a040d6b0eee2d631ab6b1881a192a8d1624f242d") diff --git a/var/spack/repos/builtin/packages/double-conversion/package.py b/var/spack/repos/builtin/packages/double-conversion/package.py index 54c39657365a55..ef644be4a7d1c6 100644 --- a/var/spack/repos/builtin/packages/double-conversion/package.py +++ b/var/spack/repos/builtin/packages/double-conversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class DoubleConversion(CMakePackage): homepage = "https://github.com/google/double-conversion" url = "https://github.com/google/double-conversion/archive/v2.0.1.zip" + license("BSD-3-Clause") + version("3.3.0", sha256="4080014235f90854ffade6d1c423940b314bbca273a338235f049da296e47183") version("3.2.1", sha256="55aa41b463346b1032585c04fe7d0adec9db56598d8d699841cdadeb3597e909") version("3.1.5", sha256="72c0e3925a1214095afc6f1c214faecbec20e8526cf6b8a541cf72195a11887f") diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index f0f10b5ecfff7a..e6c099cb57f821 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,10 @@ class Doxygen(CMakePackage): homepage = "https://www.doxygen.org" url = "https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_9_5.tar.gz" + license("GPL-2.0-or-later") + + 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") @@ -120,12 +124,3 @@ def patch(self): join_path("cmake", "FindIconv.cmake"), string=True, ) - - def cmake_args(self): - args = [ - # Doxygen's build system uses CMake's deprecated `FindPythonInterp`, - # which can get confused by other `python` executables in the PATH. - # See issue: https://github.com/spack/spack/issues/28215 - self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path) - ] - return args diff --git a/var/spack/repos/builtin/packages/dpcpp/package.py b/var/spack/repos/builtin/packages/dpcpp/package.py index 23b7b01e4b5e29..4fa5a00abb8ecd 100644 --- a/var/spack/repos/builtin/packages/dpcpp/package.py +++ b/var/spack/repos/builtin/packages/dpcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dpcpp(CMakePackage): homepage = "https://intel.github.io/llvm-docs/" git = "https://github.com/intel/llvm.git" + license("Apache-2.0") + version("develop", branch="sycl") version("2021.09", commit="bd68232bb96386bf7649345c0557ba520e73c02d") version("2021.12", commit="27f59d8906fcc8aece7ff6aa570ccdee52168c2d") diff --git a/var/spack/repos/builtin/packages/dpdk/package.py b/var/spack/repos/builtin/packages/dpdk/package.py index ceaef10135367f..590fe54ef49aaf 100644 --- a/var/spack/repos/builtin/packages/dpdk/package.py +++ b/var/spack/repos/builtin/packages/dpdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Dpdk(MakefilePackage, MesonPackage): maintainers("hyoklee") + license("BSD-3-Clause AND GPL-2.0-only") + version("main", branch="main") version("23.03", sha256="8a8fa67941b1e0d428937f9068f401457e4e4fd576031479450da065385b332c") version("22.11", sha256="ed8b2a2b153f0311ffa065d35af29a098367af44a22b3c33e191e1a74211f2e3") diff --git a/var/spack/repos/builtin/packages/dpmjet/package.py b/var/spack/repos/builtin/packages/dpmjet/package.py index e39328f5366176..9cb169cf393f1f 100644 --- a/var/spack/repos/builtin/packages/dpmjet/package.py +++ b/var/spack/repos/builtin/packages/dpmjet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Dpmjet(MakefilePackage): maintainers("wdconinc") + license("BSD-3-Clause") + version("19.3.5", sha256="5a546ca20f86abaecda1828eb5b577aee8a532dffb2c5e7244667d5f25777909") version("19.3.4", sha256="646f520aa67ef6355c45cde155a5dd55f7c9d661314358a7668f6ff472f5d5f9") version("19.3.3", sha256="4f449a36b48ff551beb4303d66bac18bebc52dbcac907f84ab7716c914ad6d8a") diff --git a/var/spack/repos/builtin/packages/draco/package.py b/var/spack/repos/builtin/packages/draco/package.py index dbe118e550f871..fd045639ab10e9 100644 --- a/var/spack/repos/builtin/packages/draco/package.py +++ b/var/spack/repos/builtin/packages/draco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Draco(CMakePackage): git = "https://github.com/lanl/Draco.git" maintainers("KineticTheory") + license("BSD-3-Clause-Open-MPI") + version("develop", branch="develop") version("7.14.1", sha256="b05c75f1b8ea1d4fac4900d897fb1c948b470826b174ed8b97b32c6da9f030bf") version("7.14.0", sha256="c8abf293d81c1b8020907557c20d8d2f2edf9ac7ae60a534eab052a8c3b7f99d") diff --git a/var/spack/repos/builtin/packages/dracut/package.py b/var/spack/repos/builtin/packages/dracut/package.py index 404022daaca794..b29f42426fc330 100644 --- a/var/spack/repos/builtin/packages/dracut/package.py +++ b/var/spack/repos/builtin/packages/dracut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Dracut(AutotoolsPackage): homepage = "https://github.com/dracutdevs/dracut" url = "https://github.com/dracutdevs/dracut/archive/050.tar.gz" + license("GPL-2.0-or-later") + version("050", sha256="f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333") depends_on("kmod") diff --git a/var/spack/repos/builtin/packages/dramsim2/package.py b/var/spack/repos/builtin/packages/dramsim2/package.py index 301a58569a4724..3a896ffcd68092 100644 --- a/var/spack/repos/builtin/packages/dramsim2/package.py +++ b/var/spack/repos/builtin/packages/dramsim2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dramsim3/package.py b/var/spack/repos/builtin/packages/dramsim3/package.py index f0c3947c7a2b8b..85668f3e9e76e3 100644 --- a/var/spack/repos/builtin/packages/dramsim3/package.py +++ b/var/spack/repos/builtin/packages/dramsim3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 62c98e6febd1a7..e7567908be2e63 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -43,6 +43,8 @@ class Dray(Package, CudaPackage): maintainers("cyrush") + license("BSD-3-Clause") + version("develop", branch="develop", submodules="True") version("0.1.8", sha256="ae78ca6a5a31f06f6400a4a1ff6fc1d75347c8b41027a80662179f5b877eee30") version("0.1.7", sha256="11ea794c1a24d7ed0d76bad7209d62bafc033ec40a2ea3a00e68fe598c6aa46d") diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py index 837bbfbcd9b500..7e2e204de73a8d 100644 --- a/var/spack/repos/builtin/packages/dri2proto/package.py +++ b/var/spack/repos/builtin/packages/dri2proto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Dri2proto(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/dri2proto/" xorg_mirror_path = "proto/dri2proto-2.8.tar.gz" + license("ICU") + version("2.8", sha256="7e65b031eaa6ebe23c75583d4abd993ded7add8009b4200a4db7aa10728b0f61") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py index 9685595ec56d8b..e50e43cff6be32 100644 --- a/var/spack/repos/builtin/packages/dri3proto/package.py +++ b/var/spack/repos/builtin/packages/dri3proto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/drill/package.py b/var/spack/repos/builtin/packages/drill/package.py index 3e268864f0f415..0759e0c0e43e77 100644 --- a/var/spack/repos/builtin/packages/drill/package.py +++ b/var/spack/repos/builtin/packages/drill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Drill(Package): homepage = "https://drill.apache.org/" url = "https://www-eu.apache.org/dist/drill/drill-1.17.0/apache-drill-1.17.0.tar.gz" + license("Apache-2.0") + version("1.17.0", sha256="a3d2d544bcc32b915fb53fced0f982670bd6fe2abd764423e566a5f6b54debf1") version("1.16.0", sha256="fd195d2b38f393459b37d8f13ac1f36cdbe38495eabb08252da38e3544e87839") version("1.15.0", sha256="188c1d0df28e50f0265f4bc3c5871b4e7abc9450a4e5a7dbe7f0b23146bec76b") diff --git a/var/spack/repos/builtin/packages/drishti/package.py b/var/spack/repos/builtin/packages/drishti/package.py index 7827f4421b5c8a..8ea7d53d3bb85d 100644 --- a/var/spack/repos/builtin/packages/drishti/package.py +++ b/var/spack/repos/builtin/packages/drishti/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Drishti(PythonPackage): maintainers("jeanbez", "sbyna") + license("BSD-3-Clause-LBNL") + version("master", branch="master") version("0.4", sha256="bbbb272b4f6f44ae762f6cba28a2c589e15608691c559af0cc2f552590335d7b") diff --git a/var/spack/repos/builtin/packages/dropwatch/package.py b/var/spack/repos/builtin/packages/dropwatch/package.py index 3ac932570de899..e003c5602d95b5 100644 --- a/var/spack/repos/builtin/packages/dropwatch/package.py +++ b/var/spack/repos/builtin/packages/dropwatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Dropwatch(AutotoolsPackage): homepage = "https://github.com/nhorman/dropwatch" url = "https://github.com/nhorman/dropwatch/archive/v1.5.3.tar.gz" + license("GPL-2.0") + version("1.5.4", sha256="8c43d0c15d0cb9ce179fa1fb0610611723689a6f551b23c70a7ddc1cf068e8d2") version("1.5.3", sha256="b748b66a816c1f94531446c0451da5461a4a31b0949244bb867d741c6ac0148b") diff --git a/var/spack/repos/builtin/packages/druid/package.py b/var/spack/repos/builtin/packages/druid/package.py index 3fb716884e4e75..4ab7d0a9bdf8c4 100644 --- a/var/spack/repos/builtin/packages/druid/package.py +++ b/var/spack/repos/builtin/packages/druid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Druid(MavenPackage): homepage = "https://github.com/alibaba/druid/" url = "https://github.com/alibaba/druid/archive/1.1.23.tar.gz" + license("Apache-2.0") + version("1.2.8", sha256="e7e3726ea6d16f98bcf027eaa8591078827d249830ff3b3ba6579d70735d0003") version("1.1.23", sha256="f29a0c5e60eb8a4d6fcfdf21bb4b6f54c1076a214f65190b8cdce2663cf84432") version("1.1.22", sha256="0bd64e518beca840cd2f79bbfa612f47defbb3366333a11cff937af4424f96ce") diff --git a/var/spack/repos/builtin/packages/ds/package.py b/var/spack/repos/builtin/packages/ds/package.py index 294f029c0bf216..6eceafce11a520 100644 --- a/var/spack/repos/builtin/packages/ds/package.py +++ b/var/spack/repos/builtin/packages/ds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dsdp/package.py b/var/spack/repos/builtin/packages/dsdp/package.py index a5193da74871ce..381dba628e7d04 100644 --- a/var/spack/repos/builtin/packages/dsdp/package.py +++ b/var/spack/repos/builtin/packages/dsdp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Dsdp(MakefilePackage): homepage = "https://www.mcs.anl.gov/hs/software/DSDP/" url = "https://www.mcs.anl.gov/hs/software/DSDP/DSDP5.8.tar.gz" + license("DSDP") + version("5.8", sha256="26aa624525a636de272c0b329e2dfd01a0d5b7827f1c1c76f393d71e37dead70") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/dsfmt/package.py b/var/spack/repos/builtin/packages/dsfmt/package.py index e3677306bb07db..5486455f9daedb 100644 --- a/var/spack/repos/builtin/packages/dsfmt/package.py +++ b/var/spack/repos/builtin/packages/dsfmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Dsfmt(MakefilePackage): # so we add it for them. patch("targets.patch") + license("BSD-3-Clause") + version("2.2.5", sha256="b7bc498cd140b4808963b1ff9f33b42a491870f54775c1060ecad0e02bcaffb4") version("2.2.4", sha256="39682961ecfba621a98dbb6610b6ae2b7d6add450d4f08d8d4edd0e10abd8174") diff --git a/var/spack/repos/builtin/packages/dsqss/package.py b/var/spack/repos/builtin/packages/dsqss/package.py index ae92627bca82de..72e5f5961f381c 100644 --- a/var/spack/repos/builtin/packages/dsqss/package.py +++ b/var/spack/repos/builtin/packages/dsqss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Dsqss(CMakePackage): homepage = "https://www.pasums.issp.u-tokyo.ac.jp/dsqss/en/" url = "https://github.com/issp-center-dev/dsqss/releases/download/v2.0.3/dsqss-v2.0.3.tar.gz" + license("GPL-3.0-or-later") + version("2.0.3", sha256="11255dd1f1317fb4ac2d6ae95535f027d627d03f5470717cd277dd9ab94496e0") variant("mpi", default=True, description="build mpi support") diff --git a/var/spack/repos/builtin/packages/dsrc/package.py b/var/spack/repos/builtin/packages/dsrc/package.py index e560765928b16f..4baa53b74bd552 100644 --- a/var/spack/repos/builtin/packages/dsrc/package.py +++ b/var/spack/repos/builtin/packages/dsrc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dssp/package.py b/var/spack/repos/builtin/packages/dssp/package.py index 86a2df10b71194..a5a20a4be59688 100644 --- a/var/spack/repos/builtin/packages/dssp/package.py +++ b/var/spack/repos/builtin/packages/dssp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Dssp(AutotoolsPackage): homepage = "https://github.com/cmbi/dssp" url = "https://github.com/cmbi/dssp/archive/3.1.4.tar.gz" + license("GPL-3.0-or-later") + version("3.1.4", sha256="496282b4b5defc55d111190ab9f1b615a9574a2f090e7cf5444521c747b272d4") version("2.3.0", sha256="4c95976d86dc64949cb0807fbd58c7bee5393df0001999405863dc90f05846c6") diff --git a/var/spack/repos/builtin/packages/dtc/package.py b/var/spack/repos/builtin/packages/dtc/package.py index 7d7f1939af7175..a775a98803f8c7 100644 --- a/var/spack/repos/builtin/packages/dtc/package.py +++ b/var/spack/repos/builtin/packages/dtc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Dtc(MakefilePackage): homepage = "https://github.com/dgibson/dtc" url = "https://github.com/dgibson/dtc/archive/refs/tags/v1.6.1.tar.gz" + license("GPL-2.0-or-later") + version("1.6.1", sha256="6401c9a0f577a270df4632bf0f3e5454ccc7a5ca3caefa67a3e1c29c9c6b8c60") depends_on("bison", type="build") diff --git a/var/spack/repos/builtin/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py index 6b9c32fa950f34..992b2bf646a4d0 100644 --- a/var/spack/repos/builtin/packages/dtcmp/package.py +++ b/var/spack/repos/builtin/packages/dtcmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/dtf/package.py b/var/spack/repos/builtin/packages/dtf/package.py index a9a749fb1c653e..97e057717b4f88 100644 --- a/var/spack/repos/builtin/packages/dtf/package.py +++ b/var/spack/repos/builtin/packages/dtf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/duckdb/package.py b/var/spack/repos/builtin/packages/duckdb/package.py index aae9bca08b7e01..7dabb8636bd584 100644 --- a/var/spack/repos/builtin/packages/duckdb/package.py +++ b/var/spack/repos/builtin/packages/duckdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Duckdb(CMakePackage): url = "https://github.com/duckdb/duckdb/archive/refs/tags/v0.8.1.tar.gz" git = "https://github.com/duckdb/duckdb.git" + license("MIT") + version("master", branch="master") version("0.8.1", sha256="a0674f7e320dc7ebcf51990d7fc1c0e7f7b2c335c08f5953702b5285e6c30694") version("0.7.1", sha256="67f840f861e5ffbe137d65a8543642d016f900b89dd035492d562ad11acf0e1e") diff --git a/var/spack/repos/builtin/packages/duperemove/package.py b/var/spack/repos/builtin/packages/duperemove/package.py index de3dcc711ced40..340abe8a47cc7c 100644 --- a/var/spack/repos/builtin/packages/duperemove/package.py +++ b/var/spack/repos/builtin/packages/duperemove/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Duperemove(MakefilePackage): homepage = "https://github.com/markfasheh/duperemove" url = "https://github.com/markfasheh/duperemove/archive/v0.11.1.tar.gz" + license("GPL-2.0-only") + version("0.11.1", sha256="75c3c91baf7e5195acad62eab73a7afc3d0b88cbfccefac3e3412eba06a42ac8") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/dust/package.py b/var/spack/repos/builtin/packages/dust/package.py index 0ee7234b8952dd..2d7437fb32bbf0 100644 --- a/var/spack/repos/builtin/packages/dust/package.py +++ b/var/spack/repos/builtin/packages/dust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Dust(Package): maintainers("fangohr") + license("Apache-2.0") + version("0.8.6", sha256="feede818e814011207c5bfeaf06dd9fc95825c59ab70942aa9b9314791c5d6b6") version("0.7.5", sha256="f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618") diff --git a/var/spack/repos/builtin/packages/dwz/package.py b/var/spack/repos/builtin/packages/dwz/package.py index cb1b1f5e2accc3..85afeedbb6e73c 100644 --- a/var/spack/repos/builtin/packages/dwz/package.py +++ b/var/spack/repos/builtin/packages/dwz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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") diff --git a/var/spack/repos/builtin/packages/dxt-explorer/package.py b/var/spack/repos/builtin/packages/dxt-explorer/package.py index 90ef64818346c4..88f4fdb536bfa7 100644 --- a/var/spack/repos/builtin/packages/dxt-explorer/package.py +++ b/var/spack/repos/builtin/packages/dxt-explorer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class DxtExplorer(PythonPackage): maintainers("jeanbez", "sbyna") + license("BSD-3-Clause-LBNL") + version("develop", branch="develop") version("0.3", sha256="fb73947b737c327154d03eeb0744c86774263878b893b365094ce4af8ac60b8b") diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 3055f090d53361..331f60d4a33676 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Dyninst(CMakePackage): tags = ["e4s"] + license("LGPL-2.1-or-later") + version("master", branch="master") version("12.3.0", sha256="956b0378d2badb765a7e677c0b66c0b8b8cacca7631222bfe7a27b369abf7dd4") version("12.2.1", sha256="c304af3c6191e92acd27350fd9b7b02899767a0e38abb3a08a378abe01d1ef01") diff --git a/var/spack/repos/builtin/packages/dysco/package.py b/var/spack/repos/builtin/packages/dysco/package.py index 07955427f87662..cd853afe2b63aa 100644 --- a/var/spack/repos/builtin/packages/dysco/package.py +++ b/var/spack/repos/builtin/packages/dysco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Dysco(CMakePackage): homepage = "https://github.com/aroffringa/dysco" url = "https://github.com/aroffringa/dysco/archive/v1.2.tar.gz" + license("GPL-3.0-only") + version("1.2", sha256="dd992c5a13df67173aa1d3f6dc5df9b51b0bea2fe77bc08f5be7a839be741269") depends_on("casacore") diff --git a/var/spack/repos/builtin/packages/e2fsprogs/package.py b/var/spack/repos/builtin/packages/e2fsprogs/package.py index b89221075fd0be..5560a5348df4af 100644 --- a/var/spack/repos/builtin/packages/e2fsprogs/package.py +++ b/var/spack/repos/builtin/packages/e2fsprogs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class E2fsprogs(AutotoolsPackage): homepage = "https://github.com/tytso/e2fsprogs" url = "https://github.com/tytso/e2fsprogs/archive/v1.45.6.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT") + version("1.45.6", sha256="d785164a2977cd88758cb0cac5c29add3fe491562a60040cfb193abcd0f9609b") version("1.45.5", sha256="0fd76e55c1196c1d97a2c01f2e84f463b8e99484541b43ff4197f5a695159fd3") diff --git a/var/spack/repos/builtin/packages/e3sm-kernels/package.py b/var/spack/repos/builtin/packages/e3sm-kernels/package.py index 0f1df42267b86b..8000d18ae71381 100644 --- a/var/spack/repos/builtin/packages/e3sm-kernels/package.py +++ b/var/spack/repos/builtin/packages/e3sm-kernels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/e3sm-scorpio/package.py b/var/spack/repos/builtin/packages/e3sm-scorpio/package.py index c9958c35bd1a5b..66c8600096aa42 100644 --- a/var/spack/repos/builtin/packages/e3sm-scorpio/package.py +++ b/var/spack/repos/builtin/packages/e3sm-scorpio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/e4s-cl/package.py b/var/spack/repos/builtin/packages/e4s-cl/package.py index 86f4b3a1a84b11..258471c0108f70 100644 --- a/var/spack/repos/builtin/packages/e4s-cl/package.py +++ b/var/spack/repos/builtin/packages/e4s-cl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class E4sCl(PythonPackage): patch("drop-docker.patch", when="@:1.0.1") + license("MIT") + version("master", branch="master") version("1.0.1", commit="b2c92993e0c7cb42de07f0f7cc02da3a06816192") version("1.0.0", commit="410bb2e6601d9b90243a487ad7f7d2dabd8ba04c") diff --git a/var/spack/repos/builtin/packages/ea-utils/package.py b/var/spack/repos/builtin/packages/ea-utils/package.py index afd6611dd20232..b57c30ecb1e39a 100644 --- a/var/spack/repos/builtin/packages/ea-utils/package.py +++ b/var/spack/repos/builtin/packages/ea-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/eagle/package.py b/var/spack/repos/builtin/packages/eagle/package.py index 3070c64439bf6d..3a68066d11b59c 100644 --- a/var/spack/repos/builtin/packages/eagle/package.py +++ b/var/spack/repos/builtin/packages/eagle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Eagle(MakefilePackage): url = "https://github.com/tony-kuo/eagle/archive/v1.1.2.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("1.1.3", sha256="bd510b8eef2de14898cbf417e1c7a30b97ddaba24e5e2834da7b02767362fe3c") version("1.1.2", sha256="afe967560d1f8fdbd0caf4b93b5f2a86830e9e4d399fee4a526140431343045e") diff --git a/var/spack/repos/builtin/packages/earlyoom/package.py b/var/spack/repos/builtin/packages/earlyoom/package.py index 7ff8aae0d905c5..09cc0d1fad6fae 100644 --- a/var/spack/repos/builtin/packages/earlyoom/package.py +++ b/var/spack/repos/builtin/packages/earlyoom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Earlyoom(MakefilePackage): homepage = "https://github.com/rfjakob/earlyoom" url = "https://github.com/rfjakob/earlyoom/archive/v1.6.1.tar.gz" + license("MIT") + version("1.6.1", sha256="bcd3fab4da5e1dddec952a0974c866ec90c5f9159c995f9162c45488c4d03340") version("1.6", sha256="b81804fc4470f996014d52252a87a1cf3b43d3d8754140035b10dcee349302b8") diff --git a/var/spack/repos/builtin/packages/easi/package.py b/var/spack/repos/builtin/packages/easi/package.py index a6d8b3ae32152a..ea5a113ed185cb 100644 --- a/var/spack/repos/builtin/packages/easi/package.py +++ b/var/spack/repos/builtin/packages/easi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,9 @@ class Easi(CMakePackage): homepage = "https://easyinit.readthedocs.io" git = "https://github.com/SeisSol/easi.git" - maintainers("ravil-mobile", "Thomas-Ulrich", "krenzland", "ThrudPrimrose") + maintainers("ravil-mobile", "Thomas-Ulrich", "krenzland", "ThrudPrimrose", "davschneller") + + license("BSD-3-Clause") version("develop", branch="master") version("1.2.0", tag="v1.2.0", commit="305a119338116a0ceac6b68b36841a50250d05b1") @@ -34,7 +36,7 @@ class Easi(CMakePackage): depends_on("impalajit@llvm-1.0.0", when="jit=impalajit-llvm") depends_on("lua@5.3.2", when="jit=lua") - depends_on("impalajit", when="jit=impalajit") + depends_on("impalajit@main", when="jit=impalajit") conflicts("jit=impalajit", when="jit=impalajit-llvm") conflicts("jit=impalajit-llvm", when="jit=impalajit") diff --git a/var/spack/repos/builtin/packages/easybuild/package.py b/var/spack/repos/builtin/packages/easybuild/package.py index d18864da8c8a1e..358b3f58df2c6d 100644 --- a/var/spack/repos/builtin/packages/easybuild/package.py +++ b/var/spack/repos/builtin/packages/easybuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Easybuild(PythonPackage): pypi = "easybuild/easybuild-4.0.0.tar.gz" maintainers("boegel") + license("GPL-2.0-or-later") + version("4.7.0", sha256="e68c280e3a508965aefbdf234872919f777f739cf4787cb11bb97a56e0cf74a6") version("4.0.0", sha256="21bcc1048525ad6219667cc97a7421b5388068c670cabba356712e474896de40") diff --git a/var/spack/repos/builtin/packages/easyloggingpp/package.py b/var/spack/repos/builtin/packages/easyloggingpp/package.py index e81089011d375d..c1fba765e8d3d7 100644 --- a/var/spack/repos/builtin/packages/easyloggingpp/package.py +++ b/var/spack/repos/builtin/packages/easyloggingpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ebms/package.py b/var/spack/repos/builtin/packages/ebms/package.py index 9ef56dbe3b4bc9..f92a83e3592a7e 100644 --- a/var/spack/repos/builtin/packages/ebms/package.py +++ b/var/spack/repos/builtin/packages/ebms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Ebms(MakefilePackage): homepage = "https://github.com/ANL-CESAR/EBMS" git = "https://github.com/ANL-CESAR/EBMS.git" + license("MIT") + version("develop") depends_on("mpi@2:") diff --git a/var/spack/repos/builtin/packages/ecbuild/package.py b/var/spack/repos/builtin/packages/ecbuild/package.py index 66664ea6e3f68d..d4882131a7a285 100644 --- a/var/spack/repos/builtin/packages/ecbuild/package.py +++ b/var/spack/repos/builtin/packages/ecbuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,9 @@ class Ecbuild(CMakePackage): homepage = "https://github.com/ecmwf/ecbuild" url = "https://github.com/ecmwf/ecbuild/archive/refs/tags/3.6.1.tar.gz" - maintainers("skosukhin", "climbfuji") + maintainers("skosukhin", "climbfuji", "victoria-cherkas", "dominichofer") + + license("Apache-2.0") version("3.7.2", sha256="7a2d192cef1e53dc5431a688b2e316251b017d25808190faed485903594a3fb9") version("3.6.5", sha256="98bff3d3c269f973f4bfbe29b4de834cd1d43f15b1c8d1941ee2bfe15e3d4f7f") diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index e985367c147c12..77c53cfc3f7a15 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -45,12 +45,15 @@ class Eccodes(CMakePackage): git = "https://github.com/ecmwf/eccodes.git" list_url = "https://confluence.ecmwf.int/display/ECC/Releases" - maintainers("skosukhin") + maintainers("skosukhin", "victoria-cherkas", "dominichofer", "climbfuji") + + license("Apache-2.0") version("develop", branch="develop") + version("2.33.0", sha256="bdcec8ce63654ec6803400c507f01220a9aa403a45fa6b5bdff7fdcc44fd7daf") + version("2.32.1", sha256="ad2ac1bf36577b1d35c4a771b4d174a06f522a1e5ef6c1f5e53a795fb624863e") version("2.32.0", sha256="b57e8eeb0eba0c05d66fda5527c4ffa84b5ab35c46bcbc9a2227142973ccb8e6") version("2.31.0", sha256="808ecd2c11fbf2c3f9fc7a36f8c2965b343f3151011b58a1d6e7cc2e6b3cac5d") - version("2.27.0", sha256="ede5b3ffd503967a5eac89100e8ead5e16a881b7585d02f033584ed0c4269c99") version("2.25.0", sha256="8975131aac54d406e5457706fd4e6ba46a8cc9c7dd817a41f2aa64ce1193c04e") version("2.24.2", sha256="c60ad0fd89e11918ace0d84c01489f21222b11d6cad3ff7495856a0add610403") version("2.23.0", sha256="cbdc8532537e9682f1a93ddb03440416b66906a4cc25dec3cbd73940d194bf0c") @@ -347,9 +350,6 @@ def cmake_args(self): # Prevent overriding by environment variables AEC_DIR and AEC_PATH: args.append(self.define("AEC_DIR", self.spec["libaec"].prefix)) - if "+memfs" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", python.path)) - return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/ecdsautils/package.py b/var/spack/repos/builtin/packages/ecdsautils/package.py index b87339323e958d..2c9602eb7353a1 100644 --- a/var/spack/repos/builtin/packages/ecdsautils/package.py +++ b/var/spack/repos/builtin/packages/ecdsautils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ecflow/package.py b/var/spack/repos/builtin/packages/ecflow/package.py index 7fa77e386a0e2d..ea447d5f482747 100644 --- a/var/spack/repos/builtin/packages/ecflow/package.py +++ b/var/spack/repos/builtin/packages/ecflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -91,7 +91,6 @@ def cmake_args(self): self.define_from_variant("ENABLE_SSL", "ssl"), # https://jira.ecmwf.int/browse/SUP-2641#comment-208943 self.define_from_variant("ENABLE_STATIC_BOOST_LIBS", "static_boost"), - self.define("Python3_EXECUTABLE", spec["python"].package.command), self.define("BOOST_ROOT", spec["boost"].prefix), self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), ] diff --git a/var/spack/repos/builtin/packages/eckit/package.py b/var/spack/repos/builtin/packages/eckit/package.py index b20c3b0e6e2967..2c5ca7326786d7 100644 --- a/var/spack/repos/builtin/packages/eckit/package.py +++ b/var/spack/repos/builtin/packages/eckit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,9 @@ class Eckit(CMakePackage): git = "https://github.com/ecmwf/eckit.git" url = "https://github.com/ecmwf/eckit/archive/refs/tags/1.16.0.tar.gz" - maintainers("skosukhin", "climbfuji") + maintainers("skosukhin", "climbfuji", "victoria-cherkas", "dominichofer") + + license("Apache-2.0") version("1.24.5", sha256="2fd74e04c20a59f9e13635828d9da880e18f8a2cb7fd3bfd0201e07071d6ec41") version("1.24.4", sha256="b6129eb4f7b8532aa6905033e4cf7d09aadc8547c225780fea3db196e34e4671") diff --git a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py index 5b96953f95473f..d8d0b438585822 100644 --- a/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py +++ b/var/spack/repos/builtin/packages/eclipse-gcj-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ecmwf-atlas/package.py b/var/spack/repos/builtin/packages/ecmwf-atlas/package.py index 3bac653899b5fc..78859abf9fd416 100644 --- a/var/spack/repos/builtin/packages/ecmwf-atlas/package.py +++ b/var/spack/repos/builtin/packages/ecmwf-atlas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,8 +18,11 @@ class EcmwfAtlas(CMakePackage): maintainers("climbfuji", "srherbener") + license("Apache-2.0") + version("master", branch="master") version("develop", branch="develop") + version("0.36.0", sha256="39bf748aa7b22df80b9791fbb6b4351ed9a9f85587b58fc3225314278a2a68f8") version("0.35.1", sha256="7a344aaa8a1378d989a7bb883eb741852c5fa494630be6d8c88e477e4b9c5be1") version("0.35.0", sha256="5a4f898ffb4a33c738b6f86e4e2a4c8e26dfd56d3c3399018081487374e29e97") version("0.34.0", sha256="48536742cec0bc268695240843ac0e232e2b5142d06b19365688d9ea44dbd9ba") @@ -70,7 +73,6 @@ def cmake_args(self): self.define_from_variant("ENABLE_FCKIT", "fckit"), self.define_from_variant("ENABLE_EIGEN", "eigen"), self.define_from_variant("ENABLE_FFTW", "fftw"), - "-DPYTHON_EXECUTABLE:FILEPATH=" + self.spec["python"].command.path, ] if self.spec.satisfies("@0.31:0.34"): args.append(self.define_from_variant("ENABLE_TRANS", "trans")) @@ -83,8 +85,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: diff --git a/var/spack/repos/builtin/packages/ecos/package.py b/var/spack/repos/builtin/packages/ecos/package.py index 65203114272c9d..b393e2636cccd4 100644 --- a/var/spack/repos/builtin/packages/ecos/package.py +++ b/var/spack/repos/builtin/packages/ecos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ecos(MakefilePackage): homepage = "https://github.com/embotech/ecos" url = "https://github.com/embotech/ecos/archive/2.0.7.tar.gz" + license("GPL-3.0-only") + version("2.0.7", sha256="bdb6a84f7d150820459bd0a796cb64ffbb019afb95dc456d22acc2dafb2e70e0") build_targets = ["all", "shared"] diff --git a/var/spack/repos/builtin/packages/ecoslim/package.py b/var/spack/repos/builtin/packages/ecoslim/package.py index 8a99faf3201df2..61b2fcdfec9b4f 100644 --- a/var/spack/repos/builtin/packages/ecoslim/package.py +++ b/var/spack/repos/builtin/packages/ecoslim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Ecoslim(CMakePackage): maintainers("reedmaxwell", "lecondon", "smithsg84") + license("LGPL-3.0-or-later") + version("1.3", sha256="b532e570b4767e4fa84123d8773732150679e8e3d7fecd5c6e99fb1d4dc57b84") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index f23a736569f24a..d33cd410b00861 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py index 1427e7a72f9f2f..b2f124e68ee14d 100644 --- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py +++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ectrans/package.py b/var/spack/repos/builtin/packages/ectrans/package.py index 900aaaf1d1a498..8b94a62e1e3750 100644 --- a/var/spack/repos/builtin/packages/ectrans/package.py +++ b/var/spack/repos/builtin/packages/ectrans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ectrans(CMakePackage): maintainers("climbfuji") + license("Apache-2.0") + version("develop", branch="develop", no_cache=True) version("main", branch="main", no_cache=True) version("1.2.0", sha256="2ee6dccc8bbfcc23faada1d957d141f24e41bb077c1821a7bc2b812148dd336c") diff --git a/var/spack/repos/builtin/packages/ed/package.py b/var/spack/repos/builtin/packages/ed/package.py index 993436c179b914..df2c77d0ab396a 100644 --- a/var/spack/repos/builtin/packages/ed/package.py +++ b/var/spack/repos/builtin/packages/ed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ed(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/ed" gnu_mirror_path = "ed/ed-1.4.tar.gz" + license("GPL-2.0-or-later") + version("1.4", sha256="db36da85ee1a9d8bafb4b041bd4c8c11becba0c43ec446353b67045de1634fda") parallel = False diff --git a/var/spack/repos/builtin/packages/editline/package.py b/var/spack/repos/builtin/packages/editline/package.py index cdc959a8c4fd7c..4d6f8024f6b512 100644 --- a/var/spack/repos/builtin/packages/editline/package.py +++ b/var/spack/repos/builtin/packages/editline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Editline(AutotoolsPackage): homepage = "https://troglobit.com/editline.html" url = "https://github.com/troglobit/editline/archive/1.16.0.tar.gz" + license("Spencer-94") + version("1.17.1", sha256="d65c5739c8ca388fa71feabc5aae506d052e1a6d288ee4e7fcab7efb07a3be74") version("1.16.0", sha256="33421a1569d025f332a87054bfea28e2c757bdb573f1437bc22c34b798b6383c") diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py index 8bc6519a6129c0..16053f9e3bfdee 100644 --- a/var/spack/repos/builtin/packages/editres/package.py +++ b/var/spack/repos/builtin/packages/editres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index b8d4238ce70522..edf245bce8cfd4 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,11 @@ class Edm4hep(CMakePackage): tags = ["hep", "key4hep"] - version("master", branch="master") + license("Apache-2.0") + + version("main", branch="main") + version("0.10.3", sha256="0ba5e4e90376f750f9531831909160e3d7b9c2d1f020d7556f0d3977b7eaafcc") + version("0.10.2", sha256="c22c5c2f0fd1d09da9b734c1fa7ee546675fd2b047406db6ab8266e7657486d2") version("0.10.1", sha256="28a3bd4df899309b14ec0d441f8b6ed0065206a08a0018113bb490e9d008caed") version("0.10", sha256="a95c917c19793cfad6b0959854a653c5ce698c965598cabd649d544da07712c0") version( @@ -99,6 +103,7 @@ class Edm4hep(CMakePackage): ) depends_on("cmake@3.3:", type="build") + depends_on("cmake@3.23:", type="build", when="@0.10.3:") depends_on("python", type="build") depends_on("root@6.08:") diff --git a/var/spack/repos/builtin/packages/eem/package.py b/var/spack/repos/builtin/packages/eem/package.py index f2424548c2974f..4b41e8cefd845d 100644 --- a/var/spack/repos/builtin/packages/eem/package.py +++ b/var/spack/repos/builtin/packages/eem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/efivar/package.py b/var/spack/repos/builtin/packages/efivar/package.py index b2a69bf384003c..1ef249380af2a2 100644 --- a/var/spack/repos/builtin/packages/efivar/package.py +++ b/var/spack/repos/builtin/packages/efivar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Efivar(MakefilePackage): homepage = "https://github.com/rhboot/efivar" url = "https://github.com/rhboot/efivar/archive/37.tar.gz" + license("LGPL-2.1-only") + version("37", sha256="74c52b4f479120fb6639e753e71163ba3f557a7a67c0be225593f9f05b253f36") version("36", sha256="24ed0cafbaf6d913e8f60e5da3cbbac1a1578e16cf5c95b21f2eb6753c13173f") version("35", sha256="747bc4d97b4bd74979e5356c44a172534a8a07184f130349fd201742e683d292") diff --git a/var/spack/repos/builtin/packages/egl/package.py b/var/spack/repos/builtin/packages/egl/package.py new file mode 100644 index 00000000000000..c0ef7824250b0b --- /dev/null +++ b/var/spack/repos/builtin/packages/egl/package.py @@ -0,0 +1,92 @@ +# 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 re +import sys + +from spack.package import * + + +class Egl(BundlePackage): + """Placeholder for external EGL(OpenGL) libraries from hardware vendors""" + + homepage = "https://www.khronos.org/egl" + maintainers("biddisco") + + version("1.5") + + # This should really be when='platform=linux' but can't because of a + # current bug in when and how ArchSpecs are constructed + if sys.platform.startswith("linux"): + provides("gl@4.5") + + # conflict with GLX + conflicts("glx") + + # not always available, but sometimes + executables = ["^eglinfo$"] + + @classmethod + def determine_version(cls, exe): + if exe: + output = Executable(exe)(output=str, error=str) + match = re.search(r"EGL version string: (\S+)", output) + return match.group(1) if match else None + else: + return None + + # Override the fetcher method to throw a useful error message; + # fixes GitHub issue (#7061) in which this package threw a + # generic, uninformative error during the `fetch` step, + @property + def fetcher(self): + msg = """This package is intended to be a placeholder for + system-provided EGL(OpenGL) libraries from hardware vendors. Please + download and install EGL drivers/libraries for your graphics + hardware separately, and then set that up as an external package. + An example of a working packages.yaml: + + packages: + egl: + buildable: False + externals: + - spec: egl@1.5.0 + prefix: /usr/ + + In that case, /usr/ should contain these two folders: + + include/EGL/ (egl headers, including "egl.h") + lib (egl libraries, including "libEGL.so") + + """ + raise InstallError(msg) + + @fetcher.setter # Since fetcher is read-write, must override both + def fetcher(self): + _ = self.fetcher + + @property + def headers(self): + return self.egl_headers + + @property + def libs(self): + return self.egl_libs + + @property + def egl_headers(self): + header_name = "GL/gl" + gl_header = find_headers(header_name, root=self.prefix, recursive=True) + header_name = "EGL/egl" + egl_header = find_headers(header_name, root=self.prefix, recursive=True) + return gl_header + egl_header + + @property + def egl_libs(self): + lib_name = "libGL" + gl_lib = find_libraries(lib_name, root=self.prefix, recursive=True) + lib_name = "libEGL" + egl_lib = find_libraries(lib_name, root=self.prefix, recursive=True) + return gl_lib + egl_lib diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py index 889ca904f259bf..6301084fa3506b 100644 --- a/var/spack/repos/builtin/packages/eigen/package.py +++ b/var/spack/repos/builtin/packages/eigen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Eigen(CMakePackage): url = "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz" maintainers("HaoZeke") + license("MPL-2.0") + version("3.4.0", sha256="8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72") version("3.3.9", sha256="7985975b787340124786f092b3a07d594b2e9cd53bbfe5f3d9b1daee7d55f56f") version("3.3.8", sha256="146a480b8ed1fb6ac7cd33fec9eb5e8f8f62c3683b3f850094d9d5c35a92419a") diff --git a/var/spack/repos/builtin/packages/eigenexa/package.py b/var/spack/repos/builtin/packages/eigenexa/package.py index 3d994bbbcdb98b..7678f2138bcdf6 100644 --- a/var/spack/repos/builtin/packages/eigenexa/package.py +++ b/var/spack/repos/builtin/packages/eigenexa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/elasticsearch/package.py b/var/spack/repos/builtin/packages/elasticsearch/package.py index 59890a4f6e2953..b17ec0668613b4 100644 --- a/var/spack/repos/builtin/packages/elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/elasticsearch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/elbencho/package.py b/var/spack/repos/builtin/packages/elbencho/package.py index a9417a4dfc135a..bcc0b6fc5377f9 100644 --- a/var/spack/repos/builtin/packages/elbencho/package.py +++ b/var/spack/repos/builtin/packages/elbencho/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,9 +16,15 @@ 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") + license("GPL-3.0-only") + + 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") diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index 8a118dc7c51672..49306457d6a81a 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Elemental(CMakePackage): url = "https://github.com/elemental/Elemental/archive/v0.87.7.tar.gz" git = "https://github.com/elemental/Elemental.git" + license("Apache-2.0") + version("develop", branch="master") version("0.87.7", sha256="7becfdbc223e9c72e65ae876d842c48d2037d13f83e9f41cea285e21b840d7d9") version("0.87.6", sha256="b597987c99ddd3462e0619524c5b7f711177ae8ae541b1b961e11d96e15afc64") diff --git a/var/spack/repos/builtin/packages/elfio/package.py b/var/spack/repos/builtin/packages/elfio/package.py index 5c0ed829449f87..9205da948129b7 100644 --- a/var/spack/repos/builtin/packages/elfio/package.py +++ b/var/spack/repos/builtin/packages/elfio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Elfio(CMakePackage): maintainers("haampie") + license("MIT") + version("3.11", sha256="3307b104c205399786edbba203906de9517e36297709fe747faf9478d55fbb91") version("3.10", sha256="cdc6362ede2e0c8d1d6db15d7da4b526f461d9cfae6f6337369e416a8bc60234") version("3.9", sha256="767b269063fc35aba6d361139f830aa91c45dc6b77942f082666876c1aa0be0f") diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py index 15f0b11130e7bf..7ebea92c432a71 100644 --- a/var/spack/repos/builtin/packages/elfutils/package.py +++ b/var/spack/repos/builtin/packages/elfutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,9 @@ class Elfutils(AutotoolsPackage, SourcewarePackage): maintainers("mwkrentel") + license("GPL-3.0-or-later AND ( GPL-2.0-or-later OR LGPL-3.0-or-later )") + + version("0.190", sha256="8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692") version("0.189", sha256="39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8") version("0.188", sha256="fb8b0e8d0802005b9a309c60c1d8de32dd2951b56f0c3a3cb56d21ce01595dff") version("0.187", sha256="e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8") diff --git a/var/spack/repos/builtin/packages/elk/package.py b/var/spack/repos/builtin/packages/elk/package.py index 920c821e676c07..96dda40d5ee5ad 100644 --- a/var/spack/repos/builtin/packages/elk/package.py +++ b/var/spack/repos/builtin/packages/elk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Elk(MakefilePackage): homepage = "https://elk.sourceforge.io/" url = "https://sourceforge.net/projects/elk/files/elk-3.3.17.tgz" + license("LGPL-3.0-or-later") + version("8.3.22", sha256="1c31f09b7c09d6b24e775d4f0d5e1e8871f95a7656ee4ca21ac17dbe7ea16277") version("7.2.42", sha256="73f03776dbf9b2147bfcc5b7c062af5befa0944608f6fc4b6a1e590615400fc6") version("7.1.14", sha256="7c2ff30f4b1d72d5dc116de9d70761f2c206700c69d85dd82a17a5a6374453d2") @@ -68,7 +70,12 @@ class Elk(MakefilePackage): depends_on("lapack", when="linalg=generic") depends_on("mkl", when="linalg=mkl") - depends_on("mkl threads=openmp", when="linalg=mkl +openmp") + with when("linalg=mkl +openmp"): + depends_on("intel-mkl threads=openmp", when="^[virtuals=mkl] intel-mkl") + depends_on("intel-oneapi-mkl threads=openmp", when="^[virtuals=mkl] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio threads=openmp", when="^[virtuals=mkl] intel-parallel-studio" + ) depends_on("openblas", when="linalg=openblas") depends_on("openblas threads=openmp", when="linalg=openblas +openmp") diff --git a/var/spack/repos/builtin/packages/elmerfem/package.py b/var/spack/repos/builtin/packages/elmerfem/package.py index fda948b73c0ccf..3d8863054a56ba 100644 --- a/var/spack/repos/builtin/packages/elmerfem/package.py +++ b/var/spack/repos/builtin/packages/elmerfem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/elpa/fujitsu.patch b/var/spack/repos/builtin/packages/elpa/fujitsu.patch new file mode 100644 index 00000000000000..d3600cf6bc5f5b --- /dev/null +++ b/var/spack/repos/builtin/packages/elpa/fujitsu.patch @@ -0,0 +1,65 @@ +From 8bda2149e4398bb6e6b66e601151966c91f9ec78 Mon Sep 17 00:00:00 2001 +From: m-shunji +Date: Wed, 13 Sep 2023 17:58:26 +0900 +Subject: [PATCH] Fix compile error in disabling openmp + +--- + src/elpa_impl_math_template.F90 | 6 +++--- + test/Fortran/test_autotune.F90 | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/elpa_impl_math_template.F90 b/src/elpa_impl_math_template.F90 +index f87a0ad..b41c0c3 100644 +--- a/src/elpa_impl_math_template.F90 ++++ b/src/elpa_impl_math_template.F90 +@@ -888,10 +888,10 @@ + #endif + #ifdef COMPLEXCASE + #ifdef DOUBLE_PRECISION_COMPLEX +- & !bind(C, name="elpa_solve_tridiagonal_dc") ++ bind(C, name="elpa_solve_tridiagonal_dc") + #endif + #ifdef SINGLE_PRECISION_COMPLEX +- & !bind(C, name="elpa_solve_tridiagonal_fc") ++ bind(C, name="elpa_solve_tridiagonal_fc") + #endif + #endif + +@@ -913,4 +913,4 @@ + &ELPA_IMPL_SUFFIX& + & (self, d, e, q, error) + end subroutine +- +\ No newline at end of file ++ +diff --git a/test/Fortran/test_autotune.F90 b/test/Fortran/test_autotune.F90 +index 4662564..5355ab3 100644 +--- a/test/Fortran/test_autotune.F90 ++++ b/test/Fortran/test_autotune.F90 +@@ -312,8 +312,8 @@ program test + status = check_correctness_analytic(na, nev, ev, z, nblk, myid, np_rows, np_cols, my_prow, my_pcol, & + .true., .true., print_times=.false.) + a(:,:) = as(:,:) +- call e%autotune_print_state(tune_state) +- call e%autotune_save_state(tune_state, "saved_state_"//trim(iter_string)//".txt") ++ call e%autotune_print_state(tune_state, error_elpa) ++ call e%autotune_save_state(tune_state, "saved_state_"//trim(iter_string)//".txt", error_elpa) + end do + + !! set and print the autotuned-settings +-- +1.8.3.1 +diff --git a/manual_cpp b/manual_cpp +index 6f74a79..dbdfc65 100755 +--- a/manual_cpp ++++ b/manual_cpp +@@ -46,7 +46,7 @@ elif len(files) == 0: + elif len(files) == 1: + file, = files + +-tmp_filename = "manually_preprocessed_" + file.replace("/", "_") ++tmp_filename = "manually_preprocessed_" + file.replace("/", "_").replace("-", "_") + + try: + output = args.index("-o") + diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 30061eb9eff857..8e0ac1e70f3f1c 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/2015.11.001/elpa-2015.11.001.tar.gz" git = "https://gitlab.mpcdf.mpg.de/elpa/elpa.git" + license("LGPL-3.0-only") + version("master", branch="master") version( @@ -47,6 +49,8 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): variant("openmp", default=True, description="Activates OpenMP support") variant("mpi", default=True, description="Activates MPI support") + patch("fujitsu.patch", when="%fj") + depends_on("autoconf", type="build", when="@master") depends_on("automake", type="build", when="@master") @@ -123,7 +127,7 @@ def configure_args(self): if spec.target.family != "x86_64": options.append("--disable-sse-assembly") - if "%aocc" in spec: + if "%aocc" in spec or "%fj" in spec: options.append("--disable-shared") options.append("--enable-static") @@ -132,20 +136,17 @@ def configure_args(self): options.append("--enable-generic") if self.compiler.name == "gcc": - gcc_options = [] - gfortran_options = ["-ffree-line-length-none"] - - space_separator = " " - options.extend( - [ - "CFLAGS=" + space_separator.join(gcc_options), - "FCFLAGS=" + space_separator.join(gfortran_options), - ] - ) + options.extend(["CFLAGS=-O3", "FCFLAGS=-O3 -ffree-line-length-none"]) if "%aocc" in spec: options.extend(["FCFLAGS=-O3", "CFLAGS=-O3"]) + if "%fj" in spec: + options.append("--disable-Fortran2008-features") + options.append("--enable-FUGAKU") + if "+openmp" in spec: + options.extend(["FCFLAGS=-Kparallel"]) + cuda_flag = "nvidia-gpu" if "+cuda" in spec: prefix = spec["cuda"].prefix diff --git a/var/spack/repos/builtin/packages/elsd/package.py b/var/spack/repos/builtin/packages/elsd/package.py index 05eec4a14cbca3..1e2c68116d9f72 100644 --- a/var/spack/repos/builtin/packages/elsd/package.py +++ b/var/spack/repos/builtin/packages/elsd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Elsd(MakefilePackage): homepage = "http://ubee.enseeiht.fr/vision/ELSD/" git = "https://github.com/viorik/ELSD.git" + license("AGPL-3.0-only") + version("master", branch="master") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/elsdc/package.py b/var/spack/repos/builtin/packages/elsdc/package.py index a226f612806194..2edb0fddf65076 100644 --- a/var/spack/repos/builtin/packages/elsdc/package.py +++ b/var/spack/repos/builtin/packages/elsdc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Elsdc(MakefilePackage): homepage = "http://ubee.enseeiht.fr/vision/ELSD/" git = "https://github.com/viorik/ELSDc.git" + license("AGPL-3.0-only") + version("master", branch="master") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/elsi/package.py b/var/spack/repos/builtin/packages/elsi/package.py index cf46a570900938..23fa1fc40f7bd1 100644 --- a/var/spack/repos/builtin/packages/elsi/package.py +++ b/var/spack/repos/builtin/packages/elsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Elsi(CMakePackage): homepage = "https://wordpress.elsi-interchange.org/" url = "https://wordpress.elsi-interchange.org/wp-content/uploads/2019/03/elsi-2.2.1.tar.gz" + license("BSD-3-Clause") + version("2.2.1", sha256="5b4b2e8fa4b3b68131fe02cc1803a884039b89a1b1138af474af66453bec0b4d") # Variants (translation of cmake options) diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 8bf6ee8c476f96..765bd6a7040f9a 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,10 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): maintainers("alecbcs") + license("GPL-3.0-or-later") + version("master", branch="master") + version("29.2", sha256="ac8773eb17d8b3c0c4a3bccbb478f7c359266b458563f9a5e2c23c53c05e4e59") version("29.1", sha256="5b80e0475b0e619d2ad395ef5bc481b7cb9f13894ed23c301210572040e4b5b1") version("28.2", sha256="a6912b14ef4abb1edab7f88191bfd61c3edd7085e084de960a4f86485cb7cad8") version("28.1", sha256="1439bf7f24e5769f35601dbf332e74dfc07634da6b1e9500af67188a92340a28") diff --git a/var/spack/repos/builtin/packages/ember/package.py b/var/spack/repos/builtin/packages/ember/package.py index 6c386a263f7b5a..3f3bf23dcfd18f 100644 --- a/var/spack/repos/builtin/packages/ember/package.py +++ b/var/spack/repos/builtin/packages/ember/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Ember(MakefilePackage): git = "https://github.com/sstsimulator/ember.git" url = "https://github.com/sstsimulator/ember/archive/v1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.0.0", sha256="5b2a6b8055b46ab3ea2c7baabaf4d280d837bb7c21eba0c9f59e092c6fc1c4a6") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/emblmygff3/package.py b/var/spack/repos/builtin/packages/emblmygff3/package.py index 7803efca76f07d..8be1befdf07866 100644 --- a/var/spack/repos/builtin/packages/emblmygff3/package.py +++ b/var/spack/repos/builtin/packages/emblmygff3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Emblmygff3(PythonPackage): maintainers("snehring") + license("GPL-3.0-or-later") + version("2.2", sha256="225b2b50da9064f779e164b2859506d7540d11fa78f7d41b5c0d94f02f7845c5") version("2.1", sha256="64aef403bc64088eca504b69acffb3fb16ec4448cd3d6c9692b7baf276b92fd2") diff --git a/var/spack/repos/builtin/packages/emboss/package.py b/var/spack/repos/builtin/packages/emboss/package.py index a77b972a5022d8..387e4f34646c67 100644 --- a/var/spack/repos/builtin/packages/emboss/package.py +++ b/var/spack/repos/builtin/packages/emboss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Emboss(AutotoolsPackage): homepage = "http://emboss.sourceforge.net/" url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz" + license("GPL-2.0-only") + version("6.6.0", sha256="7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e") depends_on("libxpm") diff --git a/var/spack/repos/builtin/packages/embree/package.py b/var/spack/repos/builtin/packages/embree/package.py index 6a6e91115eb4f3..3b54a7c6924b78 100644 --- a/var/spack/repos/builtin/packages/embree/package.py +++ b/var/spack/repos/builtin/packages/embree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Embree(CMakePackage): url = "https://github.com/embree/embree/archive/v3.7.0.tar.gz" maintainers("aumuell") + license("Apache-2.0") + version("4.3.0", sha256="baf0a57a45837fc055ba828a139467bce0bc0c6a9a5f2dccb05163d012c12308") version("4.2.0", sha256="b0479ce688045d17aa63ce6223c84b1cdb5edbf00d7eda71c06b7e64e21f53a0") version("4.1.0", sha256="117efd87d6dddbf7b164edd94b0bc057da69d6422a25366283cded57ed94738b") @@ -57,7 +59,6 @@ def cmake_args(self): "-DEMBREE_TUTORIALS=OFF", "-DEMBREE_IGNORE_CMAKE_CXX_FLAGS=ON", self.define_from_variant("EMBREE_ISPC_SUPPORT", "ispc"), - self.define("EMBREE_TBB_ROOT", spec["tbb"].prefix), ] if spec.satisfies("target=x86_64:") or spec.satisfies("target=x86:"): diff --git a/var/spack/repos/builtin/packages/enca/package.py b/var/spack/repos/builtin/packages/enca/package.py index 82e7dc15de3fc6..8d3d67ca8e69d9 100644 --- a/var/spack/repos/builtin/packages/enca/package.py +++ b/var/spack/repos/builtin/packages/enca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Enca(AutotoolsPackage): homepage = "https://cihar.com/software/enca/" url = "https://github.com/nijel/enca/archive/1.19.tar.gz" + license("GPL-2.0-only") + version("1.19", sha256="c4fd9a3d7c086803138842b18eed6072ec8810859b0e1ef091f1e1138d283f25") version("1.18", sha256="b87c8d1bffc7d06ba74f82ae86eb21a921e94629203b2a971c966064c7eadab2") version("1.17", sha256="b20372440c500e6463bd61dab0e68131cdfe857c6b7ca139b5c6cbf01e24fdc7") diff --git a/var/spack/repos/builtin/packages/enchant/package.py b/var/spack/repos/builtin/packages/enchant/package.py index 2d323d279fb129..b32545e730bd1e 100644 --- a/var/spack/repos/builtin/packages/enchant/package.py +++ b/var/spack/repos/builtin/packages/enchant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Enchant(AutotoolsPackage): homepage = "https://abiword.github.io/enchant/" url = "https://github.com/AbiWord/enchant/releases/download/v2.2.5/enchant-2.2.5.tar.gz" + license("LGPL-2.1-or-later") + version("2.2.7", sha256="1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09") version("2.2.6", sha256="8048c5bd26190b21279745cfecd05808c635bc14912e630340cd44a49b87d46d") version("2.2.5", sha256="ffce4ea00dbda1478d91c3e1538cadfe5761d9d6c0ceb27bc3dba51882fe1c47") diff --git a/var/spack/repos/builtin/packages/energyplus/package.py b/var/spack/repos/builtin/packages/energyplus/package.py index d46b56a7df826d..c0c1774edc0f2b 100644 --- a/var/spack/repos/builtin/packages/energyplus/package.py +++ b/var/spack/repos/builtin/packages/energyplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ensmallen/package.py b/var/spack/repos/builtin/packages/ensmallen/package.py index 213e14b51f7d7e..f96d0be33de286 100644 --- a/var/spack/repos/builtin/packages/ensmallen/package.py +++ b/var/spack/repos/builtin/packages/ensmallen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ensmallen(CMakePackage): homepage = "https://ensmallen.org" url = "https://github.com/mlpack/ensmallen/archive/refs/tags/2.19.1.tar.gz" + license("BSD-3-Clause") + version("2.19.1", sha256="f36ad7f08b0688d2a8152e1c73dd437c56ed7a5af5facf65db6ffd977b275b2e") variant("openmp", default=True, description="Use OpenMP for parallelization") diff --git a/var/spack/repos/builtin/packages/entrezdirect/package.py b/var/spack/repos/builtin/packages/entrezdirect/package.py index c0e579719335fe..fd87aaca5c46b3 100644 --- a/var/spack/repos/builtin/packages/entrezdirect/package.py +++ b/var/spack/repos/builtin/packages/entrezdirect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/entt/package.py b/var/spack/repos/builtin/packages/entt/package.py index 080a271722a1e7..0726c577185efd 100644 --- a/var/spack/repos/builtin/packages/entt/package.py +++ b/var/spack/repos/builtin/packages/entt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Entt(CMakePackage): homepage = "https://entt.docsforge.com" url = "https://github.com/skypjack/entt/archive/v3.5.2.tar.gz" + license("MIT") + version("3.11.1", sha256="0ac010f232d3089200c5e545bcbd6480cf68b705de6930d8ff7cdb0a29f5b47b") version("3.5.2", sha256="f9271293c44518386c402c9a2188627819748f66302df48af4f6d08e30661036") diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index 38bcd9b3bac08b..87c2031da34c2e 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/enzo/package.py b/var/spack/repos/builtin/packages/enzo/package.py index 5452b27b7b81d3..b8498d08626432 100644 --- a/var/spack/repos/builtin/packages/enzo/package.py +++ b/var/spack/repos/builtin/packages/enzo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/enzyme/package.py b/var/spack/repos/builtin/packages/enzyme/package.py index 2d4edd17ffcaab..8f983a65344a56 100644 --- a/var/spack/repos/builtin/packages/enzyme/package.py +++ b/var/spack/repos/builtin/packages/enzyme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/eospac/package.py b/var/spack/repos/builtin/packages/eospac/package.py index 8587a4b583e1b4..e21b62f109f273 100644 --- a/var/spack/repos/builtin/packages/eospac/package.py +++ b/var/spack/repos/builtin/packages/eospac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/epics-base/package.py b/var/spack/repos/builtin/packages/epics-base/package.py index 9aae46a46bea54..2509eab83eb850 100644 --- a/var/spack/repos/builtin/packages/epics-base/package.py +++ b/var/spack/repos/builtin/packages/epics-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,7 @@ class EpicsBase(MakefilePackage): def patch(self): filter_file(r"^\s*CC\s*=.*", "CC = " + spack_cc, "configure/CONFIG.gnuCommon") filter_file(r"^\s*CCC\s*=.*", "CCC = " + spack_cxx, "configure/CONFIG.gnuCommon") + filter_file(r"\$\(PERL\)\s+\$\(XSUBPP\)", "$(XSUBPP)", "modules/ca/src/perl/Makefile") @property def install_targets(self): diff --git a/var/spack/repos/builtin/packages/epics-ca-gateway/package.py b/var/spack/repos/builtin/packages/epics-ca-gateway/package.py index a1476b8d85032a..fbaf1dc9613343 100644 --- a/var/spack/repos/builtin/packages/epics-ca-gateway/package.py +++ b/var/spack/repos/builtin/packages/epics-ca-gateway/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/epics-pcas/package.py b/var/spack/repos/builtin/packages/epics-pcas/package.py index 09ff843fc7c2a1..14e02f0a09f5d8 100644 --- a/var/spack/repos/builtin/packages/epics-pcas/package.py +++ b/var/spack/repos/builtin/packages/epics-pcas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/epics-snmp/package.py b/var/spack/repos/builtin/packages/epics-snmp/package.py index 5976f9f7abd1d3..a163a9e653cb88 100644 --- a/var/spack/repos/builtin/packages/epics-snmp/package.py +++ b/var/spack/repos/builtin/packages/epics-snmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py b/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py index d523ad86952cf4..1302190bb3cb2a 100644 --- a/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py +++ b/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class EprosimaFastcdr(CMakePackage): homepage = "https://www.eprosima.com/" url = "https://github.com/eProsima/Fast-CDR/archive/v1.0.27.tar.gz" + license("Apache-2.0") + version("1.0.27", sha256="a9bc8fd31a2c2b95e6d2fb46e6ce1ad733e86dc4442f733479e33ed9cdc54bf6") diff --git a/var/spack/repos/builtin/packages/eprosima-fastdds/package.py b/var/spack/repos/builtin/packages/eprosima-fastdds/package.py index f3898409a845bd..3af859c1fffa40 100644 --- a/var/spack/repos/builtin/packages/eprosima-fastdds/package.py +++ b/var/spack/repos/builtin/packages/eprosima-fastdds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class EprosimaFastdds(CMakePackage): homepage = "https://www.eprosima.com/" url = "https://github.com/eProsima/Fast-DDS/archive/v2.10.1.tar.gz" + license("Apache-2.0") + version("2.10.1", sha256="2cc2682db5dc7e87684b7f23166e2f32faf8d5c4b4a8c94c6c21211a8a38f553") depends_on("asio") diff --git a/var/spack/repos/builtin/packages/epsic/package.py b/var/spack/repos/builtin/packages/epsic/package.py index 74284c631fcec2..16144c585d1bf9 100644 --- a/var/spack/repos/builtin/packages/epsic/package.py +++ b/var/spack/repos/builtin/packages/epsic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/eq-r/package.py b/var/spack/repos/builtin/packages/eq-r/package.py index 8d79fe01f224a8..81670ed8db7347 100644 --- a/var/spack/repos/builtin/packages/eq-r/package.py +++ b/var/spack/repos/builtin/packages/eq-r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/er/package.py b/var/spack/repos/builtin/packages/er/package.py index 19d7faae8bc0be..6fed09c5e6bdc1 100644 --- a/var/spack/repos/builtin/packages/er/package.py +++ b/var/spack/repos/builtin/packages/er/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Er(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.4.0", sha256="6cb5b6724ddac5c1f5ed6b326a5f3bf5d4eb1c6958a48218e6ca9bb7c02e48a8") version("0.3.0", sha256="01bc71bfb2ebb015ccb948f2bb9138b70972a3e8be0e53f9a4844e46b106a36c") diff --git a/var/spack/repos/builtin/packages/erfa/package.py b/var/spack/repos/builtin/packages/erfa/package.py index a08d251fded1d3..b1132258d41dc0 100644 --- a/var/spack/repos/builtin/packages/erfa/package.py +++ b/var/spack/repos/builtin/packages/erfa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/erlang/package.py b/var/spack/repos/builtin/packages/erlang/package.py index f64a6ff55c7d90..e21d2d736d6917 100644 --- a/var/spack/repos/builtin/packages/erlang/package.py +++ b/var/spack/repos/builtin/packages/erlang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Erlang(AutotoolsPackage): homepage = "https://erlang.org/" url = "https://erlang.org/download/otp_src_23.3.tar.gz" + license("Apache-2.0") + version("26.0", sha256="4e411587bd7d18ee2d5a0e7207f638e14036152633db57d2cf49c84a9c92d945") version("25.3", sha256="aeaa546e0c38e338010d16348d8c67f7fc8c02df728a88d8499838d8c9131e1c") version("25.2", sha256="0df1243afde953647df95785f8e75541fd0ea8ac70c0f639c977513be1761f63") diff --git a/var/spack/repos/builtin/packages/ermod/package.py b/var/spack/repos/builtin/packages/ermod/package.py index c72a976d93c852..5ae705818c52ef 100644 --- a/var/spack/repos/builtin/packages/ermod/package.py +++ b/var/spack/repos/builtin/packages/ermod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ermod(AutotoolsPackage): "https://sourceforge.net/projects/ermod/files/ermod-0.3%20%28stable%29/ermod-0.3.5.tar.gz" ) + license("GPL-2.0-or-later") + version("0.3.6", sha256="8fdd8e0844fcc34cda2bbbf8ad03168c1c2f1409e06967a96a0f2269bb5f1b6b") version("0.3.5", sha256="42043ba7f53e9b74d0327b9982f33a4b79ed6964fbeb409e33178a6dcdf9e827") diff --git a/var/spack/repos/builtin/packages/erne/package.py b/var/spack/repos/builtin/packages/erne/package.py index f9fe8f864576af..dee89bebb8af5e 100644 --- a/var/spack/repos/builtin/packages/erne/package.py +++ b/var/spack/repos/builtin/packages/erne/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Erne(AutotoolsPackage): homepage = "http://erne.sourceforge.net/" url = "https://downloads.sourceforge.net/project/erne/2.1.1/erne-2.1.1-source.tar.gz" + license("GPL-3.0-only") + version("2.1.1", sha256="f32ab48481fd6c129b0a0246ab02b6e3a2a9da84024e1349510a59c15425d983") variant("mpi", default=False, description="Build with OpenMPI support") diff --git a/var/spack/repos/builtin/packages/es-shell/package.py b/var/spack/repos/builtin/packages/es-shell/package.py index 3d319210478256..79c23768054417 100644 --- a/var/spack/repos/builtin/packages/es-shell/package.py +++ b/var/spack/repos/builtin/packages/es-shell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class EsShell(AutotoolsPackage): homepage = "https://wryun.github.io/es-shell/" url = "https://github.com/wryun/es-shell/releases/download/v0.9.1/es-0.9.1.tar.gz" + license("Public-Domain") + version("0.9.1", sha256="b0b41fce99b122a173a06b899a4d92e5bd3cc48b227b2736159f596a58fff4ba") depends_on("readline") diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 9485c64df23eb7..e317d07cee4fb4 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/espanso/package.py b/var/spack/repos/builtin/packages/espanso/package.py index e12f7a4f656338..6432eb1c87f498 100644 --- a/var/spack/repos/builtin/packages/espanso/package.py +++ b/var/spack/repos/builtin/packages/espanso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py index 4b8572834c43aa..bda77a149fa4db 100644 --- a/var/spack/repos/builtin/packages/essl/package.py +++ b/var/spack/repos/builtin/packages/essl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/estarlight/package.py b/var/spack/repos/builtin/packages/estarlight/package.py index e171cc17ac9c71..95e27e4d16ec39 100644 --- a/var/spack/repos/builtin/packages/estarlight/package.py +++ b/var/spack/repos/builtin/packages/estarlight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/esys-particle/package.py b/var/spack/repos/builtin/packages/esys-particle/package.py index 843a9afa9b85c9..0475d965d8fa85 100644 --- a/var/spack/repos/builtin/packages/esys-particle/package.py +++ b/var/spack/repos/builtin/packages/esys-particle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class EsysParticle(CMakePackage): maintainers("snehring") + license("Apache-2.0") + version("3.0-alpha", sha256="4fba856a95c93991cacb904e6a54a7ded93558f7adc8c3e6da99bc347843a434") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/etcd/package.py b/var/spack/repos/builtin/packages/etcd/package.py index 9587221e973b61..e1b9bba9c9361f 100644 --- a/var/spack/repos/builtin/packages/etcd/package.py +++ b/var/spack/repos/builtin/packages/etcd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Etcd(Package): maintainers("alecbcs") + license("Apache-2.0") + version("3.5.9", sha256="ab24d74b66ba1ed7d2bc391839d961e7215f0f3d674c3a9592dad6dc67a7b223") version("3.4.23", sha256="055c608c4898d25f23aefbc845ff074bf5e8a07e61ed41dbd5cc4d4f59c93093") diff --git a/var/spack/repos/builtin/packages/ethminer/package.py b/var/spack/repos/builtin/packages/ethminer/package.py index 91b42ef93a5499..ae28904c544981 100644 --- a/var/spack/repos/builtin/packages/ethminer/package.py +++ b/var/spack/repos/builtin/packages/ethminer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ethminer(CMakePackage): homepage = "https://github.com/ethereum-mining/ethminer" url = "https://github.com/ethereum-mining/ethminer/archive/v0.12.0.tar.gz" + license("GPL-3.0-or-later") + version("0.12.0", sha256="71122c8aa1be2c29e46d7f07961fa760b1eb390e4d9a2a21cf900f6482a8755a") variant("opencl", default=True, description="Enable OpenCL mining.") diff --git a/var/spack/repos/builtin/packages/ethtool/package.py b/var/spack/repos/builtin/packages/ethtool/package.py index 6a149380625b43..da8800471b0704 100644 --- a/var/spack/repos/builtin/packages/ethtool/package.py +++ b/var/spack/repos/builtin/packages/ethtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ethtool(AutotoolsPackage): homepage = "https://github.com/Distrotech/ethtool" url = "https://github.com/Distrotech/ethtool/archive/v4.8.tar.gz" + license("GPL-2.0-only") + version("4.8", sha256="e4443c612b01b6c4891e21f55a59aa2d6da1c9915edcf067bb66a0855590e143") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/etsf-io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py index be5435c5dd5a5f..df30e5e257a594 100644 --- a/var/spack/repos/builtin/packages/etsf-io/package.py +++ b/var/spack/repos/builtin/packages/etsf-io/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class EtsfIo(Package): homepage = "https://github.com/ElectronicStructureLibrary/libetsf_io" url = "https://launchpad.net/etsf-io/1.0/1.0.4/+download/etsf_io-1.0.4.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.4", sha256="3140c2cde17f578a0e6b63acb27a5f6e9352257a1371a17b9c15c3d0ef078fa4") variant("mpi", default=True, description="Add MPI support") diff --git a/var/spack/repos/builtin/packages/eve/package.py b/var/spack/repos/builtin/packages/eve/package.py index 64f9e075865ba1..aa0da87e422ca9 100644 --- a/var/spack/repos/builtin/packages/eve/package.py +++ b/var/spack/repos/builtin/packages/eve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Eve(CMakePackage): maintainers("jfalcou") git = "https://github.com/jfalcou/eve.git" + license("BSL-1.0") + version("main", branch="main") version( "2023.02.15", sha256="7a5fb59c0e6ef3bef3e8b36d62e138d31e7f2a9f1bdfe95a8e96512b207f84c5" diff --git a/var/spack/repos/builtin/packages/evemu/package.py b/var/spack/repos/builtin/packages/evemu/package.py index 38e64288a83189..fee10a7f91eb21 100644 --- a/var/spack/repos/builtin/packages/evemu/package.py +++ b/var/spack/repos/builtin/packages/evemu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Evemu(AutotoolsPackage): homepage = "https://github.com/freedesktop/evemu" url = "https://github.com/freedesktop/evemu/archive/v2.7.0.tar.gz" + license("LGPL-3.0-only") + version("2.7.0", sha256="aee1ecc2b6761134470316d97208b173adb4686dc72548b82b2c2b5d1e5dc259") version("2.6.0", sha256="dc2382bee4dcb6c413271d586dc11d9b4372a70fa2b66b1e53a7107f2f9f51f8") version("2.5.0", sha256="ab7cce32800db84ab3504789583d1be0d9b0a5f2689389691367b18cf059b09f") diff --git a/var/spack/repos/builtin/packages/everytrace-example/package.py b/var/spack/repos/builtin/packages/everytrace-example/package.py index 7a29ea6d813de3..4ea4c237b67c31 100644 --- a/var/spack/repos/builtin/packages/everytrace-example/package.py +++ b/var/spack/repos/builtin/packages/everytrace-example/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class EverytraceExample(CMakePackage): homepage = "https://github.com/citibeth/everytrace-example" git = "https://github.com/citibeth/everytrace-example.git" + license("GPL-3.0-or-later") + version("develop", branch="develop") depends_on("everytrace+mpi+fortran") diff --git a/var/spack/repos/builtin/packages/everytrace/package.py b/var/spack/repos/builtin/packages/everytrace/package.py index fdf546dc928a7f..3e5c1d9c88ee4b 100644 --- a/var/spack/repos/builtin/packages/everytrace/package.py +++ b/var/spack/repos/builtin/packages/everytrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Everytrace(CMakePackage): maintainers("citibeth") + license("LGPL-3.0-or-later") + version("develop", branch="develop") version("0.2.2", sha256="0487276bb24e648388862d8e1d8cfe56b529f7e3d840df3fcb5b3a3dad4016e1") diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py index c3ae27f858fc12..b431e2136ef357 100644 --- a/var/spack/repos/builtin/packages/evieext/package.py +++ b/var/spack/repos/builtin/packages/evieext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Evieext(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/evieproto" xorg_mirror_path = "proto/evieext-1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="e58080443c279dfb5a23c37076922df535e42bf209d21a1f3e88442cc01b4a0e") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/evtgen/package.py b/var/spack/repos/builtin/packages/evtgen/package.py index 2c4d3d9a68e994..51b12f1111869e 100644 --- a/var/spack/repos/builtin/packages/evtgen/package.py +++ b/var/spack/repos/builtin/packages/evtgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Evtgen(CMakePackage): maintainers("vvolkl") + version("02.02.01", sha256="1fcae56c6b27b89c4a2f4b224d27980607442185f5570e961f6334a3543c6e77") version("02.02.00", sha256="0c626e51cb17e799ad0ffd0beea5cb94d7ac8a5f8777b746aa1944dd26071ecf") version("02.00.00", sha256="02372308e1261b8369d10538a3aa65fe60728ab343fcb64b224dac7313deb719") # switched to cmake in 02.00.00 @@ -36,6 +37,7 @@ class Evtgen(CMakePackage): depends_on("hepmc", when="~hepmc3") depends_on("hepmc3", when="+hepmc3") + depends_on("pythia8@:8.309", when="@:02.02.00 +pythia8") depends_on("pythia8", when="+pythia8") depends_on("tauola~hepmc3", when="+tauola~hepmc3") depends_on("photos~hepmc3", when="+photos~hepmc3") diff --git a/var/spack/repos/builtin/packages/exa/package.py b/var/spack/repos/builtin/packages/exa/package.py index 8488f3b3a11438..e6b843d8ab69da 100644 --- a/var/spack/repos/builtin/packages/exa/package.py +++ b/var/spack/repos/builtin/packages/exa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,17 +6,22 @@ from spack.package import * -class Exa(Package): - """exa is a replacement for ls written in Rust.""" +class Exa(CargoPackage): + """DEPRECATED: The exa upstream is no longer maintained, see the eza package for a + replacement. + + exa is a replacement for ls written in Rust.""" homepage = "https://the.exa.website" url = "https://github.com/ogham/exa/archive/v0.9.0.tar.gz" - version("0.10.1", sha256="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c") - version("0.9.0", sha256="96e743ffac0512a278de9ca3277183536ee8b691a46ff200ec27e28108fef783") - - depends_on("rust") - - def install(self, spec, prefix): - cargo = which("cargo") - cargo("install", "--root", prefix, "--path", ".") + version( + "0.10.1", + sha256="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c", + deprecated=True, + ) + version( + "0.9.0", + sha256="96e743ffac0512a278de9ca3277183536ee8b691a46ff200ec27e28108fef783", + deprecated=True, + ) diff --git a/var/spack/repos/builtin/packages/exabayes/package.py b/var/spack/repos/builtin/packages/exabayes/package.py index ffa79bced71a02..ce1937dc1f8ae7 100644 --- a/var/spack/repos/builtin/packages/exabayes/package.py +++ b/var/spack/repos/builtin/packages/exabayes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Exabayes(AutotoolsPackage): homepage = "https://sco.h-its.org/exelixis/web/software/exabayes/" url = "https://sco.h-its.org/exelixis/resource/download/software/exabayes-1.5.tar.gz" + license("GPL-3.0-only") + version("1.5.1", sha256="f75ce8d5cee4d241cadacd0f5f5612d783b9e9babff2a99c7e0c3819a94bbca9") version("1.5", sha256="e401f1b4645e67e8879d296807131d0ab79bba81a1cd5afea14d7c3838b095a2") diff --git a/var/spack/repos/builtin/packages/exaca/package.py b/var/spack/repos/builtin/packages/exaca/package.py index d5d6b8785a2601..b1fd6416b9fdf3 100644 --- a/var/spack/repos/builtin/packages/exaca/package.py +++ b/var/spack/repos/builtin/packages/exaca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Exaca(CMakePackage): tags = ["ecp"] + license("MIT") + version("master", branch="master") version("1.2.0", sha256="5038d63de96c6142ddea956998e1f4ebffbc4a5723caa4da0e73eb185e6623e4") version("1.1.0", sha256="10106fb1836964a19bc5bab3f374baa24188ba786c768e554442ab896b31ff24") diff --git a/var/spack/repos/builtin/packages/exago/exago-1.1.0.patch b/var/spack/repos/builtin/packages/exago/exago-1.1.0.patch new file mode 100644 index 00000000000000..2af6044f0217be --- /dev/null +++ b/var/spack/repos/builtin/packages/exago/exago-1.1.0.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0e8ed18..3225509c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -366,10 +366,13 @@ else() + endif() + endif() + +-include(ExaGOCheckPython) + if(EXAGO_ENABLE_PYTHON) ++ include(ExaGOCheckPython) + add_subdirectory(interfaces/python) + endif() + +-# Build tests +-add_subdirectory(tests) ++if(EXAGO_RUN_TESTS) ++ # Build tests ++ add_subdirectory(tests) ++endif() ++ diff --git a/var/spack/repos/builtin/packages/exago/exago-1.3.0.patch b/var/spack/repos/builtin/packages/exago/exago-1.3.0.patch new file mode 100644 index 00000000000000..e245a96422904a --- /dev/null +++ b/var/spack/repos/builtin/packages/exago/exago-1.3.0.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d6ef668..7a1c4702 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,11 +222,13 @@ endif(EXAGO_ENABLE_GPU) + if(EXAGO_ENABLE_PETSC) + include(FindPkgConfig) + # Include petsc package path in pkg_config_path ++ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} + ${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig + ) + pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc) + set(EXAGO_HAVE_PETSC 1) ++ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save}) + endif() + + # Set install rpath to the locations where EXAGO and PETSc libraries reside. +@@ -394,12 +396,15 @@ else() + endif() + endif() + +-include(ExaGOCheckPython) + if(EXAGO_ENABLE_PYTHON) ++ include(ExaGOCheckPython) + # Build pybind11 target manually + add_subdirectory(tpl/pybind11) + add_subdirectory(interfaces/python) + endif() + +-# Build tests +-add_subdirectory(tests) ++if(EXAGO_RUN_TESTS) ++ # Build tests ++ add_subdirectory(tests) ++endif() ++ diff --git a/var/spack/repos/builtin/packages/exago/exago-1.5.0.patch b/var/spack/repos/builtin/packages/exago/exago-1.5.0.patch new file mode 100644 index 00000000000000..3d9d5afc418079 --- /dev/null +++ b/var/spack/repos/builtin/packages/exago/exago-1.5.0.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ba8e145f..89dd3327 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,11 +217,13 @@ endif(EXAGO_ENABLE_GPU) + if(EXAGO_ENABLE_PETSC) + include(FindPkgConfig) + # Include petsc package path in pkg_config_path ++ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} + ${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig + ) + pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc) + set(EXAGO_HAVE_PETSC 1) ++ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save}) + endif() + + # Set install rpath to the locations where EXAGO and PETSc libraries reside. +@@ -392,15 +394,17 @@ else() + endif() + endif() + +-include(ExaGOCheckPython) + if(EXAGO_ENABLE_PYTHON) ++ include(ExaGOCheckPython) + # Build pybind11 target manually + add_subdirectory(tpl/pybind11) + add_subdirectory(interfaces/python) + endif() + +-# Build tests +-add_subdirectory(tests) ++if(EXAGO_RUN_TESTS) ++ # Build tests ++ add_subdirectory(tests) ++endif() + + if((NOT EXAGO_ENABLE_IPOPT) AND (NOT EXAGO_ENABLE_HIOP)) + message( diff --git a/var/spack/repos/builtin/packages/exago/exago-1.6.0.patch b/var/spack/repos/builtin/packages/exago/exago-1.6.0.patch new file mode 100644 index 00000000000000..f6b03cec8eb6a1 --- /dev/null +++ b/var/spack/repos/builtin/packages/exago/exago-1.6.0.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 90bddf2e..47ab5998 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,11 +217,13 @@ endif(EXAGO_ENABLE_GPU) + if(EXAGO_ENABLE_PETSC) + include(FindPkgConfig) + # Include petsc package path in pkg_config_path ++ set(PKG_CONFIG_PATH_save $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} + ${PETSC_DIR}/lib/pkgconfig:${PETSC_DIR}/${PETSC_ARCH}/lib/pkgconfig + ) + pkg_check_modules(PETSC REQUIRED IMPORTED_TARGET PETSc) + set(EXAGO_HAVE_PETSC 1) ++ set(ENV{PKG_CONFIG_PATH} ${PKG_CONFIG_PATH_save}) + endif() + + # Set install rpath to the locations where EXAGO and PETSc libraries reside. diff --git a/var/spack/repos/builtin/packages/exago/package.py b/var/spack/repos/builtin/packages/exago/package.py index fe7b67cc11d949..796138b4c5e0fd 100644 --- a/var/spack/repos/builtin/packages/exago/package.py +++ b/var/spack/repos/builtin/packages/exago/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,9 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage): version( "1.3.0", tag="v1.3.0", commit="58b039d746a6eac8e84b0afc01354cd58caec485", submodules=True ) + version( + "1.2.0", tag="v1.2.0", commit="255a214ec747b7bdde7a6d8151c083067b4d0907", submodules=True + ) version( "1.1.2", tag="v1.1.2", commit="db3bb16e19c09e01402071623258dae4d13e5133", submodules=True ) @@ -124,14 +127,15 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage): when="+{0} build_type=RelWithDebInfo".format(pkg[1]), ) - depends_on( - "{0} build_type=Release".format("hiop+ginkgo ^ginkgo"), - when="+{0} build_type=Release".format("hiop ^hiop+ginkgo"), - ) - depends_on( - "{0} build_type=Debug".format("hiop+ginkgo ^ginkgo"), - when="+{0} build_type=RelWithDebInfo".format("hiop ^hiop+ginkgo"), - ) + with when("+hiop"): + depends_on("hiop") + with when("build_type=Release"): + depends_on("hiop build_type=Release") + depends_on("ginkgo build_type=Release", when="^hiop+ginkgo") + with when("build_type=Debug"): + depends_on("hiop build_type=RelWithDebInfo") + depends_on("ginkgo build_type=Debug", when="^hiop+ginkgo") + # depends_on("hpctoolkit", when="with_profiling=hpctoolkit") # depends_on("tau", when="with_profiling=tau") # ^ need to depend when both hpctoolkit and tau @@ -140,7 +144,8 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage): depends_on("hiop@0.3.99:", when="@0.99:+hiop") depends_on("hiop@0.5.1:", when="@1.1.0:+hiop") depends_on("hiop@0.5.3:", when="@1.3.0:+hiop") - depends_on("hiop@0.7.0:1.0.0", when="@1.5.0:+hiop") + depends_on("hiop@0.7.0:1.0.0", when="@1.5.0:1.6.0+hiop") + depends_on("hiop@1.0.1:", when="@develop:+hiop") depends_on("hiop~mpi", when="+hiop~mpi") depends_on("hiop+mpi", when="+hiop+mpi") @@ -160,7 +165,7 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage): depends_on("petsc@3.13:3.14", when="@:1.2") depends_on("petsc@3.16", when="@1.3:1.4") depends_on("petsc@3.18:3.19", when="@1.5") - depends_on("petsc@3.20:", when="@1.6:") + depends_on("petsc@3.19:", when="@1.6:") depends_on("petsc~mpi", when="~mpi") @@ -178,6 +183,12 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage): depends_on("umpire {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep)) depends_on("camp {0}".format(rocm_dep), when="+raja {0}".format(rocm_dep)) + # CMake patches to support ~python and ~testing + patch("exago-1.6.0.patch", when="@1.6.0") + patch("exago-1.5.0.patch", when="@1.5.0:1.5.1") + patch("exago-1.3.0.patch", when="@1.3.0:1.4.1") + patch("exago-1.1.0.patch", when="@1.1.0:1.2.0") + flag_handler = build_system_flags def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py index cb5bc74ac1f6ae..d23fff888bf28f 100644 --- a/var/spack/repos/builtin/packages/examinimd/package.py +++ b/var/spack/repos/builtin/packages/examinimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/examl/package.py b/var/spack/repos/builtin/packages/examl/package.py index a396e51d38981c..1747eb95ea7439 100644 --- a/var/spack/repos/builtin/packages/examl/package.py +++ b/var/spack/repos/builtin/packages/examl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Examl(MakefilePackage): maintainers("robqiao") + license("GPL-3.0-only") + version("3.0.22", sha256="802e673b0c2ea83fdbe6b060048d83f22b6978933a04be64fb9b4334fe318ca3") version("3.0.21", sha256="6c7e6c5d7bf4ab5cfbac5cc0d577885272a803c142e06b531693a6a589102e2e") version("3.0.20", sha256="023681248bbc7f19821b509948d79301e46bbf275aa90bf12e9f4879639a023b") diff --git a/var/spack/repos/builtin/packages/exampm/package.py b/var/spack/repos/builtin/packages/exampm/package.py index ae39ccb6649520..5c3a4280229ec0 100644 --- a/var/spack/repos/builtin/packages/exampm/package.py +++ b/var/spack/repos/builtin/packages/exampm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Exampm(CMakePackage): tags = ["proxy-app", "ecp-proxy-app"] + license("BSD-3-Clause") + version("master", branch="master") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/exasp2/package.py b/var/spack/repos/builtin/packages/exasp2/package.py index 8741f3fb8f05d3..e19cb8d201427e 100644 --- a/var/spack/repos/builtin/packages/exasp2/package.py +++ b/var/spack/repos/builtin/packages/exasp2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/exawind/package.py b/var/spack/repos/builtin/packages/exawind/package.py index 94ad2b09ea4b64..b7ba5e378d4aff 100644 --- a/var/spack/repos/builtin/packages/exawind/package.py +++ b/var/spack/repos/builtin/packages/exawind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Exawind(CMakePackage): tags = ["ecp", "ecp-apps"] + license("Apache-2.0") + version("master", branch="main") depends_on("trilinos+stk") diff --git a/var/spack/repos/builtin/packages/exaworks/package.py b/var/spack/repos/builtin/packages/exaworks/package.py index 5a154456580572..fe6372ca22d573 100644 --- a/var/spack/repos/builtin/packages/exaworks/package.py +++ b/var/spack/repos/builtin/packages/exaworks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/exciting/package.py b/var/spack/repos/builtin/packages/exciting/package.py index c74da1013c1ebf..72e9c2f82be1b2 100644 --- a/var/spack/repos/builtin/packages/exciting/package.py +++ b/var/spack/repos/builtin/packages/exciting/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Exciting(MakefilePackage): url = "https://exciting.wdfiles.com/local--files/nitrogen-14/exciting.nitrogen-14.tar.gz" git = "https://github.com/exciting/exciting.git" + license("LGPL-2.1-or-later") + version("oxygen", branch="oxygen_release", preferred=True) version("14", sha256="a7feaffdc23881d6c0737d2f79f94d9bf073e85ea358a57196d7f7618a0a3eff") diff --git a/var/spack/repos/builtin/packages/exempi/package.py b/var/spack/repos/builtin/packages/exempi/package.py index 3a3f6be668b5c0..f720a3a56b4ce9 100644 --- a/var/spack/repos/builtin/packages/exempi/package.py +++ b/var/spack/repos/builtin/packages/exempi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Exempi(AutotoolsPackage): homepage = "https://libopenraw.freedesktop.org/wiki/Exempi" url = "https://libopenraw.freedesktop.org/download/exempi-2.6.1.tar.bz2" + license("BSD-3-Clause") + version("2.6.1", sha256="072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd") version("2.5.2", sha256="52f54314aefd45945d47a6ecf4bd21f362e6467fa5d0538b0d45a06bc6eaaed5") diff --git a/var/spack/repos/builtin/packages/exiv2/package.py b/var/spack/repos/builtin/packages/exiv2/package.py index b1509359da51d2..937576b4ae9721 100644 --- a/var/spack/repos/builtin/packages/exiv2/package.py +++ b/var/spack/repos/builtin/packages/exiv2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Exiv2(CMakePackage): homepage = "https://www.exiv2.org/" url = "https://github.com/Exiv2/exiv2/archive/v0.27.2.tar.gz" + license("GPL-2.0-or-later") + version("0.27.6", sha256="f16ee5ff08b6994c66106109417857f13e711fca100ac43c6a403d4f02b59602") version("0.27.5", sha256="1da1721f84809e4d37b3f106adb18b70b1b0441c860746ce6812bb3df184ed6c") version("0.27.4", sha256="9fb2752c92f63c9853e0bef9768f21138eeac046280f40ded5f37d06a34880d9") diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index 7886b6b6146c22..8cd81156133fe0 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py index 53b472d908be96..1a755b39653053 100644 --- a/var/spack/repos/builtin/packages/exodusii/package.py +++ b/var/spack/repos/builtin/packages/exodusii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Exodusii(CMakePackage): git = "https://github.com/gsjaardema/seacas.git" url = "https://github.com/gsjaardema/seacas/archive/refs/tags/v2021-04-05.zip" + license("X11") + version( "2021-04-05", sha256="f40d318674753287b8b28d2b4e5cca872cd772d4c7383af4a8f3eeb48fcc7ec0" ) diff --git a/var/spack/repos/builtin/packages/exonerate-gff3/package.py b/var/spack/repos/builtin/packages/exonerate-gff3/package.py index 73b97276476724..3d7fac832ccce0 100644 --- a/var/spack/repos/builtin/packages/exonerate-gff3/package.py +++ b/var/spack/repos/builtin/packages/exonerate-gff3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class ExonerateGff3(AutotoolsPackage): homepage = "https://github.com/hotdogee/exonerate-gff3/" url = "https://github.com/hotdogee/exonerate-gff3/archive/2.3.0.tar.gz" + license("GPL-3.0-only") + version("2.3.0", sha256="eeab7ea8bc815fc4a37d4c3b89c625167a9a60a4a833b5cc96e32dc313eafd1f") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/exonerate/package.py b/var/spack/repos/builtin/packages/exonerate/package.py index d9ec84cab1186a..0eac5a46059404 100644 --- a/var/spack/repos/builtin/packages/exonerate/package.py +++ b/var/spack/repos/builtin/packages/exonerate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Exonerate(AutotoolsPackage): homepage = "https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate" url = "https://ftp.ebi.ac.uk/pub/software/vertebrategenomics/exonerate/exonerate-2.4.0.tar.gz" + license("GPL-3.0-only") + version("2.4.0", sha256="f849261dc7c97ef1f15f222e955b0d3daf994ec13c9db7766f1ac7e77baa4042") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index c6a5fae505156e..2d3a0148f4734f 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Expat(AutotoolsPackage, CMakePackage): homepage = "https://libexpat.github.io/" url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2" + license("MIT") + version("2.5.0", sha256="6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67") # deprecate all releases before 2.5.0 because of security issues version( @@ -105,7 +107,7 @@ class Expat(AutotoolsPackage, CMakePackage): # `~libbsd`. variant( "libbsd", - default=sys.platform != "darwin" and sys.platform != "win32", + default=sys.platform == "linux", description="Use libbsd (for high quality randomness)", ) diff --git a/var/spack/repos/builtin/packages/expect/package.py b/var/spack/repos/builtin/packages/expect/package.py index 2fa455d82f5b00..372817b8d660df 100644 --- a/var/spack/repos/builtin/packages/expect/package.py +++ b/var/spack/repos/builtin/packages/expect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Expect(AutotoolsPackage): "https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz/download" ) + license("NIST-PD") + version("5.45.4", sha256="49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34") version("5.45.3", sha256="c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9") version("5.45", sha256="b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040") diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py index 4dcd6d72d505d7..31c1dbee975249 100644 --- a/var/spack/repos/builtin/packages/express/package.py +++ b/var/spack/repos/builtin/packages/express/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Express(CMakePackage): homepage = "http://bio.math.berkeley.edu/eXpress/" url = "https://github.com/adarob/eXpress/archive/1.5.2.zip" + license("Artistic-2.0") + # 1.5.1 used to be known as 2015-11-29 (same commit), but they've # added tags, so lets use 'em version("1.5.3", sha256="dfea819bbe7187a06462d6549a13f9cad7f3f128cb5c62bd90946f972c45a1f2") diff --git a/var/spack/repos/builtin/packages/extrae/package.py b/var/spack/repos/builtin/packages/extrae/package.py index 25b763700f4f8a..a800bc309f9b11 100644 --- a/var/spack/repos/builtin/packages/extrae/package.py +++ b/var/spack/repos/builtin/packages/extrae/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -40,6 +40,8 @@ class Extrae(AutotoolsPackage): homepage = "https://tools.bsc.es/extrae" url = "https://ftp.tools.bsc.es/extrae/extrae-3.4.1-src.tar.bz2" + license("LGPL-2.1-or-later") + version("4.0.6", sha256="b5060336cac57f1345faa09009b1940edf1e6991aae05cc10d0b714d31360a92") version("4.0.5", sha256="8f5eefa95f2e94a3b5f9b7f7cbaaed523862f190575ee797113b1e97deff1586") version("4.0.4", sha256="003bede870de6d88b705c1a13eabe63b6beb928d8f389f5dd70ca5db8450a1f9") diff --git a/var/spack/repos/builtin/packages/exuberant-ctags/package.py b/var/spack/repos/builtin/packages/exuberant-ctags/package.py index 2da76678c8a02b..41452896fad6ef 100644 --- a/var/spack/repos/builtin/packages/exuberant-ctags/package.py +++ b/var/spack/repos/builtin/packages/exuberant-ctags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class ExuberantCtags(AutotoolsPackage): homepage = "http://ctags.sourceforge.net" url = "http://downloads.sourceforge.net/project/ctags/ctags/5.8/ctags-5.8.tar.gz" + license("GPL-2.0-or-later") + version("5.8", sha256="0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7") patch("ctags-5.8-gcc-unused-attribute.patch", when="@5.8") diff --git a/var/spack/repos/builtin/packages/eza/package.py b/var/spack/repos/builtin/packages/eza/package.py new file mode 100644 index 00000000000000..98e1582ff6ac15 --- /dev/null +++ b/var/spack/repos/builtin/packages/eza/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Eza(CargoPackage): + """A modern, maintained replacement for ls.""" + + homepage = "https://github.com/eza-community/eza" + url = "https://github.com/eza-community/eza/archive/refs/tags/v0.15.3.tar.gz" + + maintainers("trws") + + license("MIT") + + version("0.15.3", sha256="09093e565913104acb7a8eba974f8067c95566b6fbedf31138c9923a8cfde42f") diff --git a/var/spack/repos/builtin/packages/eztrace/package.py b/var/spack/repos/builtin/packages/eztrace/package.py index 5fa16fe9c44da0..2a119e960e5d66 100644 --- a/var/spack/repos/builtin/packages/eztrace/package.py +++ b/var/spack/repos/builtin/packages/eztrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Eztrace(Package): maintainers("trahay") git = "https://gitlab.com/eztrace/eztrace.git" + license("CECILL-B") + version("master", branch="master") version("2.1", sha256="ab5076086eced78e4c6cf7736e7765ca1337dec95a881c9270a42b3251aeea19") version("2.0", sha256="67bd296f059cdfab303c62f674af3e1e858213d6945bd79cb8ede4a035c0c2d6") diff --git a/var/spack/repos/builtin/packages/f2c/package.py b/var/spack/repos/builtin/packages/f2c/package.py index 92f90c5005d44e..be2d921a1acd93 100644 --- a/var/spack/repos/builtin/packages/f2c/package.py +++ b/var/spack/repos/builtin/packages/f2c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/f3d/package.py b/var/spack/repos/builtin/packages/f3d/package.py index 3808f5eaa0f378..760cfbbb6f0ddb 100644 --- a/var/spack/repos/builtin/packages/f3d/package.py +++ b/var/spack/repos/builtin/packages/f3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class F3d(CMakePackage): homepage = "https://f3d-app.github.io" url = "https://github.com/f3d-app/f3d/archive/refs/tags/v1.1.1.tar.gz" + license("BSD-3-Clause") + version("2.0.0", sha256="5b335de78a9f68903d7023d947090d4b36fa15b9e165749906a82153e0f56d05") version("1.1.1", sha256="68bdbe3a90f2cd553d5e090a95d3c847e2a2f06abbe225ffecd47d3d29978b0a") diff --git a/var/spack/repos/builtin/packages/f77-zmq/package.py b/var/spack/repos/builtin/packages/f77-zmq/package.py index c88239c375b98a..645126b67d8ce8 100644 --- a/var/spack/repos/builtin/packages/f77-zmq/package.py +++ b/var/spack/repos/builtin/packages/f77-zmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class F77Zmq(MakefilePackage): maintainers("scemama") + license("LGPL-2.1-or-later") + version("4.3.2", sha256="f1fb7544d38d9bb7235f98c96f241875ddcb0d37ed950618c23d4e4d666a73ca") version("4.3.1", sha256="a15d72d93022d3e095528d2808c7767cece974a2dc0e2dd95e4c122f60fcf0a8") diff --git a/var/spack/repos/builtin/packages/f90cache/package.py b/var/spack/repos/builtin/packages/f90cache/package.py index 5b1cdc4d875713..29e3fc0f67f6e7 100644 --- a/var/spack/repos/builtin/packages/f90cache/package.py +++ b/var/spack/repos/builtin/packages/f90cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fabtests/package.py b/var/spack/repos/builtin/packages/fabtests/package.py index a715965488ed0e..4c8aef39d8a503 100644 --- a/var/spack/repos/builtin/packages/fabtests/package.py +++ b/var/spack/repos/builtin/packages/fabtests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,20 @@ class Fabtests(AutotoolsPackage): homepage = "https://libfabric.org" url = "https://github.com/ofiwg/libfabric/releases/download/v1.9.1/fabtests-1.9.1.tar.bz2" + maintainers("kgerheiser") + license("GPL-2.0-only") + + version("1.20.0", sha256="61d483452163b39d81dcb9f578e5d9007817e0496235bc2aac1e82b7737fd65e") + version("1.19.0", sha256="82d714020df9258cfdd659c51f2be8f4507cbe157c7f03c992c70fc528d8d837") + version("1.18.2", sha256="3d85486ff80151defdb66414a851a9a9a2d4adc6cf696e2b8e4bb3ce340512c2") + version("1.18.1", sha256="fe9864acc0e17a5b0157b1cc996bb3c578cfa32c87bd43bc17b5e31e24ef63b5") + version("1.18.0", sha256="9201ba020c3cf2f07dbf16d9837b565031f2eab664efd02f2e4345443983ae3e") + version("1.17.1", sha256="efc89c6c2412168b7b8fdd495c2f46d9074205363959e80e4c8d452ba97d4c0d") + version("1.17.0", sha256="5d3cf28de32549822cbb155329fe7ce0f88423157e1210a76b23c498c848ce2a") + version("1.16.1", sha256="0e5def832ac9438ba7c50b8198f0089b568935fcc13d1ccb50a5f8a1dcf4ec30") + version("1.16.0", sha256="c428ec353f64b073fb17ac0061aab76b9cc8c41614adb772d00575f3e486884d") + version("1.15.2", sha256="9afdc992bedf3f47c068824ba3408156c890b5cb2587964ec2ad9f658102db63") version("1.9.1", sha256="6f8ced2c6b3514759a0e177c8b2a19125e4ef0714d4cc0fe0386b33bd6cd5585") version("1.9.0", sha256="60cc21db7092334904cbdafd142b2403572976018a22218e7c453195caef366e") version("1.8.1", sha256="e9005d8fe73ca3849c872649c29811846bd72a62f897ecab73a08c7a9514f37b") @@ -24,7 +37,29 @@ class Fabtests(AutotoolsPackage): version("1.5.0", sha256="1dddd446c3f1df346899f9a8636f1b4265de5b863103ae24876e9f0c1e40a69d") version("1.4.2", sha256="3b78d0ca1b223ff21b7f5b3627e67e358e3c18b700f86b017e2233fee7e88c2e") - for v in ["1.4.2", "1.5.0", "1.5.3", "1.6.0", "1.6.1", "1.6.2", "1.8.1", "1.9.0", "1.9.1"]: + versions = [ + "1.20.0", + "1.19.0", + "1.18.2", + "1.18.1", + "1.18.0", + "1.17.1", + "1.17.0", + "1.16.1", + "1.16.0", + "1.15.2", + "1.9.1", + "1.9.0", + "1.8.1", + "1.6.2", + "1.6.1", + "1.6.0", + "1.5.3", + "1.5.0", + "1.4.2", + ] + + for v in versions: depends_on("libfabric@{0}".format(v), when="@{0}".format(v)) def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/faircmakemodules/package.py b/var/spack/repos/builtin/packages/faircmakemodules/package.py index 13027f5a771e98..71732cc0566f07 100644 --- a/var/spack/repos/builtin/packages/faircmakemodules/package.py +++ b/var/spack/repos/builtin/packages/faircmakemodules/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Faircmakemodules(CMakePackage): git = "https://github.com/FairRootGroup/FairCMakeModules.git" maintainers("dennisklein", "ChristianTackeGSI") + license("LGPL-3.0-or-later") + version("main", branch="main", get_full_repo=True) version("1.0.0", sha256="ec60c31f38050c1173d512c58c684650db66736877c580936f7ecca33eeaf696") diff --git a/var/spack/repos/builtin/packages/fairlogger/package.py b/var/spack/repos/builtin/packages/fairlogger/package.py index 9add0005554683..83570639b9726b 100644 --- a/var/spack/repos/builtin/packages/fairlogger/package.py +++ b/var/spack/repos/builtin/packages/fairlogger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # Copyright 2020 GSI Helmholtz Centre for Heavy Ion Research GmbH, # Darmstadt, Germany diff --git a/var/spack/repos/builtin/packages/fairmq/package.py b/var/spack/repos/builtin/packages/fairmq/package.py index 2af3ce52c1a8b6..bb21f841ca2896 100644 --- a/var/spack/repos/builtin/packages/fairmq/package.py +++ b/var/spack/repos/builtin/packages/fairmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,32 +13,18 @@ class Fairmq(CMakePackage): git = "https://github.com/FairRootGroup/FairMQ.git" maintainers("dennisklein", "ChristianTackeGSI") + license("LGPL-3.0-or-later") + version("dev", branch="dev", submodules=True, get_full_repo=True) - version( - "1.7.0", - tag="v1.7.0", - commit="d1c99f7e150c1177dc1cab1b2adc16475cade24e", - submodules=True, - no_cache=True, - ) - version( - "1.6.0", - tag="v1.6.0", - commit="42d27af20fb5cbbbc0b0fdfef1c981d51a8baf87", - submodules=True, - no_cache=True, - ) - version( - "1.5.0", - tag="v1.5.0", - commit="c8fde17b6a10a467035590fd800bb693f50c4826", - submodules=True, - no_cache=True, - ) - # no_cache=True is currently needed, because FairMQ's build system - # depends on the git metadata, see also - # https://github.com/spack/spack/issues/19972 - # https://github.com/spack/spack/issues/14344 + with default_args(submodules=True, no_cache=True): + # no_cache=True is currently needed, because FairMQ's build system + # depends on the git metadata, see also + # https://github.com/spack/spack/issues/19972 + # https://github.com/spack/spack/issues/14344 + version("1.8.1", tag="v1.8.1", commit="961eca52761a31a0200c567b44e2b2d6d6e50df3") + version("1.7.0", tag="v1.7.0", commit="d1c99f7e150c1177dc1cab1b2adc16475cade24e") + version("1.6.0", tag="v1.6.0", commit="42d27af20fb5cbbbc0b0fdfef1c981d51a8baf87") + version("1.5.0", tag="v1.5.0", commit="c8fde17b6a10a467035590fd800bb693f50c4826") variant( "autobind", default=True, when="@1.7:", description="Override the channel autoBind default" @@ -61,9 +47,10 @@ class Fairmq(CMakePackage): generator("make", "ninja", default="ninja") - depends_on("cmake@3.15:", type="build") - depends_on("faircmakemodules", type="build") - depends_on("git", type="build") + with default_args(type="build"): + depends_on("cmake@3.15:") + depends_on("faircmakemodules") + depends_on("git") depends_on("boost@1.66: +container+program_options+filesystem+date_time+regex") depends_on("fairlogger@1.6: +pretty") @@ -72,6 +59,7 @@ class Fairmq(CMakePackage): def cmake_args(self): args = [ self.define("DISABLE_COLOR", True), + self.define("BUILD_TESTING", self.run_tests), self.define_from_variant("BUILD_EXAMPLES", "examples"), self.define_from_variant("FAIRMQ_CHANNEL_DEFAULT_AUTOBIND", "autobind"), ] diff --git a/var/spack/repos/builtin/packages/faiss/package.py b/var/spack/repos/builtin/packages/faiss/package.py index 5f502b8a161f22..8f4b6acb69af20 100644 --- a/var/spack/repos/builtin/packages/faiss/package.py +++ b/var/spack/repos/builtin/packages/faiss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Faiss(AutotoolsPackage, CMakePackage, CudaPackage): conditional("cmake", when="@1.7:"), conditional("autotools", when="@:1.6"), default="cmake" ) + license("MIT") + version("1.7.4", sha256="d9a7b31bf7fd6eb32c10b7ea7ff918160eed5be04fe63bb7b4b4b5f2bbde01ad") version("1.7.2", sha256="d49b4afd6a7a5b64f260a236ee9b2efb760edb08c33d5ea5610c2f078a5995ec") version("1.6.3", sha256="e1a41c159f0b896975fbb133e0240a233af5c9286c09a28fde6aefff5336e542") @@ -94,9 +96,6 @@ def cmake_args(self): self.define_from_variant("BUILD_TESTING", "tests"), self.define("FAISS_OPT_LEVEL", "generic"), ] - if "+python" in spec: - pyexe = spec["python"].command.path - args.append(self.define("Python_EXECUTABLE", pyexe)) if "+cuda" in spec: key = "CMAKE_CUDA_ARCHITECTURES" diff --git a/var/spack/repos/builtin/packages/fakechroot/package.py b/var/spack/repos/builtin/packages/fakechroot/package.py index fe2e003d9ccf15..c74d7597b1aec7 100644 --- a/var/spack/repos/builtin/packages/fakechroot/package.py +++ b/var/spack/repos/builtin/packages/fakechroot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fakechroot(AutotoolsPackage): homepage = "https://github.com/dex4er/fakechroot" url = "https://github.com/dex4er/fakechroot/releases/download/2.20.1/fakechroot-2.20.1.tar.gz" + license("LGPL-2.1-or-later") + version("2.20.1", sha256="5abd04323c9ddae06b5dcaa56b2da07728de3fe21007b08bd88a17b2409b32aa") version("2.20", sha256="5da99358d2a49ddd3dd54ba2ff401d93a8fa641e3754cd058bdf53adb4b7e100") version("2.19", sha256="39ffbbbe3a823be7450928b8e3b99ae4cb339c47213b2f1d8ff903e0246f2e15") diff --git a/var/spack/repos/builtin/packages/fakexrandr/package.py b/var/spack/repos/builtin/packages/fakexrandr/package.py index cf19967b46ac50..e314fd3ebd5e12 100644 --- a/var/spack/repos/builtin/packages/fakexrandr/package.py +++ b/var/spack/repos/builtin/packages/fakexrandr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/falco/package.py b/var/spack/repos/builtin/packages/falco/package.py index 5acecbf5c0f3de..3b6c4268c8dcfc 100644 --- a/var/spack/repos/builtin/packages/falco/package.py +++ b/var/spack/repos/builtin/packages/falco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Falco(AutotoolsPackage): homepage = "https://github.com/smithlabcode/falco" url = "https://github.com/smithlabcode/falco/releases/download/v1.2.1/falco-1.2.1.tar.gz" + license("GPL-3.0-only") + version("1.2.1", sha256="33de8aafac45c7aea055ed7ab837d0a39d12dcf782816cea8a6c648acb911057") variant("htslib", default=False, description="Add support for BAM files") diff --git a/var/spack/repos/builtin/packages/falcon/package.py b/var/spack/repos/builtin/packages/falcon/package.py index 23c2bd87a6e10d..898e13354ab0c7 100644 --- a/var/spack/repos/builtin/packages/falcon/package.py +++ b/var/spack/repos/builtin/packages/falcon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fann/package.py b/var/spack/repos/builtin/packages/fann/package.py index 832c5bdf1915e6..ca48172e31661e 100644 --- a/var/spack/repos/builtin/packages/fann/package.py +++ b/var/spack/repos/builtin/packages/fann/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,4 +23,6 @@ class Fann(CMakePackage): homepage = "https://leenissen.dk/fann/wp/" url = "https://github.com/libfann/fann/archive/2.2.0.tar.gz" + license("LGPL-2.0-or-later") + version("2.2.0", sha256="f31c92c1589996f97d855939b37293478ac03d24b4e1c08ff21e0bd093449c3c") diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py index 263ff3521df487..b4b600d299e6aa 100644 --- a/var/spack/repos/builtin/packages/faodel/package.py +++ b/var/spack/repos/builtin/packages/faodel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Faodel(CMakePackage): tags = ["e4s"] + license("MIT") + version("master", branch="master") version("1.2108.1", sha256="66c53daa510b28f906faac7c67d944a034900da2e296159a2879c3c0b0080ffd") version("1.1906.2", sha256="fd61c0a9c4303cd6b8c33bf04414acfc80ceaf08272be99bf3ebc854b37656a0") diff --git a/var/spack/repos/builtin/packages/fargparse/package.py b/var/spack/repos/builtin/packages/fargparse/package.py index fcbde4717dbfff..53944f5cf084e5 100644 --- a/var/spack/repos/builtin/packages/fargparse/package.py +++ b/var/spack/repos/builtin/packages/fargparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,7 @@ class Fargparse(CMakePackage): version("develop", branch="develop") version("main", branch="main") + version("1.6.0", sha256="055a0af44f50c302f8f20a8bcf3d26c5bbeacf5222cdbaa5b19da4cff56eb9c0") version("1.5.0", sha256="1c16ead5f1bacb9c2f33aab99a0889c68c1a1ece754ddc3fd340f10a0d5da2f7") version("1.4.2", sha256="2cd3f14845235407c6a4171ab4602499dade045e3f9b7dc75190f4a315ac8b44") version("1.4.1", sha256="8f9b92a80f05b0a8ab2dd5cd309ad165041c7fcdd589b96bf75c7dd889b9b584") diff --git a/var/spack/repos/builtin/packages/fasd/package.py b/var/spack/repos/builtin/packages/fasd/package.py index 0be946bb72044b..3f42e768a812e2 100644 --- a/var/spack/repos/builtin/packages/fasd/package.py +++ b/var/spack/repos/builtin/packages/fasd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Fasd(MakefilePackage): url = "https://github.com/clvv/fasd/archive/refs/tags/1.0.1.tar.gz" git = "https://github.com/clvv/fasd.git" + license("MIT") + version("1.0.1", sha256="88efdfbbed8df408699a14fa6c567450bf86480f5ff3dde42d0b3e1dee731f65") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/fast-global-file-status/package.py b/var/spack/repos/builtin/packages/fast-global-file-status/package.py index a09ed3723adbcb..916bcab19334c5 100644 --- a/var/spack/repos/builtin/packages/fast-global-file-status/package.py +++ b/var/spack/repos/builtin/packages/fast-global-file-status/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py index 763e6ec9dbce0c..412fb7b28d2c25 100644 --- a/var/spack/repos/builtin/packages/fasta/package.py +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Fasta(MakefilePackage): homepage = "https://fasta.bioch.virginia.edu/fasta_www2/fasta_list2.shtml" url = "https://github.com/wrpearson/fasta36/archive/fasta-v36.3.8g.tar.gz" + license("Apache-2.0") + version("36.3.8g", sha256="fa5318b6f8d6a3cfdef0d29de530eb005bfd3ca05835faa6ad63663f8dce7b2e") version( "36.3.8h_2020-05-04", diff --git a/var/spack/repos/builtin/packages/fastani/package.py b/var/spack/repos/builtin/packages/fastani/package.py index d5c9444005f789..fe8a3ee2d5bc11 100644 --- a/var/spack/repos/builtin/packages/fastani/package.py +++ b/var/spack/repos/builtin/packages/fastani/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fastani(CMakePackage, AutotoolsPackage): url = "https://github.com/ParBLiSS/FastANI/archive/v1.33.tar.gz" maintainers("snehring") + license("Apache-2.0") + version("1.34", sha256="dc185cf29b9fa40cdcc2c83bb48150db46835e49b9b64a3dbff8bc4d0f631cb1") version("1.33", sha256="0b18b3074094722fb1b2247c1a1c4eb96295fff369b837f422e05072740e0013") diff --git a/var/spack/repos/builtin/packages/fastdb/package.py b/var/spack/repos/builtin/packages/fastdb/package.py index 66565ece9c39de..a99b515fde7fa0 100644 --- a/var/spack/repos/builtin/packages/fastdb/package.py +++ b/var/spack/repos/builtin/packages/fastdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fastdfs/package.py b/var/spack/repos/builtin/packages/fastdfs/package.py index d01698d89deb91..0192f7cc19295f 100644 --- a/var/spack/repos/builtin/packages/fastdfs/package.py +++ b/var/spack/repos/builtin/packages/fastdfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Fastdfs(Package): homepage = "https://github.com/happyfish100/fastdfs" url = "https://github.com/happyfish100/fastdfs/archive/V6.05.tar.gz" + license("GPL-3.0-or-later") + version("6.05", sha256="00b736a1a7bd9cb5733aa51969efaa3b46df3764988c1edb43f06d72c4d575d9") version("6.04", sha256="76090f6bbd0add08b049ce17f30a7507a44ef0d883784cad774b380ba4906916") version("6.03", sha256="142be123eb389335b3b3793f0765494bdad3a632e4352af57861ed29098ec8d1") diff --git a/var/spack/repos/builtin/packages/fastjar/package.py b/var/spack/repos/builtin/packages/fastjar/package.py index e27320d50eacbc..1a124ff62d3984 100644 --- a/var/spack/repos/builtin/packages/fastjar/package.py +++ b/var/spack/repos/builtin/packages/fastjar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fastjar(AutotoolsPackage): homepage = "https://savannah.nongnu.org/projects/fastjar/" url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-0.98.tar.gz" + license("GPL-2.0") + version("0.98", sha256="f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/fastjet/package.py b/var/spack/repos/builtin/packages/fastjet/package.py index 781b56bbeee710..82975e7d775220 100644 --- a/var/spack/repos/builtin/packages/fastjet/package.py +++ b/var/spack/repos/builtin/packages/fastjet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Fastjet(AutotoolsPackage): maintainers("drbenmorgan", "vvolkl") + license("GPL-2.0-only") + version("3.4.1", sha256="05608c6ff213f06dd9de723813d6b4dccd51e661ac13098f74bfc9eeaf1cb5aa") version("3.4.0", sha256="ee07c8747c8ead86d88de4a9e4e8d1e9e7d7614973f5631ba8297f7a02478b91") version("3.3.4", sha256="432b51401e1335697c9248519ce3737809808fc1f6d1644bfae948716dddfc03") @@ -59,6 +61,14 @@ class Fastjet(AutotoolsPackage): variant("shared", default=True, description="Builds a shared version of the library") variant("auto-ptr", default=False, description="Use auto_ptr") + variant( + "thread-safety", + default="limited", + values=("none", "limited", "full"), + multi=False, + when="@3.4.0:", + description="Enables thread safety", + ) variant("atlas", default=False, description="Patch to make random generator thread_local") patch("atlas.patch", when="@:3.3 +atlas", level=0) @@ -73,5 +83,9 @@ def configure_args(self): extra_args = ["--enable-allplugins"] extra_args += self.enable_or_disable("shared") extra_args += self.enable_or_disable("auto-ptr") + if self.spec.variants["thread-safety"].value == "limited": + extra_args += ["--enable-limited-thread-safety"] + if self.spec.variants["thread-safety"].value == "full": + extra_args += ["--enable-thread-safety"] return extra_args diff --git a/var/spack/repos/builtin/packages/fastjson/package.py b/var/spack/repos/builtin/packages/fastjson/package.py index 032340b9ce1379..351a78358e664f 100644 --- a/var/spack/repos/builtin/packages/fastjson/package.py +++ b/var/spack/repos/builtin/packages/fastjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fastjson(MavenPackage): homepage = "https://github.com/alibaba/fastjson/wiki" url = "https://github.com/alibaba/fastjson/archive/1.2.68.tar.gz" + license("Apache-2.0") + version("1.2.68", sha256="0b3f5308830e5e5abacf9dc8e4115c20153c1cdabec228c3eca48a48c9d5f4d7") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/fastmath/package.py b/var/spack/repos/builtin/packages/fastmath/package.py index 601f779839c212..456f9759e2993a 100644 --- a/var/spack/repos/builtin/packages/fastmath/package.py +++ b/var/spack/repos/builtin/packages/fastmath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fastme/package.py b/var/spack/repos/builtin/packages/fastme/package.py index a97ff3a35f710b..96f125f937dc46 100644 --- a/var/spack/repos/builtin/packages/fastme/package.py +++ b/var/spack/repos/builtin/packages/fastme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fastp/package.py b/var/spack/repos/builtin/packages/fastp/package.py index 5bba09f2203c76..422b0294bd1f04 100644 --- a/var/spack/repos/builtin/packages/fastp/package.py +++ b/var/spack/repos/builtin/packages/fastp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Fastp(MakefilePackage): homepage = "https://github.com/OpenGene/fastp" url = "https://github.com/OpenGene/fastp/archive/v0.20.0.tar.gz" + license("MIT") + version("0.23.4", sha256="4fad6db156e769d46071add8a778a13a5cb5186bc1e1a5f9b1ffd499d84d72b5") version("0.23.3", sha256="a37ee4b5dcf836a5a19baec645657b71d9dcd69ee843998f41f921e9b67350e3") version("0.20.0", sha256="8d751d2746db11ff233032fc49e3bcc8b53758dd4596fdcf4b4099a4d702ac22") diff --git a/var/spack/repos/builtin/packages/fastphase/package.py b/var/spack/repos/builtin/packages/fastphase/package.py index 9737f83527bfec..13ed937915c4a9 100644 --- a/var/spack/repos/builtin/packages/fastphase/package.py +++ b/var/spack/repos/builtin/packages/fastphase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fastq-screen/package.py b/var/spack/repos/builtin/packages/fastq-screen/package.py index 4d9acde2c94388..a2dc6134b60a7f 100644 --- a/var/spack/repos/builtin/packages/fastq-screen/package.py +++ b/var/spack/repos/builtin/packages/fastq-screen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class FastqScreen(Package): homepage = "https://www.bioinformatics.babraham.ac.uk/projects/fastq_screen/" url = "https://github.com/StevenWingett/FastQ-Screen/archive/refs/tags/v0.15.3.tar.gz" + license("GPL-3.0-or-later") + version("0.15.3", sha256="002750d78ca50fe0f789e24445e10988e16244f81b4f0189bf2fc4ee8b680be5") version( "0.11.2", diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index b2a1cf7b64d8b7..b982409ca4eb65 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fastqc(Package): homepage = "https://www.bioinformatics.babraham.ac.uk/projects/fastqc/" url = "https://www.bioinformatics.babraham.ac.uk/projects/fastqc/fastqc_v0.11.5.zip" + license("GPL-3.0-or-later") + version("0.12.1", sha256="5f4dba8780231a25a6b8e11ab2c238601920c9704caa5458d9de559575d58aa7") version("0.11.9", sha256="15510a176ef798e40325b717cac556509fb218268cfdb9a35ea6776498321369") version("0.11.7", sha256="59cf50876bbe5f363442eb989e43ae3eaab8d932c49e8cff2c1a1898dd721112") diff --git a/var/spack/repos/builtin/packages/fastqvalidator/package.py b/var/spack/repos/builtin/packages/fastqvalidator/package.py index 46792698087e00..588597d359b770 100644 --- a/var/spack/repos/builtin/packages/fastqvalidator/package.py +++ b/var/spack/repos/builtin/packages/fastqvalidator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fasttext/package.py b/var/spack/repos/builtin/packages/fasttext/package.py index 8fe07147d2e709..3efd1c347d7d0c 100644 --- a/var/spack/repos/builtin/packages/fasttext/package.py +++ b/var/spack/repos/builtin/packages/fasttext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Fasttext(CMakePackage): homepage = "https://github.com/facebookresearch/fastText" url = "https://github.com/facebookresearch/fastText/archive/v0.9.2.tar.gz" + license("MIT") + version("0.9.2", sha256="7ea4edcdb64bfc6faaaec193ef181bdc108ee62bb6a04e48b2e80b639a99e27e") version("0.9.1", sha256="254ace2fc8dc3bea0fc6ad4897a221eb85c1e9adfa61d130b43398193ca1f061") version("0.2.0", sha256="71d24ffec9fcc4364554ecac2b3308d834178c903d16d090aa6be9ea6b8e480c") diff --git a/var/spack/repos/builtin/packages/fasttransforms/package.py b/var/spack/repos/builtin/packages/fasttransforms/package.py index 358ab36c47ba7e..5c35700bdbd159 100644 --- a/var/spack/repos/builtin/packages/fasttransforms/package.py +++ b/var/spack/repos/builtin/packages/fasttransforms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fasttransforms(MakefilePackage): homepage = "https://github.com/MikaelSlevinsky/FastTransforms" url = "https://github.com/MikaelSlevinsky/FastTransforms/archive/v0.3.4.tar.gz" + license("MIT") + version("0.6.2", sha256="fd00befcb0c20ba962a8744a7b9139355071ee95be70420de005b7c0f6e023aa") version("0.5.0", sha256="9556d0037bd5348a33f15ad6100e32053b6e22cab16a97c504f30d6c52fd0efd") version("0.3.4", sha256="a5c8b5aedbdb40218521d061a7df65ef32ce153d4e19d232957db7e3e63c7e9b") diff --git a/var/spack/repos/builtin/packages/fasttree/package.py b/var/spack/repos/builtin/packages/fasttree/package.py index b8feb7b32c3741..8a766c29770fbd 100644 --- a/var/spack/repos/builtin/packages/fasttree/package.py +++ b/var/spack/repos/builtin/packages/fasttree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py index b47fcb78e385ab..651cc94255ddbf 100644 --- a/var/spack/repos/builtin/packages/fastx-toolkit/package.py +++ b/var/spack/repos/builtin/packages/fastx-toolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class FastxToolkit(AutotoolsPackage): homepage = "http://hannonlab.cshl.edu/fastx_toolkit/" url = "https://github.com/agordon/fastx_toolkit/releases/download/0.0.14/fastx_toolkit-0.0.14.tar.bz2" + license("AGPL-3.0-only") + version("0.0.14", sha256="9e1f00c4c9f286be59ac0e07ddb7504f3b6433c93c5c7941d6e3208306ff5806") depends_on("libgtextutils") diff --git a/var/spack/repos/builtin/packages/faust/package.py b/var/spack/repos/builtin/packages/faust/package.py index e72bf212433ad6..fccda50b4e64aa 100644 --- a/var/spack/repos/builtin/packages/faust/package.py +++ b/var/spack/repos/builtin/packages/faust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Faust(MakefilePackage): homepage = "https://faust.grame.fr/" url = "https://github.com/grame-cncm/faust/archive/2.27.2.tar.gz" + license("GPL-2.0-or-later") + version("2.54.9", sha256="14648f020d77874e6f7411d7ff605820015645bbd4b891b24bee3d3a898e48d2") version("2.27.2", sha256="3367a868a93b63582bae29ab8783f1df7a10f4084a2bc1d2258ebf3d6a8c31d7") version("2.27.1", sha256="b3e93ca573025b231931e5eb92efc1a1e7f7720902aa3b285061519600a8c417") diff --git a/var/spack/repos/builtin/packages/fbgemm/package.py b/var/spack/repos/builtin/packages/fbgemm/package.py index 3b853465c56345..39893255ed4e6b 100644 --- a/var/spack/repos/builtin/packages/fbgemm/package.py +++ b/var/spack/repos/builtin/packages/fbgemm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fbgemm(CMakePackage): maintainers("dskhudia") + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version( "2021-05-10", commit="7794b2950b35ddfa7426091e7fb2f991b1407557", submodules=True diff --git a/var/spack/repos/builtin/packages/fca/package.py b/var/spack/repos/builtin/packages/fca/package.py index d17b11520c42fd..784fe72e74a96f 100644 --- a/var/spack/repos/builtin/packages/fca/package.py +++ b/var/spack/repos/builtin/packages/fca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fcgi/package.py b/var/spack/repos/builtin/packages/fcgi/package.py index 97495afc02ec7c..0f1f88f8708f27 100644 --- a/var/spack/repos/builtin/packages/fcgi/package.py +++ b/var/spack/repos/builtin/packages/fcgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Fcgi(AutotoolsPackage): depends_on("automake", type="build") depends_on("libtool", type="build") + license("OML") + version("2.4.2", sha256="1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc") version( "2.4.1-SNAP-0910052249", diff --git a/var/spack/repos/builtin/packages/fckit/package.py b/var/spack/repos/builtin/packages/fckit/package.py index de4f995f27be8f..5822e13344fdb6 100644 --- a/var/spack/repos/builtin/packages/fckit/package.py +++ b/var/spack/repos/builtin/packages/fckit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Fckit(CMakePackage): maintainers("climbfuji") + license("Apache-2.0") + version("master", branch="master") version("develop", branch="develop") version("0.11.0", sha256="846f5c369940c0a3d42cd12932f7d6155339e79218d149ebbfdd02e759dc86c5") @@ -60,7 +62,6 @@ def cmake_args(self): args = [ self.define_from_variant("ENABLE_ECKIT", "eckit"), self.define_from_variant("ENABLE_OMP", "openmp"), - "-DPYTHON_EXECUTABLE:FILEPATH=" + self.spec["python"].command.path, "-DFYPP_NO_LINE_NUMBERING=ON", ] diff --git a/var/spack/repos/builtin/packages/fd/package.py b/var/spack/repos/builtin/packages/fd/package.py index 40311ba941b165..47f0d13eac6a67 100644 --- a/var/spack/repos/builtin/packages/fd/package.py +++ b/var/spack/repos/builtin/packages/fd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,20 +6,17 @@ from spack.package import * -class Fd(Package): +class Fd(CargoPackage): """A simple, fast and user-friendly alternative to 'find'""" homepage = "https://github.com/sharkdp/fd" url = "https://github.com/sharkdp/fd/archive/refs/tags/v8.4.0.tar.gz" - version("8.7.0", sha256="13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9") - version("8.4.0", sha256="d0c2fc7ddbe74e3fd88bf5bb02e0f69078ee6d2aeea3d8df42f508543c9db05d") - version("7.4.0", sha256="33570ba65e7f8b438746cb92bb9bc4a6030b482a0d50db37c830c4e315877537") - maintainers("alecbcs", "ashermancinelli") - depends_on("rust") + license("Apache-2.0 OR MIT") - def install(self, spec, prefix): - cargo = which("cargo") - cargo("install", "--root", prefix, "--path", ".") + version("9.0.0", sha256="306d7662994e06e23d25587246fa3fb1f528579e42a84f5128e75feec635a370") + version("8.7.0", sha256="13da15f3197d58a54768aaad0099c80ad2e9756dd1b0c7df68c413ad2d5238c9") + version("8.4.0", sha256="d0c2fc7ddbe74e3fd88bf5bb02e0f69078ee6d2aeea3d8df42f508543c9db05d") + version("7.4.0", sha256="33570ba65e7f8b438746cb92bb9bc4a6030b482a0d50db37c830c4e315877537") diff --git a/var/spack/repos/builtin/packages/fdb/package.py b/var/spack/repos/builtin/packages/fdb/package.py index 7dc2f75e76b031..76e693d16173a6 100644 --- a/var/spack/repos/builtin/packages/fdb/package.py +++ b/var/spack/repos/builtin/packages/fdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,9 +14,10 @@ class Fdb(CMakePackage): url = "https://github.com/ecmwf/fdb/archive/refs/tags/5.7.8.tar.gz" git = "https://github.com/ecmwf/fdb.git" - maintainers("skosukhin") + maintainers("skosukhin", "victoria-cherkas", "dominichofer") + + license("Apache-2.0") - # master version of fdb is subject to frequent changes and is to be used experimentally. version("master", branch="master") version("5.11.23", sha256="09b1d93f2b71d70c7b69472dfbd45a7da0257211f5505b5fcaf55bfc28ca6c65") version("5.11.17", sha256="375c6893c7c60f6fdd666d2abaccb2558667bd450100817c0e1072708ad5591e") @@ -44,6 +45,7 @@ class Fdb(CMakePackage): depends_on("ecbuild@3.7:", type="build", when="@5.11.6:") depends_on("eckit@1.16:") + depends_on("eckit@1.24.4:", when="@5.11.22:") depends_on("eckit+admin", when="+tools") depends_on("eccodes@2.10:") diff --git a/var/spack/repos/builtin/packages/fds/package.py b/var/spack/repos/builtin/packages/fds/package.py index 5e9e7737c2c6f5..0b08921af187e6 100644 --- a/var/spack/repos/builtin/packages/fds/package.py +++ b/var/spack/repos/builtin/packages/fds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fdupes/package.py b/var/spack/repos/builtin/packages/fdupes/package.py index adb3f152d85f0d..fcb2010409a887 100644 --- a/var/spack/repos/builtin/packages/fdupes/package.py +++ b/var/spack/repos/builtin/packages/fdupes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Fdupes(AutotoolsPackage): maintainers("michaelkuhn") + license("MIT") + version("2.2.1", sha256="846bb79ca3f0157856aa93ed50b49217feb68e1b35226193b6bc578be0c5698d") version("2.1.2", sha256="cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd") diff --git a/var/spack/repos/builtin/packages/feh/package.py b/var/spack/repos/builtin/packages/feh/package.py index e422e23f3371ed..e41ba4e1bb948e 100644 --- a/var/spack/repos/builtin/packages/feh/package.py +++ b/var/spack/repos/builtin/packages/feh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Feh(MakefilePackage): maintainers("TheQueasle") + license("MIT-feh") + version("3.10", sha256="1d71d1f6dcfe9ffee5e2766969a11978f7eb4fac7d7ae556f104c11f9c57cc98") version("3.9.1", sha256="455c92711b588af149b945edc5c145f3e9aa137ed9689dabed49d5e4acac75fa") version("3.3", sha256="f3959958258111d5f7c9fbe2e165c52b9d5987f07fd1f37540a4abf9f9638811") diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index 0de31ae59ff624..9fec644fc538d9 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class FenicsBasix(CMakePackage): git = "https://github.com/FEniCS/basix.git" maintainers("mscroggs", "chrisrichardson", "garth-wells", "jhale") + license("MIT") + version("main", branch="main") version("0.7.0", sha256="9bee81b396ee452eec8d9735f278cb44cb6994c6bc30aec8ed9bb4b12d83fa7f") version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 59b642359b811e..2e42785450a192 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,10 @@ class FenicsDolfinx(CMakePackage): url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz" maintainers("chrisrichardson", "garth-wells", "nate-sime", "jhale") + license("LGPL-3.0-or-later") + version("main", branch="main") + version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") @@ -65,11 +68,13 @@ class FenicsDolfinx(CMakePackage): depends_on("pugixml", when="@0.5.0:") depends_on("fenics-ufcx@main", when="@main") + depends_on("fenics-ufcx@0.7", when="@0.7") depends_on("fenics-ufcx@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-ufcx@0.5.0", when="@0.5.1:0.5") depends_on("fenics-ufcx@0.4.2", when="@0.4.1") depends_on("fenics-basix@main", when="@main") + depends_on("fenics-basix@0.7", when="@0.7") depends_on("fenics-basix@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", when="@0.4.1") diff --git a/var/spack/repos/builtin/packages/fenics-ufcx/package.py b/var/spack/repos/builtin/packages/fenics-ufcx/package.py index 3d62d7a1497231..49a9ff54c28d7a 100644 --- a/var/spack/repos/builtin/packages/fenics-ufcx/package.py +++ b/var/spack/repos/builtin/packages/fenics-ufcx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,10 @@ class FenicsUfcx(CMakePackage): url = "https://github.com/FEniCS/ffcx/archive/v0.4.2.tar.gz" maintainers("ma595", "jhale") + license("LGPL-3.0-or-later") + version("main", branch="main") + version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") version( "0.5.0.post0", sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882" diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index e8e5f89cce324e..711d6e3333c4ca 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Fenics(CMakePackage): git = "https://bitbucket.org/fenics-project/dolfin.git" url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-2019.1.0.post0.tar.gz" + license("LGPL-3.0-only") + version( "2019.1.0.post0", sha256="61abdcdb13684ba2a3ba4afb7ea6c7907aa0896a46439d3af7e8848483d4392f" ) diff --git a/var/spack/repos/builtin/packages/feq-parse/package.py b/var/spack/repos/builtin/packages/feq-parse/package.py index 687ae6f66fd297..f470cab980928d 100644 --- a/var/spack/repos/builtin/packages/feq-parse/package.py +++ b/var/spack/repos/builtin/packages/feq-parse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class FeqParse(CMakePackage): maintainers("fluidnumerics-joe") + license("Apache-2.0") + + version("2.1.0", sha256="f3fd51c24c563fe1d0dcb880bc16a62c9e08fe0cdd6f58df08f0db0ed34c289a") version("2.0.3", sha256="a1c42507801adc55a63a9a904807058079d54e002e10f2b29a916b06fc815f80") version("2.0.1", sha256="08dd08bd100a0a2eb672a5b2792ad56a337df575c634aac0d7a300d7e484b21c") version("1.1.0", sha256="d33a4fd6904939bb70780e8f25f37c1291c4f24fd207feb4ffc0f8d89637d1e3") diff --git a/var/spack/repos/builtin/packages/fermi/package.py b/var/spack/repos/builtin/packages/fermi/package.py index df03daa2899dd0..22f98cc0ca7f12 100644 --- a/var/spack/repos/builtin/packages/fermi/package.py +++ b/var/spack/repos/builtin/packages/fermi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fermikit/package.py b/var/spack/repos/builtin/packages/fermikit/package.py index a17f9e8f3a5b3c..9bc92d4a285d9d 100644 --- a/var/spack/repos/builtin/packages/fermikit/package.py +++ b/var/spack/repos/builtin/packages/fermikit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fermisciencetools/package.py b/var/spack/repos/builtin/packages/fermisciencetools/package.py index 35fe02eff1d4e1..739bd4c4eaa723 100644 --- a/var/spack/repos/builtin/packages/fermisciencetools/package.py +++ b/var/spack/repos/builtin/packages/fermisciencetools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 0d7dc892ee3aec..1e8fa1e45e0aa5 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ferret(Package): maintainers("RemiLacroix-IDRIS") + license("Unlicense") + version("7.6.0", sha256="69832d740bd44c9eadd198a5de4d96c4c01ae90ae28c2c3414c1bb9f43e475d1") version("7.5.0", sha256="2a038c547e6e80e6bd0645a374c3247360cf8c94ea56f6f3444b533257eb16db") version("7.4", sha256="5167bb9e6ef441ae9cf90da555203d2155e3fcf929e7b8dddb237de0d58c5e5f") diff --git a/var/spack/repos/builtin/packages/feynhiggs/package.py b/var/spack/repos/builtin/packages/feynhiggs/package.py index 2fff7c6d30c6bc..0a3afb7c10bbcf 100644 --- a/var/spack/repos/builtin/packages/feynhiggs/package.py +++ b/var/spack/repos/builtin/packages/feynhiggs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Feynhiggs(AutotoolsPackage): maintainers("vvolkl") tags = ["hep"] + license("GPL-3.0-or-later") + version("2.18.1", sha256="3aba89cac6397d7e1a8a9d9dcfeed9fb32eeeee98768b0c0c9f444c2cc125ab9") def configure_args(self): diff --git a/var/spack/repos/builtin/packages/ffb/package.py b/var/spack/repos/builtin/packages/ffb/package.py index e9d8690d4d7962..afc9fd75348c62 100644 --- a/var/spack/repos/builtin/packages/ffb/package.py +++ b/var/spack/repos/builtin/packages/ffb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index ff597653ff987b..d12c547da6e5fd 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,14 +15,20 @@ class Ffmpeg(AutotoolsPackage): maintainers("xjrc") + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("6.0", sha256="47d062731c9f66a78380e35a19aac77cebceccd1c7cc309b9c82343ffc430c3d") + version("5.1.3", sha256="5d5bef6a11f0c500588f9870ec965a30acc0d54d8b1e535da6554a32902d236d") version("5.1.2", sha256="39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b") version("4.4.1", sha256="8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42") version("4.3.2", sha256="ab3a6d6a70358ba0a5f67f37f91f6656b7302b02e98e5b8c846c16763c99913a") version("4.2.2", sha256="b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c") version("4.1.1", sha256="0cb40e3b8acaccd0ecb38aa863f66f0c6e02406246556c2992f67bf650fab058") version("4.1", sha256="b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5") + version("3.4.12", sha256="08e400330c70b567116addebd1a70279e0d41b0f8742085e32527f2a4eef9ca3") + version("3.2.19", sha256="87a61fa3b20819b71633aa90b55ee6411614e4a0ff7908cf35236b465de5e602") version("3.2.4", sha256="c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4") + version("2.8.21", sha256="782c3af1a1ee8945be0800edc39b1d1199ee6a8f31c74b65230795f11911b0d8") version("2.8.15", sha256="35647f6c1f6d4a1719bc20b76bf4c26e4ccd665f46b5676c0e91c5a04622ee21") version("1.0.10", sha256="1dbde434c3b5c573d3b2ffc1babe3814f781c10c4bc66193a4132a44c9715176") @@ -50,6 +56,7 @@ class Ffmpeg(AutotoolsPackage): # options variant("bzlib", default=True, description="bzip2 support") + variant("doc", default=False, description="build documentation") variant("libaom", default=False, when="@4.0:", description="AV1 video encoding/decoding") variant("libmp3lame", default=False, description="MP3 encoding") variant("libopenjpeg", default=False, description="JPEG 2000 de/encoding") @@ -74,6 +81,8 @@ class Ffmpeg(AutotoolsPackage): variant("shared", default=True, description="build shared libraries") variant("libx264", default=False, description="H.264 encoding") + conflicts("@1", when="platform=darwin target=aarch64:", msg="requires gas-preprocessor") + depends_on("alsa-lib", when="platform=linux") depends_on("iconv") depends_on("yasm@1.2.0:") @@ -101,6 +110,8 @@ class Ffmpeg(AutotoolsPackage): depends_on("speex", when="+libspeex") depends_on("xz", when="+lzma") depends_on("x264", when="+libx264") + depends_on("texinfo", when="+doc") + depends_on("texinfo@:6", when="+doc @:4") conflicts("%nvhpc") @@ -115,7 +126,14 @@ class Ffmpeg(AutotoolsPackage): patch( "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/effadce6c756247ea8bae32dc13bb3e6f464f0eb", sha256="d1ea47c29968507fee772234bc734d29958b62ab92400801ef28559b538a9168", - when="@6.0", + when="@:6.0", + ) + + # fix incompatibility with texinfo@7, especially @7.1: + patch( + "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/f01fdedb69e4accb1d1555106d8f682ff1f1ddc7", + sha256="416751f41cfbf086c28b4bbf01ace4c08e5651e59911dca6240292bb1b5c6b53", + when="@5:6.0", ) @property @@ -165,6 +183,7 @@ def configure_args(self): variant_opts = [ "bzlib", + "doc", "gpl", "libmp3lame", "libopenjpeg", @@ -185,9 +204,11 @@ def configure_args(self): "libsnappy", "sdl2", "libaom", - "libxml2", ] + if spec.satisfies("@4:"): + variant_opts.append("libxml2") + for variant_opt in variant_opts: config_args += self.enable_or_disable(variant_opt) diff --git a/var/spack/repos/builtin/packages/ffr/package.py b/var/spack/repos/builtin/packages/ffr/package.py index 96fe784e12db61..6188042c507c42 100644 --- a/var/spack/repos/builtin/packages/ffr/package.py +++ b/var/spack/repos/builtin/packages/ffr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ffsb/package.py b/var/spack/repos/builtin/packages/ffsb/package.py index 5c30984183c976..7000586d8ac175 100644 --- a/var/spack/repos/builtin/packages/ffsb/package.py +++ b/var/spack/repos/builtin/packages/ffsb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ffsb(AutotoolsPackage): homepage = "https://sourceforge.net/projects/ffsb/" url = "https://sourceforge.net/projects/ffsb/files/ffsb/5.2.1/ffsb-5.2.1.tar.gz" + license("GPL-2.0-only") + version("5.2.1", sha256="36ccda8ff04f837e20bb8b2cc9edb8c6fc923fdcdbb8060d9448dc49234b968d") version("5.1.1", sha256="e25aef255d8bfe54f29ac88c7af8237fa5a8c2e1716fdef1946cf0ecd9166d1f") version("5.1", sha256="4d7da7eba46c824ebdc23b3d32532b006aeb5b6697a3ada314c75785ab25cb97") diff --git a/var/spack/repos/builtin/packages/ffte/package.py b/var/spack/repos/builtin/packages/ffte/package.py index ed6de99aa4c2c7..98f870f545821b 100644 --- a/var/spack/repos/builtin/packages/ffte/package.py +++ b/var/spack/repos/builtin/packages/ffte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 976d8183f893fa..fa606cf3ce24cb 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -219,6 +219,8 @@ class Fftw(FftwBase): url = "https://www.fftw.org/fftw-3.3.4.tar.gz" list_url = "https://www.fftw.org/download.html" + license("GPL-2.0-or-later") + version("3.3.10", sha256="56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467") version("3.3.9", sha256="bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d") version("3.3.8", sha256="6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303") diff --git a/var/spack/repos/builtin/packages/fftx/package.py b/var/spack/repos/builtin/packages/fftx/package.py index b9229216ff1510..fa4052cf01a8c7 100644 --- a/var/spack/repos/builtin/packages/fftx/package.py +++ b/var/spack/repos/builtin/packages/fftx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,13 +14,16 @@ class Fftx(CMakePackage, CudaPackage, ROCmPackage): operations composed of linear operations combined with DFT transforms.""" homepage = "https://spiralgen.com" - url = "https://github.com/spiral-software/fftx/archive/refs/tags/1.1.3.tar.gz" + url = "https://github.com/spiral-software/fftx/archive/refs/tags/1.2.0.tar.gz" git = "https://github.com/spiral-software/fftx.git" maintainers("spiralgen") + license("BSD-3-Clause-LBNL") + version("develop", branch="develop") version("main", branch="main") + version("1.2.0", sha256="7be541bdb5905361e24bfb098314f946fe89f7b10f587d91e2397d821434b48b") version("1.1.3", sha256="17ed0baf9c2dcf30c789fdae530e006ae3ff2d2c9006989b1e6348e4ae50cef9") version("1.1.2", sha256="b2c4a7791305481af9e1bd358c1215efa4506c91c943cddca3780a1ccbc27810") version("1.1.1", sha256="5cbca66ef09eca02ee8f336f58eb45cfac69cfb29cd6eb945852ad74085d8a60") diff --git a/var/spack/repos/builtin/packages/fgsl/package.py b/var/spack/repos/builtin/packages/fgsl/package.py index 33736c0afcfc1b..3f16008ff49e6f 100644 --- a/var/spack/repos/builtin/packages/fgsl/package.py +++ b/var/spack/repos/builtin/packages/fgsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fgsl(AutotoolsPackage): homepage = "https://github.com/reinh-bader/fgsl" url = "https://github.com/reinh-bader/fgsl/archive/v1.2.0.tar.gz" + license("GPL-2.0-or-later") + version( "1.5.0", sha256="5013b4e000e556daac8b3c83192adfe8f36ffdc91d1d4baf0b1cb3100260e664", diff --git a/var/spack/repos/builtin/packages/fiat/package.py b/var/spack/repos/builtin/packages/fiat/package.py index a839b0e8a6847e..488ecf450d85a4 100644 --- a/var/spack/repos/builtin/packages/fiat/package.py +++ b/var/spack/repos/builtin/packages/fiat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fiat(CMakePackage): maintainers("climbfuji") + license("Apache-2.0") + version("main", branch="main", no_cache=True) version("1.2.0", sha256="758147410a4a3c493290b87443b4091660b915fcf29f7c4d565c5168ac67745f") version("1.1.0", sha256="58354e60d29a1b710bfcea9b87a72c0d89c39182cb2c9523ead76a142c695f82") diff --git a/var/spack/repos/builtin/packages/fides/package.py b/var/spack/repos/builtin/packages/fides/package.py index 0e284141e3a9ba..29c5ea00c525a3 100644 --- a/var/spack/repos/builtin/packages/fides/package.py +++ b/var/spack/repos/builtin/packages/fides/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,13 +23,16 @@ class Fides(CMakePackage): # Certain CMake versions have been found to break for our use cases depends_on("cmake@3.14.1:3.14,3.18.2:", type="build") - depends_on("mpi", when="+mpi") depends_on("adios2") - # Type check failures when using 32 bit IDs and ADIOS2 with ZFP in older - # versions of Fides - depends_on("adios2~zfp", when="@:1.1 ^vtk-m ~64bitids") - depends_on("vtk-m") + # adios2::Mode::ReadRandomAccess requires adios2 2.8.0. + # older adios2 supported in https://gitlab.kitware.com/vtk/fides/-/merge_requests/146 + depends_on("adios2@2.8:", when="@1.2") + depends_on("adios2@2.7:2.8", when="@1.1") + + depends_on("vtk-m@1.9:") + # vtk-m 2.0 has a breaking change in cmake target name + depends_on("vtk-m@:1.9", when="@:1.1") # Fix missing implicit includes @when("%gcc@7:") diff --git a/var/spack/repos/builtin/packages/figcone/package.py b/var/spack/repos/builtin/packages/figcone/package.py index 43b0f1a1cf0db4..deb9d730dfd7b6 100644 --- a/var/spack/repos/builtin/packages/figcone/package.py +++ b/var/spack/repos/builtin/packages/figcone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Figcone(CMakePackage): homepage = "https://github.com/kamchatka-volcano/figcone" url = "https://github.com/kamchatka-volcano/figcone/archive/refs/tags/v2.4.9.tar.gz" + license("MS-PL") + version("2.4.9", sha256="735399e849621a4923e71a50d5e2ba928d5dfa3b01e54d56e0bac8e5102b7697") diff --git a/var/spack/repos/builtin/packages/figlet/package.py b/var/spack/repos/builtin/packages/figlet/package.py index f1178eb1b601a9..2037a2de715196 100644 --- a/var/spack/repos/builtin/packages/figlet/package.py +++ b/var/spack/repos/builtin/packages/figlet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Figlet(MakefilePackage): homepage = "http://www.figlet.org/" url = "https://github.com/cmatsuoka/figlet/archive/2.2.5.tar.gz" + license("BSD-3-Clause") + version("2.2.5", sha256="4d366c4a618ecdd6fdb81cde90edc54dbff9764efb635b3be47a929473f13930") version("2.2.4", sha256="970a18a2a32cca736ff11a5b77e26a54f31a0e08606b85d21d3d5c666937e03d") version("2.2.3", sha256="168fa3c7a5888d6f796708780d3006f0e1871d83f32c4a10a84596b90ac35999") diff --git a/var/spack/repos/builtin/packages/figtree/package.py b/var/spack/repos/builtin/packages/figtree/package.py index f8f113b5fcd661..876e5bcba5317d 100644 --- a/var/spack/repos/builtin/packages/figtree/package.py +++ b/var/spack/repos/builtin/packages/figtree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/file/package.py b/var/spack/repos/builtin/packages/file/package.py index 23394ab2ab8af9..d2bc55cb710200 100644 --- a/var/spack/repos/builtin/packages/file/package.py +++ b/var/spack/repos/builtin/packages/file/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class File(AutotoolsPackage): maintainers("sethrj") + license("BSD-2-Clause") + version("5.44", sha256="3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b") version("5.43", sha256="8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991") version("5.42", sha256="c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4") diff --git a/var/spack/repos/builtin/packages/filebench/package.py b/var/spack/repos/builtin/packages/filebench/package.py index 9093c3108c3f20..4b1efcfad3a4fb 100644 --- a/var/spack/repos/builtin/packages/filebench/package.py +++ b/var/spack/repos/builtin/packages/filebench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Filebench(AutotoolsPackage): homepage = "https://github.com/filebench/filebench" url = "https://github.com/filebench/filebench/archive/1.4.9.1.tar.gz" + license("CDDL-1.0") + version("1.4.9.1", sha256="77ae91b83c828ded1219550aec74fbbd6975dce02cb5ab13c3b99ac2154e5c2e") version("1.4.9", sha256="61b8a838c1450b51a4ce61481a19a1bf0d6e3993180c524ff4051f7c18bd9c6a") diff --git a/var/spack/repos/builtin/packages/filo/package.py b/var/spack/repos/builtin/packages/filo/package.py index a8780f3b87c69d..fc778210cdeb36 100644 --- a/var/spack/repos/builtin/packages/filo/package.py +++ b/var/spack/repos/builtin/packages/filo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Filo(CMakePackage): tags = ["ecp"] + license("MIT") + version("main", branch="main") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/filtlong/package.py b/var/spack/repos/builtin/packages/filtlong/package.py index fa32ca6633607e..ceb344bec17c6d 100644 --- a/var/spack/repos/builtin/packages/filtlong/package.py +++ b/var/spack/repos/builtin/packages/filtlong/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Filtlong(MakefilePackage): homepage = "https://github.com/rrwick/Filtlong" url = "https://github.com/rrwick/Filtlong/archive/v0.2.0.tar.gz" + license("GPL-3.0-only") + version("0.2.1", sha256="e6f47675e87f98cf2481a60bef5cad38396f1e4db653a5c1673139f37770273a") version("0.2.0", sha256="a4afb925d7ced8d083be12ca58911bb16d5348754e7c2f6431127138338ee02a") version("0.1.1", sha256="ddae7a5850efeb64424965a443540b1ced34286fbefad9230ab71f4af314081b") diff --git a/var/spack/repos/builtin/packages/fimpute/package.py b/var/spack/repos/builtin/packages/fimpute/package.py index b61f7f0858d1fd..a7d0752b5d8375 100644 --- a/var/spack/repos/builtin/packages/fimpute/package.py +++ b/var/spack/repos/builtin/packages/fimpute/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/findbugs/package.py b/var/spack/repos/builtin/packages/findbugs/package.py index 607f9e014accea..9f9a0de92558c6 100644 --- a/var/spack/repos/builtin/packages/findbugs/package.py +++ b/var/spack/repos/builtin/packages/findbugs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index 46bd4d3255af6a..6ff1decade2eba 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ def url_for_version(self, version): executables = ["^find$"] + license("GPL-3.0-or-later") + version("4.9.0", sha256="a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe") version("4.8.0", sha256="57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164") version("4.7.0", sha256="c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a") diff --git a/var/spack/repos/builtin/packages/fio/package.py b/var/spack/repos/builtin/packages/fio/package.py index 9c98da798cb99a..ba5f513726c6f4 100644 --- a/var/spack/repos/builtin/packages/fio/package.py +++ b/var/spack/repos/builtin/packages/fio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,9 @@ class Fio(AutotoolsPackage): homepage = "https://github.com/axboe/fio" url = "https://github.com/axboe/fio/archive/fio-3.26.tar.gz" + license("GPL-2.0-only") + + version("3.36", sha256="b34b8f3c5cd074c09ea487ffe3f444e95565c214b34a73042f35b00cbaab0e17") version("3.34", sha256="42ea28c78d269c4cc111b7516213f4d4b32986797a710b0ff364232cc7a3a0b7") version("3.33", sha256="f48b2547313ffd1799c58c6a170175176131bbd42bc847b5650784eaf6d914b3") version("3.26", sha256="8bd6987fd9b8c2a75d3923661566ade50b99f61fa4352148975e65577ffa4024") diff --git a/var/spack/repos/builtin/packages/fipscheck/package.py b/var/spack/repos/builtin/packages/fipscheck/package.py index af345d1a10ed9a..bd8039e9e6130d 100644 --- a/var/spack/repos/builtin/packages/fipscheck/package.py +++ b/var/spack/repos/builtin/packages/fipscheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py index 14c9057ba8018a..cca14b84bdad15 100644 --- a/var/spack/repos/builtin/packages/fish/package.py +++ b/var/spack/repos/builtin/packages/fish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Fish(CMakePackage): maintainers("funnell", "adamjstewart") + license("GPL-2.0-only") + version("master", branch="master") version("3.6.1", sha256="55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2") version("3.6.0", sha256="97044d57773ee7ca15634f693d917ed1c3dc0fa7fde1017f1626d60b83ea6181") diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py index c74043f4533c40..92e7f494702341 100644 --- a/var/spack/repos/builtin/packages/fixesproto/package.py +++ b/var/spack/repos/builtin/packages/fixesproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fj/package.py b/var/spack/repos/builtin/packages/fj/package.py index 918bcef6a978d4..899f85aa78e77c 100644 --- a/var/spack/repos/builtin/packages/fj/package.py +++ b/var/spack/repos/builtin/packages/fj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fjcontrib/package.py b/var/spack/repos/builtin/packages/fjcontrib/package.py index 80ebaae7044f90..fa84c9d83305f2 100644 --- a/var/spack/repos/builtin/packages/fjcontrib/package.py +++ b/var/spack/repos/builtin/packages/fjcontrib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fjcontrib(AutotoolsPackage): tags = ["hep"] + license("GPL-2.0-or-later") + version("1.052", sha256="bde63c28cbdf992bedea4ddedfc3cd52c9fec241a767cc455dd4ad10e8210c39") version("1.051", sha256="76a2ec612c768db3eb6bbaf686d02b05ddb64dde477d185e20df563b52308473") version("1.045", sha256="667f15556ca371cfaf185086fb41ac579658a233c18fb1e5153382114f9785f8") diff --git a/var/spack/repos/builtin/packages/fl/package.py b/var/spack/repos/builtin/packages/fl/package.py index 2de76a922255aa..38ce56ab574924 100644 --- a/var/spack/repos/builtin/packages/fl/package.py +++ b/var/spack/repos/builtin/packages/fl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/flac/package.py b/var/spack/repos/builtin/packages/flac/package.py index 9bfb0ef980a790..8ec66a154d4671 100644 --- a/var/spack/repos/builtin/packages/flac/package.py +++ b/var/spack/repos/builtin/packages/flac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Flac(AutotoolsPackage): homepage = "https://xiph.org/flac/index.html" url = "http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz" + license("BSD-3-Clause AND GPL-2.0-or-later") + version("1.4.2", sha256="e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4") version("1.3.3", sha256="213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748") version("1.3.2", sha256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f") diff --git a/var/spack/repos/builtin/packages/flamemaster/package.py b/var/spack/repos/builtin/packages/flamemaster/package.py index 045ee12092a28a..d49eacef5912d2 100644 --- a/var/spack/repos/builtin/packages/flamemaster/package.py +++ b/var/spack/repos/builtin/packages/flamemaster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/flann/package.py b/var/spack/repos/builtin/packages/flann/package.py index cea89ef01ea58d..301d1d88f5d4a6 100644 --- a/var/spack/repos/builtin/packages/flann/package.py +++ b/var/spack/repos/builtin/packages/flann/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Flann(CMakePackage): homepage = "https://github.com/mariusmuja/flann" url = "https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz" + license("BSD-3-Clause") + version("1.9.2", sha256="e26829bb0017f317d9cc45ab83ddcb8b16d75ada1ae07157006c1e7d601c8824") version("1.9.1", sha256="b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3") version("1.8.5", sha256="59a9925dac0705b281496ae52b5dfd79d6b69316d37015e3d3b38c859bac4f2f") @@ -121,8 +123,4 @@ def cmake_args(self): use_mpi = "ON" if "+mpi" in spec else "OFF" args.append("-DUSE_MPI:BOOL={0}".format(use_mpi)) - # Configure the proper python executable - if "+python" in spec: - args.append("-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/flap/package.py b/var/spack/repos/builtin/packages/flap/package.py index e13e00a471cf7d..082ff297e6d7a2 100644 --- a/var/spack/repos/builtin/packages/flap/package.py +++ b/var/spack/repos/builtin/packages/flap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Flap(CMakePackage): maintainers("fluidnumerics-joe") + license("GPL-3.0-only") + version("master", branch="master", submodules=True) def flag_handler(self, name, flags): diff --git a/var/spack/repos/builtin/packages/flash/package.py b/var/spack/repos/builtin/packages/flash/package.py index 78451f9ddf99e4..8cd9e98f5afc8b 100644 --- a/var/spack/repos/builtin/packages/flash/package.py +++ b/var/spack/repos/builtin/packages/flash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Flash(MakefilePackage): homepage = "https://ccb.jhu.edu/software/FLASH/" url = "https://sourceforge.net/projects/flashpage/files/FLASH-1.2.11.tar.gz" + license("GPL-3.0-or-later") + version("1.2.11", sha256="685ca6f7fedda07434d8ee03c536f4763385671c4509c5bb48beb3055fd236ac") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/flashdimmsim/package.py b/var/spack/repos/builtin/packages/flashdimmsim/package.py index 1784b1f03d5a05..9f2bc1574ae6ff 100644 --- a/var/spack/repos/builtin/packages/flashdimmsim/package.py +++ b/var/spack/repos/builtin/packages/flashdimmsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/flatbuffers/package.py b/var/spack/repos/builtin/packages/flatbuffers/package.py index 439979142fd39d..7613821016f10f 100644 --- a/var/spack/repos/builtin/packages/flatbuffers/package.py +++ b/var/spack/repos/builtin/packages/flatbuffers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Flatbuffers(CMakePackage): homepage = "https://google.github.io/flatbuffers/" url = "https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz" + license("Apache-2.0") + version("2.0.6", sha256="e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9") version("2.0.0", sha256="9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4") version("1.12.0", sha256="62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45") diff --git a/var/spack/repos/builtin/packages/flatcc/package.py b/var/spack/repos/builtin/packages/flatcc/package.py index b011c33495bc34..ae0fdd2fca0574 100644 --- a/var/spack/repos/builtin/packages/flatcc/package.py +++ b/var/spack/repos/builtin/packages/flatcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Flatcc(CMakePackage): url = "https://github.com/dvidelabs/flatcc/archive/v0.5.3.tar.gz" git = "https://github.com/dvidelabs/flatcc.git" + license("Apache-2.0") + version("0.5.3", sha256="d7519a97569ebdc9d12b162be0f9861fdc2724244f68595264a411ac48e4e983") version("0.5.2", sha256="02dac93d3daf8d0a290aa8711a9b8a53f047436ec5331adb1972389061ec6615") version("0.5.1", sha256="8c4560ca32e3c555716d9363bed469e2c60e0f443ec32bc08e7abfe681e25ca9") diff --git a/var/spack/repos/builtin/packages/flcl/package.py b/var/spack/repos/builtin/packages/flcl/package.py index 31ba3ed59b38ee..dad907c1f7b9cc 100644 --- a/var/spack/repos/builtin/packages/flcl/package.py +++ b/var/spack/repos/builtin/packages/flcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Flcl(CMakePackage): maintainers("womeld", "agaspar") + license("BSD-3-Clause") + version("develop", branch="develop") version("0.99.0", sha256="edb8310154e5e5cf315dad63cd59f13b2537e0ba698869ce9757b04e38047464") version("0.5.0", sha256="bfd9b9092904eab1135d3bb4c458a50653b3325c176a722af56f158da0a16f19") diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py index 3b1cbe8220d204..ef09c6a29f8450 100644 --- a/var/spack/repos/builtin/packages/flecsale/package.py +++ b/var/spack/repos/builtin/packages/flecsale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Flecsale(CMakePackage): homepage = "https://github.com/laristra/flecsale" git = "https://github.com/laristra/flecsale.git" + license("Unlicense") + version("develop", branch="master", submodules=True) variant("mpi", default=True, description="Build on top of mpi conduit for mpi inoperability") diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 1ae350aac74b48..c11b4ecf6aa9e9 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,26 +29,9 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): version("2.1.0", tag="v2.1.0", commit="533df139c267e2a93c268dfe68f9aec55de11cf0") version("2.0.0", tag="v2.0.0", commit="5ceebadf75d1c98999ea9e9446926722d061ec22") version( - "1.4.1", tag="v1.4.1", commit="ab974c3164056e6c406917c8ca771ffd43c5a031", submodules=True - ) - version( - "1.4.develop", - git="https://github.com/laristra/flecsi.git", - branch="1.4", - submodules=True, - deprecated=True, - ) - version( - "1.4.2", - git="https://github.com/laristra/flecsi.git", - tag="v1.4.2", - submodules=True, - deprecated=True, - ) - version( - "flecsph", - git="https://github.com/laristra/flecsi.git", - branch="stable/flecsph", + "1.4.1", + tag="v1.4.1", + commit="ab974c3164056e6c406917c8ca771ffd43c5a031", submodules=True, deprecated=True, ) @@ -63,7 +46,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): variant("shared", default=True, description="Build shared libraries") variant("flog", default=False, description="Enable logging support") variant("graphviz", default=False, description="Enable GraphViz Support") - variant("doc", default=False, description="Enable documentation") + variant("doc", default=False, description="Enable documentation", when="@2.2:") variant("hdf5", default=True, description="Enable HDF5 Support") variant( "caliper_detail", @@ -99,7 +82,6 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): depends_on("metis@5.1.0:") depends_on("parmetis@4.0.3:") depends_on("boost@1.70.0: cxxstd=17 +program_options +stacktrace") - depends_on("legion network=gasnet", when="backend=legion") # FleCSI@1.x depends_on("cmake@3.12:", when="@:1") @@ -130,10 +112,12 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos@3.2.00:", when="+kokkos @2.0:") depends_on("kokkos +cuda +cuda_constexpr +cuda_lambda", when="+kokkos +cuda @2.0:") depends_on("kokkos +rocm", when="+kokkos +rocm @2.0:") + depends_on("kokkos +openmp", when="+kokkos +openmp @2.0:") depends_on("legion@cr", when="backend=legion @2.0:") depends_on("legion+shared", when="backend=legion +shared @2.0:") depends_on("legion+hdf5", when="backend=legion +hdf5 @2.0:") depends_on("legion+kokkos", when="backend=legion +kokkos @2.0:") + depends_on("legion+openmp", when="backend=legion +openmp @2.0:") depends_on("legion+cuda", when="backend=legion +cuda @2.0:") depends_on("legion+rocm", when="backend=legion +rocm @2.0:") depends_on("hdf5@1.10.7:", when="backend=legion +hdf5 @2.0:") @@ -143,11 +127,11 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): depends_on("openmpi@4.1.0:", when="@2.0: ^openmpi") # FleCSI 2.2+ documentation dependencies - depends_on("py-sphinx", when="@2.2: +doc") - depends_on("py-sphinx-rtd-theme", when="@2.2: +doc") - depends_on("py-recommonmark", when="@2.2: +doc") - depends_on("doxygen", when="@2.2: +doc") - depends_on("graphviz", when="@2.2: +doc") + depends_on("py-sphinx", when="+doc") + depends_on("py-sphinx-rtd-theme", when="+doc") + depends_on("py-recommonmark", when="+doc") + depends_on("doxygen", when="+doc") + depends_on("graphviz", when="+doc") # Propagate cuda_arch requirement to dependencies for _flag in CudaPackage.cuda_arch_values: @@ -182,6 +166,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage): # Due to overhauls of Legion and Gasnet spackages # flecsi@:1.4 can no longer be built with a usable legion conflicts("backend=legion", when="@:1.4") + conflicts("+hdf5", when="@2: backend=hpx", msg="HPX backend doesn't support HDF5") def cmake_args(self): spec = self.spec @@ -192,9 +177,7 @@ def cmake_args(self): self.define_from_variant("CALIPER_DETAIL", "caliper_detail"), self.define_from_variant("ENABLE_FLOG", "flog"), self.define_from_variant("ENABLE_GRAPHVIZ", "graphviz"), - self.define( - "ENABLE_HDF5", "+hdf5" in spec and spec.variants["backend"].value != "hpx" - ), + self.define_from_variant("ENABLE_HDF5", "hdf5"), self.define_from_variant("ENABLE_KOKKOS", "kokkos"), self.define_from_variant("ENABLE_OPENMP", "openmp"), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), @@ -205,6 +188,9 @@ def cmake_args(self): if "+rocm" in self.spec: options.append(self.define("CMAKE_CXX_COMPILER", self.spec["hip"].hipcc)) options.append(self.define("CMAKE_C_COMPILER", self.spec["hip"].hipcc)) + if "backend=legion" in self.spec: + # CMake pulled in via find_package(Legion) won't work without this + options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix))) elif "+kokkos" in self.spec: options.append(self.define("CMAKE_CXX_COMPILER", self.spec["kokkos"].kokkos_cxx)) else: @@ -217,7 +203,6 @@ def cmake_args(self): self.define_from_variant("ENABLE_KOKKOS", "kokkos"), self.define_from_variant("ENABLE_OPENMP", "openmp"), self.define_from_variant("ENABLE_DOXYGEN", "doxygen"), - self.define_from_variant("ENABLE_DOCUMENTATION", "doc"), self.define_from_variant("ENABLE_COVERAGE_BUILD", "coverage"), self.define_from_variant("ENABLE_FLOG", "flog"), self.define_from_variant("ENABLE_FLECSIT", "tutorial"), @@ -225,9 +210,7 @@ def cmake_args(self): self.define_from_variant("ENABLE_FLECSTAN", "flecstan"), self.define("ENABLE_MPI", spec.variants["backend"].value != "serial"), self.define("ENABLE_UNIT_TESTS", self.run_tests or "+unit_tests" in spec), - self.define( - "ENABLE_HDF5", "+hdf5" in spec and spec.variants["backend"].value != "hpx" - ), + self.define_from_variant("ENABLE_HDF5", "hdf5"), ] if "+external_cinch" in spec: diff --git a/var/spack/repos/builtin/packages/flecsph/package.py b/var/spack/repos/builtin/packages/flecsph/package.py index 9d7985df08fb3b..0e47ba5ea3794e 100644 --- a/var/spack/repos/builtin/packages/flecsph/package.py +++ b/var/spack/repos/builtin/packages/flecsph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fleur/package.py b/var/spack/repos/builtin/packages/fleur/package.py index a4a2b60cb2d826..ec6c271ad44166 100644 --- a/var/spack/repos/builtin/packages/fleur/package.py +++ b/var/spack/repos/builtin/packages/fleur/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fleur(Package): homepage = "https://www.flapw.de/MaX-5.1" git = "https://iffgit.fz-juelich.de/fleur/fleur.git" + license("MIT") + version("develop", branch="develop") version("5.1", tag="MaX-R5.1", commit="a482abd9511b16412c2222e2ac1b1a303acd454b") version("5.0", tag="MaX-R5", commit="f2df362c3dad6ef39938807ea14e4ec4cb677723") diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 115e18c5019b09..c887e3580b3ccf 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Flex(AutotoolsPackage): executables = ["^flex$"] + license("BSD-2-Clause") + version("2.6.4", sha256="e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995") version( "2.6.3", diff --git a/var/spack/repos/builtin/packages/flexi/package.py b/var/spack/repos/builtin/packages/flexi/package.py index ef0aa67961d027..36e1a6296854b7 100644 --- a/var/spack/repos/builtin/packages/flexi/package.py +++ b/var/spack/repos/builtin/packages/flexi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Flexi(CMakePackage): homepage = "https://www.flexi-project.org/" git = "https://github.com/flexi-framework/flexi.git" + license("GPL-3.0-or-later") + version("master", preferred=True) version("21.03.0", tag="v21.03.0", commit="d061978e5d96cfc96c06edc1bae9d92cbe540c18") diff --git a/var/spack/repos/builtin/packages/flexiblas/package.py b/var/spack/repos/builtin/packages/flexiblas/package.py index b42fc81153b941..369397b1562bf8 100644 --- a/var/spack/repos/builtin/packages/flexiblas/package.py +++ b/var/spack/repos/builtin/packages/flexiblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Flexiblas(CMakePackage): homepage = "https://www.mpi-magdeburg.mpg.de/projects/flexiblas" url = "https://csc.mpi-magdeburg.mpg.de/mpcsc/software/flexiblas/flexiblas-3.0.3.tar.gz" + license("GPL-3.0-or-later") + version("3.3.0", sha256="2696cd63d69b9a007f40f1f4a1ed83ad2fc46f6a930a22753bd221758c503ea2") version("3.2.1", sha256="5be7e508e2dbb751b3bf372639d8e82a11f79e9ef6cbf243b64981c24a5703cf") version("3.2.0", sha256="a3f4d66a30b6fa6473e492de86d34abc5f9d4e69d4d91ba23618388e8df05904") @@ -22,3 +24,6 @@ class Flexiblas(CMakePackage): # virtual dependency provides("blas") provides("lapack") + + def cmake_args(self): + return [self.define("SYSCONFDIR", self.prefix.etc)] diff --git a/var/spack/repos/builtin/packages/flibcpp/package.py b/var/spack/repos/builtin/packages/flibcpp/package.py index a58e572c239176..72e52395444e1f 100644 --- a/var/spack/repos/builtin/packages/flibcpp/package.py +++ b/var/spack/repos/builtin/packages/flibcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Flibcpp(CMakePackage): test_requires_compiler = True + license("MIT") + version("1.0.2", sha256="e2c11c1f58ca830eb7ac7f25d66fc3502c4a8d994192ee30c63a1c3b51aac241") version("1.0.1", sha256="8569c71eab0257097a6aa666a6d86bdcb6cd6e31244d32cc5b2478d0e936ca7a") version("0.5.2", sha256="b9b4eb6431d5b56a54c37f658df7455eafd3d204a5534903b127e0c8a1c9b827") diff --git a/var/spack/repos/builtin/packages/flink/package.py b/var/spack/repos/builtin/packages/flink/package.py index 220d14a89690cc..d8d351ad73fb69 100644 --- a/var/spack/repos/builtin/packages/flink/package.py +++ b/var/spack/repos/builtin/packages/flink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Flink(Package): homepage = "https://flink.apache.org/" url = "https://archive.apache.org/dist/flink/flink-1.9.1/flink-1.9.1-bin-scala_2.11.tgz" + license("BSD-2-Clause") + version("1.9.1", sha256="f69de344cd593e92f8261e19ae8a47b3910e9a70a7cd1ccfb1ecd1ff000b93ea") version("1.9.0", sha256="a2245f68309e94ed54d86a680232a518aed9c5ea030bcc0b298bc8f27165eeb7") version("1.8.3", sha256="1ba90e99f70ad7e2583d48d1404d1c09e327e8fb8fa716b1823e427464cc8dc0") diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index 0483b2979bb6a5..0c3560fb320c50 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Flint(Package): url = "https://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz" git = "https://github.com/wbhart/flint2.git" + license("LGPL-2.1-or-later") + version("develop", branch="trunk") version("2.5.2", sha256="cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87") version("2.4.5", sha256="e489354df00f0d84976ccdd0477028693977c87ccd14f3924a89f848bb0e01e3") diff --git a/var/spack/repos/builtin/packages/flit/package.py b/var/spack/repos/builtin/packages/flit/package.py index 34ce6d378808e1..8aaad29b0098c6 100644 --- a/var/spack/repos/builtin/packages/flit/package.py +++ b/var/spack/repos/builtin/packages/flit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fltk/package.py b/var/spack/repos/builtin/packages/fltk/package.py index 0c5b8b706947dd..f860c05cc5ab0f 100644 --- a/var/spack/repos/builtin/packages/fltk/package.py +++ b/var/spack/repos/builtin/packages/fltk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/flume/package.py b/var/spack/repos/builtin/packages/flume/package.py index ead27adabb6d5b..7a57524b304c87 100644 --- a/var/spack/repos/builtin/packages/flume/package.py +++ b/var/spack/repos/builtin/packages/flume/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Flume(Package): homepage = "https://cwiki.apache.org/FLUME" url = "https://www.apache.org/dist/flume/1.9.0/apache-flume-1.9.0-bin.tar.gz" + license("Apache-2.0") + version("1.9.0", sha256="0373ed5abfd44dc4ab23d9a02251ffd7e3b32c02d83a03546e97ec15a7b23619") version("1.8.0", sha256="be1b554a5e23340ecc5e0b044215bf7828ff841f6eabe647b526d31add1ab5fa") version("1.7.0", sha256="b97254cf37c36b6e5045f764095d86fc6d9a8043dda169e950547fcae35681ec") diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index bb150b154dc9b8..a992b2d3c09c24 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,12 @@ class FluxCore(AutotoolsPackage): maintainers("grondo") + license("LGPL-3.0-only") + version("master", branch="master") + version("0.58.0", sha256="3125ace7d4d3c99b362290344f97db74c06c37b5510cfcb746e1bf48e1dc1389") + version("0.57.0", sha256="a412b8370b5236605a5261c892f48d65c1357a83c88446cd1723236f58a807ce") + version("0.56.0", sha256="dfce5aa21bcb1f990397343cdff8a60542b2d18cbd929e46bdb444d21a961efb") version("0.55.0", sha256="2925b8a084e9d1069a96de7689b515ad6f2051ecfb9fbbe4d2643507de7ccd30") version("0.54.0", sha256="721fc3fff64b3b167ae55d0e29379ff3211729248ef97e3b9855816219063b42") version("0.53.0", sha256="2f14d032a2d54f34e066c8a15c79917089e9f7f8558baa03dbfe63dbf56918b7") diff --git a/var/spack/repos/builtin/packages/flux-pmix/package.py b/var/spack/repos/builtin/packages/flux-pmix/package.py index db6d580a61c5c3..035d85075945dc 100644 --- a/var/spack/repos/builtin/packages/flux-pmix/package.py +++ b/var/spack/repos/builtin/packages/flux-pmix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index df38f938296043..5592f6664acf2f 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,12 @@ class FluxSched(CMakePackage, AutotoolsPackage): maintainers("grondo") + license("LGPL-3.0-only") + version("master", branch="master") + version("0.32.0", sha256="f0b88881f0154057de3dd5485a3e1cfc0b9b64c98052bda7d5fed7c05b5e02f3") + version("0.31.0", sha256="4440156b7f2d43e3db2cbfa0dbc43671074c397525f6b97e3748c3d96a035cdb") + version("0.30.0", sha256="1ccb2e53f4caede0233f19b2707e868f0cee9d2c957a06f97c22936ba9a43552") version("0.29.0", sha256="b93b18788e677535aa8ef945cdbeeced6d1408a4d16cb4a816ead53f31dd78d2") version("0.28.0", sha256="9431c671bed5d76fd95b4a4a7f36224d4bf76f416a2a1a5c4908f3ca790d434d") version("0.27.0", sha256="1e131924440c904fa0c925b7aa14c47b97f4e67b43af7efd2ebc0ef7ce90eb7c") diff --git a/var/spack/repos/builtin/packages/flux-security/package.py b/var/spack/repos/builtin/packages/flux-security/package.py index 71f0081f7125be..1d108f8449ba55 100644 --- a/var/spack/repos/builtin/packages/flux-security/package.py +++ b/var/spack/repos/builtin/packages/flux-security/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,10 @@ class FluxSecurity(AutotoolsPackage): maintainers("grondo") + license("LGPL-3.0-or-later") + 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") diff --git a/var/spack/repos/builtin/packages/fluxbox/package.py b/var/spack/repos/builtin/packages/fluxbox/package.py index c7d7efdd9647ae..4559ad9c80f619 100644 --- a/var/spack/repos/builtin/packages/fluxbox/package.py +++ b/var/spack/repos/builtin/packages/fluxbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fluxbox(AutotoolsPackage): homepage = "http://fluxbox.org/" url = "http://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.7/fluxbox-1.3.7.tar.gz" + license("MIT") + version("1.3.7", sha256="c99e2baa06fff1e96342b20415059d12ff1fa2917ade0173c75b2fa570295b9f") # Referenced:https://sourceforge.net/p/fluxbox/bugs/1171/ diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index 17b7aa4322ec1c..06727b1ccb480e 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Fms(CMakePackage): url = "https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2022.04.tar.gz" git = "https://github.com/NOAA-GFDL/FMS.git" + license("LGPL-3.0-or-later") + maintainers("AlexanderRichert-NOAA", "Hang-Lei-NOAA", "edwardhartnett", "rem1776", "climbfuji") version("2023.04", sha256="feb895ea2b3269ca66df296199a36af335f0dc281e2dab2f1bfebb19fd9c22c4") diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index ea7abc909284ec..6ee85c35ed23f4 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,13 @@ class Fmt(CMakePackage): homepage = "https://fmt.dev/" url = "https://github.com/fmtlib/fmt/releases/download/7.1.3/fmt-7.1.3.zip" + git = "https://github.com/fmtlib/fmt.git" maintainers("msimberg") + license("MIT") + + version("10.2.1", sha256="312151a2d13c8327f5c9c586ac6cf7cddc1658e8f53edae0ec56509c8fa516c9") + version("10.2.0", sha256="8a942861a94f8461a280f823041cde8f620a6d8b0e0aacc98c15bb5a9dd92399") version("10.1.1", sha256="b84e58a310c9b50196cda48d5678d5fa0849bca19e5fdba6b684f0ee93ed9d1b") version("10.1.0", sha256="d725fa83a8b57a3cedf238828fa6b167f963041e8f9f7327649bddc68ae316f4") version("10.0.0", sha256="4943cb165f3f587f26da834d3056ee8733c397e024145ca7d2a8a96bb71ac281") @@ -81,6 +86,13 @@ class Fmt(CMakePackage): when="@9.0.0:9.1.0", ) + # Fix compilation with clang in CUDA mode: https://github.com/fmtlib/fmt/issues/3740 + patch( + "https://github.com/fmtlib/fmt/commit/89860eb9013a345608c8144b1aad5f12b0682d7e.patch?full_index=1", + sha256="6ef12fe60a2b3625139c6d29c748dafd81b51e2a0690c1fa37604ed5b15615e0", + when="@10.0.0:10.1.1", + ) + def cmake_args(self): spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index ffd431f18a460c..a9a333dde88b96 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -53,13 +53,16 @@ class FoamExtend(Package): and owner of the OPENFOAM trademark. """ - homepage = "http://www.extend-project.de/" + homepage = "https://sourceforge.net/projects/foam-extend/" + license("GPL-3.0-only") + + version("5.0", git="http://git.code.sf.net/p/foam-extend/foam-extend-5.0.git") version("4.1", git="http://git.code.sf.net/p/foam-extend/foam-extend-4.1.git") version("4.0", git="http://git.code.sf.net/p/foam-extend/foam-extend-4.0.git") version("3.2", git="http://git.code.sf.net/p/foam-extend/foam-extend-3.2.git") - version("3.1", git="http://git.code.sf.net/p/foam-extend/foam-extend-3.1.git") - version("3.0", git="http://git.code.sf.net/p/foam-extend/foam-extend-3.0.git") + version("3.1", git="http://git.code.sf.net/p/foam-extend/foam-extend-3.1.git", deprecated=True) + version("3.0", git="http://git.code.sf.net/p/foam-extend/foam-extend-3.0.git", deprecated=True) # variant('int64', default=False, # description='Compile with 64-bit label') @@ -87,6 +90,7 @@ class FoamExtend(Package): # mgridgen is statically linked depends_on("parmgridgen", when="+parmgridgen", type="build") depends_on("paraview@:5.0.1", when="+paraview") + depends_on("mesquite") # General patches common = ["spack-Allwmake", "README-spack"] @@ -201,10 +205,28 @@ def archlib(self): """Relative location of architecture-specific libraries""" return join_path("lib", self.foam_arch) + def rename_source(self): + """The github tarfiles have weird names that do not correspond to the + canonical name. We need to rename these, but leave a symlink for + spack to work with. + """ + # Note that this particular Foam-Extned requires absolute directories + # to build correctly! + parent = os.path.dirname(self.stage.source_path) + original = os.path.basename(self.stage.source_path) + target = "foam-extend-{0}".format(self.version) + # Could also grep through etc/bashrc for WM_PROJECT_VERSION + with working_dir(parent): + if original != target and not os.path.lexists(target): + os.rename(original, target) + os.symlink(target, original) + tty.info("renamed {0} -> {1}".format(original, target)) + def patch(self): """Adjust OpenFOAM build for spack. Where needed, apply filter as an alternative to normal patching.""" add_extra_files(self, self.common, self.assets) + self.rename_source() # Adjust ParMGridGen - this is still a mess files = [ @@ -262,6 +284,12 @@ def configure(self, spec, prefix): "flex": {"FLEX_SYSTEM": 1, "FLEX_DIR": spec["flex"].prefix}, "bison": {"BISON_SYSTEM": 1, "BISON_DIR": spec["flex"].prefix}, "zlib": {"ZLIB_SYSTEM": 1, "ZLIB_DIR": spec["zlib-api"].prefix}, + "mesquite": { + "MESQUITE_SYSTEM": 1, + "MESQUITE_DIR": spec["mesquite"].prefix, + "MESQUITE_INCLUDE_DIR": spec["mesquite"].prefix.include, + "NESQUITE_LIB_DIR": spec["mesquite"].prefix.lib, + }, } # Adjust configuration via prefs - sort second self.etc_prefs["001"].update(self.foam_arch.foam_dict()) diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py index b099f73e7be8d4..f621fe475c0ce6 100644 --- a/var/spack/repos/builtin/packages/folly/package.py +++ b/var/spack/repos/builtin/packages/folly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,9 @@ class Folly(CMakePackage): homepage = "https://github.com/facebook/folly" url = "https://github.com/facebook/folly/releases/download/v2021.05.24.00/folly-v2021.05.24.00.tar.gz" + + license("MIT") + version( "2021.05.24.00", sha256="9d308adefe4670637f5c7d96309b3b394ac3fa129bc954f5dfbdd8b741c02aad" ) diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index fbfe503621d974..8dddef8645b34f 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class FontUtil(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/font/util" xorg_mirror_path = "font/font-util-1.3.1.tar.gz" + license("custom") + version("1.4.0", sha256="30b90fe52347916be9b08f95f717f17c9c1f58bef8cabb49014d0fdd2b0df643") version("1.3.2", sha256="f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76") version("1.3.1", sha256="34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b") diff --git a/var/spack/repos/builtin/packages/fontcacheproto/package.py b/var/spack/repos/builtin/packages/fontcacheproto/package.py index d41187b5edf5fc..50c66ff1a8ef2c 100644 --- a/var/spack/repos/builtin/packages/fontcacheproto/package.py +++ b/var/spack/repos/builtin/packages/fontcacheproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Fontcacheproto(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/fontcacheproto" xorg_mirror_path = "proto/fontcacheproto-0.1.3.tar.gz" + license("BSD-2-Clause") + version("0.1.3", sha256="759b4863b55a25bfc8f977d8ed969da0b99b3c823f33c674d6da5825f9df9a79") diff --git a/var/spack/repos/builtin/packages/fontconfig/package.py b/var/spack/repos/builtin/packages/fontconfig/package.py index d45b261d133aa4..f9fcba28e41b6c 100644 --- a/var/spack/repos/builtin/packages/fontconfig/package.py +++ b/var/spack/repos/builtin/packages/fontconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fontconfig(AutotoolsPackage): homepage = "https://www.freedesktop.org/wiki/Software/fontconfig/" url = "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.3.tar.gz" + license("MIT") + version("2.14.2", sha256="3ba2dd92158718acec5caaf1a716043b5aa055c27b081d914af3ccb40dce8a55") version("2.13.94", sha256="246d1640a7e54fba697b28e4445f4d9eb63dda1b511d19986249368ee7191882") version("2.13.93", sha256="0f302a18ee52dde0793fe38b266bf269dfe6e0c0ae140e30d72c6cca5dc08db5") diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py index ed5c4f25c807bb..f5bdd2b2f171a5 100644 --- a/var/spack/repos/builtin/packages/fontsproto/package.py +++ b/var/spack/repos/builtin/packages/fontsproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py index d9624b202c68f6..bcda2bee772c21 100644 --- a/var/spack/repos/builtin/packages/fonttosfnt/package.py +++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fonttosfnt(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/fonttosfnt" xorg_mirror_path = "app/fonttosfnt-1.0.4.tar.gz" + license("MIT") + version("1.2.2", sha256="8111317c38f63aff08c717595e65381af7ebfc54ccc23511c2042ef1cd86c648") version("1.0.4", sha256="3873636be5b3b8e4160070e8f9a7a9221b5bd5efbf740d7abaa9092e10732673") diff --git a/var/spack/repos/builtin/packages/foonathan-memory/package.py b/var/spack/repos/builtin/packages/foonathan-memory/package.py index 6ff55036c1a53a..4c288031bd4638 100644 --- a/var/spack/repos/builtin/packages/foonathan-memory/package.py +++ b/var/spack/repos/builtin/packages/foonathan-memory/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class FoonathanMemory(CMakePackage): homepage = "https://memory.foonathan.net/" url = "https://github.com/foonathan/memory/archive/v0.7.tar.gz" + license("Zlib") + version("0.7-3", sha256="4203d15db22a94a3978eeb1afb59a37d35c57c0f148733f0f1a53a6281cb74dd") version("0.7", sha256="01a7cc5a5ebddbd71bec69c89562a4a2ecd7c29334c0a29d38d83e7f7f66eb53") diff --git a/var/spack/repos/builtin/packages/form/package.py b/var/spack/repos/builtin/packages/form/package.py index 13c303ca508802..0cd7a1a85d174d 100644 --- a/var/spack/repos/builtin/packages/form/package.py +++ b/var/spack/repos/builtin/packages/form/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,7 +11,9 @@ 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") + + license("GPL-3.0-only") version("4.3.1", sha256="f1f512dc34fe9bbd6b19f2dfef05fcb9912dfb43c8368a75b796ec472ee8bbce") version("4.3.0", sha256="b234e0d095f73ecb0904cdc3b0d8d8323a9fa7f46770a52fb22267c624aafbf6") diff --git a/var/spack/repos/builtin/packages/formetis/package.py b/var/spack/repos/builtin/packages/formetis/package.py index 71dd87d0667d48..747eaa9eaf7636 100644 --- a/var/spack/repos/builtin/packages/formetis/package.py +++ b/var/spack/repos/builtin/packages/formetis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Formetis(CMakePackage): test_requires_compiler = True + license("MIT") + version("0.0.2", sha256="0067c03ca822f4a3955751acb470f21eed489256e2ec5ff24741eb2b638592f1") variant("mpi", default=False, description="Enable ParMETIS support") diff --git a/var/spack/repos/builtin/packages/fortran/package.py b/var/spack/repos/builtin/packages/fortran/package.py index 9cbcdc7fd30dcf..082d1224c64288 100644 --- a/var/spack/repos/builtin/packages/fortran/package.py +++ b/var/spack/repos/builtin/packages/fortran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fortrilinos/package.py b/var/spack/repos/builtin/packages/fortrilinos/package.py index f1a51a8909ceb3..a90a954f6f20af 100644 --- a/var/spack/repos/builtin/packages/fortrilinos/package.py +++ b/var/spack/repos/builtin/packages/fortrilinos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Fortrilinos(CMakePackage): tags = ["e4s"] test_requires_compiler = True + license("BSD-3-Clause") + version("2.3.0", sha256="7be5efecaea61ad773d3fe182aa28735ebc3e7af821e1805ad284e4ed4e31a49") version("2.2.0", sha256="9e73fc71066bfaf7cde040e1467baf7a1ec797ff2874add49f9741e93f9fffb5") version("2.1.0", sha256="2c62bb6106ae86a804497d549080cb6877c5d860b6bf2e72ec5cbcbbe63e3b5b") diff --git a/var/spack/repos/builtin/packages/fossil/package.py b/var/spack/repos/builtin/packages/fossil/package.py index 4ce3c6a45ab5bd..6c62b5b4a526fc 100644 --- a/var/spack/repos/builtin/packages/fossil/package.py +++ b/var/spack/repos/builtin/packages/fossil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Fossil(AutotoolsPackage): maintainers("eschnett") + license("BSD-2-Clause") + version( "2.18", url="https://fossil-scm.org/home/tarball/84f25d7eb10c0714109d69bb2809abfa8b4b5c3d73b151a5b10df724dacd46d8/fossil-src-2.18.tar.gz", diff --git a/var/spack/repos/builtin/packages/foundationdb/package.py b/var/spack/repos/builtin/packages/foundationdb/package.py index 61754d67814d41..710bdde1504958 100644 --- a/var/spack/repos/builtin/packages/foundationdb/package.py +++ b/var/spack/repos/builtin/packages/foundationdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Foundationdb(CMakePackage): homepage = "https://www.foundationdb.org/" url = "https://github.com/apple/foundationdb/archive/6.3.3.tar.gz" + license("Apache-2.0") + version("6.3.4", sha256="80a3d7f005b42e7b63abd27728f4d7f4088eea65aafb6942424c97a704b60fd4") version("6.3.3", sha256="1fd46c2281ea283d17fc5044c57a3dbef371a3ed31733abf38610c459a4ed79d") version("6.3.2", sha256="e930510937f8db3aba73262494eedcafb75cd3f523a8b5cd8254250af5da6086") diff --git a/var/spack/repos/builtin/packages/fox/package.py b/var/spack/repos/builtin/packages/fox/package.py index 2d0166e3fcf496..98e44974736447 100644 --- a/var/spack/repos/builtin/packages/fox/package.py +++ b/var/spack/repos/builtin/packages/fox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Fox(AutotoolsPackage): homepage = "http://fox-toolkit.org/" url = "http://fox-toolkit.org/ftp/fox-1.7.67.tar.gz" + license("LGPL-3.0-or-later") + version("1.7.67", sha256="7e511685119ef096fa90d334da46f0e50cfed8d414df32d80a7850442052f57d") version( "1.6.57", diff --git a/var/spack/repos/builtin/packages/fp16/package.py b/var/spack/repos/builtin/packages/fp16/package.py index 5e56aec0113a74..d971dc6a1ebf18 100644 --- a/var/spack/repos/builtin/packages/fp16/package.py +++ b/var/spack/repos/builtin/packages/fp16/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Fp16(CMakePackage): homepage = "https://github.com/Maratyszcza/FP16/" git = "https://github.com/Maratyszcza/FP16.git" + license("MIT") + version("master", branch="master") version("2020-05-14", commit="4dfe081cf6bcd15db339cf2680b9281b8451eeb3") # py-torch@1.5: version("2018-11-28", commit="febbb1c163726b5db24bed55cc9dc42529068997") # py-torch@1.1:1.4 diff --git a/var/spack/repos/builtin/packages/fpart/package.py b/var/spack/repos/builtin/packages/fpart/package.py index 1a6d36331c935d..e0da5fae0134d0 100644 --- a/var/spack/repos/builtin/packages/fpart/package.py +++ b/var/spack/repos/builtin/packages/fpart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,13 +17,34 @@ class Fpart(AutotoolsPackage): maintainers("drkrynstrng") + license("BSD-2-Clause") + version("master", branch="master") + version("1.6.0", sha256="ed1fac2853fc421071b72e4c5d8455a231bc30e50034db14af8b0485ece6e097") version("1.5.1", sha256="c353a28f48e4c08f597304cb4ebb88b382f66b7fabfc8d0328ccbb0ceae9220c") + variant("embfts", default=False, description="Build with embedded fts functions") + variant("static", default=False, description="Build static binary") + variant("debug", default=False, description="Build with debugging support") + # fpsync has the following run dependencies, at least one is required + variant( + "fpsynctools", + default="rsync", + values=("rsync", "tar", "cpio"), + multi=True, + description="Tools used by fpsync to copy files", + ) + depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - # fpsync has the following run dependencies - depends_on("rsync", type="run") - depends_on("tar", type="run") - depends_on("cpio", type="run") + depends_on("rsync", when="fpsynctools=rsync", type="run") + depends_on("tar", when="fpsynctools=tar", type="run") + depends_on("cpio", when="fpsynctools=cpio", type="run") + + def configure_args(self): + config_args = [] + config_args.extend(self.enable_or_disable("embfts")) + config_args.extend(self.enable_or_disable("static")) + config_args.extend(self.enable_or_disable("debug")) + return config_args diff --git a/var/spack/repos/builtin/packages/fpc/package.py b/var/spack/repos/builtin/packages/fpc/package.py index 895fcfd30bb0ce..611aa3bd610037 100644 --- a/var/spack/repos/builtin/packages/fpc/package.py +++ b/var/spack/repos/builtin/packages/fpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fpc(Package): homepage = "https://www.freepascal.org/" url = "https://downloads.sourceforge.net/project/freepascal/Linux/3.0.2/fpc-3.0.2.x86_64-linux.tar" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("3.0.2", sha256="b5b27fdbc31b1d05b6a898f3c192d8a5083050562b29c19eb9eb018ba4482bd8") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/fpchecker/package.py b/var/spack/repos/builtin/packages/fpchecker/package.py index ca832e9d3f030b..0607838e56c6d9 100644 --- a/var/spack/repos/builtin/packages/fpchecker/package.py +++ b/var/spack/repos/builtin/packages/fpchecker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Fpchecker(CMakePackage): maintainers("ilagunap") + license("Apache-2.0") + version("master", branch="master") version("0.4.0", sha256="59d18a3fb5211645bb1cfde1502ba78a9cca4234604dfd879534d7f13ae5d5b9") version("0.3.5", sha256="ed7277318af8e0a22b05c5655c9acc99e1d3036af41095ec2f1b1ada4d6e90f6") diff --git a/var/spack/repos/builtin/packages/fping/package.py b/var/spack/repos/builtin/packages/fping/package.py index 3cfa7753f95995..5a243a48082036 100644 --- a/var/spack/repos/builtin/packages/fping/package.py +++ b/var/spack/repos/builtin/packages/fping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fping(AutotoolsPackage): homepage = "https://fping.org/" url = "https://github.com/schweikert/fping/archive/v4.2.tar.gz" + license("MIT") + version("5.1", sha256="3ec5cdae259a948956b1146b2ecb66276eee4206a77201251833922eca0de7f4") version("4.2", sha256="49b0ac77fd67c1ed45c9587ffab0737a3bebcfa5968174329f418732dbf655d4") version("4.1", sha256="1da45b1d8c2d38b52bebd4f8b1617ddfae678e9f6436dafa6f62e97b8ecfc93c") diff --git a/var/spack/repos/builtin/packages/fplll/package.py b/var/spack/repos/builtin/packages/fplll/package.py index 005becbf2e28e1..4186175b510905 100644 --- a/var/spack/repos/builtin/packages/fplll/package.py +++ b/var/spack/repos/builtin/packages/fplll/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fplll(AutotoolsPackage): homepage = "https://github.com/fplll/fplll" url = "https://github.com/fplll/fplll/releases/download/5.4.0/fplll-5.4.0.tar.gz" + license("LGPL-2.1-or-later") + version("5.4.4", sha256="0fd9d378f04ff886d8864728baf5d90b8b0b82c1e541e92550644fb54f75691d") version("5.4.1", sha256="7bd887957173aa592091772c1c36f6aa606b3b2ace0d14e2c26c7463dcf2deb7") version("5.4.0", sha256="fe192a65a56439b098e26e3b7ee224dda7c2c73a58f36ef2cc6f9185ae8c482b") diff --git a/var/spack/repos/builtin/packages/fplo/package.py b/var/spack/repos/builtin/packages/fplo/package.py index a9e8cbc2c2fb11..f294fc05d346ac 100644 --- a/var/spack/repos/builtin/packages/fplo/package.py +++ b/var/spack/repos/builtin/packages/fplo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fpm/package.py b/var/spack/repos/builtin/packages/fpm/package.py index 6c8d1811bb79f6..a8c410e31a0aa7 100644 --- a/var/spack/repos/builtin/packages/fpm/package.py +++ b/var/spack/repos/builtin/packages/fpm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,9 @@ class Fpm(Package): maintainers("awvwgk") + license("MIT") + + version("0.10.0", sha256="00d687e17bdada4dcae0ff1ea2e01bad287dcc77a74c3bbde0c9ff9633b655bb") version("0.9.0", sha256="484debabd7d22186ac41f865ddf63475c279a61a51aaff5636ed615860b5b8d7") version("0.8.2", sha256="67fd8f4f78d19662c61855f531465e347ab0bc913ba59bd419f75f4022d2cd70") version("0.8.1", sha256="0bd978bb1d3f2a3297d82a0d6ac009746a466cfa9a59ba3b6513b74e5ce4b7bf") diff --git a/var/spack/repos/builtin/packages/fpocket/package.py b/var/spack/repos/builtin/packages/fpocket/package.py index bf8d64aa9e8e12..3b50ee68832398 100644 --- a/var/spack/repos/builtin/packages/fpocket/package.py +++ b/var/spack/repos/builtin/packages/fpocket/package.py @@ -1,9 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.build_systems import makefile from spack.package import * @@ -14,16 +15,23 @@ class Fpocket(MakefilePackage): homepage = "https://github.com/Discngine/fpocket" url = "https://github.com/Discngine/fpocket/archive/refs/tags/4.1.tar.gz" + license("MIT") + version("4.1", "1a2af2d3f2df42de67301996db3b93c7eaff0375f866443c0468dcf4b1750688") depends_on("netcdf-c") depends_on("netcdf-cxx") + depends_on("qhull") + +class MakefileBuilder(makefile.MakefileBuilder): def setup_build_environment(self, env): - if self.compiler.name == "gcc": + if self.pkg.compiler.name == "gcc": env.set("CXX", "g++") - def edit(self, spec, prefix): + def edit(self, pkg, spec, prefix): + mkdirp(prefix.lib) makefile = FileFilter("makefile") makefile.filter("BINDIR .*", f"BINDIR = {prefix}/bin") makefile.filter("MANDIR .*", f"MANDIR = {prefix}/man/man8") + makefile.filter("LIBDIR .*", f"LIBDIR = {prefix}/lib") diff --git a/var/spack/repos/builtin/packages/fpzip/package.py b/var/spack/repos/builtin/packages/fpzip/package.py index 269ce21bcd9570..7a5c011b196eda 100644 --- a/var/spack/repos/builtin/packages/fpzip/package.py +++ b/var/spack/repos/builtin/packages/fpzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class Fpzip(CMakePackage): maintainers("robertu94") + license("BSD-3-Clause") + version("master", branch="master") version("1.3.0", sha256="248df7d84259e3feaa4c4797956b2a77c3fcd734e8f8fdc51ce171dcf4f0136c") diff --git a/var/spack/repos/builtin/packages/fq/package.py b/var/spack/repos/builtin/packages/fq/package.py index e0b73c3906bba4..edd4446e1840e4 100644 --- a/var/spack/repos/builtin/packages/fq/package.py +++ b/var/spack/repos/builtin/packages/fq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Fq(Package): url = "https://github.com/stjude-rust-labs/fq/archive/refs/tags/v0.10.0.tar.gz" maintainers("pabloaledo") + license("MIT") + version("0.10.0", sha256="34007ab71a873e1b066d910e90c5bdac3dcc4299ae6c9891ac6d8233cffeabb8") depends_on("rust") diff --git a/var/spack/repos/builtin/packages/fqtrim/package.py b/var/spack/repos/builtin/packages/fqtrim/package.py index ea8ced3ae10697..88d80ee3459344 100644 --- a/var/spack/repos/builtin/packages/fqtrim/package.py +++ b/var/spack/repos/builtin/packages/fqtrim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Fqtrim(MakefilePackage): homepage = "https://ccb.jhu.edu/software/fqtrim/" url = "https://ccb.jhu.edu/software/fqtrim/dl/fqtrim-0.9.7.tar.gz" + license("Artistic-2.0") + version("0.9.7", sha256="4951538f69dde14a23fc4841ff020434d26eb9622c4e06b43c068c702aa3d0d6") def build(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/fr-hit/package.py b/var/spack/repos/builtin/packages/fr-hit/package.py index 09b6cf06ac273d..93ab62e574192b 100644 --- a/var/spack/repos/builtin/packages/fr-hit/package.py +++ b/var/spack/repos/builtin/packages/fr-hit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class FrHit(Package): homepage = "http://weizhong-lab.ucsd.edu/frhit" url = "http://weizhong-lab.ucsd.edu/frhit/fr-hit-v0.7.1-2013-02-20.tar.gz" + license("MIT") + version( "0.7.1-2013-02-20", sha256="44dcfeb73106529fcefb02c017ec7b95b04b6523a2a57683b2bc905c142e62eb", diff --git a/var/spack/repos/builtin/packages/fraggenescan/package.py b/var/spack/repos/builtin/packages/fraggenescan/package.py index 50ef68c0f3a35e..89aab4e7368b40 100644 --- a/var/spack/repos/builtin/packages/fraggenescan/package.py +++ b/var/spack/repos/builtin/packages/fraggenescan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/freebayes/package.py b/var/spack/repos/builtin/packages/freebayes/package.py index f54c7955211c23..003a652cd7528d 100644 --- a/var/spack/repos/builtin/packages/freebayes/package.py +++ b/var/spack/repos/builtin/packages/freebayes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Freebayes(MesonPackage): url = "https://github.com/freebayes/freebayes/releases/download/v1.3.5/freebayes-1.3.5-src.tar.gz" git = "https://github.com/ekg/freebayes.git" + license("MIT") + version("1.3.6", sha256="6016c1e58fdf34a1f6f77b720dd8e12e13a127f7cbac9c747e47954561b437f5") version("1.3.5", sha256="7e2635690e916ed85cec36b3263e6e5357413a4f2bf3035362d9749335e8a696") version( diff --git a/var/spack/repos/builtin/packages/freecad/package.py b/var/spack/repos/builtin/packages/freecad/package.py index fa0ee537518397..1a395a5dad3d3a 100644 --- a/var/spack/repos/builtin/packages/freecad/package.py +++ b/var/spack/repos/builtin/packages/freecad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Freecad(CMakePackage): maintainers("aweits") + license("LGPL-2.0-or-later") + version("0.20.2", sha256="46922f3a477e742e1a89cd5346692d63aebb2b67af887b3e463e094a4ae055da") depends_on("opencascade") diff --git a/var/spack/repos/builtin/packages/freefem/package.py b/var/spack/repos/builtin/packages/freefem/package.py index 0f00f844cb6d3c..712a1b9b96baf5 100644 --- a/var/spack/repos/builtin/packages/freefem/package.py +++ b/var/spack/repos/builtin/packages/freefem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/freeglut/package.py b/var/spack/repos/builtin/packages/freeglut/package.py index 9114f6e1e2a943..993f4dc29e26f0 100644 --- a/var/spack/repos/builtin/packages/freeglut/package.py +++ b/var/spack/repos/builtin/packages/freeglut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Freeglut(CMakePackage, SourceforgePackage): homepage = "http://freeglut.sourceforge.net/" sourceforge_mirror_path = "freeglut/freeglut-3.2.1.tar.gz" + license("MIT") + version("3.2.2", sha256="c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50") version("3.2.1", sha256="d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68") version("3.0.0", sha256="2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2") diff --git a/var/spack/repos/builtin/packages/freeimage/package.py b/var/spack/repos/builtin/packages/freeimage/package.py index 3b216a70845f68..a0e6ae2e2608f3 100644 --- a/var/spack/repos/builtin/packages/freeimage/package.py +++ b/var/spack/repos/builtin/packages/freeimage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/freeipmi/package.py b/var/spack/repos/builtin/packages/freeipmi/package.py index f6eb5284ce1021..2e2b23a614415e 100644 --- a/var/spack/repos/builtin/packages/freeipmi/package.py +++ b/var/spack/repos/builtin/packages/freeipmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Freeipmi(AutotoolsPackage): homepage = "https://www.gnu.org/software/freeipmi/" url = "https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.4.tar.gz" + license("GPL-3.0-or-later") + version("1.6.9", sha256="f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206") version("1.6.4", sha256="65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c") diff --git a/var/spack/repos/builtin/packages/freesasa/package.py b/var/spack/repos/builtin/packages/freesasa/package.py index 201fbd596527de..65e50b4d7e36b0 100644 --- a/var/spack/repos/builtin/packages/freesasa/package.py +++ b/var/spack/repos/builtin/packages/freesasa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/freesurfer/package.py b/var/spack/repos/builtin/packages/freesurfer/package.py index 0e7188db06c51a..912de00d491162 100644 --- a/var/spack/repos/builtin/packages/freesurfer/package.py +++ b/var/spack/repos/builtin/packages/freesurfer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py index 057bf8d317822d..7545e7578fa79e 100644 --- a/var/spack/repos/builtin/packages/freetype/package.py +++ b/var/spack/repos/builtin/packages/freetype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Freetype(AutotoolsPackage, CMakePackage): maintainers("michaelkuhn") + license("FTL OR GPL-2.0-or-later") + version("2.11.1", sha256="f8db94d307e9c54961b39a1cc799a67d46681480696ed72ecf78d4473770f09b") version("2.11.0", sha256="a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f") version("2.10.4", sha256="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac") diff --git a/var/spack/repos/builtin/packages/freexl/package.py b/var/spack/repos/builtin/packages/freexl/package.py index aa40f253a633a1..4ba17479e18e70 100644 --- a/var/spack/repos/builtin/packages/freexl/package.py +++ b/var/spack/repos/builtin/packages/freexl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fribidi/package.py b/var/spack/repos/builtin/packages/fribidi/package.py index b4d521b3521d43..beea8647cbd4ba 100644 --- a/var/spack/repos/builtin/packages/fribidi/package.py +++ b/var/spack/repos/builtin/packages/fribidi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fribidi(AutotoolsPackage): homepage = "https://github.com/fribidi/fribidi" url = "https://github.com/fribidi/fribidi/releases/download/v1.0.5/fribidi-1.0.5.tar.bz2" + license("LGPL-2.1-or-later") + version("1.0.12", sha256="0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495") version("1.0.8", sha256="94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c") version("1.0.5", sha256="6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce") diff --git a/var/spack/repos/builtin/packages/frontier-client/package.py b/var/spack/repos/builtin/packages/frontier-client/package.py index a25c0c854f6d2b..2c9d9f03a71a1b 100644 --- a/var/spack/repos/builtin/packages/frontier-client/package.py +++ b/var/spack/repos/builtin/packages/frontier-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/frontistr/package.py b/var/spack/repos/builtin/packages/frontistr/package.py index c86304e00e93a6..0691a409352523 100644 --- a/var/spack/repos/builtin/packages/frontistr/package.py +++ b/var/spack/repos/builtin/packages/frontistr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,6 +50,8 @@ class Frontistr(FrontistrBase): maintainers("hiroshi.okuda", "kgoto", "morita", "inagaki", "michioga") + license("MIT") + version("5.3", tag="v5.3", commit="5db1d80452b951905658da828285c2fd0537603c") version("5.2", tag="v5.2", commit="c66bdc397de319ca59a0565b3f3b1a3b33f0c50c") version("5.1.1", tag="v5.1.1", commit="57e9bbd529a6062f55e03c884b59af22f920eef1") diff --git a/var/spack/repos/builtin/packages/fseq/package.py b/var/spack/repos/builtin/packages/fseq/package.py index aaccdaf565b8a1..ca548b71ea42b5 100644 --- a/var/spack/repos/builtin/packages/fseq/package.py +++ b/var/spack/repos/builtin/packages/fseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fsl/package.py b/var/spack/repos/builtin/packages/fsl/package.py index add8cce02c0d8c..cae1ff6ecd233f 100644 --- a/var/spack/repos/builtin/packages/fsl/package.py +++ b/var/spack/repos/builtin/packages/fsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py index e052da19127166..d08250cc2f9eb8 100644 --- a/var/spack/repos/builtin/packages/fslsfonts/package.py +++ b/var/spack/repos/builtin/packages/fslsfonts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py index e6d6764469d786..2d316b44743d55 100644 --- a/var/spack/repos/builtin/packages/fstobdf/package.py +++ b/var/spack/repos/builtin/packages/fstobdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fstrack/package.py b/var/spack/repos/builtin/packages/fstrack/package.py index 3578ea085a021c..4a0da90af87e3e 100644 --- a/var/spack/repos/builtin/packages/fstrack/package.py +++ b/var/spack/repos/builtin/packages/fstrack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Fstrack(MakefilePackage): homepage = "http://www-udc.ig.utexas.edu/external/becker/data.html#fstrack" url = "http://www-udc.ig.utexas.edu/external/becker/software/fstrack-0.5.3.092918.tgz" + license("Unlicense") + version( "0.5.3.092918", sha256="34b31687fdfa207b9659425238b805eaacf0b0209e7e3343c1a3cb4c9e62345d" ) diff --git a/var/spack/repos/builtin/packages/ftgl/package.py b/var/spack/repos/builtin/packages/ftgl/package.py index 01a04cb57e227b..d9ac0dba6dbb65 100644 --- a/var/spack/repos/builtin/packages/ftgl/package.py +++ b/var/spack/repos/builtin/packages/ftgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ftgl(CMakePackage): homepage = "https://github.com/frankheckenbach/ftgl" git = "https://github.com/frankheckenbach/ftgl.git" + license("MIT") + version("master", branch="master") version("2.4.0", commit="483639219095ad080538e07ceb5996de901d4e74") version("2.3.1", commit="3c0fdf367824b6381f29df3d8b4590240db62ab7") diff --git a/var/spack/repos/builtin/packages/ftjam/package.py b/var/spack/repos/builtin/packages/ftjam/package.py index d912268334d2c6..c54a9427e0ebbb 100644 --- a/var/spack/repos/builtin/packages/ftjam/package.py +++ b/var/spack/repos/builtin/packages/ftjam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ftk/package.py b/var/spack/repos/builtin/packages/ftk/package.py index f3e4e0f8a8c795..44276329c4f26d 100644 --- a/var/spack/repos/builtin/packages/ftk/package.py +++ b/var/spack/repos/builtin/packages/ftk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ftk(CMakePackage): # notify when the package is updated. maintainers("hguo") + license("MIT") + version("master", branch="master") version("dev", branch="dev") version("0.0.7.1", sha256="6090fd436f971316062dbb4fcbf2c44603ed5c29341df8f2b80b85770a3bcda2") diff --git a/var/spack/repos/builtin/packages/ftobjectlibrary/package.py b/var/spack/repos/builtin/packages/ftobjectlibrary/package.py index d55c2ffac80ae0..fe0e6c62d2cec2 100644 --- a/var/spack/repos/builtin/packages/ftobjectlibrary/package.py +++ b/var/spack/repos/builtin/packages/ftobjectlibrary/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class Ftobjectlibrary(CMakePackage): maintainers("schoonovernumerics") + license("MIT") + version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/ftxui/package.py b/var/spack/repos/builtin/packages/ftxui/package.py index 16f9fb977b08d1..92b72c0c26c84e 100644 --- a/var/spack/repos/builtin/packages/ftxui/package.py +++ b/var/spack/repos/builtin/packages/ftxui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ftxui(CMakePackage): homepage = "https://arthursonzogni.github.io" url = "https://github.com/ArthurSonzogni/FTXUI/archive/refs/tags/v2.0.0.tar.gz" + license("MIT") + version("4.1.1", sha256="9009d093e48b3189487d67fc3e375a57c7b354c0e43fc554ad31bec74a4bc2dd") version("4.0.0", sha256="7276e4117429ebf8e34ea371c3ea4e66eb99e0f234cb4c5c85fca17174a53dfa") version("2.0.0", sha256="d891695ef22176f0c09f8261a37af9ad5b262dd670a81e6b83661a23abc2c54f") diff --git a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py index b93ed50f928438..29ea363b1d7d56 100644 --- a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,16 +50,7 @@ class FujitsuFftw(FftwBase): when="%fj", msg="ARM-SVE vector instructions only works in single or double precision", ) - conflicts("%arm") - conflicts("%cce") - conflicts("%apple-clang") - conflicts("%clang") - conflicts("%gcc") - conflicts("%intel") - conflicts("%nag") - conflicts("%pgi") - conflicts("%xl") - conflicts("%xl_r") + requires("%fj") def autoreconf(self, spec, prefix): if spec.target != "a64fx": diff --git a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py index fc788e2754197c..06e184f296973d 100644 --- a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class FujitsuFrontistr(FrontistrBase): git = "https://github.com/fujitsu/FrontISTR" maintainers("kinagaki-fj", "kinagaki", "m-shunji") + license("MIT") + version("master", branch="fj-master") version("5.2", sha256="ebf73a96c33ae7c9e616c99f9ce07ec90d802764dbf6abf627b0083c3bbd2b2e") version("5.0", sha256="7a3a2dd0f834048fb71cc254c9da6c2637fb23110e79b5efaf208d6f69a5b30a") diff --git a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py index d765a0f9405c2c..07a66318600980 100644 --- a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,18 +13,8 @@ class FujitsuMpi(Package): homepage = "https://www.fujitsu.com/us/" - conflicts("%arm") - conflicts("%cce") - conflicts("%apple-clang") - conflicts("%clang") - conflicts("%gcc") - conflicts("%intel") - conflicts("%nag") - conflicts("%pgi") - conflicts("%xl") - conflicts("%xl_r") - provides("mpi@3.1:") + requires("%fj") def install(self, spec, prefix): raise InstallError("Fujitsu MPI is not installable; it is vendor supplied") diff --git a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py index d61d40f1261c59..76682cc862d930 100644 --- a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py +++ b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,21 +18,12 @@ class FujitsuSsl2(Package): variant("parallel", default=True, description="Build with thread-parallel versions") - conflicts("%arm") - conflicts("%cce") - conflicts("%apple-clang") - conflicts("%clang") - conflicts("%gcc") - conflicts("%intel") - conflicts("%nag") - conflicts("%pgi") - conflicts("%xl") - conflicts("%xl_r") - provides("blas") provides("lapack") provides("scalapack") + requires("%fj") + def install(self, spec, prefix): raise InstallError( "Fujitsu SSL2 is not installable; it is vendor supplied \ diff --git a/var/spack/repos/builtin/packages/fullock/package.py b/var/spack/repos/builtin/packages/fullock/package.py index 11ae62794abafa..2009c03628ca14 100644 --- a/var/spack/repos/builtin/packages/fullock/package.py +++ b/var/spack/repos/builtin/packages/fullock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fullock(AutotoolsPackage): homepage = "https://antpick.ax/" url = "https://github.com/yahoojapan/fullock/archive/v1.0.36.tar.gz" + license("MIT") + version("1.0.50", sha256="7222976883289376c1b88fd30ecd3ab2f055316103b97df4aa71192954072848") version("1.0.39", sha256="0089d4446e3102b5de39e3d18c1b7e5c9567deb77a4e60963e15b5c1b23a594d") version("1.0.36", sha256="68d0dc9036c2c1871653b4626a594f57663973c159f083ec68647c60ddc919f7") diff --git a/var/spack/repos/builtin/packages/funhpc/package.py b/var/spack/repos/builtin/packages/funhpc/package.py index b9af19619e924a..f9745c18c79b3c 100644 --- a/var/spack/repos/builtin/packages/funhpc/package.py +++ b/var/spack/repos/builtin/packages/funhpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/funwave/package.py b/var/spack/repos/builtin/packages/funwave/package.py index 76b8e6376a95b8..f4b4023dd8018c 100644 --- a/var/spack/repos/builtin/packages/funwave/package.py +++ b/var/spack/repos/builtin/packages/funwave/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/fuse-overlayfs/package.py b/var/spack/repos/builtin/packages/fuse-overlayfs/package.py index a6968e68a58f6f..18112758dc998c 100644 --- a/var/spack/repos/builtin/packages/fuse-overlayfs/package.py +++ b/var/spack/repos/builtin/packages/fuse-overlayfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class FuseOverlayfs(AutotoolsPackage): url = "https://github.com/containers/fuse-overlayfs/archive/v1.1.2.tar.gz" maintainers("haampie") + license("GPL-2.0-or-later") + version("1.10", sha256="4351eaed7cf26a5012c14c6e0fc883ef65a7b5dcc95ba129ce485904106c25a9") version("1.7.1", sha256="fe2c076aed7b8669e7970301a99c0b197759b611035d8199de4c0add7d2fb2b4") version("1.7", sha256="e4d9a794d270e237a38e7ced95af95ad15268e0584eab981ed7c7b3758b95995") diff --git a/var/spack/repos/builtin/packages/fxdiv/package.py b/var/spack/repos/builtin/packages/fxdiv/package.py index 454b8f4b5b3cc9..f9349661692d0a 100644 --- a/var/spack/repos/builtin/packages/fxdiv/package.py +++ b/var/spack/repos/builtin/packages/fxdiv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Fxdiv(CMakePackage): homepage = "https://github.com/Maratyszcza/FXdiv" git = "https://github.com/Maratyszcza/FXdiv.git" + license("MIT") + version("master", branch="master") version("2020-04-17", commit="b408327ac2a15ec3e43352421954f5b1967701d1") # py-torch@1.6:1.9 version("2018-11-16", commit="b742d1143724d646cd0f914646f1240eacf5bd73") # py-torch@1.0:1.5 diff --git a/var/spack/repos/builtin/packages/fxt/package.py b/var/spack/repos/builtin/packages/fxt/package.py index fe0f5261d83fcc..d8039a53dacc81 100644 --- a/var/spack/repos/builtin/packages/fxt/package.py +++ b/var/spack/repos/builtin/packages/fxt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Fxt(AutotoolsPackage): maintainers("nfurmento", "sthibaul") + license("GPL-2.0-only") + version("0.3.14", sha256="317d8d93175cd9f27ec43b8390b6d29dc66114f06aa74f2329847d49baaaebf2") version("0.3.5", sha256="3c0b33c82a01c4fb710c53ee9fc2c803314beba6fb60c397e13e874811e34a22") version("0.3.4", sha256="fcd35a5278ac0f10eba12fed4fa436dce79559897fde5b8176d5eee9081970f7") diff --git a/var/spack/repos/builtin/packages/fyba/package.py b/var/spack/repos/builtin/packages/fyba/package.py index 888758e8c616ed..37653cf3a8a7e1 100644 --- a/var/spack/repos/builtin/packages/fyba/package.py +++ b/var/spack/repos/builtin/packages/fyba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Fyba(AutotoolsPackage): homepage = "https://github.com/kartverket/fyba" url = "https://github.com/kartverket/fyba/archive/4.1.1.tar.gz" + license("Unlicense") + version("4.1.1", sha256="99f658d52e8fd8997118bb6207b9c121500700996d9481a736683474e2534179") # configure: error: cannot find install-sh or install.sh diff --git a/var/spack/repos/builtin/packages/fzf/package.py b/var/spack/repos/builtin/packages/fzf/package.py index 95362138f1ec0c..9b73a7cd13f81b 100644 --- a/var/spack/repos/builtin/packages/fzf/package.py +++ b/var/spack/repos/builtin/packages/fzf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,10 @@ class Fzf(MakefilePackage): executables = ["^fzf$"] + license("MIT") + + version("0.45.0", sha256="f0dd5548f80fe7f80d9277bb8fe252ac6e42a41e76fc85ce0f3af702cd987600") + version("0.44.1", sha256="295f3aec9519f0cf2dce67a14e94d8a743d82c19520e5671f39c71c9ea04f90c") version("0.42.0", sha256="743c1bfc7851b0796ab73c6da7db09d915c2b54c0dd3e8611308985af8ed3df2") version("0.41.1", sha256="982682eaac377c8a55ae8d7491fcd0e888d6c13915d01da9ebb6b7c434d7f4b5") version("0.40.0", sha256="9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65") diff --git a/var/spack/repos/builtin/packages/g2/package.py b/var/spack/repos/builtin/packages/g2/package.py index de4dcd4bcbc175..afd108bb87254b 100644 --- a/var/spack/repos/builtin/packages/g2/package.py +++ b/var/spack/repos/builtin/packages/g2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g2c/package.py b/var/spack/repos/builtin/packages/g2c/package.py index 9f3d93c71ed38b..0a5493ab10b8f4 100644 --- a/var/spack/repos/builtin/packages/g2c/package.py +++ b/var/spack/repos/builtin/packages/g2c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g2o/package.py b/var/spack/repos/builtin/packages/g2o/package.py index 63f76506300354..effc4b3c7c5d19 100644 --- a/var/spack/repos/builtin/packages/g2o/package.py +++ b/var/spack/repos/builtin/packages/g2o/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g2tmpl/package.py b/var/spack/repos/builtin/packages/g2tmpl/package.py index e5a94b4e451877..4a2a2158e90138 100644 --- a/var/spack/repos/builtin/packages/g2tmpl/package.py +++ b/var/spack/repos/builtin/packages/g2tmpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4abla/package.py b/var/spack/repos/builtin/packages/g4abla/package.py index d9ad945f56bb95..710d8de011829c 100644 --- a/var/spack/repos/builtin/packages/g4abla/package.py +++ b/var/spack/repos/builtin/packages/g4abla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,7 @@ class G4abla(Package): maintainers("drbenmorgan") # Only versions relevant to Geant4 releases built by spack are added + version("3.3", sha256="1e041b3252ee9cef886d624f753e693303aa32d7e5ef3bba87b34f36d92ea2b1") version("3.1", sha256="7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed") version("3.0", sha256="99fd4dcc9b4949778f14ed8364088e45fa4ff3148b3ea36f9f3103241d277014") diff --git a/var/spack/repos/builtin/packages/g4emlow/package.py b/var/spack/repos/builtin/packages/g4emlow/package.py index 0601cfca29b3b5..d2f220dd2b6457 100644 --- a/var/spack/repos/builtin/packages/g4emlow/package.py +++ b/var/spack/repos/builtin/packages/g4emlow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class G4emlow(Package): maintainers("drbenmorgan") # Only versions relevant to Geant4 releases built by spack are added + version("8.5", sha256="66baca49ac5d45e2ac10c125b4fb266225e511803e66981909ce9cd3e9bcef73") + version("8.4", sha256="d87de4d2a364cb0a1e1846560525ffc3f735ccdeea8bc426d61775179aebbe8e") version("8.2", sha256="3d7768264ff5a53bcb96087604bbe11c60b7fea90aaac8f7d1252183e1a8e427") version("8.0", sha256="d919a8e5838688257b9248a613910eb2a7633059e030c8b50c0a2c2ad9fd2b3b") version("7.13", sha256="374896b649be776c6c10fea80abe6cf32f9136df0b6ab7c7236d571d49fb8c69") @@ -26,6 +28,7 @@ class G4emlow(Package): version("7.7", sha256="16dec6adda6477a97424d749688d73e9bd7d0b84d0137a67cf341f1960984663") version("7.3", sha256="583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e") version("6.50", sha256="c97be73fece5fb4f73c43e11c146b43f651c6991edd0edf8619c9452f8ab1236") + version("6.35", sha256="1564045a0acad344c8d432cd48c2c3bb2e051a81ab3099a84e0f56ba0fe82cec") def install(self, spec, prefix): mkdirp(join_path(prefix.share, "data")) diff --git a/var/spack/repos/builtin/packages/g4ensdfstate/package.py b/var/spack/repos/builtin/packages/g4ensdfstate/package.py index 09fd398e3dbd17..59fe04f45deebf 100644 --- a/var/spack/repos/builtin/packages/g4ensdfstate/package.py +++ b/var/spack/repos/builtin/packages/g4ensdfstate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,7 @@ class G4ensdfstate(Package): version("2.3", sha256="9444c5e0820791abd3ccaace105b0e47790fadce286e11149834e79c4a8e9203") version("2.2", sha256="dd7e27ef62070734a4a709601f5b3bada6641b111eb7069344e4f99a01d6e0a6") version("2.1", sha256="933e7f99b1c70f24694d12d517dfca36d82f4e95b084c15d86756ace2a2790d9") + version("1.0", sha256="4562e7476aa2df7204a1a77263e9d2331e9ffcdb591d11814dcc2d6b605021dd") def install(self, spec, prefix): mkdirp(join_path(prefix.share, "data")) diff --git a/var/spack/repos/builtin/packages/g4incl/package.py b/var/spack/repos/builtin/packages/g4incl/package.py index ce5fbfe820b094..479ce2dda269d1 100644 --- a/var/spack/repos/builtin/packages/g4incl/package.py +++ b/var/spack/repos/builtin/packages/g4incl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class G4incl(Package): maintainers("drbenmorgan") # Only versions relevant to Geant4 releases built by spack are added + version("1.2", sha256="f880b16073ee0a92d7494f3276a6d52d4de1d3677a0d4c7c58700396ed0e1a7e") + version("1.1", sha256="5d82e71db5f5a1b659937506576be58db7de7753ec5913128141ae7fce673b44") version("1.0", sha256="716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/g4ndl/package.py b/var/spack/repos/builtin/packages/g4ndl/package.py index e91a682496ba52..be9f298c2f8154 100644 --- a/var/spack/repos/builtin/packages/g4ndl/package.py +++ b/var/spack/repos/builtin/packages/g4ndl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,7 @@ class G4ndl(Package): version("4.7", sha256="7e7d3d2621102dc614f753ad928730a290d19660eed96304a9d24b453d670309") version("4.6", sha256="9d287cf2ae0fb887a2adce801ee74fb9be21b0d166dab49bcbee9408a5145408") version("4.5", sha256="cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e") + version("4.4", sha256="e9fe8800566a83ccaf9b5229a1fa1d2cd24530bbd2e9fcb96eb6b5b117233071") def install(self, spec, prefix): mkdirp(join_path(prefix.share, "data")) diff --git a/var/spack/repos/builtin/packages/g4neutronxs/package.py b/var/spack/repos/builtin/packages/g4neutronxs/package.py index 3d8b2ac5b905b1..39f6915346ba04 100644 --- a/var/spack/repos/builtin/packages/g4neutronxs/package.py +++ b/var/spack/repos/builtin/packages/g4neutronxs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4particlexs/package.py b/var/spack/repos/builtin/packages/g4particlexs/package.py index 129781aaa08891..93c53fb277a266 100644 --- a/var/spack/repos/builtin/packages/g4particlexs/package.py +++ b/var/spack/repos/builtin/packages/g4particlexs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4photonevaporation/package.py b/var/spack/repos/builtin/packages/g4photonevaporation/package.py index c0e160bd14907d..1c847dec3e8eb9 100644 --- a/var/spack/repos/builtin/packages/g4photonevaporation/package.py +++ b/var/spack/repos/builtin/packages/g4photonevaporation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,7 @@ class G4photonevaporation(Package): version("5.3", sha256="d47ababc8cbe548065ef644e9bd88266869e75e2f9e577ebc36bc55bf7a92ec8") version("5.2", sha256="83607f8d36827b2a7fca19c9c336caffbebf61a359d0ef7cee44a8bcf3fc2d1f") version("4.3.2", sha256="d4641a6fe1c645ab2a7ecee09c34e5ea584fb10d63d2838248bfc487d34207c7") + version("3.0", sha256="c76a843672eca21110e97a274a6b5cd9a58b66f35235301c8e1b162926e0e7cb") def install(self, spec, prefix): mkdirp(join_path(prefix.share, "data")) diff --git a/var/spack/repos/builtin/packages/g4pii/package.py b/var/spack/repos/builtin/packages/g4pii/package.py index a282e3787b6753..a1aa5590bc1a42 100644 --- a/var/spack/repos/builtin/packages/g4pii/package.py +++ b/var/spack/repos/builtin/packages/g4pii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4radioactivedecay/package.py b/var/spack/repos/builtin/packages/g4radioactivedecay/package.py index df758bc2c5a0e1..69f5681b64996c 100644 --- a/var/spack/repos/builtin/packages/g4radioactivedecay/package.py +++ b/var/spack/repos/builtin/packages/g4radioactivedecay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,7 @@ class G4radioactivedecay(Package): version("5.3", sha256="5c8992ac57ae56e66b064d3f5cdfe7c2fee76567520ad34a625bfb187119f8c1") version("5.2", sha256="99c038d89d70281316be15c3c98a66c5d0ca01ef575127b6a094063003e2af5d") version("5.1.1", sha256="f7a9a0cc998f0d946359f2cb18d30dff1eabb7f3c578891111fc3641833870ae") + version("4.0", sha256="ed2053bddee507920a29a27db4364fbef255b951597686b0410d5458e9b38cb5") def install(self, spec, prefix): mkdirp(join_path(prefix.share, "data")) diff --git a/var/spack/repos/builtin/packages/g4realsurface/package.py b/var/spack/repos/builtin/packages/g4realsurface/package.py index 575fc65e1202e2..28f335bba029c3 100644 --- a/var/spack/repos/builtin/packages/g4realsurface/package.py +++ b/var/spack/repos/builtin/packages/g4realsurface/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4saiddata/package.py b/var/spack/repos/builtin/packages/g4saiddata/package.py index 5b7e650f6bc920..371811381b0967 100644 --- a/var/spack/repos/builtin/packages/g4saiddata/package.py +++ b/var/spack/repos/builtin/packages/g4saiddata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/g4tendl/package.py b/var/spack/repos/builtin/packages/g4tendl/package.py index 231d8a3070ebf5..92c12423c27d5a 100644 --- a/var/spack/repos/builtin/packages/g4tendl/package.py +++ b/var/spack/repos/builtin/packages/g4tendl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gadap/package.py b/var/spack/repos/builtin/packages/gadap/package.py index 90cb596ec61c97..6c50abe4a59c41 100644 --- a/var/spack/repos/builtin/packages/gadap/package.py +++ b/var/spack/repos/builtin/packages/gadap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Gadap(AutotoolsPackage): maintainers("vanderwb") + license("GPL-2.0-only") + version("2.0", sha256="ae9a989ca00ec29fb40616383d170883f07c022456db338399982a8a94ec0100") depends_on("curl@7.18.0:") diff --git a/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py b/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py index 273a75ba48bfcb..230da6450511c7 100644 --- a/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py +++ b/var/spack/repos/builtin/packages/gamess-ri-mp2-miniapp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gams/package.py b/var/spack/repos/builtin/packages/gams/package.py index d05c13820dcac6..a1377f5a6f9349 100644 --- a/var/spack/repos/builtin/packages/gams/package.py +++ b/var/spack/repos/builtin/packages/gams/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gapbs/package.py b/var/spack/repos/builtin/packages/gapbs/package.py index aaf50e8f33d2d5..34a96c284a650b 100644 --- a/var/spack/repos/builtin/packages/gapbs/package.py +++ b/var/spack/repos/builtin/packages/gapbs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Gapbs(MakefilePackage): homepage = "http://gap.cs.berkeley.edu/benchmark.html" url = "https://github.com/sbeamer/gapbs/archive/v1.0.tar.gz" + license("BSD-3-Clause") + version("1.4", sha256="d91ecfe364e8c307e9e5535d730ef8ef8554b71d33891b70d0c4665cc11178bb") version("1.0", sha256="a7516998c4994592053c7aa0c76282760a8e009865a6b7a1c7c40968be1ca55d") diff --git a/var/spack/repos/builtin/packages/gapcloser/package.py b/var/spack/repos/builtin/packages/gapcloser/package.py index 0cd36477812036..7d07c0885ccb50 100644 --- a/var/spack/repos/builtin/packages/gapcloser/package.py +++ b/var/spack/repos/builtin/packages/gapcloser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py index d6c8bad178726a..4847ef6c732896 100644 --- a/var/spack/repos/builtin/packages/gapfiller/package.py +++ b/var/spack/repos/builtin/packages/gapfiller/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/garfieldpp/package.py b/var/spack/repos/builtin/packages/garfieldpp/package.py index 0bbdda3e3d9d8a..5d78e443a6a82d 100644 --- a/var/spack/repos/builtin/packages/garfieldpp/package.py +++ b/var/spack/repos/builtin/packages/garfieldpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index 516accb30db6a5..74e6061918e218 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -37,15 +37,36 @@ class Gasnet(Package, CudaPackage, ROCmPackage): version("main", branch="stable") version("master", branch="master") + version("2023.9.0", sha256="2d9f15a794e10683579ce494cd458b0dd97e2d3327c4d17e1fea79bd95576ce6") version("2023.3.0", sha256="e1fa783d38a503cf2efa7662be591ca5c2bb98d19ac72a9bc6da457329a9a14f") version("2022.9.2", sha256="2352d52f395a9aa14cc57d82957d9f1ebd928d0a0021fd26c5f1382a06cd6f1d") version("2022.9.0", sha256="6873ff4ad8ebee49da4378f2d78095a6ccc31333d6ae4cd739b9f772af11f936") version("2022.3.0", sha256="91b59aa84c0680c807e00d3d1d8fa7c33c1aed50b86d1616f93e499620a9ba09") - version("2021.9.0", sha256="1b6ff6cdad5ecf76b92032ef9507e8a0876c9fc3ee0ab008de847c1fad0359ee") - version("2021.3.0", sha256="8a40fb3fa8bacc3922cd4d45217816fcb60100357ab97fb622a245567ea31747") - version("2020.10.0", sha256="ed17baf7fce90499b539857ee37b3eea961aa475cffbde77e4c607a34ece06a0") - version("2020.3.0", sha256="019eb2d2284856e6fabe6c8c0061c874f10e95fa0265245f227fd3497f1bb274") - version("2019.9.0", sha256="117f5fdb16e53d0fa8a47a1e28cccab1d8020ed4f6e50163d985dc90226aaa2c") + version( + "2021.9.0", + deprecated=True, + sha256="1b6ff6cdad5ecf76b92032ef9507e8a0876c9fc3ee0ab008de847c1fad0359ee", + ) + version( + "2021.3.0", + deprecated=True, + sha256="8a40fb3fa8bacc3922cd4d45217816fcb60100357ab97fb622a245567ea31747", + ) + version( + "2020.10.0", + deprecated=True, + sha256="ed17baf7fce90499b539857ee37b3eea961aa475cffbde77e4c607a34ece06a0", + ) + version( + "2020.3.0", + deprecated=True, + sha256="019eb2d2284856e6fabe6c8c0061c874f10e95fa0265245f227fd3497f1bb274", + ) + version( + "2019.9.0", + deprecated=True, + sha256="117f5fdb16e53d0fa8a47a1e28cccab1d8020ed4f6e50163d985dc90226aaa2c", + ) # Do NOT add older versions here. # GASNet-EX releases over 2 years old are not supported. @@ -70,12 +91,30 @@ class Gasnet(Package, CudaPackage, ROCmPackage): default=False, description="Enables support for the CUDA memory kind in some conduits.\n" + "NOTE: Requires CUDA Driver library be present on the build system", + when="@2020.11:", + ) + conflicts( + "+cuda", + when="@:2020.10", + msg="GASNet version 2020.11.0 or newer required for CUDA support", ) variant( "rocm", default=False, description="Enables support for the ROCm/HIP memory kind in some conduits", + when="@2021.9:", + ) + conflicts( + "+rocm", when="@:2021.8", msg="GASNet version 2021.9.0 or newer required for ROCm support" + ) + + variant( + "level_zero", + default=False, + description="Enables *experimental* support for the Level Zero " + + "memory kind on Intel GPUs in some conduits", + when="@2023.9.0:", ) depends_on("mpi", when="conduits=mpi") @@ -85,6 +124,8 @@ class Gasnet(Package, CudaPackage, ROCmPackage): conflicts("^hip@:4.4.0", when="+rocm") + depends_on("oneapi-level-zero@1.8.0:", when="+level_zero") + def install(self, spec, prefix): if spec.satisfies("@master:"): bootstrapsh = Executable("./Bootstrap") @@ -120,6 +161,10 @@ def install(self, spec, prefix): if "+rocm" in spec: options.append("--enable-kind-hip") + if "+level_zero" in spec: + options.append("--enable-kind-ze") + options.append("--with-ze-home=" + spec["oneapi-level-zero"].prefix) + if "conduits=mpi" in spec: options.append("--enable-mpi-compat") else: diff --git a/var/spack/repos/builtin/packages/gatb-core/package.py b/var/spack/repos/builtin/packages/gatb-core/package.py index 9da5b143c53104..f37117d84476b5 100644 --- a/var/spack/repos/builtin/packages/gatb-core/package.py +++ b/var/spack/repos/builtin/packages/gatb-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gate/package.py b/var/spack/repos/builtin/packages/gate/package.py index 69c4802b6b016a..9a77788ef7a45e 100644 --- a/var/spack/repos/builtin/packages/gate/package.py +++ b/var/spack/repos/builtin/packages/gate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class Gate(CMakePackage): homepage = "http://opengatecollaboration.org/" url = "https://github.com/OpenGATE/Gate/archive/v9.0.tar.gz" + license("LGPL-3.0-or-later") + version("9.1", sha256="aaab874198500b81d45b27cc6d6a51e72cca9519910b893a5c85c8e6d3ffa4fc") version("9.0", sha256="8354f392facc0b7ae2ddf0eed61cc43136195b198ba399df25e874886b8b69cb") diff --git a/var/spack/repos/builtin/packages/gatepet2stir/package.py b/var/spack/repos/builtin/packages/gatepet2stir/package.py index 420ea69ae08b94..08caa8ed0f52e3 100644 --- a/var/spack/repos/builtin/packages/gatepet2stir/package.py +++ b/var/spack/repos/builtin/packages/gatepet2stir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gatetools/package.py b/var/spack/repos/builtin/packages/gatetools/package.py index 7fec4d6ae8e052..3c4222b73ad20d 100644 --- a/var/spack/repos/builtin/packages/gatetools/package.py +++ b/var/spack/repos/builtin/packages/gatetools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gatetools(PythonPackage): homepage = "https://github.com/OpenGATE/GateTools" pypi = "gatetools/gatetools-0.9.14.tar.gz" + license("LGPL-3.0-only") + version("0.11.2", sha256="6eef8a779278b862823ae79d6aab210db4f7889c9127b2c2e4c3a4195f9a9928") version("0.9.14", sha256="78fe864bb52fd4c6aeeee90d8f6c1bc5406ce02ac6f48712379efac606b5c006") diff --git a/var/spack/repos/builtin/packages/gatk/package.py b/var/spack/repos/builtin/packages/gatk/package.py index 2e84107b61565a..3c71462b14747e 100644 --- a/var/spack/repos/builtin/packages/gatk/package.py +++ b/var/spack/repos/builtin/packages/gatk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,9 @@ class Gatk(Package): list_url = "https://github.com/broadinstitute/gatk/releases" maintainers("snehring") + license("Unlicense") + + version("4.5.0.0", sha256="dc1a4471e8bb566397db9894ca18acbf8f40f3fc312c8fad9a8c5390c218e916") version("4.4.0.0", sha256="444600f7b38b46ad0b3606b7d40ce921e0ff1910a50165872f1c73c7c4a1a390") version("4.3.0.0", sha256="e2c27229b34c3e22445964adf00639a0909887bbfcc040f6910079177bc6e2dd") version("4.2.6.1", sha256="1125cfc862301d437310506c8774d36c3a90d00d52c7b5d6b59dac7241203628") diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 12a095c301989a..cc79f162105203 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Gaudi(CMakePackage): tags = ["hep"] version("master", branch="master") + version("37.2", sha256="9b866caab46e182de98b59eddbde80d6fa0e670fe4a35906f1518b04bd99b2d2") version("37.1", sha256="1d7038fd5dfb5f2517ce57623cf8090549ffe2ea8f0171d534e5c1ca20bd009a") version("37.0", sha256="823f3821a4f498ddd2dd123fbb8a3787b361ddfd818f4ab13572076fc9afdfe4") version("36.14", sha256="b11e0afcb797d61a305856dfe8079d48d74c6b6867ceccc0a83aab5978c9ba5f") @@ -35,11 +36,6 @@ class Gaudi(CMakePackage): version("36.1", sha256="9f718c832313676249e5c3ac76ba4346978ee2328f8cdcb29176498b080402e9") version("36.0", sha256="8a0458cef5b616532f9db7cca9fa0e892e602b64c9e93dc0cc6d972e03034830") version("35.0", sha256="c01b822f9592a7bf875b9997cbeb3c94dea97cb13d523c12649dbbf5d69b5fa6") - version("34.0", sha256="28fc4abb5a6b08da5a6b1300451c7e8487f918b055939877219d454abf7668ae") - version("33.2", sha256="26aaf9c4ff237a60ec79af9bd18ad249fc91c16e297ba77e28e4a256123db6e5") - version("33.1", sha256="7eb6b2af64aeb965228d4b6ea66c7f9f57f832f93d5b8ad55c9105235af5b042") - version("33.0", sha256="76a967c41f579acc432593d498875dd4dc1f8afd5061e692741a355a9cf233c8") - version("32.2", sha256="e9ef3eb57fd9ac7b9d5647e278a84b2e6263f29f0b14dbe1321667d44d969d2e") maintainers("drbenmorgan", "vvolkl", "jmcarcell") @@ -60,6 +56,12 @@ class Gaudi(CMakePackage): patch("link_target_fixes.patch", when="@33.0:34") patch("link_target_fixes32.patch", when="@:32.2") patch("fmt_fix.patch", when="@36.6:36.12 ^fmt@10:") + # fix issues with catch2 3.1 and above + patch( + "https://gitlab.cern.ch/gaudi/Gaudi/-/commit/110f2189f386c3a23150ccdfdc47c1858fc7098e.diff", + sha256="b05f6b7c1efb8c3af291c8d81fd1627e58af7c5f9a78a0098c6e3bfd7ec80c15", + when="@37.1 ^catch2@3.1:", + ) # These dependencies are needed for a minimal Gaudi build depends_on("aida") @@ -72,17 +74,15 @@ class Gaudi(CMakePackage): depends_on("clhep") depends_on("cmake", type="build") depends_on("cppgsl") - depends_on("fmt", when="@33.2:") + depends_on("fmt") depends_on("fmt@:8", when="@:36.9") depends_on("intel-tbb@:2020.3", when="@:37.0") depends_on("tbb", when="@37.1:") depends_on("uuid") - depends_on("nlohmann-json", when="@35.0:") + depends_on("nlohmann-json") depends_on("python", type=("build", "run")) - depends_on("python@:3.7", when="@32.2:34", type=("build", "run")) depends_on("py-networkx", type=("build", "run")) depends_on("py-six", type=("build", "run")) - depends_on("py-xenv@1:", when="@:34.9", type=("build", "run")) depends_on("range-v3") depends_on("root +python +root7 +ssl +tbb +threads") depends_on("zlib-api") @@ -99,13 +99,9 @@ class Gaudi(CMakePackage): depends_on("doxygen +graphviz", when="+docs") depends_on("gperftools", when="+gperftools") depends_on("gdb") - depends_on("gsl", when="@:31 +examples") - depends_on("heppdt", when="@:34 +examples") depends_on("heppdt", when="+heppdt") depends_on("jemalloc", when="+jemalloc") - depends_on("libpng", when="@:34 +examples") depends_on("libunwind", when="+unwind") - depends_on("relax", when="@:34 +examples") depends_on("xerces-c", when="+xercesc") # NOTE: pocl cannot be added as a minimal OpenCL implementation because # ROOT does not like being exposed to LLVM symbols. @@ -131,9 +127,6 @@ def cmake_args(self): # todo: self.define("GAUDI_USE_INTELAMPLIFIER", False), ] - # this is not really used in spack builds, but needs to be set - if self.spec.version < Version("34"): - args.append("-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt") return args def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/gaussian-src/package.py b/var/spack/repos/builtin/packages/gaussian-src/package.py index 5cd0cf9e27e661..51d771efada76f 100644 --- a/var/spack/repos/builtin/packages/gaussian-src/package.py +++ b/var/spack/repos/builtin/packages/gaussian-src/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py index dc4320c0202852..b092719a45b00e 100644 --- a/var/spack/repos/builtin/packages/gaussian-view/package.py +++ b/var/spack/repos/builtin/packages/gaussian-view/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gaussian/package.py b/var/spack/repos/builtin/packages/gaussian/package.py index 05d8c34b23a721..9daef789dfe7a6 100644 --- a/var/spack/repos/builtin/packages/gaussian/package.py +++ b/var/spack/repos/builtin/packages/gaussian/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gawk/package.py b/var/spack/repos/builtin/packages/gawk/package.py index 46f5034ad4486a..2c935856d0fad8 100644 --- a/var/spack/repos/builtin/packages/gawk/package.py +++ b/var/spack/repos/builtin/packages/gawk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Gawk(AutotoolsPackage, GNUMirrorPackage): tags = ["build-tools", "core-packages"] + license("GPL-3.0-or-later") + version("5.2.2", sha256="3c1fce1446b4cbee1cd273bd7ec64bc87d89f61537471cd3e05e33a965a250e9") version("5.2.1", sha256="673553b91f9e18cc5792ed51075df8d510c9040f550a6f74e09c9add243a7e4f") version("5.1.1", sha256="d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2") diff --git a/var/spack/repos/builtin/packages/gbl/package.py b/var/spack/repos/builtin/packages/gbl/package.py index 98aeb67fab3bc3..89388076ba695f 100644 --- a/var/spack/repos/builtin/packages/gbl/package.py +++ b/var/spack/repos/builtin/packages/gbl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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") diff --git a/var/spack/repos/builtin/packages/gblocks/package.py b/var/spack/repos/builtin/packages/gblocks/package.py index 168ec08b03967d..ea4617dd77a0a1 100644 --- a/var/spack/repos/builtin/packages/gblocks/package.py +++ b/var/spack/repos/builtin/packages/gblocks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gcc-runtime/package.py b/var/spack/repos/builtin/packages/gcc-runtime/package.py new file mode 100644 index 00000000000000..085042b8ceb02c --- /dev/null +++ b/var/spack/repos/builtin/packages/gcc-runtime/package.py @@ -0,0 +1,154 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +import os +import re + +from macholib import MachO, mach_o + +from llnl.util import tty + +from spack.package import * +from spack.util.elf import parse_elf + + +class GccRuntime(Package): + """Package for GCC compiler runtime libraries""" + + homepage = "https://gcc.gnu.org" + has_code = False + + tags = ["runtime"] + + maintainers("haampie") + + license("GPL-3.0-or-later WITH GCC-exception-3.1") + + requires("%gcc") + + LIBRARIES = [ + "asan", + "atomic", + "gcc_s", + "gfortran", + "gomp", + "hwasan", + "itm", + "lsan", + "quadmath", + "ssp", + "stdc++", + "tsan", + "ubsan", + ] + + def install(self, spec, prefix): + if spec.platform in ["linux", "cray", "freebsd"]: + libraries = self._get_libraries_elf() + elif spec.platform == "darwin": + libraries = self._get_libraries_macho() + else: + raise RuntimeError("Unsupported platform") + + mkdir(prefix.lib) + + if not libraries: + tty.warn("Could not detect any shared GCC runtime libraries") + return + + for path, name in libraries: + install(path, os.path.join(prefix.lib, name)) + + def _get_libraries_elf(self): + """Get the GCC runtime libraries for ELF binaries""" + cc = Executable(self.compiler.cc) + lib_regex = re.compile(rb"\blib[a-z-_]+\.so\.\d+\b") + path_and_install_name = [] + + for name in self.LIBRARIES: + # Look for the dynamic library that gcc would use to link, + # that is with .so extension and without abi suffix. + path = cc(f"-print-file-name=lib{name}.so", output=str).strip() + + # gcc reports an absolute path on success + if not os.path.isabs(path): + continue + + # Now there are two options: + # 1. the file is an ELF file + # 2. the file is a linker script referencing the actual library + with open(path, "rb") as f: + try: + # Try to parse as an ELF file + soname = parse_elf(f, dynamic_section=True).dt_soname_str.decode("utf-8") + except Exception: + # On failure try to "parse" as ld script; the actual + # library needs to be mentioned by filename. + f.seek(0) + script_matches = lib_regex.findall(f.read()) + if len(script_matches) != 1: + continue + soname = script_matches[0].decode("utf-8") + + # Now locate and install the runtime library + runtime_path = cc(f"-print-file-name={soname}", output=str).strip() + + if not os.path.isabs(runtime_path): + continue + + path_and_install_name.append((runtime_path, soname)) + + return path_and_install_name + + def _get_libraries_macho(self): + """Same as _get_libraries_elf but for Mach-O binaries""" + cc = Executable(self.compiler.cc) + path_and_install_name = [] + + for name in self.LIBRARIES: + if name == "gcc_s": + # On darwin, libgcc_s is versioned and can't be linked as -lgcc_s, + # but needs a suffix we don't know, so we parse it from the link line. + match = re.search( + r"\s-l(gcc_s\.[0-9.]+)\s", cc("-xc", "-", "-shared-libgcc", "-###", error=str) + ) + if match is None: + continue + name = match.group(1) + + path = cc(f"-print-file-name=lib{name}.dylib", output=str).strip() + + if not os.path.isabs(path): + continue + + macho = MachO.MachO(path) + + # Get the LC_ID_DYLIB load command + for load_command, _, data in macho.headers[-1].commands: + if load_command.cmd == mach_o.LC_ID_DYLIB: + # Strip off @rpath/ prefix, or even an absolute path. + dylib_name = os.path.basename(data.rstrip(b"\x00").decode()) + break + else: + continue + + # Locate by dylib name + runtime_path = cc(f"-print-file-name={dylib_name}", output=str).strip() + + if not os.path.isabs(runtime_path): + continue + + path_and_install_name.append((runtime_path, dylib_name)) + + return path_and_install_name + + @property + def libs(self): + # Currently these libs are not linkable with -l, they all have a suffix. + return LibraryList([]) + + @property + def headers(self): + return HeaderList([]) diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 116371cdb272bc..f74e67efe5c815 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,6 +33,8 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): maintainers("michaelkuhn", "alalazo") + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("master", branch="master") version("13.2.0", sha256="e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da") @@ -454,8 +456,8 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): # Backport libsanitizer patch for glibc >= 2.36 # https://reviews.llvm.org/D129471 - patch("glibc-2.36-libsanitizer-gcc-5-9.patch", when="@5.1:5.5,6.1:6.5,7.1:7.5,8.1:8.5,9.1:9.5") - patch("glibc-2.36-libsanitizer-gcc-10-12.patch", when="@10.1:10.4,11.1:11.3,12.1.0") + patch("glibc-2.36-libsanitizer-gcc-5-9.patch", when="@5:9") + patch("glibc-2.36-libsanitizer-gcc-10-12.patch", when="@10:10.4,11:11.3,12.1.0") # Older versions do not compile with newer versions of glibc # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 @@ -1016,7 +1018,9 @@ def setup_run_environment(self, env): continue abspath = os.path.join(bin_path, filename) - if os.path.islink(abspath): + + # Skip broken symlinks (https://github.com/spack/spack/issues/41327) + if not os.path.exists(abspath): continue # Set the proper environment variable @@ -1109,3 +1113,32 @@ def detect_gdc(self): ), ), ) + + @classmethod + def runtime_constraints(cls, *, compiler, pkg): + """Callback function to inject runtime-related rules into the solver. + + Rule-injection is obtained through method calls of the ``pkg`` argument. + + Documentation for this function is temporary. When the API will be in its final state, + we'll document the behavior at https://spack.readthedocs.io/en/latest/ + + Args: + compiler: compiler object (node attribute) currently considered + pkg: object used to forward information to the solver + """ + pkg("*").depends_on( + "gcc-runtime", + when="%gcc", + type="link", + description="If any package uses %gcc, it depends on gcc-runtime", + ) + pkg("*").depends_on( + f"gcc-runtime@{str(compiler.version)}:", + when=f"%{str(compiler.spec)}", + type="link", + description=f"If any package uses %{str(compiler.spec)}, " + f"it depends on gcc-runtime@{str(compiler.version)}:", + ) + # The version of gcc-runtime is the same as the %gcc used to "compile" it + pkg("gcc-runtime").requires(f"@={str(compiler.version)}", when=f"%{str(compiler.spec)}") diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py index 5c666315d98fb1..7f89c316f661e4 100644 --- a/var/spack/repos/builtin/packages/gccmakedep/package.py +++ b/var/spack/repos/builtin/packages/gccmakedep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gccmakedep(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/util/gccmakedep/" xorg_mirror_path = "util/gccmakedep-1.0.3.tar.gz" + license("MIT") + version("1.0.3", sha256="f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/gccxml/package.py b/var/spack/repos/builtin/packages/gccxml/package.py index 11f89cefe26fee..2b492412a25301 100644 --- a/var/spack/repos/builtin/packages/gccxml/package.py +++ b/var/spack/repos/builtin/packages/gccxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gchp/package.py b/var/spack/repos/builtin/packages/gchp/package.py index f32639a3acf6a2..3c1b892fc59dee 100644 --- a/var/spack/repos/builtin/packages/gchp/package.py +++ b/var/spack/repos/builtin/packages/gchp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Gchp(CMakePackage): git = "https://github.com/geoschem/GCHP.git" maintainers("lizziel", "laestrada") + license("MIT") + version("13.4.0", commit="d8c6d4d8db1c5b0ba54d4893185d999a619afc58", submodules=True) version("13.3.4", commit="efb2346381648ffff04ce441d5d61d7fec0c53fe", submodules=True) version("13.2.1", commit="9dc2340cac684971fa961559a4dc3d8818326ab8", submodules=True) diff --git a/var/spack/repos/builtin/packages/gconf/package.py b/var/spack/repos/builtin/packages/gconf/package.py index 424471fad70233..3b6098b1139e54 100644 --- a/var/spack/repos/builtin/packages/gconf/package.py +++ b/var/spack/repos/builtin/packages/gconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gcta/package.py b/var/spack/repos/builtin/packages/gcta/package.py index 538e26fe7d0b11..19b89f45e33ede 100644 --- a/var/spack/repos/builtin/packages/gcta/package.py +++ b/var/spack/repos/builtin/packages/gcta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 313a46f28bd969..c2b0635bd901aa 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,12 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): maintainers("adamjstewart") + license("MIT") + + version("3.8.3", sha256="ae2d160f65016e208eca34ff14490ec4511f1fa03fd386ac130449d15e82929d") + version("3.8.2", sha256="dc2921ee1cf7a5c0498e94d15fb9ab9c9689c296363a1d021fc3293dd242b4db") + version("3.8.1", sha256="75a20b23879bfa3d8c0db68e1d6f8b924f7f9d97f5fed089b01a72e404293900") + version("3.8.0", sha256="ec0f78d9dc32352aeac6edc9c3b27a991b91f9dc6f92c452207d84431c58757d") version("3.7.3", sha256="e0a6f0c453ea7eb7c09967f50ac49426808fcd8f259dbc9888140eb69d7ffee6") version("3.7.2", sha256="40c0068591d2c711c699bbb734319398485ab169116ac28005d8302f80b923ad") version("3.7.1", sha256="9297948f0a8ba9e6369cd50e87c7e2442eda95336b94d2b92ef1829d260b9a06") @@ -90,6 +96,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): version("2.0.0", sha256="91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061") # Optional dependencies + variant("archive", default=False, when="@3.7:", description="Optional for vsi7z VFS driver") variant( "armadillo", default=False, @@ -137,9 +144,11 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): variant("kdu", default=False, description="Required for JP2KAK and JPIPKAK drivers") variant("kea", default=False, description="Required for KEA driver") variant("lerc", default=False, when="@2.4:", description="Required for LERC compression") + variant("libaec", default=False, when="@3.8:", description="Optional for GRIB driver") variant("libcsf", default=False, description="Required for PCRaster driver") variant("libkml", default=False, description="Required for LIBKML driver") variant("liblzma", default=False, description="Required for Zarr driver") + variant("libqb3", default=False, when="@3.6:", description="Required for MRF driver") variant( "libxml2", default=False, description="Required for XML validation in many OGR drivers" ) @@ -190,7 +199,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): ) variant("pcidsk", default=False, description="Required for PCIDSK driver") variant( - "pcre", default=False, description="Required for REGEXP operator in drivers using SQLite3" + "pcre2", default=False, description="Required for REGEXP operator in drivers using SQLite3" ) variant("pdfium", default=False, when="@2.1:", description="Possible backend for PDF driver") variant("png", default=True, description="Required for PNG driver") @@ -201,7 +210,6 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): default=False, description="Required for PostgreSQL and PostGISRaster drivers", ) - variant("qb3", default=False, when="@3.6:", description="Required for MRF driver") variant( "qhull", default=False, @@ -265,6 +273,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): depends_on("json-c@0.12.1", when="@:2.2") # Optional dependencies + depends_on("libarchive", when="+archive") depends_on("armadillo", when="+armadillo") depends_on("blas", when="+armadillo") depends_on("lapack", when="+armadillo") @@ -306,6 +315,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): # depends_on('kakadu', when='+kdu') depends_on("kealib", when="+kea") depends_on("lerc", when="+lerc") + depends_on("libaec", when="+libaec") # depends_on('libcsf', when='+libcsf') depends_on("libkml@1.3:", when="+libkml") depends_on("xz", when="+liblzma") @@ -333,8 +343,8 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): depends_on("oracle-instant-client", when="+oracle") depends_on("parquet-cpp", when="+parquet") # depends_on('pcidsk', when='+pcidsk') - depends_on("pcre2", when="@3.5:+pcre") - depends_on("pcre", when="@:3.4+pcre") + depends_on("pcre2", when="@3.5:+pcre2") + depends_on("pcre", when="@:3.4+pcre2") # depends_on('pdfium', when='+pdfium') depends_on("libpng", when="+png") # depends_on('podofo', when='+podofo') @@ -344,7 +354,7 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): depends_on("poppler@:0.71", when="@:2.4 +poppler") depends_on("poppler@:21", when="@:3.4.1 +poppler") depends_on("postgresql", when="+postgresql") - depends_on("qb3", when="+qb3") + depends_on("qb3", when="+libqb3") depends_on("qhull", when="+qhull") depends_on("qhull@2015:", when="@3.5:+qhull") depends_on("qhull@:2020.1", when="@:3.3+qhull") @@ -448,6 +458,14 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): sha256="9f9824296e75b34b3e78284ec772a5ac8f8ba92c17253ea9ca242caf766767ce", ) + # https://github.com/spack/spack/issues/41299 + # ensures the correct build specific libproj is used with cmake builds (gdal >=3.5.0) + patch( + "https://patch-diff.githubusercontent.com/raw/OSGeo/gdal/pull/8964.patch?full_index=1", + when="@3.5:3.8", + sha256="52459dc9903ced5005ba81515762a55cd829d8f5420607405c211c4a77c2bf79", + ) + executables = ["^gdal-config$"] @classmethod @@ -493,6 +511,7 @@ def cmake_args(self): # be necessary. self.define("ENABLE_DEFLATE64", "zlib-ng" not in self.spec), # Optional dependencies + self.define_from_variant("GDAL_USE_ARCHIVE", "archive"), self.define_from_variant("GDAL_USE_ARMADILLO", "armadillo"), self.define_from_variant("GDAL_USE_ARROW", "arrow"), self.define_from_variant("GDAL_USE_BASISU", "basisu"), @@ -522,9 +541,11 @@ def cmake_args(self): self.define_from_variant("GDAL_USE_KDU", "kdu"), self.define_from_variant("GDAL_USE_KEA", "kea"), self.define_from_variant("GDAL_USE_LERC", "lerc"), + self.define_from_variant("GDAL_USE_LIBAEC", "libaec"), self.define_from_variant("GDAL_USE_LIBCSF", "libcsf"), self.define_from_variant("GDAL_USE_LIBKML", "libkml"), self.define_from_variant("GDAL_USE_LIBLZMA", "liblzma"), + self.define_from_variant("GDAL_USE_LIBQB3", "libqb3"), self.define_from_variant("GDAL_USE_LIBXML2", "libxml2"), self.define_from_variant("GDAL_USE_LURATECH", "luratech"), self.define_from_variant("GDAL_USE_LZ4", "lz4"), @@ -544,13 +565,12 @@ def cmake_args(self): self.define_from_variant("GDAL_USE_OPENSSL", "openssl"), self.define_from_variant("GDAL_USE_ORACLE", "oracle"), self.define_from_variant("GDAL_USE_PARQUET", "parquet"), - self.define_from_variant("GDAL_USE_PCRE2", "pcre"), + self.define_from_variant("GDAL_USE_PCRE2", "pcre2"), self.define_from_variant("GDAL_USE_PDFIUM", "pdfium"), self.define_from_variant("GDAL_USE_PNG", "png"), self.define_from_variant("GDAL_USE_PODOFO", "podofo"), self.define_from_variant("GDAL_USE_POPPLER", "poppler"), self.define_from_variant("GDAL_USE_POSTGRESQL", "postgresql"), - self.define_from_variant("GDAL_USE_LIBQB3", "qb3"), self.define_from_variant("GDAL_USE_QHULL", "qhull"), self.define_from_variant("GDAL_USE_RASDAMAN", "rasdaman"), self.define_from_variant("GDAL_USE_RASTERLITE2", "rasterlite2"), @@ -674,7 +694,7 @@ def configure_args(self): self.with_or_without("crypto", variant="openssl", package="openssl"), self.with_or_without("oci", variant="oracle", package="oracle-instant-client"), self.with_or_without("pcidsk", package="pcidsk"), - self.with_or_without("pcre"), + self.with_or_without("pcre", variant="pcre2"), self.with_or_without("pdfium", package="pdfium"), self.with_or_without("png", package="libpng"), self.with_or_without("podofo", package="podofo"), diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index f4c4a54396a725..85bfeaade8c166 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,10 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): maintainers("robertu94") + license("GPL-3.0-or-later AND LGPL-3.0-or-later") + + version("14.1", sha256="683e63182fb72bd5d8db32ab388143796370a8e3e71c26bc264effb487db7927") + version("13.2", sha256="7ead13d9e19fa0c57bb19104e1a5f67eefa9fc79f2e6360de491e8fddeda1e30") version("13.1", sha256="4cc3d7143d6d54d289d227b1e7289dbc0fa4cbd46131ab87136e1ea831cf46d4") version("12.1", sha256="87296a3a9727356b56712c793704082d5df0ff36a34ca9ec9734fc9a8bdfdaab") version("11.2", sha256="b558b66084835e43b6361f60d60d314c487447419cdf53adf83a87020c367290") @@ -85,6 +89,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): depends_on("ncurses", when="+tui") depends_on("gmp", when="@11.1:") depends_on("elfutils@0.179:+debuginfod", when="@10.1:+debuginfod") + depends_on("mpfr@4.2:", when="@14:") build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index a0882d5493f95e..e2efcf9683a650 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org.ua/software/gdbm/gdbm.html" gnu_mirror_path = "gdbm/gdbm-1.13.tar.gz" + license("GPL-3.0-or-later") + version("1.23", sha256="74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd") version("1.22", sha256="f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762") version("1.21", sha256="b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2") diff --git a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py index aac83b70013bd8..97a57b6ce44fec 100644 --- a/var/spack/repos/builtin/packages/gdk-pixbuf/package.py +++ b/var/spack/repos/builtin/packages/gdk-pixbuf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class GdkPixbuf(Package): list_url = "https://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/" list_depth = 1 + license("LGPL-2.1-or-later") + version("2.42.10", sha256="ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b") version("2.42.9", sha256="28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962") version("2.42.6", sha256="c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f") diff --git a/var/spack/repos/builtin/packages/gdl/package.py b/var/spack/repos/builtin/packages/gdl/package.py index 8007f4c5a66ebd..b81062260df03c 100644 --- a/var/spack/repos/builtin/packages/gdl/package.py +++ b/var/spack/repos/builtin/packages/gdl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gdrcopy/package.py b/var/spack/repos/builtin/packages/gdrcopy/package.py index 441349bdbb2a78..03f22a577ec1f3 100644 --- a/var/spack/repos/builtin/packages/gdrcopy/package.py +++ b/var/spack/repos/builtin/packages/gdrcopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class Gdrcopy(MakefilePackage, CudaPackage): git = "https://github.com/NVIDIA/gdrcopy" maintainers("scothalverson") + license("MIT") + version("master", branch="master") + version("2.4.1", sha256="faa7e816e9bad3301e53d6721457f7ef5ab42b7aa3b01ffda51f8e5620bb20ed") version("2.3", sha256="b85d15901889aa42de6c4a9233792af40dd94543e82abe0439e544c87fd79475") version("2.2", sha256="e4be119809391b18c735346d24b3b398dd9421cbff47ef12befbae40d61da45f") version("2.1", sha256="cecc7dcc071107f77396f5553c9109790b6d2298ae29eb2dbbdd52b2a213e4ea") diff --git a/var/spack/repos/builtin/packages/geant3/package.py b/var/spack/repos/builtin/packages/geant3/package.py index 867e458bf410e4..cef0167b3b60ea 100644 --- a/var/spack/repos/builtin/packages/geant3/package.py +++ b/var/spack/repos/builtin/packages/geant3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/geant4-data/package.py b/var/spack/repos/builtin/packages/geant4-data/package.py index 7953ba2d4582a4..c4134e356a9453 100644 --- a/var/spack/repos/builtin/packages/geant4-data/package.py +++ b/var/spack/repos/builtin/packages/geant4-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,7 @@ class Geant4Data(BundlePackage): tags = ["hep"] + version("11.2.0") version("11.1.0") version("11.0.0") version("10.7.4") @@ -33,6 +34,7 @@ class Geant4Data(BundlePackage): version("10.4.3") version("10.4.0") version("10.3.3") + version("10.0.4") # Add install phase so we can create the data "view" phases = ["install"] @@ -41,6 +43,19 @@ class Geant4Data(BundlePackage): # they generally don't change on the patch level # Can move to declaring on a dataset basis if needed _datasets = { + "11.2.0:11.2": [ + "g4ndl@4.7", + "g4emlow@8.5", + "g4photonevaporation@5.7", + "g4radioactivedecay@5.6", + "g4particlexs@4.0", + "g4pii@1.3", + "g4realsurface@2.2", + "g4saiddata@2.0", + "g4abla@3.3", + "g4incl@1.2", + "g4ensdfstate@2.3", + ], "11.1.0:11.1": [ "g4ndl@4.7", "g4emlow@8.2", @@ -132,6 +147,18 @@ class Geant4Data(BundlePackage): ], "10.3.1:10.3": ["g4photonevaporation@4.3.2", "g4radioactivedecay@5.1.1"], "10.3.0": ["g4photonevaporation@4.3", "g4radioactivedecay@5.1"], + "10.0.4": [ + "g4ndl@4.4", + "g4emlow@6.35", + "g4photonevaporation@3.0", + "g4radioactivedecay@4.0", + "g4neutronxs@1.4", + "g4pii@1.3", + "g4realsurface@1.0", + "g4saiddata@1.1", + "g4abla@3.0", + "g4ensdfstate@1.0", + ], } for _vers, _dsets in _datasets.items(): diff --git a/var/spack/repos/builtin/packages/geant4-vmc/package.py b/var/spack/repos/builtin/packages/geant4-vmc/package.py index 80ba272bb1683c..60e4bb866b412f 100644 --- a/var/spack/repos/builtin/packages/geant4-vmc/package.py +++ b/var/spack/repos/builtin/packages/geant4-vmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Geant4Vmc(CMakePackage): maintainer = ["wdconinc"] + license("GPL-3.0-only") + version("master", branch="master") version("6-1-p1", sha256="b3115cd891192ae6cb347737854ee01a22620498f005beb7644af12461ad8b9d") version("5-3", sha256="22f58530963988380509a7741ad6b3dde21806f3862fb55c11cc27f25d3d3c2d") diff --git a/var/spack/repos/builtin/packages/geant4/geant4-10.0.4.patch b/var/spack/repos/builtin/packages/geant4/geant4-10.0.4.patch new file mode 100644 index 00000000000000..b09c205882664c --- /dev/null +++ b/var/spack/repos/builtin/packages/geant4/geant4-10.0.4.patch @@ -0,0 +1,31 @@ +diff -Naur a/cmake/Modules/Geant4MakeRules_cxx.cmake b/cmake/Modules/Geant4MakeRules_cxx.cmake +--- a/cmake/Modules/Geant4MakeRules_cxx.cmake 2016-06-10 12:04:27 ++++ b/cmake/Modules/Geant4MakeRules_cxx.cmake 2023-12-04 16:49:28 +@@ -51,7 +51,7 @@ + elseif(_gnucxx_version VERSION_LESS 4.7) + set(_CXXSTDS "c++98" "c++0x") + else() +- set(_CXXSTDS "c++98" "c++0x" "c++11") ++ set(_CXXSTDS "c++98" "c++0x" "c++11" "c++14") + endif() + + set(CXXSTD_IS_AVAILABLE ${_CXXSTDS} PARENT_SCOPE) +diff -Naur a/source/visualization/HepRep/sources.cmake b/source/visualization/HepRep/sources.cmake +--- a/source/visualization/HepRep/sources.cmake 2016-06-10 12:04:27 ++++ b/source/visualization/HepRep/sources.cmake 2023-12-04 16:12:32 +@@ -71,13 +71,13 @@ + G4HepRepMessenger.cc + G4HepRepSceneHandler.cc + G4HepRepViewer.cc +- GZIPOutputStream.cc ++ gzipoutputstream.cc + GZIPOutputStreamBuffer.cc + IndentPrintWriter.cc + XMLHepRepFactory.cc + XMLHepRepWriter.cc + XMLWriter.cc +- ZipOutputStream.cc ++ zipoutputstream.cc + ZipOutputStreamBuffer.cc + GRANULAR_DEPENDENCIES + G4csg diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index afc4464b098bd8..4f1bebec298644 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Geant4(CMakePackage): maintainers("drbenmorgan") + version("11.2.0", sha256="9ff544739b243a24dac8f29a4e7aab4274fc0124fd4e1c4972018213dc6991ee") + version("11.1.3", sha256="5d9a05d4ccf8b975649eab1d615fc1b8dce5937e01ab9e795bffd04149240db6") version("11.1.2", sha256="e9df8ad18c445d9213f028fd9537e174d6badb59d94bab4eeae32f665beb89af") version("11.1.1", sha256="c5878634da9ba6765ce35a469b2893044f4a6598aa948733da8436cdbfeef7d2") version("11.1.0", sha256="c4a23f2f502efeab56de43a4412b21f65c7ca1b0877b9bc1d7e845ee12edf70a") @@ -43,6 +45,7 @@ class Geant4(CMakePackage): version("10.4.3", sha256="67f3bb6405a2c77e573936c2b933f5a4a33915aa379626a2eb3012009b91e1da") version("10.4.0", sha256="e919b9b0a88476e00c0b18ab65d40e6a714b55ee4778f66bac32a5396c22aa74") version("10.3.3", sha256="bcd36a453da44de9368d1d61b0144031a58e4b43a6d2d875e19085f2700a89d8") + version("10.0.4", sha256="97f3744366b00143d1eed52f8786823034bbe523f45998106f798af61d83f863") _cxxstd_values = ( conditional("11", "14", when="@:10"), @@ -58,7 +61,7 @@ class Geant4(CMakePackage): ) variant("threads", default=True, description="Build with multithreading") - variant("vecgeom", default=False, description="Enable vecgeom support") + variant("vecgeom", default=False, description="Enable vecgeom support", when="@10.4:") variant("opengl", default=False, description="Optional OpenGL support") variant("x11", default=False, description="Optional X11 support") variant("motif", default=False, description="Optional motif support") @@ -72,6 +75,7 @@ class Geant4(CMakePackage): depends_on("cmake@3.5:", type="build") for _vers in [ + "10.0.4", "10.3.3", "10.4.0", "10.4.3", @@ -85,8 +89,9 @@ class Geant4(CMakePackage): "10.7.2", "10.7.3", "10.7.4", - "11.0.0:11.0", - "11.1:", + "11.0", + "11.1", + "11.2:", ]: depends_on("geant4-data@" + _vers, type="run", when="@" + _vers) @@ -104,17 +109,18 @@ class Geant4(CMakePackage): depends_on("clhep@2.4.6.0:", when="@11.1:") depends_on("clhep@2.4.5.1:", when="@11.0.0:") depends_on("clhep@2.4.4.0:", when="@10.7.0:") - depends_on("clhep@2.3.3.0:", when="@10.3.3:10.6") + depends_on("clhep@2.3.3.0:", when="@10.3:10.6") + depends_on("clhep@2.1.2.3", when="@:10.2") # Vecgeom specific versions for each Geant4 version with when("+vecgeom"): - depends_on("vecgeom@1.2.0:", when="@11.1:") + depends_on("vecgeom@1.2.6:", when="@11.2:") + depends_on("vecgeom@1.2.0:", when="@11.1") depends_on("vecgeom@1.1.18:1.1", when="@11.0.0:11.0") depends_on("vecgeom@1.1.8:1.1", when="@10.7.0:10.7") depends_on("vecgeom@1.1.5", when="@10.6.0:10.6") depends_on("vecgeom@1.1.0", when="@10.5.0:10.5") depends_on("vecgeom@0.5.2", when="@10.4.0:10.4") - depends_on("vecgeom@0.3rc", when="@10.3.0:10.3") def std_when(values): for v in values: @@ -141,18 +147,23 @@ def std_when(values): depends_on("libx11", when="+x11") depends_on("libxmu", when="+x11") depends_on("motif", when="+motif") - depends_on("qt@5: +opengl", when="+qt") + with when("+qt"): + depends_on("qt@5: +opengl") + depends_on("qt@5.9:", when="@11.2:") + # As released, 10.0.4 has inconsistently capitalised filenames + # in the cmake files; this patch also enables cxxstd 14 + patch("geant4-10.0.4.patch", when="@10.0.4") # As released, 10.03.03 has issues with respect to using external # CLHEP. - patch("CLHEP-10.03.03.patch", level=1, when="@10.3.3") + patch("CLHEP-10.03.03.patch", level=1, when="@10.3") # These patches can be applied independent of the cxxstd value? - patch("cxx17.patch", when="@:10.3 cxxstd=17") + patch("cxx17.patch", when="@10.3 cxxstd=17") patch("cxx17_geant4_10_0.patch", level=1, when="@10.4.0 cxxstd=17") 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") @@ -230,8 +241,11 @@ def cmake_args(self): # Use the correct C++ standard option for the requested version if spec.version >= Version("11.0"): options.append(self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd")) - else: + elif spec.version >= Version("10.3"): options.append(self.define_from_variant("GEANT4_BUILD_CXXSTD", "cxxstd")) + else: + cxxstd = spec.variants["cxxstd"].value + options.append(self.define("GEANT4_BUILD_CXXSTD", f"c++{cxxstd}")) if spec.version >= Version("10.6"): # When building a downstream library/app outside of Spack, make diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py index f099842392bbb0..c9cc7b7586dc90 100644 --- a/var/spack/repos/builtin/packages/gearshifft/package.py +++ b/var/spack/repos/builtin/packages/gearshifft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Gearshifft(CMakePackage): maintainers("zyzzyxdonta") + license("Apache-2.0") + version("0.4.0", sha256="15b9e4bfa1d9b4fe4ae316f289c67b7be0774cdada5bd7310df4d0e026d9d227") # gearshifft used the variable name `CMAKE_DEFAULT_BUILD_TYPE` which was diff --git a/var/spack/repos/builtin/packages/gegelati/package.py b/var/spack/repos/builtin/packages/gegelati/package.py index f994d21328311c..4558126bb12674 100644 --- a/var/spack/repos/builtin/packages/gegelati/package.py +++ b/var/spack/repos/builtin/packages/gegelati/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Gegelati(CMakePackage): # notify when the package is updated. maintainers("lucascarvalhoroncoroni") + license("CECILL-C") + version("1.2.0", sha256="039997c7d6cb394f910f6c40620165b32094e0c85c170be01eb74b55488a1d4c") depends_on("sdl2") diff --git a/var/spack/repos/builtin/packages/gegl/package.py b/var/spack/repos/builtin/packages/gegl/package.py index 303b71d021523f..7005968e7d671a 100644 --- a/var/spack/repos/builtin/packages/gegl/package.py +++ b/var/spack/repos/builtin/packages/gegl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Gegl(MesonPackage): maintainers("benkirk") + license("GPL-3.0-or-later AND LGPL-3.0-or-later") + version("0.4.44", sha256="0a4cdb41635e406a0849cd0d3f03caf7d97cab8aa13d28707d532d0089d56126") version("0.4.42", sha256="aba83a0cbaa6c56edc29ea22f2e8172950a53b96daa51592083d59222bdde02d") version("0.4.40", sha256="cdde80d15a49dab9a614ef98f804c8ce6e4cfe1339a3c240c34f3fb45436b85d") diff --git a/var/spack/repos/builtin/packages/gemma/package.py b/var/spack/repos/builtin/packages/gemma/package.py index 625b30dfa204c6..6a43842e0fd930 100644 --- a/var/spack/repos/builtin/packages/gemma/package.py +++ b/var/spack/repos/builtin/packages/gemma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Gemma(MakefilePackage): maintainers("snehring", "dlkuehn") + license("GPL-3.0-or-later") + version("0.98.5", sha256="3ed336deee29e370f96ec8f1a240f7b62550e57dcd1694245ce7ec8f42241677") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/gemmlowp/package.py b/var/spack/repos/builtin/packages/gemmlowp/package.py index d1162a4525685e..cb56090e2e332a 100644 --- a/var/spack/repos/builtin/packages/gemmlowp/package.py +++ b/var/spack/repos/builtin/packages/gemmlowp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gemmlowp(Package): homepage = "https://github.com/google/gemmlowp" git = "https://github.com/google/gemmlowp.git" + license("Apache-2.0") + version("a6f29d9ac", commit="a6f29d8ac48d63293f845f2253eccbf86bc28321") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/genemark-et/package.py b/var/spack/repos/builtin/packages/genemark-et/package.py index b24096996c9eaa..8a344157fed7d5 100644 --- a/var/spack/repos/builtin/packages/genemark-et/package.py +++ b/var/spack/repos/builtin/packages/genemark-et/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/generax/package.py b/var/spack/repos/builtin/packages/generax/package.py index 16692d72c50aca..ef52f73e5b884b 100644 --- a/var/spack/repos/builtin/packages/generax/package.py +++ b/var/spack/repos/builtin/packages/generax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Generax(CMakePackage): maintainers("snehring") + license("AGPL-3.0-or-later") + version("master", branch="master", submodules=True) version("dev", branch="dev", submodules=True) version("2.0.4", commit="e4fab40f407bdd3b588d3d69a449f8c1be56f9fa", submodules=True) diff --git a/var/spack/repos/builtin/packages/genesis/package.py b/var/spack/repos/builtin/packages/genesis/package.py index 37404faa8c8926..485693084f50c0 100644 --- a/var/spack/repos/builtin/packages/genesis/package.py +++ b/var/spack/repos/builtin/packages/genesis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Genesis(AutotoolsPackage, CudaPackage): url = "https://www.r-ccs.riken.jp/labs/cbrt/wp-content/uploads/2020/09/genesis-1.5.1.tar.bz2" git = "https://github.com/genesis-release-r-ccs/genesis-2.0.git" + license("LGPL-3.0-or-later") + version( "1.6.0", sha256="d0185a5464ed4231f6ee81f6dcaa15935a99fa30b96658d2b7c25d7fbc5b38e9", diff --git a/var/spack/repos/builtin/packages/genfit/package.py b/var/spack/repos/builtin/packages/genfit/package.py index 182f366020c45d..c4e7f4b4417f01 100644 --- a/var/spack/repos/builtin/packages/genfit/package.py +++ b/var/spack/repos/builtin/packages/genfit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,13 @@ class Genfit(CMakePackage): tags = ["hep"] + license("LGPL-3.0-or-later") + version("master", branch="master") + version("02-00-05", sha256="8c37d1692e592f9f28a145c38aa41b0a6ed9211947846e9d10e34a2759ee446e") + version("02-00-04", sha256="b833e40cfe5343424262d28f9cb715fc80255313a985508453ac17c3a522b273") + version("02-00-03", sha256="23bb4c26740be96bd7933d30f3b683c6246b8f349116bc43d1c85117682e7a4b") + version("02-00-02", sha256="b415abec7466d7fd15de6c37cd970c07a6581fe303fdfa3a8bc9258ea1c19d7d") version("02-00-01", sha256="e5a3eabf1ab53178fbd40aff0a8071bf48bac558ba1b798769106ccf230c4120") version("02-00-00", sha256="0bfd5dd152ad0573daa4153a731945824e0ce266f844988b6a8bebafb7f2dacc") # Untagged version from 2017-06-23 known to work with root@6.16.00 @@ -29,14 +35,18 @@ class Genfit(CMakePackage): depends_on("eigen") depends_on("googletest") + # See https://github.com/GenFit/GenFit/pull/127 + conflicts("root@6.30:", when="@:02-00-04", msg="genfit cannot be built against root@6.30 ") + def cmake_args(self): args = [] - # normally, as a cmake package root should be - # automatically picked up after 'depends_on' - # as it is added to CMAKE_PREFIX_PATH - # but genfit cooks its own root cmake config - # so this workaround is needed for now. - root_prefix = self.spec["root"].prefix - args.append("-DROOT_DIR=%s" % root_prefix) + if self.spec.satisfies("@:02-00-04"): + # normally, as a cmake package root should be + # automatically picked up after 'depends_on' + # as it is added to CMAKE_PREFIX_PATH + # but genfit cooks its own root cmake config + # so this workaround is needed for now. + root_prefix = self.spec["root"].prefix + args.append("-DROOT_DIR=%s" % root_prefix) return args diff --git a/var/spack/repos/builtin/packages/gengeo/package.py b/var/spack/repos/builtin/packages/gengeo/package.py index a0bb146498c79b..6c0f3c6be25338 100644 --- a/var/spack/repos/builtin/packages/gengeo/package.py +++ b/var/spack/repos/builtin/packages/gengeo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Gengeo(AutotoolsPackage): maintainers("dorton21") + license("Apache-2.0") + version("163", sha256="9c896d430d8f315a45379d2b82e7d374f36259af66a745bfdee4c022a080d34d") extends("python") diff --git a/var/spack/repos/builtin/packages/gengetopt/package.py b/var/spack/repos/builtin/packages/gengetopt/package.py index 255f3308462da6..b445d8b23aafab 100644 --- a/var/spack/repos/builtin/packages/gengetopt/package.py +++ b/var/spack/repos/builtin/packages/gengetopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Gengetopt(AutotoolsPackage): maintainers("rblake-llnl") + license("GPL-3.0-or-later") + version("2.23", sha256="b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac") version("2.22.6", sha256="30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7") version("2.22.5", sha256="3b6fb3240352b0eb0c5b8583b58b62cbba58167cef5a7e82fa08a7f968ed2137") diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py index 5b4aa017fa09c0..bb9af9dbdd508f 100644 --- a/var/spack/repos/builtin/packages/genie/package.py +++ b/var/spack/repos/builtin/packages/genie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/genomefinisher/package.py b/var/spack/repos/builtin/packages/genomefinisher/package.py index 62723ce19825c4..e4c42ce2f6f046 100644 --- a/var/spack/repos/builtin/packages/genomefinisher/package.py +++ b/var/spack/repos/builtin/packages/genomefinisher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/genometools/package.py b/var/spack/repos/builtin/packages/genometools/package.py index 65125ded31cd80..7a3d299e2aee5d 100644 --- a/var/spack/repos/builtin/packages/genometools/package.py +++ b/var/spack/repos/builtin/packages/genometools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Genometools(MakefilePackage): homepage = "http://genometools.org/" url = "https://github.com/genometools/genometools/archive/refs/tags/v1.6.2.tar.gz" + license("BSD-2-Clause") + version("1.6.2", sha256="974825ddc42602bdce3d5fbe2b6e2726e7a35e81b532a0dc236f6e375d18adac") version("1.6.1", sha256="528ca143a7f1d42af8614d60ea1e5518012913a23526d82e434f0dad2e2d863f") version("1.5.9", sha256="bba8e043f097e7c72e823f73cb0efbd20bbd60f1ce797a0e4c0ab632b170c909") diff --git a/var/spack/repos/builtin/packages/genomeworks/package.py b/var/spack/repos/builtin/packages/genomeworks/package.py index 9ea6b6c072f3f6..59622cd79cdd38 100644 --- a/var/spack/repos/builtin/packages/genomeworks/package.py +++ b/var/spack/repos/builtin/packages/genomeworks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Genomeworks(CMakePackage, CudaPackage): url = "https://github.com/clara-parabricks/GenomeWorks/archive/v0.5.3.tar.gz" git = "https://github.com/clara-parabricks/GenomeWorks.git" + license("Apache-2.0") + version( "0.5.3", tag="v0.5.3", commit="b4b8bf76ea2ce44452d3a1107e66d47968414adb", submodules=True ) diff --git a/var/spack/repos/builtin/packages/genrich/package.py b/var/spack/repos/builtin/packages/genrich/package.py index 93253354dd3cdb..b36c194c921d61 100644 --- a/var/spack/repos/builtin/packages/genrich/package.py +++ b/var/spack/repos/builtin/packages/genrich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Genrich(MakefilePackage): homepage = "https://github.com/jsh58/Genrich" url = "https://github.com/jsh58/Genrich/archive/v0.6.tar.gz" + license("MIT") + version("0.6.1", sha256="2c70239e1caf33519b9e99142470bb4dd2f4c69e71f68cee33d6d6a1032d0e33") version("0.6", sha256="4c87aca8b7789f28b0c5c2c0ccea75668f19fa6a4cb38cd3c06d80ffd98d396f") diff --git a/var/spack/repos/builtin/packages/geode/package.py b/var/spack/repos/builtin/packages/geode/package.py index ca2b8549c9306c..51e828435624ec 100644 --- a/var/spack/repos/builtin/packages/geode/package.py +++ b/var/spack/repos/builtin/packages/geode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Geode(Package): homepage = "https://geode.apache.org/" url = "https://archive.apache.org/dist/geode/1.9.2/apache-geode-1.9.2.tgz" + license("Apache-2.0") + version("1.9.2", sha256="4b8118114ef43166f6bf73af56b93aadbf9108fcab06d1fbbb8e27f7d559d7e0") version("1.9.0", sha256="8794808ebc89bc855f0b989b32e91e890d446cfd058e123f6ccb9e12597c1c4f") version("1.8.0", sha256="58edc41edac4eabd899322b73a24727eac41f6253274c2ce7d0a82227121ae3e") diff --git a/var/spack/repos/builtin/packages/geoip-api-c/package.py b/var/spack/repos/builtin/packages/geoip-api-c/package.py index 0205334d5c4807..d7d1dc52934b36 100644 --- a/var/spack/repos/builtin/packages/geoip-api-c/package.py +++ b/var/spack/repos/builtin/packages/geoip-api-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class GeoipApiC(AutotoolsPackage): homepage = "https://github.com/maxmind/geoip-api-c" url = "https://github.com/maxmind/geoip-api-c/archive/v1.6.12.tar.gz" + license("LGPL-2.1-or-later") + version("1.6.12", sha256="99b119f8e21e94f1dfd6d49fbeed29a70df1544896e76cd456f25e397b07d476") version("1.6.11", sha256="b0e5a92200b5ab540d118983f7b7191caf4faf1ae879c44afa3ff2a2abcdb0f5") version("1.6.10", sha256="cb44e0d0dbc45efe2e399e695864e58237ce00026fba8a74b31d85888c89c67a") diff --git a/var/spack/repos/builtin/packages/geoip/package.py b/var/spack/repos/builtin/packages/geoip/package.py index 49034fa58f8520..2e3b02833882b3 100644 --- a/var/spack/repos/builtin/packages/geoip/package.py +++ b/var/spack/repos/builtin/packages/geoip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Geoip(AutotoolsPackage): homepage = "http://www.maxmind.com/app/c" url = "https://github.com/maxmind/geoip-api-c/releases/download/v1.6.12/GeoIP-1.6.12.tar.gz" + license("LGPL-2.1-or-later") + version("1.6.12", sha256="1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80") version("1.6.11", sha256="b0e5a92200b5ab540d118983f7b7191caf4faf1ae879c44afa3ff2a2abcdb0f5") version("1.6.10", sha256="cb44e0d0dbc45efe2e399e695864e58237ce00026fba8a74b31d85888c89c67a") diff --git a/var/spack/repos/builtin/packages/geopm/package.py b/var/spack/repos/builtin/packages/geopm/package.py index 56b6f3525f8bb9..4b033d27e56ada 100644 --- a/var/spack/repos/builtin/packages/geopm/package.py +++ b/var/spack/repos/builtin/packages/geopm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Geopm(AutotoolsPackage): tags = ["e4s"] + license("BSD-3-Clause") + # Add additional proper versions and checksums here. "spack checksum geopm" version("develop", branch="dev") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index dc23024cdc2116..ae859c85b079fd 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,20 +21,32 @@ class Geos(CMakePackage): maintainers("adamjstewart") + license("LGPL-2.1-or-later") + + version("3.12.1", sha256="d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03") version("3.12.0", sha256="d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39") + version("3.11.3", sha256="80d60a2bbc0cde7745a3366b9eb8c0d65a142b03e063ea0a52c364758cd5ee89") version("3.11.2", sha256="b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc") version("3.11.1", sha256="6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2") version("3.11.0", sha256="79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a") + version("3.10.6", sha256="078403158da66cad8be39ad1ede5e2fe4b70dcf7bb292fb06a65bdfe8afa6daf") + version("3.10.5", sha256="cc47d95e846e2745c493d8f9f3a9913b1c61f26717a1165898da64352aec4dde") version("3.10.4", sha256="d6fc11bcfd265cbf2714199174e4c3392d657551e5fd84c74c07c863b29357e3") version("3.10.3", sha256="3c141b07d61958a758345d5f54e3c735834b2f4303edb9f67fb26914f0d44770") version("3.10.2", sha256="50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715") version("3.10.1", sha256="a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648") version("3.10.0", sha256="097d70e3c8f688e59633ceb8d38ad5c9b0d7ead5729adeb925dbc489437abe13") + version("3.9.5", sha256="c6c9aedfa8864fb44ba78911408442382bfd0690cf2d4091ae3805c863789036") version("3.9.4", sha256="70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14") version("3.9.3", sha256="f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35") version("3.9.2", sha256="44a5a9be21d7d473436bf621c2ddcc3cf5a8bbe3c786e13229618a3b9d861297") version("3.9.1", sha256="7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a") + version("3.9.0", sha256="bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269") + version("3.8.4", sha256="6de8c98c1ae7cb0cd2d726a8dc9b7467308c4b4e05f9df94742244e64e441499") + version("3.8.3", sha256="f98315d1ba35c8d1a94a2947235f9e9dfb7057fdec343683f64ff9ad1061255c") + version("3.8.2", sha256="5a102f4614b0c9291504bbefd847ebac18ea717843506bd251d015c7cf9726b4") version("3.8.1", sha256="4258af4308deb9dbb5047379026b4cd9838513627cb943a44e16c40e42ae17f7") + version("3.8.0", sha256="99114c3dc95df31757f44d2afde73e61b9f742f0b683fd1894cbbee05dda62d5") version("3.7.2", sha256="2166e65be6d612317115bfec07827c11b403c3f303e0a7420a2106bc999d7707") version("3.6.2", sha256="045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a") version("3.6.1", sha256="4a2e4e3a7a09a7cfda3211d0f4a235d9fd3176ddf64bd8db14b4ead266189fc5") diff --git a/var/spack/repos/builtin/packages/getorganelle/package.py b/var/spack/repos/builtin/packages/getorganelle/package.py index cbf02854e5746a..8cc716fe28270f 100644 --- a/var/spack/repos/builtin/packages/getorganelle/package.py +++ b/var/spack/repos/builtin/packages/getorganelle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Getorganelle(PythonPackage): maintainers("snehring") + license("GPL-3.0-only") + version("1.7.7.0", sha256="dd351b5cd33688adfcd8bff9794ae0cc0ce01a572dac2bcf6c9d7db77b3e4883") version("1.7.5.0", sha256="c498196737726cb4c0158f23037bf301a069f5028ece729bb4d09c7d915df93d") diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index ee502c07853974..0c600821dcb77a 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,11 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): maintainers("michaelkuhn") executables = [r"^gettext$"] + tags = ["build-tools"] + license("GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT") + + version("0.22.4", sha256="29217f1816ee2e777fa9a01f9956a14139c0c23cc1b20368f06b2888e8a34116") version("0.22.3", sha256="b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6") version("0.21.1", sha256="50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6") version("0.21", sha256="d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192") diff --git a/var/spack/repos/builtin/packages/gexiv2/package.py b/var/spack/repos/builtin/packages/gexiv2/package.py index 109a8b61005e30..fc88a05935eb71 100644 --- a/var/spack/repos/builtin/packages/gexiv2/package.py +++ b/var/spack/repos/builtin/packages/gexiv2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gexiv2(MesonPackage): maintainers("benkirk") + license("GPL-2.0-or-later") + version("0.12.3", sha256="d23b7972a2fc6f840150bad1ed79c1cbec672951e180c1e1ec33ca6c730c59f3") version("0.12.2", sha256="2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c") version("0.12.1", sha256="8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77") diff --git a/var/spack/repos/builtin/packages/gffcompare/package.py b/var/spack/repos/builtin/packages/gffcompare/package.py index 7f1dda5318d140..88c66316cae13c 100644 --- a/var/spack/repos/builtin/packages/gffcompare/package.py +++ b/var/spack/repos/builtin/packages/gffcompare/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Gffcompare(MakefilePackage): "https://github.com/gpertea/gffcompare/releases/download/v0.12.6/gffcompare-0.12.6.tar.gz" ) + license("MIT") + version("0.12.6", sha256="0e713bc9177d874c935802d11669776da5e9377a8c4d031153b48a783d3391d0") def build(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/gffread/package.py b/var/spack/repos/builtin/packages/gffread/package.py index 3757aa52c1e098..58896451b2e340 100644 --- a/var/spack/repos/builtin/packages/gffread/package.py +++ b/var/spack/repos/builtin/packages/gffread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gffread(MakefilePackage): homepage = "http://ccb.jhu.edu/software/stringtie/gff.shtml#gffread" url = "https://github.com/gpertea/gffread/releases/download/v0.12.7/gffread-0.12.7.tar.gz" + license("MIT") + version("0.12.7", sha256="bfde1c857495e578f5b3af3c007a9aa40593e69450eafcc6a42c3e8ef08ed1f5") def build(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/gflags/package.py b/var/spack/repos/builtin/packages/gflags/package.py index 47ebfbeda01434..fbc0e846d98779 100644 --- a/var/spack/repos/builtin/packages/gflags/package.py +++ b/var/spack/repos/builtin/packages/gflags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Gflags(CMakePackage): homepage = "https://gflags.github.io/gflags" url = "https://github.com/gflags/gflags/archive/v2.1.2.tar.gz" + license("BSD-3-Clause") + version("2.2.2", sha256="34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf") version("2.1.2", sha256="d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662") diff --git a/var/spack/repos/builtin/packages/gfsio/package.py b/var/spack/repos/builtin/packages/gfsio/package.py index 2c03bb0fdba35a..a5dc64a92cf039 100644 --- a/var/spack/repos/builtin/packages/gfsio/package.py +++ b/var/spack/repos/builtin/packages/gfsio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gftl-shared/package.py b/var/spack/repos/builtin/packages/gftl-shared/package.py index 0ab1d4e672ca81..8a327a36265c26 100644 --- a/var/spack/repos/builtin/packages/gftl-shared/package.py +++ b/var/spack/repos/builtin/packages/gftl-shared/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,8 +21,11 @@ class GftlShared(CMakePackage): maintainers("mathomp4", "tclune") + license("Apache-2.0") + version("main", branch="main") + version("1.7.0", sha256="8ba567133fcee6b93bc71f61b3bb2053b4b07c6d78f6ad98a04dfc40aa478de7") version("1.6.1", sha256="0e3e1e0c7e0c3f1576e296b3b199dcae4bbaad055fc8fe929c34e52d4b07b02c") version("1.6.0", sha256="90245b83aea9854bc5b9fbd553a68cf73ab12f6ed5a14753a9c84092047e8cb0") version("1.5.1", sha256="353d07cc22678d1a79b19dbf53d8ba54b889e424a15e315cc4f035b72eedb83a") diff --git a/var/spack/repos/builtin/packages/gftl/package.py b/var/spack/repos/builtin/packages/gftl/package.py index ea176f9391f2f8..8f9dec7c90a5ca 100644 --- a/var/spack/repos/builtin/packages/gftl/package.py +++ b/var/spack/repos/builtin/packages/gftl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -39,6 +39,7 @@ class Gftl(CMakePackage): version("develop", branch="develop") version("main", branch="main") + version("1.11.0", sha256="b28935bc077749823b1505ad8c1208360a5ba7e961d7593c17a33b11455a32a4") version("1.10.0", sha256="d6086e8cba2497bacdae66d301f7cdacaed9138a0055f33f8ca1b778a0cf0dc5") version("1.9.0", sha256="4c7cb8b1313d87eaa5cc9aae242301085aa3b12688d0fddf54061503e95e4cc0") version("1.8.3", sha256="5864c6a427105c1194cbc0dcbe0dad2c3d14d42b2717f0a5e1626e0d56bba8a6") diff --git a/var/spack/repos/builtin/packages/gh/package.py b/var/spack/repos/builtin/packages/gh/package.py index c9012abb89298b..227ce371a092e4 100644 --- a/var/spack/repos/builtin/packages/gh/package.py +++ b/var/spack/repos/builtin/packages/gh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Gh(Package): maintainers("lcnzg") + license("MIT") + version("2.32.1", sha256="1d569dc82eb6520e6a8959568c2db84fea3bbaab2604c8dd5901849d320e1eae") version("2.28.0", sha256="cf3c0fb7f601d717d8b5177707a197c49fd426f5dc3c9aa52a932e96ba7166af") version("2.25.1", sha256="d3b28da03f49600697d2e80c2393425bd382e340040c34641bf3569593c7fbe8") diff --git a/var/spack/repos/builtin/packages/ghost/package.py b/var/spack/repos/builtin/packages/ghost/package.py index b37994afd4bba3..030edfe45b411f 100644 --- a/var/spack/repos/builtin/packages/ghost/package.py +++ b/var/spack/repos/builtin/packages/ghost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Ghost(CMakePackage, CudaPackage): maintainers("jthies") + license("BSD-3-Clause") + version("develop", branch="devel") variant("shared", default=True, description="Enables the build of shared libraries") diff --git a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py index 007f85cf74ee9f..9f2b83dccb8417 100644 --- a/var/spack/repos/builtin/packages/ghostscript-fonts/package.py +++ b/var/spack/repos/builtin/packages/ghostscript-fonts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class GhostscriptFonts(Package, SourceforgePackage): "gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/" "ghostscript-fonts-std-8.11.tar.gz" ) + license("GPL-2.0-or-later") + version("8.11", sha256="0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/ghostscript/package.py b/var/spack/repos/builtin/packages/ghostscript/package.py index 9e812e638f1d8e..9384b1e16fca07 100644 --- a/var/spack/repos/builtin/packages/ghostscript/package.py +++ b/var/spack/repos/builtin/packages/ghostscript/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Ghostscript(AutotoolsPackage): executables = [r"^gs$"] + license("AGPL-3.0-or-later") + version("10.0.0", sha256="a57764d70caf85e2fc0b0f59b83b92e25775631714dcdb97cc6e0cea414bb5a3") version("9.56.1", sha256="1598b9a38659cce8448d42a73054b2f9cbfcc40a9b97eeec5f22d4d6cd1de8e6") version("9.54.0", sha256="0646bb97f6f4d10a763f4919c54fa28b4fbdd3dff8e7de3410431c81762cade0") diff --git a/var/spack/repos/builtin/packages/giblib/package.py b/var/spack/repos/builtin/packages/giblib/package.py index 768329b190b965..d90ebb1e7c5679 100644 --- a/var/spack/repos/builtin/packages/giblib/package.py +++ b/var/spack/repos/builtin/packages/giblib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Giblib(AutotoolsPackage): homepage = "https://web.archive.org/web/20071002210842/http://linuxbrit.co.uk/giblib/" url = "https://mirror.amdmi3.ru/distfiles/giblib-1.2.4.tar.gz" + license("MIT") + version("1.2.4", sha256="176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac") depends_on("imlib2") diff --git a/var/spack/repos/builtin/packages/giflib/package.py b/var/spack/repos/builtin/packages/giflib/package.py index 8b8e6ac8e508c5..b28aed78931423 100644 --- a/var/spack/repos/builtin/packages/giflib/package.py +++ b/var/spack/repos/builtin/packages/giflib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Giflib(MakefilePackage, SourceforgePackage): homepage = "http://giflib.sourceforge.net/" sourceforge_mirror_path = "giflib/giflib-5.1.4.tar.gz" + license("MIT") + version("5.2.1", sha256="31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd") version("5.2.0", sha256="dc7257487c767137602d86c17098ec97065a718ff568a61cfcf1a9466f197b1f") version( diff --git a/var/spack/repos/builtin/packages/gimp/package.py b/var/spack/repos/builtin/packages/gimp/package.py index 4d0c424150568b..e823df76d8f26e 100644 --- a/var/spack/repos/builtin/packages/gimp/package.py +++ b/var/spack/repos/builtin/packages/gimp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and otherargs +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and otherargs # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) @@ -23,6 +23,8 @@ class Gimp(AutotoolsPackage): conflicts("platform=darwin", msg="spack/GIMP currently requires Linux") conflicts("platform=windows", msg="spack/GIMP currently requires Linux") + license("GPL-3.0-or-later") + version("2.10.32", sha256="3f15c70554af5dcc1b46e6dc68f3d8f0a6cc9fe56b6d78ac08c0fd859ab89a25") version("2.10.30", sha256="88815daa76ed7d4277eeb353358bafa116cd2fcd2c861d95b95135c1d52b67dc") version("2.10.28", sha256="4f4dc22cff1ab5f026feaa2ab55e05775b3a11e198186b47bdab79cbfa078826") diff --git a/var/spack/repos/builtin/packages/ginac/package.py b/var/spack/repos/builtin/packages/ginac/package.py index 1eec942844b52e..0cdd143e3df105 100644 --- a/var/spack/repos/builtin/packages/ginac/package.py +++ b/var/spack/repos/builtin/packages/ginac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ginac(CMakePackage): url = "https://www.ginac.de/ginac-1.7.8.tar.bz2" git = "git://www.ginac.de/ginac.git" + license("GPL-2.0-or-later") + version("1.7.11", sha256="96529ddef6ae9788aca0093f4b85fc4e34318bc6704e628e6423ab5a92dfe929") version("1.7.9", sha256="67cdff43a4360da997ee5323cce27cf313a5b17ba58f02e8f886138c0f629821") version("1.7.8", sha256="0c86501aa6c72efd5937fce42c5e983fc9f05dadb65b4ebdb51ee95c9f6a7067") diff --git a/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch b/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch new file mode 100644 index 00000000000000..7d1f97fc15c227 --- /dev/null +++ b/var/spack/repos/builtin/packages/ginkgo/ginkgo-sycl-pr1524.patch @@ -0,0 +1,13 @@ +diff -ruN spack-src/dpcpp/components/cooperative_groups.dp.hpp spack-src-patched/dpcpp/components/cooperative_groups.dp.hpp +--- spack-src/dpcpp/components/cooperative_groups.dp.hpp 2024-01-18 17:25:05.336926061 +0000 ++++ spack-src-patched/dpcpp/components/cooperative_groups.dp.hpp 2024-01-18 17:26:50.649595478 +0000 +@@ -240,7 +240,8 @@ + { + // todo: change it when OneAPI update the mask related api + return sycl::reduce_over_group( +- *this, (predicate != 0) ? mask_type(1) << data_.rank : mask_type(0), ++ static_cast(*this), ++ (predicate != 0) ? mask_type(1) << data_.rank : mask_type(0), + sycl::plus()); + } + diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 7bdfdb390370d5..d0ea6b619d3102 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,11 +22,18 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): tags = ["e4s"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") - version("1.6.0", commit="1f1ed46e724334626f016f105213c047e16bc1ae", preferred=True) # v1.6.0 + version("1.7.0", commit="49242ff89af1e695d7794f6d50ed9933024b66fe") # v1.7.0 + version("1.6.0", commit="1f1ed46e724334626f016f105213c047e16bc1ae") # v1.6.0 version("1.5.0", commit="234594c92b58e2384dfb43c2d08e7f43e2b58e7a") # v1.5.0 - version("1.5.0.glu_experimental", branch="glu_experimental") + version( + "1.5.0.glu_experimental", + branch="glu_experimental", + commit="e234eab1bd7afe85dd594638e291a2caf464bfb1", + ) version("1.4.0", commit="f811917c1def4d0fcd8db3fe5c948ce13409e28e") # v1.4.0 version("1.3.0", commit="4678668c66f634169def81620a85c9a20b7cec78") # v1.3.0 version("1.2.0", commit="b4be2be961fd5db45c3d02b5e004d73550722e31") # v1.2.0 @@ -37,13 +44,18 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): variant("shared", default=True, description="Build shared libraries") variant("full_optimizations", default=False, description="Compile with all optimizations") variant("openmp", default=sys.platform != "darwin", description="Build with OpenMP") - variant("oneapi", default=False, description="Build with oneAPI support") + variant("sycl", default=False, description="Enable SYCL backend") variant("develtools", default=False, description="Compile with develtools enabled") variant("hwloc", default=False, description="Enable HWLOC support") variant("mpi", default=False, description="Enable MPI support") - depends_on("cmake@3.9:", type="build") - depends_on("cuda@9:", when="+cuda") + depends_on("cmake@3.9:", type="build", when="@:1.3.0") + depends_on("cmake@3.13:", type="build", when="@1.4.0:1.6.0") + depends_on("cmake@3.16:", type="build", when="@1.7.0:") + depends_on("cmake@3.18:", type="build", when="+cuda@1.7.0:") + depends_on("cuda@9:", when="+cuda @:1.4.0") + depends_on("cuda@9.2:", when="+cuda @1.5.0:") + depends_on("cuda@10.1:", when="+cuda @1.7.0:") depends_on("mpi", when="+mpi") depends_on("rocthrust", when="+rocm") @@ -60,14 +72,13 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): depends_on("googletest", type="test") depends_on("numactl", type="test", when="+hwloc") - depends_on("intel-oneapi-mkl", when="+oneapi") - depends_on("intel-oneapi-dpl", when="+oneapi") + depends_on("intel-oneapi-mkl", when="+sycl") + depends_on("intel-oneapi-dpl", when="+sycl") + depends_on("intel-oneapi-tbb", when="+sycl") conflicts("%gcc@:5.2.9") conflicts("+rocm", when="@:1.1.1") conflicts("+mpi", when="@:1.4.0") - conflicts("+cuda", when="+rocm") - conflicts("+openmp", when="+oneapi") # ROCm 4.1.0 breaks platform settings which breaks Ginkgo's HIP support. conflicts("^hip@4.1.0:", when="@:1.3.0") @@ -76,22 +87,38 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): conflicts("^rocthrust@4.1.0:", when="@:1.3.0") conflicts("^rocprim@4.1.0:", when="@:1.3.0") + # Ginkgo 1.6.0 start relying on ROCm 4.5.0 + conflicts("^hip@:4.3.1", when="@1.6.0:") + conflicts("^hipblas@:4.3.1", when="@1.6.0:") + conflicts("^hipsparse@:4.3.1", when="@1.6.0:") + conflicts("^rocthrust@:4.3.1", when="@1.6.0:") + conflicts("^rocprim@:4.3.1", when="@1.6.0:") + + conflicts( + "+sycl", when="@:1.4.0", msg="For SYCL support, please use Ginkgo version 1.4.0 and newer." + ) + + # https://github.com/ginkgo-project/ginkgo/pull/1524 + patch("ginkgo-sycl-pr1524.patch", when="@1.7.0 +sycl %oneapi@2024:") + # Skip smoke tests if compatible hardware isn't found patch("1.4.0_skip_invalid_smoke_tests.patch", when="@1.4.0") - # Newer DPC++ compilers use the updated SYCL 2020 standard which change - # kernel attribute propagation rules. This doesn't work well with the - # initial Ginkgo oneAPI support. - patch("1.4.0_dpcpp_use_old_standard.patch", when="+oneapi @1.4.0") - # Add missing include statement patch("thrust-count-header.patch", when="+rocm @1.5.0") def setup_build_environment(self, env): spec = self.spec - if "+oneapi" in spec: + if "+sycl" in spec: env.set("MKLROOT", join_path(spec["intel-oneapi-mkl"].prefix, "mkl", "latest")) env.set("DPL_ROOT", join_path(spec["intel-oneapi-dpl"].prefix, "dpl", "latest")) + # The `IntelSYCLConfig.cmake` is broken with spack. By default, it + # relies on the CMAKE_CXX_COMPILER being the real ipcx/dpcpp + # compiler. If not, the variable SYCL_COMPILER of that script is + # broken, and all the SYCL detection mechanism is wrong. We fix it + # by giving hint environment variables. + env.set("SYCL_LIBRARY_DIR_HINT", os.path.dirname(os.path.dirname(self.compiler.cxx))) + env.set("SYCL_INCLUDE_DIR_HINT", os.path.dirname(os.path.dirname(self.compiler.cxx))) def cmake_args(self): # Check that the have the correct C++ standard is available @@ -106,18 +133,19 @@ def cmake_args(self): except UnsupportedCompilerFlag: raise InstallError("Ginkgo requires a C++14-compliant C++ compiler") - cxx_is_dpcpp = os.path.basename(self.compiler.cxx) == "dpcpp" - if self.spec.satisfies("+oneapi") and not cxx_is_dpcpp: - raise InstallError( - "Ginkgo's oneAPI backend requires the" + "DPC++ compiler as main CXX compiler." - ) + if self.spec.satisfies("@1.4.0:1.6.0 +sycl") and not self.spec.satisfies( + "%oneapi@2021.3.0:" + ): + raise InstallError("ginkgo +sycl requires %oneapi@2021.3.0:") + elif self.spec.satisfies("@1.7.0: +sycl") and not self.spec.satisfies("%oneapi@2022.1.0:"): + raise InstallError("ginkgo +sycl requires %oneapi@2022.1.0:") spec = self.spec from_variant = self.define_from_variant args = [ from_variant("GINKGO_BUILD_CUDA", "cuda"), from_variant("GINKGO_BUILD_HIP", "rocm"), - from_variant("GINKGO_BUILD_DPCPP", "oneapi"), + from_variant("GINKGO_BUILD_SYCL", "sycl"), from_variant("GINKGO_BUILD_OMP", "openmp"), from_variant("GINKGO_BUILD_MPI", "mpi"), from_variant("BUILD_SHARED_LIBS", "shared"), @@ -161,6 +189,11 @@ def cmake_args(self): args.append( self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip) ) + + if "+sycl" in self.spec: + sycl_compatible_compilers = ["dpcpp", "icpx"] + if not (os.path.basename(self.compiler.cxx) in sycl_compatible_compilers): + raise InstallError("ginkgo +sycl requires DPC++ (dpcpp) or icpx compiler.") return args @property diff --git a/var/spack/repos/builtin/packages/giraph/package.py b/var/spack/repos/builtin/packages/giraph/package.py index 4c2c3bf1fe767b..799a03a44b0ed9 100644 --- a/var/spack/repos/builtin/packages/giraph/package.py +++ b/var/spack/repos/builtin/packages/giraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Giraph(MavenPackage): list_url = "https://downloads.apache.org/giraph/" list_depth = 1 + license("Apache-2.0") + version("1.2.0", sha256="6206f4ad220ea42aa0c4abecce343e36026cf9c6e0a2853f1eb08543da452ad1") version("1.1.0", sha256="181d94b8198c0f312d4611e24b0056b5181c8358a7ec89b0393661736cd19a4c") diff --git a/var/spack/repos/builtin/packages/git-annex/package.py b/var/spack/repos/builtin/packages/git-annex/package.py index ece00cd376225d..be50387287245d 100644 --- a/var/spack/repos/builtin/packages/git-annex/package.py +++ b/var/spack/repos/builtin/packages/git-annex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -49,6 +49,8 @@ class GitAnnex(Package): skip_version_audit = ["platform=darwin"] + license("AGPL-3.0-or-later") + if platform.system() == "Linux" and platform.machine() == "aarch64": # git-annex-standalone-arm64.tar.gz version( diff --git a/var/spack/repos/builtin/packages/git-fat-git/package.py b/var/spack/repos/builtin/packages/git-fat-git/package.py index a42713b674405e..1d4417f936c29c 100644 --- a/var/spack/repos/builtin/packages/git-fat-git/package.py +++ b/var/spack/repos/builtin/packages/git-fat-git/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class GitFatGit(Package): homepage = "https://github.com/jedbrown/git-fat" git = "https://github.com/jedbrown/git-fat.git" + license("BSD-2-Clause") + version("2018-08-21", commit="e1733b1c7c4169d0a1d31cb76f168fb0880176c0") depends_on("python", type="run") diff --git a/var/spack/repos/builtin/packages/git-filter-repo/package.py b/var/spack/repos/builtin/packages/git-filter-repo/package.py index b2644eeaa8af7d..545d15300b1423 100644 --- a/var/spack/repos/builtin/packages/git-filter-repo/package.py +++ b/var/spack/repos/builtin/packages/git-filter-repo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class GitFilterRepo(Package): maintainers("aphedges") + license("MIT") + version("2.38.0", sha256="db954f4cae9e47c6be3bd3161bc80540d44f5379cb9cf9df498f4e019f0a41a9") version("2.34.0", sha256="b1bf46af1e6a91a54056d0254e480803db8e40f631336c559a1a94d2a08389c4") diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 6befd2525bef4a..ea9671eda0abc9 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class GitImerge(MakefilePackage): homepage = "https://github.com/mhagger/git-imerge" url = "https://github.com/mhagger/git-imerge/archive/v1.1.0.tar.gz" + license("GPL-2.0-or-later") + version("1.1.0", sha256="62692f43591cc7d861689c60b68c55d7b10c7a201c1026096a7efc771df2ca28") version("1.0.0", sha256="2ef3a49a6d54c4248ef2541efc3c860824fc8295a7226760f24f0bb2c5dd41f2") diff --git a/var/spack/repos/builtin/packages/git-lfs/package.py b/var/spack/repos/builtin/packages/git-lfs/package.py index 3ebef50240a8c1..e2e9ffe793f960 100644 --- a/var/spack/repos/builtin/packages/git-lfs/package.py +++ b/var/spack/repos/builtin/packages/git-lfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class GitLfs(MakefilePackage): maintainers("sethrj") + license("MIT") + version("3.3.0", sha256="d5eeb9ee33188d3dd6a391f8a39b96d271f10295129789e5b3a1ac0e9f5114f5") version("3.1.2", sha256="5c9bc449068d0104ea124c25f596af16da85e7b5bf256bc544d8ce5f4fe231f2") version("2.13.3", sha256="f8bd7a06e61e47417eb54c3a0db809ea864a9322629b5544b78661edab17b950") diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 417600cc05d3f2..c47510fa87c86a 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Git(AutotoolsPackage): executables = ["^git$"] + license("GPL-2.0-only") + # Every new git release comes with a corresponding manpage resource: # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.gz # https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc diff --git a/var/spack/repos/builtin/packages/gitconddb/package.py b/var/spack/repos/builtin/packages/gitconddb/package.py index 8dbad1692ce907..f42822459d0387 100644 --- a/var/spack/repos/builtin/packages/gitconddb/package.py +++ b/var/spack/repos/builtin/packages/gitconddb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Gitconddb(CMakePackage): maintainers("drbenmorgan") + license("Apache-2.0") + version("master", branch="master") version("0.2.0", sha256="dfbaa33581d5c6fac1102668c542b32d14499a30a2793bc55b133aba9f7295fc") version("0.1.3", sha256="29ed88498fd7ea3fd24bc80e9bfdec796cbeb584796c94c6c6b0baa368842ad4") diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py index 9e2973a166c668..59fcebe43146f9 100644 --- a/var/spack/repos/builtin/packages/gl2ps/package.py +++ b/var/spack/repos/builtin/packages/gl2ps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gl2ps(CMakePackage): homepage = "https://www.geuz.org/gl2ps/" url = "https://geuz.org/gl2ps/src/gl2ps-1.3.9.tgz" + license("LGPL-2.0-only") + version("1.4.2", sha256="8d1c00c1018f96b4b97655482e57dcb0ce42ae2f1d349cd6d4191e7848d9ffe9") version("1.4.0", sha256="03cb5e6dfcd87183f3b9ba3b22f04cd155096af81e52988cc37d8d8efe6cf1e2") version("1.3.9", sha256="8a680bff120df8bcd78afac276cdc38041fed617f2721bade01213362bcc3640") diff --git a/var/spack/repos/builtin/packages/glab/package.py b/var/spack/repos/builtin/packages/glab/package.py index 1f5d5fc20d6bad..9cb9a26c2570b6 100644 --- a/var/spack/repos/builtin/packages/glab/package.py +++ b/var/spack/repos/builtin/packages/glab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class Glab(Package): maintainers("alecbcs") + license("MIT") + + version("1.35.0", sha256="7ed31c7a9b425fc15922f83c5dd8634a2758262a4f25f92583378655fcad6303") version("1.33.0", sha256="447a9b76acb5377642a4975908f610a3082026c176329c7c8cfed1461d2e1570") version("1.31.0", sha256="5648e88e7d6cc993227f5a4e80238af189bed09c7aed1eb12be7408e9a042747") version("1.30.0", sha256="d3c1a9ba723d94a0be10fc343717cf7b61732644f5c42922f1c8d81047164b99") diff --git a/var/spack/repos/builtin/packages/glew/package.py b/var/spack/repos/builtin/packages/glew/package.py index a5d8d1ef3e6117..22ec0dbb684b11 100644 --- a/var/spack/repos/builtin/packages/glew/package.py +++ b/var/spack/repos/builtin/packages/glew/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,10 @@ class Glew(CMakePackage): url = "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz" root_cmakelists_dir = "build/cmake" + maintainers("biddisco") + + license("GPL-2.0-or-later") + version("2.2.0", sha256="d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1") version("2.1.0", sha256="04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95") version("2.0.0", sha256="c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764") @@ -22,20 +26,26 @@ class Glew(CMakePackage): variant( "gl", default="glx" if sys.platform.startswith("linux") else "other", - values=("glx", "osmesa", "other"), + values=("glx", "osmesa", "egl", "other"), multi=False, description="The OpenGL provider to use", ) conflicts("^osmesa", when="gl=glx") + conflicts("^osmesa", when="gl=egl") conflicts("^osmesa", when="gl=other") conflicts("^glx", when="gl=osmesa") conflicts("^glx", when="gl=other") + conflicts("^glx", when="gl=egl") + conflicts("^egl", when="gl=glx") + conflicts("^egl", when="gl=osmesa") + conflicts("^egl", when="gl=other") depends_on("gl") depends_on("osmesa", when="gl=osmesa") depends_on("glx", when="gl=glx") depends_on("libx11", when="gl=glx") depends_on("xproto", when="gl=glx") + depends_on("egl", when="gl=egl") # glu is already forcibly disabled in the CMakeLists.txt. This prevents # it from showing up in the .pc file @@ -46,17 +56,22 @@ def cmake_args(self): args = [ self.define("BUILD_UTILS", True), self.define("GLEW_REGAL", False), - self.define("GLEW_EGL", 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_egl_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( + self.define("OPENGL_egl_LIBRARY", [spec["egl"].libs[0], spec["egl"].libs[1]]) + ) + else: + args.append(self.define("OPENGL_egl_LIBRARY", "IGNORE")) return args diff --git a/var/spack/repos/builtin/packages/glfmultiples/package.py b/var/spack/repos/builtin/packages/glfmultiples/package.py index b59997ed4b5740..4ed24a057343a8 100644 --- a/var/spack/repos/builtin/packages/glfmultiples/package.py +++ b/var/spack/repos/builtin/packages/glfmultiples/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Glfmultiples(MakefilePackage): homepage = "https://genome.sph.umich.edu/wiki/GlfMultiples" url = "http://www.sph.umich.edu/csg/abecasis/downloads/generic-glfMultiples-2010-06-16.tar.gz" + license("BSD-3-Clause") + version( "2010-06-16", sha256="f7abef6f6b043e9052fb408bb2aae6d0d97d907aedc1b3e02dd0db08eb81b979" ) diff --git a/var/spack/repos/builtin/packages/glfw/package.py b/var/spack/repos/builtin/packages/glfw/package.py index ba12fb79512ce3..bdaadb3cfd915f 100644 --- a/var/spack/repos/builtin/packages/glfw/package.py +++ b/var/spack/repos/builtin/packages/glfw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Glfw(CMakePackage): homepage = "https://www.glfw.org/" url = "https://github.com/glfw/glfw/archive/3.3.2.tar.gz" + license("Zlib") + version("3.3.8", sha256="f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713") version("3.3.2", sha256="98768e12e615fbe9f3386f5bbfeb91b5a3b45a8c4c77159cef06b1f6ff749537") version("3.3.1", sha256="6bca16e69361798817a4b62a5239a77253c29577fcd5d52ae8b85096e514177f") diff --git a/var/spack/repos/builtin/packages/glib-networking/package.py b/var/spack/repos/builtin/packages/glib-networking/package.py index 1ca95898e0e35b..998c0d7beed17e 100644 --- a/var/spack/repos/builtin/packages/glib-networking/package.py +++ b/var/spack/repos/builtin/packages/glib-networking/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class GlibNetworking(MesonPackage): homepage = "https://gitlab.gnome.org/GNOME/glib-networking" url = "https://github.com/GNOME/glib-networking/archive/2.66.0.tar.gz" + license("LGPL-2.0-or-later") + version("2.66.0", sha256="186a670c00525d62aa160bc3e492d9efd2f59c540c50477982eb732ed62ee96c") version("2.65.90", sha256="91b35c5d7472d10229b0b01c0631ac171903e96f84a6fb22c4126a40528c09e2") version("2.65.1", sha256="d06311004f7dda4561c210f286a3678b631fb7187cb3b90616c5ba39307cc91f") diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index f51d636d7eccda..dd4eafcae17162 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,9 @@ class Glib(MesonPackage, AutotoolsPackage): maintainers("michaelkuhn") + license("LGPL-2.1-or-later") + + version("2.78.3", sha256="609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21") version("2.78.0", sha256="44eaab8b720877ce303c5540b657b126f12dc94972d9880b52959f43fb537b30") version("2.76.6", sha256="1136ae6987dcbb64e0be3197a80190520f7acab81e2bfb937dc85c11c8aa9f04") version("2.76.4", sha256="5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda") diff --git a/var/spack/repos/builtin/packages/glibc/package.py b/var/spack/repos/builtin/packages/glibc/package.py index a49a934abe3df1..471eb0345dfd88 100644 --- a/var/spack/repos/builtin/packages/glibc/package.py +++ b/var/spack/repos/builtin/packages/glibc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Glibc(AutotoolsPackage, GNUMirrorPackage): build_directory = "build" + license("LGPL-2.1-or-later") + version("master", branch="master") version("2.38", sha256="16e51e0455e288f03380b436e41d5927c60945abd86d0c9852b84be57dd6ed5e") version("2.37", sha256="e3a790c2f84eed5c5d569ed6172c253c607dd3962135437da413aa39aa4fd352") diff --git a/var/spack/repos/builtin/packages/glibmm/package.py b/var/spack/repos/builtin/packages/glibmm/package.py index 71a44496c2bb13..25b0ba95eae427 100644 --- a/var/spack/repos/builtin/packages/glibmm/package.py +++ b/var/spack/repos/builtin/packages/glibmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Glibmm(AutotoolsPackage): homepage = "https://gitlab.gnome.org/GNOME/glibmm" url = "https://download-fallback.gnome.org/sources/glibmm/2.70/glibmm-2.70.0.tar.xz" + license("LGPL-2.1-or-later") + # version('2.70.0', sha256='8008fd8aeddcc867a3f97f113de625f6e96ef98cf7860379813a9c0feffdb520') version("2.19.3", sha256="23958368535c19188b1241c4615dcf1f35e80e0922a04236bb9247dcd8fe0a2b") version("2.16.0", sha256="99795b9c6e58e490df740a113408092bf47a928427cbf178d77c35adcb6a57a3") diff --git a/var/spack/repos/builtin/packages/glimmer/package.py b/var/spack/repos/builtin/packages/glimmer/package.py index ea160b7eca7590..f16453f198d79d 100644 --- a/var/spack/repos/builtin/packages/glimmer/package.py +++ b/var/spack/repos/builtin/packages/glimmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Glimmer(MakefilePackage): homepage = "https://ccb.jhu.edu/software/glimmer" + license("Artistic-1.0") + version("3.02b", sha256="ecf28e03d0a675aed7360ca34ca7f19993f5c3ea889273e657ced9fa7d1e2bf6") build_directory = "src" diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index 68ab06285b8f2c..bd5921c61bc82e 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Glm(CMakePackage): git = "https://github.com/g-truc/glm.git" tags = ["windows"] + license("MIT") + version("develop", branch="master") version("0.9.9.8", sha256="7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592") version("0.9.9.3", sha256="fba9fd177073a36c5a7798c74b28e79ba6deb8f4bb0d2dbfc0e207c27da7e12c") diff --git a/var/spack/repos/builtin/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py index e8881071228596..9b134f600a7dc6 100644 --- a/var/spack/repos/builtin/packages/global/package.py +++ b/var/spack/repos/builtin/packages/global/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Global(Package): maintainers("gaber") + license("LGPL-3.0-only") + version("6.6.7", sha256="69a0f77f53827c5568176c1d382166df361e74263a047f0b3058aa2f2ad58a3c") version("6.6.6", sha256="758078afff98d4c051c58785c7ada3ed1977fabb77f8897ff657b71cc62d4d5d") version("6.6.4", sha256="987e8cb956c53f8ebe4453b778a8fde2037b982613aba7f3e8e74bcd05312594") diff --git a/var/spack/repos/builtin/packages/globalarrays/package.py b/var/spack/repos/builtin/packages/globalarrays/package.py index 7800d45d4195c7..54f740cac9054c 100644 --- a/var/spack/repos/builtin/packages/globalarrays/package.py +++ b/var/spack/repos/builtin/packages/globalarrays/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Globalarrays(AutotoolsPackage): tags = ["e4s"] + license("BSD-3-Clause") + version("5.8.2", sha256="51599e4abfe36f05cecfaffa33be19efbe9e9fa42d035fd3f866469b663c22a2") version("5.8", sha256="64df7d1ea4053d24d84ca361e67a6f51c7b17ed7d626cb18a9fbc759f4a078ac") version("5.7.2", sha256="8cd0fcfd85bc7f9c168c831616f66f1e8b9b2ca31dc7dd93cc55b27cc7fe7069") diff --git a/var/spack/repos/builtin/packages/glog/package.py b/var/spack/repos/builtin/packages/glog/package.py index 17c30dcc5567a8..b6deab02533608 100644 --- a/var/spack/repos/builtin/packages/glog/package.py +++ b/var/spack/repos/builtin/packages/glog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Glog(Package): homepage = "https://github.com/google/glog" url = "https://github.com/google/glog/archive/v0.3.5.tar.gz" + license("BSD-3-Clause") + version("0.6.0", sha256="8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6") version("0.4.0", sha256="f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c") version("0.3.5", sha256="7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0") diff --git a/var/spack/repos/builtin/packages/gloo/package.py b/var/spack/repos/builtin/packages/gloo/package.py index ec4503900e9b4c..dcf9a7e3cebd4f 100644 --- a/var/spack/repos/builtin/packages/gloo/package.py +++ b/var/spack/repos/builtin/packages/gloo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gloo(CMakePackage, CudaPackage): homepage = "https://github.com/facebookincubator/gloo" git = "https://github.com/facebookincubator/gloo.git" + license("BSD-3-Clause") + version("master", branch="master") version("2023-05-19", commit="597accfd79f5b0f9d57b228dec088ca996686475") # py-torch@2.1: version("2023-01-17", commit="10909297fedab0a680799211a299203e53515032") # py-torch@2.0 @@ -35,6 +37,13 @@ class Gloo(CMakePackage, CudaPackage): sha256="8e6e9a44e0533ba4303a95a651b1934e5d73632cab08cc7d5a9435e1e64aa424", when="@:2023-01-16", ) + # Fix building with gcc 12, see https://github.com/facebookincubator/gloo/pull/333 + patch( + "https://github.com/facebookincubator/gloo/commit/4a5e339b764261d20fc409071dc7a8b8989aa195.patch?full_index=1", + sha256="dc8b3a9bea4693f32d6850ea2ce6ce75e1778538bfba464b50efca92bac425e3", + when="@2021-05-21:2022-05-18", + ) + generator("ninja") depends_on("cmake@2.8.12:", type="build") diff --git a/var/spack/repos/builtin/packages/glow/package.py b/var/spack/repos/builtin/packages/glow/package.py new file mode 100644 index 00000000000000..979d56da20740a --- /dev/null +++ b/var/spack/repos/builtin/packages/glow/package.py @@ -0,0 +1,40 @@ +# 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 Glow(GoPackage): + """ + Glow is a terminal based markdown reader designed + from the ground up to bring out the beauty—and power—of the CLI. + Use it to discover markdown files, + read documentation directly on the command line and stash markdown files + to your own private collection, so you can read them anywhere. + Glow will find local markdown files in subdirectories or a local Git repository. + """ + + homepage = "https://github.com/charmbracelet/glow" + + url = "https://github.com/charmbracelet/glow/archive/refs/tags/v1.5.1.tar.gz" + + license("MIT") + + version("1.5.1", sha256="b4ecf269b7c6447e19591b1d23f398ef2b38a6a75be68458390b42d3efc44b92") + version("1.5.0", sha256="66f2a876eba15d71cfd08b56667fb07e1d49d383aa17d31696a39e794e23ba92") + version("1.4.1", sha256="ff6dfd7568f0bac5144ffa3a429ed956dcbdb531487ef6e38ac61365322c9601") + version("1.4.0", sha256="97d373e002332e54e2fb808ea38f098ca49e2b88038c115bd6d33d0b3b921495") + version("1.3.0", sha256="828d8453f026a24cd7a6dcf8d97213fe713cadcfab7ca969d5f4c8338d88bb86") + version("1.2.1", sha256="ceb9369e2f93412abf914fd4cdc2e1a7e70cf48e2b2607c1e10847223c4a1b68") + version("1.2.0", sha256="75d80dcd3258569e187d189f96f79de544332b72d635cc20b5111453d03c3a2d") + version("1.1.0", sha256="c9a72e2267b95e39033e845961ad45675c9f0d86080b138c6a2fbf2a5d3428d1") + version("1.0.2", sha256="2d98c1e780d750b83d8da094de4c2a999c324021906e6d813b7c75d0320243c8") + version("1.0.1", sha256="78d163bea8e6c13fb343f1e3586e93e0392e5052c408a248cc2f0fcc7aa38618") + + def install(self, spec, prefix): + mkdirp(prefix.bin) + install("glow", prefix.bin) + mkdirp(prefix.completions) + install_tree(".", prefix.completions) diff --git a/var/spack/repos/builtin/packages/glpk/package.py b/var/spack/repos/builtin/packages/glpk/package.py index 80b26430d75d14..2cd7426f7102cf 100644 --- a/var/spack/repos/builtin/packages/glpk/package.py +++ b/var/spack/repos/builtin/packages/glpk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Glpk(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/glpk" gnu_mirror_path = "glpk/glpk-4.65.tar.gz" + license("GPL-3.0-only") + version("5.0", sha256="4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15") version("4.65", sha256="4281e29b628864dfe48d393a7bedd781e5b475387c20d8b0158f329994721a10") version("4.61", sha256="9866de41777782d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9") diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py index 9a2ad04d6291ab..b3fc6753ad81b6 100644 --- a/var/spack/repos/builtin/packages/glproto/package.py +++ b/var/spack/repos/builtin/packages/glproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Glproto(AutotoolsPackage, XorgPackage): homepage = "https://www.x.org/wiki/" xorg_mirror_path = "proto/glproto-1.4.17.tar.gz" + license("SGI-B-1.1") + version("1.4.17", sha256="9d8130fec2b98bd032db7730fa092dd9dec39f3de34f4bb03ceb43b9903dbc96") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/gluegen/package.py b/var/spack/repos/builtin/packages/gluegen/package.py index 84bd8b093a997e..5112cee7c66dd5 100644 --- a/var/spack/repos/builtin/packages/gluegen/package.py +++ b/var/spack/repos/builtin/packages/gluegen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Gluegen(Package): homepage = "https://jogamp.org/gluegen/www/" git = "https://github.com/WadeWalker/gluegen.git" + license("Apache-2.0") + version("java-11-fixes", branch="java-11-fixes", submodules=True) # ant optional jar file to execute antlr tasks diff --git a/var/spack/repos/builtin/packages/glusterfs/package.py b/var/spack/repos/builtin/packages/glusterfs/package.py index 9d3facb9da7b00..0df17e464a5d24 100644 --- a/var/spack/repos/builtin/packages/glusterfs/package.py +++ b/var/spack/repos/builtin/packages/glusterfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Glusterfs(AutotoolsPackage): list_url = "https://download.gluster.org/pub/gluster/glusterfs/" list_depth = 2 + license("LGPL-3.0-or-later") + version("7.3", sha256="2401cc7c3f5488f6fc5ea09ce2ab30c918612f592571fb3de6124f8482ad4954") version("7.2", sha256="8e43614967b90d64495fbe2c52230dd72572ce219507fb48bc317b1c228a06e1") version("7.1", sha256="ffc5bd78b079009382bd01391865646bc9b2e8e72366afc96d62ba891dd9dbce") diff --git a/var/spack/repos/builtin/packages/glvis/package.py b/var/spack/repos/builtin/packages/glvis/package.py index ba2ff744232cb0..310c9695b5ed11 100644 --- a/var/spack/repos/builtin/packages/glvis/package.py +++ b/var/spack/repos/builtin/packages/glvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -40,6 +40,8 @@ class Glvis(MakefilePackage): # glvis does not need mfem+mpi but will build that by default, to just build # a serial mfem: `spack install glvis ^mfem~mpi~metis' + license("BSD-3-Clause") + version("develop", branch="master") version( diff --git a/var/spack/repos/builtin/packages/glx/package.py b/var/spack/repos/builtin/packages/glx/package.py index 8cc47356c8b67e..56cbfca57f6130 100644 --- a/var/spack/repos/builtin/packages/glx/package.py +++ b/var/spack/repos/builtin/packages/glx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py index d30b94b1051e10..95ea48276d0d4e 100644 --- a/var/spack/repos/builtin/packages/gmake/package.py +++ b/var/spack/repos/builtin/packages/gmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gmake(Package, GNUMirrorPackage): gnu_mirror_path = "make/make-4.2.1.tar.gz" maintainers("haampie") + license("GPL-3.0-only") + # Stable releases version("4.4.1", sha256="dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3") version("4.4", sha256="581f4d4e872da74b3941c874215898a7d35802f03732bdccee1d4a7979105d18") @@ -67,6 +69,8 @@ def configure_args(self): return [ "--with-guile" if self.spec.satisfies("+guile") else "--without-guile", "--disable-nls", + # configure needs make to enable dependency tracking, disable explicitly + "--disable-dependency-tracking", ] def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/gmap-gsnap/package.py b/var/spack/repos/builtin/packages/gmap-gsnap/package.py index 3b7773763d2fa5..739e76f5fea51d 100644 --- a/var/spack/repos/builtin/packages/gmap-gsnap/package.py +++ b/var/spack/repos/builtin/packages/gmap-gsnap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class GmapGsnap(AutotoolsPackage): maintainers("snehring") + license("Apache-2.0") + version( "2023-07-20", sha256="19e70eebd9b282d8596721812d071efed188b6d5000627b9948f0486f87fe68f" ) diff --git a/var/spack/repos/builtin/packages/gmic/package.py b/var/spack/repos/builtin/packages/gmic/package.py index af6a4cd37f0307..eacf2e90e06933 100644 --- a/var/spack/repos/builtin/packages/gmic/package.py +++ b/var/spack/repos/builtin/packages/gmic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Gmic(MakefilePackage): homepage = "https://gmic.eu/" git = "https://github.com/GreycLab/gmic.git" + license("CECILL-2.1") + version("develop", branch="master") version("3.1.6", tag="v.3.1.6") diff --git a/var/spack/repos/builtin/packages/gmime/package.py b/var/spack/repos/builtin/packages/gmime/package.py index ef14fffcf9aeb0..c10f374153d419 100644 --- a/var/spack/repos/builtin/packages/gmime/package.py +++ b/var/spack/repos/builtin/packages/gmime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Gmime(AutotoolsPackage): homepage = "http://spruce.sourceforge.net/gmime/" url = "https://download.gnome.org/sources/gmime/2.6/gmime-2.6.23.tar.xz" + license("LGPL-2.1-or-later") + version("2.6.23", sha256="7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a") depends_on("glib@2.18.0:") diff --git a/var/spack/repos/builtin/packages/gmodel/package.py b/var/spack/repos/builtin/packages/gmodel/package.py index fc47831a5d0201..c65558e0cca0c2 100644 --- a/var/spack/repos/builtin/packages/gmodel/package.py +++ b/var/spack/repos/builtin/packages/gmodel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Gmodel(CMakePackage): homepage = "https://github.com/ibaned/gmodel" url = "https://github.com/ibaned/gmodel/archive/v2.1.0.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("2.1.0", sha256="80df0c6dc413a9ffa0f0e7b65118b05b643ba3e1bfcac28fb91d2d3ad017fda0") # fix error [-Werror,-Wzero-as-null-pointer-constant] diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index bf026ec9263082..d385de6a303233 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gmp(AutotoolsPackage, GNUMirrorPackage): homepage = "https://gmplib.org" gnu_mirror_path = "gmp/gmp-6.1.2.tar.bz2" + license("LGPL-3.0-or-later OR GPL-2.0-or-later") + version("6.2.1", sha256="eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c") version("6.2.0", sha256="f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea") version("6.1.2", sha256="5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2") diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 166bbe788854ca..3cac8166365e6a 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Gmsh(CMakePackage): url = "https://gmsh.info/src/gmsh-4.4.1-source.tgz" git = "https://gitlab.onelab.info/gmsh/gmsh.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("4.10.3", sha256="a87d59ccea596d493d375b0d6bc380079a5e5a4baebf0d3383018b0cd6bd8e33") version("4.8.4", sha256="760dbdc072eaa3c82d066c5ba3b06eacdd3304eb2a97373fe4ada9509f0b6ace") diff --git a/var/spack/repos/builtin/packages/gmt/package.py b/var/spack/repos/builtin/packages/gmt/package.py index 59169fdaaa3090..02e3d1973e383c 100644 --- a/var/spack/repos/builtin/packages/gmt/package.py +++ b/var/spack/repos/builtin/packages/gmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Gmt(CMakePackage, AutotoolsPackage): maintainers("adamjstewart") + license("LGPL-3.0-only") + version("master", branch="master") version("6.4.0", sha256="c39d23dbc8a85416457946f6b93c2b9a5f039f092453e7f4b1aaf88d4a288300") version("6.3.0", sha256="48712279da8228a7960f36fd4b7b04cc1a66489c37b2a5c03f8336a631aa3b24") diff --git a/var/spack/repos/builtin/packages/gmtsar/package.py b/var/spack/repos/builtin/packages/gmtsar/package.py index 09d44abcb727ae..40de8de678a907 100644 --- a/var/spack/repos/builtin/packages/gmtsar/package.py +++ b/var/spack/repos/builtin/packages/gmtsar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gnat/package.py b/var/spack/repos/builtin/packages/gnat/package.py index c4ea2f42149e60..42e188e5c82462 100644 --- a/var/spack/repos/builtin/packages/gnat/package.py +++ b/var/spack/repos/builtin/packages/gnat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gnds/package.py b/var/spack/repos/builtin/packages/gnds/package.py index 7bae0b140a8594..f413ab30f7eb0e 100644 --- a/var/spack/repos/builtin/packages/gnds/package.py +++ b/var/spack/repos/builtin/packages/gnds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gnina/package.py b/var/spack/repos/builtin/packages/gnina/package.py index ab009f27eeb21a..dcfa07c259e7d2 100644 --- a/var/spack/repos/builtin/packages/gnina/package.py +++ b/var/spack/repos/builtin/packages/gnina/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class Gnina(CMakePackage, CudaPackage): maintainers("RMeli") + license("Apache-2.0") + + version("1.1", sha256="114570b0f84a545ce0fea5b2da87bc116c134cef64bf90e6e58e8f84e175a0fa") version("1.0.3", sha256="4274429f38293d79c7d22ab08aca91109e327e9ce3f682cd329a8f9c6ef429da") variant("cudnn", default=True, description="Build with cuDNN") @@ -67,10 +70,7 @@ class Gnina(CMakePackage, CudaPackage): depends_on("cudnn", when="+cudnn") def cmake_args(self): - args = [ - "-DBLAS=Open", # Use OpenBLAS instead of Atlas' BLAS - f"-DPYTHON_EXECUTABLE={self.spec['python'].command.path}", - ] + args = ["-DBLAS=Open"] # Use OpenBLAS instead of Atlas' BLAS if "+gninavis" in self.spec: args.append(f"-DRDKIT_INCLUDE_DIR={self.spec['rdkit'].prefix.include.rdkit}") diff --git a/var/spack/repos/builtin/packages/gnome-common/package.py b/var/spack/repos/builtin/packages/gnome-common/package.py index 4d261595887c6f..6c2b4975ae3cbd 100644 --- a/var/spack/repos/builtin/packages/gnome-common/package.py +++ b/var/spack/repos/builtin/packages/gnome-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class GnomeCommon(AutotoolsPackage): homepage = "https://gitlab.gnome.org/GNOME" url = "https://github.com/GNOME/gnome-common/archive/3.18.0.tar.gz" + license("LGPL-2.1-or-later") + version("3.18.0", sha256="8407fd8786a44c9ce47987de0906d9266492195df9251a089afaa06cc65c72d8") version("3.14.0", sha256="6ba2990ae52f54adf90626a8e04c41e58631870ed1b28088bb670cdc1eff22c7") version("3.12.0", sha256="b1dd2651900e701d3b732177ab633a35c8608e06c2ae78910130e5cbbda3b204") diff --git a/var/spack/repos/builtin/packages/gnuconfig/package.py b/var/spack/repos/builtin/packages/gnuconfig/package.py index ab27a34233e7b5..a0420c6a4ab4e2 100644 --- a/var/spack/repos/builtin/packages/gnuconfig/package.py +++ b/var/spack/repos/builtin/packages/gnuconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,7 @@ class Gnuconfig(Package): homepage = "https://www.gnu.org/software/config/" git = "https://github.com/spack/gnuconfig.git" url = "https://github.com/spack/gnuconfig/releases/download/2021-08-14/gnuconfig-2021-08-14.tar.gz" + tags = ["build-tools"] maintainers("haampie") diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 6e512a105eb62d..066b06448c1297 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Gnupg(AutotoolsPackage): maintainers("alalazo") + license("GPL-3.0-or-later") + version("2.4.3", sha256="a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d") version("2.4.2", sha256="97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49") version("2.4.1", sha256="76b71e5aeb443bfd910ce9cbc8281b617c8341687afb67bae455877972b59de8") diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 20f567d804c8a5..d2d684d6c0dba2 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Gnuplot(AutotoolsPackage): # dependency of readline. Fix it with a small patch patch("term_include.patch") + license("MIT") + version("5.4.3", sha256="51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84") version("5.4.2", sha256="e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba") version("5.2.8", sha256="60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37") @@ -160,7 +162,7 @@ def configure_args(self): # TODO: --with-aquaterm depends_on('aquaterm') options.append("--without-aquaterm") - if spec.satisfies("%gcc@11:"): + if spec.satisfies("%gcc@8:"): os.environ["LDFLAGS"] = "-Wl,--copy-dt-needed-entries" return options diff --git a/var/spack/repos/builtin/packages/gnuradio/package.py b/var/spack/repos/builtin/packages/gnuradio/package.py index 6b453b7c34e387..cb4f86c7a8e264 100644 --- a/var/spack/repos/builtin/packages/gnuradio/package.py +++ b/var/spack/repos/builtin/packages/gnuradio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Gnuradio(CMakePackage): maintainers("aweits") + license("GPL-3.0-or-later") + version("3.8.2.0", sha256="ddda12b55e3e1d925eefb24afb9d604bca7c9bbe0a431707aa48a2eed53eec2f") variant("gui", default=False, description="Build with gui support") @@ -59,10 +61,7 @@ class Gnuradio(CMakePackage): extends("python") def cmake_args(self): - args = [] - args.append("-DPYTHON_EXECUTABLE={0}".format(self.spec["python"].command.path)) - args.append("-DENABLE_INTERNAL_VOLK=OFF") - return args + return ["-DENABLE_INTERNAL_VOLK=OFF"] def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("XDG_DATA_DIRS", self.prefix.share) diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index 2ffa13278dce37..c8b0feb408fe6b 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gnutls(AutotoolsPackage): homepage = "https://www.gnutls.org" url = "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.19.tar.xz" + license("LGPL-2.1-or-later") + version("3.7.8", sha256="c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114") version("3.6.15", sha256="0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558") version("3.6.14", sha256="5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63") diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py index 4f5c8f00732439..494eea00f04164 100644 --- a/var/spack/repos/builtin/packages/go-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -61,6 +61,8 @@ class GoBootstrap(Package): os = platform.system().lower() target = go_targets.get(platform.machine().lower(), platform.machine().lower()) + license("BSD-3-Clause") + # construct releases for current system configuration for release in go_releases: if os in go_releases[release] and target in go_releases[release][os]: diff --git a/var/spack/repos/builtin/packages/go-md2man/package.py b/var/spack/repos/builtin/packages/go-md2man/package.py index 808f0e4891b27b..7c26ef69cd9e14 100644 --- a/var/spack/repos/builtin/packages/go-md2man/package.py +++ b/var/spack/repos/builtin/packages/go-md2man/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class GoMd2man(Package): homepage = "https://github.com/cpuguy83/go-md2man" url = "https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz" + license("MIT") + version("2.0.2", sha256="2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a") version("1.0.10", sha256="76aa56849123b99b95fcea2b15502fd886dead9a5c35be7f78bdc2bad6be8d99") diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py index 439b7ca90c5197..a1d4fcd779d670 100644 --- a/var/spack/repos/builtin/packages/go/package.py +++ b/var/spack/repos/builtin/packages/go/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -39,9 +39,18 @@ class Go(Package): maintainers("alecbcs") - version("1.21.3", sha256="186f2b6f8c8b704e696821b09ab2041a5c1ee13dcbc3156a13adcf75931ee488") + license("BSD-3-Clause") + + version("1.21.6", sha256="124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248") + version("1.21.5", sha256="285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19") # Deprecated Versions + # https://nvd.nist.gov/vuln/detail/CVE-2023-44487 + version( + "1.21.3", + sha256="186f2b6f8c8b704e696821b09ab2041a5c1ee13dcbc3156a13adcf75931ee488", + deprecated=True, + ) # https://nvd.nist.gov/vuln/detail/CVE-2023-39533 version( "1.20.6", diff --git a/var/spack/repos/builtin/packages/gobject-introspection/package.py b/var/spack/repos/builtin/packages/gobject-introspection/package.py index 5e30182d512a41..8b3255de3c0c79 100644 --- a/var/spack/repos/builtin/packages/gobject-introspection/package.py +++ b/var/spack/repos/builtin/packages/gobject-introspection/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,9 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage): maintainers("michaelkuhn") + license("LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT") + + version("1.78.1", sha256="bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4") version("1.76.1", sha256="196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf") version("1.72.1", sha256="012e313186e3186cf0fde6decb57d970adf90e6b1fac5612fe69cbb5ba99543a") version("1.72.0", sha256="02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc") @@ -39,9 +42,13 @@ class GobjectIntrospection(MesonPackage, AutotoolsPackage): depends_on("sed", when="platform=darwin", type="build") depends_on("cairo+gobject") + depends_on("glib@2.78:", when="@1.78") + depends_on("glib@2.76:", when="@1.76") + depends_on("glib@2.72:", when="@1.72") + depends_on("glib@2.56:", when="@1.56") depends_on("glib@2.49.2:", when="@1.49.2:") - # version 1.48.0 build fails with glib 2.49.4 depends_on("glib@2.48.1", when="@1.48.0") + depends_on("libffi") # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 depends_on("libffi@:3.3", when="@:1.72") # libffi 3.4 caused seg faults diff --git a/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py b/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py index 090f6d37324151..74865bfcef6915 100644 --- a/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py +++ b/var/spack/repos/builtin/packages/goblin-hmc-sim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,9 +20,13 @@ class GoblinHmcSim(MakefilePackage): # For some reason .o files get thrashed inside Spack parallel = False - maintainers("jjwilke") + maintainers("berquist") + + license("BSD-2-Clause") version("8.0.0", sha256="8a5e6b701865a581f15965d3ddd8c7d301b15f4b63543c444058e9c3688fd2c8") + version("main", branch="main") + def install(self, spec, prefix): install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/goma/package.py b/var/spack/repos/builtin/packages/goma/package.py index 26d08e48fef61f..aa468cb1d106e0 100644 --- a/var/spack/repos/builtin/packages/goma/package.py +++ b/var/spack/repos/builtin/packages/goma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Goma(CMakePackage): maintainers("wortiz") + license("GPL-2.0-or-later") + version("7.4.3", commit="bb0cf8030f9e8d61066d052ea6fad67fe49651f8") version("7.3.0", commit="415f442953e2171afae1f8ad55868052c6f511ce") version("7.2.0", commit="814f433aa5674c07274fffd4a619d80cd31f71ab") diff --git a/var/spack/repos/builtin/packages/google-cloud-cli/package.py b/var/spack/repos/builtin/packages/google-cloud-cli/package.py index 7fc7a5cda297bc..a40a09e66c6094 100644 --- a/var/spack/repos/builtin/packages/google-cloud-cli/package.py +++ b/var/spack/repos/builtin/packages/google-cloud-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -43,6 +43,8 @@ class GoogleCloudCli(Package): machine = targets[machine] ext = "zip" if system == "windows" else "tar.gz" + license("Apache-2.0") + for ver in versions: if system in versions[ver] and machine in versions[ver][system]: version(ver, sha256=versions[ver][system][machine]) diff --git a/var/spack/repos/builtin/packages/google-crc32c/package.py b/var/spack/repos/builtin/packages/google-crc32c/package.py index a37b1d15b96529..0cfd5075bfb5a9 100644 --- a/var/spack/repos/builtin/packages/google-crc32c/package.py +++ b/var/spack/repos/builtin/packages/google-crc32c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class GoogleCrc32c(CMakePackage): maintainers("marcusboden") + license("BSD-3-Clause") + version("1.1.2", sha256="ac07840513072b7fcebda6e821068aa04889018f24e10e46181068fb214d7e56") depends_on("cmake@3.1:", type="build") diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py index bf995e9a4ad731..f1b1424f73aa42 100644 --- a/var/spack/repos/builtin/packages/googletest/package.py +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,20 +10,22 @@ class Googletest(CMakePackage): """Google test framework for C++. Also called gtest.""" homepage = "https://github.com/google/googletest" - url = "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + url = "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz" git = "https://github.com/google/googletest" maintainers("sethrj") version("main", branch="main") + version("1.14.0", sha256="8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7") + version("1.13.0", sha256="ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363") version("1.12.1", sha256="81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2") version("1.12.0", sha256="2a4f11dce6188b256f3650061525d0fe352069e5c162452818efbbf8d0b5fe1c") - version("1.11.0", sha256="07b0896360f8e14414a8419e35515da0be085c5b4547c914ab8f4684ef0a3a8e") - version("1.10.0", sha256="e4a7cd97c903818abe7ddb129db9c41cc9fd9e2ded654be57ced26d45c72e4c9") - version("1.8.1", sha256="8e40a005e098b1ba917d64104549e3da274e31261dedc57d6250fe91391b2e84") - version("1.8.0", sha256="d8c33605d23d303b08a912eaee7f84c4e091d6e3d90e9a8ec8aaf7450dfe2568") - version("1.7.0", sha256="9639cf8b7f37a4d0c6575f52c01ef167c5f11faee65252296b3ffc2d9acd421b") - version("1.6.0", sha256="a61e20c65819eb39a2da85c88622bac703b865ca7fe2bfdcd3da734d87d5521a") + version("1.11.0", sha256="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5") + version("1.10.0", sha256="9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb") + version("1.8.1", sha256="9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c") + version("1.8.0", sha256="58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8") + version("1.7.0", sha256="f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc") + version("1.6.0", sha256="5fbc058e5b662b9c86d93ac76fefb58eec89cbf26144b49669a38ecb62758447") variant("gmock", default=True, when="@1.8:", description="Build with gmock") variant("pthreads", default=True, description="Build multithreaded version with pthreads") @@ -74,3 +76,20 @@ def darwin_fix(self): # The shared library is not installed correctly on Darwin; fix this if self.spec.satisfies("platform=darwin"): fix_darwin_install_name(self.prefix.lib) + + def url_for_version(self, version): + """googletest has changed how they publish releases on github. Up until, + including version 1.12.1 they were tagged as `release-`. + Afterwards things switched to the format `v`. Additionally, + newer versions are available from `archive/refs/tags/.tar.gz`, + while versions up to, and including, 1.8.0 are available only from + `archive/release-.tar.gz` + """ + if version <= Version("1.8.0"): + return f"{self.git}/archive/release-{version}.tar.gz" + + tagname = f"release-{version}" + if version >= Version("1.13"): + tagname = f"v{version}" + + return f"{self.git}/archive/refs/tags/{tagname}.tar.gz" diff --git a/var/spack/repos/builtin/packages/gosam-contrib/package.py b/var/spack/repos/builtin/packages/gosam-contrib/package.py index 7921304cce9ed7..ab60938f497270 100644 --- a/var/spack/repos/builtin/packages/gosam-contrib/package.py +++ b/var/spack/repos/builtin/packages/gosam-contrib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/goshimmer/package.py b/var/spack/repos/builtin/packages/goshimmer/package.py index c2ae6a7f9bc342..bd3fc555780d4d 100644 --- a/var/spack/repos/builtin/packages/goshimmer/package.py +++ b/var/spack/repos/builtin/packages/goshimmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Goshimmer(Package): maintainers("bernhardkaindl") + license("BSD-2-Clause") + version("0.8.0", sha256="ec515deebf0dd35ff76cd98addae9cfcbf4758ab9eb72eb0f6ff4654f2658980") depends_on("go@1.16:", type="build") diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 0efc4d986914e8..a743f844743f1f 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Gotcha(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("1.0.5", tag="1.0.5", commit="e28f10c45a0cda0e1ec225eaea6abfe72c8353aa") version("1.0.4", tag="1.0.4", commit="46f2aaedc885f140a3f31a17b9b9a9d171f3d6f0") version("1.0.3", tag="1.0.3", commit="1aafd1e30d46ce4e6555c8a4ea5f5edf6a5eade5") version("1.0.2", tag="1.0.2", commit="bed1b7c716ebb0604b3e063121649b5611640f25") diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index de540a5faff453..e410159ff99d76 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gource(AutotoolsPackage): homepage = "https://gource.io" url = "https://github.com/acaudwell/Gource/releases/download/gource-0.44/gource-0.44.tar.gz" + license("GPL-3.0") + version("0.44", sha256="2604ca4442305ffdc5bb1a7bac07e223d59c846f93567be067e8dfe2f42f097c") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/gpcnet/package.py b/var/spack/repos/builtin/packages/gpcnet/package.py index 1958cc194889dd..37c6eac63c224d 100644 --- a/var/spack/repos/builtin/packages/gpcnet/package.py +++ b/var/spack/repos/builtin/packages/gpcnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class Gpcnet(MakefilePackage): homepage = "https://github.com/netbench/GPCNET" git = "https://github.com/netbench/GPCNET.git" + + license("Apache-2.0") + version("master") depends_on("mpi", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py index 51ddf0f2ea1f1b..dbb1b2c3256aae 100644 --- a/var/spack/repos/builtin/packages/gperf/package.py +++ b/var/spack/repos/builtin/packages/gperf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gperf(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/gperf/" gnu_mirror_path = "gperf/gperf-3.0.4.tar.gz" + license("GPL-3.0-or-later") + version("3.1", sha256="588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2") version("3.0.4", sha256="767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e") diff --git a/var/spack/repos/builtin/packages/gperftools/package.py b/var/spack/repos/builtin/packages/gperftools/package.py index 6dd96c36678682..42c07707a3d464 100644 --- a/var/spack/repos/builtin/packages/gperftools/package.py +++ b/var/spack/repos/builtin/packages/gperftools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,10 @@ class Gperftools(AutotoolsPackage): url = "https://github.com/gperftools/gperftools/releases/download/gperftools-2.7/gperftools-2.7.tar.gz" maintainers("albestro", "eschnett", "msimberg", "teonnik") + license("BSD-3-Clause") + + version("2.15", sha256="c69fef855628c81ef56f12e3c58f2b7ce1f326c0a1fe783e5cae0b88cbbe9a80") + version("2.14", sha256="6b561baf304b53d0a25311bd2e29bc993bed76b7c562380949e7cb5e3846b299") version("2.13", sha256="4882c5ece69f8691e51ffd6486df7d79dbf43b0c909d84d3c0883e30d27323e7") version("2.12", sha256="fb611b56871a3d9c92ab0cc41f9c807e8dfa81a54a4a9de7f30e838756b5c7c6") version("2.11", sha256="8ffda10e7c500fea23df182d7adddbf378a203c681515ad913c28a64b87e24dc") @@ -40,6 +44,11 @@ class Gperftools(AutotoolsPackage): depends_on("unwind", when="+libunwind") + # Linker error: src/base/dynamic_annotations.cc:46: undefined reference to + # `TCMallocGetenvSafe' + conflicts("target=ppc64:", when="@2.14") + conflicts("target=ppc64le:", when="@2.14") + def configure_args(self): args = [] args += self.enable_or_disable("sized-delete", variant="sized_delete") diff --git a/var/spack/repos/builtin/packages/gpgme/package.py b/var/spack/repos/builtin/packages/gpgme/package.py index 5613914f69b51d..6707d1fc3e1b24 100644 --- a/var/spack/repos/builtin/packages/gpgme/package.py +++ b/var/spack/repos/builtin/packages/gpgme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gpi-2/package.py b/var/spack/repos/builtin/packages/gpi-2/package.py index 79832f56e494a0..16167b43d01e54 100644 --- a/var/spack/repos/builtin/packages/gpi-2/package.py +++ b/var/spack/repos/builtin/packages/gpi-2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Gpi2(AutotoolsPackage): maintainers("robert-mijakovic", "acastanedam", "mzeyen1985") + license("GPL-3.0-only") + version("develop", branch="next") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/gpi-space/package.py b/var/spack/repos/builtin/packages/gpi-space/package.py index 827af130673cf0..166e20c458c6bd 100644 --- a/var/spack/repos/builtin/packages/gpi-space/package.py +++ b/var/spack/repos/builtin/packages/gpi-space/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class GpiSpace(CMakePackage): maintainers("mzeyen1985", "tiberot", "rumach", "mrahn", "acastanedam") + license("GPL-3.0-or-later") + version("latest", branch="main") version("23.06", sha256="b4ee51f309c80c12a7842c0909041903608c6144535bc6faac3bbb8ff40e9213") version("22.12", sha256="1c0ab9a1ada9dbbc0f80fb04ddbbb24ff900231f709cb99aa63f0d135a3ad398") diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index ae6e17d2a0e15b..b9008f70d2c10f 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gprolog/package.py b/var/spack/repos/builtin/packages/gprolog/package.py index 1a59f47a34f162..099e9b1af839ba 100644 --- a/var/spack/repos/builtin/packages/gprolog/package.py +++ b/var/spack/repos/builtin/packages/gprolog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gprolog(Package): homepage = "http://www.gprolog.org/" url = "http://www.gprolog.org/gprolog-1.4.5.tar.gz" + license("LGPL-3.0-or-later") + version("1.5.0", sha256="670642b43c0faa27ebd68961efb17ebe707688f91b6809566ddd606139512c01") version("1.4.5", sha256="bfdcf00e051e0628b4f9af9d6638d4fde6ad793401e58a5619d1cc6105618c7c") diff --git a/var/spack/repos/builtin/packages/gptl/package.py b/var/spack/repos/builtin/packages/gptl/package.py index 828ede0b75d361..76e89e1e643a1e 100644 --- a/var/spack/repos/builtin/packages/gptl/package.py +++ b/var/spack/repos/builtin/packages/gptl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gptune/package.py b/var/spack/repos/builtin/packages/gptune/package.py index c0c321c9a4a0d7..f7647367b21823 100644 --- a/var/spack/repos/builtin/packages/gptune/package.py +++ b/var/spack/repos/builtin/packages/gptune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gptune(CMakePackage): git = "https://github.com/gptune/GPTune.git" maintainers("liuyangzhuan") + license("BSD-3-Clause-LBNL") + version("master", branch="master") version("4.0.0", sha256="4f954a810d83b73f5abe5b15b79e3ed5b7ebf7bc0ae7335d27b68111bd078102") version("3.0.0", sha256="e19bfc3033fff11ff8c20cae65b88b7ca005d2c4e4db047f9f23226126ec92fa") diff --git a/var/spack/repos/builtin/packages/gpu-burn/package.py b/var/spack/repos/builtin/packages/gpu-burn/package.py index d8dc12f7ce8c18..b673b851a80a30 100644 --- a/var/spack/repos/builtin/packages/gpu-burn/package.py +++ b/var/spack/repos/builtin/packages/gpu-burn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gqrx/package.py b/var/spack/repos/builtin/packages/gqrx/package.py index c1285427477e87..cd47d34469a972 100644 --- a/var/spack/repos/builtin/packages/gqrx/package.py +++ b/var/spack/repos/builtin/packages/gqrx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Gqrx(CMakePackage): maintainers("aweits") + license("GPL-3.0-or-later") + version("2.13.1", sha256="08b7b930bed00c6ac79330695c24919a9d779112e1a3dd37d22cc9ee38561e82") depends_on("cmake@3.2.0:", type="build") depends_on("gnuradio") diff --git a/var/spack/repos/builtin/packages/gr-osmosdr/package.py b/var/spack/repos/builtin/packages/gr-osmosdr/package.py index 1cb33395fb6115..93b5389646743b 100644 --- a/var/spack/repos/builtin/packages/gr-osmosdr/package.py +++ b/var/spack/repos/builtin/packages/gr-osmosdr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,6 +33,8 @@ class GrOsmosdr(CMakePackage): variant("hackrf", default=True, description="Support HackRF Hardware") + license("GPL-3.0-only") + version("0.2.2", sha256="5a7ce7afee38a56191b5d16cb4a91c92476729ff16ed09cbba5a3851ac619713") depends_on("gnuradio") diff --git a/var/spack/repos/builtin/packages/grabix/package.py b/var/spack/repos/builtin/packages/grabix/package.py index 4327a9f28978c7..31f6d661eb293b 100644 --- a/var/spack/repos/builtin/packages/grabix/package.py +++ b/var/spack/repos/builtin/packages/grabix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Grabix(MakefilePackage): maintainers("robqiao") + license("MIT") + version("0.1.7", sha256="d90735c55c0985a4d751858d7ce9e36ad534fff4103257e8e981e34d5c915b28") conflicts("%gcc@7:", msg="grabix cannot be compiled with newer versions of GCC") diff --git a/var/spack/repos/builtin/packages/grace/package.py b/var/spack/repos/builtin/packages/grace/package.py index e28017029dc2ed..5d36086c23874d 100644 --- a/var/spack/repos/builtin/packages/grace/package.py +++ b/var/spack/repos/builtin/packages/grace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Grace(AutotoolsPackage): maintainers("RemiLacroix-IDRIS") + license("GPL-2.0-or-later") + version("5.1.25", sha256="751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/grackle/package.py b/var/spack/repos/builtin/packages/grackle/package.py index 07442dec3a22f7..e87b2ef93e1b62 100644 --- a/var/spack/repos/builtin/packages/grackle/package.py +++ b/var/spack/repos/builtin/packages/grackle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gradle/package.py b/var/spack/repos/builtin/packages/gradle/package.py index 1c329c70e8335b..10b69e7849baeb 100644 --- a/var/spack/repos/builtin/packages/gradle/package.py +++ b/var/spack/repos/builtin/packages/gradle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gradle(Package): homepage = "https://gradle.org" url = "https://services.gradle.org/distributions/gradle-3.4-all.zip" + license("Apache-2.0") + version("8.1.1", sha256="5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975") version("8.0.2", sha256="47a5bfed9ef814f90f8debcbbb315e8e7c654109acd224595ea39fca95c5d4da") version("7.3", sha256="00b273629df4ce46e68df232161d5a7c4e495b9a029ce6e0420f071e21316867") diff --git a/var/spack/repos/builtin/packages/grads/package.py b/var/spack/repos/builtin/packages/grads/package.py index ff45cea375345b..216b4b8db13a05 100644 --- a/var/spack/repos/builtin/packages/grads/package.py +++ b/var/spack/repos/builtin/packages/grads/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Grads(AutotoolsPackage): maintainers("vanderwb") + license("GPL-2.0-or-later") + version("2.2.3", sha256="2cbb67284fe64763c589ecaf08d5bd31144554dfd82a1fccf71e1cc424695a9e") version("2.2.2", sha256="1b5a600d4d407ffcf2fbbbba42037a6e1ebfdb8246ba56b93c628e3c472b4ded") version("2.2.1", sha256="695e2066d7d131720d598bac0beb61ac3ae5578240a5437401dc0ffbbe516206") diff --git a/var/spack/repos/builtin/packages/grafana/package.py b/var/spack/repos/builtin/packages/grafana/package.py index e0e4e7349af44d..37f3b730640439 100644 --- a/var/spack/repos/builtin/packages/grafana/package.py +++ b/var/spack/repos/builtin/packages/grafana/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Grafana(Package): homepage = "https://grafana.com" url = "https://github.com/grafana/grafana/archive/v6.7.3.tar.gz" + license("AGPL-3.0-only") + version("6.7.3", sha256="2477b70bfc8770ab844ee683f72b5efe8a47324b9779663d8e5259ffb9ddb8d8") version("6.7.2", sha256="dc81cdb77c1c0ae99ae3302a0ef8b3d577f4a717208a90df65da8fcb282122fc") version("6.7.1", sha256="5750d286273069a195679d5586e810b0ca8cdd08ee07dcdd9b52cfaac8c62b89") diff --git a/var/spack/repos/builtin/packages/grandr/package.py b/var/spack/repos/builtin/packages/grandr/package.py index 22ec55c4302e7b..46cd8962fa1d03 100644 --- a/var/spack/repos/builtin/packages/grandr/package.py +++ b/var/spack/repos/builtin/packages/grandr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/graph500/package.py b/var/spack/repos/builtin/packages/graph500/package.py index 2565c676a95cca..e1a6131e885d24 100644 --- a/var/spack/repos/builtin/packages/graph500/package.py +++ b/var/spack/repos/builtin/packages/graph500/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Graph500(MakefilePackage): homepage = "https://graph500.org" url = "https://github.com/graph500/graph500/archive/graph500-3.0.0.tar.gz" + license("BSL-1.0") + version("3.0.0", sha256="887dcff56999987fba4953c1c5696d50e52265fe61b6ffa8bb14cc69ff27e8a0") depends_on("mpi@2.0:") diff --git a/var/spack/repos/builtin/packages/graphblast/package.py b/var/spack/repos/builtin/packages/graphblast/package.py index 74a3c31dae1781..e67fd0b906a26d 100644 --- a/var/spack/repos/builtin/packages/graphblast/package.py +++ b/var/spack/repos/builtin/packages/graphblast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Graphblast(MakefilePackage, CudaPackage): homepage = "https://github.com/gunrock/graphblast" git = "https://github.com/gunrock/graphblast.git" + license("Apache-2.0") + version("master", submodules=True) version( "2020-05-07", diff --git a/var/spack/repos/builtin/packages/graphicsmagick/package.py b/var/spack/repos/builtin/packages/graphicsmagick/package.py index 7d2c96f367dc21..c84bde89b9b6e0 100644 --- a/var/spack/repos/builtin/packages/graphicsmagick/package.py +++ b/var/spack/repos/builtin/packages/graphicsmagick/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Graphicsmagick(AutotoolsPackage): homepage = "http://www.graphicsmagick.org/" url = "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/1.3.29/GraphicsMagick-1.3.29.tar.xz/download" + license("MIT") + version("1.3.34", sha256="df009d5173ed0d6a0c6457234256c5a8aeaace782afa1cbab015d5a12bd4f7a4") version("1.3.33", sha256="130cb330a633580b5124eba5c125bbcbc484298423a97b9bed37ccd50d6dc778") version("1.3.32", sha256="b842a5a0d6c84fd6c5f161b5cd8e02bbd210b0c0b6728dd762b7c53062ba94e1") diff --git a/var/spack/repos/builtin/packages/graphite2/package.py b/var/spack/repos/builtin/packages/graphite2/package.py index 3453886eea47de..10af88d825de9a 100644 --- a/var/spack/repos/builtin/packages/graphite2/package.py +++ b/var/spack/repos/builtin/packages/graphite2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Graphite2(CMakePackage): ) url = "https://github.com/silnrsi/graphite/releases/download/1.3.13/graphite2-1.3.13.tgz" + license("LGPL-2.1-or-later OR MPL-1.1") + version("1.3.14", sha256="f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d") version("1.3.13", sha256="dd63e169b0d3cf954b397c122551ab9343e0696fb2045e1b326db0202d875f06") diff --git a/var/spack/repos/builtin/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py index 01e7f500609a67..3f8026b0488ab3 100644 --- a/var/spack/repos/builtin/packages/graphlib/package.py +++ b/var/spack/repos/builtin/packages/graphlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/graphmap/package.py b/var/spack/repos/builtin/packages/graphmap/package.py index 4199da13d513bf..0d9ad07e81fc6a 100644 --- a/var/spack/repos/builtin/packages/graphmap/package.py +++ b/var/spack/repos/builtin/packages/graphmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Graphmap(MakefilePackage): homepage = "https://github.com/isovic/graphmap" git = "https://github.com/isovic/graphmap.git" + license("MIT") + version("0.3.0", commit="eb8c75d68b03be95464318afa69b645a59f8f6b7") depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 658a6a39b43c6d..110746d9110359 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Graphviz(AutotoolsPackage): git = "https://gitlab.com/graphviz/graphviz.git" url = "https://gitlab.com/graphviz/graphviz/-/archive/2.46.0/graphviz-2.46.0.tar.bz2" + license("EPL-1.0") + version("8.0.5", sha256="c1901fe52483fad55fbf893ccd59a3dcaedd53f0d50b5aebbbf3deaba93b674d") version("8.0.1", sha256="19928f09f759676578b50101420b24475eb35f712ffbe8a97254f64b20fdbd03") version("7.1.0", sha256="7943c3fa0c55c779f595259f3b9e41c7ea6ed92f0aca0d24df917f631322dc01") diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index 8b4065d81430a9..01adc4587bcddd 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Grass(AutotoolsPackage): maintainers("adamjstewart") + license("MIT") + version("master", branch="master") version("8.2.0", sha256="621c3304a563be19c0220ae28f931a5e9ba74a53218c5556cd3f7fbfcca33a80") version("7.8.5", sha256="a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37") diff --git a/var/spack/repos/builtin/packages/graylog2-server/package.py b/var/spack/repos/builtin/packages/graylog2-server/package.py index 72e1fde2792d5d..8e105a17113dcf 100644 --- a/var/spack/repos/builtin/packages/graylog2-server/package.py +++ b/var/spack/repos/builtin/packages/graylog2-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Graylog2Server(Package): homepage = "https://www.graylog.org/" url = "https://github.com/Graylog2/graylog2-server/archive/3.2.4.tar.gz" + license("GPL-3.0-or-later") + version("3.2.4", sha256="d34cc9fd42b2ee0b872c0f644fe53ef9b2e9790029c5d2182f782f66f1e1d99d") version("3.2.3", sha256="6da5ba1da897a371a490a6ba7c9d017a479a22e3c16a39280a49e61f551280c0") version("3.2.2", sha256="dc7baa5c0e451b0927b28320c4d9ca19810f4690eb2c521ed8a8272c99fb3bc3") diff --git a/var/spack/repos/builtin/packages/grep/package.py b/var/spack/repos/builtin/packages/grep/package.py index 37b1e62cfe3b01..5a08cad458257c 100644 --- a/var/spack/repos/builtin/packages/grep/package.py +++ b/var/spack/repos/builtin/packages/grep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Grep(AutotoolsPackage): homepage = "https://www.gnu.org/software/grep/" url = "https://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz" + license("GPL-3.0-or-later") + version("3.11", sha256="1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab") version("3.10", sha256="24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b") version("3.9", sha256="abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599") diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index d798318e7eef12..70d3d2517d73c7 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/grib-util/package.py b/var/spack/repos/builtin/packages/grib-util/package.py index 8b0464dec825b6..bd4dd94f7dba44 100644 --- a/var/spack/repos/builtin/packages/grib-util/package.py +++ b/var/spack/repos/builtin/packages/grib-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/grid/package.py b/var/spack/repos/builtin/packages/grid/package.py index e68e4955f704d9..952d741b683676 100644 --- a/var/spack/repos/builtin/packages/grid/package.py +++ b/var/spack/repos/builtin/packages/grid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Grid(AutotoolsPackage): maintainers("giordano") + license("GPL-2.0-only") + version("develop", branch="develop") variant( diff --git a/var/spack/repos/builtin/packages/gridlab-d/package.py b/var/spack/repos/builtin/packages/gridlab-d/package.py index fe8531461f5959..aa3ecdcbd1f102 100644 --- a/var/spack/repos/builtin/packages/gridlab-d/package.py +++ b/var/spack/repos/builtin/packages/gridlab-d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/grnboost/package.py b/var/spack/repos/builtin/packages/grnboost/package.py index 6e28cb7fcee652..92ea32139d47cd 100644 --- a/var/spack/repos/builtin/packages/grnboost/package.py +++ b/var/spack/repos/builtin/packages/grnboost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Grnboost(Package): homepage = "https://github.com/aertslab/GRNBoost" + license("BSD-3-Clause") + version( "2017-10-9", git="https://github.com/aertslab/GRNBoost.git", diff --git a/var/spack/repos/builtin/packages/groff/package.py b/var/spack/repos/builtin/packages/groff/package.py index a2ccd663ec20a0..c648b7e16be876 100644 --- a/var/spack/repos/builtin/packages/groff/package.py +++ b/var/spack/repos/builtin/packages/groff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Groff(AutotoolsPackage, GNUMirrorPackage): tags = ["build-tools"] + license("GPL-3.0-or-later") + version("1.22.4", sha256="e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293") version("1.22.3", sha256="3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5") diff --git a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py index 1133d5d1dca549..d5160ebf4bcd3a 100644 --- a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py +++ b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py @@ -1,9 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * +from spack.pkg.builtin.gromacs import CMakeBuilder as GromacsCMakeBuilder from spack.pkg.builtin.gromacs import Gromacs @@ -14,12 +15,18 @@ class GromacsChainCoordinate(Gromacs): """ homepage = "https://gitlab.com/cbjh/gromacs-chain-coordinate/-/blob/main/README.md" - url = "https://gitlab.com/cbjh/gromacs-chain-coordinate/-/archive/release-2021.chaincoord-0.2/gromacs-chain-coordinate-release-2021.chaincoord-0.2.tar.bz2" + url = "https://gitlab.com/cbjh/gromacs-chain-coordinate/-/archive/release-2021.chaincoord-0.3/gromacs-chain-coordinate-release-2021.chaincoord-0.3.tar.bz2" git = "https://gitlab.com/cbjh/gromacs-chain-coordinate.git" maintainers("w8jcik") version("main", branch="main") + version( + "2021.5-0.3", + sha256="64ec5f385445ae43dfec8c27198034c0ba641863ab856c8c29798a4c83016baa", + url="https://gitlab.com/cbjh/gromacs-chain-coordinate/-/archive/release-2021.chaincoord-0.3/gromacs-chain-coordinate-release-2021.chaincoord-0.3.tar.bz2", + ) + version( "2021.5-0.2", sha256="33dda1e39cd47c5ae32b5455af8534225d3888fd7e4968f499b8483620fa770a", @@ -56,3 +63,7 @@ def check(self): self._if_make_target_execute("check") elif self.generator == "Ninja": self._if_ninja_target_execute("check") + + +class CMakeBuilder(GromacsCMakeBuilder): + pass diff --git a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py index ac97d477be397a..bea5a16102a94d 100644 --- a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py +++ b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py @@ -1,9 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * +from spack.pkg.builtin.gromacs import CMakeBuilder as GromacsCMakeBuilder from spack.pkg.builtin.gromacs import Gromacs @@ -11,10 +12,16 @@ class GromacsSwaxs(Gromacs): """Modified Gromacs for small-angle scattering calculations (SAXS/WAXS/SANS)""" homepage = "https://biophys.uni-saarland.de/swaxs.html" - url = "https://gitlab.com/cbjh/gromacs-swaxs/-/archive/release-2019.swaxs-0.1/gromacs-swaxs-release-2019.swaxs-0.1.tar.bz2" + url = "https://gitlab.com/cbjh/gromacs-swaxs/-/archive/release-2021.swaxs-0.5/gromacs-swaxs-release-2021.swaxs-0.5.tar.bz2" git = "https://gitlab.com/cbjh/gromacs-swaxs.git" maintainers("w8jcik") + version( + "2021.5-0.5", + sha256="7207f107dc6c4009a04a533e18545666d4f58c172b2b24d04442bb1a0f43ff44", + url="https://gitlab.com/cbjh/gromacs-swaxs/-/archive/release-2021.swaxs-0.5/gromacs-swaxs-release-2021.swaxs-0.5.tar.bz2", + ) + version( "2021.5-0.4", sha256="9f8ed6d448a04789d45e847cbbc706a07130377f578388220a9d5357fae9d1c3", @@ -151,3 +158,7 @@ def __init__(self, spec): super().__init__(spec) self.remove_parent_versions() + + +class CMakeBuilder(GromacsCMakeBuilder): + pass diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 66c594c71ef328..0191a9ff32f3d8 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Gromacs(CMakePackage, CudaPackage): git = "https://gitlab.com/gromacs/gromacs.git" maintainers("danielahlin", "eirrgang", "junghans") + license("BSD-2-Clause") + version("main", branch="main") version("master", branch="main", deprecated=True) version("2023.3", sha256="4ec8f8d0c7af76b13f8fd16db8e2c120e749de439ae9554d9f653f812d78d1cb") @@ -90,9 +92,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: +sycl", + description="Enable support for Intel Data Center GPU Max", + ) variant("nosuffix", default=False, description="Disable default suffixes") variant( "build_type", @@ -108,6 +127,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, @@ -241,6 +272,8 @@ class Gromacs(CMakePackage, CudaPackage): depends_on("cmake@3.16.3:3", type="build", when="@2022:") depends_on("cmake@3.18.4:3", type="build", when="@main") depends_on("cmake@3.16.0:3", type="build", when="%fj") + depends_on("pkgconfig", type="build") + depends_on("cuda", when="+cuda") depends_on("sycl", when="+sycl") depends_on("lapack") @@ -254,6 +287,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 +550,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": diff --git a/var/spack/repos/builtin/packages/grpc/package.py b/var/spack/repos/builtin/packages/grpc/package.py index 58e64427ec23fb..03bdb71303133f 100644 --- a/var/spack/repos/builtin/packages/grpc/package.py +++ b/var/spack/repos/builtin/packages/grpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class Grpc(CMakePackage): homepage = "https://grpc.io" url = "https://github.com/grpc/grpc/archive/v1.39.0.tar.gz" + + license("Apache-2.0 AND BSD-3-Clause AND MIT") + version("1.55.0", sha256="9cf1a69a921534ac0b760dcbefb900f3c2f735f56070bf0536506913bb5bfd74") version("1.50.0", sha256="76900ab068da86378395a8e125b5cc43dfae671e09ff6462ddfef18676e2165a") version("1.47.0", sha256="271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54") diff --git a/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py b/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py index 60b7d482e171f0..1056f36a105c64 100644 --- a/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py +++ b/var/spack/repos/builtin/packages/gsettings-desktop-schemas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class GsettingsDesktopSchemas(MesonPackage): homepage = "https://github.com/GNOME/gsettings-desktop-schemas/" url = "https://github.com/GNOME/gsettings-desktop-schemas/archive/3.38.0.tar.gz" + license("LGPL-2.0-or-later") + version("3.38.0", sha256="b808bd285ac7176f2e9e3a8763c3913121ab9f109d2988c70e3f1f8e742a630d") version("3.37.92", sha256="5f5dd0421ed2f3746674b8bb6e0c652784915133c7f2d133339bf5e4140d8d1d") version("3.37.2", sha256="1dacdfeecfc57468da7c598a01b635f82ecd088e1d78d5aa840e47256026654d") diff --git a/var/spack/repos/builtin/packages/gsi-ncdiag/package.py b/var/spack/repos/builtin/packages/gsi-ncdiag/package.py index 58dc16499c9a52..f25498a04acfbd 100644 --- a/var/spack/repos/builtin/packages/gsi-ncdiag/package.py +++ b/var/spack/repos/builtin/packages/gsi-ncdiag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gsibec/package.py b/var/spack/repos/builtin/packages/gsibec/package.py index cf3b99e2b2cb3a..853851ecc10aa3 100644 --- a/var/spack/repos/builtin/packages/gsibec/package.py +++ b/var/spack/repos/builtin/packages/gsibec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gsibec(CMakePackage): maintainers("mathomp4", "danholdaway") + license("Apache-2.0") + version("develop", branch="develop") version("1.1.3", sha256="9cac000562250487c16608e8245d97457cc1663b1793b3833be5a76ebccb4b47") version("1.1.2", sha256="8bdcdf1663e6071b6ad9e893a76307abc70a6de744fb75a13986e70242993ada") diff --git a/var/spack/repos/builtin/packages/gsl-lite/package.py b/var/spack/repos/builtin/packages/gsl-lite/package.py index 8f819f25ed8c96..cd00e0c38f2c3e 100644 --- a/var/spack/repos/builtin/packages/gsl-lite/package.py +++ b/var/spack/repos/builtin/packages/gsl-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class GslLite(CMakePackage): maintainers("AlexanderRichert-NOAA", "climbfuji", "edwardhartnett", "Hang-Lei-NOAA") + license("MIT") + version("0.41.0", sha256="4682d8a60260321b92555760be3b9caab60e2a71f95eddbdfb91e557ee93302a") version("0.40.0", commit="d6c8af99a1d95b3db36f26b4f22dc3bad89952de") version("0.39.0", commit="d0903fa87ff579c30f608bc363582e6563570342") diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 072be62cb488cb..1c4732e1604588 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Gsl(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/gsl" gnu_mirror_path = "gsl/gsl-2.3.tar.gz" + license("GPL-3.0-or-later") + version("2.7.1", sha256="dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b") version("2.7", sha256="efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b") version("2.6", sha256="b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8") diff --git a/var/spack/repos/builtin/packages/gslib/package.py b/var/spack/repos/builtin/packages/gslib/package.py index fff12c49c4f020..b8658064445fcf 100644 --- a/var/spack/repos/builtin/packages/gslib/package.py +++ b/var/spack/repos/builtin/packages/gslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gsoap/package.py b/var/spack/repos/builtin/packages/gsoap/package.py index f664ee1e13b162..6eface4e36b683 100644 --- a/var/spack/repos/builtin/packages/gsoap/package.py +++ b/var/spack/repos/builtin/packages/gsoap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gtk-doc/package.py b/var/spack/repos/builtin/packages/gtk-doc/package.py index ba28f4d7defe06..470836b317ce4c 100644 --- a/var/spack/repos/builtin/packages/gtk-doc/package.py +++ b/var/spack/repos/builtin/packages/gtk-doc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class GtkDoc(AutotoolsPackage): homepage = "https://wiki.gnome.org/DocumentationProject/GtkDoc" url = "https://gitlab.gnome.org/GNOME/gtk-doc/-/archive/1.33.2/gtk-doc-1.33.2.tar.gz" + license("GPL-2.0-or-later AND GFDL-1.1-or-later") + version("1.33.2", sha256="2d1b0cbd26edfcb54694b2339106a02a81d630a7dedc357461aeb186874cc7c0") version("1.32", sha256="0890c1f00d4817279be51602e67c4805daf264092adc58f9c04338566e8225ba") diff --git a/var/spack/repos/builtin/packages/gtkmm/package.py b/var/spack/repos/builtin/packages/gtkmm/package.py index 22fc0d0541c18b..eeddcc70e59e6f 100644 --- a/var/spack/repos/builtin/packages/gtkmm/package.py +++ b/var/spack/repos/builtin/packages/gtkmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Gtkmm(AutotoolsPackage): homepage = "https://www.gtkmm.org/en/" url = "https://ftp.acc.umu.se/pub/GNOME/sources/gtkmm/2.16/gtkmm-2.16.0.tar.gz" + license("LGPL-2.1-or-later") + version("2.19.7", sha256="7cc8d26f9a0956092e61ecfbb029c5d6223cd7e49d4434653446ff190a990957") version("2.19.6", sha256="d495d4012d49841a4f0a09584e002bc25ef55d7b2782660ecf7a58ed67357ad7") version("2.19.4", sha256="ade220b0d395cb44215a69623af40a420281bc090ddaefc55350ad48e888fed2") diff --git a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py index f345dbba0e7b95..a748baf9b9bef5 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-atl/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-atl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py index 390c109270518f..638202b428e0c3 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-cercs-env/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py index 59fdac91dbb6de..0cd813d6e250dd 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-dill/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-dill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py index deddfd493c0e66..640479d6d5526a 100644 --- a/var/spack/repos/builtin/packages/gtkorvo-enet/package.py +++ b/var/spack/repos/builtin/packages/gtkorvo-enet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,5 +16,7 @@ class GtkorvoEnet(AutotoolsPackage): homepage = "https://www.github.com/GTkorvo/enet" url = "https://github.com/GTkorvo/enet/archive/v1.3.13.tar.gz" + license("MIT") + version("1.3.14", sha256="d1fda051bdee46ad8cce7c3bb36fb6b7a7a443945f27a280ac104753c29465b0") version("1.3.13", sha256="ede6e4f03e4cb0c3d93044ace9e8c1818ef4d3ced4aaa70384155769b3c436dc") diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index 52aa981d3cde8a..884fe8552e81be 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gtkplus(MesonPackage): homepage = "https://www.gtk.org/" url = "https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.26.tar.xz" + license("LGPL-2.0-or-later") + version("3.24.29", sha256="f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa") version("3.24.26", sha256="2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9") version( diff --git a/var/spack/repos/builtin/packages/gtksourceview/package.py b/var/spack/repos/builtin/packages/gtksourceview/package.py index 071749ccfb829b..d9607d34a5263d 100644 --- a/var/spack/repos/builtin/packages/gtksourceview/package.py +++ b/var/spack/repos/builtin/packages/gtksourceview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Gtksourceview(AutotoolsPackage): homepage = "https://projects.gnome.org/gtksourceview" url = "https://download.gnome.org/sources/gtksourceview/4.2/gtksourceview-4.2.0.tar.xz" + license("LGPL-2.1-or-later") + version("4.2.0", sha256="c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675") version("3.24.11", sha256="691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd") diff --git a/var/spack/repos/builtin/packages/gts/package.py b/var/spack/repos/builtin/packages/gts/package.py index eb50d0c416e74c..a5883016d9b5d7 100644 --- a/var/spack/repos/builtin/packages/gts/package.py +++ b/var/spack/repos/builtin/packages/gts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Gts(AutotoolsPackage): homepage = "http://gts.sourceforge.net/index.html" url = "http://gts.sourceforge.net/tarballs/gts-snapshot-121130.tar.gz" + license("LGPL-2.0-only") + version("121130", sha256="c23f72ab74bbf65599f8c0b599d6336fabe1ec2a09c19b70544eeefdc069b73b") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/guacamole-client/package.py b/var/spack/repos/builtin/packages/guacamole-client/package.py index 25577e327dac40..7b1cb8d11cd5f4 100644 --- a/var/spack/repos/builtin/packages/guacamole-client/package.py +++ b/var/spack/repos/builtin/packages/guacamole-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class GuacamoleClient(MavenPackage): homepage = "https://guacamole.apache.org/" url = "https://github.com/apache/guacamole-client/archive/1.2.0.tar.gz" + license("Apache-2.0") + version("1.2.0", sha256="2327368a32e61cf82032311be79ded4e5eefbc59ac9fb6e0a054b4f49168843e") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/guacamole-server/package.py b/var/spack/repos/builtin/packages/guacamole-server/package.py index f378da05c7ddd1..39f0e19bebb84e 100644 --- a/var/spack/repos/builtin/packages/guacamole-server/package.py +++ b/var/spack/repos/builtin/packages/guacamole-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class GuacamoleServer(AutotoolsPackage): homepage = "https://guacamole.apache.org/" url = "https://github.com/apache/guacamole-server/archive/1.1.0.tar.gz" + license("GPL-3.0-or-later") + version("1.1.0", sha256="d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/guidance/package.py b/var/spack/repos/builtin/packages/guidance/package.py index ffd565e21f34c8..759ffdae121785 100644 --- a/var/spack/repos/builtin/packages/guidance/package.py +++ b/var/spack/repos/builtin/packages/guidance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 66be676f89812c..2103145fef9362 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Guile(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/guile/" gnu_mirror_path = "guile/guile-2.2.0.tar.gz" + license("LGPL-3.0-or-later AND GPL-3.0-or-later") + version("2.2.6", sha256="08c0e7487777740b61cdd97949b69e8a5e2997d8c2fe6c7e175819eb18444506") version("2.2.5", sha256="c3c7a2f6ae0d8321a240c7ebc532a1d47af8c63214157a73789e2b2305b4c927") version("2.2.4", sha256="33b904c0bf4e48e156f3fb1d0e6b0392033bd610c6c9d9a0410c6e0ea96a3e5c") diff --git a/var/spack/repos/builtin/packages/gunrock/package.py b/var/spack/repos/builtin/packages/gunrock/package.py index 0c192654b4dd82..19813e6d199fb1 100644 --- a/var/spack/repos/builtin/packages/gunrock/package.py +++ b/var/spack/repos/builtin/packages/gunrock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Gunrock(CMakePackage, CudaPackage): homepage = "https://gunrock.github.io/docs/" git = "https://github.com/gunrock/gunrock.git" + license("Apache-2.0") + version("master", submodules=True) version("1.2", submodules=True, tag="v1.2", commit="5ee3df50c45f702eb247ef1abcea7a490b60b2ea") # v1.1 build is broken. See: diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py index b69e311163903b..c0fa33639df9f2 100644 --- a/var/spack/repos/builtin/packages/gurobi/package.py +++ b/var/spack/repos/builtin/packages/gurobi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/gxsview/package.py b/var/spack/repos/builtin/packages/gxsview/package.py index d38daa889a3c28..ea45246d1c6f6a 100644 --- a/var/spack/repos/builtin/packages/gxsview/package.py +++ b/var/spack/repos/builtin/packages/gxsview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Gxsview(QMakePackage): # Support email for questions ohnishi@m.mpat.go.jp maintainers("cessenat") + license("LGPL-3.0-only") + version( "2023.05.29", sha256="1e768fd7afd22198b7f73adeb42f4ccf7e0ff68996a3843b1ea138225c4c1da3" ) diff --git a/var/spack/repos/builtin/packages/gzip/package.py b/var/spack/repos/builtin/packages/gzip/package.py index 76a06818251e37..11d8f898450531 100644 --- a/var/spack/repos/builtin/packages/gzip/package.py +++ b/var/spack/repos/builtin/packages/gzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,24 @@ class Gzip(AutotoolsPackage): homepage = "https://www.gnu.org/software/gzip/" url = "https://ftp.gnu.org/gnu/gzip/gzip-1.10.tar.gz" - version("1.12", sha256="5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085") - version("1.11", sha256="3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9") - version("1.10", sha256="c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68") + license("GPL-3.0-or-later") + + version("1.13", sha256="20fc818aeebae87cdbf209d35141ad9d3cf312b35a5e6be61bfcfbf9eddd212a") + version( + "1.12", + sha256="5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085", + deprecated=True, + ) + version( + "1.11", + sha256="3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9", + deprecated=True, + ) + version( + "1.10", + sha256="c91f74430bf7bc20402e1f657d0b252cb80aa66ba333a25704512af346633c68", + deprecated=True, + ) # Gzip makes a recursive symlink if built in-source build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/h2database/package.py b/var/spack/repos/builtin/packages/h2database/package.py index 7fb00bf0e5355b..7752f002812ad1 100644 --- a/var/spack/repos/builtin/packages/h2database/package.py +++ b/var/spack/repos/builtin/packages/h2database/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/h5bench/package.py b/var/spack/repos/builtin/packages/h5bench/package.py index 9457040c9564fc..c367bbaf8ebae7 100644 --- a/var/spack/repos/builtin/packages/h5bench/package.py +++ b/var/spack/repos/builtin/packages/h5bench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class H5bench(CMakePackage): tags = ["e4s"] + license("BSD-3-Clause-LBNL") + version("latest", branch="master", submodules=True) version("develop", branch="develop", submodules=True) diff --git a/var/spack/repos/builtin/packages/h5cpp/package.py b/var/spack/repos/builtin/packages/h5cpp/package.py index c652578d92c074..9d793f32ebf367 100644 --- a/var/spack/repos/builtin/packages/h5cpp/package.py +++ b/var/spack/repos/builtin/packages/h5cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class H5cpp(CMakePackage): maintainers("eschnett") + license("BSD-3-Clause") + version("master", branch="master") version("1.10.4-6", sha256="4fbc8e777dc78a37ec2fe8c7b6a47114080ffe587f083e83a2046b5e794aef93") version("1.10.4-5", sha256="661ccc4d76e081afc73df71ef11d027837d92dd1089185f3650afcaec9d418ec") diff --git a/var/spack/repos/builtin/packages/h5hut/package.py b/var/spack/repos/builtin/packages/h5hut/package.py index dfb41d0f5b32a5..dd1013bac72fc3 100644 --- a/var/spack/repos/builtin/packages/h5hut/package.py +++ b/var/spack/repos/builtin/packages/h5hut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/h5part/package.py b/var/spack/repos/builtin/packages/h5part/package.py index 6e58621f093543..baf07ef49c97dd 100644 --- a/var/spack/repos/builtin/packages/h5part/package.py +++ b/var/spack/repos/builtin/packages/h5part/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/h5utils/package.py b/var/spack/repos/builtin/packages/h5utils/package.py index 4752a74879a4f3..d2d583a8f67b08 100644 --- a/var/spack/repos/builtin/packages/h5utils/package.py +++ b/var/spack/repos/builtin/packages/h5utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class H5utils(AutotoolsPackage): homepage = "http://ab-initio.mit.edu/wiki/index.php/H5utils" url = "https://github.com/NanoComp/h5utils/releases/download/1.13.1/h5utils-1.13.1.tar.gz" + license("GPL-2.0-only") + version("1.13.1", sha256="c5a76f064d6daa3e65583dce2b61202510e67cf6590f076af9a8aa72511d7d65") version( "1.12.1", diff --git a/var/spack/repos/builtin/packages/h5z-zfp/Makefile.0.7.0.patch b/var/spack/repos/builtin/packages/h5z-zfp/Makefile.0.7.0.patch deleted file mode 100644 index 2f82ac7c5b6817..00000000000000 --- a/var/spack/repos/builtin/packages/h5z-zfp/Makefile.0.7.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spack-src/src/Makefile.orig 2022-02-02 17:42:03.000000000 +0900 -+++ spack-src/src/Makefile 2022-02-02 17:42:34.000000000 +0900 -@@ -54,7 +54,7 @@ - $(INSTALL) libh5zzfp.a $(PREFIX)/lib - $(INSTALL) -m 644 H5Zzfp.h H5Zzfp_lib.h H5Zzfp_plugin.h H5Zzfp_props.h $(PREFIX)/include - ifneq ($(FC),) -- $(INSTALL) -m 644 H5Zzfp_props_f.mod $(PREFIX)/include -+ $(INSTALL) -m 644 *.[mM][oO][dD] $(PREFIX)/include - endif - - clean: diff --git a/var/spack/repos/builtin/packages/h5z-zfp/config.make.0.7.0.patch b/var/spack/repos/builtin/packages/h5z-zfp/config.make.0.7.0.patch deleted file mode 100644 index e163292acc690b..00000000000000 --- a/var/spack/repos/builtin/packages/h5z-zfp/config.make.0.7.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spack-src/config.make.orig 2017-06-09 21:15:21.000000000 +0900 -+++ spack-src/config.make 2022-02-02 17:04:31.000000000 +0900 -@@ -16,6 +16,8 @@ - H5Z_ZFP_BASE := ../src - else ifeq ($(PWD_BASE),H5Z-ZFP) - H5Z_ZFP_BASE := ./src -+else -+ H5Z_ZFP_BASE := ./src - endif - H5Z_ZFP_PLUGIN := $(H5Z_ZFP_BASE)/plugin - H5Z_ZFP_VERSINFO := $(shell grep '^\#define H5Z_FILTER_ZFP_VERSION_[MP]' $(H5Z_ZFP_BASE)/H5Zzfp_plugin.h | cut -d' ' -f3 | tr '\n' '.' | cut -d'.' -f-3 2>/dev/null) diff --git a/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch b/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch deleted file mode 100644 index 4879a1b755cb96..00000000000000 --- a/var/spack/repos/builtin/packages/h5z-zfp/config.make.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/config.make b/config.make -index d782bd1..1c53ab8 100644 ---- a/config.make -+++ b/config.make -@@ -128,18 +128,37 @@ ZFP_INC = $(ZFP_HOME)/inc - else - ZFP_INC = $(ZFP_HOME)/include - endif -+ifeq ($(wildcard $(ZFP_HOME)/lib),) -+ZFP_LIB = $(ZFP_HOME)/lib64 -+else - ZFP_LIB = $(ZFP_HOME)/lib -+endif -+ -+# Check if specified individually the HDF5 include directory, -+# library directory and bin directory separated by commas, i.e. HDF5_HOME=INC,LIB,BIN - --HDF5_INC = $(HDF5_HOME)/include --HDF5_LIB = $(HDF5_HOME)/lib --HDF5_BIN = $(HDF5_HOME)/bin -+ifneq (,$(findstring ",",$(HDF5_HOME))) -+ HDF5_INC = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$1}') -+ HDF5_LIB = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$2}') -+ HDF5_BIN = $(shell echo $(HDF5_HOME) | awk -F'[,]' '{print $$3}') -+ MAKEVARS = -+else -+ HDF5_INC = $(HDF5_HOME)/include -+ ifeq ($(wildcard $(HDF5_HOME)/lib),) -+ HDF5_LIB = $(HDF5_HOME)/lib64 -+ else -+ HDF5_LIB = $(HDF5_HOME)/lib -+ endif -+ HDF5_BIN = $(HDF5_HOME)/bin -+ MAKEVARS = HDF5_HOME=$(HDF5_HOME) -+endif - - ifeq ($(PREFIX),) - PREFIX := $(shell pwd)/install - endif - INSTALL ?= install - --MAKEVARS = ZFP_HOME=$(ZFP_HOME) HDF5_HOME=$(HDF5_HOME) PREFIX=$(PREFIX) -+MAKEVARS += ZFP_HOME=$(ZFP_HOME) PREFIX=$(PREFIX) - - .SUFFIXES: - .SUFFIXES: .c .F90 .h .o .mod diff --git a/var/spack/repos/builtin/packages/h5z-zfp/fj.patch b/var/spack/repos/builtin/packages/h5z-zfp/fj.patch deleted file mode 100644 index fd3ff5c76d06c7..00000000000000 --- a/var/spack/repos/builtin/packages/h5z-zfp/fj.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- spack-src/config.make.org 2022-02-01 18:43:23.000000000 +0900 -+++ spack-src/config.make 2022-02-01 18:42:54.000000000 +0900 -@@ -106,6 +106,11 @@ - SOEXT ?= so - SHFLAG ?= -qmkshrobj - PREPATH = -Wl,-R, -+else ifneq ($(findstring fcc, $(CC)),) -+ CFLAGS += -KPIC -+ SOEXT ?= so -+ SHFLAG ?= -shared -+ PREPATH = -Wl,-rpath, - endif - - ifneq ($(findstring gfortran, $(FC)),) -@@ -118,6 +123,8 @@ - FCFLAGS += -qpic - else ifneq ($(findstring bgxlf_r, $(FC)),) - FCFLAGS += -qpic -+else ifneq ($(findstring frt, $(FC)),) -+ FCFLAGS += -KPIC - else ifneq ($(findstring f77, $(FC)),) - # some makefile versions set FC=f77 if FC is not set - FC = diff --git a/var/spack/repos/builtin/packages/h5z-zfp/package.py b/var/spack/repos/builtin/packages/h5z-zfp/package.py index f90a244ed8f832..a9c1f86974b19f 100644 --- a/var/spack/repos/builtin/packages/h5z-zfp/package.py +++ b/var/spack/repos/builtin/packages/h5z-zfp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ from spack.package import * -class H5zZfp(MakefilePackage): +class H5zZfp(CMakePackage): """A highly flexible floating point and integer compression plugin for the HDF5 library using ZFP compression.""" @@ -19,9 +19,6 @@ class H5zZfp(MakefilePackage): version("develop", branch="master") version("1.1.1", sha256="921af7b9d1c8c46c036b46544f2785f69d405c0701abe1c1ce3aca2bd5899171") version("1.1.0", sha256="48a81e69d1f3b61d9a1eb07e868164fadf3b88690ec930efd849f5889681a893") - version("1.0.1", sha256="b9ed91dab8e2ef82dc6706b4242c807fb352875e3b21c217dd00782dd1a22b24") - version("0.8.0", sha256="a5eb089191369a5e929c51ec9e5da107afaee39c6ab3b7ad693c454319ab9217") - version("0.7.0", sha256="f728b0bcb9e9cf8bafe05909ab02fec39415635d275e98b661176f69d34f87b3") variant("fortran", default=True, description="Enable Fortran support") @@ -30,16 +27,6 @@ class H5zZfp(MakefilePackage): depends_on("mpi", when="^hdf5+mpi") depends_on("zfp bsws=8") - patch( - "https://github.com/LLNL/H5Z-ZFP/commit/983a1870cefff5fdb643898a14eda855c2c231e4.patch?full_index=1", - sha256="07a53b8b0d4c1df62a3f9f21b30ad0eb90f26b38eb6cacc0de6482fd8f5daea2", - when="@1.0.1", - ) - patch("config.make.patch", when="@0.7.0:0.8.0") - patch("config.make.0.7.0.patch", when="@0.7.0") - patch("Makefile.0.7.0.patch", when="@0.7.0") - patch("fj.patch", when="@0.7.0: %fj") - @property def make_defs(self): cc = spack_cc diff --git a/var/spack/repos/builtin/packages/haccabana/package.py b/var/spack/repos/builtin/packages/haccabana/package.py index 7259308786cd17..bce59ef2ba663c 100644 --- a/var/spack/repos/builtin/packages/haccabana/package.py +++ b/var/spack/repos/builtin/packages/haccabana/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Haccabana(CMakePackage): tags = ["proxy-app", "ecp-proxy-app"] + license("BSD-3-Clause") + version("master", branch="master") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py index a16e1b7a11ed5d..01bae2a3866593 100644 --- a/var/spack/repos/builtin/packages/hacckernels/package.py +++ b/var/spack/repos/builtin/packages/hacckernels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Hacckernels(CMakePackage): tags = ["proxy-app"] + license("BSD-3-Clause") + version("develop", branch="master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/hackrf-host/package.py b/var/spack/repos/builtin/packages/hackrf-host/package.py index db5e129b861fd0..6a02fa73a262a6 100644 --- a/var/spack/repos/builtin/packages/hackrf-host/package.py +++ b/var/spack/repos/builtin/packages/hackrf-host/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class HackrfHost(CMakePackage): root_cmakelists_dir = "host" + license("GPL-2.0-only") + version("2018.01.1", sha256="84dbb5536d3aa5bd6b25d50df78d591e6c3431d752de051a17f4cb87b7963ec3") depends_on("cmake@2.8.12:", type="build") diff --git a/var/spack/repos/builtin/packages/hadoop-xrootd/package.py b/var/spack/repos/builtin/packages/hadoop-xrootd/package.py index b67743397efdd6..439301c38ecf87 100644 --- a/var/spack/repos/builtin/packages/hadoop-xrootd/package.py +++ b/var/spack/repos/builtin/packages/hadoop-xrootd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class HadoopXrootd(MavenPackage): maintainers("haralmha") + license("Apache-2.0") + version("1.0.7", sha256="9a129dc14b3dc139aa4da7543f6392a5c80b41fea6bb9f6cd27db5acf6f5471f") depends_on("hadoop") diff --git a/var/spack/repos/builtin/packages/hadoop/package.py b/var/spack/repos/builtin/packages/hadoop/package.py index 2a5c11b3150a19..d3d1212f45a0dd 100644 --- a/var/spack/repos/builtin/packages/hadoop/package.py +++ b/var/spack/repos/builtin/packages/hadoop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hadoop(Package): homepage = "https://hadoop.apache.org/" url = "https://archive.apache.org/dist/hadoop/common/hadoop-3.3.2/hadoop-3.3.2.tar.gz" + license("Apache-2.0") + version("3.3.2", sha256="b341587495b12eec0b244b517f21df88eb46ef634dc7dc3e5969455b80ce2ce5") version("3.3.0", sha256="ea1a0f0afcdfb9b6b9d261cdce5a99023d7e8f72d26409e87f69bda65c663688") version("3.2.2", sha256="97e73b46c3972cd3c40c2295bd9488843c24e8503c36e7c57f6e6ecc4e12b8c3") diff --git a/var/spack/repos/builtin/packages/hal/package.py b/var/spack/repos/builtin/packages/hal/package.py index 78d214df10f0b8..06461380fb5b73 100644 --- a/var/spack/repos/builtin/packages/hal/package.py +++ b/var/spack/repos/builtin/packages/hal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/half/package.py b/var/spack/repos/builtin/packages/half/package.py index 784dfe7043b3d9..4a33bf6d6aaa3a 100644 --- a/var/spack/repos/builtin/packages/half/package.py +++ b/var/spack/repos/builtin/packages/half/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Half(Package): maintainers("bvanessen") + license("MIT") + version("2.1.0", sha256="ad1788afe0300fa2b02b0d1df128d857f021f92ccf7c8bddd07812685fa07a25") version("1.12.0", sha256="cdd70d3bf3fe091b688e7ab3f48471c881a197d2c186c95cca8bf156961fb41c") patch("f16fix.patch", when="@2.1.0") diff --git a/var/spack/repos/builtin/packages/halide/package.py b/var/spack/repos/builtin/packages/halide/package.py index f7021ed9ad6cc6..282fda87331a8e 100644 --- a/var/spack/repos/builtin/packages/halide/package.py +++ b/var/spack/repos/builtin/packages/halide/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class Halide(CMakePackage, PythonExtension): homepage = "https://halide-lang.org/" url = "https://github.com/halide/Halide/archive/refs/tags/v14.0.0.tar.gz" git = "https://github.com/halide/Halide.git" + + license("MIT") + maintainers("wraith1995") version("main", branch="main") version("15.0.0", sha256="6680424f80c5731a85d977c06327096afe5af31da3667e91d4d36a25fabdda15") @@ -105,7 +108,6 @@ def cmake_args(self): if "+python" in spec: args += [ - self.define("Python3_EXECUTABLE", spec["python"].command.path), self.define("PYBIND11_USE_FETCHCONTENT", False), self.define("Halide_INSTALL_PYTHONDIR", python_platlib), ] diff --git a/var/spack/repos/builtin/packages/hama/package.py b/var/spack/repos/builtin/packages/hama/package.py index bacadc23672cdc..123e66377ad1db 100644 --- a/var/spack/repos/builtin/packages/hama/package.py +++ b/var/spack/repos/builtin/packages/hama/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hama(Package): homepage = "https://www-eu.apache.org" url = "https://www-eu.apache.org/dist/hama/hama-0.7.1/hama-dist-0.7.1.tar.gz" + license("Apache-2.0") + version("0.7.1", sha256="c7466c2a70a949609a501e868f6a288b7142725c407e24649ea6f7121632bc89") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/hapcut2/package.py b/var/spack/repos/builtin/packages/hapcut2/package.py index c025fb3df8fc7c..620f297cd66185 100644 --- a/var/spack/repos/builtin/packages/hapcut2/package.py +++ b/var/spack/repos/builtin/packages/hapcut2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hapcut2(MakefilePackage): git = "https://github.com/vibansal/HapCUT2.git" maintainers("snehring") + license("BSD-2-Clause") + version("v1.3.1", commit="c6481d5fd0618dc3e82b2eb8c2b4835d9a4f6da7") version( "2017-07-10", diff --git a/var/spack/repos/builtin/packages/hapdip/package.py b/var/spack/repos/builtin/packages/hapdip/package.py index 718c716ca07007..e590cd7227fe88 100644 --- a/var/spack/repos/builtin/packages/hapdip/package.py +++ b/var/spack/repos/builtin/packages/hapdip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/haploview/package.py b/var/spack/repos/builtin/packages/haploview/package.py index d0142f04e28bb8..3e299c474844a6 100644 --- a/var/spack/repos/builtin/packages/haploview/package.py +++ b/var/spack/repos/builtin/packages/haploview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/haproxy/package.py b/var/spack/repos/builtin/packages/haproxy/package.py index 0fa43e730060d7..b887c3d090e8e2 100644 --- a/var/spack/repos/builtin/packages/haproxy/package.py +++ b/var/spack/repos/builtin/packages/haproxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hardlink/package.py b/var/spack/repos/builtin/packages/hardlink/package.py index 96e5eae627a012..66e0cbbf0b3b09 100644 --- a/var/spack/repos/builtin/packages/hardlink/package.py +++ b/var/spack/repos/builtin/packages/hardlink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index fa637bd4763c9d..f853baa2491a12 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Harfbuzz(MesonPackage, AutotoolsPackage): conditional("autotools", when="@:2.9"), conditional("meson", when="@3:"), default="meson" ) + license("MIT") + version("7.3.0", sha256="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb") version("7.2.0", sha256="fc5560c807eae0efd5f95b5aa4c65800c7a8eed6642008a6b1e7e3ffff7873cc") version("6.0.0", sha256="1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4") diff --git a/var/spack/repos/builtin/packages/harminv/package.py b/var/spack/repos/builtin/packages/harminv/package.py index 8c3648f84f0c13..3bff34a9197da9 100644 --- a/var/spack/repos/builtin/packages/harminv/package.py +++ b/var/spack/repos/builtin/packages/harminv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Harminv(AutotoolsPackage): homepage = "https://github.com/NanoComp/harminv" url = "https://github.com/NanoComp/harminv/releases/download/v1.4.2/harminv-1.4.2.tar.gz" + license("GPL-2.0-or-later") + version("1.4.2", sha256="5a9a1bf710972442f065d0d62c62d0c4ec3da4a3696d7160a35602c9470bc7a2") version("1.4.1", sha256="e1b923c508a565f230aac04e3feea23b888b47d8e19b08816a97ee4444233670") diff --git a/var/spack/repos/builtin/packages/hashcat/package.py b/var/spack/repos/builtin/packages/hashcat/package.py index 456f31b3feca30..56d615a9cca9a8 100644 --- a/var/spack/repos/builtin/packages/hashcat/package.py +++ b/var/spack/repos/builtin/packages/hashcat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hashcat(MakefilePackage): homepage = "https://hashcat.net/hashcat/" url = "https://github.com/hashcat/hashcat/archive/v6.1.1.tar.gz" + license("MIT") + version("6.2.6", sha256="b25e1077bcf34908cc8f18c1a69a2ec98b047b2cbcf0f51144dcf3ba1e0b7b2a") version("6.1.1", sha256="39c140bbb3c0bdb1564bfa9b9a1cff49115a42f4c9c19e9b066b617aea309f80") version("6.1.0", sha256="916f92434e3b36a126be1d1247a95cd3b32b4d814604960a2ca325d4cc0542d1") diff --git a/var/spack/repos/builtin/packages/haveged/package.py b/var/spack/repos/builtin/packages/haveged/package.py index fd983d0d2f68c8..5c806639799e9a 100644 --- a/var/spack/repos/builtin/packages/haveged/package.py +++ b/var/spack/repos/builtin/packages/haveged/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Haveged(AutotoolsPackage): homepage = "https://github.com/jirka-h/haveged" url = "https://github.com/jirka-h/haveged/archive/v1.9.13/haveged-1.9.13.tar.gz" + license("GPL-3.0-or-later") + version("1.9.13", sha256="d17bd22fa1745daca5ac72e014ed3b0fe5720da4c115953124b1bf2a0aa2b04b") diff --git a/var/spack/repos/builtin/packages/hazelcast/package.py b/var/spack/repos/builtin/packages/hazelcast/package.py index bc6ad9b4eac05d..60eb0b1018463e 100644 --- a/var/spack/repos/builtin/packages/hazelcast/package.py +++ b/var/spack/repos/builtin/packages/hazelcast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hazelcast(MavenPackage): homepage = "http://www.hazelcast.com/" url = "https://github.com/hazelcast/hazelcast/archive/v3.12.8.tar.gz" + license("Apache-2.0") + version("5.2.3", sha256="026c213d3bb520b6c44587ae2a67eca50b9a5a0fc56d2cdedfb2c09c7858a11f") version("4.0.2", sha256="4f01682583ae6603365ac7a24c568d7598cc3c1cbd736e5c6ed98bd75e39ffa3") version("4.0.1", sha256="c9c7d5cbcf70c5e1eb72890df2b4104639f7543f11c6ac5d3e80cd2d4a0d2181") diff --git a/var/spack/repos/builtin/packages/hbase/package.py b/var/spack/repos/builtin/packages/hbase/package.py index 78281d2090a03d..96c68e27d89dd2 100644 --- a/var/spack/repos/builtin/packages/hbase/package.py +++ b/var/spack/repos/builtin/packages/hbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Hbase(Package): list_url = "https://archive.apache.org/dist/hbase" list_depth = 1 + license("Apache-2.0") + version("2.5.4", sha256="ffb929d1ffcaf0309e1617833f3b36645a9c9d9c10b47d6baccc7e50c6d0ed33") version("2.5.3", sha256="874f239c341a6a4a646051c79fda9e838242481b70463bf8daa28ba7239576c2") version("2.4.9", sha256="ed282a165fe0910b27d143f3ea21d552110bc155fd5456250a05dc51b0f0b6bd") diff --git a/var/spack/repos/builtin/packages/hbm-dramsim2/package.py b/var/spack/repos/builtin/packages/hbm-dramsim2/package.py index 7975093cca46b4..5fff62e4c0ee25 100644 --- a/var/spack/repos/builtin/packages/hbm-dramsim2/package.py +++ b/var/spack/repos/builtin/packages/hbm-dramsim2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hc/package.py b/var/spack/repos/builtin/packages/hc/package.py index 454889bd5107d3..9538391912e339 100644 --- a/var/spack/repos/builtin/packages/hc/package.py +++ b/var/spack/repos/builtin/packages/hc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Hc(MakefilePackage): homepage = "https://geodynamics.org/cig/software/hc/" url = "https://geodynamics.org/cig/software/hc/hc-1.0.7.tar.gz" + license("GPL-2.0-only") + version("1.0.7", sha256="7499ea76ac4739a9c0941bd57d124fb681fd387c8d716ebb358e6af3395103ed") depends_on("gmt@4.2.1:4") diff --git a/var/spack/repos/builtin/packages/hcoll/package.py b/var/spack/repos/builtin/packages/hcoll/package.py index b9f666c56e7288..53ff7cc51b2895 100644 --- a/var/spack/repos/builtin/packages/hcoll/package.py +++ b/var/spack/repos/builtin/packages/hcoll/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf-eos2/package.py b/var/spack/repos/builtin/packages/hdf-eos2/package.py index e06e4d3684cdf5..886e2ade976619 100644 --- a/var/spack/repos/builtin/packages/hdf-eos2/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf-eos5/package.py b/var/spack/repos/builtin/packages/hdf-eos5/package.py index 258291ec3a4d54..fd0d6147ef10fe 100644 --- a/var/spack/repos/builtin/packages/hdf-eos5/package.py +++ b/var/spack/repos/builtin/packages/hdf-eos5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf/package.py b/var/spack/repos/builtin/packages/hdf/package.py index 4adb083fc1e8b7..ec022efed06bcc 100644 --- a/var/spack/repos/builtin/packages/hdf/package.py +++ b/var/spack/repos/builtin/packages/hdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index ef072a98a09c8e..d99e9bbd3aebb5 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class Hdf5Blosc(Package): homepage = "https://github.com/Blosc/hdf5-blosc" git = "https://github.com/Blosc/hdf5-blosc.git" + license("MIT") + version("master", branch="master") depends_on("c-blosc") diff --git a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py index 8bcefb47dc6cfc..28ab546bd4773c 100644 --- a/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vfd-gds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hdf5VfdGds(CMakePackage, CudaPackage): git = "https://github.com/hpc-io/vfd-gds.git" maintainers("hyoklee", "lrknox") + license("BSD-3-Clause-LBNL") + # Versions version("master", branch="master") version("1.0.2", sha256="f7df64ff62e057b525bc30ed6534f9c0752e52bd58b65f7c147878d6c68105ae") diff --git a/var/spack/repos/builtin/packages/hdf5-vol-async/package.py b/var/spack/repos/builtin/packages/hdf5-vol-async/package.py index ab34a7f0b1a148..fd94f588d587d8 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-async/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-async/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Hdf5VolAsync(CMakePackage): tags = ["e4s"] + license("BSD-3-Clause-LBNL") + version("develop", branch="develop") version("1.7", tag="v1.7", commit="70a22cf9863a7c1386d97be865342deb751ca501") version("1.6", tag="v1.6", commit="f3406d62ec055cdcfe077979a1068bd102c598a5") diff --git a/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py b/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py index fd9977b3f871f0..e5f086b88a7f1c 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Hdf5VolCache(CMakePackage): maintainers("hyoklee", "lrknox") + license("BSD-3-Clause") + version("default", branch="develop") version("v1.1", tag="v1.1", commit="d886a17a381990b5949d95f5299461c39d7ac2bc") version("v1.0", tag="v1.0", commit="a9b9704e74fa24af50b2a3bd0d63a40a69bde8fe") diff --git a/var/spack/repos/builtin/packages/hdf5-vol-daos/package.py b/var/spack/repos/builtin/packages/hdf5-vol-daos/package.py index 22d648fd038649..6fe945bb024187 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-daos/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-daos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Hdf5VolDaos(CMakePackage): maintainers("hyoklee", "soumagne") + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version("1.2.0", sha256="669c1443605068f24c033783ef72619afcec4844902b3e0bffa19ddeea39779f") diff --git a/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py b/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py index 12490e38e6a144..e7892a705d37fa 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-external-passthrough/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py index fa1718d09168ea..3864e6ec3c5a5f 100644 --- a/var/spack/repos/builtin/packages/hdf5-vol-log/package.py +++ b/var/spack/repos/builtin/packages/hdf5-vol-log/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 210c9b08fea64f..c9a720152dc742 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class Hdf5(CMakePackage): test_requires_compiler = True + license("custom") + # The 'develop' version is renamed so that we could uninstall (or patch) it # without affecting other develop version. version("develop-1.15", branch="develop") @@ -46,167 +48,47 @@ class Hdf5(CMakePackage): sha256="09cdb287aa7a89148c1638dd20891fdbae08102cf433ef128fd345338aa237c7", preferred=True, ) - version( - "1.14.2", - sha256="1c342e634008284a8c2794c8e7608e2eaf26d01d445fb3dfd7f33cb2fb51ac53", - preferred=True, - ) - version( - "1.14.1-2", - sha256="cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07", - preferred=True, - ) - version( - "1.14.0", - sha256="a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4", - preferred=True, - ) - version( - "1.12.2", - sha256="2a89af03d56ce7502dcae18232c241281ad1773561ec00c0f0e8ee2463910f14", - preferred=True, - ) - version( - "1.12.1", - sha256="79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca", - preferred=True, - ) - version( - "1.12.0", - sha256="a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a", - preferred=True, - ) - version( - "1.10.11", - sha256="341684c5c0976b8c7e6951735a400275a90693604464cac73e9f323c696fc79c", - preferred=True, - ) - version( - "1.10.10", - sha256="a6877ab7bd5d769d2d68618fdb54beb50263dcc2a8c157fe7e2186925cdb02db", - preferred=True, - ) - version( - "1.10.9", - sha256="f5b77f59b705a755a5a223372d0222c7bc408fe8db6fa8d9d7ecf8bce291b8dd", - preferred=True, - ) - version( - "1.10.8", - sha256="d341b80d380dd763753a0ebe22915e11e87aac4e44a084a850646ff934d19c80", - preferred=True, - ) - version( - "1.10.7", - sha256="7a1a0a54371275ce2dfc5cd093775bb025c365846512961e7e5ceaecb437ef15", - preferred=True, - ) - version( - "1.10.6", - sha256="5f9a3ee85db4ea1d3b1fa9159352aebc2af72732fc2f58c96a3f0768dba0e9aa", - preferred=True, - ) - version( - "1.10.5", - sha256="6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8", - preferred=True, - ) - version( - "1.10.4", - sha256="8f60dc4dd6ab5fcd23c750d1dc5bca3d0453bdce5c8cdaf0a4a61a9d1122adb2", - preferred=True, - ) - version( - "1.10.3", - sha256="b600d7c914cfa80ae127cd1a1539981213fee9994ac22ebec9e3845e951d9b39", - preferred=True, - ) - version( - "1.10.2", - sha256="bfec1be8c366965a99812cf02ddc97e4b708c1754fccba5414d4adccdc073866", - preferred=True, - ) - version( - "1.10.1", - sha256="048a9d149fb99aaa1680a712963f5a78e9c43b588d0e79d55e06760ec377c172", - preferred=True, - ) - version( - "1.10.0-patch1", - sha256="6e78cfe32a10e6e0629393cdfddf6cfa536571efdaf85f08e35326e1b4e9eff0", - preferred=True, - ) - version( - "1.10.0", - sha256="81f6201aba5c30dced5dcd62f5d5477a2790fd5850e02ac514ca8bf3e2bb375a", - preferred=True, - ) - version( - "1.8.23", - sha256="37fa4eb6cd0e181eb49a10d54611cb00700e9537f805d03e6853503afe5abc27", - preferred=True, - ) - version( - "1.8.22", - sha256="8406d96d9355ef8961d2739fb8fd5474ad4cdf52f3cfac657733defd9709bfaa", - preferred=True, - ) - version( - "1.8.21", - sha256="87d8c82eba5cf766d97cd06c054f4639c1049c4adeaa3a79f77f8bd374f80f37", - preferred=True, - ) - version( - "1.8.19", - sha256="a4335849f19fae88c264fd0df046bc321a78c536b2548fc508627a790564dc38", - preferred=True, - ) - version( - "1.8.18", - sha256="cdb195ad8d9e6782acf24b2488061289f615628c2ccda8457b0a0c3fb7a8a063", - preferred=True, - ) - version( - "1.8.17", - sha256="d9cda297ee76ade9881c4208987939250d397bae6252d0ccb66fa7d24d67e263", - preferred=True, - ) - version( - "1.8.16", - sha256="ed17178abd9928a7237f30370189ba767b9e39e0db45917c2ac4665eb9cb4771", - preferred=True, - ) - version( - "1.8.15", - sha256="4e963216b7d32469596bc1321a8c3f6e0c278dcbbdb7be6414c63c081b34c275", - preferred=True, - ) - version( - "1.8.14", - sha256="1dbefeeef7f591897c632b2b090db96bb8d35ad035beaa36bc39cb2bc67e0639", - preferred=True, - ) - version( - "1.8.13", - sha256="82f6b38eec103b4fccfbf14892786e0c27a8135d3252d8601cf5bf20066d38c1", - preferred=True, - ) - version( - "1.8.12", - sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb", - preferred=True, - ) - version( - "1.8.10", - sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a", - preferred=True, - ) + version("1.14.2", sha256="1c342e634008284a8c2794c8e7608e2eaf26d01d445fb3dfd7f33cb2fb51ac53") + version("1.14.1-2", sha256="cbe93f275d5231df28ced9549253793e40cd2b555e3d288df09d7b89a9967b07") + version("1.14.0", sha256="a571cc83efda62e1a51a0a912dd916d01895801c5025af91669484a1575a6ef4") + version("1.12.3", sha256="c15adf34647918dd48150ea1bd9dffd3b32a3aec5298991d56048cc3d39b4f6f") + version("1.12.2", sha256="2a89af03d56ce7502dcae18232c241281ad1773561ec00c0f0e8ee2463910f14") + version("1.12.1", sha256="79c66ff67e666665369396e9c90b32e238e501f345afd2234186bfb8331081ca") + version("1.12.0", sha256="a62dcb276658cb78e6795dd29bf926ed7a9bc4edf6e77025cd2c689a8f97c17a") + version("1.10.11", sha256="341684c5c0976b8c7e6951735a400275a90693604464cac73e9f323c696fc79c") + version("1.10.10", sha256="a6877ab7bd5d769d2d68618fdb54beb50263dcc2a8c157fe7e2186925cdb02db") + version("1.10.9", sha256="f5b77f59b705a755a5a223372d0222c7bc408fe8db6fa8d9d7ecf8bce291b8dd") + version("1.10.8", sha256="d341b80d380dd763753a0ebe22915e11e87aac4e44a084a850646ff934d19c80") + version("1.10.7", sha256="7a1a0a54371275ce2dfc5cd093775bb025c365846512961e7e5ceaecb437ef15") + version("1.10.6", sha256="5f9a3ee85db4ea1d3b1fa9159352aebc2af72732fc2f58c96a3f0768dba0e9aa") + version("1.10.5", sha256="6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8") + version("1.10.4", sha256="8f60dc4dd6ab5fcd23c750d1dc5bca3d0453bdce5c8cdaf0a4a61a9d1122adb2") + version("1.10.3", sha256="b600d7c914cfa80ae127cd1a1539981213fee9994ac22ebec9e3845e951d9b39") + version("1.10.2", sha256="bfec1be8c366965a99812cf02ddc97e4b708c1754fccba5414d4adccdc073866") + version("1.10.1", sha256="048a9d149fb99aaa1680a712963f5a78e9c43b588d0e79d55e06760ec377c172") + version( + "1.10.0-patch1", sha256="6e78cfe32a10e6e0629393cdfddf6cfa536571efdaf85f08e35326e1b4e9eff0" + ) + version("1.10.0", sha256="81f6201aba5c30dced5dcd62f5d5477a2790fd5850e02ac514ca8bf3e2bb375a") + version("1.8.23", sha256="37fa4eb6cd0e181eb49a10d54611cb00700e9537f805d03e6853503afe5abc27") + version("1.8.22", sha256="8406d96d9355ef8961d2739fb8fd5474ad4cdf52f3cfac657733defd9709bfaa") + version("1.8.21", sha256="87d8c82eba5cf766d97cd06c054f4639c1049c4adeaa3a79f77f8bd374f80f37") + version("1.8.19", sha256="a4335849f19fae88c264fd0df046bc321a78c536b2548fc508627a790564dc38") + version("1.8.18", sha256="cdb195ad8d9e6782acf24b2488061289f615628c2ccda8457b0a0c3fb7a8a063") + version("1.8.17", sha256="d9cda297ee76ade9881c4208987939250d397bae6252d0ccb66fa7d24d67e263") + version("1.8.16", sha256="ed17178abd9928a7237f30370189ba767b9e39e0db45917c2ac4665eb9cb4771") + version("1.8.15", sha256="4e963216b7d32469596bc1321a8c3f6e0c278dcbbdb7be6414c63c081b34c275") + version("1.8.14", sha256="1dbefeeef7f591897c632b2b090db96bb8d35ad035beaa36bc39cb2bc67e0639") + version("1.8.13", sha256="82f6b38eec103b4fccfbf14892786e0c27a8135d3252d8601cf5bf20066d38c1") + version("1.8.12", sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb") + version("1.8.10", sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a") variant("shared", default=True, description="Builds a shared version of the library") variant("hl", default=False, description="Enable the high-level library") variant("cxx", default=False, description="Enable C++ support") variant("map", when="@1.14:", default=False, description="Enable MAP API support") + variant("subfiling", when="@1.14:", default=False, description="Enable Subfiling VFD support") variant("fortran", default=False, description="Enable Fortran support") variant("java", when="@1.10:", default=False, description="Enable Java support") variant("threadsafe", default=False, description="Enable thread-safe capabilities") @@ -332,7 +214,7 @@ class Hdf5(CMakePackage): patch("fortran-kinds.patch", when="@1.10.7") - # This patch may only be needed with GCC11.2 on macOS, but it's valid for + # This patch may only be needed with GCC 11.2 on macOS, but it's valid for # any of the head HDF5 versions as of 12/2021. Since it's impossible to # tell what Fortran version is part of a mixed apple-clang toolchain on # macOS (which is the norm), and this might be an issue for other compilers @@ -414,9 +296,13 @@ def flag_handler(self, name, flags): cmake_flags.append(self.compiler.cc_pic_flag) if spec.satisfies("@1.8.21 %oneapi@2023.0.0"): cmake_flags.append("-Wno-error=int-conversion") + if spec.satisfies("%apple-clang@15:"): + cmake_flags.append("-Wl,-ld_classic") elif name == "cxxflags": if spec.satisfies("@:1.8.12+cxx~shared"): cmake_flags.append(self.compiler.cxx_pic_flag) + if spec.satisfies("%apple-clang@15:"): + cmake_flags.append("-Wl,-ld_classic") elif name == "fflags": if spec.satisfies("%cce+fortran"): # Cray compiler generates module files with uppercase names by @@ -610,6 +496,7 @@ def cmake_args(self): # are enabled but the tests are disabled. spec.satisfies("@1.8.22+shared+tools"), ), + self.define_from_variant("HDF5_ENABLE_SUBFILING_VFD", "subfiling"), self.define_from_variant("HDF5_ENABLE_MAP_API", "map"), self.define("HDF5_ENABLE_Z_LIB_SUPPORT", True), self.define_from_variant("HDF5_ENABLE_SZIP_SUPPORT", "szip"), @@ -673,7 +560,7 @@ def ensure_parallel_compiler_wrappers(self): # 1.10.6 and 1.12.0. The current develop versions do not produce 'h5pfc' # at all. Here, we make sure that 'h5pfc' is available when Fortran and # MPI support are enabled (only for versions that generate 'h5fc'). - if self.spec.satisfies("@1.8.22:1.8," "1.10.6:1.10.9," "1.12.0:1.12" "+fortran+mpi"): + if self.spec.satisfies("@1.8.22:1.8," "1.10.6:1.10.9," "1.12.0:1.12.2" "+fortran+mpi"): with working_dir(self.prefix.bin): # No try/except here, fix the condition above instead: symlink("h5fc", "h5pfc") diff --git a/var/spack/repos/builtin/packages/hdfview/package.py b/var/spack/repos/builtin/packages/hdfview/package.py index 4de9e8a4fda269..323c5e7bf439cc 100644 --- a/var/spack/repos/builtin/packages/hdfview/package.py +++ b/var/spack/repos/builtin/packages/hdfview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/healpix-cxx/package.py b/var/spack/repos/builtin/packages/healpix-cxx/package.py index b1eed688c500bd..22e096ac44e817 100644 --- a/var/spack/repos/builtin/packages/healpix-cxx/package.py +++ b/var/spack/repos/builtin/packages/healpix-cxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class HealpixCxx(AutotoolsPackage): homepage = "https://healpix.sourceforge.io" url = "https://ayera.dl.sourceforge.net/project/healpix/Healpix_3.50/healpix_cxx-3.50.0.tar.gz" + license("GPL-2.0-or-later") + version("3.50.0", sha256="6538ee160423e8a0c0f92cf2b2001e1a2afd9567d026a86ff6e2287c1580cb4c") depends_on("cfitsio") diff --git a/var/spack/repos/builtin/packages/heaptrack/package.py b/var/spack/repos/builtin/packages/heaptrack/package.py index 35e84890422224..e24689594327d1 100644 --- a/var/spack/repos/builtin/packages/heaptrack/package.py +++ b/var/spack/repos/builtin/packages/heaptrack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Heaptrack(CMakePackage): homepage = "https://github.com/KDE/heaptrack" url = "https://github.com/KDE/heaptrack/archive/v1.1.0.tar.gz" + license("BSD-3-Clause") + version("1.3.0", sha256="794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956") version("1.1.0", sha256="bd247ac67d1ecf023ec7e2a2888764bfc03e2f8b24876928ca6aa0cdb3a07309") diff --git a/var/spack/repos/builtin/packages/heasoft/package.py b/var/spack/repos/builtin/packages/heasoft/package.py index 750be26df89878..76073a2e3b03f4 100644 --- a/var/spack/repos/builtin/packages/heasoft/package.py +++ b/var/spack/repos/builtin/packages/heasoft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Heasoft(AutotoolsPackage): homepage = "https://heasarc.gsfc.nasa.gov/docs/software/lheasoft/" url = "https://heasarc.gsfc.nasa.gov/FTP/software/lheasoft/lheasoft6.29/heasoft-6.29src.tar.gz" + license("BSD-3-Clause") + version("6.30", sha256="7f828f6050809653319f94d715c1b6815fbc09adfdcb61f2f0f1d7a6af10684a") version("6.29", sha256="534fec04baa2586326fd7240805f2606620f3b7d7078a80fdd95c9c1177c9e68") diff --git a/var/spack/repos/builtin/packages/heffte/package.py b/var/spack/repos/builtin/packages/heffte/package.py index 01f1235771a744..1472116be9bf08 100644 --- a/var/spack/repos/builtin/packages/heffte/package.py +++ b/var/spack/repos/builtin/packages/heffte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Heffte(CMakePackage, CudaPackage, ROCmPackage): test_requires_compiler = True + license("BSD-3-Clause") + version("develop", branch="master") version("2.4.0", sha256="02310fb4f9688df02f7181667e61c3adb7e38baf79611d80919d47452ff7881d") version("2.3.0", sha256="63db8c9a8822211d23e29f7adf5aa88bb462c91d7a18c296c3ef3a06be8d6171") @@ -38,6 +40,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 +76,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 +88,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"), @@ -96,14 +107,14 @@ def cmake_args(self): archs = ";".join(cuda_arch) args.append("-DCMAKE_CUDA_ARCHITECTURES=%s" % archs) - if "+rocm" in self.spec and self.spec.satisfies("@:2.3.0"): + if "+rocm" in self.spec: args.append("-DCMAKE_CXX_COMPILER={0}".format(self.spec["hip"].hipcc)) rocm_arch = self.spec.variants["amdgpu_target"].value if "none" not in rocm_arch: args.append("-DCMAKE_CXX_FLAGS={0}".format(self.hip_flags(rocm_arch))) - # See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/322 + # See https://github.com/ROCm/rocFFT/issues/322 if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) diff --git a/var/spack/repos/builtin/packages/helib/package.py b/var/spack/repos/builtin/packages/helib/package.py index cc4215fa4b6806..040b828cca7686 100644 --- a/var/spack/repos/builtin/packages/helib/package.py +++ b/var/spack/repos/builtin/packages/helib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Helib(CMakePackage): maintainers("wohlbier") + license("Apache-2.0") + version("2.2.2", sha256="70c07d2a2da393c695095fe755836524e3d98efb27a336e206291f71db9cec7d") version("2.2.1", sha256="cbe030c752c915f1ece09681cadfbe4f140f6752414ab000b4cf076b6c3019e4") version("2.2.0", sha256="e5f82fb0520a76eafdf5044a1f17f512999479d899da8c34335da5e193699b94") diff --git a/var/spack/repos/builtin/packages/helics/package.py b/var/spack/repos/builtin/packages/helics/package.py index 82421aa9d2d991..90c82bbb5432b7 100644 --- a/var/spack/repos/builtin/packages/helics/package.py +++ b/var/spack/repos/builtin/packages/helics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Helics(CMakePackage): maintainers("nightlark") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=True) version("main", branch="main", submodules=True) version("master", branch="main", submodules=True) diff --git a/var/spack/repos/builtin/packages/help2man/package.py b/var/spack/repos/builtin/packages/help2man/package.py index 5f6024add30077..f5b41627f9b510 100644 --- a/var/spack/repos/builtin/packages/help2man/package.py +++ b/var/spack/repos/builtin/packages/help2man/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Help2man(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/help2man/" gnu_mirror_path = "help2man/help2man-1.47.11.tar.xz" + license("GPL-3.0-or-later") + version("1.49.3", sha256="4d7e4fdef2eca6afe07a2682151cea78781e0a4e8f9622142d9f70c083a2fd4f") version("1.47.16", sha256="3ef8580c5b86e32ca092ce8de43df204f5e6f714b0cd32bc6237e6cd0f34a8f4") version("1.47.11", sha256="5985b257f86304c8791842c0c807a37541d0d6807ee973000cf8a3fe6ad47b88") diff --git a/var/spack/repos/builtin/packages/henson/package.py b/var/spack/repos/builtin/packages/henson/package.py index a66fb7552c9742..d1be8ba2cd234e 100644 --- a/var/spack/repos/builtin/packages/henson/package.py +++ b/var/spack/repos/builtin/packages/henson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Henson(CMakePackage): homepage = "https://github.com/henson-insitu/henson" git = "https://github.com/henson-insitu/henson.git" + license("BSD-3-Clause-LBNL") + version("master", branch="master") maintainers("mrzv") @@ -30,13 +32,8 @@ class Henson(CMakePackage): conflicts("^openmpi", when="+mpi-wrappers") def cmake_args(self): - args = [ + return [ self.define_from_variant("python", "python"), self.define_from_variant("mpi-wrappers", "mpi-wrappers"), self.define_from_variant("use_boost", "boost"), ] - - if self.spec.satisfies("+python"): - args += [self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)] - - return args diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index 38633a012c7672..a1194a79381fc0 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hepmc(CMakePackage): tags = ["hep"] + license("GPL-2.0-or-later") + version("2.06.11", sha256="86b66ea0278f803cde5774de8bd187dd42c870367f1cbf6cdaec8dc7cf6afc10") version("2.06.10", sha256="5adedd9e3f7447e1e5fc01b72f745ab87da2c1611df89208bb3d7c6ea94c11a4") version("2.06.09", sha256="e0f8fddd38472c5615210894444686ac5d72df3be682f7d151b562b236d9b422") diff --git a/var/spack/repos/builtin/packages/hepmc3/package.py b/var/spack/repos/builtin/packages/hepmc3/package.py index de8936d52a3018..a3f96d95c5c51b 100644 --- a/var/spack/repos/builtin/packages/hepmc3/package.py +++ b/var/spack/repos/builtin/packages/hepmc3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,9 @@ class Hepmc3(CMakePackage): maintainers("vvolkl") + license("LGPL-3.0-or-later") + + version("3.2.7", sha256="587faa6556cc54ccd89ad35421461b4761d7809bc17a2e72f5034daea142232b") version("3.2.6", sha256="248f3b5b36dd773844cbe73d51f60891458334b986b259754c59dbf4bbf1d525") version("3.2.5", sha256="cd0f75c80f75549c59cc2a829ece7601c77de97cb2a5ab75790cac8e1d585032") version("3.2.4", sha256="e088fccfd1a6c2f8e1089f457101bee1e5c7a9777e9d51c6419c8a288a49e1bb") @@ -63,8 +66,8 @@ def cmake_args(self): py_ver = spec["python"].version.up_to(2) args.extend( [ - from_variant("HEPMC3_PYTHON_VERSIONS", str(py_ver)), - from_variant("HEPMC3_Python_SITEARCH" + py_ver.joined, python_platlib), + self.define("HEPMC3_PYTHON_VERSIONS", str(py_ver)), + self.define("HEPMC3_Python_SITEARCH" + str(py_ver.joined), python_platlib), ] ) diff --git a/var/spack/repos/builtin/packages/hepmcanalysis/package.py b/var/spack/repos/builtin/packages/hepmcanalysis/package.py index 3743fd15fd3321..2b66581b9c5883 100644 --- a/var/spack/repos/builtin/packages/hepmcanalysis/package.py +++ b/var/spack/repos/builtin/packages/hepmcanalysis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/heppdt/package.py b/var/spack/repos/builtin/packages/heppdt/package.py index 99678bbff5df3f..5f066f44d3ddb6 100644 --- a/var/spack/repos/builtin/packages/heppdt/package.py +++ b/var/spack/repos/builtin/packages/heppdt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/heputils/package.py b/var/spack/repos/builtin/packages/heputils/package.py index 9fa66ce020063a..a70d06d12f3f72 100644 --- a/var/spack/repos/builtin/packages/heputils/package.py +++ b/var/spack/repos/builtin/packages/heputils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Heputils(MakefilePackage): tags = ["hep"] + license("GPL-3.0-only") + version("1.3.2", sha256="be43586979ab1a81a55348d795c2f63a5da19fc6367d5f66f354217c76c809c0") version("1.3.1", sha256="7f33ef44364a3d3a39cc65005fb6aa9dfd06bd1b18b41151c0e5e3d28d6ba15b") version("1.3.0", sha256="1ec9d9d71d409ce6b2e668e4927b1090ddf2ee9acf25457f767925cf89b24852") diff --git a/var/spack/repos/builtin/packages/hercules/package.py b/var/spack/repos/builtin/packages/hercules/package.py deleted file mode 100644 index 6410b5552dc3b6..00000000000000 --- a/var/spack/repos/builtin/packages/hercules/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class Hercules(MakefilePackage): - """Hercules is an amazingly fast and highly customizable Git - repository analysis engine written in Go.""" - - homepage = "https://github.com/src-d/hercules" - url = "https://github.com/src-d/hercules/archive/v10.7.2.tar.gz" - - version("10.7.2", sha256="4654dcfb1eee5af1610fd05677c6734c2ca1161535fcc14d3933d6debda4bc34") - - depends_on("protobuf", type="build") - depends_on("go@1.11:", type="build") - depends_on("py-labours", type="run") - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install("hercules", prefix.bin) diff --git a/var/spack/repos/builtin/packages/hermes/package.py b/var/spack/repos/builtin/packages/hermes/package.py index 698e412bb441b8..ef33ea207b2bec 100644 --- a/var/spack/repos/builtin/packages/hermes/package.py +++ b/var/spack/repos/builtin/packages/hermes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hermes(CMakePackage): maintainers("hyoklee") + license("GPL-2.0-only") + version("master", branch="master") version( "0.9.0-beta", diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index ac0dcdfff90582..960656ee6b59f6 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Herwig3(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-only") + version("7.2.3", sha256="5599899379b01b09e331a2426d78d39b7f6ec126db2543e9d340aefe6aa50f84") version("7.2.2", sha256="53e06b386df5bc20fe268b6c8ba50f1e62b6744e577d383ec836ea3fc672c383") version("7.2.1", sha256="d4fff32f21c5c08a4b2e563c476b079859c2c8e3b78d853a8a60da96d5eea686") diff --git a/var/spack/repos/builtin/packages/herwigpp/package.py b/var/spack/repos/builtin/packages/herwigpp/package.py index ff05945e610db3..b1d2cd12eb4e61 100644 --- a/var/spack/repos/builtin/packages/herwigpp/package.py +++ b/var/spack/repos/builtin/packages/herwigpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Herwigpp(AutotoolsPackage): tags = ["hep"] + license("GPL-2.0-only") + version("2.7.1", sha256="80a189376bb65f5ec4e64f42e76c00ea9102d8224010563a424fc11e619a6ad6") patch("herwig++-2.7.1.patch", when="@2.7.1", level=0) diff --git a/var/spack/repos/builtin/packages/hevea/package.py b/var/spack/repos/builtin/packages/hevea/package.py index 3b9d76f881f6a4..b29903e95e5f3a 100644 --- a/var/spack/repos/builtin/packages/hevea/package.py +++ b/var/spack/repos/builtin/packages/hevea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hevea(MakefilePackage): maintainers("scemama", "cessenat") + license("LGPL-2.0-only") + version("develop", branch="master") version("2.35", sha256="78f834cc7a8112ec59d0b8acdfbed0c8ac7dbb85f964d0be1f4eed04f25cdf54") version("2.34", sha256="f505a2a5bafdc2ea389ec521876844e6fdcb5c1b656396b7e8421c1631469ea2") diff --git a/var/spack/repos/builtin/packages/hh-suite/package.py b/var/spack/repos/builtin/packages/hh-suite/package.py index 7d395ef5a9dce8..334653ea86ce45 100644 --- a/var/spack/repos/builtin/packages/hh-suite/package.py +++ b/var/spack/repos/builtin/packages/hh-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class HhSuite(CMakePackage): homepage = "https://github.com/soedinglab/hh-suite" url = "https://github.com/soedinglab/hh-suite/archive/refs/tags/v3.3.0.tar.gz" + license("GPL-3.0-or-later") + version("3.3.0", sha256="dd67f7f3bf601e48c9c0bc4cf1fbe3b946f787a808bde765e9436a48d27b0964") variant("mpi", default=True, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/hibench/package.py b/var/spack/repos/builtin/packages/hibench/package.py index d1addcabb58a49..7d764d7f9f844b 100644 --- a/var/spack/repos/builtin/packages/hibench/package.py +++ b/var/spack/repos/builtin/packages/hibench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Hibench(MavenPackage): homepage = "https://github.com/Intel-bigdata/HiBench" url = "https://github.com/Intel-bigdata/HiBench/archive/HiBench-7.1.tar.gz" + license("Apache-2.0") + version("7.1", sha256="96572a837d747fb6347f2b906fd5f7fb97a62095435326ccfee5e75777a5c210") version("7.0", sha256="89b01f3ad90b758f24afd5ea2bee997c3d700ce9244b8a2b544acc462ab0e847") version("6.0", sha256="179f5415903f4029bd0ea1101a3d4c67faf88ca46a993d8179582299ad730f79") diff --git a/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py b/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py index 4e085969612847..1d4f188a0de1cd 100644 --- a/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py +++ b/var/spack/repos/builtin/packages/hicolor-icon-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class HicolorIconTheme(AutotoolsPackage): homepage = "https://www.freedesktop.org/wiki/Software/icon-theme/" url = "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.tar.xz" + license("GPL-2.0-only") + version("0.17", sha256="317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8") def setup_dependent_build_environment(self, env, dependent_spec): diff --git a/var/spack/repos/builtin/packages/hicops/package.py b/var/spack/repos/builtin/packages/hicops/package.py index fc61377e8c6dcf..7cfd6c36728344 100644 --- a/var/spack/repos/builtin/packages/hicops/package.py +++ b/var/spack/repos/builtin/packages/hicops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index 02f0152bef5409..da9f4425da6003 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Highfive(CMakePackage): git = "https://github.com/BlueBrain/HighFive.git" maintainers("alkino") + license("BSL-1.0") + version("develop", branch="master") version("2.8.0", sha256="cd2502cae61bfb00e32dd18c9dc75289e09ad1db5c2a46d3b0eefd32e0df983b") version("2.7.1", sha256="25b4c51a94d1e670dc93b9b73f51e79b65d8ff49bcd6e5d5582d5ecd2789a249") diff --git a/var/spack/repos/builtin/packages/highway/package.py b/var/spack/repos/builtin/packages/highway/package.py index 75f5398ab29717..d4b2f0cc6840bd 100644 --- a/var/spack/repos/builtin/packages/highway/package.py +++ b/var/spack/repos/builtin/packages/highway/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Highway(CMakePackage): homepage = "https://github.com/google/highway" url = "https://github.com/google/highway/archive/refs/tags/1.0.0.tar.gz" + license("Apache-2.0") + version("1.0.7", sha256="5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5") version("1.0.6", sha256="d89664a045a41d822146e787bceeefbf648cc228ce354f347b18f2b419e57207") version("1.0.5", sha256="99b7dad98b8fa088673b720151458fae698ae5df9154016e39de4afdc23bb927") diff --git a/var/spack/repos/builtin/packages/highwayhash/package.py b/var/spack/repos/builtin/packages/highwayhash/package.py index c608ec033a6d2a..8dad7acc99c662 100644 --- a/var/spack/repos/builtin/packages/highwayhash/package.py +++ b/var/spack/repos/builtin/packages/highwayhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Highwayhash(MakefilePackage): homepage = "https://github.com/google/highwayhash" git = "https://github.com/google/highwayhash.git" + license("Apache-2.0") + version("dfcb97", commit="dfcb97ca4fe9277bf9dc1802dd979b071896453b") build_targets = ["all", "libhighwayhash.a"] diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 4f68978ab640fa..1abcdb43ae71b4 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/LLNL/hiop.git" maintainers("ryandanehy", "cameronrutherford", "pelesh") + license("BSD-3-Clause") + # Most recent tagged snapshot is the preferred version when profiling. version( "1.0.1", tag="v1.0.1", commit="c5e156c6f27d046f590dc35114980e3f9c573ca6", submodules=True @@ -47,10 +49,10 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): version("0.5.0", tag="v0.5.0", commit="a39da8025037c7c8ae2eb31234eb80cc73bec2af") version("0.4.6", tag="v0.4.6", commit="b72d163d52c9225c3196ceb2baebdc7cf09a69de") version("0.4.5", tag="v0.4.5", commit="c353580456c4776c50811b97cf8ff802dc27b90c") - version("0.4.4", tag="v0.4.4", commit="e858eefa6b914f5c87c3717bbce811931ea69386") + version("0.4.4", tag="v0.4.4", commit="4e3faa9963e83cd7f2a388bfcc1e402dc86fc81d") version("0.4.3", tag="v0.4.3", commit="c0394af4d84ebb84b7d2b95283ad65ffd84e0d45") version("0.4.2", tag="v0.4.2", commit="3fcb788d223eec24c0241680070c4a9a5ec71ef3") - version("0.4.1", tag="v0.4.1", commit="3f269560f76d5a89bcbd1d3c4f9f0e5acaa6fd64") + version("0.4.1", tag="v0.4.1", commit="281adb5fb335642446e0804a2669b97d8ef62998") version("0.4", tag="v0.4", commit="91d21085a1149eacdb27cd738d4a74a7e412fcff") version("0.3.99.3", tag="v0.3.99.3", commit="bed1dbef260e53a9d139ccfb77d2e83a98aab216") version("0.3.99.2", tag="v0.3.99.2", commit="9eb026768bc5e0a2c1293d0487cc39913001ae19") diff --git a/var/spack/repos/builtin/packages/hip-examples/package.py b/var/spack/repos/builtin/packages/hip-examples/package.py index c625d0fe4b76c2..22f5705389649a 100644 --- a/var/spack/repos/builtin/packages/hip-examples/package.py +++ b/var/spack/repos/builtin/packages/hip-examples/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,21 +11,25 @@ class HipExamples(Package): """Examples for HIP""" - homepage = "https://github.com/ROCm-Developer-Tools/HIP-Examples/" - git = "https://github.com/ROCm-Developer-Tools/HIP-Examples.git" - url = "https://github.com/ROCm-Developer-Tools/HIP-Examples/archive/rocm-5.4.3.tar.gz" + homepage = "https://github.com/ROCm/HIP-Examples/" + git = "https://github.com/ROCm/HIP-Examples.git" + url = "https://github.com/ROCm/HIP-Examples/archive/rocm-5.4.3.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "afzpatel") - version("master", branch="master") - + version("5.6.1", sha256="c1b5d30e387f869fae21170790ea3d604f7f0dba7771a9c096d9a5c2351dd001") + version("5.6.0", sha256="b751a0cac938248f7ea0fbeaa9df35688357b54ddd13359e2842a770b7923dfe") + version("5.5.1", sha256="c8522ef3f0804c85eef7e9efe2671f375b0d7f2100de85f55dcc2401efed6389") + version("5.5.0", sha256="bea8a4155bbfbdb3bc1f83c22e4bd1214b1b4e1840b58dc7d37704620de5b103") version("5.4.3", sha256="053b8b7892e2929e3f90bd978d8bb1c9801e4803eadd7d97fc6692ce60af1d47") patch("0001-add-inc-and-lib-paths-to-openmp-helloworld.patch") patch("0002-add-fpic-compile-to-add4.patch") - depends_on("hip") - depends_on("rocm-openmp-extras") + + for ver in ["5.6.1", "5.6.0", "5.5.1", "5.5.0", "5.4.3"]: + depends_on("hip@" + ver, when="@" + ver) + depends_on("rocm-openmp-extras@" + ver, when="@" + ver) def install(self, spec, prefix): stage = os.getcwd() diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index e6a4b3bbdfe1ae..22c1232e2ccbea 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,8 +12,8 @@ class HipRocclr(CMakePackage): with to different backends such as ROCr or PAL This abstraction allows runtimes to work on Windows as well as on Linux without much effort.""" - homepage = "https://github.com/ROCm-Developer-Tools/ROCclr" - git = "https://github.com/ROCm-Developer-Tools/ROCclr.git" + homepage = "https://github.com/ROCm/ROCclr" + git = "https://github.com/ROCm/ROCclr.git" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") @@ -21,11 +21,13 @@ class HipRocclr(CMakePackage): def url_for_version(self, version): # Fix up a typo in the 3.5.0 release. if version == Version("3.5.0"): - return "https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-3.5.0.tar.gz" + return "https://github.com/ROCm/ROCclr/archive/roc-3.5.0.tar.gz" - url = "https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz" + url = "https://github.com/ROCm/ROCclr/archive/rocm-{0}.tar.gz" return url.format(version) + license("MIT") + version("master", branch="main") version("5.6.1", sha256="cc9a99c7e4de3d9360c0a471b27d626e84a39c9e60e0aff1e8e1500d82391819") version("5.6.0", sha256="864f87323e793e60b16905284fba381a7182b960dd4a37fb67420c174442c03c") @@ -150,13 +152,13 @@ def url_for_version(self, version): depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("comgr@" + ver, when="@" + ver) - # See: https://github.com/ROCm-Developer-Tools/ROCclr/pull/16 + # See: https://github.com/ROCm/ROCclr/pull/16 # In 3.7.0 the find opengl things have changed slightly. patch("opengl.patch", when="@3.5.0") resource( name="opencl-on-vdi", - url="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz", + url="https://github.com/ROCm/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz", sha256="511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0", expand=True, destination="", @@ -195,7 +197,7 @@ def url_for_version(self, version): ]: resource( name="opencl-on-vdi", - url="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz".format( + url="https://github.com/ROCm/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz".format( d_version ), sha256=d_shasum, @@ -207,7 +209,7 @@ def url_for_version(self, version): resource( name="opencl-on-vdi", - git="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git", + git="https://github.com/ROCm/ROCm-OpenCL-Runtime.git", destination="", placement="opencl-on-vdi", branch="main", diff --git a/var/spack/repos/builtin/packages/hip-tensor/package.py b/var/spack/repos/builtin/packages/hip-tensor/package.py new file mode 100644 index 00000000000000..86fd4e385dd6f5 --- /dev/null +++ b/var/spack/repos/builtin/packages/hip-tensor/package.py @@ -0,0 +1,29 @@ +# 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 HipTensor(CMakePackage, ROCmPackage): + """AMD’s C++ library for accelerating tensor primitives""" + + homepage = "https://github.com/ROCm/hipTensor" + git = "https://github.com/ROCm/hipTensor.git" + url = "https://github.com/ROCm/hipTensor/archive/refs/tags/rocm-5.7.0.tar.gz" + tags = ["rocm"] + + maintainers("srekolam", "afzpatel") + + version("master", branch="master") + version("6.0.0", sha256="268d7f114784b7e824f89c21c65c2efedbb5486f09a356a56dca1b89bde1ef7a") + version("5.7.1", sha256="96743d4e695fe865aef4097ae31d9b4e42a2d5a92135a005b0d187d9c0b17645") + version("5.7.0", sha256="4b17f6d43b17fe2dc1d0c61e9663d4752006f7898cc94231206444a1663eb252") + + for ver in ["5.7.0", "5.7.1", "6.0.0", "master"]: + depends_on(f"composable-kernel@{ver}", when=f"@{ver}") + depends_on(f"rocm-cmake@{ver}", when=f"@{ver}") + + def setup_build_environment(self, env): + env.set("CXX", self.spec["hip"].hipcc) diff --git a/var/spack/repos/builtin/packages/hip/0014-Remove-compiler-rt-linkage-for-host-for-5.7.0.patch b/var/spack/repos/builtin/packages/hip/0014-Remove-compiler-rt-linkage-for-host-for-5.7.0.patch new file mode 100644 index 00000000000000..3f1bf4974be60e --- /dev/null +++ b/var/spack/repos/builtin/packages/hip/0014-Remove-compiler-rt-linkage-for-host-for-5.7.0.patch @@ -0,0 +1,74 @@ +From 9be86942bfd8fd9a1c9436a7f87de5a52aa4cb7e Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Wed, 25 Oct 2023 07:33:45 +0000 +Subject: [PATCH] Remove-compiler-rt-linkage-for-host-for-5.7.0 + +--- + clr/hipamd/CMakeLists.txt | 6 ++++-- + clr/hipamd/hip-config-amd.cmake | 1 - + hipcc/bin/hipcc.pl | 10 +++++++--- + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt +index 272ebca..48f7686 100755 +--- a/clr/hipamd/CMakeLists.txt ++++ b/clr/hipamd/CMakeLists.txt +@@ -402,8 +402,10 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "") + install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin) + install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin) + install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin) +- install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin) +- install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin) ++ if(WIN32) ++ install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin) ++ install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin) ++ endif() + endif() + + ############################# +diff --git a/clr/hipamd/hip-config-amd.cmake b/clr/hipamd/hip-config-amd.cmake +index 229bb0f..d685172 100755 +--- a/clr/hipamd/hip-config-amd.cmake ++++ b/clr/hipamd/hip-config-amd.cmake +@@ -153,7 +153,6 @@ else() + # Add support for __fp16 and _Float16, explicitly link with compiler-rt + if( "${CLANGRT_BUILTINS_FETCH_EXIT_CODE}" STREQUAL "0" ) + # CLANG_RT Builtins found Successfully Set interface link libraries property +- set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") + set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") + else() + message(STATUS "clangrt builtins lib not found: ${CLANGRT_BUILTINS_FETCH_EXIT_CODE}") +diff --git a/hipcc/bin/hipcc.pl b/hipcc/bin/hipcc.pl +index 56dcda2..c2e0cc9 100755 +--- a/hipcc/bin/hipcc.pl ++++ b/hipcc/bin/hipcc.pl +@@ -155,11 +155,14 @@ if ($HIP_PLATFORM eq "amd") { + if($isWindows) { + $execExtension = ".exe"; + } +- $HIPCC="$HIP_CLANG_PATH/clang++" . $execExtension; ++ # llvm_path is set inside the hip recipe ++ $LLVM_PATH= $ENV{'LLVM_PATH'}; ++ $HIPCC="${LLVM_PATH}/bin/clang++" . $execExtension; + + # If $HIPCC clang++ is not compiled, use clang instead + if ( ! -e $HIPCC ) { +- $HIPCC="$HIP_CLANG_PATH/clang" . $execExtension; ++ $LLVM_PATH= $ENV{'LLVM_PATH'}; ++ $HIPCC="${LLVM_PATH}/bin/clang" . $execExtension; + $HIPLDFLAGS = "--driver-mode=g++"; + } + # to avoid using dk linker or MSVC linker +@@ -483,7 +486,8 @@ if($HIP_PLATFORM eq "amd"){ + $targetsStr = $ENV{HCC_AMDGPU_TARGET}; + } elsif (not $isWindows) { + # Else try using rocm_agent_enumerator +- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; ++ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCMINFO_PATH; ++ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator"; + $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; + $targetsStr =~ s/\n/,/g; + } +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/hip/0014-remove-compiler-rt-linkage-for-host.6.0.patch b/var/spack/repos/builtin/packages/hip/0014-remove-compiler-rt-linkage-for-host.6.0.patch new file mode 100644 index 00000000000000..597baa2e5d1a63 --- /dev/null +++ b/var/spack/repos/builtin/packages/hip/0014-remove-compiler-rt-linkage-for-host.6.0.patch @@ -0,0 +1,61 @@ +diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt +index 7ad3001..aaf6ad0 100755 +--- a/clr/hipamd/CMakeLists.txt ++++ b/clr/hipamd/CMakeLists.txt +@@ -297,16 +297,6 @@ if(HIP_RUNTIME STREQUAL "rocclr") + add_subdirectory(src) + endif() + +-# Download libamdhip64.so.5 +-if(HIP_PLATFORM STREQUAL "amd") +- if(NOT WIN32) +- execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/download_libamhip64_v5.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND_ECHO STDERR RESULT_VARIABLE DWLD_HIP_SO_RC) +- if (DWLD_HIP_SO_RC AND NOT DWLD_HIP_SO_RC EQUAL 0) +- message(FATAL_ERROR "Failed to download libamdhip64.so.5") +- endif() +- endif() +-endif() +- + # Build doxygen documentation + find_program(DOXYGEN_EXE doxygen) + if(DOXYGEN_EXE) +@@ -408,8 +398,6 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "") + install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin) + install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin) + install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin) +- install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin) +- install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin) + endif() + + ############################# +diff --git a/hipcc/bin/hipcc.pl b/hipcc/bin/hipcc.pl +index 513a427..cd2d6ac 100755 +--- a/hipcc/bin/hipcc.pl ++++ b/hipcc/bin/hipcc.pl +@@ -160,11 +160,14 @@ if ($HIP_PLATFORM eq "amd") { + if($isWindows) { + $execExtension = ".exe"; + } +- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang++" . $execExtension); ++ # llvm_path is set inside the hip recipe ++ $LLVM_PATH= $ENV{'LLVM_PATH'}; ++ $HIPCC="${LLVM_PATH}/bin/clang++" . $execExtension; + + # If $HIPCC clang++ is not compiled, use clang instead + if ( ! -e $HIPCC ) { +- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang" . $execExtension); ++ $LLVM_PATH= $ENV{'LLVM_PATH'}; ++ $HIPCC="${LLVM_PATH}/bin/clang" . $execExtension; + $HIPLDFLAGS = "--driver-mode=g++"; + } + # to avoid using dk linker or MSVC linker +@@ -484,7 +487,8 @@ if($HIP_PLATFORM eq "amd"){ + $targetsStr = $ENV{HCC_AMDGPU_TARGET}; + } elsif (not $isWindows) { + # Else try using rocm_agent_enumerator +- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; ++ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCMINFO_PATH; ++ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator"; + $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; + $targetsStr =~ s/\n/,/g; + } diff --git a/var/spack/repos/builtin/packages/hip/0017-Set-PARAMETERS_MIN_ALIGNMENT-to-the-native-alignment.patch b/var/spack/repos/builtin/packages/hip/0017-Set-PARAMETERS_MIN_ALIGNMENT-to-the-native-alignment.patch new file mode 100644 index 00000000000000..cabc64fd2a671c --- /dev/null +++ b/var/spack/repos/builtin/packages/hip/0017-Set-PARAMETERS_MIN_ALIGNMENT-to-the-native-alignment.patch @@ -0,0 +1,63 @@ +diff --git a/clr/rocclr/platform/kernel.hpp b/clr/rocclr/platform/kernel.hpp +index 8cb3b7f..d441b18 100644 +--- a/clr/rocclr/platform/kernel.hpp ++++ b/clr/rocclr/platform/kernel.hpp +@@ -159,7 +159,7 @@ class KernelParameters : protected HeapObject { + deviceKernelArgs_(false) { + totalSize_ = signature.paramsSize() + (signature.numMemories() + + signature.numSamplers() + signature.numQueues()) * sizeof(void*); +- values_ = reinterpret_cast
(this) + alignUp(sizeof(KernelParameters), 16); ++ values_ = reinterpret_cast
(this) + alignUp(sizeof(KernelParameters), PARAMETERS_MIN_ALIGNMENT); + memoryObjOffset_ = signature_.paramsSize(); + memoryObjects_ = reinterpret_cast(values_ + memoryObjOffset_); + samplerObjOffset_ = memoryObjOffset_ + signature_.numMemories() * sizeof(amd::Memory*); +@@ -183,7 +183,7 @@ class KernelParameters : protected HeapObject { + execNewVcop_(rhs.execNewVcop_), + execPfpaVcop_(rhs.execPfpaVcop_), + deviceKernelArgs_(false) { +- values_ = reinterpret_cast
(this) + alignUp(sizeof(KernelParameters), 16); ++ values_ = reinterpret_cast
(this) + alignUp(sizeof(KernelParameters), PARAMETERS_MIN_ALIGNMENT); + memoryObjOffset_ = signature_.paramsSize(); + memoryObjects_ = reinterpret_cast(values_ + memoryObjOffset_); + samplerObjOffset_ = memoryObjOffset_ + signature_.numMemories() * sizeof(amd::Memory*); +@@ -220,7 +220,7 @@ class KernelParameters : protected HeapObject { + //! Allocate memory for this instance as well as the required storage for + // the values_, defined_, and rawPointer_ arrays. + void* operator new(size_t size, const KernelSignature& signature) { +- size_t requiredSize = alignUp(size, 16) + signature.paramsSize() + ++ size_t requiredSize = alignUp(size, PARAMETERS_MIN_ALIGNMENT) + signature.paramsSize() + + (signature.numMemories() + signature.numSamplers() + signature.numQueues()) * + sizeof(void*); + return AlignedMemory::allocate(requiredSize, PARAMETERS_MIN_ALIGNMENT); +diff --git a/clr/rocclr/utils/flags.hpp b/clr/rocclr/utils/flags.hpp +index df12fe6..88848e5 100644 +--- a/clr/rocclr/utils/flags.hpp ++++ b/clr/rocclr/utils/flags.hpp +@@ -52,7 +52,7 @@ debug(size_t, CPU_MEMORY_GUARD_PAGE_SIZE, 64, \ + "Size in KB of CPU memory guard page") \ + debug(size_t, CPU_MEMORY_ALIGNMENT_SIZE, 256, \ + "Size in bytes for the default alignment for guarded memory on CPU") \ +-debug(size_t, PARAMETERS_MIN_ALIGNMENT, 16, \ ++debug(size_t, PARAMETERS_MIN_ALIGNMENT, NATIVE_ALIGNMENT_SIZE, \ + "Minimum alignment required for the abstract parameters stack") \ + debug(size_t, MEMOBJ_BASE_ADDR_ALIGN, 4*Ki, \ + "Alignment of the base address of any allocate memory object") \ +diff --git a/clr/rocclr/utils/macros.hpp b/clr/rocclr/utils/macros.hpp +index 02fef75..e2110eb 100644 +--- a/clr/rocclr/utils/macros.hpp ++++ b/clr/rocclr/utils/macros.hpp +@@ -126,6 +126,14 @@ + #define IS_WINDOWS false + #endif + ++#if defined(__AVX512F__) ++#define NATIVE_ALIGNMENT_SIZE 64 ++#elif defined(__AVX__) ++#define NATIVE_ALIGNMENT_SIZE 32 ++#else ++#define NATIVE_ALIGNMENT_SIZE 16 ++#endif ++ + #define IF_LEFT_true(x) x + #define IF_LEFT_false(x) + #define IF_RIGHT_true(x) diff --git a/var/spack/repos/builtin/packages/hip/0018-reverting-hipMemoryType-with-memoryType.patch b/var/spack/repos/builtin/packages/hip/0018-reverting-hipMemoryType-with-memoryType.patch new file mode 100644 index 00000000000000..c77075d640e882 --- /dev/null +++ b/var/spack/repos/builtin/packages/hip/0018-reverting-hipMemoryType-with-memoryType.patch @@ -0,0 +1,17 @@ +diff --git a/include/hip/hip_runtime_api.h b/include/hip/hip_runtime_api.h +index 88e6850..d280504 100644 +--- a/include/hip/hip_runtime_api.h ++++ b/include/hip/hip_runtime_api.h +@@ -259,7 +259,11 @@ typedef enum hipMemoryType { + * Pointer attributes + */ + typedef struct hipPointerAttribute_t { +- enum hipMemoryType type; ++ union { ++ // Deprecated, use instead type ++ enum hipMemoryType memoryType; ++ enum hipMemoryType type; ++ }; + int device; + void* devicePointer; + void* hostPointer; diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 1200cfdd2cb72d..a6fd9469558118 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,15 +16,20 @@ class Hip(CMakePackage): create portable applications for AMD and NVIDIA GPUs from single source code.""" - homepage = "https://github.com/ROCm-Developer-Tools/HIP" - git = "https://github.com/ROCm-Developer-Tools/HIP.git" - url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/HIP" + git = "https://github.com/ROCm/HIP.git" + url = "https://github.com/ROCm/HIP/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "haampie") libraries = ["libamdhip64"] + license("MIT") + version("master", branch="master") + version("6.0.0", sha256="0d575788e0b731124a8489a36652014a165b9ebab92d5456ec3c976e062f3a82") + version("5.7.1", sha256="eaa0e14a9ae45c58ed37863797b683a7778b3cbbf92f5b6529ec65fd61d61f3e") + version("5.7.0", sha256="cb61234eec7879fb7e20937659ad535b93a6e66fc8de0a543da8b7702474f2fc") version("5.6.1", sha256="4b3c4dfcf8595da0e1b8c3e8067b1ccebeaac337762ff098db14375fa8dd4487") version("5.6.0", sha256="a8237768c1ae70029d972376f8d279f4de18a1e6106fff6215d1e16847bc375e") version("5.5.1", sha256="1f5f6bb72d8d64335ccc8242ef2e2ea8efeb380cce2997f475b1ee77528d9fb4") @@ -166,6 +171,9 @@ class Hip(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) @@ -174,13 +182,22 @@ class Hip(CMakePackage): depends_on("rocminfo@" + ver, when="@" + ver) depends_on("roctracer-dev-api@" + ver, when="@" + ver) - for ver in ["5.4.0", "5.4.3", "5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in [ + "5.4.0", + "5.4.3", + "5.5.0", + "5.5.1", + "5.6.0", + "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", + ]: depends_on("hipify-clang", when="@" + ver) - - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) # hipcc likes to add `-lnuma` by default :( - # ref https://github.com/ROCm-Developer-Tools/HIP/pull/2202 + # ref https://github.com/ROCm/HIP/pull/2202 depends_on("numactl", when="@3.7.0:") # roc-obj-ls requirements @@ -207,9 +224,7 @@ class Hip(CMakePackage): ]: resource( name="hipamd", - url="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-{0}.tar.gz".format( - d_version - ), + url="https://github.com/ROCm/hipamd/archive/rocm-{0}.tar.gz".format(d_version), sha256=d_shasum, expand=True, destination="", @@ -236,7 +251,7 @@ class Hip(CMakePackage): ]: resource( name="opencl", - url="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz".format( + url="https://github.com/ROCm/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz".format( d_version ), sha256=d_shasum, @@ -264,9 +279,7 @@ class Hip(CMakePackage): ]: resource( name="rocclr", - url="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz".format( - d_version - ), + url="https://github.com/ROCm/ROCclr/archive/rocm-{0}.tar.gz".format(d_version), sha256=d_shasum, expand=True, destination="", @@ -275,14 +288,15 @@ class Hip(CMakePackage): ) # Add hip-clr sources thru the below for d_version, d_shasum in [ + ("6.0.0", "798b55b5b5fb90dd19db54f136d8d8e1da9ae1e408d5b12b896101d635f97e50"), + ("5.7.1", "c78490335233a11b4d8a5426ace7417c555f5e2325de10422df06c0f0f00f7eb"), + ("5.7.0", "bc2447cb6fd86dff6a333b04e77ce85755104d9011a14a044af53caf02449573"), ("5.6.1", "0b88af1e99643899d11b1c8cf8a3c46601051b328a5e0ffbd44ee88b7eb0db33"), ("5.6.0", "8dcd99110737a294f67a805639cf372890c8ca16c7603caaa793e71e84478fe4"), ]: resource( name="clr", - url="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-{0}.tar.gz".format( - d_version - ), + url="https://github.com/ROCm/clr/archive/refs/tags/rocm-{0}.tar.gz".format(d_version), sha256=d_shasum, expand=True, destination="", @@ -292,12 +306,15 @@ class Hip(CMakePackage): # Add hipcc sources thru the below for d_version, d_shasum in [ + ("6.0.0", "e9cfaaecaf0e6ed363946439197f340c115e8e1189f96dbd716cf20245c29255"), + ("5.7.1", "d47d27ef2b5de7f49cdfd8547832ac9b437a32e6fc6f0e9c1646f4b704c90aee"), + ("5.7.0", "9f839bf7226e5e26f3150f8ba6eca507ab9a668e68b207736301b3bb9040c973"), ("5.6.1", "5800fac92b841ef6f52acda78d9bf86f83970bec0fb848a6265d239bdb7eb51a"), ("5.6.0", "fdb7fdc9e4648376120330f034ee8353038d34c8a015f9eb0c208c56eeddd097"), ]: resource( name="hipcc", - url="https://github.com/ROCm-Developer-Tools/HIPCC/archive/refs/tags/rocm-{0}.tar.gz".format( + url="https://github.com/ROCm/HIPCC/archive/refs/tags/rocm-{0}.tar.gz".format( d_version ), sha256=d_shasum, @@ -308,12 +325,15 @@ class Hip(CMakePackage): ) # Add hiptests sources thru the below for d_version, d_shasum in [ + ("6.0.0", "e8f92a0f5d1f6093ca1fb24ff1b7140128900fcdc6e9f01f153d6907e5c2d807"), + ("5.7.1", "28fbdf49f405adfee903bc0f05a43ac392c55b34c514c3582dfb7d6d67e79985"), + ("5.7.0", "b1dae3cfc715e71dce92ac1da94265a9398944c76cee85ffab8f0c93665a48d6"), ("5.6.1", "5b3002ddfafda162329e4d9e6ac1200eeb48ff08e666b342aa8aeca30750f48b"), ("5.6.0", "8cf4509bf9c0747dab8ed8fec1365a9156792034b517207a0b2d63270429fd2e"), ]: resource( name="hip-tests", - url="https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-{0}.tar.gz".format( + url="https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-{0}.tar.gz".format( d_version ), sha256=d_shasum, @@ -355,10 +375,10 @@ class Hip(CMakePackage): ) patch("0013-remove-compiler-rt-linkage-for-host.5.3.0.patch", when="@5.3.0:5.4") - # See https://github.com/ROCm-Developer-Tools/HIP/pull/2141 + # See https://github.com/ROCm/HIP/pull/2141 patch("0002-Fix-detection-of-HIP_CLANG_ROOT.patch", when="@:3.9.0") - # See https://github.com/ROCm-Developer-Tools/HIP/pull/2218 + # See https://github.com/ROCm/HIP/pull/2218 patch("0003-Improve-compilation-without-git-repo.3.7.0.patch", when="@3.7.0:3.9.0") patch("0003-Improve-compilation-without-git-repo.3.10.0.patch", when="@3.10.0:4.0.0") patch("0003-Improve-compilation-without-git-repo.4.1.0.patch", when="@4.1.0") @@ -372,7 +392,7 @@ class Hip(CMakePackage): "_disabletests.4.5.0.patch", when="@4.5.0:4.5.3", ) - # See https://github.com/ROCm-Developer-Tools/HIP/pull/2219 + # See https://github.com/ROCm/HIP/pull/2219 patch("0004-Drop-clang-rt-builtins-linking-on-hip-host.3.7.0.patch", when="@3.7.0:3.9.0") patch("0004-Drop-clang-rt-builtins-linking-on-hip-host.3.10.0.patch", when="@3.10.0:4.1.0") @@ -387,13 +407,18 @@ class Hip(CMakePackage): patch("0014-hip-test-file-reorg-5.4.0.patch", when="@5.4.0:5.5") patch("0016-hip-sample-fix-hipMalloc-call.patch", when="@5.4.3:5.5") patch("0014-remove-compiler-rt-linkage-for-host.5.5.0.patch", when="@5.5") - patch("0014-remove-compiler-rt-linkage-for-host.5.6.0.patch", when="@5.6:") - patch("0015-reverting-operator-mixup-fix-for-slate.patch", when="@5.6:") - # See https://github.com/ROCm-Developer-Tools/HIP/pull/3206 + patch("0014-remove-compiler-rt-linkage-for-host.5.6.0.patch", when="@5.6.0:5.6") + patch("0014-Remove-compiler-rt-linkage-for-host-for-5.7.0.patch", when="@5.7.0:5.7") + patch("0014-remove-compiler-rt-linkage-for-host.6.0.patch", when="@6.0:") + patch("0015-reverting-operator-mixup-fix-for-slate.patch", when="@5.6:6.0") + patch("0017-Set-PARAMETERS_MIN_ALIGNMENT-to-the-native-alignment.patch", when="@5.7:6.0") + patch("0018-reverting-hipMemoryType-with-memoryType.patch", when="@6.0") + + # See https://github.com/ROCm/HIP/pull/3206 patch( - "https://github.com/ROCm-Developer-Tools/HIP/commit/50ee82f6bc4aad10908ce09198c9f7ebfb2a3561.patch?full_index=1", + "https://github.com/ROCm/HIP/commit/50ee82f6bc4aad10908ce09198c9f7ebfb2a3561.patch?full_index=1", sha256="c2ee21cdc55262c7c6ba65546b5ca5f65ea89730", - when="@5.2:", + when="@5.2:5.7", ) @property @@ -455,6 +480,9 @@ def get_paths(self): if self.spec.satisfies("@5.4:"): paths["hipify-clang"] = rocm_prefix + + if self.spec.satisfies("@5.7:"): + paths["hip-path"] = rocm_prefix else: paths = { "hip-path": self.spec.prefix, @@ -468,7 +496,6 @@ def get_paths(self): if self.spec.satisfies("@5.4:"): paths["hipify-clang"] = self.spec["hipify-clang"].prefix - if "@:3.8.0" in self.spec: paths["bitcode"] = paths["rocm-device-libs"].lib else: @@ -517,7 +544,7 @@ def set_variables(self, env): # This is a variable that does not exist in hipcc but was introduced # in a patch of ours since 3.5.0 to locate rocm_agent_enumerator: - # https://github.com/ROCm-Developer-Tools/HIP/pull/2138 + # https://github.com/ROCm/HIP/pull/2138 env.set("ROCMINFO_PATH", paths["rocminfo"]) # This one is used in hipcc to run `clang --hip-device-lib-path=...` @@ -532,7 +559,7 @@ def set_variables(self, env): # Used in comgr and seems necessary when using the JIT compiler, e.g. # hiprtcCreateProgram: - # https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/blob/rocm-4.0.0/lib/comgr/src/comgr-env.cpp + # https://github.com/ROCm/ROCm-CompilerSupport/blob/rocm-4.0.0/lib/comgr/src/comgr-env.cpp env.set("LLVM_PATH", paths["llvm-amdgpu"]) env.set("COMGR_PATH", paths["comgr"]) @@ -544,7 +571,7 @@ def set_variables(self, env): # and parsing of the /bin/.hipVersion file. Let's just set this # to the hip prefix directory for non-external builds so that the # bin/.hipVersion file can still be parsed. - # See also https://github.com/ROCm-Developer-Tools/HIP/issues/2223 + # See also https://github.com/ROCm/HIP/issues/2223 if "@3.8.0:" in self.spec: env.append_path( "HIPCC_COMPILE_FLAGS_APPEND", @@ -591,14 +618,26 @@ def patch(self): "hipamd/hip-config.cmake.in", string=True, ) - if self.spec.satisfies("@5.6: +rocm"): + if self.spec.satisfies("@5.6.0:5.6 +rocm"): filter_file( '"${ROCM_PATH}/llvm"', self.spec["llvm-amdgpu"].prefix, "clr/hipamd/hip-config.cmake.in", string=True, ) - + if self.spec.satisfies("@5.7: +rocm"): + filter_file( + '"${ROCM_PATH}/llvm"', + self.spec["llvm-amdgpu"].prefix, + "clr/hipamd/hip-config-amd.cmake", + string=True, + ) + filter_file( + '"${ROCM_PATH}/llvm"', + self.spec["llvm-amdgpu"].prefix, + "clr/hipamd/src/hiprtc/CMakeLists.txt", + string=True, + ) perl = self.spec["perl"].command kwargs = {"ignore_absent": False, "backup": False, "string": False} @@ -707,8 +746,17 @@ def cmake_args(self): args.append(self.define("HIPCC_BIN_DIR", self.stage.source_path + "/hipcc/bin")), args.append(self.define("CLR_BUILD_HIP", True)), args.append(self.define("CLR_BUILD_OCL", False)), + args.append(self.define("HIP_LLVM_ROOT", self.spec["llvm-amdgpu"].prefix)) return args + test_src_dir_old = "samples" + test_src_dir = "hip-tests/samples" + + @run_after("install") + def install_samples(self): + if self.spec.satisfies("@5.6.0:"): + install_tree(self.test_src_dir, self.spec.prefix.share.samples) + @run_after("install") def cache_test_sources(self): """Copy the tests source files after the package is installed to an @@ -716,16 +764,18 @@ def cache_test_sources(self): if self.spec.satisfies("@:5.1.0"): return elif self.spec.satisfies("@5.1:5.5"): - self.test_src_dir = "samples" + self.cache_extra_test_sources([self.test_src_dir_old]) elif self.spec.satisfies("@5.6:"): - self.test_src_dir = "hip-tests/samples" - self.cache_extra_test_sources([self.test_src_dir]) + self.cache_extra_test_sources([self.test_src_dir]) def test_samples(self): # configure, build and run all hip samples if self.spec.satisfies("@:5.1.0"): raise SkipTest("Test is only available for specs after version 5.1.0") - test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir) + elif self.spec.satisfies("@5.1:5.5"): + test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir_old) + elif self.spec.satisfies("@5.6:"): + test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir) prefixes = ";".join( [ self.spec["hip"].prefix, diff --git a/var/spack/repos/builtin/packages/hipace/package.py b/var/spack/repos/builtin/packages/hipace/package.py index 044d4ecfa2ad40..70ca72c6215a9c 100644 --- a/var/spack/repos/builtin/packages/hipace/package.py +++ b/var/spack/repos/builtin/packages/hipace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Hipace(CMakePackage): maintainers("ax3l", "MaxThevenet", "SeverinDiederichs") + license("BSD-3-Clause-LBNL") + version("develop", branch="development") version("23.07", sha256="2b1f61c91d2543d7ee360eba3630c864107e29f7bcfd0221451beea88f414f21") version("23.05", sha256="33a15cfeada3ca16c2a3af1538caa7ff731df13b48b884045a0fe7974382fcd1") diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index b0261bd5db545c..46b02ad3529075 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,16 +12,21 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): """hipBLAS is a BLAS marshalling library, with multiple supported backends""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS" - git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git" - url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipBLAS" + git = "https://github.com/ROCm/hipBLAS.git" + url = "https://github.com/ROCm/hipBLAS/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie") libraries = ["libhipblas"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") + version("6.0.0", sha256="8fbd0c244fe82eded866e06d2399b1d91ab5d43d2ebcb73382c7ce1ae48d9cb3") + version("5.7.1", sha256="794e9298f48ffbe3bd1c1ab87a5c2c2b953713500155fdec9ef8cbb11f81fc8a") + version("5.7.0", sha256="8c6cd2ffa4ce6ab03e05feffe074685b5525610870aebe9d78f817b3037f33a4") version("5.6.1", sha256="f9da82fbefc68b84081ea0ed0139b91d2a540357fcf505c7f1d57eab01eb327c") version("5.6.0", sha256="9453a31324e10ba528f8f4755d2c270d0ed9baa33e980d8f8383204d8e28a563") version("5.5.1", sha256="5920c9a9c83cf7e2b42d1f99f5d5091cac7f6c0a040a737e869e57b92d7045a9") @@ -132,14 +137,14 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): patch("link-clients-blas.patch", when="@4.3.0:4.3.2") patch("link-clients-blas-4.5.0.patch", when="@4.5.0:4.5.2") patch("hipblas-link-clients-blas-5.0.0.patch", when="@5.0.0:5.0.2") + patch("remove-hipblas-clients-file-installation.patch", when="@5.5:5.7.1") + patch("remove-hipblas-clients-file-installation-6.0.patch", when="@6.0:") - def check(self): - exe = join_path(self.build_directory, "clients", "staging", "hipblas-test") - self.run_test(exe, options=["--gtest_filter=-*known_bug*"]) - - depends_on("rocm-cmake@5.2.0:", type="build", when="@5.2.0:") + depends_on("rocm-cmake@5.2.0:", type="build", when="@5.2.0:5.7") depends_on("rocm-cmake@4.5.0:", type="build", when="@4.5.0:") depends_on("rocm-cmake@3.5.0:", type="build") + for ver in ["6.0.0"]: + depends_on("rocm-cmake@" + ver, when="+rocm @" + ver) depends_on("hip +cuda", when="+cuda") @@ -171,12 +176,14 @@ def check(self): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", "develop", ]: depends_on("rocsolver@" + ver, when="+rocm @" + ver) depends_on("rocblas@" + ver, when="+rocm @" + ver) - for tgt in ROCmPackage.amdgpu_targets: depends_on( "rocblas amdgpu_target={0}".format(tgt), when="+rocm amdgpu_target={0}".format(tgt) @@ -222,3 +229,9 @@ def cmake_args(self): args.append("-DCMAKE_INSTALL_LIBDIR=lib") return args + + @run_after("build") + @on_package_attributes(run_tests=True) + def check_build(self): + exe = Executable(join_path(self.build_directory, "clients", "staging", "hipblas-test")) + exe("--gtest_filter=-*known_bug*") diff --git a/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation-6.0.patch b/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation-6.0.patch new file mode 100644 index 00000000000000..ca6fa8f4131807 --- /dev/null +++ b/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation-6.0.patch @@ -0,0 +1,32 @@ +From 120af1b2483868ebdc2ee5f137418d23c14178ad Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Wed, 10 Jan 2024 04:28:15 +0000 +Subject: [PATCH] Remove hipblas clients file installation + +--- + clients/CMakeLists.txt | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt +index 8206ad7..6a59808 100644 +--- a/clients/CMakeLists.txt ++++ b/clients/CMakeLists.txt +@@ -135,15 +135,3 @@ add_custom_command( OUTPUT "${HIPBLAS_GENTEST}" + + add_custom_target( hipblas-common DEPENDS "${HIPBLAS_COMMON}" "${HIPBLAS_TEMPLATE}" "${HIPBLAS_SMOKE}" "${HIPBLAS_GENTEST}" ) + +-if( BUILD_CLIENTS_TESTS OR BUILD_CLIENTS_BENCHMARKS ) +- rocm_install( +- FILES ${HIPBLAS_COMMON} ${HIPBLAS_TEMPLATE} ${HIPBLAS_SMOKE} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" +- COMPONENT clients-common +- ) +- rocm_install( +- PROGRAMS ${HIPBLAS_GENTEST} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" +- COMPONENT clients-common +- ) +-endif() +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation.patch b/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation.patch new file mode 100644 index 00000000000000..a1adf8930675be --- /dev/null +++ b/var/spack/repos/builtin/packages/hipblas/remove-hipblas-clients-file-installation.patch @@ -0,0 +1,18 @@ +diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt +index 2ae1535..c956e00 100644 +--- a/clients/CMakeLists.txt ++++ b/clients/CMakeLists.txt +@@ -134,13 +134,3 @@ add_custom_command( OUTPUT "${HIPBLAS_GENTEST}" + + add_custom_target( hipblas-common DEPENDS "${HIPBLAS_COMMON}" "${HIPBLAS_TEMPLATE}" "${HIPBLAS_SMOKE}" "${HIPBLAS_GENTEST}" ) + +-rocm_install( +- FILES ${HIPBLAS_COMMON} ${HIPBLAS_TEMPLATE} ${HIPBLAS_SMOKE} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" +- COMPONENT clients-common +-) +-rocm_install( +- PROGRAMS ${HIPBLAS_GENTEST} +- DESTINATION "${CMAKE_INSTALL_BINDIR}" +- COMPONENT clients-common +-) diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index cb878d18233df7..34e16cd4bc81b9 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,12 +9,17 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage): """Radeon Open Compute Parallel Primitives Library""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB" - git = "https://github.com/ROCmSoftwarePlatform/hipCUB.git" - url = "https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipCUB" + git = "https://github.com/ROCm/hipCUB.git" + url = "https://github.com/ROCm/hipCUB/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("BSD-3-Clause") + maintainers("srekolam", "renjithravindrankannath") + version("6.0.0", sha256="8d9f6e1e3f8433a2ceae1b0efd6727c21383980077e264725d00d5fee165bd30") + version("5.7.1", sha256="9b23a58408bc4c549d3c754196cb3e2c1a50e177ab0a286101cbea2f7f173945") + version("5.7.0", sha256="899356867f662d9a6f3870bb4a496f605a3143c6ad4d1fa9e9faead68fa8d13b") version("5.6.1", sha256="4b9479daa40424c9ddbc14ce967aa170680f8ca1ed01a514e6e30ccfa22552ce") version("5.6.0", sha256="5e74ddbf833f39836bf9ec6c6750348c7386a85ca67aaf9bb54d16c9e1959031") version("5.5.1", sha256="ad83f3f1ed85ead9e3012906957c125a896168be913f6fb6af298228fc571480") @@ -151,6 +156,9 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocprim@" + ver, when="+rocm @" + ver) depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/hipfft/001-remove-submodule-and-sync-shared-files-from-rocFFT.patch b/var/spack/repos/builtin/packages/hipfft/001-remove-submodule-and-sync-shared-files-from-rocFFT.patch new file mode 100644 index 00000000000000..537794d3cca8aa --- /dev/null +++ b/var/spack/repos/builtin/packages/hipfft/001-remove-submodule-and-sync-shared-files-from-rocFFT.patch @@ -0,0 +1,11431 @@ +From 27ae15a459f45f1acfcb1a9b1c8d491d9f731fd4 Mon Sep 17 00:00:00 2001 +From: Steve Leung +Date: Thu, 4 Jan 2024 16:36:08 -0700 +Subject: [PATCH] remove submodule and sync shared files from rocFFT, update + CHANGELOG.md + +--- + clients/CMakeLists.txt | 15 - + clients/bench/CMakeLists.txt | 4 +- + clients/bench/bench.cpp | 2 +- + clients/hipfft_params.h | 2 +- + clients/tests/CMakeLists.txt | 11 +- + clients/tests/accuracy_test_1D.cpp | 8 +- + clients/tests/accuracy_test_2D.cpp | 8 +- + clients/tests/accuracy_test_3D.cpp | 8 +- + clients/tests/accuracy_test_callback.cpp | 2 +- + clients/tests/gtest_main.cpp | 6 +- + clients/tests/hipfft_accuracy_test.cpp | 11 +- + clients/tests/hipfft_accuracy_test.h | 2 +- + clients/tests/multi_device_test.cpp | 2 +- + cmake/dependencies.cmake | 3 - + library/src/amd_detail/hipfft.cpp | 8 +- + shared/accuracy_test.h | 1949 +++++++++++++ + shared/arithmetic.h | 61 + + shared/array_predicate.h | 47 + + shared/array_validator.cpp | 549 ++++ + shared/array_validator.h | 31 + + shared/concurrency.h | 41 + + shared/data_gen_device.h | 1303 +++++++++ + shared/data_gen_host.h | 881 ++++++ + shared/device_properties.h | 74 + + shared/enum_to_string.h | 81 + + shared/environment.h | 97 + + shared/fft_params.h | 3274 ++++++++++++++++++++++ + shared/fftw_transform.h | 493 ++++ + shared/gpubuf.h | 134 + + shared/hip_object_wrapper.h | 86 + + shared/hostbuf.h | 158 ++ + shared/increment.h | 100 + + shared/precision_type.h | 70 + + shared/printbuffer.h | 108 + + shared/ptrdiff.h | 40 + + shared/rocfft_accuracy_test.h | 29 + + shared/rocfft_against_fftw.h | 231 ++ + shared/rocfft_complex.h | 346 +++ + shared/rocfft_hip.h | 52 + + shared/rocfft_params.h | 585 ++++ + shared/test_params.h | 51 + + shared/work_queue.h | 49 + + 46 files changed, 10966 insertions(+), 66 deletions(-) + create mode 100644 shared/accuracy_test.h + create mode 100644 shared/arithmetic.h + create mode 100644 shared/array_predicate.h + create mode 100644 shared/array_validator.cpp + create mode 100644 shared/array_validator.h + create mode 100644 shared/concurrency.h + create mode 100644 shared/data_gen_device.h + create mode 100644 shared/data_gen_host.h + create mode 100644 shared/device_properties.h + create mode 100644 shared/enum_to_string.h + create mode 100644 shared/environment.h + create mode 100644 shared/fft_params.h + create mode 100644 shared/fftw_transform.h + create mode 100644 shared/gpubuf.h + create mode 100644 shared/hip_object_wrapper.h + create mode 100644 shared/hostbuf.h + create mode 100644 shared/increment.h + create mode 100644 shared/precision_type.h + create mode 100644 shared/printbuffer.h + create mode 100644 shared/ptrdiff.h + create mode 100644 shared/rocfft_accuracy_test.h + create mode 100644 shared/rocfft_against_fftw.h + create mode 100644 shared/rocfft_complex.h + create mode 100644 shared/rocfft_hip.h + create mode 100644 shared/rocfft_params.h + create mode 100644 shared/test_params.h + create mode 100644 shared/work_queue.h + +diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt +index 1db0d9c..b99a9e5 100644 +--- a/clients/CMakeLists.txt ++++ b/clients/CMakeLists.txt +@@ -65,21 +65,6 @@ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" AND NOT CMAKE_CXX_COMPILER_ID STR + endif() + + +-if( GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git" ) +- message(STATUS "rocFFT submodule update") +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/clients/rocFFT +- RESULT_VARIABLE GIT_SUBMOD_RESULT) +- if( NOT GIT_SUBMOD_RESULT EQUAL "0" ) +- message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules manually.") +- endif( ) +-endif( ) +- +-if( NOT EXISTS "${CMAKE_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt" ) +- message(FATAL_ERROR "The rocFFT submodule is not present! Please update git submodules and try again. ${CMAKE_CURRENT_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt") +-endif( ) +- +- + # This option only works for make/nmake and the ninja generators, but no reason it shouldn't be on + # all the time + # This tells cmake to create a compile_commands.json file that can be used with clang tooling or vim +diff --git a/clients/bench/CMakeLists.txt b/clients/bench/CMakeLists.txt +index b5cef9b..ccb8c29 100644 +--- a/clients/bench/CMakeLists.txt ++++ b/clients/bench/CMakeLists.txt +@@ -26,8 +26,8 @@ find_package( Boost COMPONENTS program_options REQUIRED) + set( Boost_USE_STATIC_LIBS OFF ) + + +-set( hipfft_bench_source bench.cpp ../rocFFT/shared/array_validator.cpp ) +-set( hipfft_bench_includes bench.h ../rocFFT/shared/array_validator.h ) ++set( hipfft_bench_source bench.cpp ../../shared/array_validator.cpp ) ++set( hipfft_bench_includes bench.h ../../shared/array_validator.h ) + + add_executable( hipfft-bench ${hipfft_bench_source} ${hipfft_bench_includes} ) + +diff --git a/clients/bench/bench.cpp b/clients/bench/bench.cpp +index 894769c..a906879 100644 +--- a/clients/bench/bench.cpp ++++ b/clients/bench/bench.cpp +@@ -29,7 +29,7 @@ + #include + namespace po = boost::program_options; + +-#include "../rocFFT/shared/gpubuf.h" ++#include "../../shared/gpubuf.h" + + int main(int argc, char* argv[]) + { +diff --git a/clients/hipfft_params.h b/clients/hipfft_params.h +index b8b58ac..75d9db9 100644 +--- a/clients/hipfft_params.h ++++ b/clients/hipfft_params.h +@@ -23,9 +23,9 @@ + + #include + ++#include "../shared/fft_params.h" + #include "hipfft/hipfft.h" + #include "hipfft/hipfftXt.h" +-#include "rocFFT/shared/fft_params.h" + + inline fft_status fft_status_from_hipfftparams(const hipfftResult_t val) + { +diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt +index 9742a45..2d1aac0 100644 +--- a/clients/tests/CMakeLists.txt ++++ b/clients/tests/CMakeLists.txt +@@ -37,14 +37,7 @@ set( hipfft-test_source + accuracy_test_3D.cpp + accuracy_test_callback.cpp + multi_device_test.cpp +- ../rocFFT/shared/array_validator.cpp +- ) +- +-set( hipfft-test_includes +- ../rocFFT/clients/tests/fftw_transform.h +- ../rocFFT/clients/tests/rocfft_against_fftw.h +- ../rocFFT/clients/tests/misc/include/test_exception.h +- ../rocFFT/shared/array_validator.h ++ ../../shared/array_validator.cpp + ) + + add_executable( hipfft-test ${hipfft-test_source} ${hipfft-test_includes} ) +@@ -56,8 +49,6 @@ target_include_directories( + $ + $ + $ +- $ +- $ + ) + + +diff --git a/clients/tests/accuracy_test_1D.cpp b/clients/tests/accuracy_test_1D.cpp +index 27e849d..57d846a 100644 +--- a/clients/tests/accuracy_test_1D.cpp ++++ b/clients/tests/accuracy_test_1D.cpp +@@ -23,11 +23,11 @@ + #include + #include + +-#include "../rocFFT/shared/fft_params.h" ++#include "../../shared/fft_params.h" + +-#include "accuracy_test.h" +-#include "fftw_transform.h" +-#include "rocfft_against_fftw.h" ++#include "../../shared/accuracy_test.h" ++#include "../../shared/fftw_transform.h" ++#include "../../shared/rocfft_against_fftw.h" + + using ::testing::ValuesIn; + +diff --git a/clients/tests/accuracy_test_2D.cpp b/clients/tests/accuracy_test_2D.cpp +index 1674593..6f618c0 100644 +--- a/clients/tests/accuracy_test_2D.cpp ++++ b/clients/tests/accuracy_test_2D.cpp +@@ -23,11 +23,11 @@ + #include + #include + +-#include "../rocFFT/shared/fft_params.h" ++#include "../../shared/fft_params.h" + +-#include "accuracy_test.h" +-#include "fftw_transform.h" +-#include "rocfft_against_fftw.h" ++#include "../../shared/accuracy_test.h" ++#include "../../shared/fftw_transform.h" ++#include "../../shared/rocfft_against_fftw.h" + + using ::testing::ValuesIn; + +diff --git a/clients/tests/accuracy_test_3D.cpp b/clients/tests/accuracy_test_3D.cpp +index a87476a..941ec24 100644 +--- a/clients/tests/accuracy_test_3D.cpp ++++ b/clients/tests/accuracy_test_3D.cpp +@@ -23,11 +23,11 @@ + #include + #include + +-#include "../rocFFT/shared/fft_params.h" ++#include "../../shared/fft_params.h" + +-#include "accuracy_test.h" +-#include "fftw_transform.h" +-#include "rocfft_against_fftw.h" ++#include "../../shared/accuracy_test.h" ++#include "../../shared/fftw_transform.h" ++#include "../../shared/rocfft_against_fftw.h" + + using ::testing::ValuesIn; + +diff --git a/clients/tests/accuracy_test_callback.cpp b/clients/tests/accuracy_test_callback.cpp +index 4782830..b5cc4a7 100644 +--- a/clients/tests/accuracy_test_callback.cpp ++++ b/clients/tests/accuracy_test_callback.cpp +@@ -18,7 +18,7 @@ + // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + // THE SOFTWARE. + +-#include "accuracy_test.h" ++#include "../../shared/accuracy_test.h" + + std::vector> callback_sizes = { + // some single kernel sizes +diff --git a/clients/tests/gtest_main.cpp b/clients/tests/gtest_main.cpp +index 1f0ae83..2f7674e 100644 +--- a/clients/tests/gtest_main.cpp ++++ b/clients/tests/gtest_main.cpp +@@ -30,10 +30,10 @@ + #include + #include + ++#include "../../shared/concurrency.h" ++#include "../../shared/environment.h" ++#include "../../shared/work_queue.h" + #include "../hipfft_params.h" +-#include "../rocFFT/shared/concurrency.h" +-#include "../rocFFT/shared/environment.h" +-#include "../rocFFT/shared/work_queue.h" + #include "hipfft/hipfft.h" + #include "hipfft_accuracy_test.h" + #include "hipfft_test_params.h" +diff --git a/clients/tests/hipfft_accuracy_test.cpp b/clients/tests/hipfft_accuracy_test.cpp +index 2abaf74..609239a 100644 +--- a/clients/tests/hipfft_accuracy_test.cpp ++++ b/clients/tests/hipfft_accuracy_test.cpp +@@ -29,11 +29,12 @@ + #include "hipfft/hipfft.h" + + #include "../hipfft_params.h" +-#include "../rocFFT/clients/tests/fftw_transform.h" +-#include "../rocFFT/clients/tests/rocfft_accuracy_test.h" +-#include "../rocFFT/clients/tests/rocfft_against_fftw.h" +-#include "../rocFFT/shared/gpubuf.h" +-#include "../rocFFT/shared/rocfft_complex.h" ++ ++#include "../../shared/accuracy_test.h" ++#include "../../shared/fftw_transform.h" ++#include "../../shared/gpubuf.h" ++#include "../../shared/rocfft_against_fftw.h" ++#include "../../shared/rocfft_complex.h" + + void fft_vs_reference(hipfft_params& params, bool round_trip) + { +diff --git a/clients/tests/hipfft_accuracy_test.h b/clients/tests/hipfft_accuracy_test.h +index 0491bd9..181150e 100644 +--- a/clients/tests/hipfft_accuracy_test.h ++++ b/clients/tests/hipfft_accuracy_test.h +@@ -23,8 +23,8 @@ + #ifndef ROCFFT_ACCURACY_TEST + #define ROCFFT_ACCURACY_TEST + ++#include "../../shared/accuracy_test.h" + #include "../hipfft_params.h" +-#include "../rocFFT/clients/tests/accuracy_test.h" + + void fft_vs_reference(hipfft_params& params, bool round_trip = false); + +diff --git a/clients/tests/multi_device_test.cpp b/clients/tests/multi_device_test.cpp +index b3dc4c9..3274b80 100644 +--- a/clients/tests/multi_device_test.cpp ++++ b/clients/tests/multi_device_test.cpp +@@ -18,7 +18,7 @@ + // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + // THE SOFTWARE. + +-#include "accuracy_test.h" ++#include "../../shared/accuracy_test.h" + #include + #include + +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 5810e37..bdbf689 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -21,9 +21,6 @@ + # + # ############################################################################# + +-# Git +-find_package(Git REQUIRED) +- + # HIP + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +diff --git a/library/src/amd_detail/hipfft.cpp b/library/src/amd_detail/hipfft.cpp +index c2f7036..3d4f61f 100644 +--- a/library/src/amd_detail/hipfft.cpp ++++ b/library/src/amd_detail/hipfft.cpp +@@ -27,10 +27,10 @@ + #include + #include + +-#include "../../../clients/rocFFT/shared/arithmetic.h" +-#include "../../../clients/rocFFT/shared/gpubuf.h" +-#include "../../../clients/rocFFT/shared/ptrdiff.h" +-#include "../../../clients/rocFFT/shared/rocfft_hip.h" ++#include "../../../shared/arithmetic.h" ++#include "../../../shared/gpubuf.h" ++#include "../../../shared/ptrdiff.h" ++#include "../../../shared/rocfft_hip.h" + + #define ROC_FFT_CHECK_ALLOC_FAILED(ret) \ + { \ +diff --git a/shared/accuracy_test.h b/shared/accuracy_test.h +new file mode 100644 +index 0000000..362a7c1 +--- /dev/null ++++ b/shared/accuracy_test.h +@@ -0,0 +1,1949 @@ ++// Copyright (C) 2020 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++ ++#ifndef ACCURACY_TEST ++#define ACCURACY_TEST ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "enum_to_string.h" ++#include "fft_params.h" ++#include "fftw_transform.h" ++#include "gpubuf.h" ++#include "rocfft_against_fftw.h" ++#include "test_params.h" ++ ++extern int verbose; ++extern size_t ramgb; ++extern bool fftw_compare; ++ ++static const size_t ONE_GiB = 1 << 30; ++ ++inline size_t bytes_to_GiB(const size_t bytes) ++{ ++ return bytes == 0 ? 0 : (bytes - 1 + ONE_GiB) / ONE_GiB; ++} ++ ++typedef std::tuple ++ type_place_io_t; ++ ++// Remember the results of the last FFT we computed with FFTW. Tests ++// are ordered so that later cases can often reuse this result. ++struct last_cpu_fft_cache ++{ ++ // keys to the cache ++ std::vector length; ++ size_t nbatch = 0; ++ fft_transform_type transform_type = fft_transform_type_complex_forward; ++ bool run_callbacks = false; ++ fft_precision precision = fft_precision_single; ++ ++ // FFTW input/output ++ std::vector cpu_input; ++ std::vector cpu_output; ++}; ++extern last_cpu_fft_cache last_cpu_fft_data; ++ ++struct system_memory ++{ ++ size_t total_bytes = 0; ++ size_t free_bytes = 0; ++}; ++extern system_memory start_memory; ++ ++system_memory get_system_memory(); ++ ++// Estimate the amount of host memory needed for buffers. ++inline size_t needed_ram_buffers(const fft_params& params, const int verbose) ++{ ++ // This calculation is assuming contiguous data but noncontiguous buffers ++ // are assumed to require a close enough amount of space for the purposes ++ // of this estimate. ++ ++ size_t needed_ram = 6 ++ * std::accumulate(params.length.begin(), ++ params.length.end(), ++ static_cast(1), ++ std::multiplies()); ++ ++ // Account for precision and data type: ++ if(params.transform_type != fft_transform_type_real_forward ++ && params.transform_type != fft_transform_type_real_inverse) ++ { ++ needed_ram *= 2; ++ } ++ switch(params.precision) ++ { ++ case fft_precision_half: ++ needed_ram *= 2; ++ break; ++ case fft_precision_single: ++ needed_ram *= 4; ++ break; ++ case fft_precision_double: ++ needed_ram *= 8; ++ break; ++ } ++ ++ needed_ram *= params.nbatch; ++ ++ if(verbose) ++ { ++ std::cout << "required host memory for buffers (GiB): " << bytes_to_GiB(needed_ram) << "\n"; ++ } ++ ++ return needed_ram; ++} ++ ++template ++bool fftw_plan_uses_bluestein(const typename fftw_trait::fftw_plan_type& cpu_plan) ++{ ++#ifdef FFTW_HAVE_SPRINT_PLAN ++ char* print_plan_c_str = fftw_sprint_plan(cpu_plan); ++ std::string print_plan(print_plan_c_str); ++ free(print_plan_c_str); ++ return print_plan.find("bluestein") != std::string::npos; ++#else ++ // assume worst case (bluestein is always used) ++ return true; ++#endif ++} ++ ++// Estimate the amount of host memory needed for fftw. ++template ++inline size_t needed_ram_fftw(const fft_params& contiguous_params, ++ const typename fftw_trait::fftw_plan_type& cpu_plan, ++ const int verbose) ++{ ++ size_t total_length = std::accumulate(contiguous_params.length.begin(), ++ contiguous_params.length.end(), ++ static_cast(1), ++ std::multiplies()); ++ size_t needed_ram = 0; ++ // Detect Bluestein in plan ++ if(fftw_plan_uses_bluestein(cpu_plan)) ++ { ++ for(size_t dim : contiguous_params.length) ++ { ++ unsigned int needed_ram_dim = dim; ++ ++ // Next-plus-one-power-of-two multiplied any other lengths ++ needed_ram_dim--; ++ ++ needed_ram_dim |= needed_ram_dim >> 2; ++ needed_ram_dim |= needed_ram_dim >> 4; ++ needed_ram_dim |= needed_ram_dim >> 8; ++ needed_ram_dim |= needed_ram_dim >> 16; ++ ++ needed_ram_dim++; ++ ++ needed_ram_dim *= 2 * (total_length / dim); ++ ++ if(needed_ram_dim > needed_ram) ++ { ++ needed_ram = needed_ram_dim; ++ } ++ } ++ } ++ ++ // Account for precision and data type: ++ if(contiguous_params.transform_type != fft_transform_type_real_forward ++ && contiguous_params.transform_type != fft_transform_type_real_inverse) ++ { ++ needed_ram *= 2; ++ } ++ switch(contiguous_params.precision) ++ { ++ case fft_precision_half: ++ needed_ram *= 2; ++ break; ++ case fft_precision_single: ++ needed_ram *= 4; ++ break; ++ case fft_precision_double: ++ needed_ram *= 8; ++ break; ++ } ++ ++ needed_ram *= contiguous_params.nbatch; ++ ++ if(verbose) ++ { ++ std::cout << "required host memory for FFTW (GiB): " << bytes_to_GiB(needed_ram) << "\n"; ++ } ++ ++ return needed_ram; ++} ++ ++// Base gtest class for comparison with FFTW. ++class accuracy_test : public ::testing::TestWithParam ++{ ++protected: ++ void SetUp() override {} ++ void TearDown() override {} ++ ++public: ++ static std::string TestName(const testing::TestParamInfo& info) ++ { ++ return info.param.token(); ++ } ++}; ++ ++const static std::vector batch_range = {2, 1}; ++ ++const static std::vector precision_range_full ++ = {fft_precision_double, fft_precision_single, fft_precision_half}; ++const static std::vector precision_range_sp_dp ++ = {fft_precision_double, fft_precision_single}; ++ ++const static std::vector place_range ++ = {fft_placement_inplace, fft_placement_notinplace}; ++const static std::vector trans_type_range ++ = {fft_transform_type_complex_forward, fft_transform_type_real_forward}; ++const static std::vector trans_type_range_complex ++ = {fft_transform_type_complex_forward}; ++const static std::vector trans_type_range_real ++ = {fft_transform_type_real_forward}; ++ ++// Given a vector of vector of lengths, generate all unique permutations. ++// Add an optional vector of ad-hoc lengths to the result. ++inline std::vector> ++ generate_lengths(const std::vector>& inlengths) ++{ ++ std::vector> output; ++ if(inlengths.size() == 0) ++ { ++ return output; ++ } ++ const size_t dim = inlengths.size(); ++ std::vector looplength(dim); ++ for(unsigned int i = 0; i < dim; ++i) ++ { ++ looplength[i] = inlengths[i].size(); ++ } ++ for(unsigned int idx = 0; idx < inlengths.size(); ++idx) ++ { ++ std::vector index(dim); ++ do ++ { ++ std::vector length(dim); ++ for(unsigned int i = 0; i < dim; ++i) ++ { ++ length[i] = inlengths[i][index[i]]; ++ } ++ output.push_back(length); ++ } while(increment_rowmajor(index, looplength)); ++ } ++ // uniquify the result ++ std::sort(output.begin(), output.end()); ++ output.erase(std::unique(output.begin(), output.end()), output.end()); ++ return output; ++} ++ ++// Return the valid rocFFT input and output types for a given transform type. ++inline std::vector> ++ iotypes(const fft_transform_type transformType, ++ const fft_result_placement place, ++ const bool planar = true) ++{ ++ std::vector> iotypes; ++ switch(transformType) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ iotypes.push_back(std::make_pair( ++ fft_array_type_complex_interleaved, fft_array_type_complex_interleaved)); ++ if(planar) ++ { ++ iotypes.push_back(std::make_pair( ++ fft_array_type_complex_planar, fft_array_type_complex_planar)); ++ if(place == fft_placement_notinplace) ++ { ++ iotypes.push_back(std::make_pair( ++ fft_array_type_complex_planar, fft_array_type_complex_interleaved)); ++ iotypes.push_back(std::make_pair( ++ fft_array_type_complex_interleaved, fft_array_type_complex_planar)); ++ } ++ } ++ break; ++ case fft_transform_type_real_forward: ++ iotypes.push_back(std::make_pair( ++ fft_array_type_real, fft_array_type_hermitian_interleaved)); ++ if(planar && place == fft_placement_notinplace) ++ { ++ iotypes.push_back(std::make_pair( ++ fft_array_type_real, fft_array_type_hermitian_planar)); ++ } ++ break; ++ case fft_transform_type_real_inverse: ++ iotypes.push_back(std::make_pair( ++ fft_array_type_hermitian_interleaved, fft_array_type_real)); ++ if(planar && place == fft_placement_notinplace) ++ { ++ iotypes.push_back(std::make_pair( ++ fft_array_type_hermitian_planar, fft_array_type_real)); ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ return iotypes; ++} ++ ++// Generate all combinations of input/output types, from combinations of transform and placement ++// types. ++static std::vector ++ generate_types(fft_transform_type transform_type, ++ const std::vector& place_range, ++ const bool planar) ++{ ++ std::vector ret; ++ for(auto place : place_range) ++ { ++ for(auto iotype : iotypes(transform_type, place, planar)) ++ { ++ ret.push_back(std::make_tuple(transform_type, place, iotype.first, iotype.second)); ++ } ++ } ++ return ret; ++} ++ ++struct stride_generator ++{ ++ struct stride_dist ++ { ++ stride_dist(const std::vector& s, size_t d) ++ : stride(s) ++ , dist(d) ++ { ++ } ++ std::vector stride; ++ size_t dist; ++ }; ++ ++ // NOTE: allow for this ctor to be implicit, so it's less typing for a test writer ++ // ++ // cppcheck-suppress noExplicitConstructor ++ stride_generator(const std::vector>& stride_list_in) ++ : stride_list(stride_list_in) ++ { ++ } ++ virtual std::vector generate(const std::vector& lengths, ++ size_t batch) const ++ { ++ std::vector ret; ++ for(const auto& s : stride_list) ++ ret.emplace_back(s, 0); ++ return ret; ++ } ++ std::vector> stride_list; ++}; ++ ++// Generate strides such that batch is essentially the innermost dimension ++// e.g. given a batch-2 4x3x2 transform which logically looks like: ++// ++// batch0: ++// A B A B ++// A B A B ++// A B A B ++// ++// A B A B ++// A B A B ++// A B A B ++// ++// batch1: ++// A B A B ++// A B A B ++// A B A B ++// ++// A B A B ++// A B A B ++// A B A B ++// ++// we instead do stride-2 4x3x2 transform where first batch is the ++// A's and second batch is the B's. ++struct stride_generator_3D_inner_batch : public stride_generator ++{ ++ explicit stride_generator_3D_inner_batch(const std::vector>& stride_list_in) ++ : stride_generator(stride_list_in) ++ { ++ } ++ std::vector generate(const std::vector& lengths, ++ size_t batch) const override ++ { ++ std::vector ret = stride_generator::generate(lengths, batch); ++ std::vector strides{lengths[1] * lengths[2] * batch, lengths[2] * batch, batch}; ++ ret.emplace_back(strides, 1); ++ return ret; ++ } ++}; ++ ++// Create an array of parameters to pass to gtest. Base generator ++// that allows choosing transform type. ++inline auto param_generator_base(const std::vector& type_range, ++ const std::vector>& v_lengths, ++ const std::vector& precision_range, ++ const std::vector& batch_range, ++ decltype(generate_types) types_generator, ++ const stride_generator& istride, ++ const stride_generator& ostride, ++ const std::vector>& ioffset_range, ++ const std::vector>& ooffset_range, ++ const std::vector& place_range, ++ const bool planar = true, ++ const bool run_callbacks = false) ++{ ++ ++ std::vector params; ++ ++ // For any length, we compute double-precision CPU reference ++ // for largest batch size first and reuse for smaller batch ++ // sizes, then convert to single-precision. ++ ++ for(auto& transform_type : type_range) ++ { ++ for(const auto& lengths : v_lengths) ++ { ++ // try to ensure that we are given literal lengths, not ++ // something to be passed to generate_lengths ++ if(lengths.empty() || lengths.size() > 3) ++ { ++ continue; ++ } ++ { ++ for(const auto precision : precision_range) ++ { ++ for(const auto batch : batch_range) ++ { ++ for(const auto& types : ++ types_generator(transform_type, place_range, planar)) ++ { ++ for(const auto& istride_dist : istride.generate(lengths, batch)) ++ { ++ for(const auto& ostride_dist : ostride.generate(lengths, batch)) ++ { ++ for(const auto& ioffset : ioffset_range) ++ { ++ for(const auto& ooffset : ooffset_range) ++ { ++ fft_params param; ++ ++ param.length = lengths; ++ param.istride = istride_dist.stride; ++ param.ostride = ostride_dist.stride; ++ param.nbatch = batch; ++ param.precision = precision; ++ param.transform_type = std::get<0>(types); ++ param.placement = std::get<1>(types); ++ param.idist = istride_dist.dist; ++ param.odist = ostride_dist.dist; ++ param.itype = std::get<2>(types); ++ param.otype = std::get<3>(types); ++ param.ioffset = ioffset; ++ param.ooffset = ooffset; ++ ++ if(run_callbacks) ++ { ++ // add a test if both input and output support callbacks ++ if(param.itype != fft_array_type_complex_planar ++ && param.itype != fft_array_type_hermitian_planar ++ && param.otype != fft_array_type_complex_planar ++ && param.otype ++ != fft_array_type_hermitian_planar) ++ { ++ param.run_callbacks = true; ++ } ++ else ++ { ++ continue; ++ } ++ } ++ param.validate(); ++ ++ // Keeping the random number generator here ++ // allows one to run the same tests for a given ++ // random seed; ie the test suite is repeatable. ++ std::hash hasher; ++ std::ranlux24_base gen(random_seed ++ + hasher(param.token())); ++ std::uniform_real_distribution<> dis(0.0, 1.0); ++ ++ if(param.is_planar()) ++ { ++ const double roll = dis(gen); ++ if(roll > planar_prob) ++ { ++ if(verbose > 4) ++ { ++ std::cout << "Planar transform skipped " ++ "(planar_prob: " ++ << planar_prob << " > " << roll ++ << ")\n"; ++ } ++ continue; ++ } ++ } ++ if(run_callbacks) ++ { ++ const double roll = dis(gen); ++ if(roll > callback_prob) ++ { ++ ++ if(verbose > 4) ++ { ++ std::cout << "Callback transform skipped " ++ "(planar_prob: " ++ << planar_prob << " > " << roll ++ << ")\n"; ++ } ++ continue; ++ } ++ } ++ ++ if(param.valid(0)) ++ { ++ params.push_back(param); ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ } ++ return params; ++} ++ ++// Create an array of parameters to pass to gtest. Default generator ++// that picks all transform types. ++inline auto param_generator(const std::vector>& v_lengths, ++ const std::vector& precision_range, ++ const std::vector& batch_range, ++ const stride_generator& istride, ++ const stride_generator& ostride, ++ const std::vector>& ioffset_range, ++ const std::vector>& ooffset_range, ++ const std::vector& place_range, ++ const bool planar, ++ const bool run_callbacks = false) ++{ ++ return param_generator_base(trans_type_range, ++ v_lengths, ++ precision_range, ++ batch_range, ++ generate_types, ++ istride, ++ ostride, ++ ioffset_range, ++ ooffset_range, ++ place_range, ++ planar, ++ run_callbacks); ++} ++ ++// Create an array of parameters to pass to gtest. Only tests complex-type transforms ++inline auto param_generator_complex(const std::vector>& v_lengths, ++ const std::vector& precision_range, ++ const std::vector& batch_range, ++ const stride_generator& istride, ++ const stride_generator& ostride, ++ const std::vector>& ioffset_range, ++ const std::vector>& ooffset_range, ++ const std::vector& place_range, ++ const bool planar, ++ const bool run_callbacks = false) ++{ ++ return param_generator_base(trans_type_range_complex, ++ v_lengths, ++ precision_range, ++ batch_range, ++ generate_types, ++ istride, ++ ostride, ++ ioffset_range, ++ ooffset_range, ++ place_range, ++ planar, ++ run_callbacks); ++} ++ ++// Create an array of parameters to pass to gtest. ++inline auto param_generator_real(const std::vector>& v_lengths, ++ const std::vector& precision_range, ++ const std::vector& batch_range, ++ const stride_generator& istride, ++ const stride_generator& ostride, ++ const std::vector>& ioffset_range, ++ const std::vector>& ooffset_range, ++ const std::vector& place_range, ++ const bool planar, ++ const bool run_callbacks = false) ++{ ++ return param_generator_base(trans_type_range_real, ++ v_lengths, ++ precision_range, ++ batch_range, ++ generate_types, ++ istride, ++ ostride, ++ ioffset_range, ++ ooffset_range, ++ place_range, ++ planar, ++ run_callbacks); ++} ++ ++template ++auto param_generator_token(const Tcontainer& tokens) ++{ ++ std::vector params; ++ params.reserve(tokens.size()); ++ for(auto t : tokens) ++ { ++ params.push_back({}); ++ params.back().from_token(t); ++ } ++ return params; ++} ++ ++struct callback_test_data ++{ ++ // scalar to modify the input/output with ++ double scalar; ++ // base address of input, to ensure that each callback gets an offset from that base ++ void* base; ++}; ++ ++void* get_load_callback_host(fft_array_type itype, ++ fft_precision precision, ++ bool round_trip_inverse); ++void apply_load_callback(const fft_params& params, std::vector& input); ++void apply_store_callback(const fft_params& params, std::vector& output); ++void* get_store_callback_host(fft_array_type otype, ++ fft_precision precision, ++ bool round_trip_inverse); ++ ++static auto allocate_cpu_fft_buffer(const fft_precision precision, ++ const fft_array_type type, ++ const std::vector& size) ++{ ++ // FFTW does not support half-precision, so we do single instead. ++ // So if we need to do a half-precision FFTW transform, allocate ++ // enough buffer for single-precision instead. ++ return allocate_host_buffer( ++ precision == fft_precision_half ? fft_precision_single : precision, type, size); ++} ++ ++template ++inline void execute_cpu_fft(fft_params& params, ++ fft_params& contiguous_params, ++ typename fftw_trait::fftw_plan_type& cpu_plan, ++ std::vector& cpu_input, ++ std::vector& cpu_output) ++{ ++ // CPU output might not be allocated already for us, if FFTW never ++ // needed an output buffer during planning ++ if(cpu_output.empty()) ++ cpu_output = allocate_cpu_fft_buffer( ++ contiguous_params.precision, contiguous_params.otype, contiguous_params.osize); ++ ++ // If this is either C2R or callbacks are enabled, the ++ // input will be modified. So we need to modify the copy instead. ++ std::vector cpu_input_copy(cpu_input.size()); ++ std::vector* input_ptr = &cpu_input; ++ if(params.run_callbacks || contiguous_params.transform_type == fft_transform_type_real_inverse) ++ { ++ for(size_t i = 0; i < cpu_input.size(); ++i) ++ { ++ cpu_input_copy[i] = cpu_input[i].copy(); ++ } ++ ++ input_ptr = &cpu_input_copy; ++ } ++ ++ // run FFTW (which may destroy CPU input) ++ apply_load_callback(params, *input_ptr); ++ fftw_run(contiguous_params.transform_type, cpu_plan, *input_ptr, cpu_output); ++ // clean up ++ fftw_destroy_plan_type(cpu_plan); ++ // ask FFTW to fully clean up, since it tries to cache plan details ++ fftw_cleanup(); ++ cpu_plan = nullptr; ++ apply_store_callback(params, cpu_output); ++} ++ ++// execute the GPU transform ++template ++inline void execute_gpu_fft(Tparams& params, ++ std::vector& pibuffer, ++ std::vector& pobuffer, ++ std::vector& obuffer, ++ std::vector& gpu_output, ++ bool round_trip_inverse = false) ++{ ++ gpubuf_t load_cb_data_dev; ++ gpubuf_t store_cb_data_dev; ++ if(params.run_callbacks) ++ { ++ void* load_cb_host ++ = get_load_callback_host(params.itype, params.precision, round_trip_inverse); ++ ++ callback_test_data load_cb_data_host; ++ ++ if(round_trip_inverse) ++ { ++ load_cb_data_host.scalar = params.store_cb_scalar; ++ } ++ else ++ { ++ load_cb_data_host.scalar = params.load_cb_scalar; ++ } ++ ++ load_cb_data_host.base = pibuffer.front(); ++ ++ auto hip_status = hipSuccess; ++ ++ hip_status = load_cb_data_dev.alloc(sizeof(callback_test_data)); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP(); ++ } ++ else ++ { ++ GTEST_FAIL(); ++ } ++ } ++ hip_status = hipMemcpy(load_cb_data_dev.data(), ++ &load_cb_data_host, ++ sizeof(callback_test_data), ++ hipMemcpyHostToDevice); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP(); ++ } ++ else ++ { ++ GTEST_FAIL(); ++ } ++ } ++ ++ void* store_cb_host ++ = get_store_callback_host(params.otype, params.precision, round_trip_inverse); ++ ++ callback_test_data store_cb_data_host; ++ ++ if(round_trip_inverse) ++ { ++ store_cb_data_host.scalar = params.load_cb_scalar; ++ } ++ else ++ { ++ store_cb_data_host.scalar = params.store_cb_scalar; ++ } ++ ++ store_cb_data_host.base = pobuffer.front(); ++ ++ hip_status = store_cb_data_dev.alloc(sizeof(callback_test_data)); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP(); ++ } ++ else ++ { ++ GTEST_FAIL(); ++ } ++ } ++ ++ hip_status = hipMemcpy(store_cb_data_dev.data(), ++ &store_cb_data_host, ++ sizeof(callback_test_data), ++ hipMemcpyHostToDevice); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP(); ++ } ++ else ++ { ++ GTEST_FAIL(); ++ } ++ } ++ ++ auto fft_status = params.set_callbacks( ++ load_cb_host, load_cb_data_dev.data(), store_cb_host, store_cb_data_dev.data()); ++ if(fft_status != fft_status_success) ++ throw std::runtime_error("set callback failure"); ++ } ++ ++ // Execute the transform: ++ auto fft_status = params.execute(pibuffer.data(), pobuffer.data()); ++ if(fft_status != fft_status_success) ++ throw std::runtime_error("rocFFT plan execution failure"); ++ ++ // if not comparing, then just executing the GPU FFT is all we ++ // need to do ++ if(!fftw_compare) ++ return; ++ ++ // finalize a multi-GPU transform ++ params.multi_gpu_finalize(obuffer, pobuffer); ++ ++ ASSERT_TRUE(!gpu_output.empty()) << "no output buffers"; ++ for(unsigned int idx = 0; idx < gpu_output.size(); ++idx) ++ { ++ ASSERT_TRUE(gpu_output[idx].data() != nullptr) ++ << "output buffer index " << idx << " is empty"; ++ auto hip_status = hipMemcpy(gpu_output[idx].data(), ++ pobuffer.at(idx), ++ gpu_output[idx].size(), ++ hipMemcpyDeviceToHost); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemcpy failure"; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemcpy failure"; ++ } ++ } ++ } ++ if(verbose > 2) ++ { ++ std::cout << "GPU output:\n"; ++ params.print_obuffer(gpu_output); ++ } ++ if(verbose > 5) ++ { ++ std::cout << "flat GPU output:\n"; ++ params.print_obuffer_flat(gpu_output); ++ } ++} ++ ++template ++static void assert_init_value(const std::vector& output, ++ const size_t idx, ++ const Tfloat orig_value); ++ ++template <> ++void assert_init_value(const std::vector& output, const size_t idx, const float orig_value) ++{ ++ float actual_value = reinterpret_cast(output.front().data())[idx]; ++ ASSERT_EQ(actual_value, orig_value) << "index " << idx; ++} ++ ++template <> ++void assert_init_value(const std::vector& output, ++ const size_t idx, ++ const double orig_value) ++{ ++ double actual_value = reinterpret_cast(output.front().data())[idx]; ++ ASSERT_EQ(actual_value, orig_value) << "index " << idx; ++} ++ ++template <> ++void assert_init_value(const std::vector& output, ++ const size_t idx, ++ const rocfft_complex orig_value) ++{ ++ // if this is interleaved, check directly ++ if(output.size() == 1) ++ { ++ rocfft_complex actual_value ++ = reinterpret_cast*>(output.front().data())[idx]; ++ ASSERT_EQ(actual_value.x, orig_value.x) << "x index " << idx; ++ ASSERT_EQ(actual_value.y, orig_value.y) << "y index " << idx; ++ } ++ else ++ { ++ // planar ++ rocfft_complex actual_value{ ++ reinterpret_cast(output.front().data())[idx], ++ reinterpret_cast(output.back().data())[idx]}; ++ ASSERT_EQ(actual_value.x, orig_value.x) << "x index " << idx; ++ ASSERT_EQ(actual_value.y, orig_value.y) << "y index " << idx; ++ } ++} ++ ++template <> ++void assert_init_value(const std::vector& output, ++ const size_t idx, ++ const rocfft_complex orig_value) ++{ ++ // if this is interleaved, check directly ++ if(output.size() == 1) ++ { ++ rocfft_complex actual_value ++ = reinterpret_cast*>(output.front().data())[idx]; ++ ASSERT_EQ(actual_value.x, orig_value.x) << "x index " << idx; ++ ASSERT_EQ(actual_value.y, orig_value.y) << "y index " << idx; ++ } ++ else ++ { ++ // planar ++ rocfft_complex actual_value{ ++ reinterpret_cast(output.front().data())[idx], ++ reinterpret_cast(output.back().data())[idx]}; ++ ASSERT_EQ(actual_value.x, orig_value.x) << "x index " << idx; ++ ASSERT_EQ(actual_value.y, orig_value.y) << "y index " << idx; ++ } ++} ++ ++static const int OUTPUT_INIT_PATTERN = 0xcd; ++template ++void check_single_output_stride(const std::vector& output, ++ const size_t offset, ++ const std::vector& length, ++ const std::vector& stride, ++ const size_t i) ++{ ++ Tfloat orig; ++ memset(static_cast(&orig), OUTPUT_INIT_PATTERN, sizeof(Tfloat)); ++ ++ size_t curLength = length[i]; ++ size_t curStride = stride[i]; ++ size_t nextSmallerLength = i == length.size() - 1 ? 0 : length[i + 1]; ++ size_t nextSmallerStride = i == stride.size() - 1 ? 0 : stride[i + 1]; ++ ++ if(nextSmallerLength == 0) ++ { ++ // this is the fastest dim, indexes that are not multiples of ++ // the stride should be the initial value ++ for(size_t idx = 0; idx < (curLength - 1) * curStride; ++idx) ++ { ++ if(idx % curStride != 0) ++ assert_init_value(output, idx, orig); ++ } ++ } ++ else ++ { ++ for(size_t lengthIdx = 0; lengthIdx < curLength; ++lengthIdx) ++ { ++ // check that the space after the next smaller dim and the ++ // end of this dim is initial value ++ for(size_t idx = nextSmallerLength * nextSmallerStride; idx < curStride; ++idx) ++ assert_init_value(output, idx, orig); ++ ++ check_single_output_stride( ++ output, offset + lengthIdx * curStride, length, stride, i + 1); ++ } ++ } ++} ++ ++template ++void check_output_strides(const std::vector& output, Tparams& params) ++{ ++ // treat batch+dist like highest length+stride, if batch > 1 ++ std::vector length; ++ std::vector stride; ++ if(params.nbatch > 1) ++ { ++ length.push_back(params.nbatch); ++ stride.push_back(params.odist); ++ } ++ ++ auto olength = params.olength(); ++ std::copy(olength.begin(), olength.end(), std::back_inserter(length)); ++ std::copy(params.ostride.begin(), params.ostride.end(), std::back_inserter(stride)); ++ ++ if(params.precision == fft_precision_single) ++ { ++ if(params.otype == fft_array_type_real) ++ check_single_output_stride(output, 0, length, stride, 0); ++ else ++ check_single_output_stride>(output, 0, length, stride, 0); ++ } ++ else ++ { ++ if(params.otype == fft_array_type_real) ++ check_single_output_stride(output, 0, length, stride, 0); ++ else ++ check_single_output_stride>(output, 0, length, stride, 0); ++ } ++} ++ ++// run rocFFT inverse transform ++template ++inline void run_round_trip_inverse(Tparams& params, ++ std::vector& obuffer, ++ std::vector& pibuffer, ++ std::vector& pobuffer, ++ std::vector& gpu_output) ++{ ++ params.validate(); ++ ++ // Make sure that the parameters make sense: ++ ASSERT_TRUE(params.valid(verbose)); ++ ++ // Create FFT plan - this will also allocate work buffer, but will throw a ++ // specific exception if that step fails ++ auto plan_status = fft_status_success; ++ try ++ { ++ plan_status = params.create_plan(); ++ } ++ catch(fft_params::work_buffer_alloc_failure& e) ++ { ++ std::stringstream ss; ++ ss << "Failed to allocate work buffer (size: " << params.workbuffersize << ")"; ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << ss.str(); ++ } ++ else ++ { ++ GTEST_FAIL() << ss.str(); ++ } ++ } ++ ASSERT_EQ(plan_status, fft_status_success) << "round trip inverse plan creation failed"; ++ ++ auto obuffer_sizes = params.obuffer_sizes(); ++ ++ if(params.placement != fft_placement_inplace) ++ { ++ for(unsigned int i = 0; i < obuffer_sizes.size(); ++i) ++ { ++ // If we're validating output strides, init the ++ // output buffer to a known pattern and we can check ++ // that the pattern is untouched in places that ++ // shouldn't have been touched. ++ if(params.check_output_strides) ++ { ++ auto hip_status ++ = hipMemset(obuffer[i].data(), OUTPUT_INIT_PATTERN, obuffer_sizes[i]); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemset failure"; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemset failure"; ++ } ++ } ++ } ++ } ++ } ++ ++ // execute GPU transform ++ execute_gpu_fft(params, pibuffer, pobuffer, obuffer, gpu_output, true); ++} ++ ++// compare rocFFT inverse transform with forward transform input ++template ++inline void compare_round_trip_inverse(Tparams& params, ++ fft_params& contiguous_params, ++ std::vector& gpu_output, ++ std::vector& cpu_input, ++ const VectorNorms& cpu_input_norm, ++ size_t total_length) ++{ ++ if(params.check_output_strides) ++ { ++ check_output_strides(gpu_output, params); ++ } ++ ++ // compute GPU output norm ++ std::shared_future gpu_norm = std::async(std::launch::async, [&]() { ++ return norm(gpu_output, ++ params.olength(), ++ params.nbatch, ++ params.precision, ++ params.otype, ++ params.ostride, ++ params.odist, ++ params.ooffset); ++ }); ++ ++ // compare GPU inverse output to CPU forward input ++ std::unique_ptr>> linf_failures; ++ if(verbose > 1) ++ linf_failures = std::make_unique>>(); ++ const double linf_cutoff ++ = type_epsilon(params.precision) * cpu_input_norm.l_inf * log(total_length); ++ ++ VectorNorms diff = distance(cpu_input, ++ gpu_output, ++ params.olength(), ++ params.nbatch, ++ params.precision, ++ contiguous_params.itype, ++ contiguous_params.istride, ++ contiguous_params.idist, ++ params.otype, ++ params.ostride, ++ params.odist, ++ linf_failures.get(), ++ linf_cutoff, ++ {0}, ++ params.ooffset, ++ 1.0 / total_length); ++ ++ if(verbose > 1) ++ { ++ std::cout << "GPU output Linf norm: " << gpu_norm.get().l_inf << "\n"; ++ std::cout << "GPU output L2 norm: " << gpu_norm.get().l_2 << "\n"; ++ std::cout << "GPU linf norm failures:"; ++ std::sort(linf_failures->begin(), linf_failures->end()); ++ for(const auto& i : *linf_failures) ++ { ++ std::cout << " (" << i.first << "," << i.second << ")"; ++ } ++ std::cout << std::endl; ++ } ++ ++ EXPECT_TRUE(std::isfinite(gpu_norm.get().l_inf)) << params.str(); ++ EXPECT_TRUE(std::isfinite(gpu_norm.get().l_2)) << params.str(); ++ ++ switch(params.precision) ++ { ++ case fft_precision_half: ++ max_linf_eps_half ++ = std::max(max_linf_eps_half, diff.l_inf / cpu_input_norm.l_inf / log(total_length)); ++ max_l2_eps_half ++ = std::max(max_l2_eps_half, diff.l_2 / cpu_input_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ case fft_precision_single: ++ max_linf_eps_single ++ = std::max(max_linf_eps_single, diff.l_inf / cpu_input_norm.l_inf / log(total_length)); ++ max_l2_eps_single ++ = std::max(max_l2_eps_single, diff.l_2 / cpu_input_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ case fft_precision_double: ++ max_linf_eps_double ++ = std::max(max_linf_eps_double, diff.l_inf / cpu_input_norm.l_inf / log(total_length)); ++ max_l2_eps_double ++ = std::max(max_l2_eps_double, diff.l_2 / cpu_input_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ } ++ ++ if(verbose > 1) ++ { ++ std::cout << "L2 diff: " << diff.l_2 << "\n"; ++ std::cout << "Linf diff: " << diff.l_inf << "\n"; ++ } ++ ++ EXPECT_TRUE(diff.l_inf <= linf_cutoff) ++ << "Linf test failed. Linf:" << diff.l_inf ++ << "\tnormalized Linf: " << diff.l_inf / cpu_input_norm.l_inf << "\tcutoff: " << linf_cutoff ++ << params.str(); ++ ++ EXPECT_TRUE(diff.l_2 / cpu_input_norm.l_2 ++ < sqrt(log2(total_length)) * type_epsilon(params.precision)) ++ << "L2 test failed. L2: " << diff.l_2 ++ << "\tnormalized L2: " << diff.l_2 / cpu_input_norm.l_2 ++ << "\tepsilon: " << sqrt(log2(total_length)) * type_epsilon(params.precision) ++ << params.str(); ++} ++ ++// RAII type to put data into the cache when this object leaves scope ++struct StoreCPUDataToCache ++{ ++ StoreCPUDataToCache(std::vector& cpu_input, std::vector& cpu_output) ++ : cpu_input(cpu_input) ++ , cpu_output(cpu_output) ++ { ++ } ++ ~StoreCPUDataToCache() ++ { ++ last_cpu_fft_data.cpu_output.swap(cpu_output); ++ last_cpu_fft_data.cpu_input.swap(cpu_input); ++ } ++ std::vector& cpu_input; ++ std::vector& cpu_output; ++}; ++ ++// run CPU + rocFFT transform with the given params and compare ++template ++inline void fft_vs_reference_impl(Tparams& params, bool round_trip) ++{ ++ // Call hipGetLastError to reset any errors ++ // returned by previous HIP runtime API calls. ++ hipError_t hip_status = hipGetLastError(); ++ ++ // Make sure that the parameters make sense: ++ ASSERT_TRUE(params.valid(verbose)); ++ ++ size_t needed_ram = needed_ram_buffers(params, verbose); ++ ++ if(ramgb > 0 && needed_ram > ramgb * ONE_GiB) ++ { ++ GTEST_SKIP() << "needed_ramgb: " << bytes_to_GiB(needed_ram) << ", ramgb limit: " << ramgb ++ << ".\n"; ++ } ++ ++ auto ibuffer_sizes = params.ibuffer_sizes(); ++ auto obuffer_sizes = params.obuffer_sizes(); ++ ++ size_t vram_avail = 0; ++ ++ if(vramgb == 0) ++ { ++ // Check free and total available memory: ++ size_t free = 0; ++ size_t total = 0; ++ auto hip_status = hipMemGetInfo(&free, &total); ++ if(hip_status != hipSuccess || total == 0) ++ { ++ ++n_hip_failures; ++ std::stringstream ss; ++ if(total == 0) ++ ss << "hipMemGetInfo claims there there isn't any vram"; ++ else ++ ss << "hipMemGetInfo failure with error " << hip_status; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << ss.str(); ++ } ++ else ++ { ++ GTEST_FAIL() << ss.str(); ++ } ++ } ++ vram_avail = total; ++ } ++ else ++ { ++ vram_avail = vramgb * ONE_GiB; ++ } ++ ++ // First try a quick estimation of vram footprint, to speed up skipping tests ++ // that are too large to fit in the gpu (no plan created with the rocFFT backend) ++ const auto raw_vram_footprint ++ = params.fft_params_vram_footprint() + twiddle_table_vram_footprint(params); ++ ++ if(!vram_fits_problem(raw_vram_footprint, vram_avail)) ++ { ++ GTEST_SKIP() << "Raw problem size (" << bytes_to_GiB(raw_vram_footprint) ++ << " GiB) raw data too large for device"; ++ } ++ ++ if(verbose > 2) ++ { ++ std::cout << "Raw problem size: " << raw_vram_footprint << std::endl; ++ } ++ ++ // If it passed the quick estimation test, go for the more ++ // accurate calculation that actually creates the plan and ++ // take into account the work buffer size ++ const auto vram_footprint = params.vram_footprint(); ++ if(!vram_fits_problem(vram_footprint, vram_avail)) ++ { ++ if(verbose) ++ { ++ std::cout << "Problem raw data won't fit on device; skipped." << std::endl; ++ } ++ GTEST_SKIP() << "Problem size (" << bytes_to_GiB(vram_footprint) ++ << " GiB) raw data too large for device"; ++ } ++ ++ // Create FFT plan - this will also allocate work buffer, but ++ // will throw a specific exception if that step fails ++ auto plan_status = fft_status_success; ++ try ++ { ++ plan_status = params.create_plan(); ++ } ++ catch(fft_params::work_buffer_alloc_failure& e) ++ { ++ ++n_hip_failures; ++ std::stringstream ss; ++ ss << "Work buffer allocation failed with size: " << params.workbuffersize; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << ss.str(); ++ } ++ else ++ { ++ GTEST_FAIL() << ss.str(); ++ } ++ } ++ ASSERT_EQ(plan_status, fft_status_success) << "plan creation failed"; ++ ++ if(!vram_fits_problem(vram_footprint, vram_avail)) ++ { ++ if(verbose) ++ { ++ std::cout << "Problem won't fit on device; skipped." << std::endl; ++ } ++ GTEST_SKIP() << "Problem size (" << vram_footprint << ") too large for device"; ++ return; ++ } ++ ++ fft_params contiguous_params; ++ contiguous_params.length = params.length; ++ contiguous_params.precision = params.precision; ++ contiguous_params.placement = fft_placement_notinplace; ++ contiguous_params.transform_type = params.transform_type; ++ contiguous_params.nbatch = params.nbatch; ++ contiguous_params.itype = contiguous_itype(params.transform_type); ++ contiguous_params.otype = contiguous_otype(contiguous_params.transform_type); ++ ++ contiguous_params.validate(); ++ ++ if(!contiguous_params.valid(verbose)) ++ { ++ throw std::runtime_error("Invalid contiguous params"); ++ } ++ ++ if(verbose > 3) ++ { ++ std::cout << "CPU params:\n"; ++ std::cout << contiguous_params.str("\n\t") << std::endl; ++ } ++ ++ std::vector ibuffer(ibuffer_sizes.size()); ++ std::vector pibuffer(ibuffer_sizes.size()); ++ for(unsigned int i = 0; i < ibuffer.size(); ++i) ++ { ++ hip_status = ibuffer[i].alloc(ibuffer_sizes[i]); ++ if(hip_status != hipSuccess) ++ { ++ std::stringstream ss; ++ ss << "hipMalloc failure for input buffer " << i << " size " << ibuffer_sizes[i] << "(" ++ << bytes_to_GiB(ibuffer_sizes[i]) << " GiB)" ++ << " with code " << hipError_to_string(hip_status); ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << ss.str(); ++ } ++ else ++ { ++ GTEST_FAIL() << ss.str(); ++ } ++ } ++ pibuffer[i] = ibuffer[i].data(); ++ } ++ ++ // allocation counts in elements, ibuffer_sizes is in bytes ++ auto ibuffer_sizes_elems = ibuffer_sizes; ++ for(auto& buf : ibuffer_sizes_elems) ++ buf /= var_size(params.precision, params.itype); ++ ++ // Check cache first - nbatch is a >= comparison because we compute ++ // the largest batch size and cache it. Smaller batch runs can ++ // compare against the larger data. ++ std::vector cpu_input; ++ std::vector cpu_output; ++ std::shared_future convert_cpu_output_precision; ++ std::shared_future convert_cpu_input_precision; ++ bool run_fftw = true; ++ std::unique_ptr store_to_cache; ++ if(fftw_compare && last_cpu_fft_data.length == params.length ++ && last_cpu_fft_data.transform_type == params.transform_type ++ && last_cpu_fft_data.run_callbacks == params.run_callbacks) ++ { ++ if(last_cpu_fft_data.nbatch >= params.nbatch) ++ { ++ // use the cached input/output ++ cpu_input.swap(last_cpu_fft_data.cpu_input); ++ cpu_output.swap(last_cpu_fft_data.cpu_output); ++ run_fftw = false; ++ ++ store_to_cache = std::make_unique(cpu_input, cpu_output); ++ ++ if(params.precision != last_cpu_fft_data.precision) ++ { ++ // Tests should be ordered so we do wider first, then narrower. ++ switch(params.precision) ++ { ++ case fft_precision_double: ++ std::cerr ++ << "test ordering is incorrect: double precision follows a narrower one" ++ << std::endl; ++ abort(); ++ break; ++ case fft_precision_single: ++ if(last_cpu_fft_data.precision != fft_precision_double) ++ { ++ std::cerr ++ << "test ordering is incorrect: float precision follows a narrower one" ++ << std::endl; ++ abort(); ++ } ++ // convert the input/output to single-precision ++ convert_cpu_output_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_output.front()); ++ }); ++ convert_cpu_input_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_input.front()); ++ }); ++ break; ++ case fft_precision_half: ++ // convert to half precision ++ if(last_cpu_fft_data.precision == fft_precision_double) ++ { ++ convert_cpu_output_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_output.front()); ++ }); ++ convert_cpu_input_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_input.front()); ++ }); ++ } ++ else if(last_cpu_fft_data.precision == fft_precision_single) ++ { ++ convert_cpu_output_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_output.front()); ++ }); ++ convert_cpu_input_precision = std::async(std::launch::async, [&]() { ++ narrow_precision_inplace(cpu_input.front()); ++ }); ++ } ++ else ++ { ++ std::cerr << "unhandled previous precision, cannot convert to half" ++ << std::endl; ++ abort(); ++ } ++ break; ++ } ++ last_cpu_fft_data.precision = params.precision; ++ } ++ } ++ // If the last result has a smaller batch than the new ++ // params, that might be a developer error - tests should be ++ // ordered to generate the bigger batch first. But if tests ++ // got filtered or skipped due to insufficient memory, we ++ // might never have tried to generate the bigger batch first. ++ // So just fall through and redo the CPU FFT. ++ } ++ else ++ { ++ // Clear cache explicitly so that even if we didn't get a hit, ++ // we're not uselessly holding on to cached cpu input/output ++ last_cpu_fft_data = last_cpu_fft_cache(); ++ } ++ ++ // Allocate CPU input ++ if(run_fftw) ++ { ++ cpu_input = allocate_cpu_fft_buffer( ++ contiguous_params.precision, contiguous_params.itype, contiguous_params.isize); ++ } ++ ++ // Create FFTW plan - this may write to input, but that's fine ++ // since there's nothing in there right now ++ typename fftw_trait::fftw_plan_type cpu_plan = nullptr; ++ if(run_fftw) ++ { ++ // Normally, we would want to defer allocation of CPU output ++ // buffer until when we actually do the CPU FFT. But if we're ++ // using FFTW wisdom, FFTW needs an output buffer at plan ++ // creation time. ++ if(use_fftw_wisdom) ++ { ++ cpu_output = allocate_cpu_fft_buffer( ++ contiguous_params.precision, contiguous_params.otype, contiguous_params.osize); ++ } ++ cpu_plan = fftw_plan_via_rocfft(contiguous_params.length, ++ contiguous_params.istride, ++ contiguous_params.ostride, ++ contiguous_params.nbatch, ++ contiguous_params.idist, ++ contiguous_params.odist, ++ contiguous_params.transform_type, ++ cpu_input, ++ cpu_output); ++ ++ needed_ram += needed_ram_fftw(contiguous_params, cpu_plan, verbose); ++ ++ if(ramgb > 0 && needed_ram > ramgb * ONE_GiB) ++ { ++ if(verbose) ++ { ++ std::cout << "Problem exceeds memory limit; skipped [rocfft_transform]." ++ << std::endl; ++ } ++ GTEST_SKIP(); ++ return; ++ } ++ } ++ ++ std::vector gpu_input_data; ++ ++ // allocate and populate the input buffer (cpu/gpu) ++ if(run_fftw) ++ { ++ gpu_input_data = allocate_host_buffer(params.precision, params.itype, ibuffer_sizes_elems); ++ ++ //generate the input directly on the gpu ++ params.compute_input(ibuffer); ++ ++ // Copy the input to CPU ++ if(params.itype != contiguous_params.itype || params.istride != contiguous_params.istride ++ || params.idist != contiguous_params.idist || params.isize != contiguous_params.isize) ++ { ++ // Copy input to CPU ++ for(unsigned int idx = 0; idx < ibuffer.size(); ++idx) ++ { ++ hip_status = hipMemcpy(gpu_input_data.at(idx).data(), ++ ibuffer[idx].data(), ++ ibuffer_sizes[idx], ++ hipMemcpyDeviceToHost); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemcpy failure with error " << hip_status; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemcpy failure with error " << hip_status; ++ } ++ } ++ } ++ ++ copy_buffers(gpu_input_data, ++ cpu_input, ++ params.ilength(), ++ params.nbatch, ++ params.precision, ++ params.itype, ++ params.istride, ++ params.idist, ++ contiguous_params.itype, ++ contiguous_params.istride, ++ contiguous_params.idist, ++ params.ioffset, ++ contiguous_params.ioffset); ++ } ++ else ++ { ++ // Copy input to CPU ++ for(unsigned int idx = 0; idx < ibuffer.size(); ++idx) ++ { ++ hip_status = hipMemcpy(cpu_input.at(idx).data(), ++ ibuffer[idx].data(), ++ ibuffer_sizes[idx], ++ hipMemcpyDeviceToHost); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemcpy failure with error " << hip_status; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemcpy failure with error " << hip_status; ++ } ++ } ++ } ++ } ++ } ++ else if(fftw_compare) ++ { ++ gpu_input_data = allocate_host_buffer(params.precision, params.itype, ibuffer_sizes_elems); ++ ++ // In case the cached cpu input needed conversion, wait for it ++ if(convert_cpu_input_precision.valid()) ++ convert_cpu_input_precision.get(); ++ ++ // gets a pre-computed gpu input buffer from the cpu cache ++ std::vector* gpu_input = &cpu_input; ++ ++ if(params.itype != contiguous_params.itype || params.istride != contiguous_params.istride ++ || params.idist != contiguous_params.idist || params.isize != contiguous_params.isize) ++ { ++ copy_buffers(cpu_input, ++ gpu_input_data, ++ params.ilength(), ++ params.nbatch, ++ params.precision, ++ contiguous_params.itype, ++ contiguous_params.istride, ++ contiguous_params.idist, ++ params.itype, ++ params.istride, ++ params.idist, ++ {0}, ++ params.ioffset); ++ gpu_input = &gpu_input_data; ++ } ++ ++ // Copy input to GPU ++ for(unsigned int idx = 0; idx < gpu_input->size(); ++idx) ++ { ++ hip_status = hipMemcpy(ibuffer[idx].data(), ++ gpu_input->at(idx).data(), ++ ibuffer_sizes[idx], ++ hipMemcpyHostToDevice); ++ ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemcpy failure with error " << hip_status; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemcpy failure with error " << hip_status; ++ } ++ } ++ } ++ } ++ ++ if(verbose > 3) ++ { ++ std::cout << "CPU input:\n"; ++ contiguous_params.print_ibuffer(cpu_input); ++ } ++ ++ // compute input norm ++ std::shared_future cpu_input_norm; ++ if(fftw_compare) ++ cpu_input_norm = std::async(std::launch::async, [&]() { ++ // in case the cached cpu input needed conversion, wait for it ++ if(convert_cpu_input_precision.valid()) ++ convert_cpu_input_precision.get(); ++ ++ auto input_norm = norm(cpu_input, ++ contiguous_params.ilength(), ++ contiguous_params.nbatch, ++ contiguous_params.precision, ++ contiguous_params.itype, ++ contiguous_params.istride, ++ contiguous_params.idist, ++ contiguous_params.ioffset); ++ if(verbose > 2) ++ { ++ std::cout << "CPU Input Linf norm: " << input_norm.l_inf << "\n"; ++ std::cout << "CPU Input L2 norm: " << input_norm.l_2 << "\n"; ++ } ++ return input_norm; ++ }); ++ ++ std::vector obuffer_data; ++ std::vector* obuffer = &obuffer_data; ++ std::vector pobuffer; ++ ++ // allocate the output buffer ++ ++ if(params.placement == fft_placement_inplace) ++ { ++ obuffer = &ibuffer; ++ } ++ else ++ { ++ auto obuffer_sizes = params.obuffer_sizes(); ++ obuffer_data.resize(obuffer_sizes.size()); ++ for(unsigned int i = 0; i < obuffer_data.size(); ++i) ++ { ++ hip_status = obuffer_data[i].alloc(obuffer_sizes[i]); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ std::stringstream ss; ++ ss << "hipMalloc failure for output buffer " << i << " size " << obuffer_sizes[i] ++ << "(" << bytes_to_GiB(obuffer_sizes[i]) << " GiB)" ++ << " with code " << hipError_to_string(hip_status); ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << ss.str(); ++ } ++ else ++ { ++ GTEST_FAIL() << ss.str(); ++ } ++ } ++ ++ // If we're validating output strides, init the ++ // output buffer to a known pattern and we can check ++ // that the pattern is untouched in places that ++ // shouldn't have been touched. ++ if(params.check_output_strides) ++ { ++ hip_status ++ = hipMemset(obuffer_data[i].data(), OUTPUT_INIT_PATTERN, obuffer_sizes[i]); ++ if(hip_status != hipSuccess) ++ { ++ ++n_hip_failures; ++ if(skip_runtime_fails) ++ { ++ GTEST_SKIP() << "hipMemset failure with error " << hip_status; ++ } ++ else ++ { ++ GTEST_FAIL() << "hipMemset failure with error " << hip_status; ++ } ++ } ++ } ++ } ++ } ++ pobuffer.resize(obuffer->size()); ++ for(unsigned int i = 0; i < obuffer->size(); ++i) ++ { ++ pobuffer[i] = obuffer->at(i).data(); ++ } ++ ++ // Run CPU transform ++ // ++ // NOTE: This must happen after input is copied to GPU and input ++ // norm is computed, since the CPU FFT may overwrite the input. ++ VectorNorms cpu_output_norm; ++ std::shared_future cpu_fft; ++ if(fftw_compare) ++ cpu_fft = std::async(std::launch::async, [&]() { ++ // wait for input norm to finish, since we might overwrite input ++ cpu_input_norm.get(); ++ ++ if(run_fftw) ++ execute_cpu_fft(params, contiguous_params, cpu_plan, cpu_input, cpu_output); ++ // in case the cached cpu output needed conversion, wait for it ++ else if(convert_cpu_output_precision.valid()) ++ convert_cpu_output_precision.get(); ++ ++ if(verbose > 3) ++ { ++ std::cout << "CPU output:\n"; ++ contiguous_params.print_obuffer(cpu_output); ++ } ++ ++ cpu_output_norm = norm(cpu_output, ++ params.olength(), ++ params.nbatch, ++ params.precision, ++ contiguous_params.otype, ++ contiguous_params.ostride, ++ contiguous_params.odist, ++ contiguous_params.ooffset); ++ if(verbose > 2) ++ { ++ std::cout << "CPU Output Linf norm: " << cpu_output_norm.l_inf << "\n"; ++ std::cout << "CPU Output L2 norm: " << cpu_output_norm.l_2 << "\n"; ++ } ++ }); ++ ++ // scatter data out to multi-GPUs if this is a multi-GPU test ++ params.multi_gpu_prepare(ibuffer, pibuffer, pobuffer); ++ ++ // execute GPU transform ++ std::vector gpu_output ++ = allocate_host_buffer(params.precision, params.otype, params.osize); ++ ++ execute_gpu_fft(params, pibuffer, pobuffer, *obuffer, gpu_output); ++ ++ params.free(); ++ ++ if(params.check_output_strides) ++ { ++ check_output_strides(gpu_output, params); ++ } ++ ++ // compute GPU output norm ++ std::shared_future gpu_norm; ++ if(fftw_compare) ++ gpu_norm = std::async(std::launch::async, [&]() { ++ return norm(gpu_output, ++ params.olength(), ++ params.nbatch, ++ params.precision, ++ params.otype, ++ params.ostride, ++ params.odist, ++ params.ooffset); ++ }); ++ ++ // compare output ++ // ++ // Compute the l-infinity and l-2 distance between the CPU and GPU output: ++ // wait for cpu FFT so we can compute cutoff ++ ++ const auto total_length = std::accumulate(params.length.begin(), ++ params.length.end(), ++ static_cast(1), ++ std::multiplies()); ++ ++ std::unique_ptr>> linf_failures; ++ if(verbose > 1) ++ linf_failures = std::make_unique>>(); ++ double linf_cutoff; ++ VectorNorms diff; ++ ++ std::shared_future compare_output; ++ if(fftw_compare) ++ compare_output = std::async(std::launch::async, [&]() { ++ cpu_fft.get(); ++ linf_cutoff ++ = type_epsilon(params.precision) * cpu_output_norm.l_inf * log(total_length); ++ ++ diff = distance(cpu_output, ++ gpu_output, ++ params.olength(), ++ params.nbatch, ++ params.precision, ++ contiguous_params.otype, ++ contiguous_params.ostride, ++ contiguous_params.odist, ++ params.otype, ++ params.ostride, ++ params.odist, ++ linf_failures.get(), ++ linf_cutoff, ++ {0}, ++ params.ooffset); ++ }); ++ ++ // Update the cache if this current transform is different from ++ // what's stored. But if this transform only has a smaller batch ++ // than what's cached, we can still keep the cache around since ++ // the input/output we already have is still valid. ++ const bool update_last_cpu_fft_data ++ = last_cpu_fft_data.length != params.length ++ || last_cpu_fft_data.transform_type != params.transform_type ++ || last_cpu_fft_data.run_callbacks != params.run_callbacks ++ || last_cpu_fft_data.precision != params.precision ++ || params.nbatch > last_cpu_fft_data.nbatch; ++ ++ // store cpu output in cache ++ if(update_last_cpu_fft_data) ++ { ++ last_cpu_fft_data.length = params.length; ++ last_cpu_fft_data.nbatch = params.nbatch; ++ last_cpu_fft_data.transform_type = params.transform_type; ++ last_cpu_fft_data.run_callbacks = params.run_callbacks; ++ last_cpu_fft_data.precision = params.precision; ++ } ++ ++ if(compare_output.valid()) ++ compare_output.get(); ++ ++ if(!store_to_cache) ++ store_to_cache = std::make_unique(cpu_input, cpu_output); ++ ++ Tparams params_inverse; ++ ++ if(round_trip) ++ { ++ params_inverse.inverse_from_forward(params); ++ ++ run_round_trip_inverse( ++ params_inverse, ibuffer, pobuffer, pibuffer, gpu_input_data); ++ } ++ ++ if(fftw_compare) ++ { ++ ASSERT_TRUE(std::isfinite(cpu_input_norm.get().l_2)); ++ ASSERT_TRUE(std::isfinite(cpu_input_norm.get().l_inf)); ++ ++ ASSERT_TRUE(std::isfinite(cpu_output_norm.l_2)); ++ ASSERT_TRUE(std::isfinite(cpu_output_norm.l_inf)); ++ ++ if(verbose > 1) ++ { ++ std::cout << "GPU output Linf norm: " << gpu_norm.get().l_inf << "\n"; ++ std::cout << "GPU output L2 norm: " << gpu_norm.get().l_2 << "\n"; ++ std::cout << "GPU linf norm failures:"; ++ std::sort(linf_failures->begin(), linf_failures->end()); ++ for(const auto& i : *linf_failures) ++ { ++ std::cout << " (" << i.first << "," << i.second << ")"; ++ } ++ std::cout << std::endl; ++ } ++ ++ EXPECT_TRUE(std::isfinite(gpu_norm.get().l_inf)) << params.str(); ++ EXPECT_TRUE(std::isfinite(gpu_norm.get().l_2)) << params.str(); ++ } ++ ++ switch(params.precision) ++ { ++ case fft_precision_half: ++ max_linf_eps_half ++ = std::max(max_linf_eps_half, diff.l_inf / cpu_output_norm.l_inf / log(total_length)); ++ max_l2_eps_half ++ = std::max(max_l2_eps_half, diff.l_2 / cpu_output_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ case fft_precision_single: ++ max_linf_eps_single ++ = std::max(max_linf_eps_single, diff.l_inf / cpu_output_norm.l_inf / log(total_length)); ++ max_l2_eps_single = std::max(max_l2_eps_single, ++ diff.l_2 / cpu_output_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ case fft_precision_double: ++ max_linf_eps_double ++ = std::max(max_linf_eps_double, diff.l_inf / cpu_output_norm.l_inf / log(total_length)); ++ max_l2_eps_double = std::max(max_l2_eps_double, ++ diff.l_2 / cpu_output_norm.l_2 * sqrt(log2(total_length))); ++ break; ++ } ++ ++ if(verbose > 1) ++ { ++ std::cout << "L2 diff: " << diff.l_2 << "\n"; ++ std::cout << "Linf diff: " << diff.l_inf << "\n"; ++ } ++ ++ if(fftw_compare) ++ { ++ EXPECT_TRUE(diff.l_inf <= linf_cutoff) ++ << "Linf test failed. Linf:" << diff.l_inf ++ << "\tnormalized Linf: " << diff.l_inf / cpu_output_norm.l_inf ++ << "\tcutoff: " << linf_cutoff << params.str(); ++ ++ EXPECT_TRUE(diff.l_2 / cpu_output_norm.l_2 ++ < sqrt(log2(total_length)) * type_epsilon(params.precision)) ++ << "L2 test failed. L2: " << diff.l_2 ++ << "\tnormalized L2: " << diff.l_2 / cpu_output_norm.l_2 ++ << "\tepsilon: " << sqrt(log2(total_length)) * type_epsilon(params.precision) ++ << params.str(); ++ } ++ ++ if(round_trip && fftw_compare) ++ { ++ compare_round_trip_inverse(params_inverse, ++ contiguous_params, ++ gpu_input_data, ++ cpu_input, ++ cpu_input_norm.get(), ++ total_length); ++ } ++} ++ ++#endif +diff --git a/shared/arithmetic.h b/shared/arithmetic.h +new file mode 100644 +index 0000000..774d342 +--- /dev/null ++++ b/shared/arithmetic.h +@@ -0,0 +1,61 @@ ++/****************************************************************************** ++* Copyright (C) 2021 - 2022 Advanced Micro Devices, Inc. All rights reserved. ++* ++* Permission is hereby granted, free of charge, to any person obtaining a copy ++* of this software and associated documentation files (the "Software"), to deal ++* in the Software without restriction, including without limitation the rights ++* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++* copies of the Software, and to permit persons to whom the Software is ++* furnished to do so, subject to the following conditions: ++* ++* The above copyright notice and this permission notice shall be included in ++* all copies or substantial portions of the Software. ++* ++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++* THE SOFTWARE. ++*******************************************************************************/ ++ ++#pragma once ++ ++#include ++#include ++ ++// arithmetic helper functions ++ ++static inline bool IsPo2(size_t u) ++{ ++ return (u != 0) && (0 == (u & (u - 1))); ++} ++ ++// help function: Find the smallest power of 2 that is >= n; return its ++// power of 2 factor ++// e.g., CeilPo2 (7) returns 3 : (2^3 >= 7) ++static inline size_t CeilPo2(size_t n) ++{ ++ size_t v = 1, t = 0; ++ while(v < n) ++ { ++ v <<= 1; ++ t++; ++ } ++ ++ return t; ++} ++ ++template ++static inline T DivRoundingUp(T a, T b) ++{ ++ return (a + (b - 1)) / b; ++} ++ ++template ++typename Titer::value_type product(Titer begin, Titer end) ++{ ++ return std::accumulate( ++ begin, end, typename Titer::value_type(1), std::multiplies()); ++} +diff --git a/shared/array_predicate.h b/shared/array_predicate.h +new file mode 100644 +index 0000000..92e45b4 +--- /dev/null ++++ b/shared/array_predicate.h +@@ -0,0 +1,47 @@ ++// Copyright (C) 2021 - 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_ARRAY_PREDICATE_H ++#define ROCFFT_ARRAY_PREDICATE_H ++ ++#include "rocfft/rocfft.h" ++ ++namespace ++{ ++ bool array_type_is_complex(rocfft_array_type type) ++ { ++ return type == rocfft_array_type_complex_interleaved ++ || type == rocfft_array_type_complex_planar ++ || type == rocfft_array_type_hermitian_interleaved ++ || type == rocfft_array_type_hermitian_planar; ++ } ++ bool array_type_is_interleaved(rocfft_array_type type) ++ { ++ return type == rocfft_array_type_complex_interleaved ++ || type == rocfft_array_type_hermitian_interleaved; ++ } ++ bool array_type_is_planar(rocfft_array_type type) ++ { ++ return type == rocfft_array_type_complex_planar ++ || type == rocfft_array_type_hermitian_planar; ++ } ++} ++ ++#endif +diff --git a/shared/array_validator.cpp b/shared/array_validator.cpp +new file mode 100644 +index 0000000..70abb08 +--- /dev/null ++++ b/shared/array_validator.cpp +@@ -0,0 +1,549 @@ ++// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#include ++#include ++#include ++ ++#include "array_validator.h" ++#include "increment.h" ++ ++// Check a 2D array for collisions. ++// The 2D case can be determined via a number-theoretic argument. ++bool valid_length_stride_2d(const size_t l0, const size_t l1, const size_t s0, const size_t s1) ++{ ++ if(s0 == s1) ++ return false; ++ const auto c = std::lcm(s0, s1); ++ return !((s0 * (l0 - 1) >= c) && (s1 * (l1 - 1) >= c)); ++} ++ ++// Compare a 1D direction with a multi-index hyperface for collisions. ++bool valid_length_stride_1d_multi(const unsigned int idx, ++ const std::vector l, ++ const std::vector s, ++ const int verbose) ++{ ++ size_t l0{0}, s0{0}; ++ std::vector l1{}, s1{}; ++ for(unsigned int i = 0; i < l.size(); ++i) ++ { ++ if(i == idx) ++ { ++ l0 = l[i]; ++ s0 = s[i]; ++ } ++ else ++ { ++ l1.push_back(l[i]); ++ s1.push_back(s[i]); ++ } ++ } ++ ++ if(verbose > 4) ++ { ++ std::cout << "l0: " << l0 << "\ts0: " << s0 << std::endl; ++ } ++ ++ // We only need to go to the maximum pointer offset for (l1,s1). ++ const auto max_offset ++ = std::accumulate(l1.begin(), l1.end(), (size_t)1, std::multiplies()) ++ - std ::inner_product(l1.begin(), l1.end(), s1.begin(), (size_t)0); ++ std::unordered_set a0{}; ++ for(size_t i = 1; i < l0; ++i) ++ { ++ const auto val = i * s0; ++ if(val <= max_offset) ++ a0.insert(val); ++ else ++ break; ++ } ++ ++ if(verbose > 5) ++ { ++ std::cout << "a0:"; ++ for(auto i : a0) ++ std::cout << " " << i; ++ std::cout << std::endl; ++ ++ std::cout << "l1:"; ++ for(auto i : l1) ++ std::cout << " " << i; ++ std::cout << std::endl; ++ ++ std::cout << "s1:"; ++ for(auto i : s1) ++ std::cout << " " << i; ++ std::cout << std::endl; ++ } ++ ++ // TODO: this can be multi-threaded, since find(...) is thread-safe. ++ std::vector index(l1.size()); ++ std::fill(index.begin(), index.end(), 0); ++ do ++ { ++ const int i = std::inner_product(index.begin(), index.end(), s1.begin(), (size_t)0); ++ if(i > 0 && (i % s0 == 0)) ++ { ++ // TODO: use an ordered set and binary search ++ if(verbose > 6) ++ std::cout << i << std::endl; ++ if(a0.find(i) != a0.end()) ++ { ++ if(verbose > 4) ++ { ++ std::cout << "l0: " << l0 << "\ts0: " << s0 << std::endl; ++ std::cout << "l1:"; ++ for(const auto li : l1) ++ std::cout << " " << li; ++ std::cout << " s1:"; ++ for(const auto si : s1) ++ std::cout << " " << si; ++ std::cout << std::endl; ++ std::cout << "Found duplicate: " << i << std::endl; ++ } ++ return false; ++ } ++ } ++ } while(increment_rowmajor(index, l1)); ++ ++ return true; ++} ++ ++// Compare a hyperface with another hyperface for collisions. ++bool valid_length_stride_multi_multi(const std::vector l0, ++ const std::vector s0, ++ const std::vector l1, ++ const std::vector s1) ++{ ++ std::unordered_set a0{}; ++ ++ const auto max_offset ++ = std::accumulate(l1.begin(), l1.end(), (size_t)1, std::multiplies()) ++ - std::inner_product(l1.begin(), l1.end(), s1.begin(), (size_t)0); ++ std::vector index0(l0.size()); // TODO: check this ++ std::fill(index0.begin(), index0.end(), 0); ++ do ++ { ++ const auto i = std::inner_product(index0.begin(), index0.end(), s0.begin(), (size_t)0); ++ if(i > max_offset) ++ a0.insert(i); ++ } while(increment_rowmajor(index0, l0)); ++ ++ std::vector index1(l1.size()); ++ std::fill(index1.begin(), index1.end(), 0); ++ do ++ { ++ const auto i = std::inner_product(index1.begin(), index1.end(), s1.begin(), (size_t)0); ++ if(i > 0) ++ { ++ // TODO: use an ordered set and binary search ++ if(a0.find(i) != a0.end()) ++ { ++ ++ return false; ++ } ++ } ++ } while(increment_rowmajor(index1, l1)); ++ ++ return true; ++} ++ ++bool valid_length_stride_3d(const std::vector& l, ++ const std::vector& s, ++ const int verbose) ++{ ++ // Check that 2D faces are valid: ++ if(!valid_length_stride_2d(l[0], l[1], s[0], s[1])) ++ return false; ++ if(!valid_length_stride_2d(l[0], l[2], s[0], s[2])) ++ return false; ++ if(!valid_length_stride_2d(l[1], l[2], s[1], s[2])) ++ return false; ++ ++ // If the 2D faces are valid, check an axis vs a face for collisions: ++ bool invalid = false; ++#ifdef _OPENMP ++#pragma omp parallel for ++#endif ++ for(int idx = 0; idx < 3; ++idx) ++ { ++ if(!valid_length_stride_1d_multi(idx, l, s, verbose)) ++ { ++#ifdef _OPENMP ++#pragma omp cancel for ++#endif ++ invalid = true; ++ } ++ } ++ if(invalid) ++ return false; ++ return true; ++} ++ ++bool valid_length_stride_4d(const std::vector& l, ++ const std::vector& s, ++ const int verbose) ++{ ++ if(l.size() != 4) ++ { ++ throw std::runtime_error("Incorrect dimensions for valid_length_stride_4d"); ++ } ++ ++ // Check that 2D faces are valid: ++ for(int idx0 = 0; idx0 < 3; ++idx0) ++ { ++ for(int idx1 = idx0 + 1; idx1 < 4; ++idx1) ++ { ++ if(!valid_length_stride_2d(l[idx0], l[idx1], s[idx0], s[idx1])) ++ return false; ++ } ++ } ++ ++ bool invalid = false; ++ // Check that 1D vs 3D faces are valid: ++#ifdef _OPENMP ++#pragma omp parallel for ++#endif ++ for(int idx0 = 0; idx0 < 4; ++idx0) ++ { ++ if(!valid_length_stride_1d_multi(idx0, l, s, verbose)) ++ { ++#ifdef _OPENMP ++#pragma omp cancel for ++#endif ++ invalid = true; ++ } ++ } ++ if(invalid) ++ return false; ++ ++ // Check that 2D vs 2D faces are valid: ++ ++ // First, get all the permutations ++ std::vector> perms; ++ std::vector v(l.size()); ++ std::fill(v.begin(), v.begin() + 2, 0); ++ std::fill(v.begin() + 2, v.end(), 1); ++ do ++ { ++ perms.push_back(v); ++ if(verbose > 3) ++ { ++ std::cout << "v:"; ++ for(const auto i : v) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ } ++ } while(std::next_permutation(v.begin(), v.end())); ++ ++ // Then loop over all of the permutations. ++#ifdef _OPENMP ++#pragma omp parallel for ++#endif ++ for(size_t iperm = 0; iperm < perms.size(); ++iperm) ++ { ++ std::vector l0(2); ++ std::vector s0(2); ++ std::vector l1(2); ++ std::vector s1(2); ++ for(size_t i = 0; i < l.size(); ++i) ++ { ++ if(perms[iperm][i] == 0) ++ { ++ l0.push_back(l[i]); ++ s0.push_back(s[i]); ++ } ++ else ++ { ++ l1.push_back(l[i]); ++ s1.push_back(s[i]); ++ } ++ } ++ ++ if(verbose > 3) ++ { ++ std::cout << "\tl0:"; ++ for(const auto i : l0) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\ts0:"; ++ for(const auto i : s0) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\tl1:"; ++ for(const auto i : l1) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\ts1:"; ++ for(const auto i : s1) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ } ++ ++ if(!valid_length_stride_multi_multi(l0, s0, l1, s1)) ++ { ++#ifdef _OPENMP ++#pragma omp cancel for ++#endif ++ invalid = true; ++ } ++ } ++ if(invalid) ++ return false; ++ ++ return true; ++} ++ ++bool valid_length_stride_generald(const std::vector l, ++ const std::vector s, ++ const int verbose) ++{ ++ if(verbose > 2) ++ { ++ std::cout << "checking dimension " << l.size() << std::endl; ++ } ++ ++ // Recurse on d-1 hyper-faces: ++ for(unsigned int idx = 0; idx < l.size(); ++idx) ++ { ++ std::vector l0{}; ++ std::vector s0{}; ++ for(size_t i = 0; i < l.size(); ++i) ++ { ++ if(i != idx) ++ { ++ l0.push_back(l[i]); ++ s0.push_back(s[i]); ++ } ++ } ++ if(!array_valid(l0, s0, verbose)) ++ return false; ++ } ++ ++ // Handle the 1D vs (N-1) case: ++ for(unsigned int idx = 0; idx < l.size(); ++idx) ++ { ++ if(!valid_length_stride_1d_multi(idx, l, s, verbose)) ++ return false; ++ } ++ ++ for(size_t dim0 = 2; dim0 <= l.size() / 2; ++dim0) ++ { ++ const size_t dim1 = l.size() - dim0; ++ if(verbose > 2) ++ std::cout << "dims: " << dim0 << " " << dim1 << std::endl; ++ ++ // We iterate over all permutations of an array of length l.size() which contains dim0 zeros ++ // and dim1 ones. We start with {0, ..., 0, 1, ... 1} to guarantee that we hit all the ++ // possibilities. ++ ++ // First, get all the permutations ++ std::vector> perms; ++ std::vector v(l.size()); ++ std::fill(v.begin(), v.begin() + dim1, 0); ++ std::fill(v.begin() + dim1, v.end(), 1); ++ do ++ { ++ perms.push_back(v); ++ if(verbose > 3) ++ { ++ std::cout << "v:"; ++ for(const auto i : v) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ } ++ ++ } while(std::next_permutation(v.begin(), v.end())); ++ ++ bool invalid = false; ++ // Then loop over all of the permutations. ++#ifdef _OPENMP ++#pragma omp parallel for ++#endif ++ for(size_t iperm = 0; iperm < perms.size(); ++iperm) ++ { ++ std::vector l0(dim0); ++ std::vector s0(dim0); ++ std::vector l1(dim1); ++ std::vector s1(dim1); ++ ++ for(size_t i = 0; i < l.size(); ++i) ++ { ++ if(v[i] == 0) ++ { ++ l0.push_back(l[i]); ++ s0.push_back(s[i]); ++ } ++ else ++ { ++ l1.push_back(l[i]); ++ s1.push_back(s[i]); ++ } ++ } ++ ++ if(verbose > 3) ++ { ++ std::cout << "\tl0:"; ++ for(const auto i : l0) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\ts0:"; ++ for(const auto i : s0) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\tl1:"; ++ for(const auto i : l1) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ std::cout << "\ts1:"; ++ for(const auto i : s1) ++ { ++ std::cout << " " << i; ++ } ++ std::cout << "\n"; ++ } ++ ++ if(!valid_length_stride_multi_multi(l0, s0, l1, s1)) ++ { ++#ifdef _OPENMP ++#pragma omp cancel for ++#endif ++ invalid = true; ++ } ++ } ++ if(invalid) ++ return false; ++ } ++ ++ return true; ++} ++ ++bool sort_by_stride(const std::pair& ls0, const std::pair& ls1) ++{ ++ return ls0.second < ls1.second; ++} ++ ++bool array_valid(const std::vector& length, ++ const std::vector& stride, ++ const int verbose) ++{ ++ if(length.size() != stride.size()) ++ return false; ++ ++ // If a length is 1, then the stride is irrelevant. ++ // If a length is > 1, then the corresponding stride must be > 1. ++ std::vector l{}, s{}; ++ for(unsigned int i = 0; i < length.size(); ++i) ++ { ++ if(length[i] > 1) ++ { ++ if(stride[i] == 0) ++ return false; ++ l.push_back(length[i]); ++ s.push_back(stride[i]); ++ } ++ } ++ ++ if(length.size() > 1) ++ { ++ // Check happy path. ++ bool happy_path = true; ++ std::vector> ls; ++ for(size_t idx = 0; idx < length.size(); ++idx) ++ { ++ ls.push_back(std::pair(length[idx], stride[idx])); ++ } ++ std::sort(ls.begin(), ls.end(), sort_by_stride); ++ ++ if(verbose > 2) ++ { ++ for(size_t idx = 0; idx < ls.size(); ++idx) ++ { ++ std::cout << ls[idx].first << "\t" << ls[idx].second << "\n"; ++ } ++ } ++ ++ for(size_t idx = 1; idx < ls.size(); ++idx) ++ { ++ if(ls[idx].second < ls[idx - 1].first * ls[idx - 1].second) ++ { ++ happy_path = false; ++ break; ++ } ++ } ++ if(happy_path) ++ { ++ if(verbose > 2) ++ { ++ std::cout << "happy path\n"; ++ } ++ return true; ++ } ++ } ++ ++ switch(l.size()) ++ { ++ case 0: ++ return true; ++ break; ++ case 1: ++ return s[0] != 0; ++ break; ++ case 2: ++ { ++ return valid_length_stride_2d(l[0], l[1], s[0], s[1]); ++ break; ++ } ++ case 3: ++ { ++ return valid_length_stride_3d(l, s, verbose); ++ break; ++ } ++ case 4: ++ { ++ return valid_length_stride_4d(l, s, verbose); ++ break; ++ } ++ default: ++ return valid_length_stride_generald(l, s, verbose); ++ return true; ++ } ++ ++ return true; ++} +diff --git a/shared/array_validator.h b/shared/array_validator.h +new file mode 100644 +index 0000000..ce85173 +--- /dev/null ++++ b/shared/array_validator.h +@@ -0,0 +1,31 @@ ++// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ARRAY_VALIDATOR_H ++#define ARRAY_VALIDATOR_H ++ ++#include ++ ++// Checks whether the array with given length and stride has multi-index collisions. ++bool array_valid(const std::vector& length, ++ const std::vector& stride, ++ const int verbose = 0); ++ ++#endif +diff --git a/shared/concurrency.h b/shared/concurrency.h +new file mode 100644 +index 0000000..a36c7c1 +--- /dev/null ++++ b/shared/concurrency.h +@@ -0,0 +1,41 @@ ++// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++ ++#include ++ ++#ifndef WIN32 ++#include ++#endif ++ ++// work out how many parallel tasks to run, based on available ++// resources. on Linux, this will look at the cpu affinity mask (if ++// available) which might be restricted in a container. otherwise, ++// return std::thread::hardware_concurrency(). ++static unsigned int rocfft_concurrency() ++{ ++#ifndef WIN32 ++ cpu_set_t cpuset; ++ if(sched_getaffinity(0, sizeof(cpuset), &cpuset) == 0) ++ return CPU_COUNT(&cpuset); ++#endif ++ return std::thread::hardware_concurrency(); ++} +diff --git a/shared/data_gen_device.h b/shared/data_gen_device.h +new file mode 100644 +index 0000000..77fb012 +--- /dev/null ++++ b/shared/data_gen_device.h +@@ -0,0 +1,1303 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef DATA_GEN_DEVICE_H ++#define DATA_GEN_DEVICE_H ++ ++// rocRAND can generate warnings if inline asm is not available for ++// some architectures. data generation isn't performance-critical, ++// so just disable inline asm to prevent the warnings. ++#define ROCRAND_DISABLE_INLINE_ASM ++ ++#include "../shared/arithmetic.h" ++#include "../shared/device_properties.h" ++#include "../shared/gpubuf.h" ++#include "../shared/increment.h" ++#include "../shared/rocfft_complex.h" ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static const unsigned int DATA_GEN_THREADS = 8; ++static const unsigned int DATA_GEN_GRID_Y_MAX = 64; ++ ++template ++struct input_val_1D ++{ ++ T val1; ++}; ++ ++template ++struct input_val_2D ++{ ++ T val1; ++ T val2; ++}; ++ ++template ++struct input_val_3D ++{ ++ T val1; ++ T val2; ++ T val3; ++}; ++ ++template ++static input_val_1D get_input_val(const T& val) ++{ ++ return input_val_1D{val}; ++} ++ ++template ++static input_val_2D get_input_val(const std::tuple& val) ++{ ++ return input_val_2D{std::get<0>(val), std::get<1>(val)}; ++} ++ ++template ++static input_val_3D get_input_val(const std::tuple& val) ++{ ++ return input_val_3D{std::get<0>(val), std::get<1>(val), std::get<2>(val)}; ++} ++ ++template ++__device__ static size_t ++ compute_index(const input_val_1D& length, const input_val_1D& stride, size_t base) ++{ ++ return (length.val1 * stride.val1) + base; ++} ++ ++template ++__device__ static size_t ++ compute_index(const input_val_2D& length, const input_val_2D& stride, size_t base) ++{ ++ return (length.val1 * stride.val1) + (length.val2 * stride.val2) + base; ++} ++ ++template ++__device__ static size_t ++ compute_index(const input_val_3D& length, const input_val_3D& stride, size_t base) ++{ ++ return (length.val1 * stride.val1) + (length.val2 * stride.val2) + (length.val3 * stride.val3) ++ + base; ++} ++ ++template ++static inline input_val_1D make_zero_length(const input_val_1D& whole_length) ++{ ++ return input_val_1D{0}; ++} ++ ++template ++static inline input_val_2D make_zero_length(const input_val_2D& whole_length) ++{ ++ return input_val_2D{0, 0}; ++} ++ ++template ++static inline input_val_3D make_zero_length(const input_val_3D& whole_length) ++{ ++ return input_val_3D{0, 0, 0}; ++} ++ ++template ++static inline input_val_1D make_unit_stride(const input_val_1D& whole_length) ++{ ++ return input_val_1D{1}; ++} ++ ++template ++static inline input_val_2D make_unit_stride(const input_val_2D& whole_length) ++{ ++ return input_val_2D{1, whole_length.val1}; ++} ++ ++template ++static inline input_val_3D make_unit_stride(const input_val_3D& whole_length) ++{ ++ return input_val_3D{1, whole_length.val1, whole_length.val1 * whole_length.val2}; ++} ++ ++template ++__device__ static input_val_1D get_length(const size_t i, const input_val_1D& whole_length) ++{ ++ auto xlen = whole_length.val1; ++ ++ auto xidx = i % xlen; ++ ++ return input_val_1D{xidx}; ++} ++ ++template ++__device__ static input_val_2D get_length(const size_t i, const input_val_2D& whole_length) ++{ ++ auto xlen = whole_length.val1; ++ auto ylen = whole_length.val2; ++ ++ auto xidx = i % xlen; ++ auto yidx = i / xlen % ylen; ++ ++ return input_val_2D{xidx, yidx}; ++} ++ ++template ++__device__ static input_val_3D get_length(const size_t i, const input_val_3D& whole_length) ++{ ++ auto xlen = whole_length.val1; ++ auto ylen = whole_length.val2; ++ auto zlen = whole_length.val3; ++ ++ auto xidx = i % xlen; ++ auto yidx = i / xlen % ylen; ++ auto zidx = i / xlen / ylen % zlen; ++ ++ return input_val_3D{xidx, yidx, zidx}; ++} ++ ++template ++__device__ static size_t get_batch(const size_t i, const input_val_1D& whole_length) ++{ ++ auto xlen = whole_length.val1; ++ ++ auto yidx = i / xlen; ++ ++ return yidx; ++} ++ ++template ++__device__ static size_t get_batch(const size_t i, const input_val_2D& whole_length) ++{ ++ auto xlen = whole_length.val1; ++ auto ylen = whole_length.val2; ++ ++ auto zidx = i / xlen / ylen; ++ ++ return zidx; ++} ++ ++template ++__device__ static size_t get_batch(const size_t i, const input_val_3D& length) ++{ ++ auto xlen = length.val1; ++ auto ylen = length.val2; ++ auto zlen = length.val3; ++ ++ auto widx = i / xlen / ylen / zlen; ++ ++ return widx; ++} ++ ++__device__ static double make_random_val(hiprandStatePhilox4_32_10* gen_state, double offset) ++{ ++ return hiprand_uniform_double(gen_state) + offset; ++} ++ ++__device__ static float make_random_val(hiprandStatePhilox4_32_10* gen_state, float offset) ++{ ++ return hiprand_uniform(gen_state) + offset; ++} ++ ++__device__ static _Float16 make_random_val(hiprandStatePhilox4_32_10* gen_state, _Float16 offset) ++{ ++ return static_cast<_Float16>(hiprand_uniform(gen_state)) + offset; ++} ++ ++template ++__device__ static void set_imag_zero(const size_t pos, Tcomplex* x) ++{ ++ x[pos].y = 0.0; ++} ++ ++template ++__device__ static void set_imag_zero(const size_t pos, Tfloat* xreal, Tfloat* ximag) ++{ ++ ximag[pos] = 0.0; ++} ++ ++template ++__device__ static void conjugate(const size_t pos, const size_t cpos, Tcomplex* x) ++{ ++ x[pos].x = x[cpos].x; ++ x[pos].y = -x[cpos].y; ++} ++ ++template ++__device__ static void conjugate(const size_t pos, const size_t cpos, Tfloat* xreal, Tfloat* ximag) ++{ ++ xreal[pos] = xreal[cpos]; ++ ximag[pos] = -ximag[cpos]; ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_random_interleaved_data_kernel(const Tint whole_length, ++ const Tint zero_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ rocfft_complex* data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ auto i_length = get_length(i, whole_length); ++ auto i_batch = get_batch(i, whole_length); ++ auto i_base = i_batch * idist; ++ ++ auto seed = compute_index(zero_length, istride, i_base); ++ auto idx = compute_index(i_length, istride, i_base); ++ ++ hiprandStatePhilox4_32_10 gen_state; ++ hiprand_init(seed, idx, 0, &gen_state); ++ ++ data[idx].x = make_random_val(&gen_state, static_cast(-0.5)); ++ data[idx].y = make_random_val(&gen_state, static_cast(-0.5)); ++ } ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_interleaved_data_kernel(const Tint whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ const Tint ustride, ++ const Treal inv_scale, ++ rocfft_complex* data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ const auto i_length = get_length(i, whole_length); ++ const auto i_batch = get_batch(i, whole_length); ++ const auto i_base = i_batch * idist; ++ ++ const auto val = static_cast(-0.5) ++ + static_cast( ++ static_cast(compute_index(i_length, ustride, 0))) ++ * inv_scale; ++ ++ const auto idx = compute_index(i_length, istride, i_base); ++ ++ data[idx].x = val; ++ data[idx].y = val; ++ } ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_random_planar_data_kernel(const Tint whole_length, ++ const Tint zero_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ Treal* real_data, ++ Treal* imag_data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ auto i_length = get_length(i, whole_length); ++ auto i_batch = get_batch(i, whole_length); ++ auto i_base = i_batch * idist; ++ ++ auto seed = compute_index(zero_length, istride, i_base); ++ auto idx = compute_index(i_length, istride, i_base); ++ ++ hiprandStatePhilox4_32_10 gen_state; ++ hiprand_init(seed, idx, 0, &gen_state); ++ ++ real_data[idx] = make_random_val(&gen_state, static_cast(-0.5)); ++ imag_data[idx] = make_random_val(&gen_state, static_cast(-0.5)); ++ } ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_planar_data_kernel(const Tint whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ const Tint ustride, ++ const Treal inv_scale, ++ Treal* real_data, ++ Treal* imag_data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ const auto i_length = get_length(i, whole_length); ++ const auto i_batch = get_batch(i, whole_length); ++ const auto i_base = i_batch * idist; ++ ++ const auto val = static_cast(-0.5) ++ + static_cast( ++ static_cast(compute_index(i_length, ustride, 0))) ++ * inv_scale; ++ ++ const auto idx = compute_index(i_length, istride, i_base); ++ ++ real_data[idx] = val; ++ imag_data[idx] = val; ++ } ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_random_real_data_kernel(const Tint whole_length, ++ const Tint zero_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ Treal* data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ auto i_length = get_length(i, whole_length); ++ auto i_batch = get_batch(i, whole_length); ++ auto i_base = i_batch * idist; ++ ++ auto seed = compute_index(zero_length, istride, i_base); ++ auto idx = compute_index(i_length, istride, i_base); ++ ++ hiprandStatePhilox4_32_10 gen_state; ++ hiprand_init(seed, idx, 0, &gen_state); ++ ++ data[idx] = make_random_val(&gen_state, static_cast(-0.5)); ++ } ++} ++ ++template ++__global__ static void __launch_bounds__(DATA_GEN_THREADS) ++ generate_real_data_kernel(const Tint whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint istride, ++ const Tint ustride, ++ const Treal inv_scale, ++ Treal* data) ++{ ++ auto const i = static_cast(threadIdx.x) + blockIdx.x * blockDim.x ++ + blockIdx.y * gridDim.x * DATA_GEN_THREADS; ++ static_assert(sizeof(i) >= sizeof(isize)); ++ if(i < isize) ++ { ++ const auto i_length = get_length(i, whole_length); ++ const auto i_batch = get_batch(i, whole_length); ++ const auto i_base = i_batch * idist; ++ ++ const auto val = static_cast(-0.5) ++ + static_cast( ++ static_cast(compute_index(i_length, ustride, 0))) ++ * inv_scale; ++ ++ const auto idx = compute_index(i_length, istride, i_base); ++ ++ data[idx] = val; ++ } ++} ++ ++// For complex-to-real transforms, the input data must be Hermitiam-symmetric. ++// That is, u_k is the complex conjugate of u_{-k}, where k is the wavevector in Fourier ++// space. For multi-dimensional data, this means that we only need to store a bit more ++// than half of the complex values; the rest are redundant. However, there are still ++// some restrictions: ++// * the origin and Nyquist value(s) must be real-valued ++// * some of the remaining values are still redundant, and you might get different results ++// than you expect if the values don't agree. ++ ++template ++__global__ static void impose_hermitian_symmetry_interleaved_1D_kernel(Tcomplex* x, ++ const size_t Nx, ++ const size_t xstride, ++ const size_t dist, ++ const size_t batch_total, ++ const bool Nxeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ id_batch *= dist; ++ ++ set_imag_zero(id_batch, x); ++ ++ if(Nxeven) ++ set_imag_zero(id_batch + (Nx / 2) * xstride, x); ++ } ++} ++ ++template ++__global__ static void impose_hermitian_symmetry_planar_1D_kernel(Tfloat* xreal, ++ Tfloat* ximag, ++ const size_t Nx, ++ const size_t xstride, ++ const size_t dist, ++ const size_t batch_total, ++ const bool Nxeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ id_batch *= dist; ++ ++ set_imag_zero(id_batch, xreal, ximag); ++ ++ if(Nxeven) ++ set_imag_zero(id_batch + (Nx / 2) * xstride, xreal, ximag); ++ } ++} ++ ++template ++__global__ static void impose_hermitian_symmetry_interleaved_2D_kernel(Tcomplex* x, ++ const size_t Nx, ++ const size_t Ny, ++ const size_t xstride, ++ const size_t ystride, ++ const size_t dist, ++ const size_t batch_total, ++ const size_t x_total, ++ const bool Nxeven, ++ const bool Nyeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ const auto id_x = static_cast(threadIdx.y) + blockIdx.y * blockDim.y; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ static_assert(sizeof(id_x) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ id_batch *= dist; ++ ++ if(id_x == 0) ++ set_imag_zero(id_batch, x); ++ ++ if(id_x == 0 && Nxeven) ++ set_imag_zero(id_batch + (Nx / 2) * xstride, x); ++ ++ if(id_x == 0 && Nyeven) ++ set_imag_zero(id_batch + ystride * (Ny / 2), x); ++ ++ if(id_x == 0 && Nxeven && Nyeven) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2), x); ++ ++ if(id_x < x_total) ++ { ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)), id_batch + xstride * (id_x + 1), x); ++ ++ if(Nyeven) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (Ny / 2), ++ x); ++ } ++ } ++} ++ ++template ++__global__ static void impose_hermitian_symmetry_planar_2D_kernel(Tfloat* xreal, ++ Tfloat* ximag, ++ const size_t Nx, ++ const size_t Ny, ++ const size_t xstride, ++ const size_t ystride, ++ const size_t dist, ++ const size_t batch_total, ++ const size_t x_total, ++ const bool Nxeven, ++ const bool Nyeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ const auto id_x = static_cast(threadIdx.y) + blockIdx.y * blockDim.y; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ static_assert(sizeof(id_x) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ id_batch *= dist; ++ ++ if(id_x == 0) ++ set_imag_zero(id_batch, xreal, ximag); ++ ++ if(id_x == 0 && Nxeven) ++ set_imag_zero(id_batch + (Nx / 2) * xstride, xreal, ximag); ++ ++ if(id_x == 0 && Nyeven) ++ set_imag_zero(id_batch + ystride * (Ny / 2), xreal, ximag); ++ ++ if(id_x == 0 && Nxeven && Nyeven) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2), xreal, ximag); ++ ++ if(id_x < x_total) ++ { ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)), ++ id_batch + xstride * (id_x + 1), ++ xreal, ++ ximag); ++ ++ if(Nyeven) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (Ny / 2), ++ xreal, ++ ximag); ++ } ++ } ++} ++ ++template ++__global__ static void impose_hermitian_symmetry_interleaved_3D_kernel(Tcomplex* x, ++ const size_t Nx, ++ const size_t Ny, ++ const size_t Nz, ++ const size_t xstride, ++ const size_t ystride, ++ const size_t zstride, ++ const size_t dist, ++ const size_t batch_total, ++ const size_t x_total, ++ const size_t y_total, ++ const size_t y_total_half, ++ const bool Nxeven, ++ const bool Nyeven, ++ const bool Nzeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ const auto id_x = static_cast(threadIdx.y) + blockIdx.y * blockDim.y; ++ const auto id_y = static_cast(threadIdx.z) + blockIdx.z * blockDim.z; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ static_assert(sizeof(id_x) == sizeof(size_t)); ++ static_assert(sizeof(id_y) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ auto id_x_y_zero = (id_x == 0 && id_y == 0); ++ ++ id_batch *= dist; ++ ++ if(id_x_y_zero) ++ set_imag_zero(id_batch, x); ++ ++ if(Nxeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2), x); ++ ++ if(Nyeven && id_x_y_zero) ++ set_imag_zero(id_batch + ystride * (Ny / 2), x); ++ ++ if(Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + zstride * (Nz / 2), x); ++ ++ if(Nxeven && Nyeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2), x); ++ ++ if(Nxeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + zstride * (Nz / 2), x); ++ ++ if(Nyeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + ystride * (Ny / 2) + zstride * (Nz / 2), x); ++ ++ if(Nxeven && Nyeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2) + zstride * (Nz / 2), ++ x); ++ ++ if(id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + ystride * (Ny - (id_y + 1)), id_batch + ystride * (id_y + 1), x); ++ ++ if(Nxeven && id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + xstride * (Nx / 2) + ystride * (Ny - (id_y + 1)), ++ id_batch + xstride * (Nx / 2) + ystride * (id_y + 1), ++ x); ++ ++ if(id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)), id_batch + xstride * (id_x + 1), x); ++ ++ if(Nyeven && id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (Ny / 2), ++ x); ++ ++ if(id_x < x_total && id_y < y_total) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny - (id_y + 1)), ++ id_batch + xstride * (id_x + 1) + ystride * (id_y + 1), ++ x); ++ ++ if(Nzeven) ++ { ++ if(id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + zstride * (Nz / 2), ++ x); ++ ++ if(Nyeven && id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + zstride * (Nz / 2), ++ x); ++ ++ if(id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + ystride * (Ny - (id_y + 1)) + zstride * (Nz / 2), ++ id_batch + ystride * (id_y + 1) + zstride * (Nz / 2), ++ x); ++ ++ if(Nxeven && id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + xstride * (Nx / 2) + ystride * (Ny - (id_y + 1)) ++ + zstride * (Nz / 2), ++ id_batch + xstride * (Nx / 2) + ystride * (id_y + 1) + zstride * (Nz / 2), ++ x); ++ ++ if(id_x < x_total && id_y < y_total) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny - (id_y + 1)) ++ + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (id_y + 1) ++ + zstride * (Nz / 2), ++ x); ++ } ++ } ++} ++ ++template ++__global__ static void impose_hermitian_symmetry_planar_3D_kernel(Tfloat* xreal, ++ Tfloat* ximag, ++ const size_t Nx, ++ const size_t Ny, ++ const size_t Nz, ++ const size_t xstride, ++ const size_t ystride, ++ const size_t zstride, ++ const size_t dist, ++ const size_t batch_total, ++ const size_t x_total, ++ const size_t y_total, ++ const size_t y_total_half, ++ const bool Nxeven, ++ const bool Nyeven, ++ const bool Nzeven) ++{ ++ auto id_batch = static_cast(threadIdx.x) + blockIdx.x * blockDim.x; ++ const auto id_x = static_cast(threadIdx.y) + blockIdx.y * blockDim.y; ++ const auto id_y = static_cast(threadIdx.z) + blockIdx.z * blockDim.z; ++ static_assert(sizeof(id_batch) == sizeof(size_t)); ++ static_assert(sizeof(id_x) == sizeof(size_t)); ++ static_assert(sizeof(id_y) == sizeof(size_t)); ++ ++ if(id_batch < batch_total) ++ { ++ auto id_x_y_zero = (id_x == 0 && id_y == 0); ++ ++ id_batch *= dist; ++ ++ if(id_x_y_zero) ++ set_imag_zero(id_batch, xreal, ximag); ++ ++ if(Nxeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2), xreal, ximag); ++ ++ if(Nyeven && id_x_y_zero) ++ set_imag_zero(id_batch + ystride * (Ny / 2), xreal, ximag); ++ ++ if(Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + zstride * (Nz / 2), xreal, ximag); ++ ++ if(Nxeven && Nyeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2), xreal, ximag); ++ ++ if(Nxeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + zstride * (Nz / 2), xreal, ximag); ++ ++ if(Nyeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + ystride * (Ny / 2) + zstride * (Nz / 2), xreal, ximag); ++ ++ if(Nxeven && Nyeven && Nzeven && id_x_y_zero) ++ set_imag_zero(id_batch + xstride * (Nx / 2) + ystride * (Ny / 2) + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ ++ if(id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + ystride * (Ny - (id_y + 1)), ++ id_batch + ystride * (id_y + 1), ++ xreal, ++ ximag); ++ ++ if(Nxeven && id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + xstride * (Nx / 2) + ystride * (Ny - (id_y + 1)), ++ id_batch + xstride * (Nx / 2) + ystride * (id_y + 1), ++ xreal, ++ ximag); ++ ++ if(id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)), ++ id_batch + xstride * (id_x + 1), ++ xreal, ++ ximag); ++ ++ if(Nyeven && id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (Ny / 2), ++ xreal, ++ ximag); ++ ++ if(id_x < x_total && id_y < y_total) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny - (id_y + 1)), ++ id_batch + xstride * (id_x + 1) + ystride * (id_y + 1), ++ xreal, ++ ximag); ++ ++ if(Nzeven) ++ { ++ if(id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ ++ if(Nyeven && id_x < x_total && id_y == 0) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ ++ if(id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + ystride * (Ny - (id_y + 1)) + zstride * (Nz / 2), ++ id_batch + ystride * (id_y + 1) + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ ++ if(Nxeven && id_x == 0 && id_y < y_total_half) ++ conjugate(id_batch + xstride * (Nx / 2) + ystride * (Ny - (id_y + 1)) ++ + zstride * (Nz / 2), ++ id_batch + xstride * (Nx / 2) + ystride * (id_y + 1) + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ ++ if(id_x < x_total && id_y < y_total) ++ conjugate(id_batch + xstride * (Nx - (id_x + 1)) + ystride * (Ny - (id_y + 1)) ++ + zstride * (Nz / 2), ++ id_batch + xstride * (id_x + 1) + ystride * (id_y + 1) ++ + zstride * (Nz / 2), ++ xreal, ++ ximag); ++ } ++ } ++} ++ ++// get grid dimensions for data gen kernel ++static dim3 generate_data_gridDim(const size_t isize) ++{ ++ auto blockSize = DATA_GEN_THREADS; ++ // total number of blocks needed in the grid ++ auto numBlocks_setup = DivRoundingUp(isize, blockSize); ++ ++ // Total work items per dimension in the grid is counted in ++ // uint32_t. Since each thread initializes one element, very ++ // large amounts of data will overflow this total size if we do ++ // all this work in one grid dimension, causing launch failure. ++ // ++ // CUDA also generally allows for effectively unlimited grid X ++ // dim, but Y and Z are more limited. ++ auto gridDim_y = std::min(DATA_GEN_GRID_Y_MAX, numBlocks_setup); ++ auto gridDim_x = DivRoundingUp(numBlocks_setup, DATA_GEN_GRID_Y_MAX); ++ return {gridDim_x, gridDim_y}; ++} ++ ++// get grid dimensions for hermitian symmetrizer kernel ++static dim3 generate_hermitian_gridDim(const std::vector& length, ++ const size_t batch, ++ const size_t blockSize) ++{ ++ dim3 gridDim; ++ ++ switch(length.size()) ++ { ++ case 1: ++ gridDim = dim3(DivRoundingUp(batch, blockSize)); ++ break; ++ case 2: ++ gridDim = dim3(DivRoundingUp(batch, blockSize), ++ DivRoundingUp((length[0] + 1) / 2 - 1, blockSize)); ++ break; ++ case 3: ++ gridDim = dim3(DivRoundingUp(batch, blockSize), ++ DivRoundingUp((length[0] + 1) / 2 - 1, blockSize), ++ DivRoundingUp(length[1] - 1, blockSize)); ++ break; ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++ ++ return gridDim; ++} ++ ++static dim3 generate_blockDim(const std::vector& length, const size_t blockSize) ++{ ++ dim3 blockDim; ++ ++ switch(length.size()) ++ { ++ case 1: ++ blockDim = dim3(blockSize); ++ break; ++ case 2: ++ blockDim = dim3(blockSize, blockSize); ++ break; ++ case 3: ++ blockDim = dim3(blockSize, blockSize, blockSize); ++ break; ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++ ++ return blockDim; ++} ++ ++template ++static void generate_random_interleaved_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ rocfft_complex* input_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ auto input_length = get_input_val(whole_length); ++ auto zero_length = make_zero_length(input_length); ++ auto input_stride = get_input_val(whole_stride); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_random_interleaved_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL( ++ HIP_KERNEL_NAME(generate_random_interleaved_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ zero_length, ++ idist, ++ isize, ++ input_stride, ++ input_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_random_interleaved_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void generate_interleaved_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ const size_t nbatch, ++ rocfft_complex* input_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ const auto input_length = get_input_val(whole_length); ++ const auto input_stride = get_input_val(whole_stride); ++ const auto unit_stride = make_unit_stride(input_length); ++ ++ const auto inv_scale ++ = static_cast(1.0) ++ / static_cast(static_cast(isize) / nbatch - 1); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_interleaved_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL( ++ HIP_KERNEL_NAME(generate_interleaved_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ idist, ++ isize, ++ input_stride, ++ unit_stride, ++ inv_scale, ++ input_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_interleaved_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void generate_random_planar_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ Treal* real_data, ++ Treal* imag_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ const auto input_length = get_input_val(whole_length); ++ const auto zero_length = make_zero_length(input_length); ++ const auto input_stride = get_input_val(whole_stride); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_random_planar_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL( ++ HIP_KERNEL_NAME(generate_random_planar_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ zero_length, ++ idist, ++ isize, ++ input_stride, ++ real_data, ++ imag_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_random_planar_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void generate_planar_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ const size_t nbatch, ++ Treal* real_data, ++ Treal* imag_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ const auto input_length = get_input_val(whole_length); ++ const auto input_stride = get_input_val(whole_stride); ++ const auto unit_stride = make_unit_stride(input_length); ++ ++ const auto inv_scale ++ = static_cast(1.0) ++ / static_cast(static_cast(isize) / nbatch - 1); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_planar_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(HIP_KERNEL_NAME(generate_planar_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ idist, ++ isize, ++ input_stride, ++ unit_stride, ++ inv_scale, ++ real_data, ++ imag_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_planar_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void generate_random_real_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ Treal* input_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ const auto input_length = get_input_val(whole_length); ++ const auto zero_length = make_zero_length(input_length); ++ const auto input_stride = get_input_val(whole_stride); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_random_real_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL( ++ HIP_KERNEL_NAME(generate_random_real_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ zero_length, ++ idist, ++ isize, ++ input_stride, ++ input_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_random_real_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void generate_real_data(const Tint& whole_length, ++ const size_t idist, ++ const size_t isize, ++ const Tint& whole_stride, ++ const size_t nbatch, ++ Treal* input_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ const auto input_length = get_input_val(whole_length); ++ const auto input_stride = get_input_val(whole_stride); ++ const auto unit_stride = make_unit_stride(input_length); ++ ++ const auto inv_scale ++ = static_cast(1.0) ++ / static_cast(static_cast(isize) / nbatch - 1); ++ ++ dim3 gridDim = generate_data_gridDim(isize); ++ dim3 blockDim{DATA_GEN_THREADS}; ++ ++ launch_limits_check("generate_real_data_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(HIP_KERNEL_NAME(generate_real_data_kernel), ++ gridDim, ++ blockDim, ++ 0, // sharedMemBytes ++ 0, // stream ++ input_length, ++ idist, ++ isize, ++ input_stride, ++ unit_stride, ++ inv_scale, ++ input_data); ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("generate_real_data_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void impose_hermitian_symmetry_interleaved(const std::vector& length, ++ const std::vector& ilength, ++ const std::vector& stride, ++ const size_t dist, ++ const size_t batch, ++ Tcomplex* input_data, ++ const hipDeviceProp_t& deviceProp) ++{ ++ auto blockSize = DATA_GEN_THREADS; ++ auto blockDim = generate_blockDim(length, blockSize); ++ auto gridDim = generate_hermitian_gridDim(length, batch, blockSize); ++ ++ switch(length.size()) ++ { ++ case 1: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_interleaved_1D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_interleaved_1D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data, ++ length[0], ++ stride[0], ++ dist, ++ batch, ++ length[0] % 2 == 0); ++ ++ break; ++ } ++ case 2: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_interleaved_2D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_interleaved_2D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data, ++ length[0], ++ length[1], ++ stride[0], ++ stride[1], ++ dist, ++ batch, ++ (ilength[0] + 1) / 2 - 1, ++ length[0] % 2 == 0, ++ length[1] % 2 == 0); ++ ++ break; ++ } ++ case 3: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_interleaved_3D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_interleaved_3D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data, ++ length[0], ++ length[1], ++ length[2], ++ stride[0], ++ stride[1], ++ stride[2], ++ dist, ++ batch, ++ (ilength[0] + 1) / 2 - 1, ++ ilength[1] - 1, ++ (ilength[1] + 1) / 2 - 1, ++ length[0] % 2 == 0, ++ length[1] % 2 == 0, ++ length[2] % 2 == 0); ++ break; ++ } ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("impose_hermitian_symmetry_interleaved_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++template ++static void impose_hermitian_symmetry_planar(const std::vector& length, ++ const std::vector& ilength, ++ const std::vector& stride, ++ const size_t dist, ++ const size_t batch, ++ Tfloat* input_data_real, ++ Tfloat* input_data_imag, ++ const hipDeviceProp_t& deviceProp) ++{ ++ auto blockSize = DATA_GEN_THREADS; ++ auto blockDim = generate_blockDim(length, blockSize); ++ auto gridDim = generate_hermitian_gridDim(length, batch, blockSize); ++ ++ switch(length.size()) ++ { ++ case 1: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_planar_1D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_planar_1D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data_real, ++ input_data_imag, ++ length[0], ++ stride[0], ++ dist, ++ batch, ++ length[0] % 2 == 0); ++ ++ break; ++ } ++ case 2: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_planar_2D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_planar_2D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data_real, ++ input_data_imag, ++ length[0], ++ length[1], ++ stride[0], ++ stride[1], ++ dist, ++ batch, ++ (ilength[0] + 1) / 2 - 1, ++ length[0] % 2 == 0, ++ length[1] % 2 == 0); ++ ++ break; ++ } ++ case 3: ++ { ++ launch_limits_check( ++ "impose_hermitian_symmetry_planar_3D_kernel", gridDim, blockDim, deviceProp); ++ ++ hipLaunchKernelGGL(impose_hermitian_symmetry_planar_3D_kernel, ++ gridDim, ++ blockDim, ++ 0, ++ 0, ++ input_data_real, ++ input_data_imag, ++ length[0], ++ length[1], ++ length[2], ++ stride[0], ++ stride[1], ++ stride[2], ++ dist, ++ batch, ++ (ilength[0] + 1) / 2 - 1, ++ ilength[1] - 1, ++ (ilength[1] + 1) / 2 - 1, ++ length[0] % 2 == 0, ++ length[1] % 2 == 0, ++ length[2] % 2 == 0); ++ break; ++ } ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++ auto err = hipGetLastError(); ++ if(err != hipSuccess) ++ throw std::runtime_error("impose_hermitian_symmetry_planar_kernel launch failure: " ++ + std::string(hipGetErrorName(err))); ++} ++ ++#endif // DATA_GEN_DEVICE_H +diff --git a/shared/data_gen_host.h b/shared/data_gen_host.h +new file mode 100644 +index 0000000..29d3854 +--- /dev/null ++++ b/shared/data_gen_host.h +@@ -0,0 +1,881 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef DATA_GEN_HOST_H ++#define DATA_GEN_HOST_H ++ ++#include "../shared/hostbuf.h" ++#include "../shared/increment.h" ++#include ++#include ++#include ++#include ++#include ++ ++// Specialized computation of index given 1-, 2-, 3- dimension length + stride ++template ++size_t compute_index(T1 length, T2 stride, size_t base) ++{ ++ return (length * stride) + base; ++} ++ ++template ++size_t ++ compute_index(const std::tuple& length, const std::tuple& stride, size_t base) ++{ ++ static_assert(std::is_integral::value, "Integral required."); ++ static_assert(std::is_integral::value, "Integral required."); ++ return (std::get<0>(length) * std::get<0>(stride)) + (std::get<1>(length) * std::get<1>(stride)) ++ + base; ++} ++ ++template ++size_t compute_index(const std::tuple& length, ++ const std::tuple& stride, ++ size_t base) ++{ ++ static_assert(std::is_integral::value, "Integral required."); ++ static_assert(std::is_integral::value, "Integral required."); ++ return (std::get<0>(length) * std::get<0>(stride)) + (std::get<1>(length) * std::get<1>(stride)) ++ + (std::get<2>(length) * std::get<2>(stride)) + base; ++} ++ ++// count the number of total iterations for 1-, 2-, and 3-D dimensions ++template ++size_t count_iters(const T1& i) ++{ ++ return i; ++} ++ ++template ++size_t count_iters(const std::tuple& i) ++{ ++ return std::get<0>(i) * std::get<1>(i); ++} ++ ++template ++size_t count_iters(const std::tuple& i) ++{ ++ return std::get<0>(i) * std::get<1>(i) * std::get<2>(i); ++} ++ ++template ++T1 make_unit_stride(const T1& whole_length) ++{ ++ return static_cast(1); ++} ++ ++template ++std::tuple make_unit_stride(const std::tuple& whole_length) ++{ ++ return std::make_tuple(static_cast(1), static_cast(std::get<0>(whole_length))); ++} ++ ++template ++std::tuple make_unit_stride(const std::tuple& whole_length) ++{ ++ return std::make_tuple(static_cast(1), ++ static_cast(std::get<0>(whole_length)), ++ static_cast(std::get<0>(whole_length)) ++ * static_cast(std::get<1>(whole_length))); ++} ++ ++// Work out how many partitions to break our iteration problem into ++template ++static size_t compute_partition_count(T1 length) ++{ ++#ifdef _OPENMP ++ // we seem to get contention from too many threads, which slows ++ // things down. particularly noticeable with mix_3D tests ++ static const size_t MAX_PARTITIONS = 8; ++ size_t iters = count_iters(length); ++ size_t hw_threads = std::min(MAX_PARTITIONS, static_cast(omp_get_num_procs())); ++ if(!hw_threads) ++ return 1; ++ ++ // don't bother threading problem sizes that are too small. pick ++ // an arbitrary number of iterations and ensure that each thread ++ // has at least that many iterations to process ++ static const size_t MIN_ITERS_PER_THREAD = 2048; ++ ++ // either use the whole CPU, or use ceil(iters/iters_per_thread) ++ return std::min(hw_threads, (iters + MIN_ITERS_PER_THREAD + 1) / MIN_ITERS_PER_THREAD); ++#else ++ return 1; ++#endif ++} ++ ++// Break a scalar length into some number of pieces, returning ++// [(start0, end0), (start1, end1), ...] ++template ++std::vector> partition_base(const T1& length, size_t num_parts) ++{ ++ static_assert(std::is_integral::value, "Integral required."); ++ ++ // make sure we don't exceed the length ++ num_parts = std::min(length, num_parts); ++ ++ std::vector> ret(num_parts); ++ auto partition_size = length / num_parts; ++ T1 cur_partition = 0; ++ for(size_t i = 0; i < num_parts; ++i, cur_partition += partition_size) ++ { ++ ret[i].first = cur_partition; ++ ret[i].second = cur_partition + partition_size; ++ } ++ // last partition might not divide evenly, fix it up ++ ret.back().second = length; ++ return ret; ++} ++ ++// Returns pairs of startindex, endindex, for 1D, 2D, 3D lengths ++template ++std::vector> partition_rowmajor(const T1& length) ++{ ++ return partition_base(length, compute_partition_count(length)); ++} ++ ++// Partition on the leftmost part of the tuple, for row-major indexing ++template ++std::vector, std::tuple>> ++ partition_rowmajor(const std::tuple& length) ++{ ++ auto partitions = partition_base(std::get<0>(length), compute_partition_count(length)); ++ std::vector, std::tuple>> ret(partitions.size()); ++ for(size_t i = 0; i < partitions.size(); ++i) ++ { ++ std::get<0>(ret[i].first) = partitions[i].first; ++ std::get<1>(ret[i].first) = 0; ++ std::get<0>(ret[i].second) = partitions[i].second; ++ std::get<1>(ret[i].second) = std::get<1>(length); ++ } ++ return ret; ++} ++template ++std::vector, std::tuple>> ++ partition_rowmajor(const std::tuple& length) ++{ ++ auto partitions = partition_base(std::get<0>(length), compute_partition_count(length)); ++ std::vector, std::tuple>> ret(partitions.size()); ++ for(size_t i = 0; i < partitions.size(); ++i) ++ { ++ std::get<0>(ret[i].first) = partitions[i].first; ++ std::get<1>(ret[i].first) = 0; ++ std::get<2>(ret[i].first) = 0; ++ std::get<0>(ret[i].second) = partitions[i].second; ++ std::get<1>(ret[i].second) = std::get<1>(length); ++ std::get<2>(ret[i].second) = std::get<2>(length); ++ } ++ return ret; ++} ++ ++// For complex-to-real transforms, the input data must be Hermitiam-symmetric. ++// That is, u_k is the complex conjugate of u_{-k}, where k is the wavevector in Fourier ++// space. For multi-dimensional data, this means that we only need to store a bit more ++// than half of the complex values; the rest are redundant. However, there are still ++// some restrictions: ++// * the origin and Nyquist value(s) must be real-valued ++// * some of the remaining values are still redundant, and you might get different results ++// than you expect if the values don't agree. ++// Below are some example kernels which impose Hermitian symmetry on a complex array ++// of the given dimensions. ++ ++template ++static void impose_hermitian_symmetry_interleaved_1D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data = ((std::complex*)vals[0].data()) + ibatch * idist; ++ ++ data[0].imag(0.0); ++ ++ if(length[0] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2)].imag(0.0); ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_planar_1D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data_imag = ((Tfloat*)vals[1].data()) + ibatch * idist; ++ ++ data_imag[0] = 0.0; ++ ++ if(length[0] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2)] = 0.0; ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_interleaved_2D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data = ((std::complex*)vals[0].data()) + ibatch * idist; ++ ++ data[0].imag(0.0); ++ ++ if(length[0] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2)].imag(0.0); ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ data[istride[1] * (length[1] / 2)].imag(0.0); ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2)].imag(0.0); ++ } ++ ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i)] = std::conj(data[istride[0] * i]); ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = std::conj(data[istride[0] * i + istride[1] * (length[1] / 2)]); ++ } ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_planar_2D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data_real = ((Tfloat*)vals[0].data()) + ibatch * idist; ++ auto data_imag = ((Tfloat*)vals[1].data()) + ibatch * idist; ++ ++ data_imag[0] = 0.0; ++ ++ if(length[0] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2)] = 0.0; ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ data_imag[istride[1] * (length[1] / 2)] = 0.0; ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2)] = 0.0; ++ } ++ ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i)] = data_real[istride[0] * i]; ++ data_imag[istride[0] * (length[0] - i)] = -data_imag[istride[0] * i]; ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = data_real[istride[0] * i + istride[1] * (length[1] / 2)]; ++ data_imag[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = -data_imag[istride[0] * i + istride[1] * (length[1] / 2)]; ++ } ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_interleaved_3D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data = ((std::complex*)vals[0].data()) + ibatch * idist; ++ ++ data[0].imag(0.0); ++ ++ if(length[0] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2)].imag(0.0); ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ data[istride[1] * (length[1] / 2)].imag(0.0); ++ } ++ ++ if(length[2] % 2 == 0) ++ { ++ data[istride[2] * (length[2] / 2)].imag(0.0); ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2)].imag(0.0); ++ } ++ ++ if(length[0] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2) + istride[2] * (length[2] / 2)].imag(0.0); ++ } ++ if(length[1] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data[istride[1] * (length[1] / 2) + istride[2] * (length[2] / 2)].imag(0.0); ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2) ++ + istride[2] * (length[2] / 2)] ++ .imag(0.0); ++ } ++ ++ // y-axis: ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data[istride[1] * (length[1] - j)] = std::conj(data[istride[1] * j]); ++ } ++ ++ if(length[0] % 2 == 0) ++ { ++ // y-axis at x-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j)] ++ = std::conj(data[istride[0] * (length[0] / 2) + istride[1] * j]); ++ } ++ } ++ ++ // x-axis: ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i)] = std::conj(data[istride[0] * i]); ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ // x-axis at y-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = std::conj(data[istride[0] * i + istride[1] * (length[1] / 2)]); ++ } ++ } ++ ++ // x-y plane: ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ for(unsigned int j = 1; j < length[1]; ++j) ++ { ++ data[istride[0] * (length[0] - i) + istride[1] * (length[1] - j)] ++ = std::conj(data[istride[0] * i + istride[1] * j]); ++ } ++ } ++ ++ if(length[2] % 2 == 0) ++ { ++ // x-axis at z-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = std::conj(data[istride[0] * i + istride[2] * (length[2] / 2)]); ++ } ++ if(length[1] % 2 == 0) ++ { ++ // x-axis at yz-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = std::conj(data[istride[0] * i + istride[2] * (length[2] / 2)]); ++ } ++ } ++ ++ // y-axis: at z-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data[istride[1] * (length[1] - j) + istride[2] * (length[2] / 2)] ++ = std::conj(data[istride[1] * j + istride[2] * (length[2] / 2)]); ++ } ++ ++ if(length[0] % 2 == 0) ++ { ++ // y-axis: at xz-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = std::conj(data[istride[0] * (length[0] / 2) + istride[1] * j ++ + istride[2] * (length[2] / 2)]); ++ } ++ } ++ ++ // x-y plane: at z-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ for(unsigned int j = 1; j < length[1]; ++j) ++ { ++ data[istride[0] * (length[0] - i) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = std::conj( ++ data[istride[0] * i + istride[1] * j + istride[2] * (length[2] / 2)]); ++ } ++ } ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_planar_3D(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ for(unsigned int ibatch = 0; ibatch < nbatch; ++ibatch) ++ { ++ auto data_real = ((Tfloat*)vals[0].data()) + ibatch * idist; ++ auto data_imag = ((Tfloat*)vals[1].data()) + ibatch * idist; ++ ++ data_imag[0] = 0.0; ++ ++ if(length[0] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2)] = 0.0; ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ data_imag[istride[1] * (length[1] / 2)] = 0.0; ++ } ++ ++ if(length[2] % 2 == 0) ++ { ++ data_imag[istride[2] * (length[2] / 2)] = 0.0; ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2)] = 0.0; ++ } ++ ++ if(length[0] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2) + istride[2] * (length[2] / 2)] = 0.0; ++ } ++ if(length[1] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data_imag[istride[1] * (length[1] / 2) + istride[2] * (length[2] / 2)] = 0.0; ++ } ++ ++ if(length[0] % 2 == 0 && length[1] % 2 == 0 && length[2] % 2 == 0) ++ { ++ data_imag[istride[0] * (length[0] / 2) + istride[1] * (length[1] / 2) ++ + istride[2] * (length[2] / 2)] ++ = 0.0; ++ } ++ ++ // y-axis: ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data_real[istride[1] * (length[1] - j)] = data_real[istride[1] * j]; ++ data_imag[istride[1] * (length[1] - j)] = -data_imag[istride[1] * j]; ++ } ++ ++ if(length[0] % 2 == 0) ++ { ++ // y-axis at x-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data_real[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j)] ++ = data_real[istride[0] * (length[0] / 2) + istride[1] * j]; ++ data_imag[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j)] ++ = -data_imag[istride[0] * (length[0] / 2) + istride[1] * j]; ++ } ++ } ++ ++ // x-axis: ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i)] = data_real[istride[0] * i]; ++ data_imag[istride[0] * (length[0] - i)] = -data_imag[istride[0] * i]; ++ } ++ ++ if(length[1] % 2 == 0) ++ { ++ // x-axis at y-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = data_real[istride[0] * i + istride[1] * (length[1] / 2)]; ++ data_imag[istride[0] * (length[0] - i) + istride[1] * (length[1] / 2)] ++ = -data_imag[istride[0] * i + istride[1] * (length[1] / 2)]; ++ } ++ } ++ ++ // x-y plane: ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ for(unsigned int j = 1; j < length[1]; ++j) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[1] * (length[1] - j)] ++ = data_real[istride[0] * i + istride[1] * j]; ++ data_imag[istride[0] * (length[0] - i) + istride[1] * (length[1] - j)] ++ = -data_imag[istride[0] * i + istride[1] * j]; ++ } ++ } ++ ++ if(length[2] % 2 == 0) ++ { ++ // x-axis at z-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = data_real[istride[0] * i + istride[2] * (length[2] / 2)]; ++ data_imag[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = -data_imag[istride[0] * i + istride[2] * (length[2] / 2)]; ++ } ++ if(length[1] % 2 == 0) ++ { ++ // x-axis at yz-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = data_real[istride[0] * i + istride[2] * (length[2] / 2)]; ++ data_imag[istride[0] * (length[0] - i) + istride[2] * (length[2] / 2)] ++ = -data_imag[istride[0] * i + istride[2] * (length[2] / 2)]; ++ } ++ } ++ ++ // y-axis: at z-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data_real[istride[1] * (length[1] - j) + istride[2] * (length[2] / 2)] ++ = data_real[istride[1] * j + istride[2] * (length[2] / 2)]; ++ data_imag[istride[1] * (length[1] - j) + istride[2] * (length[2] / 2)] ++ = -data_imag[istride[1] * j + istride[2] * (length[2] / 2)]; ++ } ++ ++ if(length[0] % 2 == 0) ++ { ++ // y-axis: at xz-nyquist ++ for(unsigned int j = 1; j < (length[1] + 1) / 2; ++j) ++ { ++ data_real[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = data_real[istride[0] * (length[0] / 2) + istride[1] * j ++ + istride[2] * (length[2] / 2)]; ++ data_imag[istride[0] * (length[0] / 2) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = -data_imag[istride[0] * (length[0] / 2) + istride[1] * j ++ + istride[2] * (length[2] / 2)]; ++ } ++ } ++ ++ // x-y plane: at z-nyquist ++ for(unsigned int i = 1; i < (length[0] + 1) / 2; ++i) ++ { ++ for(unsigned int j = 1; j < length[1]; ++j) ++ { ++ data_real[istride[0] * (length[0] - i) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = data_real[istride[0] * i + istride[1] * j + istride[2] * (length[2] / 2)]; ++ data_imag[istride[0] * (length[0] - i) + istride[1] * (length[1] - j) ++ + istride[2] * (length[2] / 2)] ++ = -data_imag[istride[0] * i + istride[1] * j ++ + istride[2] * (length[2] / 2)]; ++ } ++ } ++ } ++ } ++} ++ ++template ++static void generate_random_interleaved_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ auto idata = (std::complex*)input[0].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ std::mt19937 gen(compute_index(index, whole_stride, i_base)); ++ do ++ { ++ const auto i = compute_index(index, whole_stride, i_base); ++ const Tfloat x = (Tfloat)gen() / (Tfloat)gen.max(); ++ const Tfloat y = (Tfloat)gen() / (Tfloat)gen.max(); ++ const std::complex val(x, y); ++ idata[i] = val; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void generate_interleaved_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ auto idata = (std::complex*)input[0].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ auto unit_stride = make_unit_stride(whole_length); ++ ++ const Tfloat inv_scale = 1.0 / static_cast(count_iters(whole_length) - 1); ++ ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto val_xy ++ = -0.5 + static_cast(compute_index(index, unit_stride, 0)) * inv_scale; ++ ++ const std::complex val(val_xy, val_xy); ++ ++ const auto i = compute_index(index, whole_stride, i_base); ++ ++ idata[i] = val; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void generate_random_planar_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ auto ireal = (Tfloat*)input[0].data(); ++ auto iimag = (Tfloat*)input[1].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ std::mt19937 gen(compute_index(index, whole_stride, i_base)); ++ do ++ { ++ const auto i = compute_index(index, whole_stride, i_base); ++ const std::complex val((Tfloat)gen() / (Tfloat)gen.max(), ++ (Tfloat)gen() / (Tfloat)gen.max()); ++ ireal[i] = val.real(); ++ iimag[i] = val.imag(); ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void generate_planar_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ ++ auto ireal = (Tfloat*)input[0].data(); ++ auto iimag = (Tfloat*)input[1].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ auto unit_stride = make_unit_stride(whole_length); ++ ++ const Tfloat inv_scale = 1.0 / static_cast(count_iters(whole_length) - 1); ++ ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto val_xy ++ = -0.5 + static_cast(compute_index(index, unit_stride, 0)) * inv_scale; ++ ++ const auto i = compute_index(index, whole_stride, i_base); ++ ++ ireal[i] = val_xy; ++ iimag[i] = val_xy; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void generate_random_real_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ auto idata = (Tfloat*)input[0].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ std::mt19937 gen(compute_index(index, whole_stride, i_base)); ++ do ++ { ++ const auto i = compute_index(index, whole_stride, i_base); ++ const Tfloat val = (Tfloat)gen() / (Tfloat)gen.max(); ++ idata[i] = val; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void generate_real_data(std::vector& input, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch) ++{ ++ ++ auto idata = (Tfloat*)input[0].data(); ++ size_t i_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ auto unit_stride = make_unit_stride(whole_length); ++ ++ const Tfloat inv_scale = 1.0 / static_cast(count_iters(whole_length) - 1); ++ ++ for(unsigned int b = 0; b < nbatch; b++, i_base += idist) ++ { ++#pragma omp parallel for num_threads(partitions.size()) ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto i = compute_index(index, whole_stride, i_base); ++ ++ idata[i] ++ = -0.5 + static_cast(compute_index(index, unit_stride, 0)) * inv_scale; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_interleaved(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ switch(length.size()) ++ { ++ case 1: ++ impose_hermitian_symmetry_interleaved_1D(vals, length, istride, idist, nbatch); ++ break; ++ case 2: ++ impose_hermitian_symmetry_interleaved_2D(vals, length, istride, idist, nbatch); ++ break; ++ case 3: ++ impose_hermitian_symmetry_interleaved_3D(vals, length, istride, idist, nbatch); ++ break; ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++} ++ ++template ++static void impose_hermitian_symmetry_planar(std::vector& vals, ++ const std::vector& length, ++ const std::vector& istride, ++ const Tsize idist, ++ const Tsize nbatch) ++{ ++ switch(length.size()) ++ { ++ case 1: ++ impose_hermitian_symmetry_planar_1D(vals, length, istride, idist, nbatch); ++ break; ++ case 2: ++ impose_hermitian_symmetry_planar_2D(vals, length, istride, idist, nbatch); ++ break; ++ case 3: ++ impose_hermitian_symmetry_planar_3D(vals, length, istride, idist, nbatch); ++ break; ++ default: ++ throw std::runtime_error("Invalid dimension for impose_hermitian_symmetry"); ++ } ++} ++ ++#endif // DATA_GEN_HOST_H +diff --git a/shared/device_properties.h b/shared/device_properties.h +new file mode 100644 +index 0000000..6e2e1e1 +--- /dev/null ++++ b/shared/device_properties.h +@@ -0,0 +1,74 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_DEVICE_PROPS_H ++#define ROCFFT_DEVICE_PROPS_H ++ ++#include ++#include ++#include ++ ++// get device properties ++static hipDeviceProp_t get_curr_device_prop() ++{ ++ hipDeviceProp_t prop; ++ int deviceId = 0; ++ if(hipGetDevice(&deviceId) != hipSuccess) ++ throw std::runtime_error("hipGetDevice failed."); ++ ++ if(hipGetDeviceProperties(&prop, deviceId) != hipSuccess) ++ throw std::runtime_error("hipGetDeviceProperties failed for deviceId " ++ + std::to_string(deviceId)); ++ ++ return prop; ++} ++ ++// check that the given grid/block dims will fit into the limits in ++// the device properties. throws std::runtime_error if the limits ++// are exceeded. ++static void launch_limits_check(const std::string& kernel_name, ++ const dim3 gridDim, ++ const dim3 blockDim, ++ const hipDeviceProp_t& deviceProp) ++{ ++ // Need lots of casting here because dim3 is unsigned but device ++ // props are signed. Cast direct comparisons to fix signedness ++ // issues. Promote types to 64-bit when multiplying to try to ++ // avoid overflow. ++ ++ // Block limits along each dimension ++ if(blockDim.x > static_cast(deviceProp.maxThreadsDim[0]) ++ || blockDim.y > static_cast(deviceProp.maxThreadsDim[1]) ++ || blockDim.z > static_cast(deviceProp.maxThreadsDim[2])) ++ throw std::runtime_error("max threads per dim exceeded: " + kernel_name); ++ ++ // Total threads for the whole block ++ if(static_cast(blockDim.x) * blockDim.y * blockDim.z ++ > static_cast(deviceProp.maxThreadsPerBlock)) ++ throw std::runtime_error("max threads per block exceeded: " + kernel_name); ++ ++ // Grid dimension limits ++ if(gridDim.x > static_cast(deviceProp.maxGridSize[0]) ++ || gridDim.y > static_cast(deviceProp.maxGridSize[1]) ++ || gridDim.z > static_cast(deviceProp.maxGridSize[2])) ++ throw std::runtime_error("max grid size exceeded: " + kernel_name); ++} ++ ++#endif +diff --git a/shared/enum_to_string.h b/shared/enum_to_string.h +new file mode 100644 +index 0000000..1c2fba0 +--- /dev/null ++++ b/shared/enum_to_string.h +@@ -0,0 +1,81 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ENUM_TO_STRING_H ++#define ENUM_TO_STRING_H ++ ++#include "fft_params.h" ++ ++// Return the string of the hipError code. ++static std::string hipError_to_string(const hipError_t ret) ++{ ++ switch(ret) ++ { ++ case hipSuccess: ++ return "hipSuccess"; ++ case hipErrorInvalidContext: ++ return "hipErrorInvalidContext"; ++ case hipErrorInvalidKernelFile: ++ return "hipErrorInvalidKernelFile"; ++ case hipErrorMemoryAllocation: ++ return "hipErrorMemoryAllocation"; ++ case hipErrorInitializationError: ++ return "hipErrorInitializationError"; ++ case hipErrorLaunchFailure: ++ return "hipErrorLaunchFailure"; ++ case hipErrorLaunchOutOfResources: ++ return "hipErrorLaunchOutOfResources"; ++ case hipErrorInvalidDevice: ++ return "hipErrorInvalidDevice"; ++ case hipErrorInvalidValue: ++ return "hipErrorInvalidValue"; ++ case hipErrorInvalidDevicePointer: ++ return "hipErrorInvalidDevicePointer"; ++ case hipErrorInvalidMemcpyDirection: ++ return "hipErrorInvalidMemcpyDirection"; ++ case hipErrorUnknown: ++ return "hipErrorUnknown"; ++ case hipErrorInvalidResourceHandle: ++ return "hipErrorInvalidResourceHandle"; ++ case hipErrorNotReady: ++ return "hipErrorNotReady"; ++ case hipErrorNoDevice: ++ return "hipErrorNoDevice"; ++ case hipErrorPeerAccessAlreadyEnabled: ++ return "hipErrorPeerAccessAlreadyEnabled"; ++ case hipErrorPeerAccessNotEnabled: ++ return "hipErrorPeerAccessNotEnabled"; ++ case hipErrorRuntimeMemory: ++ return "hipErrorRuntimeMemory"; ++ case hipErrorRuntimeOther: ++ return "hipErrorRuntimeOther"; ++ case hipErrorHostMemoryAlreadyRegistered: ++ return "hipErrorHostMemoryAlreadyRegistered"; ++ case hipErrorHostMemoryNotRegistered: ++ return "hipErrorHostMemoryNotRegistered"; ++ case hipErrorMapBufferObjectFailed: ++ return "hipErrorMapBufferObjectFailed"; ++ case hipErrorTbd: ++ return "hipErrorTbd"; ++ default: ++ throw std::runtime_error("unknown hipError"); ++ } ++} ++#endif +diff --git a/shared/environment.h b/shared/environment.h +new file mode 100644 +index 0000000..7be56a0 +--- /dev/null ++++ b/shared/environment.h +@@ -0,0 +1,97 @@ ++// Copyright (C) 2021 - 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++// wrappers around environment variable routines ++ ++#pragma once ++ ++#include ++ ++// Windows provides "getenv" and "_putenv", but those modify the ++// runtime's copy of the environment. The actual environment in the ++// process control block is accessed using GetEnvironmentVariable and ++// SetEnvironmentVariable. ++ ++#ifdef WIN32 ++#include ++static void rocfft_setenv(const char* var, const char* value) ++{ ++ SetEnvironmentVariable(var, value); ++} ++static void rocfft_unsetenv(const char* var) ++{ ++ SetEnvironmentVariable(var, nullptr); ++} ++static std::string rocfft_getenv(const char* var) ++{ ++ DWORD size = GetEnvironmentVariable(var, nullptr, 0); ++ std::string ret; ++ if(size) ++ { ++ ret.resize(size); ++ GetEnvironmentVariable(var, ret.data(), size); ++ // GetEnvironmentVariable counts the terminating null, so remove it ++ while(!ret.empty() && ret.back() == 0) ++ ret.pop_back(); ++ } ++ return ret; ++} ++ ++#else ++ ++#include ++ ++static void rocfft_setenv(const char* var, const char* value) ++{ ++ setenv(var, value, 1); ++} ++static void rocfft_unsetenv(const char* var) ++{ ++ unsetenv(var); ++} ++static std::string rocfft_getenv(const char* var) ++{ ++ auto value = getenv(var); ++ return value ? value : ""; ++} ++#endif ++ ++// RAII object to set an environment variable and restore it to its ++// previous value on destruction ++struct EnvironmentSetTemp ++{ ++ EnvironmentSetTemp(const char* _var, const char* val) ++ : var(_var) ++ { ++ auto val_ptr = rocfft_getenv(_var); ++ if(!val_ptr.empty()) ++ oldvalue = val_ptr; ++ rocfft_setenv(_var, val); ++ } ++ ~EnvironmentSetTemp() ++ { ++ if(oldvalue.empty()) ++ rocfft_unsetenv(var.c_str()); ++ else ++ rocfft_setenv(var.c_str(), oldvalue.c_str()); ++ } ++ std::string var; ++ std::string oldvalue; ++}; +diff --git a/shared/fft_params.h b/shared/fft_params.h +new file mode 100644 +index 0000000..bf428ef +--- /dev/null ++++ b/shared/fft_params.h +@@ -0,0 +1,3274 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef FFT_PARAMS_H ++#define FFT_PARAMS_H ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef _OPENMP ++#include ++#endif ++#include ++#include ++#include ++#include ++ ++#include "../shared/arithmetic.h" ++#include "../shared/array_validator.h" ++#include "../shared/data_gen_device.h" ++#include "../shared/data_gen_host.h" ++#include "../shared/device_properties.h" ++#include "../shared/printbuffer.h" ++#include "../shared/ptrdiff.h" ++ ++enum fft_status ++{ ++ fft_status_success, ++ fft_status_failure, ++ fft_status_invalid_arg_value, ++ fft_status_invalid_dimensions, ++ fft_status_invalid_array_type, ++ fft_status_invalid_strides, ++ fft_status_invalid_distance, ++ fft_status_invalid_offset, ++ fft_status_invalid_work_buffer, ++}; ++ ++enum fft_transform_type ++{ ++ fft_transform_type_complex_forward, ++ fft_transform_type_complex_inverse, ++ fft_transform_type_real_forward, ++ fft_transform_type_real_inverse, ++}; ++ ++enum fft_precision ++{ ++ fft_precision_half, ++ fft_precision_single, ++ fft_precision_double, ++}; ++ ++static std::istream& operator>>(std::istream& str, fft_precision& precision) ++{ ++ std::string word; ++ str >> word; ++ ++ if(word == "half") ++ precision = fft_precision_half; ++ else if(word == "single") ++ precision = fft_precision_single; ++ else if(word == "double") ++ precision = fft_precision_double; ++ else ++ throw std::runtime_error("Invalid precision specified"); ++ return str; ++} ++ ++// fft_input_generator: linearly spaced sequence in [-0.5,0.5] ++// fft_input_random_generator: pseudo-random sequence in [-0.5,0.5] ++enum fft_input_generator ++{ ++ fft_input_random_generator_device, ++ fft_input_random_generator_host, ++ fft_input_generator_device, ++ fft_input_generator_host, ++}; ++ ++static std::istream& operator>>(std::istream& str, fft_input_generator& gen) ++{ ++ std::string word; ++ str >> word; ++ ++ if(word == "0") ++ gen = fft_input_random_generator_device; ++ else if(word == "1") ++ gen = fft_input_random_generator_host; ++ else if(word == "2") ++ gen = fft_input_generator_device; ++ else if(word == "3") ++ gen = fft_input_generator_host; ++ else ++ throw std::runtime_error("Invalid input generator specified"); ++ return str; ++} ++ ++enum fft_array_type ++{ ++ fft_array_type_complex_interleaved, ++ fft_array_type_complex_planar, ++ fft_array_type_real, ++ fft_array_type_hermitian_interleaved, ++ fft_array_type_hermitian_planar, ++ fft_array_type_unset, ++}; ++ ++enum fft_result_placement ++{ ++ fft_placement_inplace, ++ fft_placement_notinplace, ++}; ++ ++// Determine the size of the data type given the precision and type. ++template ++inline Tsize var_size(const fft_precision precision, const fft_array_type type) ++{ ++ size_t var_size = 0; ++ switch(precision) ++ { ++ case fft_precision_half: ++ var_size = sizeof(_Float16); ++ break; ++ case fft_precision_single: ++ var_size = sizeof(float); ++ break; ++ case fft_precision_double: ++ var_size = sizeof(double); ++ break; ++ } ++ switch(type) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ var_size *= 2; ++ break; ++ default: ++ break; ++ } ++ return var_size; ++} ++// Given an array type and transform length, strides, etc, load random floats in [0,1] ++// into the input array of floats/doubles or complex floats/doubles gpu buffers. ++template ++inline void set_input(std::vector& input, ++ const fft_input_generator igen, ++ const fft_array_type itype, ++ const std::vector& length, ++ const std::vector& ilength, ++ const std::vector& istride, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch, ++ const hipDeviceProp_t& deviceProp) ++{ ++ auto isize = count_iters(whole_length) * nbatch; ++ ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ auto ibuffer = (rocfft_complex*)input[0].data(); ++ ++ if(igen == fft_input_generator_device) ++ generate_interleaved_data( ++ whole_length, idist, isize, whole_stride, nbatch, ibuffer, deviceProp); ++ else if(igen == fft_input_random_generator_device) ++ generate_random_interleaved_data( ++ whole_length, idist, isize, whole_stride, ibuffer, deviceProp); ++ ++ if(itype == fft_array_type_hermitian_interleaved) ++ { ++ auto ibuffer_2 = (rocfft_complex*)input[0].data(); ++ impose_hermitian_symmetry_interleaved( ++ length, ilength, istride, idist, nbatch, ibuffer_2, deviceProp); ++ } ++ ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ { ++ auto ibuffer_real = (Tfloat*)input[0].data(); ++ auto ibuffer_imag = (Tfloat*)input[1].data(); ++ ++ if(igen == fft_input_generator_device) ++ generate_planar_data(whole_length, ++ idist, ++ isize, ++ whole_stride, ++ nbatch, ++ ibuffer_real, ++ ibuffer_imag, ++ deviceProp); ++ else if(igen == fft_input_random_generator_device) ++ generate_random_planar_data( ++ whole_length, idist, isize, whole_stride, ibuffer_real, ibuffer_imag, deviceProp); ++ ++ if(itype == fft_array_type_hermitian_planar) ++ impose_hermitian_symmetry_planar( ++ length, ilength, istride, idist, nbatch, ibuffer_real, ibuffer_imag, deviceProp); ++ ++ break; ++ } ++ case fft_array_type_real: ++ { ++ auto ibuffer = (Tfloat*)input[0].data(); ++ ++ if(igen == fft_input_generator_device) ++ generate_real_data( ++ whole_length, idist, isize, whole_stride, nbatch, ibuffer, deviceProp); ++ else if(igen == fft_input_random_generator_device) ++ generate_random_real_data( ++ whole_length, idist, isize, whole_stride, ibuffer, deviceProp); ++ ++ break; ++ } ++ default: ++ throw std::runtime_error("Input layout format not yet supported"); ++ } ++} ++ ++template ++inline void set_input(std::vector& input, ++ const fft_input_generator igen, ++ const fft_array_type itype, ++ const std::vector& length, ++ const std::vector& ilength, ++ const std::vector& istride, ++ const Tint1& whole_length, ++ const Tint1& whole_stride, ++ const size_t idist, ++ const size_t nbatch, ++ const hipDeviceProp_t& deviceProp) ++{ ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ if(igen == fft_input_generator_host) ++ generate_interleaved_data(input, whole_length, whole_stride, idist, nbatch); ++ else if(igen == fft_input_random_generator_host) ++ generate_random_interleaved_data( ++ input, whole_length, whole_stride, idist, nbatch); ++ ++ if(itype == fft_array_type_hermitian_interleaved) ++ impose_hermitian_symmetry_interleaved(input, length, istride, idist, nbatch); ++ ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ { ++ if(igen == fft_input_generator_host) ++ generate_planar_data(input, whole_length, whole_stride, idist, nbatch); ++ else if(igen == fft_input_random_generator_host) ++ generate_random_planar_data(input, whole_length, whole_stride, idist, nbatch); ++ ++ if(itype == fft_array_type_hermitian_planar) ++ impose_hermitian_symmetry_planar(input, length, istride, idist, nbatch); ++ ++ break; ++ } ++ case fft_array_type_real: ++ { ++ if(igen == fft_input_generator_host) ++ generate_real_data(input, whole_length, whole_stride, idist, nbatch); ++ else if(igen == fft_input_random_generator_host) ++ generate_random_real_data(input, whole_length, whole_stride, idist, nbatch); ++ ++ break; ++ } ++ default: ++ throw std::runtime_error("Input layout format not yet supported"); ++ } ++} ++ ++// unroll set_input for dimension 1, 2, 3 ++template ++inline void set_input(std::vector& input, ++ const fft_input_generator igen, ++ const fft_array_type itype, ++ const std::vector& length, ++ const std::vector& ilength, ++ const std::vector& istride, ++ const size_t idist, ++ const size_t nbatch, ++ const hipDeviceProp_t& deviceProp) ++{ ++ switch(length.size()) ++ { ++ case 1: ++ set_input(input, ++ igen, ++ itype, ++ length, ++ ilength, ++ istride, ++ ilength[0], ++ istride[0], ++ idist, ++ nbatch, ++ deviceProp); ++ break; ++ case 2: ++ set_input(input, ++ igen, ++ itype, ++ length, ++ ilength, ++ istride, ++ std::make_tuple(ilength[0], ilength[1]), ++ std::make_tuple(istride[0], istride[1]), ++ idist, ++ nbatch, ++ deviceProp); ++ break; ++ case 3: ++ set_input(input, ++ igen, ++ itype, ++ length, ++ ilength, ++ istride, ++ std::make_tuple(ilength[0], ilength[1], ilength[2]), ++ std::make_tuple(istride[0], istride[1], istride[2]), ++ idist, ++ nbatch, ++ deviceProp); ++ break; ++ default: ++ abort(); ++ } ++} ++ ++// Container class for test parameters. ++class fft_params ++{ ++public: ++ // All parameters are row-major. ++ std::vector length; ++ std::vector istride; ++ std::vector ostride; ++ size_t nbatch = 1; ++ fft_precision precision = fft_precision_single; ++ fft_input_generator igen = fft_input_random_generator_device; ++ fft_transform_type transform_type = fft_transform_type_complex_forward; ++ fft_result_placement placement = fft_placement_inplace; ++ size_t idist = 0; ++ size_t odist = 0; ++ fft_array_type itype = fft_array_type_unset; ++ fft_array_type otype = fft_array_type_unset; ++ std::vector ioffset = {0, 0}; ++ std::vector ooffset = {0, 0}; ++ ++ std::vector isize; ++ std::vector osize; ++ ++ size_t workbuffersize = 0; ++ ++ struct fft_brick ++ { ++ // all vectors here are row-major, with same length as FFT ++ // dimension + 1 (for batch dimension) ++ ++ // inclusive lower bound of brick ++ std::vector lower; ++ // exclusive upper bound of brick ++ std::vector upper; ++ // stride of brick in memory ++ std::vector stride; ++ ++ // compute the length of this brick ++ std::vector length() const ++ { ++ std::vector ret; ++ for(size_t i = 0; i < lower.size(); ++i) ++ ret.push_back(upper[i] - lower[i]); ++ return ret; ++ } ++ ++ // compute offset of lower bound in a field with the given ++ // stride + dist (batch stride is separate) ++ size_t lower_field_offset(std::vector stride, size_t dist) const ++ { ++ // brick strides include batch, so adjust our input accordingly ++ stride.insert(stride.begin(), dist); ++ ++ return std::inner_product(lower.begin(), lower.end(), stride.begin(), 0); ++ } ++ ++ // location of the brick ++ int device = 0; ++ }; ++ ++ struct fft_field ++ { ++ std::vector bricks; ++ }; ++ // optional brick decomposition of inputs/outputs ++ std::vector ifields; ++ std::vector ofields; ++ ++ // run testing load/store callbacks ++ bool run_callbacks = false; ++ static constexpr double load_cb_scalar = 0.457813941; ++ static constexpr double store_cb_scalar = 0.391504938; ++ ++ // Check that data outside of output strides is not overwritten. ++ // This is only set explicitly on some tests where there's space ++ // between dimensions, but the dimensions are still in-order. ++ // We're not trying to generically find holes in arbitrary data ++ // layouts. ++ // ++ // NOTE: this flag is not included in tokens, since it doesn't ++ // affect how the FFT library behaves. ++ bool check_output_strides = false; ++ ++ // scaling factor - we do a pointwise multiplication of outputs by ++ // this factor ++ double scale_factor = 1.0; ++ ++ fft_params(){}; ++ virtual ~fft_params(){}; ++ ++ // Given an array type, return the name as a string. ++ static std::string array_type_name(const fft_array_type type, bool verbose = true) ++ { ++ switch(type) ++ { ++ case fft_array_type_complex_interleaved: ++ return verbose ? "fft_array_type_complex_interleaved" : "CI"; ++ case fft_array_type_complex_planar: ++ return verbose ? "fft_array_type_complex_planar" : "CP"; ++ case fft_array_type_real: ++ return verbose ? "fft_array_type_real" : "R"; ++ case fft_array_type_hermitian_interleaved: ++ return verbose ? "fft_array_type_hermitian_interleaved" : "HI"; ++ case fft_array_type_hermitian_planar: ++ return verbose ? "fft_array_type_hermitian_planar" : "HP"; ++ case fft_array_type_unset: ++ return verbose ? "fft_array_type_unset" : "UN"; ++ } ++ return ""; ++ } ++ ++ std::string transform_type_name() const ++ { ++ switch(transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ return "fft_transform_type_complex_forward"; ++ case fft_transform_type_complex_inverse: ++ return "fft_transform_type_complex_inverse"; ++ case fft_transform_type_real_forward: ++ return "fft_transform_type_real_forward"; ++ case fft_transform_type_real_inverse: ++ return "fft_transform_type_real_inverse"; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ } ++ ++ // Convert to string for output. ++ std::string str(const std::string& separator = ", ") const ++ { ++ // top-level stride/dist are not used when fields are specified. ++ const bool have_ifields = !ifields.empty(); ++ const bool have_ofields = !ofields.empty(); ++ ++ std::stringstream ss; ++ auto print_size_vec = [&](const char* description, const std::vector& vec) { ++ ss << description << ":"; ++ for(auto i : vec) ++ ss << " " << i; ++ ss << separator; ++ }; ++ auto print_fields = [&](const char* description, const std::vector& fields) { ++ for(unsigned int fidx = 0; fidx < fields.size(); ++fidx) ++ { ++ const auto& f = fields[fidx]; ++ ss << description << " " << fidx << ":" << separator; ++ for(unsigned int bidx = 0; bidx < f.bricks.size(); ++bidx) ++ { ++ const auto& b = f.bricks[bidx]; ++ ss << " brick " << bidx << ":" << separator; ++ print_size_vec(" lower", b.lower); ++ print_size_vec(" upper", b.upper); ++ print_size_vec(" stride", b.stride); ++ ss << " device: " << b.device << separator; ++ } ++ } ++ }; ++ ++ print_size_vec("length", length); ++ if(have_ifields) ++ { ++ print_fields("ifield", ifields); ++ } ++ else ++ { ++ print_size_vec("istride", istride); ++ ss << "idist: " << idist << separator; ++ } ++ ++ if(have_ofields) ++ { ++ print_fields("ofield", ofields); ++ } ++ else ++ { ++ print_size_vec("ostride", ostride); ++ ss << "odist: " << odist << separator; ++ } ++ ++ ss << "batch: " << nbatch << separator; ++ print_size_vec("isize", isize); ++ print_size_vec("osize", osize); ++ ++ print_size_vec("ioffset", ioffset); ++ print_size_vec("ooffset", ooffset); ++ ++ if(placement == fft_placement_inplace) ++ ss << "in-place"; ++ else ++ ss << "out-of-place"; ++ ss << separator; ++ ss << "transform_type: " << transform_type_name() << separator; ++ ss << array_type_name(itype) << " -> " << array_type_name(otype) << separator; ++ switch(precision) ++ { ++ case fft_precision_half: ++ ss << "half-precision"; ++ break; ++ case fft_precision_single: ++ ss << "single-precision"; ++ break; ++ case fft_precision_double: ++ ss << "double-precision"; ++ break; ++ } ++ ss << separator; ++ ++ print_size_vec("ilength", ilength()); ++ print_size_vec("olength", olength()); ++ ++ print_size_vec("ibuffer_size", ibuffer_sizes()); ++ print_size_vec("obuffer_size", obuffer_sizes()); ++ ++ if(scale_factor != 1.0) ++ ss << "scale factor: " << scale_factor << separator; ++ ++ return ss.str(); ++ } ++ ++ // Produce a stringified token of the test fft params. ++ std::string token() const ++ { ++ std::string ret; ++ ++ switch(transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ ret += "complex_forward_"; ++ break; ++ case fft_transform_type_complex_inverse: ++ ret += "complex_inverse_"; ++ break; ++ case fft_transform_type_real_forward: ++ ret += "real_forward_"; ++ break; ++ case fft_transform_type_real_inverse: ++ ret += "real_inverse_"; ++ break; ++ } ++ ++ auto append_size_vec = [&ret](const std::vector& vec) { ++ for(auto s : vec) ++ { ++ ret += "_"; ++ ret += std::to_string(s); ++ } ++ }; ++ ++ ret += "len"; ++ append_size_vec(length); ++ ++ switch(precision) ++ { ++ case fft_precision_half: ++ ret += "_half_"; ++ break; ++ case fft_precision_single: ++ ret += "_single_"; ++ break; ++ case fft_precision_double: ++ ret += "_double_"; ++ break; ++ } ++ ++ switch(placement) ++ { ++ case fft_placement_inplace: ++ ret += "ip_"; ++ break; ++ case fft_placement_notinplace: ++ ret += "op_"; ++ break; ++ } ++ ++ ret += "batch_"; ++ ret += std::to_string(nbatch); ++ ++ auto append_array_type = [&ret](fft_array_type type) { ++ switch(type) ++ { ++ case fft_array_type_complex_interleaved: ++ ret += "CI"; ++ break; ++ case fft_array_type_complex_planar: ++ ret += "CP"; ++ break; ++ case fft_array_type_real: ++ ret += "R"; ++ break; ++ case fft_array_type_hermitian_interleaved: ++ ret += "HI"; ++ break; ++ case fft_array_type_hermitian_planar: ++ ret += "HP"; ++ break; ++ default: ++ ret += "UN"; ++ break; ++ } ++ }; ++ ++ auto append_brick_info = [&ret, &append_size_vec](const fft_brick& b) { ++ ret += "_brick"; ++ ++ ret += "_lower"; ++ append_size_vec(b.lower); ++ ret += "_upper"; ++ append_size_vec(b.upper); ++ ret += "_stride"; ++ append_size_vec(b.stride); ++ ret += "_dev_"; ++ ret += std::to_string(b.device); ++ }; ++ ++ const bool have_ifields = !ifields.empty(); ++ const bool have_ofields = !ofields.empty(); ++ ++ if(have_ifields) ++ { ++ for(const auto& f : ifields) ++ { ++ ret += "_ifield"; ++ for(const auto& b : f.bricks) ++ append_brick_info(b); ++ } ++ } ++ else ++ { ++ ret += "_istride"; ++ append_size_vec(istride); ++ ret += "_"; ++ append_array_type(itype); ++ } ++ ++ if(have_ofields) ++ { ++ for(const auto& f : ofields) ++ { ++ ret += "_ofield"; ++ for(const auto& b : f.bricks) ++ append_brick_info(b); ++ } ++ } ++ else ++ { ++ ret += "_ostride"; ++ append_size_vec(ostride); ++ ret += "_"; ++ append_array_type(otype); ++ } ++ ++ if(!have_ifields) ++ { ++ ret += "_idist_"; ++ ret += std::to_string(idist); ++ } ++ if(!have_ofields) ++ { ++ ret += "_odist_"; ++ ret += std::to_string(odist); ++ } ++ ++ if(!have_ifields) ++ { ++ ret += "_ioffset"; ++ append_size_vec(ioffset); ++ } ++ ++ if(!have_ofields) ++ { ++ ret += "_ooffset"; ++ append_size_vec(ooffset); ++ } ++ ++ if(run_callbacks) ++ ret += "_CB"; ++ ++ if(scale_factor != 1.0) ++ ret += "_scale"; ++ ++ return ret; ++ } ++ ++ // Set all params from a stringified token. ++ void from_token(std::string token) ++ { ++ std::vector vals; ++ ++ std::string delimiter = "_"; ++ { ++ size_t pos = 0; ++ while((pos = token.find(delimiter)) != std::string::npos) ++ { ++ auto val = token.substr(0, pos); ++ vals.push_back(val); ++ token.erase(0, pos + delimiter.length()); ++ } ++ vals.push_back(token); ++ } ++ ++ auto size_parser ++ = [](const std::vector& vals, const std::string token, size_t& pos) { ++ if(vals[pos++] != token) ++ throw std::runtime_error("Unable to parse token"); ++ return std::stoull(vals[pos++]); ++ }; ++ ++ auto vector_parser ++ = [](const std::vector& vals, const std::string token, size_t& pos) { ++ if(vals[pos++] != token) ++ throw std::runtime_error("Unable to parse token"); ++ std::vector vec; ++ ++ while(pos < vals.size()) ++ { ++ if(std::all_of(vals[pos].begin(), vals[pos].end(), ::isdigit)) ++ { ++ vec.push_back(std::stoull(vals[pos++])); ++ } ++ else ++ { ++ break; ++ } ++ } ++ return vec; ++ }; ++ ++ auto type_parser = [](const std::string& val) { ++ if(val == "CI") ++ return fft_array_type_complex_interleaved; ++ else if(val == "CP") ++ return fft_array_type_complex_planar; ++ else if(val == "R") ++ return fft_array_type_real; ++ else if(val == "HI") ++ return fft_array_type_hermitian_interleaved; ++ else if(val == "HP") ++ return fft_array_type_hermitian_planar; ++ return fft_array_type_unset; ++ }; ++ ++ auto field_parser = [&vector_parser, &size_parser](const std::vector& vals, ++ size_t& pos, ++ std::vector& output) { ++ // skip over ifield/ofield word ++ pos++; ++ fft_field& f = output.emplace_back(); ++ while(pos < vals.size() && vals[pos] == "brick") ++ { ++ fft_brick& b = f.bricks.emplace_back(); ++ pos++; ++ b.lower = vector_parser(vals, "lower", pos); ++ b.upper = vector_parser(vals, "upper", pos); ++ b.stride = vector_parser(vals, "stride", pos); ++ b.device = size_parser(vals, "dev", pos); ++ } ++ }; ++ ++ size_t pos = 0; ++ ++ bool complex = vals[pos++] == "complex"; ++ bool forward = vals[pos++] == "forward"; ++ ++ if(complex && forward) ++ transform_type = fft_transform_type_complex_forward; ++ if(complex && !forward) ++ transform_type = fft_transform_type_complex_inverse; ++ if(!complex && forward) ++ transform_type = fft_transform_type_real_forward; ++ if(!complex && !forward) ++ transform_type = fft_transform_type_real_inverse; ++ ++ length = vector_parser(vals, "len", pos); ++ ++ if(vals[pos] == "half") ++ precision = fft_precision_half; ++ else if(vals[pos] == "single") ++ precision = fft_precision_single; ++ else if(vals[pos] == "double") ++ precision = fft_precision_double; ++ pos++; ++ ++ placement = (vals[pos++] == "ip") ? fft_placement_inplace : fft_placement_notinplace; ++ ++ nbatch = size_parser(vals, "batch", pos); ++ ++ // strides, bricks etc are mixed in from here, so just keep ++ // looking at the next token to decide what to do ++ while(pos < vals.size()) ++ { ++ const auto& next_token = vals[pos]; ++ if(next_token == "istride") ++ { ++ istride = vector_parser(vals, "istride", pos); ++ itype = type_parser(vals[pos]); ++ pos++; ++ } ++ else if(next_token == "ostride") ++ { ++ ostride = vector_parser(vals, "ostride", pos); ++ otype = type_parser(vals[pos]); ++ pos++; ++ } ++ else if(next_token == "idist") ++ idist = size_parser(vals, "idist", pos); ++ else if(next_token == "odist") ++ odist = size_parser(vals, "odist", pos); ++ else if(next_token == "ioffset") ++ ioffset = vector_parser(vals, "ioffset", pos); ++ else if(next_token == "ooffset") ++ ooffset = vector_parser(vals, "ooffset", pos); ++ else if(next_token == "ifield") ++ field_parser(vals, pos, ifields); ++ else if(next_token == "ofield") ++ field_parser(vals, pos, ofields); ++ else ++ break; ++ } ++ ++ if(pos < vals.size() && vals[pos] == "CB") ++ { ++ run_callbacks = true; ++ ++pos; ++ } ++ ++ if(pos < vals.size() && vals[pos] == "scale") ++ { ++ // just pick some factor that's not zero or one ++ scale_factor = 0.1239; ++ ++pos; ++ } ++ } ++ ++ // Stream output operator (for gtest, etc). ++ friend std::ostream& operator<<(std::ostream& stream, const fft_params& params) ++ { ++ stream << params.str(); ++ return stream; ++ } ++ ++ // Dimension of the transform. ++ size_t dim() const ++ { ++ return length.size(); ++ } ++ ++ virtual std::vector ilength() const ++ { ++ auto ilength = length; ++ if(transform_type == fft_transform_type_real_inverse) ++ ilength[dim() - 1] = ilength[dim() - 1] / 2 + 1; ++ return ilength; ++ } ++ ++ virtual std::vector olength() const ++ { ++ auto olength = length; ++ if(transform_type == fft_transform_type_real_forward) ++ olength[dim() - 1] = olength[dim() - 1] / 2 + 1; ++ return olength; ++ } ++ ++ static size_t nbuffer(const fft_array_type type) ++ { ++ switch(type) ++ { ++ case fft_array_type_real: ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ return 1; ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ return 2; ++ case fft_array_type_unset: ++ return 0; ++ } ++ return 0; ++ } ++ ++ // Number of input buffers ++ size_t nibuffer() const ++ { ++ return nbuffer(itype); ++ } ++ ++ // Number of output buffers ++ size_t nobuffer() const ++ { ++ return nbuffer(otype); ++ } ++ ++ void set_iotypes() ++ { ++ if(itype == fft_array_type_unset) ++ { ++ switch(transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ itype = fft_array_type_complex_interleaved; ++ break; ++ case fft_transform_type_real_forward: ++ itype = fft_array_type_real; ++ break; ++ case fft_transform_type_real_inverse: ++ itype = fft_array_type_hermitian_interleaved; ++ break; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ } ++ if(otype == fft_array_type_unset) ++ { ++ switch(transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ otype = fft_array_type_complex_interleaved; ++ break; ++ case fft_transform_type_real_forward: ++ otype = fft_array_type_hermitian_interleaved; ++ break; ++ case fft_transform_type_real_inverse: ++ otype = fft_array_type_real; ++ break; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ } ++ } ++ ++ // Check that the input and output types are consistent. ++ bool check_iotypes() const ++ { ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_interleaved: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ break; ++ default: ++ throw std::runtime_error("Invalid Input array type format"); ++ } ++ ++ switch(otype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_interleaved: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ break; ++ default: ++ throw std::runtime_error("Invalid Input array type format"); ++ } ++ ++ // Check that format choices are supported ++ if(transform_type != fft_transform_type_real_forward ++ && transform_type != fft_transform_type_real_inverse) ++ { ++ if(placement == fft_placement_inplace && itype != otype) ++ { ++ throw std::runtime_error( ++ "In-place transforms must have identical input and output types"); ++ } ++ } ++ ++ bool okformat = true; ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_complex_planar: ++ okformat = (otype == fft_array_type_complex_interleaved ++ || otype == fft_array_type_complex_planar); ++ break; ++ case fft_array_type_hermitian_interleaved: ++ case fft_array_type_hermitian_planar: ++ okformat = otype == fft_array_type_real; ++ break; ++ case fft_array_type_real: ++ okformat = (otype == fft_array_type_hermitian_interleaved ++ || otype == fft_array_type_hermitian_planar); ++ break; ++ default: ++ throw std::runtime_error("Invalid Input array type format"); ++ } ++ ++ return okformat; ++ } ++ ++ // Given a length vector, set the rest of the strides. ++ // The optional argument stride0 sets the stride for the contiguous dimension. ++ // The optional rcpadding argument sets the stride correctly for in-place ++ // multi-dimensional real/complex transforms. ++ // Format is row-major. ++ template ++ std::vector compute_stride(const std::vector& length, ++ const std::vector& stride0 = std::vector(), ++ const bool rcpadding = false) const ++ { ++ std::vector stride(dim()); ++ ++ size_t dimoffset = 0; ++ ++ if(stride0.size() == 0) ++ { ++ // Set the contiguous stride: ++ stride[dim() - 1] = 1; ++ dimoffset = 1; ++ } ++ else ++ { ++ // Copy the input values to the end of the stride array: ++ for(size_t i = 0; i < stride0.size(); ++i) ++ { ++ stride[dim() - stride0.size() + i] = stride0[i]; ++ } ++ } ++ ++ if(stride0.size() < dim()) ++ { ++ // Compute any remaining values via recursion. ++ for(size_t i = dim() - dimoffset - stride0.size(); i-- > 0;) ++ { ++ auto lengthip1 = length[i + 1]; ++ if(rcpadding && i == dim() - 2) ++ { ++ lengthip1 = 2 * (lengthip1 / 2 + 1); ++ } ++ stride[i] = stride[i + 1] * lengthip1; ++ } ++ } ++ ++ return stride; ++ } ++ ++ void compute_istride() ++ { ++ istride = compute_stride(ilength(), ++ istride, ++ placement == fft_placement_inplace ++ && transform_type == fft_transform_type_real_forward); ++ } ++ ++ void compute_ostride() ++ { ++ ostride = compute_stride(olength(), ++ ostride, ++ placement == fft_placement_inplace ++ && transform_type == fft_transform_type_real_inverse); ++ } ++ ++ virtual void compute_isize() ++ { ++ auto il = ilength(); ++ size_t val = compute_ptrdiff(il, istride, nbatch, idist); ++ isize.resize(nibuffer()); ++ for(unsigned int i = 0; i < isize.size(); ++i) ++ { ++ isize[i] = val + ioffset[i]; ++ } ++ } ++ ++ virtual void compute_osize() ++ { ++ auto ol = olength(); ++ size_t val = compute_ptrdiff(ol, ostride, nbatch, odist); ++ osize.resize(nobuffer()); ++ for(unsigned int i = 0; i < osize.size(); ++i) ++ { ++ osize[i] = val + ooffset[i]; ++ } ++ } ++ ++ std::vector ibuffer_sizes() const ++ { ++ std::vector ibuffer_sizes; ++ ++ // In-place real-to-complex transforms need to have enough space in the input buffer to ++ // accomadate the output, which is slightly larger. ++ if(placement == fft_placement_inplace && transform_type == fft_transform_type_real_forward) ++ { ++ return obuffer_sizes(); ++ } ++ ++ if(isize.empty()) ++ return ibuffer_sizes; ++ ++ switch(itype) ++ { ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ ibuffer_sizes.resize(2); ++ break; ++ default: ++ ibuffer_sizes.resize(1); ++ } ++ for(unsigned i = 0; i < ibuffer_sizes.size(); i++) ++ { ++ ibuffer_sizes[i] = isize[i] * var_size(precision, itype); ++ } ++ return ibuffer_sizes; ++ } ++ ++ virtual std::vector obuffer_sizes() const ++ { ++ std::vector obuffer_sizes; ++ ++ if(osize.empty()) ++ return obuffer_sizes; ++ ++ switch(otype) ++ { ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ obuffer_sizes.resize(2); ++ break; ++ default: ++ obuffer_sizes.resize(1); ++ } ++ for(unsigned i = 0; i < obuffer_sizes.size(); i++) ++ { ++ obuffer_sizes[i] = osize[i] * var_size(precision, otype); ++ } ++ return obuffer_sizes; ++ } ++ ++ // Compute the idist for a given transform based on the placeness, transform type, and data ++ // layout. ++ size_t compute_idist() const ++ { ++ size_t dist = 0; ++ // In-place 1D transforms need extra dist. ++ if(transform_type == fft_transform_type_real_forward && dim() == 1 ++ && placement == fft_placement_inplace) ++ { ++ dist = 2 * (length[0] / 2 + 1) * istride[0]; ++ return dist; ++ } ++ ++ if(transform_type == fft_transform_type_real_inverse && dim() == 1) ++ { ++ dist = (length[0] / 2 + 1) * istride[0]; ++ return dist; ++ } ++ ++ dist = (transform_type == fft_transform_type_real_inverse) ++ ? (length[dim() - 1] / 2 + 1) * istride[dim() - 1] ++ : length[dim() - 1] * istride[dim() - 1]; ++ for(unsigned int i = 0; i < dim() - 1; ++i) ++ { ++ dist = std::max(length[i] * istride[i], dist); ++ } ++ return dist; ++ } ++ void set_idist() ++ { ++ if(idist != 0) ++ return; ++ idist = compute_idist(); ++ } ++ ++ // Compute the odist for a given transform based on the placeness, transform type, and data ++ // layout. Row-major. ++ size_t compute_odist() const ++ { ++ size_t dist = 0; ++ // In-place 1D transforms need extra dist. ++ if(transform_type == fft_transform_type_real_inverse && dim() == 1 ++ && placement == fft_placement_inplace) ++ { ++ dist = 2 * (length[0] / 2 + 1) * ostride[0]; ++ return dist; ++ } ++ ++ if(transform_type == fft_transform_type_real_forward && dim() == 1) ++ { ++ dist = (length[0] / 2 + 1) * ostride[0]; ++ return dist; ++ } ++ ++ dist = (transform_type == fft_transform_type_real_forward) ++ ? (length[dim() - 1] / 2 + 1) * ostride[dim() - 1] ++ : length[dim() - 1] * ostride[dim() - 1]; ++ for(unsigned int i = 0; i < dim() - 1; ++i) ++ { ++ dist = std::max(length[i] * ostride[i], dist); ++ } ++ return dist; ++ } ++ void set_odist() ++ { ++ if(odist != 0) ++ return; ++ odist = compute_odist(); ++ } ++ ++ // Put the length, stride, batch, and dist into a single length/stride array and pass off to the ++ // validity checker. ++ bool valid_length_stride_batch_dist(const std::vector& l0, ++ const std::vector& s0, ++ const size_t n, ++ const size_t dist, ++ const int verbose = 0) const ++ { ++ if(l0.size() != s0.size()) ++ return false; ++ ++ // Length and stride vectors, including bathes: ++ std::vector l{}, s{}; ++ for(unsigned int i = 0; i < l0.size(); ++i) ++ { ++ if(l0[i] > 1) ++ { ++ if(s0[i] == 0) ++ return false; ++ l.push_back(l0[i]); ++ s.push_back(s0[i]); ++ } ++ } ++ if(n > 1) ++ { ++ if(dist == 0) ++ return false; ++ l.push_back(n); ++ s.push_back(dist); ++ } ++ ++ return array_valid(l, s, verbose); ++ } ++ ++ // Return true if the given GPU parameters would produce a valid transform. ++ bool valid(const int verbose) const ++ { ++ if(ioffset.size() < nibuffer() || ooffset.size() < nobuffer()) ++ return false; ++ ++ // Check that in-place transforms have the same input and output stride: ++ if(placement == fft_placement_inplace) ++ { ++ const auto stridesize = std::min(istride.size(), ostride.size()); ++ bool samestride = true; ++ for(unsigned int i = 0; i < stridesize; ++i) ++ { ++ if(istride[i] != ostride[i]) ++ samestride = false; ++ } ++ if((transform_type == fft_transform_type_complex_forward ++ || transform_type == fft_transform_type_complex_inverse) ++ && !samestride) ++ { ++ // In-place transforms require identical input and output strides. ++ if(verbose) ++ { ++ std::cout << "istride:"; ++ for(const auto& i : istride) ++ std::cout << " " << i; ++ std::cout << " ostride0:"; ++ for(const auto& i : ostride) ++ std::cout << " " << i; ++ std::cout << " differ; skipped for in-place transforms: skipping test" ++ << std::endl; ++ } ++ return false; ++ } ++ ++ if((transform_type == fft_transform_type_complex_forward ++ || transform_type == fft_transform_type_complex_inverse) ++ && (idist != odist) && nbatch > 1) ++ { ++ // In-place transforms require identical distance, if ++ // batch > 1. If batch is 1 then dist is ignored and ++ // the FFT should still work. ++ if(verbose) ++ { ++ std::cout << "idist:" << idist << " odist:" << odist ++ << " differ; skipped for in-place transforms: skipping test" ++ << std::endl; ++ } ++ return false; ++ } ++ ++ if((transform_type == fft_transform_type_real_forward ++ || transform_type == fft_transform_type_real_inverse) ++ && (istride.back() != 1 || ostride.back() != 1)) ++ { ++ // In-place real/complex transforms require unit strides. ++ if(verbose) ++ { ++ std::cout ++ << "istride.back(): " << istride.back() ++ << " ostride.back(): " << ostride.back() ++ << " must be unitary for in-place real/complex transforms: skipping test" ++ << std::endl; ++ } ++ return false; ++ } ++ ++ if((itype == fft_array_type_complex_interleaved ++ && otype == fft_array_type_complex_planar) ++ || (itype == fft_array_type_complex_planar ++ && otype == fft_array_type_complex_interleaved)) ++ { ++ if(verbose) ++ { ++ std::cout << "In-place c2c transforms require identical io types; skipped.\n"; ++ } ++ return false; ++ } ++ ++ // Check offsets ++ switch(transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ for(unsigned int i = 0; i < nibuffer(); ++i) ++ { ++ if(ioffset[i] != ooffset[i]) ++ return false; ++ } ++ break; ++ case fft_transform_type_real_forward: ++ if(ioffset[0] != 2 * ooffset[0]) ++ return false; ++ break; ++ case fft_transform_type_real_inverse: ++ if(2 * ioffset[0] != ooffset[0]) ++ return false; ++ break; ++ } ++ } ++ ++ if(!check_iotypes()) ++ return false; ++ ++ // we can only check output strides on out-of-place ++ // transforms, since we need to initialize output to a known ++ // pattern ++ if(placement == fft_placement_inplace && check_output_strides) ++ return false; ++ ++ // Check input and output strides ++ if(valid_length_stride_batch_dist(ilength(), istride, nbatch, idist, verbose) != true) ++ { ++ if(verbose) ++ std::cout << "Invalid input data format.\n"; ++ return false; ++ } ++ if(!(ilength() == olength() && istride == ostride && idist == odist)) ++ { ++ // Only check if different ++ if(valid_length_stride_batch_dist(olength(), ostride, nbatch, odist, verbose) != true) ++ { ++ if(verbose) ++ std::cout << "Invalid output data format.\n"; ++ return false; ++ } ++ } ++ ++ // The parameters are valid. ++ return true; ++ } ++ ++ // Fill in any missing parameters. ++ void validate() ++ { ++ set_iotypes(); ++ compute_istride(); ++ compute_ostride(); ++ set_idist(); ++ set_odist(); ++ compute_isize(); ++ compute_osize(); ++ ++ validate_fields(); ++ } ++ ++ virtual void validate_fields() const ++ { ++ if(!ifields.empty() || !ofields.empty()) ++ throw std::runtime_error("input/output fields are unsupported"); ++ } ++ ++ // Column-major getters: ++ std::vector length_cm() const ++ { ++ auto length_cm = length; ++ std::reverse(std::begin(length_cm), std::end(length_cm)); ++ return length_cm; ++ } ++ std::vector ilength_cm() const ++ { ++ auto ilength_cm = ilength(); ++ std::reverse(std::begin(ilength_cm), std::end(ilength_cm)); ++ return ilength_cm; ++ } ++ std::vector olength_cm() const ++ { ++ auto olength_cm = olength(); ++ std::reverse(std::begin(olength_cm), std::end(olength_cm)); ++ return olength_cm; ++ } ++ std::vector istride_cm() const ++ { ++ auto istride_cm = istride; ++ std::reverse(std::begin(istride_cm), std::end(istride_cm)); ++ return istride_cm; ++ } ++ std::vector ostride_cm() const ++ { ++ auto ostride_cm = ostride; ++ std::reverse(std::begin(ostride_cm), std::end(ostride_cm)); ++ return ostride_cm; ++ } ++ bool is_planar() const ++ { ++ if(itype == fft_array_type_complex_planar || itype == fft_array_type_hermitian_planar) ++ return true; ++ if(otype == fft_array_type_complex_planar || otype == fft_array_type_hermitian_planar) ++ return true; ++ return false; ++ } ++ ++ // Given a data type and dimensions, fill the buffer, imposing Hermitian symmetry if necessary. ++ template ++ inline void compute_input(std::vector& input) ++ { ++ auto deviceProp = get_curr_device_prop(); ++ ++ switch(precision) ++ { ++ case fft_precision_half: ++ set_input( ++ input, igen, itype, length, ilength(), istride, idist, nbatch, deviceProp); ++ break; ++ case fft_precision_double: ++ set_input( ++ input, igen, itype, length, ilength(), istride, idist, nbatch, deviceProp); ++ break; ++ case fft_precision_single: ++ set_input( ++ input, igen, itype, length, ilength(), istride, idist, nbatch, deviceProp); ++ break; ++ } ++ } ++ ++ template ++ void print_ibuffer(const std::vector& buf, Tstream& stream = std::cout) const ++ { ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer> s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer> s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ case fft_precision_double: ++ { ++ buffer_printer> s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ } ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer<_Float16> s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ case fft_precision_double: ++ { ++ buffer_printer s; ++ s.print_buffer(buf, ilength(), istride, nbatch, idist, ioffset); ++ break; ++ } ++ } ++ break; ++ } ++ default: ++ throw std::runtime_error("Invalid itype in print_ibuffer"); ++ } ++ } ++ ++ template ++ void print_obuffer(const std::vector& buf, Tstream& stream = std::cout) const ++ { ++ switch(otype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer> s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer> s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ case fft_precision_double: ++ buffer_printer> s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer<_Float16> s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ case fft_precision_double: ++ { ++ buffer_printer s; ++ s.print_buffer(buf, olength(), ostride, nbatch, odist, ooffset); ++ break; ++ } ++ } ++ break; ++ } ++ ++ default: ++ throw std::runtime_error("Invalid itype in print_obuffer"); ++ } ++ } ++ ++ void print_ibuffer_flat(const std::vector& buf) const ++ { ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_double: ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer<_Float16> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_double: ++ { ++ buffer_printer s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid itype in print_ibuffer_flat"); ++ } ++ } ++ } ++ ++ void print_obuffer_flat(const std::vector& buf) const ++ { ++ switch(otype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_double: ++ buffer_printer> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ break; ++ } ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ case fft_array_type_real: ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ { ++ buffer_printer<_Float16> s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ case fft_precision_single: ++ { ++ buffer_printer s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ ++ case fft_precision_double: ++ { ++ buffer_printer s; ++ s.print_buffer_flat(buf, osize, ooffset); ++ break; ++ } ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid itype in print_ibuffer_flat"); ++ } ++ } ++ } ++ ++ virtual fft_status set_callbacks(void* load_cb_host, ++ void* load_cb_data, ++ void* store_cb_host, ++ void* store_cb_data) ++ { ++ return fft_status_success; ++ } ++ ++ virtual fft_status execute(void** in, void** out) ++ { ++ return fft_status_success; ++ }; ++ ++ size_t fft_params_vram_footprint() ++ { ++ return fft_params::vram_footprint(); ++ } ++ ++ virtual size_t vram_footprint() ++ { ++ const auto ibuf_size = ibuffer_sizes(); ++ size_t val = std::accumulate(ibuf_size.begin(), ibuf_size.end(), (size_t)1); ++ if(placement == fft_placement_notinplace) ++ { ++ const auto obuf_size = obuffer_sizes(); ++ val += std::accumulate(obuf_size.begin(), obuf_size.end(), (size_t)1); ++ } ++ return val; ++ } ++ ++ // Specific exception type for work buffer allocation failure. ++ // Tests that hit this can't fit on the GPU and should be skipped. ++ struct work_buffer_alloc_failure : public std::runtime_error ++ { ++ work_buffer_alloc_failure(const std::string& s) ++ : std::runtime_error(s) ++ { ++ } ++ }; ++ ++ virtual fft_status create_plan() ++ { ++ return fft_status_success; ++ } ++ ++ // Change a forward transform to it's inverse ++ void inverse_from_forward(fft_params& params_forward) ++ { ++ switch(params_forward.transform_type) ++ { ++ case fft_transform_type_complex_forward: ++ transform_type = fft_transform_type_complex_inverse; ++ break; ++ case fft_transform_type_real_forward: ++ transform_type = fft_transform_type_real_inverse; ++ break; ++ default: ++ throw std::runtime_error("Transform type not forward."); ++ } ++ ++ length = params_forward.length; ++ istride = params_forward.ostride; ++ ostride = params_forward.istride; ++ nbatch = params_forward.nbatch; ++ precision = params_forward.precision; ++ placement = params_forward.placement; ++ idist = params_forward.odist; ++ odist = params_forward.idist; ++ itype = params_forward.otype; ++ otype = params_forward.itype; ++ ioffset = params_forward.ooffset; ++ ooffset = params_forward.ioffset; ++ ++ run_callbacks = params_forward.run_callbacks; ++ ++ check_output_strides = params_forward.check_output_strides; ++ ++ scale_factor = 1 / params_forward.scale_factor; ++ } ++ ++ // prepare for multi-GPU transform. Generated input is in ibuffer. ++ // pibuffer, pobuffer are the pointers that will be passed to the ++ // FFT library's "execute" API. ++ virtual void multi_gpu_prepare(std::vector& ibuffer, ++ std::vector& pibuffer, ++ std::vector& pobuffer) ++ { ++ } ++ ++ // finalize multi-GPU transform. pobuffers are the pointers ++ // provided to the FFT library's "execute" API. obuffer is the ++ // buffer where transform output needs to go for validation ++ virtual void multi_gpu_finalize(std::vector& obuffer, std::vector& pobuffer) {} ++ ++ // create bricks in the specified field for the specified number ++ // of devices. The field is split along the highest FFT ++ // dimension, and the length only includes FFT lengths, not batch ++ // dimension. ++ void distribute_field(int deviceCount, ++ std::vector& fields, ++ const std::vector& field_length) ++ { ++ size_t slowLen = field_length.front(); ++ if(slowLen < static_cast(deviceCount)) ++ throw std::runtime_error("too many devices to distribute length " ++ + std::to_string(slowLen)); ++ ++ auto& field = fields.emplace_back(); ++ ++ for(int i = 0; i < deviceCount; ++i) ++ { ++ // start at origin ++ std::vector field_lower(field_length.size()); ++ std::vector field_upper(field_length.size()); ++ ++ // note: slowest FFT dim is index 0 in these coordinates ++ field_lower[0] = slowLen / deviceCount * i; ++ ++ // last brick needs to include the whole slow len ++ if(i == deviceCount - 1) ++ { ++ field_upper[0] = slowLen; ++ } ++ else ++ { ++ field_upper[0] = std::min(slowLen, field_lower[0] + slowLen / deviceCount); ++ } ++ ++ for(unsigned int upperDim = 1; upperDim < field_length.size(); ++upperDim) ++ { ++ field_upper[upperDim] = field_length[upperDim]; ++ } ++ ++ // field coordinates also need to include batch ++ field_lower.insert(field_lower.begin(), 0); ++ field_upper.insert(field_upper.begin(), nbatch); ++ ++ // bricks have contiguous strides ++ size_t brick_dist = 1; ++ std::vector brick_stride(field_lower.size()); ++ for(size_t distIdx = 0; distIdx < field_lower.size(); ++distIdx) ++ { ++ // fill strides from fastest to slowest ++ *(brick_stride.rbegin() + distIdx) = brick_dist; ++ brick_dist *= *(field_upper.rbegin() + distIdx) - *(field_lower.rbegin() + distIdx); ++ } ++ field.bricks.push_back( ++ fft_params::fft_brick{field_lower, field_upper, brick_stride, i}); ++ } ++ } ++ ++ void distribute_input(int deviceCount) ++ { ++ distribute_field(deviceCount, ifields, length); ++ } ++ ++ void distribute_output(int deviceCount) ++ { ++ distribute_field(deviceCount, ofields, olength()); ++ } ++}; ++ ++// This is used with the program_options class so that the user can type an integer on the ++// command line and we store into an enum varaible ++template ++std::basic_istream<_Elem, _Traits>& operator>>(std::basic_istream<_Elem, _Traits>& stream, ++ fft_array_type& atype) ++{ ++ unsigned tmp; ++ stream >> tmp; ++ atype = fft_array_type(tmp); ++ return stream; ++} ++ ++// similarly for transform type ++template ++std::basic_istream<_Elem, _Traits>& operator>>(std::basic_istream<_Elem, _Traits>& stream, ++ fft_transform_type& ttype) ++{ ++ unsigned tmp; ++ stream >> tmp; ++ ttype = fft_transform_type(tmp); ++ return stream; ++} ++ ++// Returns pairs of startindex, endindex, for 1D, 2D, 3D lengths ++template ++std::vector> partition_colmajor(const T1& length) ++{ ++ return partition_base(length, compute_partition_count(length)); ++} ++ ++// Partition on the rightmost part of the tuple, for col-major indexing ++template ++std::vector, std::tuple>> ++ partition_colmajor(const std::tuple& length) ++{ ++ auto partitions = partition_base(std::get<1>(length), compute_partition_count(length)); ++ std::vector, std::tuple>> ret(partitions.size()); ++ for(size_t i = 0; i < partitions.size(); ++i) ++ { ++ std::get<1>(ret[i].first) = partitions[i].first; ++ std::get<0>(ret[i].first) = 0; ++ std::get<1>(ret[i].second) = partitions[i].second; ++ std::get<0>(ret[i].second) = std::get<0>(length); ++ } ++ return ret; ++} ++template ++std::vector, std::tuple>> ++ partition_colmajor(const std::tuple& length) ++{ ++ auto partitions = partition_base(std::get<2>(length), compute_partition_count(length)); ++ std::vector, std::tuple>> ret(partitions.size()); ++ for(size_t i = 0; i < partitions.size(); ++i) ++ { ++ std::get<2>(ret[i].first) = partitions[i].first; ++ std::get<1>(ret[i].first) = 0; ++ std::get<0>(ret[i].first) = 0; ++ std::get<2>(ret[i].second) = partitions[i].second; ++ std::get<1>(ret[i].second) = std::get<1>(length); ++ std::get<0>(ret[i].second) = std::get<0>(length); ++ } ++ return ret; ++} ++ ++// Copy data of dimensions length with strides istride and length idist between batches to ++// a buffer with strides ostride and length odist between batches. The input and output ++// types are identical. ++template ++inline void copy_buffers_1to1(const Tval* input, ++ Tval* output, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const Tint2& istride, ++ const size_t idist, ++ const Tint3& ostride, ++ const size_t odist, ++ const std::vector& ioffset, ++ const std::vector& ooffset) ++{ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for num_threads(partitions.size()) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ output[odx + ooffset[0]] = input[idx + ioffset[0]]; ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++// Copy data of dimensions length with strides istride and length idist between batches to ++// a buffer with strides ostride and length odist between batches. The input type is ++// planar and the output type is complex interleaved. ++template ++inline void copy_buffers_2to1(const Tval* input0, ++ const Tval* input1, ++ rocfft_complex* output, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const Tint2& istride, ++ const size_t idist, ++ const Tint3& ostride, ++ const size_t odist, ++ const std::vector& ioffset, ++ const std::vector& ooffset) ++{ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for num_threads(partitions.size()) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ output[odx + ooffset[0]] ++ = rocfft_complex(input0[idx + ioffset[0]], input1[idx + ioffset[1]]); ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++// Copy data of dimensions length with strides istride and length idist between batches to ++// a buffer with strides ostride and length odist between batches. The input type is ++// complex interleaved and the output type is planar. ++template ++inline void copy_buffers_1to2(const rocfft_complex* input, ++ Tval* output0, ++ Tval* output1, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const Tint2& istride, ++ const size_t idist, ++ const Tint3& ostride, ++ const size_t odist, ++ const std::vector& ioffset, ++ const std::vector& ooffset) ++{ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for num_threads(partitions.size()) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ output0[odx + ooffset[0]] = input[idx + ioffset[0]].real(); ++ output1[odx + ooffset[1]] = input[idx + ioffset[0]].imag(); ++ } while(increment_rowmajor(index, length)); ++ } ++ } ++} ++ ++// Copy data of dimensions length with strides istride and length idist between batches to ++// a buffer with strides ostride and length odist between batches. The input type given ++// by itype, and the output type is given by otype. ++template ++inline void copy_buffers(const std::vector& input, ++ std::vector& output, ++ const Tint1& length, ++ const size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type itype, ++ const Tint2& istride, ++ const size_t idist, ++ const fft_array_type otype, ++ const Tint3& ostride, ++ const size_t odist, ++ const std::vector& ioffset, ++ const std::vector& ooffset) ++{ ++ if(itype == otype) ++ { ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ switch(precision) ++ { ++ case fft_precision_half: ++ copy_buffers_1to1( ++ reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_single: ++ copy_buffers_1to1(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_double: ++ copy_buffers_1to1(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ } ++ break; ++ case fft_array_type_real: ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ for(unsigned int idx = 0; idx < input.size(); ++idx) ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ copy_buffers_1to1(reinterpret_cast(input[idx].data()), ++ reinterpret_cast<_Float16*>(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_single: ++ copy_buffers_1to1(reinterpret_cast(input[idx].data()), ++ reinterpret_cast(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_double: ++ copy_buffers_1to1(reinterpret_cast(input[idx].data()), ++ reinterpret_cast(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ } ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid data type"); ++ } ++ } ++ else if((itype == fft_array_type_complex_interleaved && otype == fft_array_type_complex_planar) ++ || (itype == fft_array_type_hermitian_interleaved ++ && otype == fft_array_type_hermitian_planar)) ++ { ++ // copy 1to2 ++ switch(precision) ++ { ++ case fft_precision_half: ++ copy_buffers_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast<_Float16*>(output[0].data()), ++ reinterpret_cast<_Float16*>(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_single: ++ copy_buffers_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast(output[0].data()), ++ reinterpret_cast(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_double: ++ copy_buffers_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast(output[0].data()), ++ reinterpret_cast(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ } ++ } ++ else if((itype == fft_array_type_complex_planar && otype == fft_array_type_complex_interleaved) ++ || (itype == fft_array_type_hermitian_planar ++ && otype == fft_array_type_hermitian_interleaved)) ++ { ++ // copy 2 to 1 ++ switch(precision) ++ { ++ case fft_precision_half: ++ copy_buffers_2to1(reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_single: ++ copy_buffers_2to1(reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ case fft_precision_double: ++ copy_buffers_2to1(reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ ioffset, ++ ooffset); ++ break; ++ } ++ } ++ else ++ { ++ throw std::runtime_error("Invalid input and output types."); ++ } ++} ++ ++// unroll arbitrary-dimension copy_buffers into specializations for 1-, 2-, 3-dimensions ++template ++inline void copy_buffers(const std::vector& input, ++ std::vector& output, ++ const std::vector& length, ++ const size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type itype, ++ const std::vector& istride, ++ const size_t idist, ++ const fft_array_type otype, ++ const std::vector& ostride, ++ const size_t odist, ++ const std::vector& ioffset, ++ const std::vector& ooffset) ++{ ++ switch(length.size()) ++ { ++ case 1: ++ return copy_buffers(input, ++ output, ++ length[0], ++ nbatch, ++ precision, ++ itype, ++ istride[0], ++ idist, ++ otype, ++ ostride[0], ++ odist, ++ ioffset, ++ ooffset); ++ case 2: ++ return copy_buffers(input, ++ output, ++ std::make_tuple(length[0], length[1]), ++ nbatch, ++ precision, ++ itype, ++ std::make_tuple(istride[0], istride[1]), ++ idist, ++ otype, ++ std::make_tuple(ostride[0], ostride[1]), ++ odist, ++ ioffset, ++ ooffset); ++ case 3: ++ return copy_buffers(input, ++ output, ++ std::make_tuple(length[0], length[1], length[2]), ++ nbatch, ++ precision, ++ itype, ++ std::make_tuple(istride[0], istride[1], istride[2]), ++ idist, ++ otype, ++ std::make_tuple(ostride[0], ostride[1], ostride[2]), ++ odist, ++ ioffset, ++ ooffset); ++ default: ++ abort(); ++ } ++} ++ ++// Compute the L-infinity and L-2 distance between two buffers with strides istride and ++// length idist between batches to a buffer with strides ostride and length odist between ++// batches. Both buffers are of complex type. ++ ++struct VectorNorms ++{ ++ double l_2 = 0.0, l_inf = 0.0; ++}; ++ ++template ++inline VectorNorms distance_1to1_complex(const Tcomplex* input, ++ const Tcomplex* output, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const Tint2& istride, ++ const size_t idist, ++ const Tint3& ostride, ++ const size_t odist, ++ std::vector>* linf_failures, ++ const double linf_cutoff, ++ const std::vector& ioffset, ++ const std::vector& ooffset, ++ const double output_scalar = 1.0) ++{ ++ double linf = 0.0; ++ double l2 = 0.0; ++ ++ std::mutex linf_failure_lock; ++ std::vector> linf_failures_private; ++ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_colmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for reduction(max : linf) reduction(+ : l2) num_threads(partitions.size()) private(linf_failures_private) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ double cur_linf = 0.0; ++ double cur_l2 = 0.0; ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ const double rdiff ++ = std::abs(static_cast(output[odx + ooffset[0]].real()) * output_scalar ++ - static_cast(input[idx + ioffset[0]].real())); ++ cur_linf = std::max(rdiff, cur_linf); ++ if(cur_linf > linf_cutoff) ++ { ++ std::pair fval(b, idx); ++ if(linf_failures) ++ linf_failures_private.push_back(fval); ++ } ++ cur_l2 += rdiff * rdiff; ++ ++ const double idiff ++ = std::abs(static_cast(output[odx + ooffset[0]].imag()) * output_scalar ++ - static_cast(input[idx + ioffset[0]].imag())); ++ cur_linf = std::max(idiff, cur_linf); ++ if(cur_linf > linf_cutoff) ++ { ++ std::pair fval(b, idx); ++ if(linf_failures) ++ linf_failures_private.push_back(fval); ++ } ++ cur_l2 += idiff * idiff; ++ ++ } while(increment_rowmajor(index, length)); ++ linf = std::max(linf, cur_linf); ++ l2 += cur_l2; ++ ++ if(linf_failures) ++ { ++ linf_failure_lock.lock(); ++ std::copy(linf_failures_private.begin(), ++ linf_failures_private.end(), ++ std::back_inserter(*linf_failures)); ++ linf_failure_lock.unlock(); ++ } ++ } ++ } ++ return {.l_2 = sqrt(l2), .l_inf = linf}; ++} ++ ++// Compute the L-infinity and L-2 distance between two buffers with strides istride and ++// length idist between batches to a buffer with strides ostride and length odist between ++// batches. Both buffers are of real type. ++template ++inline VectorNorms distance_1to1_real(const Tfloat* input, ++ const Tfloat* output, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const Tint2& istride, ++ const size_t idist, ++ const Tint3& ostride, ++ const size_t odist, ++ std::vector>* linf_failures, ++ const double linf_cutoff, ++ const std::vector& ioffset, ++ const std::vector& ooffset, ++ const double output_scalar = 1.0) ++{ ++ double linf = 0.0; ++ double l2 = 0.0; ++ ++ std::mutex linf_failure_lock; ++ std::vector> linf_failures_private; ++ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for reduction(max : linf) reduction(+ : l2) num_threads(partitions.size()) private(linf_failures_private) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ double cur_linf = 0.0; ++ double cur_l2 = 0.0; ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ const double diff ++ = std::abs(static_cast(output[odx + ooffset[0]]) * output_scalar ++ - static_cast(input[idx + ioffset[0]])); ++ cur_linf = std::max(diff, cur_linf); ++ if(cur_linf > linf_cutoff) ++ { ++ std::pair fval(b, idx); ++ if(linf_failures) ++ linf_failures_private.push_back(fval); ++ } ++ cur_l2 += diff * diff; ++ ++ } while(increment_rowmajor(index, length)); ++ linf = std::max(linf, cur_linf); ++ l2 += cur_l2; ++ ++ if(linf_failures) ++ { ++ linf_failure_lock.lock(); ++ std::copy(linf_failures_private.begin(), ++ linf_failures_private.end(), ++ std::back_inserter(*linf_failures)); ++ linf_failure_lock.unlock(); ++ } ++ } ++ } ++ return {.l_2 = sqrt(l2), .l_inf = linf}; ++} ++ ++// Compute the L-infinity and L-2 distance between two buffers with strides istride and ++// length idist between batches to a buffer with strides ostride and length odist between ++// batches. input is complex-interleaved, output is complex-planar. ++template ++inline VectorNorms distance_1to2(const rocfft_complex* input, ++ const Tval* output0, ++ const Tval* output1, ++ const Tint1& whole_length, ++ const size_t nbatch, ++ const T2& istride, ++ const size_t idist, ++ const T3& ostride, ++ const size_t odist, ++ std::vector>* linf_failures, ++ const double linf_cutoff, ++ const std::vector& ioffset, ++ const std::vector& ooffset, ++ const double output_scalar = 1.0) ++{ ++ double linf = 0.0; ++ double l2 = 0.0; ++ ++ std::mutex linf_failure_lock; ++ std::vector> linf_failures_private; ++ ++ const bool idx_equals_odx = istride == ostride && idist == odist; ++ size_t idx_base = 0; ++ size_t odx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist, odx_base += odist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for reduction(max : linf) reduction(+ : l2) num_threads(partitions.size()) private(linf_failures_private) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ double cur_linf = 0.0; ++ double cur_l2 = 0.0; ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const auto odx = idx_equals_odx ? idx : compute_index(index, ostride, odx_base); ++ const double rdiff ++ = std::abs(static_cast(output0[odx + ooffset[0]]) * output_scalar ++ - static_cast(input[idx + ioffset[0]].real())); ++ cur_linf = std::max(rdiff, cur_linf); ++ if(cur_linf > linf_cutoff) ++ { ++ std::pair fval(b, idx); ++ if(linf_failures) ++ linf_failures_private.push_back(fval); ++ } ++ cur_l2 += rdiff * rdiff; ++ ++ const double idiff ++ = std::abs(static_cast(output1[odx + ooffset[1]]) * output_scalar ++ - static_cast(input[idx + ioffset[0]].imag())); ++ cur_linf = std::max(idiff, cur_linf); ++ if(cur_linf > linf_cutoff) ++ { ++ std::pair fval(b, idx); ++ if(linf_failures) ++ linf_failures_private.push_back(fval); ++ } ++ cur_l2 += idiff * idiff; ++ ++ } while(increment_rowmajor(index, length)); ++ linf = std::max(linf, cur_linf); ++ l2 += cur_l2; ++ ++ if(linf_failures) ++ { ++ linf_failure_lock.lock(); ++ std::copy(linf_failures_private.begin(), ++ linf_failures_private.end(), ++ std::back_inserter(*linf_failures)); ++ linf_failure_lock.unlock(); ++ } ++ } ++ } ++ return {.l_2 = sqrt(l2), .l_inf = linf}; ++} ++ ++// Compute the L-inifnity and L-2 distance between two buffers of dimension length and ++// with types given by itype, otype, and precision. ++template ++inline VectorNorms distance(const std::vector& input, ++ const std::vector& output, ++ const Tint1& length, ++ const size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type itype, ++ const Tint2& istride, ++ const size_t idist, ++ const fft_array_type otype, ++ const Tint3& ostride, ++ const size_t odist, ++ std::vector>* linf_failures, ++ const double linf_cutoff, ++ const std::vector& ioffset, ++ const std::vector& ooffset, ++ const double output_scalar = 1.0) ++{ ++ VectorNorms dist; ++ ++ if(itype == otype) ++ { ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ switch(precision) ++ { ++ case fft_precision_half: ++ dist = distance_1to1_complex( ++ reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_single: ++ dist = distance_1to1_complex( ++ reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_double: ++ dist = distance_1to1_complex( ++ reinterpret_cast*>(input[0].data()), ++ reinterpret_cast*>(output[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ } ++ dist.l_2 *= dist.l_2; ++ break; ++ case fft_array_type_real: ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ for(unsigned int idx = 0; idx < input.size(); ++idx) ++ { ++ VectorNorms d; ++ switch(precision) ++ { ++ case fft_precision_half: ++ d = distance_1to1_real(reinterpret_cast(input[idx].data()), ++ reinterpret_cast(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_single: ++ d = distance_1to1_real(reinterpret_cast(input[idx].data()), ++ reinterpret_cast(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_double: ++ d = distance_1to1_real(reinterpret_cast(input[idx].data()), ++ reinterpret_cast(output[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ } ++ dist.l_inf = std::max(d.l_inf, dist.l_inf); ++ dist.l_2 += d.l_2 * d.l_2; ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid input and output types."); ++ } ++ } ++ else if((itype == fft_array_type_complex_interleaved && otype == fft_array_type_complex_planar) ++ || (itype == fft_array_type_hermitian_interleaved ++ && otype == fft_array_type_hermitian_planar)) ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ dist = distance_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast(output[0].data()), ++ reinterpret_cast(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_single: ++ dist = distance_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast(output[0].data()), ++ reinterpret_cast(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_double: ++ dist = distance_1to2(reinterpret_cast*>(input[0].data()), ++ reinterpret_cast(output[0].data()), ++ reinterpret_cast(output[1].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ ostride, ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ } ++ dist.l_2 *= dist.l_2; ++ } ++ else if((itype == fft_array_type_complex_planar && otype == fft_array_type_complex_interleaved) ++ || (itype == fft_array_type_hermitian_planar ++ && otype == fft_array_type_hermitian_interleaved)) ++ { ++ switch(precision) ++ { ++ case fft_precision_half: ++ dist ++ = distance_1to2(reinterpret_cast*>(output[0].data()), ++ reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ length, ++ nbatch, ++ ostride, ++ odist, ++ istride, ++ idist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_single: ++ dist = distance_1to2(reinterpret_cast*>(output[0].data()), ++ reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ length, ++ nbatch, ++ ostride, ++ odist, ++ istride, ++ idist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ case fft_precision_double: ++ dist = distance_1to2(reinterpret_cast*>(output[0].data()), ++ reinterpret_cast(input[0].data()), ++ reinterpret_cast(input[1].data()), ++ length, ++ nbatch, ++ ostride, ++ odist, ++ istride, ++ idist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ break; ++ } ++ dist.l_2 *= dist.l_2; ++ } ++ else ++ { ++ throw std::runtime_error("Invalid input and output types."); ++ } ++ dist.l_2 = sqrt(dist.l_2); ++ return dist; ++} ++ ++// check if the specified length + stride/dist is contiguous ++template ++bool is_contiguous_rowmajor(const std::vector& length, ++ const std::vector& stride, ++ size_t dist) ++{ ++ size_t expected_stride = 1; ++ auto stride_it = stride.rbegin(); ++ auto length_it = length.rbegin(); ++ for(; stride_it != stride.rend() && length_it != length.rend(); ++stride_it, ++length_it) ++ { ++ if(*stride_it != expected_stride) ++ return false; ++ expected_stride *= *length_it; ++ } ++ return expected_stride == dist; ++} ++ ++// Unroll arbitrary-dimension distance into specializations for 1-, 2-, 3-dimensions ++template ++inline VectorNorms distance(const std::vector& input, ++ const std::vector& output, ++ std::vector length, ++ size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type itype, ++ std::vector istride, ++ const size_t idist, ++ const fft_array_type otype, ++ std::vector ostride, ++ const size_t odist, ++ std::vector>* linf_failures, ++ const double linf_cutoff, ++ const std::vector& ioffset, ++ const std::vector& ooffset, ++ const double output_scalar = 1.0) ++{ ++ // If istride and ostride are both contiguous, collapse them down ++ // to one dimension. Index calculation is simpler (and faster) ++ // in the 1D case. ++ if(is_contiguous_rowmajor(length, istride, idist) ++ && is_contiguous_rowmajor(length, ostride, odist)) ++ { ++ length = {product(length.begin(), length.end()) * nbatch}; ++ istride = {static_cast(1)}; ++ ostride = {static_cast(1)}; ++ nbatch = 1; ++ } ++ ++ switch(length.size()) ++ { ++ case 1: ++ return distance(input, ++ output, ++ length[0], ++ nbatch, ++ precision, ++ itype, ++ istride[0], ++ idist, ++ otype, ++ ostride[0], ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ case 2: ++ return distance(input, ++ output, ++ std::make_tuple(length[0], length[1]), ++ nbatch, ++ precision, ++ itype, ++ std::make_tuple(istride[0], istride[1]), ++ idist, ++ otype, ++ std::make_tuple(ostride[0], ostride[1]), ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ case 3: ++ return distance(input, ++ output, ++ std::make_tuple(length[0], length[1], length[2]), ++ nbatch, ++ precision, ++ itype, ++ std::make_tuple(istride[0], istride[1], istride[2]), ++ idist, ++ otype, ++ std::make_tuple(ostride[0], ostride[1], ostride[2]), ++ odist, ++ linf_failures, ++ linf_cutoff, ++ ioffset, ++ ooffset, ++ output_scalar); ++ default: ++ abort(); ++ } ++} ++ ++// Compute the L-infinity and L-2 norm of a buffer with strides istride and ++// length idist. Data is rocfft_complex. ++template ++inline VectorNorms norm_complex(const Tcomplex* input, ++ const T1& whole_length, ++ const size_t nbatch, ++ const T2& istride, ++ const size_t idist, ++ const std::vector& offset) ++{ ++ double linf = 0.0; ++ double l2 = 0.0; ++ ++ size_t idx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for reduction(max : linf) reduction(+ : l2) num_threads(partitions.size()) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ double cur_linf = 0.0; ++ double cur_l2 = 0.0; ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ ++ const double rval = std::abs(static_cast(input[idx + offset[0]].real())); ++ cur_linf = std::max(rval, cur_linf); ++ cur_l2 += rval * rval; ++ ++ const double ival = std::abs(static_cast(input[idx + offset[0]].imag())); ++ cur_linf = std::max(ival, cur_linf); ++ cur_l2 += ival * ival; ++ ++ } while(increment_rowmajor(index, length)); ++ linf = std::max(linf, cur_linf); ++ l2 += cur_l2; ++ } ++ } ++ return {.l_2 = sqrt(l2), .l_inf = linf}; ++} ++ ++// Compute the L-infinity and L-2 norm of abuffer with strides istride and ++// length idist. Data is real-valued. ++template ++inline VectorNorms norm_real(const Tfloat* input, ++ const T1& whole_length, ++ const size_t nbatch, ++ const T2& istride, ++ const size_t idist, ++ const std::vector& offset) ++{ ++ double linf = 0.0; ++ double l2 = 0.0; ++ ++ size_t idx_base = 0; ++ auto partitions = partition_rowmajor(whole_length); ++ for(size_t b = 0; b < nbatch; b++, idx_base += idist) ++ { ++#ifdef _OPENMP ++#pragma omp parallel for reduction(max : linf) reduction(+ : l2) num_threads(partitions.size()) ++#endif ++ for(size_t part = 0; part < partitions.size(); ++part) ++ { ++ double cur_linf = 0.0; ++ double cur_l2 = 0.0; ++ auto index = partitions[part].first; ++ const auto length = partitions[part].second; ++ do ++ { ++ const auto idx = compute_index(index, istride, idx_base); ++ const double val = std::abs(static_cast(input[idx + offset[0]])); ++ cur_linf = std::max(val, cur_linf); ++ cur_l2 += val * val; ++ ++ } while(increment_rowmajor(index, length)); ++ linf = std::max(linf, cur_linf); ++ l2 += cur_l2; ++ } ++ } ++ return {.l_2 = sqrt(l2), .l_inf = linf}; ++} ++ ++// Compute the L-infinity and L-2 norm of abuffer with strides istride and ++// length idist. Data format is given by precision and itype. ++template ++inline VectorNorms norm(const std::vector& input, ++ const T1& length, ++ const size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type itype, ++ const T2& istride, ++ const size_t idist, ++ const std::vector& offset) ++{ ++ VectorNorms norm; ++ ++ switch(itype) ++ { ++ case fft_array_type_complex_interleaved: ++ case fft_array_type_hermitian_interleaved: ++ switch(precision) ++ { ++ case fft_precision_half: ++ norm = norm_complex(reinterpret_cast*>(input[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ case fft_precision_single: ++ norm = norm_complex(reinterpret_cast*>(input[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ case fft_precision_double: ++ norm = norm_complex(reinterpret_cast*>(input[0].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ } ++ norm.l_2 *= norm.l_2; ++ break; ++ case fft_array_type_real: ++ case fft_array_type_complex_planar: ++ case fft_array_type_hermitian_planar: ++ for(unsigned int idx = 0; idx < input.size(); ++idx) ++ { ++ VectorNorms n; ++ switch(precision) ++ { ++ case fft_precision_half: ++ n = norm_real(reinterpret_cast(input[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ case fft_precision_single: ++ n = norm_real(reinterpret_cast(input[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ case fft_precision_double: ++ n = norm_real(reinterpret_cast(input[idx].data()), ++ length, ++ nbatch, ++ istride, ++ idist, ++ offset); ++ break; ++ } ++ norm.l_inf = std::max(n.l_inf, norm.l_inf); ++ norm.l_2 += n.l_2 * n.l_2; ++ } ++ break; ++ default: ++ throw std::runtime_error("Invalid data type"); ++ } ++ ++ norm.l_2 = sqrt(norm.l_2); ++ return norm; ++} ++ ++// Unroll arbitrary-dimension norm into specializations for 1-, 2-, 3-dimensions ++template ++inline VectorNorms norm(const std::vector& input, ++ std::vector length, ++ size_t nbatch, ++ const fft_precision precision, ++ const fft_array_type type, ++ std::vector stride, ++ const size_t dist, ++ const std::vector& offset) ++{ ++ // If stride is contiguous, collapse it down to one dimension. ++ // Index calculation is simpler (and faster) in the 1D case. ++ if(is_contiguous_rowmajor(length, stride, dist)) ++ { ++ length = {product(length.begin(), length.end()) * nbatch}; ++ stride = {static_cast(1)}; ++ nbatch = 1; ++ } ++ ++ switch(length.size()) ++ { ++ case 1: ++ return norm(input, length[0], nbatch, precision, type, stride[0], dist, offset); ++ case 2: ++ return norm(input, ++ std::make_tuple(length[0], length[1]), ++ nbatch, ++ precision, ++ type, ++ std::make_tuple(stride[0], stride[1]), ++ dist, ++ offset); ++ case 3: ++ return norm(input, ++ std::make_tuple(length[0], length[1], length[2]), ++ nbatch, ++ precision, ++ type, ++ std::make_tuple(stride[0], stride[1], stride[2]), ++ dist, ++ offset); ++ default: ++ abort(); ++ } ++} ++ ++// Given a data type and precision, the distance between batches, and ++// the batch size, allocate the required host buffer(s). ++static std::vector allocate_host_buffer(const fft_precision precision, ++ const fft_array_type type, ++ const std::vector& size) ++{ ++ std::vector buffers(size.size()); ++ for(unsigned int i = 0; i < size.size(); ++i) ++ { ++ buffers[i].alloc(size[i] * var_size(precision, type)); ++ } ++ return buffers; ++} ++ ++// Check if the required buffers fit in the device vram. ++inline bool vram_fits_problem(const size_t prob_size, const size_t vram_avail, int deviceId = 0) ++{ ++ // We keep a small margin of error for fitting the problem into vram: ++ const size_t extra = 1 << 27; ++ ++ return vram_avail > prob_size + extra; ++} ++ ++// Computes the twiddle table VRAM footprint for r2c/c2r transforms. ++// This function will return 0 for the other transform types, since ++// the VRAM footprint in rocFFT is negligible for the other cases. ++inline size_t twiddle_table_vram_footprint(const fft_params& params) ++{ ++ size_t vram_footprint = 0; ++ ++ // Add vram footprint from real/complex even twiddle buffer size. ++ if(params.transform_type == fft_transform_type_real_forward ++ || params.transform_type == fft_transform_type_real_inverse) ++ { ++ const auto realdim = params.length.back(); ++ if(realdim % 2 == 0) ++ { ++ const auto complex_size = params.precision == fft_precision_single ? 8 : 16; ++ // even length twiddle size is 1/4 of the real size, but ++ // in complex elements ++ vram_footprint += realdim * complex_size / 4; ++ } ++ } ++ ++ return vram_footprint; ++} ++ ++#endif +diff --git a/shared/fftw_transform.h b/shared/fftw_transform.h +new file mode 100644 +index 0000000..873a373 +--- /dev/null ++++ b/shared/fftw_transform.h +@@ -0,0 +1,493 @@ ++// Copyright (C) 2016 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++#ifndef FFTWTRANSFORM_H ++#define FFTWTRANSFORM_H ++ ++#include "hostbuf.h" ++#include "rocfft_complex.h" ++#include "test_params.h" ++#include ++#include ++ ++// Function to return maximum error for float and double types. ++// ++// Following Schatzman (1996; Accuracy of the Discrete Fourier ++// Transform and the Fast Fourier Transform), the shape of relative ++// l_2 error vs length should look like ++// ++// epsilon * sqrt(log2(length)). ++// ++// The magic epsilon constants below were chosen so that we get a ++// reasonable upper bound for (all of) our tests. ++// ++// For rocFFT, prime lengths result in the highest error. As such, ++// the epsilons below are perhaps too loose for pow2 lengths; but they ++// are appropriate for prime lengths. ++template ++inline double type_epsilon(); ++template <> ++inline double type_epsilon<_Float16>() ++{ ++ return half_epsilon; ++} ++template <> ++inline double type_epsilon() ++{ ++ return single_epsilon; ++} ++template <> ++inline double type_epsilon() ++{ ++ return double_epsilon; ++} ++ ++// C++ traits to translate float->fftwf_complex and ++// double->fftw_complex. ++// The correct FFTW complex type can be accessed via, for example, ++// using complex_t = typename fftw_complex_trait::complex_t; ++template ++struct fftw_trait; ++template <> ++struct fftw_trait<_Float16> ++{ ++ // fftw does not support half precision, so use single precision and convert ++ using fftw_complex_type = fftwf_complex; ++ using fftw_plan_type = fftwf_plan; ++}; ++template <> ++struct fftw_trait ++{ ++ using fftw_complex_type = fftwf_complex; ++ using fftw_plan_type = fftwf_plan; ++}; ++template <> ++struct fftw_trait ++{ ++ using fftw_complex_type = fftw_complex; ++ using fftw_plan_type = fftw_plan; ++}; ++ ++// Copies the half-precision input buffer to a single-precision ++// buffer. Note that the input buffer is already sized like it's a ++// single-precision buffer (but only half of it is filled), because ++// we allocate a single-precision buffer for FFTW to plan with. ++static hostbuf half_to_single_copy(const hostbuf& in) ++{ ++ auto out = in.copy(); ++ auto in_begin = reinterpret_cast(in.data()); ++ std::copy_n(in_begin, in.size() / sizeof(_Float16) / 2, reinterpret_cast(out.data())); ++ return out; ++} ++ ++// converts a wider precision buffer to a narrower precision, in-place ++template ++void narrow_precision_inplace(hostbuf& in) ++{ ++ // ensure we're actually shrinking the data ++ static_assert(sizeof(TfloatIn) > sizeof(TfloatOut)); ++ ++ auto readPtr = reinterpret_cast(in.data()); ++ auto writePtr = reinterpret_cast(in.data()); ++ std::copy_n(readPtr, in.size() / sizeof(TfloatIn), writePtr); ++ in.shrink(in.size() / (sizeof(TfloatIn) / sizeof(TfloatOut))); ++} ++ ++static void single_to_half_inplace(hostbuf& in) ++{ ++ narrow_precision_inplace(in); ++} ++ ++// Template wrappers for real-valued FFTW allocators: ++template ++inline Tfloat* fftw_alloc_real_type(size_t n); ++template <> ++inline float* fftw_alloc_real_type(size_t n) ++{ ++ return fftwf_alloc_real(n); ++} ++template <> ++inline double* fftw_alloc_real_type(size_t n) ++{ ++ return fftw_alloc_real(n); ++} ++ ++// Template wrappers for complex-valued FFTW allocators: ++template ++inline typename fftw_trait::fftw_complex_type* fftw_alloc_complex_type(size_t n); ++template <> ++inline typename fftw_trait::fftw_complex_type* fftw_alloc_complex_type(size_t n) ++{ ++ return fftwf_alloc_complex(n); ++} ++template <> ++inline typename fftw_trait::fftw_complex_type* fftw_alloc_complex_type(size_t n) ++{ ++ return fftw_alloc_complex(n); ++} ++ ++template ++inline fftw_type* fftw_alloc_type(size_t n); ++template <> ++inline float* fftw_alloc_type(size_t n) ++{ ++ return fftw_alloc_real_type(n); ++} ++template <> ++inline double* fftw_alloc_type(size_t n) ++{ ++ return fftw_alloc_real_type(n); ++} ++template <> ++inline fftwf_complex* fftw_alloc_type(size_t n) ++{ ++ return fftw_alloc_complex_type(n); ++} ++template <> ++inline fftw_complex* fftw_alloc_type(size_t n) ++{ ++ return fftw_alloc_complex_type(n); ++} ++template <> ++inline rocfft_complex* fftw_alloc_type>(size_t n) ++{ ++ return (rocfft_complex*)fftw_alloc_complex_type(n); ++} ++template <> ++inline rocfft_complex* fftw_alloc_type>(size_t n) ++{ ++ return (rocfft_complex*)fftw_alloc_complex_type(n); ++} ++ ++// Template wrappers for FFTW plan executors: ++template ++inline void fftw_execute_type(typename fftw_trait::fftw_plan_type plan); ++template <> ++inline void fftw_execute_type(typename fftw_trait::fftw_plan_type plan) ++{ ++ return fftwf_execute(plan); ++} ++template <> ++inline void fftw_execute_type(typename fftw_trait::fftw_plan_type plan) ++{ ++ return fftw_execute(plan); ++} ++ ++// Template wrappers for FFTW plan destroyers: ++template ++inline void fftw_destroy_plan_type(Tfftw_plan plan); ++template <> ++inline void fftw_destroy_plan_type(fftwf_plan plan) ++{ ++ return fftwf_destroy_plan(plan); ++} ++template <> ++inline void fftw_destroy_plan_type(fftw_plan plan) ++{ ++ return fftw_destroy_plan(plan); ++} ++ ++// Template wrappers for FFTW c2c planners: ++template ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_dft(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ typename fftw_trait::fftw_complex_type* out, ++ int sign, ++ unsigned flags); ++ ++template <> ++inline typename fftw_trait<_Float16>::fftw_plan_type ++ fftw_plan_guru64_dft<_Float16>(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait<_Float16>::fftw_complex_type* in, ++ typename fftw_trait<_Float16>::fftw_complex_type* out, ++ int sign, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft(rank, dims, howmany_rank, howmany_dims, in, out, sign, flags); ++} ++ ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_dft(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ typename fftw_trait::fftw_complex_type* out, ++ int sign, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft(rank, dims, howmany_rank, howmany_dims, in, out, sign, flags); ++} ++ ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_dft(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ typename fftw_trait::fftw_complex_type* out, ++ int sign, ++ unsigned flags) ++{ ++ return fftw_plan_guru64_dft(rank, dims, howmany_rank, howmany_dims, in, out, sign, flags); ++} ++ ++// Template wrappers for FFTW c2c executors: ++template ++inline void fftw_plan_execute_c2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out); ++ ++template <> ++inline void fftw_plan_execute_c2c<_Float16>(typename fftw_trait<_Float16>::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ // since FFTW does not natively support half precision, convert ++ // input to single, execute, then convert output back to half ++ auto in_single = half_to_single_copy(in.front()); ++ fftwf_execute_dft(plan, ++ reinterpret_cast(in_single.data()), ++ reinterpret_cast(out.front().data())); ++ single_to_half_inplace(out.front()); ++} ++ ++template <> ++inline void fftw_plan_execute_c2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftwf_execute_dft(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++ ++template <> ++inline void fftw_plan_execute_c2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftw_execute_dft(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++ ++// Template wrappers for FFTW r2c planners: ++template ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_r2c(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ Tfloat* in, ++ typename fftw_trait::fftw_complex_type* out, ++ unsigned flags); ++template <> ++inline typename fftw_trait<_Float16>::fftw_plan_type ++ fftw_plan_guru64_r2c<_Float16>(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ _Float16* in, ++ typename fftw_trait<_Float16>::fftw_complex_type* out, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft_r2c( ++ rank, dims, howmany_rank, howmany_dims, reinterpret_cast(in), out, flags); ++} ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_r2c(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ float* in, ++ typename fftw_trait::fftw_complex_type* out, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft_r2c(rank, dims, howmany_rank, howmany_dims, in, out, flags); ++} ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_r2c(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ double* in, ++ typename fftw_trait::fftw_complex_type* out, ++ unsigned flags) ++{ ++ return fftw_plan_guru64_dft_r2c(rank, dims, howmany_rank, howmany_dims, in, out, flags); ++} ++ ++// Template wrappers for FFTW r2c executors: ++template ++inline void fftw_plan_execute_r2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out); ++template <> ++inline void fftw_plan_execute_r2c<_Float16>(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ // since FFTW does not natively support half precision, convert ++ // input to single, execute, then convert output back to half ++ auto in_single = half_to_single_copy(in.front()); ++ fftwf_execute_dft_r2c(plan, ++ reinterpret_cast(in_single.data()), ++ reinterpret_cast(out.front().data())); ++ single_to_half_inplace(out.front()); ++} ++template <> ++inline void fftw_plan_execute_r2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftwf_execute_dft_r2c(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++template <> ++inline void fftw_plan_execute_r2c(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftw_execute_dft_r2c(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++ ++// Template wrappers for FFTW c2r planners: ++template ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_c2r(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ Tfloat* out, ++ unsigned flags); ++template <> ++inline typename fftw_trait<_Float16>::fftw_plan_type ++ fftw_plan_guru64_c2r<_Float16>(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait<_Float16>::fftw_complex_type* in, ++ _Float16* out, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft_c2r( ++ rank, dims, howmany_rank, howmany_dims, in, reinterpret_cast(out), flags); ++} ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_c2r(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ float* out, ++ unsigned flags) ++{ ++ return fftwf_plan_guru64_dft_c2r(rank, dims, howmany_rank, howmany_dims, in, out, flags); ++} ++template <> ++inline typename fftw_trait::fftw_plan_type ++ fftw_plan_guru64_c2r(int rank, ++ const fftw_iodim64* dims, ++ int howmany_rank, ++ const fftw_iodim64* howmany_dims, ++ typename fftw_trait::fftw_complex_type* in, ++ double* out, ++ unsigned flags) ++{ ++ return fftw_plan_guru64_dft_c2r(rank, dims, howmany_rank, howmany_dims, in, out, flags); ++} ++ ++// Template wrappers for FFTW c2r executors: ++template ++inline void fftw_plan_execute_c2r(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out); ++template <> ++inline void fftw_plan_execute_c2r<_Float16>(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ // since FFTW does not natively support half precision, convert ++ // input to single, execute, then convert output back to half ++ auto in_single = half_to_single_copy(in.front()); ++ fftwf_execute_dft_c2r(plan, ++ reinterpret_cast(in_single.data()), ++ reinterpret_cast(out.front().data())); ++ single_to_half_inplace(out.front()); ++} ++template <> ++inline void fftw_plan_execute_c2r(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftwf_execute_dft_c2r(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++template <> ++inline void fftw_plan_execute_c2r(typename fftw_trait::fftw_plan_type plan, ++ std::vector& in, ++ std::vector& out) ++{ ++ fftw_execute_dft_c2r(plan, ++ reinterpret_cast(in.front().data()), ++ reinterpret_cast(out.front().data())); ++} ++ ++#ifdef FFTW_HAVE_SPRINT_PLAN ++// Template wrappers for FFTW print plan: ++template ++inline char* fftw_sprint_plan(const typename fftw_trait::fftw_plan_type plan); ++template <> ++inline char* fftw_sprint_plan<_Float16>(const typename fftw_trait<_Float16>::fftw_plan_type plan) ++{ ++ return fftwf_sprint_plan(plan); ++} ++template <> ++inline char* fftw_sprint_plan(const typename fftw_trait::fftw_plan_type plan) ++{ ++ return fftwf_sprint_plan(plan); ++} ++template <> ++inline char* fftw_sprint_plan(const typename fftw_trait::fftw_plan_type plan) ++{ ++ return fftw_sprint_plan(plan); ++} ++#endif ++ ++#endif +diff --git a/shared/gpubuf.h b/shared/gpubuf.h +new file mode 100644 +index 0000000..993fa95 +--- /dev/null ++++ b/shared/gpubuf.h +@@ -0,0 +1,134 @@ ++// Copyright (C) 2021 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_GPUBUF_H ++#define ROCFFT_GPUBUF_H ++ ++#include "rocfft_hip.h" ++#include ++ ++// Simple RAII class for GPU buffers. T is the type of pointer that ++// data() returns ++template ++class gpubuf_t ++{ ++public: ++ gpubuf_t() {} ++ // buffers are movable but not copyable ++ gpubuf_t(gpubuf_t&& other) ++ { ++ std::swap(buf, other.buf); ++ std::swap(bsize, other.bsize); ++ std::swap(device, other.device); ++ } ++ gpubuf_t& operator=(gpubuf_t&& other) ++ { ++ std::swap(buf, other.buf); ++ std::swap(bsize, other.bsize); ++ std::swap(device, other.device); ++ return *this; ++ } ++ gpubuf_t(const gpubuf_t&) = delete; ++ gpubuf_t& operator=(const gpubuf_t&) = delete; ++ ++ ~gpubuf_t() ++ { ++ free(); ++ } ++ ++ static bool use_alloc_managed() ++ { ++ return std::getenv("ROCFFT_MALLOC_MANAGED"); ++ } ++ ++ hipError_t alloc(const size_t size) ++ { ++ // remember the device that was current as of alloc, so we can ++ // free on the correct device ++ auto ret = hipGetDevice(&device); ++ if(ret != hipSuccess) ++ return ret; ++ ++ bsize = size; ++ static bool alloc_managed = use_alloc_managed(); ++ free(); ++ ret = alloc_managed ? hipMallocManaged(&buf, bsize) : hipMalloc(&buf, bsize); ++ if(ret != hipSuccess) ++ { ++ buf = nullptr; ++ bsize = 0; ++ } ++ return ret; ++ } ++ ++ size_t size() const ++ { ++ return bsize; ++ } ++ ++ void free() ++ { ++ if(buf != nullptr) ++ { ++ // free on the device we allocated on ++ rocfft_scoped_device dev(device); ++ (void)hipFree(buf); ++ buf = nullptr; ++ bsize = 0; ++ } ++ } ++ ++ // return a pointer to the allocated memory, offset by the ++ // specified number of bytes ++ T* data_offset(size_t offset_bytes = 0) const ++ { ++ void* ptr = static_cast(buf) + offset_bytes; ++ return static_cast(ptr); ++ } ++ ++ T* data() const ++ { ++ return static_cast(buf); ++ } ++ ++ // equality/bool tests ++ bool operator==(std::nullptr_t n) const ++ { ++ return buf == n; ++ } ++ bool operator!=(std::nullptr_t n) const ++ { ++ return buf != n; ++ } ++ operator bool() const ++ { ++ return buf; ++ } ++ ++private: ++ // The GPU buffer ++ void* buf = nullptr; ++ size_t bsize = 0; ++ int device = 0; ++}; ++ ++// default gpubuf that gives out void* pointers ++typedef gpubuf_t<> gpubuf; ++#endif +diff --git a/shared/hip_object_wrapper.h b/shared/hip_object_wrapper.h +new file mode 100644 +index 0000000..54083ab +--- /dev/null ++++ b/shared/hip_object_wrapper.h +@@ -0,0 +1,86 @@ ++/****************************************************************************** ++* Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++* ++* Permission is hereby granted, free of charge, to any person obtaining a copy ++* of this software and associated documentation files (the "Software"), to deal ++* in the Software without restriction, including without limitation the rights ++* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++* copies of the Software, and to permit persons to whom the Software is ++* furnished to do so, subject to the following conditions: ++* ++* The above copyright notice and this permission notice shall be included in ++* all copies or substantial portions of the Software. ++* ++* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++* THE SOFTWARE. ++*******************************************************************************/ ++ ++#ifndef ROCFFT_HIP_OBJ_WRAPPER_H ++#define ROCFFT_HIP_OBJ_WRAPPER_H ++ ++#include "rocfft_hip.h" ++ ++// RAII wrapper around HIP objects ++template ++struct hip_object_wrapper_t ++{ ++ hip_object_wrapper_t() ++ : obj(nullptr) ++ { ++ } ++ ++ void alloc() ++ { ++ if(obj == nullptr && TCreate(&obj) != hipSuccess) ++ throw std::runtime_error("hip create failure"); ++ } ++ ++ void free() ++ { ++ if(obj) ++ { ++ (void)TDestroy(obj); ++ obj = nullptr; ++ } ++ } ++ ++ operator const T&() const ++ { ++ return obj; ++ } ++ operator T&() ++ { ++ return obj; ++ } ++ ++ operator bool() const ++ { ++ return obj != nullptr; ++ } ++ ++ ~hip_object_wrapper_t() ++ { ++ free(); ++ } ++ ++ hip_object_wrapper_t(const hip_object_wrapper_t&) = delete; ++ hip_object_wrapper_t& operator=(const hip_object_wrapper_t&) = delete; ++ hip_object_wrapper_t(hip_object_wrapper_t&& other) ++ : obj(other.obj) ++ { ++ other.obj = nullptr; ++ } ++ ++private: ++ T obj; ++}; ++ ++typedef hip_object_wrapper_t hipStream_wrapper_t; ++typedef hip_object_wrapper_t hipEvent_wrapper_t; ++ ++#endif // ROCFFT_HIP_OBJ_WRAPPER_H +diff --git a/shared/hostbuf.h b/shared/hostbuf.h +new file mode 100644 +index 0000000..0a96c7d +--- /dev/null ++++ b/shared/hostbuf.h +@@ -0,0 +1,158 @@ ++// Copyright (C) 2021 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_HOSTBUF_H ++#define ROCFFT_HOSTBUF_H ++ ++#include "arithmetic.h" ++#include ++#include ++ ++#ifndef WIN32 ++#include ++#include ++#endif ++ ++// Simple RAII class for host buffers. T is the type of pointer that ++// data() returns ++template ++class hostbuf_t ++{ ++public: ++ hostbuf_t() {} ++ // buffers are movable but not copyable ++ hostbuf_t(hostbuf_t&& other) ++ { ++ std::swap(buf, other.buf); ++ std::swap(bsize, other.bsize); ++ } ++ hostbuf_t& operator=(hostbuf_t&& other) ++ { ++ std::swap(buf, other.buf); ++ std::swap(bsize, other.bsize); ++ return *this; ++ } ++ hostbuf_t(const hostbuf_t&) = delete; ++ hostbuf_t& operator=(const hostbuf_t&) = delete; ++ ++ ~hostbuf_t() ++ { ++ free(); ++ } ++ ++ void alloc(size_t size) ++ { ++ bsize = size; ++ free(); ++ ++ // we're aligning to multiples of 64 bytes, so round the ++ // allocation size up to the nearest 64 to keep ASAN happy ++ if(size % 64) ++ { ++ size += 64 - size % 64; ++ } ++ ++ // FFTW requires aligned allocations to use faster SIMD instructions. ++ // If enabling hugepages, align to 2 MiB. Otherwise, aligning to ++ // 64 bytes is enough for AVX instructions up to AVX512. ++#ifdef WIN32 ++ buf = _aligned_malloc(size, 64); ++#else ++ // On Linux, ask for hugepages to reduce TLB pressure and ++ // improve performance. Allocations need to be aligned to ++ // the hugepage size, and rounded up to the next whole ++ // hugepage. ++ static const size_t TWO_MiB = 2 * 1024 * 1024; ++ if(size >= TWO_MiB) ++ { ++ size_t rounded_size = DivRoundingUp(size, TWO_MiB) * TWO_MiB; ++ buf = aligned_alloc(TWO_MiB, rounded_size); ++ madvise(buf, rounded_size, MADV_HUGEPAGE); ++ } ++ else ++ buf = aligned_alloc(64, size); ++#endif ++ } ++ ++ size_t size() const ++ { ++ return bsize; ++ } ++ ++ void free() ++ { ++ if(buf != nullptr) ++ { ++#ifdef WIN32 ++ _aligned_free(buf); ++#else ++ std::free(buf); ++#endif ++ buf = nullptr; ++ bsize = 0; ++ } ++ } ++ ++ T* data() const ++ { ++ return static_cast(buf); ++ } ++ ++ // Copy method ++ hostbuf_t copy() const ++ { ++ hostbuf_t copy; ++ copy.alloc(bsize); ++ memcpy(copy.buf, buf, bsize); ++ return copy; ++ } ++ ++ // shrink the buffer to fit the new size ++ void shrink(size_t new_size) ++ { ++ if(new_size > bsize) ++ throw std::runtime_error("can't shrink hostbuf to larger size"); ++ // just pretend the buffer is now that size ++ bsize = new_size; ++ } ++ ++ // equality/bool tests ++ bool operator==(std::nullptr_t n) const ++ { ++ return buf == n; ++ } ++ bool operator!=(std::nullptr_t n) const ++ { ++ return buf != n; ++ } ++ operator bool() const ++ { ++ return buf; ++ } ++ ++private: ++ // The host buffer ++ void* buf = nullptr; ++ size_t bsize = 0; ++}; ++ ++// default hostbuf that gives out void* pointers ++typedef hostbuf_t<> hostbuf; ++#endif +diff --git a/shared/increment.h b/shared/increment.h +new file mode 100644 +index 0000000..90bba1d +--- /dev/null ++++ b/shared/increment.h +@@ -0,0 +1,100 @@ ++// Copyright (C) 2021 - 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_INCREMENT_H ++#define ROCFFT_INCREMENT_H ++ ++#include ++#include ++#include ++ ++// Helper functions to iterate over a buffer in row-major order. ++// Indexes may be given as either a tuple or vector of sizes. They ++// return true if the index was successfully incremented to move to ++// the next element in the buffer. ++ ++template ++static bool increment_base(T1& index, const T2& length) ++{ ++ static_assert(std::is_integral::value, "Integral required."); ++ static_assert(std::is_integral::value, "Integral required."); ++ if(index < length - 1) ++ { ++ ++index; ++ return true; ++ } ++ index = 0; ++ return false; ++} ++ ++// Increment the index (row-major) for looping over 1, 2, and 3 dimensions length. ++template ++static bool increment_rowmajor(T1& index, const T2& length) ++{ ++ static_assert(std::is_integral::value, "Integral required."); ++ static_assert(std::is_integral::value, "Integral required."); ++ return increment_base(index, length); ++} ++ ++template ++static bool increment_rowmajor(std::tuple& index, const std::tuple& length) ++{ ++ if(increment_base(std::get<1>(index), std::get<1>(length))) ++ // we incremented ok, nothing further to do ++ return true; ++ // otherwise, we rolled over ++ return increment_base(std::get<0>(index), std::get<0>(length)); ++} ++ ++template ++static bool increment_rowmajor(std::tuple& index, const std::tuple& length) ++{ ++ if(increment_base(std::get<2>(index), std::get<2>(length))) ++ // we incremented ok, nothing further to do ++ return true; ++ if(increment_base(std::get<1>(index), std::get<1>(length))) ++ // we incremented ok, nothing further to do ++ return true; ++ // otherwise, we rolled over ++ return increment_base(std::get<0>(index), std::get<0>(length)); ++} ++ ++// Increment row-major index over arbitrary dimension length ++template ++bool increment_rowmajor(std::vector& index, const std::vector& length) ++{ ++ for(int idim = length.size(); idim-- > 0;) ++ { ++ if(index[idim] < length[idim]) ++ { ++ if((++index[idim]) == length[idim]) ++ { ++ index[idim] = 0; ++ continue; ++ } ++ // we know we were able to increment something and didn't hit the end ++ return true; ++ } ++ } ++ // End the loop when we get back to the start: ++ return !std::all_of(index.begin(), index.end(), [](int i) { return i == 0; }); ++} ++ ++#endif +diff --git a/shared/precision_type.h b/shared/precision_type.h +new file mode 100644 +index 0000000..526fc9a +--- /dev/null ++++ b/shared/precision_type.h +@@ -0,0 +1,70 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_PRECISION_TYPE_H ++#define ROCFFT_PRECISION_TYPE_H ++ ++#include "array_predicate.h" ++#include "rocfft/rocfft.h" ++ ++static size_t real_type_size(rocfft_precision precision) ++{ ++ switch(precision) ++ { ++ case rocfft_precision_half: ++ return 2; ++ case rocfft_precision_single: ++ return 4; ++ case rocfft_precision_double: ++ return 8; ++ } ++} ++ ++static size_t complex_type_size(rocfft_precision precision) ++{ ++ return real_type_size(precision) * 2; ++} ++ ++static const char* precision_name(rocfft_precision precision) ++{ ++ switch(precision) ++ { ++ case rocfft_precision_half: ++ return "half"; ++ case rocfft_precision_single: ++ return "single"; ++ case rocfft_precision_double: ++ return "double"; ++ } ++} ++ ++static size_t element_size(rocfft_precision precision, rocfft_array_type array_type) ++{ ++ return array_type_is_complex(array_type) ? complex_type_size(precision) ++ : real_type_size(precision); ++} ++ ++// offset a pointer by a number of elements, given the elements' ++// precision and type (complex or not) ++static void* ptr_offset(void* p, size_t elems, rocfft_precision precision, rocfft_array_type type) ++{ ++ return static_cast(p) + elems * element_size(precision, type); ++} ++#endif +diff --git a/shared/printbuffer.h b/shared/printbuffer.h +new file mode 100644 +index 0000000..5ae0b64 +--- /dev/null ++++ b/shared/printbuffer.h +@@ -0,0 +1,108 @@ ++// Copyright (C) 2021 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef PRINTBUFFER_H ++#define PRINTBUFFER_H ++ ++#include "hostbuf.h" ++#include "increment.h" ++#include ++#include ++ ++// Output a formatted general-dimensional array with given length and stride in batches ++// separated by dist. ++template ++inline void printbuffer(const Toutput* output, ++ const std::vector& length, ++ const std::vector& stride, ++ const Tsize nbatch, ++ const Tsize dist, ++ const size_t offset, ++ Tstream& stream) ++{ ++ auto i_base = 0; ++ for(unsigned int b = 0; b < nbatch; b++, i_base += dist) ++ { ++ std::vector index(length.size()); ++ std::fill(index.begin(), index.end(), 0); ++ do ++ { ++ const int i ++ = std::inner_product(index.begin(), index.end(), stride.begin(), i_base + offset); ++ stream << output[i] << " "; ++ for(int li = index.size(); li-- > 0;) ++ { ++ if(index[li] == (length[li] - 1)) ++ { ++ stream << "\n"; ++ } ++ else ++ { ++ break; ++ } ++ } ++ } while(increment_rowmajor(index, length)); ++ stream << std::endl; ++ } ++} ++ ++template ++class buffer_printer ++{ ++ // The scalar versions might be part of a planar format. ++public: ++ template ++ static void print_buffer(const std::vector& buf, ++ const std::vector& length, ++ const std::vector& stride, ++ const Tsize nbatch, ++ const Tsize dist, ++ const std::vector& offset, ++ Tstream& stream = std::cout) ++ { ++ for(const auto& vec : buf) ++ { ++ printbuffer(reinterpret_cast(vec.data()), ++ length, ++ stride, ++ nbatch, ++ dist, ++ offset[0], ++ stream); ++ } ++ }; ++ template ++ static void print_buffer_flat(const std::vector& buf, ++ const std::vector& size, ++ const std::vector& offset, ++ Tstream& stream = std::cout) ++ { ++ for(const auto& vec : buf) ++ { ++ auto data = reinterpret_cast(vec.data()); ++ stream << "idx " << 0; ++ for(size_t i = 0; i < size[0]; ++i) ++ stream << " " << data[i]; ++ stream << std::endl; ++ } ++ }; ++}; ++ ++#endif +diff --git a/shared/ptrdiff.h b/shared/ptrdiff.h +new file mode 100644 +index 0000000..3bd15de +--- /dev/null ++++ b/shared/ptrdiff.h +@@ -0,0 +1,40 @@ ++// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++ ++// Compute the farthest point from the original pointer. ++static size_t compute_ptrdiff(const std::vector& length, ++ const std::vector& stride, ++ const size_t nbatch, ++ const size_t dist) ++{ ++ size_t val = 0; ++ if(!length.empty()) ++ { ++ val = 1; ++ for(unsigned int i = 0; i < length.size(); ++i) ++ { ++ val += (length[i] - 1) * stride[i]; ++ } ++ val += (nbatch - 1) * dist; ++ } ++ return val; ++} +diff --git a/shared/rocfft_accuracy_test.h b/shared/rocfft_accuracy_test.h +new file mode 100644 +index 0000000..4ce3059 +--- /dev/null ++++ b/shared/rocfft_accuracy_test.h +@@ -0,0 +1,29 @@ ++// Copyright (C) 2022 - 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_ACCURACY_TEST ++#define ROCFFT_ACCURACY_TEST ++ ++#include "accuracy_test.h" ++#include "rocfft_params.h" ++ ++void fft_vs_reference(rocfft_params& params, bool round_trip = false); ++ ++#endif +diff --git a/shared/rocfft_against_fftw.h b/shared/rocfft_against_fftw.h +new file mode 100644 +index 0000000..d03754c +--- /dev/null ++++ b/shared/rocfft_against_fftw.h +@@ -0,0 +1,231 @@ ++// Copyright (C) 2016 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++#ifndef ROCFFT_AGAINST_FFTW ++#define ROCFFT_AGAINST_FFTW ++ ++#include ++#include ++#include ++#include ++ ++#include "fftw_transform.h" ++ ++// Return the precision enum for rocFFT based upon the type. ++template ++inline fft_precision precision_selector(); ++template <> ++inline fft_precision precision_selector() ++{ ++ return fft_precision_single; ++} ++template <> ++inline fft_precision precision_selector() ++{ ++ return fft_precision_double; ++} ++ ++extern bool use_fftw_wisdom; ++ ++// construct and return an FFTW plan with the specified type, ++// precision, and dimensions. cpu_out is required if we're using ++// wisdom, which runs actual FFTs to work out the best plan. ++template ++static typename fftw_trait::fftw_plan_type ++ fftw_plan_with_precision(const std::vector& dims, ++ const std::vector& howmany_dims, ++ const fft_transform_type transformType, ++ const size_t isize, ++ void* cpu_in, ++ void* cpu_out) ++{ ++ using fftw_complex_type = typename fftw_trait::fftw_complex_type; ++ ++ // NB: Using FFTW_MEASURE implies that the input buffer's data ++ // may be destroyed during plan creation. But if we're wanting ++ // to run FFTW in the first place, we must have just created an ++ // uninitialized input buffer anyway. ++ ++ switch(transformType) ++ { ++ case fft_transform_type_complex_forward: ++ return fftw_plan_guru64_dft(dims.size(), ++ dims.data(), ++ howmany_dims.size(), ++ howmany_dims.data(), ++ reinterpret_cast(cpu_in), ++ reinterpret_cast(cpu_out), ++ -1, ++ use_fftw_wisdom ? FFTW_MEASURE : FFTW_ESTIMATE); ++ case fft_transform_type_complex_inverse: ++ return fftw_plan_guru64_dft(dims.size(), ++ dims.data(), ++ howmany_dims.size(), ++ howmany_dims.data(), ++ reinterpret_cast(cpu_in), ++ reinterpret_cast(cpu_out), ++ 1, ++ use_fftw_wisdom ? FFTW_MEASURE : FFTW_ESTIMATE); ++ case fft_transform_type_real_forward: ++ return fftw_plan_guru64_r2c(dims.size(), ++ dims.data(), ++ howmany_dims.size(), ++ howmany_dims.data(), ++ reinterpret_cast(cpu_in), ++ reinterpret_cast(cpu_out), ++ use_fftw_wisdom ? FFTW_MEASURE : FFTW_ESTIMATE); ++ case fft_transform_type_real_inverse: ++ return fftw_plan_guru64_c2r(dims.size(), ++ dims.data(), ++ howmany_dims.size(), ++ howmany_dims.data(), ++ reinterpret_cast(cpu_in), ++ reinterpret_cast(cpu_out), ++ use_fftw_wisdom ? FFTW_MEASURE : FFTW_ESTIMATE); ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++} ++ ++// construct an FFTW plan, given rocFFT parameters. output is ++// required if planning with wisdom. ++template ++static typename fftw_trait::fftw_plan_type ++ fftw_plan_via_rocfft(const std::vector& length, ++ const std::vector& istride, ++ const std::vector& ostride, ++ const size_t nbatch, ++ const size_t idist, ++ const size_t odist, ++ const fft_transform_type transformType, ++ std::vector& input, ++ std::vector& output) ++{ ++ // Dimension configuration: ++ std::vector dims(length.size()); ++ for(unsigned int idx = 0; idx < length.size(); ++idx) ++ { ++ dims[idx].n = length[idx]; ++ dims[idx].is = istride[idx]; ++ dims[idx].os = ostride[idx]; ++ } ++ ++ // Batch configuration: ++ std::vector howmany_dims(1); ++ howmany_dims[0].n = nbatch; ++ howmany_dims[0].is = idist; ++ howmany_dims[0].os = odist; ++ ++ return fftw_plan_with_precision(dims, ++ howmany_dims, ++ transformType, ++ idist * nbatch, ++ input.front().data(), ++ output.empty() ? nullptr : output.front().data()); ++} ++ ++template ++void fftw_run(fft_transform_type transformType, ++ typename fftw_trait::fftw_plan_type cpu_plan, ++ std::vector& cpu_in, ++ std::vector& cpu_out) ++{ ++ switch(transformType) ++ { ++ case fft_transform_type_complex_forward: ++ { ++ fftw_plan_execute_c2c(cpu_plan, cpu_in, cpu_out); ++ break; ++ } ++ case fft_transform_type_complex_inverse: ++ { ++ fftw_plan_execute_c2c(cpu_plan, cpu_in, cpu_out); ++ break; ++ } ++ case fft_transform_type_real_forward: ++ { ++ fftw_plan_execute_r2c(cpu_plan, cpu_in, cpu_out); ++ break; ++ } ++ case fft_transform_type_real_inverse: ++ { ++ fftw_plan_execute_c2r(cpu_plan, cpu_in, cpu_out); ++ break; ++ } ++ } ++} ++ ++// Given a transform type, return the contiguous input type. ++inline fft_array_type contiguous_itype(const fft_transform_type transformType) ++{ ++ switch(transformType) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ return fft_array_type_complex_interleaved; ++ case fft_transform_type_real_forward: ++ return fft_array_type_real; ++ case fft_transform_type_real_inverse: ++ return fft_array_type_hermitian_interleaved; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ return fft_array_type_complex_interleaved; ++} ++ ++// Given a transform type, return the contiguous output type. ++inline fft_array_type contiguous_otype(const fft_transform_type transformType) ++{ ++ switch(transformType) ++ { ++ case fft_transform_type_complex_forward: ++ case fft_transform_type_complex_inverse: ++ return fft_array_type_complex_interleaved; ++ case fft_transform_type_real_forward: ++ return fft_array_type_hermitian_interleaved; ++ case fft_transform_type_real_inverse: ++ return fft_array_type_real; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++ return fft_array_type_complex_interleaved; ++} ++ ++// Given a precision, return the acceptable tolerance. ++inline double type_epsilon(const fft_precision precision) ++{ ++ switch(precision) ++ { ++ case fft_precision_half: ++ return type_epsilon<_Float16>(); ++ break; ++ case fft_precision_single: ++ return type_epsilon(); ++ break; ++ case fft_precision_double: ++ return type_epsilon(); ++ break; ++ default: ++ throw std::runtime_error("Invalid precision"); ++ } ++} ++ ++#endif +diff --git a/shared/rocfft_complex.h b/shared/rocfft_complex.h +new file mode 100644 +index 0000000..efa0290 +--- /dev/null ++++ b/shared/rocfft_complex.h +@@ -0,0 +1,346 @@ ++// Copyright (C) 2021 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_COMPLEX_H ++#define ROCFFT_COMPLEX_H ++ ++#include ++#if !defined(__HIPCC_RTC__) ++#include ++#endif ++#include ++#include ++ ++#ifdef __HIP_PLATFORM_NVIDIA__ ++typedef __half _Float16; ++#endif ++ ++template ++struct rocfft_complex ++{ ++ ++ Treal x; // Real part ++ Treal y; // Imaginary part ++ ++ // Constructors ++ // Do not initialize the members x or y by default, to ensure that it can ++ // be used in __shared__ and that it is a trivial class compatible with C. ++ __device__ __host__ rocfft_complex() = default; ++ __device__ __host__ rocfft_complex(const rocfft_complex&) = default; ++ __device__ __host__ rocfft_complex(rocfft_complex&&) = default; ++ __device__ __host__ rocfft_complex& operator=(const rocfft_complex& rhs) & = default; ++ __device__ __host__ rocfft_complex& operator=(rocfft_complex&& rhs) & = default; ++ __device__ __host__ ~rocfft_complex() = default; ++ ++ // Constructor from real and imaginary parts ++ __device__ __host__ constexpr rocfft_complex(Treal real, Treal imag) ++ : x{real} ++ , y{imag} ++ { ++ } ++ ++ // Conversion from different precision ++ template ++ __device__ __host__ explicit constexpr rocfft_complex(const rocfft_complex& z) ++ : x(z.x) ++ , y(z.y) ++ { ++ } ++ ++ // Accessors ++ __device__ __host__ constexpr Treal real() const ++ { ++ return x; ++ } ++ ++ __device__ __host__ constexpr Treal imag() const ++ { ++ return y; ++ } ++ ++ // Unary operations ++ __forceinline__ __device__ __host__ rocfft_complex operator-() const ++ { ++ return {-x, -y}; ++ } ++ ++ __forceinline__ __device__ __host__ rocfft_complex operator+() const ++ { ++ return *this; ++ } ++ ++ __device__ __host__ Treal asum(const rocfft_complex& z) ++ { ++ return abs(z.x) + abs(z.y); ++ } ++ ++ // Internal real functions ++ static __forceinline__ __device__ __host__ Treal abs(Treal x) ++ { ++ return x < 0 ? -x : x; ++ } ++ ++ static __forceinline__ __device__ __host__ float sqrt(float x) ++ { ++ return ::sqrtf(x); ++ } ++ ++ static __forceinline__ __device__ __host__ double sqrt(double x) ++ { ++ return ::sqrt(x); ++ } ++ ++ // Addition operators ++ __device__ __host__ auto& operator+=(const rocfft_complex& rhs) ++ { ++ return *this = {x + rhs.x, y + rhs.y}; ++ } ++ ++ __device__ __host__ auto operator+(const rocfft_complex& rhs) const ++ { ++ auto lhs = *this; ++ return lhs += rhs; ++ } ++ ++ // Subtraction operators ++ __device__ __host__ auto& operator-=(const rocfft_complex& rhs) ++ { ++ return *this = {x - rhs.x, y - rhs.y}; ++ } ++ ++ __device__ __host__ auto operator-(const rocfft_complex& rhs) const ++ { ++ auto lhs = *this; ++ return lhs -= rhs; ++ } ++ ++ // Multiplication operators ++ __device__ __host__ auto& operator*=(const rocfft_complex& rhs) ++ { ++ return *this = {x * rhs.x - y * rhs.y, y * rhs.x + x * rhs.y}; ++ } ++ ++ __device__ __host__ auto operator*(const rocfft_complex& rhs) const ++ { ++ auto lhs = *this; ++ return lhs *= rhs; ++ } ++ ++ // Division operators ++ __device__ __host__ auto& operator/=(const rocfft_complex& rhs) ++ { ++ // Form of Robert L. Smith's Algorithm 116 ++ if(abs(rhs.x) > abs(rhs.y)) ++ { ++ Treal ratio = rhs.y / rhs.x; ++ Treal scale = 1 / (rhs.x + rhs.y * ratio); ++ *this = {(x + y * ratio) * scale, (y - x * ratio) * scale}; ++ } ++ else ++ { ++ Treal ratio = rhs.x / rhs.y; ++ Treal scale = 1 / (rhs.x * ratio + rhs.y); ++ *this = {(y + x * ratio) * scale, (y * ratio - x) * scale}; ++ } ++ return *this; ++ } ++ ++ __device__ __host__ auto operator/(const rocfft_complex& rhs) const ++ { ++ auto lhs = *this; ++ return lhs /= rhs; ++ } ++ ++ // Comparison operators ++ __device__ __host__ constexpr bool operator==(const rocfft_complex& rhs) const ++ { ++ return x == rhs.x && y == rhs.y; ++ } ++ ++ __device__ __host__ constexpr bool operator!=(const rocfft_complex& rhs) const ++ { ++ return !(*this == rhs); ++ } ++ ++ // Operators for complex-real computations ++ template ++ __device__ __host__ auto& operator+=(const U& rhs) ++ { ++ return (x += Treal(rhs)), *this; ++ } ++ ++ template ++ __device__ __host__ auto& operator-=(const U& rhs) ++ { ++ return (x -= Treal(rhs)), *this; ++ } ++ ++ __device__ __host__ auto operator+(const Treal& rhs) ++ { ++ auto lhs = *this; ++ return lhs += rhs; ++ } ++ ++ __device__ __host__ auto operator-(const Treal& rhs) ++ { ++ auto lhs = *this; ++ return lhs -= rhs; ++ } ++ ++ template ++ __device__ __host__ auto& operator*=(const U& rhs) ++ { ++ return (x *= Treal(rhs)), (y *= Treal(rhs)), *this; ++ } ++ ++ template ++ __device__ __host__ auto operator*(const U& rhs) const ++ { ++ auto lhs = *this; ++ return lhs *= Treal(rhs); ++ } ++ ++ template ++ __device__ __host__ auto& operator/=(const U& rhs) ++ { ++ return (x /= Treal(rhs)), (y /= Treal(rhs)), *this; ++ } ++ ++ template ++ __device__ __host__ auto operator/(const U& rhs) const ++ { ++ auto lhs = *this; ++ return lhs /= Treal(rhs); ++ } ++ ++ template ++ __device__ __host__ constexpr bool operator==(const U& rhs) const ++ { ++ return x == Treal(rhs) && y == 0; ++ } ++ ++ template ++ __device__ __host__ constexpr bool operator!=(const U& rhs) const ++ { ++ return !(*this == rhs); ++ } ++}; ++ ++// Stream operators ++#if !defined(__HIPCC_RTC__) ++static std::ostream& operator<<(std::ostream& stream, const _Float16& f) ++{ ++ return stream << static_cast(f); ++} ++ ++template ++std::ostream& operator<<(std::ostream& out, const rocfft_complex& z) ++{ ++ return out << '(' << static_cast(z.x) << ',' << static_cast(z.y) << ')'; ++} ++#endif ++ ++// Operators for real-complex computations ++template ++__device__ __host__ rocfft_complex operator+(const U& lhs, const rocfft_complex& rhs) ++{ ++ return {Treal(lhs) + rhs.x, rhs.y}; ++} ++ ++template ++__device__ __host__ rocfft_complex operator-(const U& lhs, const rocfft_complex& rhs) ++{ ++ return {Treal(lhs) - rhs.x, -rhs.y}; ++} ++ ++template ++__device__ __host__ rocfft_complex operator*(const U& lhs, const rocfft_complex& rhs) ++{ ++ return {Treal(lhs) * rhs.x, Treal(lhs) * rhs.y}; ++} ++ ++template ++__device__ __host__ rocfft_complex operator/(const U& lhs, const rocfft_complex& rhs) ++{ ++ // Form of Robert L. Smith's Algorithm 116 ++ if(rocfft_complex::abs(rhs.x) > rocfft_complex::abs(rhs.y)) ++ { ++ Treal ratio = rhs.y / rhs.x; ++ Treal scale = Treal(lhs) / (rhs.x + rhs.y * ratio); ++ return {scale, -scale * ratio}; ++ } ++ else ++ { ++ Treal ratio = rhs.x / rhs.y; ++ Treal scale = Treal(lhs) / (rhs.x * ratio + rhs.y); ++ return {ratio * scale, -scale}; ++ } ++} ++ ++template ++__device__ __host__ constexpr bool operator==(const U& lhs, const rocfft_complex& rhs) ++{ ++ return Treal(lhs) == rhs.x && 0 == rhs.y; ++} ++ ++template ++__device__ __host__ constexpr bool operator!=(const U& lhs, const rocfft_complex& rhs) ++{ ++ return !(lhs == rhs); ++} ++ ++// Extending std namespace to handle rocfft_complex datatype ++namespace std ++{ ++ template ++ __device__ __host__ constexpr Treal real(const rocfft_complex& z) ++ { ++ return z.x; ++ } ++ ++ template ++ __device__ __host__ constexpr Treal imag(const rocfft_complex& z) ++ { ++ return z.y; ++ } ++ ++ template ++ __device__ __host__ constexpr rocfft_complex conj(const rocfft_complex& z) ++ { ++ return {z.x, -z.y}; ++ } ++ ++ template ++ __device__ __host__ inline Treal norm(const rocfft_complex& z) ++ { ++ return (z.x * z.x) + (z.y * z.y); ++ } ++ ++ template ++ __device__ __host__ inline Treal abs(const rocfft_complex& z) ++ { ++ Treal tr = rocfft_complex::abs(z.x), ti = rocfft_complex::abs(z.y); ++ return tr > ti ? (ti /= tr, tr * rocfft_complex::sqrt(ti * ti + 1)) ++ : ti ? (tr /= ti, ti * rocfft_complex::sqrt(tr * tr + 1)) ++ : 0; ++ } ++} ++ ++#endif // ROCFFT_COMPLEX_H +diff --git a/shared/rocfft_hip.h b/shared/rocfft_hip.h +new file mode 100644 +index 0000000..e086cab +--- /dev/null ++++ b/shared/rocfft_hip.h +@@ -0,0 +1,52 @@ ++// Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef __ROCFFT_HIP_H__ ++#define __ROCFFT_HIP_H__ ++ ++#include ++#include ++ ++class rocfft_scoped_device ++{ ++public: ++ rocfft_scoped_device(int device) ++ { ++ if(hipGetDevice(&orig_device) != hipSuccess) ++ throw std::runtime_error("hipGetDevice failure"); ++ ++ if(hipSetDevice(device) != hipSuccess) ++ throw std::runtime_error("hipSetDevice failure"); ++ } ++ ~rocfft_scoped_device() ++ { ++ (void)hipSetDevice(orig_device); ++ } ++ ++ // not copyable or movable ++ rocfft_scoped_device(const rocfft_scoped_device&) = delete; ++ rocfft_scoped_device(rocfft_scoped_device&&) = delete; ++ rocfft_scoped_device& operator=(const rocfft_scoped_device&) = delete; ++ ++private: ++ int orig_device; ++}; ++ ++#endif // __ROCFFT_HIP_H__ +diff --git a/shared/rocfft_params.h b/shared/rocfft_params.h +new file mode 100644 +index 0000000..bf9b728 +--- /dev/null ++++ b/shared/rocfft_params.h +@@ -0,0 +1,585 @@ ++// Copyright (C) 2021 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#ifndef ROCFFT_PARAMS_H ++#define ROCFFT_PARAMS_H ++ ++#include "../shared/fft_params.h" ++#include "../shared/gpubuf.h" ++#include "rocfft/rocfft.h" ++ ++// Return the string of the rocfft_status code ++static std::string rocfft_status_to_string(const rocfft_status ret) ++{ ++ switch(ret) ++ { ++ case rocfft_status_success: ++ return "rocfft_status_success"; ++ case rocfft_status_failure: ++ return "rocfft_status_failure"; ++ case rocfft_status_invalid_arg_value: ++ return "rocfft_status_invalid_arg_value"; ++ case rocfft_status_invalid_dimensions: ++ return "rocfft_status_invalid_dimensions"; ++ case rocfft_status_invalid_array_type: ++ return "rocfft_status_invalid_array_type"; ++ case rocfft_status_invalid_strides: ++ return "rocfft_status_invalid_strides"; ++ case rocfft_status_invalid_distance: ++ return "rocfft_status_invalid_distance"; ++ case rocfft_status_invalid_offset: ++ return "rocfft_status_invalid_offset"; ++ case rocfft_status_invalid_work_buffer: ++ return "rocfft_status_invalid_work_buffer"; ++ default: ++ throw std::runtime_error("unknown rocfft_status"); ++ } ++} ++ ++inline fft_status fft_status_from_rocfftparams(const rocfft_status val) ++{ ++ switch(val) ++ { ++ case rocfft_status_success: ++ return fft_status_success; ++ case rocfft_status_failure: ++ return fft_status_failure; ++ case rocfft_status_invalid_arg_value: ++ return fft_status_invalid_arg_value; ++ case rocfft_status_invalid_dimensions: ++ return fft_status_invalid_dimensions; ++ case rocfft_status_invalid_array_type: ++ return fft_status_invalid_array_type; ++ case rocfft_status_invalid_strides: ++ return fft_status_invalid_strides; ++ case rocfft_status_invalid_distance: ++ return fft_status_invalid_distance; ++ case rocfft_status_invalid_offset: ++ return fft_status_invalid_offset; ++ case rocfft_status_invalid_work_buffer: ++ return fft_status_invalid_work_buffer; ++ default: ++ throw std::runtime_error("Invalid status"); ++ } ++} ++ ++inline rocfft_precision rocfft_precision_from_fftparams(const fft_precision val) ++{ ++ switch(val) ++ { ++ case fft_precision_single: ++ return rocfft_precision_single; ++ case fft_precision_double: ++ return rocfft_precision_double; ++ case fft_precision_half: ++ return rocfft_precision_half; ++ default: ++ throw std::runtime_error("Invalid precision"); ++ } ++} ++ ++inline rocfft_array_type rocfft_array_type_from_fftparams(const fft_array_type val) ++{ ++ switch(val) ++ { ++ case fft_array_type_complex_interleaved: ++ return rocfft_array_type_complex_interleaved; ++ case fft_array_type_complex_planar: ++ return rocfft_array_type_complex_planar; ++ case fft_array_type_real: ++ return rocfft_array_type_real; ++ case fft_array_type_hermitian_interleaved: ++ return rocfft_array_type_hermitian_interleaved; ++ case fft_array_type_hermitian_planar: ++ return rocfft_array_type_hermitian_planar; ++ case fft_array_type_unset: ++ return rocfft_array_type_unset; ++ } ++ return rocfft_array_type_unset; ++} ++ ++inline rocfft_transform_type rocfft_transform_type_from_fftparams(const fft_transform_type val) ++{ ++ switch(val) ++ { ++ case fft_transform_type_complex_forward: ++ return rocfft_transform_type_complex_forward; ++ case fft_transform_type_complex_inverse: ++ return rocfft_transform_type_complex_inverse; ++ case fft_transform_type_real_forward: ++ return rocfft_transform_type_real_forward; ++ case fft_transform_type_real_inverse: ++ return rocfft_transform_type_real_inverse; ++ default: ++ throw std::runtime_error("Invalid transform type"); ++ } ++} ++ ++inline rocfft_result_placement ++ rocfft_result_placement_from_fftparams(const fft_result_placement val) ++{ ++ switch(val) ++ { ++ case fft_placement_inplace: ++ return rocfft_placement_inplace; ++ case fft_placement_notinplace: ++ return rocfft_placement_notinplace; ++ default: ++ throw std::runtime_error("Invalid result placement"); ++ } ++} ++ ++class rocfft_params : public fft_params ++{ ++public: ++ rocfft_plan plan = nullptr; ++ rocfft_execution_info info = nullptr; ++ rocfft_plan_description desc = nullptr; ++ gpubuf_t wbuffer; ++ ++ explicit rocfft_params(){}; ++ ++ explicit rocfft_params(const fft_params& p) ++ : fft_params(p){}; ++ ++ rocfft_params(const rocfft_params&) = delete; ++ rocfft_params& operator=(const rocfft_params&) = delete; ++ ++ ~rocfft_params() ++ { ++ free(); ++ }; ++ ++ void free() ++ { ++ if(plan != nullptr) ++ { ++ rocfft_plan_destroy(plan); ++ plan = nullptr; ++ } ++ if(info != nullptr) ++ { ++ rocfft_execution_info_destroy(info); ++ info = nullptr; ++ } ++ if(desc != nullptr) ++ { ++ rocfft_plan_description_destroy(desc); ++ desc = nullptr; ++ } ++ wbuffer.free(); ++ } ++ ++ void validate_fields() const override ++ { ++ // row-major lengths including batch (i.e. batch is at the front) ++ std::vector length_with_batch{nbatch}; ++ std::copy(length.begin(), length.end(), std::back_inserter(length_with_batch)); ++ ++ auto validate_field = [&](const fft_field& f) { ++ for(const auto& b : f.bricks) ++ { ++ // bricks must have same dim as FFT, including batch ++ if(b.lower.size() != length.size() + 1 || b.upper.size() != length.size() + 1 ++ || b.stride.size() != length.size() + 1) ++ throw std::runtime_error( ++ "brick dimension does not match FFT + batch dimension"); ++ ++ // ensure lower < upper, and that both fit in the FFT + batch dims ++ if(!std::lexicographical_compare( ++ b.lower.begin(), b.lower.end(), b.upper.begin(), b.upper.end())) ++ throw std::runtime_error("brick lower index is not less than upper index"); ++ ++ if(!std::lexicographical_compare(b.lower.begin(), ++ b.lower.end(), ++ length_with_batch.begin(), ++ length_with_batch.end())) ++ throw std::runtime_error( ++ "brick lower index is not less than FFT + batch length"); ++ ++ if(!std::lexicographical_compare(b.upper.begin(), ++ b.upper.end(), ++ length_with_batch.begin(), ++ length_with_batch.end()) ++ && b.upper != length_with_batch) ++ throw std::runtime_error("brick upper index is not <= FFT + batch length"); ++ } ++ }; ++ ++ for(const auto& ifield : ifields) ++ validate_field(ifield); ++ for(const auto& ofield : ofields) ++ validate_field(ofield); ++ } ++ ++ rocfft_precision get_rocfft_precision() ++ { ++ return rocfft_precision_from_fftparams(precision); ++ } ++ ++ size_t vram_footprint() override ++ { ++ size_t val = fft_params::vram_footprint(); ++ if(setup_structs() != fft_status_success) ++ { ++ throw std::runtime_error("Struct setup failed"); ++ } ++ val += workbuffersize; ++ ++ return val; ++ } ++ ++ // Convert the generic fft_field structure to a rocfft_field ++ // structure that can be passed to rocFFT. In particular, we need ++ // to convert from row-major to column-major. ++ static rocfft_field fft_field_to_rocfft_field(const fft_field& f) ++ { ++ rocfft_field rfield = nullptr; ++ if(f.bricks.empty()) ++ return rfield; ++ ++ if(rocfft_field_create(&rfield) != rocfft_status_success) ++ throw std::runtime_error("rocfft_field_create failed"); ++ for(const auto& b : f.bricks) ++ { ++ // rocFFT wants column-major bricks and fft_params stores ++ // row-major ++ std::vector lower_cm; ++ std::copy(b.lower.rbegin(), b.lower.rend(), std::back_inserter(lower_cm)); ++ std::vector upper_cm; ++ std::copy(b.upper.rbegin(), b.upper.rend(), std::back_inserter(upper_cm)); ++ std::vector stride_cm; ++ std::copy(b.stride.rbegin(), b.stride.rend(), std::back_inserter(stride_cm)); ++ ++ rocfft_brick rbrick = nullptr; ++ if(rocfft_brick_create(&rbrick, ++ lower_cm.data(), // field_lower ++ upper_cm.data(), // field_upper ++ stride_cm.data(), // brick_stride ++ lower_cm.size(), // dim ++ b.device) // deviceID ++ != rocfft_status_success) ++ throw std::runtime_error("rocfft_brick_create failed"); ++ ++ if(rocfft_field_add_brick(rfield, rbrick) != rocfft_status_success) ++ throw std::runtime_error("rocfft_field_add_brick failed"); ++ ++ rocfft_brick_destroy(rbrick); ++ } ++ return rfield; ++ } ++ ++ fft_status setup_structs() ++ { ++ rocfft_status fft_status = rocfft_status_success; ++ if(desc == nullptr) ++ { ++ rocfft_plan_description_create(&desc); ++ if(fft_status != rocfft_status_success) ++ return fft_status_from_rocfftparams(fft_status); ++ ++ fft_status ++ = rocfft_plan_description_set_data_layout(desc, ++ rocfft_array_type_from_fftparams(itype), ++ rocfft_array_type_from_fftparams(otype), ++ ioffset.data(), ++ ooffset.data(), ++ istride_cm().size(), ++ istride_cm().data(), ++ idist, ++ ostride_cm().size(), ++ ostride_cm().data(), ++ odist); ++ if(fft_status != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_plan_description_set_data_layout failed"); ++ } ++ ++ if(scale_factor != 1.0) ++ { ++ fft_status = rocfft_plan_description_set_scale_factor(desc, scale_factor); ++ if(fft_status != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_plan_description_set_scale_factor failed"); ++ } ++ } ++ ++ for(const auto& ifield : ifields) ++ { ++ rocfft_field infield = fft_field_to_rocfft_field(ifield); ++ if(rocfft_plan_description_add_infield(desc, infield) != rocfft_status_success) ++ throw std::runtime_error("rocfft_description_add_infield failed"); ++ rocfft_field_destroy(infield); ++ } ++ ++ for(const auto& ofield : ofields) ++ { ++ rocfft_field outfield = fft_field_to_rocfft_field(ofield); ++ if(rocfft_plan_description_add_outfield(desc, outfield) != rocfft_status_success) ++ throw std::runtime_error("rocfft_description_add_outfield failed"); ++ rocfft_field_destroy(outfield); ++ } ++ } ++ ++ if(plan == nullptr) ++ { ++ fft_status = rocfft_plan_create(&plan, ++ rocfft_result_placement_from_fftparams(placement), ++ rocfft_transform_type_from_fftparams(transform_type), ++ get_rocfft_precision(), ++ length_cm().size(), ++ length_cm().data(), ++ nbatch, ++ desc); ++ if(fft_status != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_plan_create failed"); ++ } ++ } ++ ++ if(info == nullptr) ++ { ++ fft_status = rocfft_execution_info_create(&info); ++ if(fft_status != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_execution_info_create failed"); ++ } ++ } ++ ++ fft_status = rocfft_plan_get_work_buffer_size(plan, &workbuffersize); ++ if(fft_status != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_plan_get_work_buffer_size failed"); ++ } ++ ++ return fft_status_from_rocfftparams(fft_status); ++ } ++ ++ fft_status create_plan() override ++ { ++ fft_status ret = setup_structs(); ++ if(ret != fft_status_success) ++ { ++ return ret; ++ } ++ if(workbuffersize > 0) ++ { ++ hipError_t hip_status = hipSuccess; ++ hip_status = wbuffer.alloc(workbuffersize); ++ if(hip_status != hipSuccess) ++ { ++ std::ostringstream oss; ++ oss << "work buffer allocation failed (" << workbuffersize << " requested)"; ++ size_t mem_free = 0; ++ size_t mem_total = 0; ++ hip_status = hipMemGetInfo(&mem_free, &mem_total); ++ if(hip_status == hipSuccess) ++ { ++ oss << "free vram: " << mem_free << " total vram: " << mem_total; ++ } ++ else ++ { ++ oss << "hipMemGetInfo also failed"; ++ } ++ throw work_buffer_alloc_failure(oss.str()); ++ } ++ ++ auto rocret ++ = rocfft_execution_info_set_work_buffer(info, wbuffer.data(), workbuffersize); ++ if(rocret != rocfft_status_success) ++ { ++ throw std::runtime_error("rocfft_execution_info_set_work_buffer failed"); ++ } ++ } ++ ++ return ret; ++ } ++ ++ fft_status set_callbacks(void* load_cb_host, ++ void* load_cb_data, ++ void* store_cb_host, ++ void* store_cb_data) override ++ { ++ if(run_callbacks) ++ { ++ auto roc_status ++ = rocfft_execution_info_set_load_callback(info, &load_cb_host, &load_cb_data, 0); ++ if(roc_status != rocfft_status_success) ++ return fft_status_from_rocfftparams(roc_status); ++ ++ roc_status ++ = rocfft_execution_info_set_store_callback(info, &store_cb_host, &store_cb_data, 0); ++ if(roc_status != rocfft_status_success) ++ return fft_status_from_rocfftparams(roc_status); ++ } ++ return fft_status_success; ++ } ++ ++ fft_status execute(void** in, void** out) override ++ { ++ auto ret = rocfft_execute(plan, in, out, info); ++ return fft_status_from_rocfftparams(ret); ++ } ++ ++ // scatter data to multiple GPUs and adjust I/O buffers to match ++ void multi_gpu_prepare(std::vector& ibuffer, ++ std::vector& pibuffer, ++ std::vector& pobuffer) override ++ { ++ auto alloc_fields = [&](const fft_params::fft_field& field, ++ fft_array_type array_type, ++ std::vector& pbuffer, ++ bool copy_input) { ++ if(field.bricks.empty()) ++ return; ++ ++ // we have a field defined, clear the list of buffers as ++ // we'll be allocating new ones for each brick ++ pbuffer.clear(); ++ ++ for(const auto& b : field.bricks) ++ { ++ // get brick's length - note that this includes batch ++ // dimension ++ const auto brick_len = b.length(); ++ const auto brick_stride = b.stride; ++ ++ const size_t brick_size_elems = product(brick_len.begin(), brick_len.end()); ++ const size_t elem_size_bytes = var_size(precision, array_type); ++ const size_t brick_size_bytes = brick_size_elems * elem_size_bytes; ++ ++ // set device for the alloc, but we want to return to the ++ // default device as the source of a following memcpy ++ { ++ rocfft_scoped_device dev(b.device); ++ multi_gpu_data.emplace_back(); ++ if(multi_gpu_data.back().alloc(brick_size_bytes) != hipSuccess) ++ throw std::runtime_error("device allocation failure"); ++ pbuffer.push_back(multi_gpu_data.back().data()); ++ } ++ ++ if(copy_input) ++ { ++ // For now, assume we're only splitting on highest FFT ++ // dimension, lower-dimensional FFT data is all ++ // contiguous, and batches are contiguous in each brick. ++ // ++ // That means we can express this as a 2D memcpy. ++ const size_t unbatched_elems_per_brick ++ = product(brick_len.begin() + 1, brick_len.end()); ++ const size_t unbatched_elems_per_fft = product(length.begin(), length.end()); ++ ++ // get this brick's starting offset in the field ++ const size_t brick_offset ++ = b.lower_field_offset(istride, idist) * elem_size_bytes; ++ ++ // copy from original input - note that we're ++ // assuming interleaved data so ibuffer has only one ++ // gpubuf ++ if(hipMemcpy2D(pbuffer.back(), ++ unbatched_elems_per_brick * elem_size_bytes, ++ ibuffer.front().data_offset(brick_offset), ++ unbatched_elems_per_fft * elem_size_bytes, ++ unbatched_elems_per_brick * elem_size_bytes, ++ brick_len.front(), ++ hipMemcpyHostToDevice) ++ != hipSuccess) ++ throw std::runtime_error("hipMemcpy failure"); ++ } ++ } ++ ++ // if we copied the input to all the other devices, and ++ // this is an out-of-place transform, we no longer ++ // need the original input ++ if(copy_input && placement == fft_placement_notinplace) ++ ibuffer.clear(); ++ }; ++ ++ // assume one input, one output field for simple cases ++ if(!ifields.empty()) ++ alloc_fields(ifields.front(), itype, pibuffer, true); ++ if(!ofields.empty()) ++ { ++ if(!ifields.empty() && placement == fft_placement_inplace) ++ pobuffer = pibuffer; ++ else ++ alloc_fields(ofields.front(), otype, pobuffer, false); ++ } ++ } ++ ++ // when preparing for multi-GPU transform, we need to allocate data ++ // on each GPU. This vector remembers all of those allocations. ++ std::vector multi_gpu_data; ++ ++ // gather data after multi-GPU FFT for verification ++ void multi_gpu_finalize(std::vector& obuffer, std::vector& pobuffer) override ++ { ++ if(ofields.empty()) ++ return; ++ ++ for(size_t i = 0; i < ofields.front().bricks.size(); ++i) ++ { ++ const auto& b = ofields.front().bricks[i]; ++ const auto& brick_ptr = pobuffer[i]; ++ ++ const auto brick_len = b.length(); ++ ++ const size_t elem_size_bytes = var_size(precision, otype); ++ ++ // get this brick's starting offset in the field ++ const size_t brick_offset = b.lower_field_offset(ostride, odist) * elem_size_bytes; ++ ++ // switch device to where we're copying from ++ rocfft_scoped_device dev(b.device); ++ ++ // For now, assume we're only splitting on highest FFT ++ // dimension, lower-dimensional FFT data is all ++ // contiguous, and batches are contiguous in each brick. ++ // ++ // That means we can express this as a 2D memcpy. ++ const size_t unbatched_elems_per_brick ++ = product(brick_len.begin() + 1, brick_len.end()); ++ const auto output_length = olength(); ++ const size_t unbatched_elems_per_fft ++ = product(output_length.begin(), output_length.end()); ++ ++ // copy to original output buffer - note that ++ // we're assuming interleaved data so obuffer ++ // has only one gpubuf ++ if(hipMemcpy2D(obuffer.front().data_offset(brick_offset), ++ unbatched_elems_per_fft * elem_size_bytes, ++ brick_ptr, ++ unbatched_elems_per_brick * elem_size_bytes, ++ unbatched_elems_per_brick * elem_size_bytes, ++ brick_len.front(), ++ hipMemcpyDeviceToDevice) ++ != hipSuccess) ++ throw std::runtime_error("hipMemcpy failure"); ++ ++ // device-to-device transfers don't synchronize with the ++ // host, add explicit sync ++ (void)hipDeviceSynchronize(); ++ } ++ pobuffer.clear(); ++ pobuffer.push_back(obuffer.front().data()); ++ } ++}; ++ ++#endif +diff --git a/shared/test_params.h b/shared/test_params.h +new file mode 100644 +index 0000000..8d8f6f7 +--- /dev/null ++++ b/shared/test_params.h +@@ -0,0 +1,51 @@ ++// Copyright (C) 2016 - 2023 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++#ifndef TESTCONSTANTS_H ++#define TESTCONSTANTS_H ++ ++#include ++ ++extern int verbose; ++extern size_t ramgb; ++extern size_t vramgb; ++ ++extern size_t n_random_tests; ++ ++extern size_t random_seed; ++extern double planar_prob; ++extern double callback_prob; ++ ++extern double half_epsilon; ++extern double single_epsilon; ++extern double double_epsilon; ++extern bool skip_runtime_fails; ++ ++extern double max_linf_eps_double; ++extern double max_l2_eps_double; ++extern double max_linf_eps_single; ++extern double max_l2_eps_single; ++extern double max_linf_eps_half; ++extern double max_l2_eps_half; ++ ++extern int n_hip_failures; ++ ++#endif +diff --git a/shared/work_queue.h b/shared/work_queue.h +new file mode 100644 +index 0000000..e13fc41 +--- /dev/null ++++ b/shared/work_queue.h +@@ -0,0 +1,49 @@ ++// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved. ++// ++// Permission is hereby granted, free of charge, to any person obtaining a copy ++// of this software and associated documentation files (the "Software"), to deal ++// in the Software without restriction, including without limitation the rights ++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++// copies of the Software, and to permit persons to whom the Software is ++// furnished to do so, subject to the following conditions: ++// ++// The above copyright notice and this permission notice shall be included in ++// all copies or substantial portions of the Software. ++// ++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++// THE SOFTWARE. ++ ++#pragma once ++ ++#include ++#include ++#include ++template ++struct WorkQueue ++{ ++ void push(_WorkItem&& i) ++ { ++ std::unique_lock lock(queueMutex); ++ items.emplace(std::move(i)); ++ emptyWait.notify_all(); ++ } ++ _WorkItem pop() ++ { ++ std::unique_lock lock(queueMutex); ++ while(items.empty()) ++ emptyWait.wait(lock); ++ _WorkItem item(items.front()); ++ items.pop(); ++ return item; ++ } ++ ++private: ++ std::queue<_WorkItem> items; ++ std::mutex queueMutex; ++ std::condition_variable emptyWait; ++}; diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 046d908e3e3c84..f5749749acad72 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,14 +14,19 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): It sits between the application and the backend FFT library, marshalling inputs into the backend and results back to the application.""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT" - git = "https://github.com/ROCmSoftwarePlatform/hipFFT.git" - url = "https://github.com/ROCmSoftwarePlatform/hipfft/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipFFT" + git = "https://github.com/ROCm/hipFFT.git" + url = "https://github.com/ROCm/hipfft/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("renjithravindrankannath", "srekolam") + license("MIT") + version("master", branch="master") + version("6.0.0", sha256="44f328b7862c066459089dfe62833cb7d626c6ceb71c57d8c7d6bba45dad491e") + version("5.7.1", sha256="33452576649df479f084076c47d0b30f6f1da34864094bce767dd9bf609f04aa") + version("5.7.0", sha256="daa5dc44580145e85ff8ffa7eb40a3d1ef41f3217549c01281715ff696a31588") version("5.6.1", sha256="d2ae36b8eacd39b865e8a7972b8eb86bcea2de4ac90711bba7e29b39b01eaa74") version("5.6.0", sha256="c7f425b693caf9371b42226d86392335d993a117d23219b6ba1fd13523cb8261") version("5.5.1", sha256="3addd15a459752ad657e84c2a7b6b6289600d1d0a5f90d6e0946ba11e8148fc0") @@ -119,6 +124,9 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("rocfft@" + ver, when="+rocm @" + ver) @@ -127,6 +135,8 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): depends_on( "rocfft amdgpu_target={0}".format(tgt), when="+rocm amdgpu_target={0}".format(tgt) ) + # https://github.com/ROCm/rocFFT/pull/85) + patch("001-remove-submodule-and-sync-shared-files-from-rocFFT.patch", when="@6.0.0") def cmake_args(self): args = [self.define("BUILD_CLIENTS_SAMPLES", "OFF")] diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index da688d9c1fb868..8e8ea5a0a67cd0 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,12 +9,17 @@ class Hipfort(CMakePackage): """Radeon Open Compute Parallel Primitives Library""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipfort" - git = "https://github.com/ROCmSoftwarePlatform/hipfort.git" - url = "https://github.com/ROCmSoftwarePlatform/hipfort/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipfort" + git = "https://github.com/ROCm/hipfort.git" + url = "https://github.com/ROCm/hipfort/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("MIT") + maintainers("cgmb", "srekolam", "renjithravindrankannath") + version("6.0.0", sha256="151cf11648885db799aade0d00a7882589e7195643b02beaa251f1b2a43aceed") + version("5.7.1", sha256="859fac509e195f3ab97c555b5f63afea325a61aae0f281cb19a970a1b533dead") + version("5.7.0", sha256="57b04d59f61683a1b141d6d831d10c9fdecea483991ec02d14c14e441e935c05") version("5.6.1", sha256="a55345cc9ccaf0cd69d306b8eb9ec2a02c220a57e9c396443cc7273aa3377adc") version("5.6.0", sha256="03176a099bc81e212ad1bf9d86f35561f8f2d21a2f126732d7620e1ea59888d5") version("5.5.1", sha256="abc59f7b81cbefbe3555cbf1bf0d80e8aa65901c70799748c40870fe6f3fea60") @@ -121,6 +126,9 @@ class Hipfort(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index dd6b99ee716059..b1c5f2a7fb2897 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,14 +10,19 @@ class HipifyClang(CMakePackage): """hipify-clang is a clang-based tool for translation CUDA sources into HIP sources""" - homepage = "https://github.com/ROCm-Developer-Tools/HIPIFY" - git = "https://github.com/ROCm-Developer-Tools/HIPIFY.git" - url = "https://github.com/ROCm-Developer-Tools/HIPIFY/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/HIPIFY" + git = "https://github.com/ROCm/HIPIFY.git" + url = "https://github.com/ROCm/HIPIFY/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") + license("MIT") + version("master", branch="master") + version("6.0.0", sha256="91bed2b72a6684a04e078e50b12b36b93f64ff96523283f4e5d9a33c11e6b967") + version("5.7.1", sha256="43121e62233dab010ab686d6805bc2d3163f0dc5e89cc503d50c4bcd59eeb394") + version("5.7.0", sha256="10e4386727e102fba166f012147120a6ec776e8d95fbcac3af93e243205d80a6") version("5.6.1", sha256="ec3a4f276556f9fd924ea3c89be11b6c6ddf999cdd4387f669e38e41ee0042e8") version("5.6.0", sha256="a2572037a7d3bd0813bd6819a5e6c0e911678db5fd3ab15a65370601df91891b") version("5.5.1", sha256="35b9c07a7afaf9cf6f3bbe9dd147fa81b1b297af3e5e26e60c55629e83feaa48") @@ -137,11 +142,14 @@ class HipifyClang(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("llvm-amdgpu@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hiprand/package.py b/var/spack/repos/builtin/packages/hiprand/package.py index 5f85c46cb91698..acc36297627839 100644 --- a/var/spack/repos/builtin/packages/hiprand/package.py +++ b/var/spack/repos/builtin/packages/hiprand/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,16 +12,21 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage): """The hipRAND project provides an interface for generating pseudo-random and quasi-random numbers with either cuRAND or rocRAND backends.""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipRAND" - git = "https://github.com/ROCmSoftwarePlatform/hipRAND.git" - url = "https://github.com/ROCmSoftwarePlatform/hipRAND/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipRAND" + git = "https://github.com/ROCm/hipRAND.git" + url = "https://github.com/ROCm/hipRAND/archive/rocm-5.7.1.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") libraries = ["libhiprand"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") + version("6.0.0", sha256="7e06c98f9da7c0b20b55b2106cf3a48b9ef6577a79549a455667ae97bd15b61d") + version("5.7.1", sha256="81a9f5f0960dce125ce1ab1c7eb58bb07c8756346f9e46a1cc65aa61d5a114f8") + version("5.7.0", sha256="4dee76719839503b02ce7d38e1c61bbdb2da18da7f63a7ef7012c84c71aa0a9d") version("5.6.1", sha256="a73d5578bc7f8dff0b8960e4bff97bc4fc28f508a19ed6acd1cfd4d3e76b47ee") version("5.6.0", sha256="8c214e2f90337a5317a69950026bf337b1e567d43bb9ae64f2a802af2228c313") version("5.5.1", sha256="5df9d78eae0991be5ec9f60e8d3530fabc23793d9f9cf274b075d689675db04e") @@ -82,6 +87,9 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", "develop", ]: diff --git a/var/spack/repos/builtin/packages/hipsolver/package.py b/var/spack/repos/builtin/packages/hipsolver/package.py index 1ef38160a65979..81c956334cb2e7 100644 --- a/var/spack/repos/builtin/packages/hipsolver/package.py +++ b/var/spack/repos/builtin/packages/hipsolver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,16 +16,21 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage): regardless of the chosen backend. Currently, hipSOLVER supports rocSOLVER and cuSOLVER as backends.""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER" - git = "https://github.com/ROCmSoftwarePlatform/hipSOLVER.git" - url = "https://github.com/ROCmSoftwarePlatform/hipSOLVER/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipSOLVER" + git = "https://github.com/ROCm/hipSOLVER.git" + url = "https://github.com/ROCm/hipSOLVER/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") libraries = ["libhipsolver"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") + version("6.0.0", sha256="385849db02189d5e62096457e52ae899ae5c1ae7d409dc1da61f904d8861b48c") + version("5.7.1", sha256="5592e965c0dc5722931302289643d1ece370220af2c7afc58af97b3395295658") + version("5.7.0", sha256="0e35795bfbcb57ed8e8437471209fb7d230babcc31d9a4a0b3640c3ee639f4a7") version("5.6.1", sha256="2e546bc7771f7bf0aa7892b69cded725941573e8b70614759c3d03c21eb78dde") version("5.6.0", sha256="11fa51d210853d93d24d55b20367738e49711793412f58e8d7689710b92ae16c") version("5.5.1", sha256="826bd64a4887176595bb7319d9a3612e7327602efe1f42aa3f2ad0e783d1a180") @@ -109,6 +114,9 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", "develop", ]: diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 696094cb5af0de..0473a3ea3d9484 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,19 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage): """hipSPARSE is a SPARSE marshalling library, with multiple supported backends""" - homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE" - git = "https://github.com/ROCmSoftwarePlatform/hipSPARSE.git" - url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/hipSPARSE" + git = "https://github.com/ROCm/hipSPARSE.git" + url = "https://github.com/ROCm/hipSPARSE/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie") libraries = ["libhipsparse"] + + license("MIT") + + version("6.0.0", sha256="718a5f03b6a579c0542a60d00f5688bec53a181b429b7ee8ce3c8b6c4a78d754") + version("5.7.1", sha256="16c3818260611226c3576d8d55ad8f51e0890d2473503edf2c9313250ae65ca7") + version("5.7.0", sha256="729b749b5340034639873a99e6091963374f6f0456c8f36d076c96f03fe43888") version("5.6.1", sha256="d636d0c5d1e38cc0c09b1e95380199ec82bd465b94bd6661f0c8d9374d9b565d") version("5.6.0", sha256="3a6931b744ebaa4469a4c50d059a008403e4dc2a4f04dd69c3c6d20916b4a491") version("5.5.1", sha256="3d291e4fe2c611d555e54de66149b204fe7ac59f5dd00a9ad93bc6dca0528880") @@ -153,6 +159,9 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("rocsparse@" + ver, when="+rocm @" + ver) diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index b6b30c2e5cfa7a..1e2a05921177b4 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Hipsycl(CMakePackage): provides("sycl") + license("BSD-2-Clause") + version("stable", branch="stable", submodules=True) version("0.9.4", commit="99d9e24d462b35e815e0e59c1b611936c70464ae", submodules=True) version("0.9.3", commit="51507bad524c33afe8b124804091b10fa25618dc", submodules=True) diff --git a/var/spack/repos/builtin/packages/hiptt/package.py b/var/spack/repos/builtin/packages/hiptt/package.py index d2c9e118a72849..2e3c4704c27384 100644 --- a/var/spack/repos/builtin/packages/hiptt/package.py +++ b/var/spack/repos/builtin/packages/hiptt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hiptt(MakefilePackage, ROCmPackage): maintainers("bvanessen") + license("Unlicense") + version("master", branch="master") patch("bugfix_make.patch") diff --git a/var/spack/repos/builtin/packages/hiredis/package.py b/var/spack/repos/builtin/packages/hiredis/package.py index 69191203bdd81e..c54f214367f8d0 100644 --- a/var/spack/repos/builtin/packages/hiredis/package.py +++ b/var/spack/repos/builtin/packages/hiredis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hiredis(MakefilePackage, CMakePackage): maintainers("lpottier", "rblake-llnl") + license("BSD-3-Clause") + version("1.1.0", sha256="fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6") version("1.0.2", sha256="e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819") version("1.0.1", sha256="a420df40775ac7b4b46550dd4df78ffe6620616333496a17c9c9fc556815ba4b") diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index 53e7deb9ca0312..f4f2886fc7ea33 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Hisat2(MakefilePackage): homepage = "https://daehwankimlab.github.io/hisat2/" url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-2.1.0-source.zip" + license("GPL-3.0-or-later") + version( "2.2.1", sha256="48e933330d4d8470d2b3dfe7ec3918f2e98a75f7381891e23b7df1fb4f135eb1", diff --git a/var/spack/repos/builtin/packages/hisea/package.py b/var/spack/repos/builtin/packages/hisea/package.py index 928677a988500a..ff08e1d90cc03d 100644 --- a/var/spack/repos/builtin/packages/hisea/package.py +++ b/var/spack/repos/builtin/packages/hisea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Hisea(MakefilePackage): homepage = "https://doi.org/10.1186/s12859-017-1953-9" + license("GPL-3.0-only") + version( "2017.12.26", sha256="3c6ddfb8490a327cc5f9e45f64cd4312abc6ef5719661ce8892db8a20a1e9c5e", diff --git a/var/spack/repos/builtin/packages/hive/package.py b/var/spack/repos/builtin/packages/hive/package.py index cf3d2da8e37a8d..da071c8bb7c89c 100644 --- a/var/spack/repos/builtin/packages/hive/package.py +++ b/var/spack/repos/builtin/packages/hive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Hive(Package): homepage = "https://hive.apache.org/" url = "https://www.apache.org/dist/hive/hive-3.1.2/apache-hive-3.1.2-bin.tar.gz" + license("Apache-2.0") + version("3.1.2", sha256="d75dcf36908b4e7b9b0ec9aec57a46a6628b97b276c233cb2c2f1a3e89b13462") version("2.3.6", sha256="0b3736edc8d15f01ed649bfce7d74346c35fd57567411e9d0c3f48578f76610d") version("1.2.2", sha256="763b246a1a1ceeb815493d1e5e1d71836b0c5b9be1c4cd9c8d685565113771d1") diff --git a/var/spack/repos/builtin/packages/hivex/package.py b/var/spack/repos/builtin/packages/hivex/package.py index 7560aa142761a1..9a231f270eae46 100644 --- a/var/spack/repos/builtin/packages/hivex/package.py +++ b/var/spack/repos/builtin/packages/hivex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Hivex(AutotoolsPackage): homepage = "https://libguestfs.org" url = "https://libguestfs.org/download/hivex/hivex-1.3.17.tar.gz" + license("LGPL-2.1") + version("1.3.23", sha256="40cf5484f15c94672259fb3b99a90bef6f390e63f37a52a1c06808a2016a6bbd") version("1.3.19", sha256="5102cc5149767229dbfb436ae7b47dd85b90e0215445e42c2809cbe32e54f762") version("1.3.18", sha256="8a1e788fd9ea9b6e8a99705ebd0ff8a65b1bdee28e319c89c4a965430d0a7445") diff --git a/var/spack/repos/builtin/packages/hmmer/package.py b/var/spack/repos/builtin/packages/hmmer/package.py index 6753c331a8dc25..0df0c49501a8fa 100644 --- a/var/spack/repos/builtin/packages/hmmer/package.py +++ b/var/spack/repos/builtin/packages/hmmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hohqmesh/package.py b/var/spack/repos/builtin/packages/hohqmesh/package.py index a6918f6bd86022..d5bd80bf16b8e5 100644 --- a/var/spack/repos/builtin/packages/hohqmesh/package.py +++ b/var/spack/repos/builtin/packages/hohqmesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hohqmesh(CMakePackage): maintainers("fluidnumerics-joe") + license("MIT") + version("1.3.0", sha256="31ea80de15ece886df0dd1b941714d86ec06a9ed02c1415308b4ba23d8314eff") version("1.2.1", sha256="b1b13a680c3ef6b8d6a8d05406f68c1ff641c26f69c468ccf2d7bed8d556dd7e") version("1.1.0", sha256="5fdb75157d9dc29bba55e6ae9dc2be71294754204f4f0912795532ae66aada10") diff --git a/var/spack/repos/builtin/packages/homer/package.py b/var/spack/repos/builtin/packages/homer/package.py index 003638b7540140..7ee7b7fbdc7b34 100644 --- a/var/spack/repos/builtin/packages/homer/package.py +++ b/var/spack/repos/builtin/packages/homer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Homer(Package): homepage = "http://homer.ucsd.edu/homer" url = "http://homer.ucsd.edu/homer/data/software/homer.v4.9.1.zip" + license("GPL-3.0-only") + version("4.11.1", sha256="80d1cd00616729894017b24a36a2ef81f9cde8bd364e875aead1e0cfb500c82b") version("4.9.1", sha256="ad1303b0b0400dc8a88dbeae1ee03a94631977b751a3d335326c4febf0eec3a9") diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py index 9d58a05ac67195..54afb419c15888 100644 --- a/var/spack/repos/builtin/packages/hoomd-blue/package.py +++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -65,10 +65,7 @@ class HoomdBlue(CMakePackage): def cmake_args(self): spec = self.spec - cmake_args = [ - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path), - "-DCMAKE_INSTALL_PREFIX={0}".format(python_platlib), - ] + cmake_args = ["-DCMAKE_INSTALL_PREFIX={0}".format(python_platlib)] # MPI support if "+mpi" in spec: diff --git a/var/spack/repos/builtin/packages/hoppet/package.py b/var/spack/repos/builtin/packages/hoppet/package.py index 80aa3ff2440018..e2cade0a732c69 100644 --- a/var/spack/repos/builtin/packages/hoppet/package.py +++ b/var/spack/repos/builtin/packages/hoppet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hotspot/package.py b/var/spack/repos/builtin/packages/hotspot/package.py index 0ff22cff85d0f8..2d9d0a0cf6465b 100644 --- a/var/spack/repos/builtin/packages/hotspot/package.py +++ b/var/spack/repos/builtin/packages/hotspot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpcc/package.py b/var/spack/repos/builtin/packages/hpcc/package.py index 05d08014482541..08c620c00d97a0 100644 --- a/var/spack/repos/builtin/packages/hpcc/package.py +++ b/var/spack/repos/builtin/packages/hpcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -51,7 +51,7 @@ class Hpcc(MakefilePackage): depends_on("gmake", type="build") depends_on("mpi@1.1:") depends_on("blas") - depends_on("fftw-api@2+mpi", when="fft=fftw2") + depends_on("fftw@2+mpi", when="fft=fftw2") depends_on("mkl", when="fft=mkl") arch = "{0}-{1}".format(platform.system(), platform.processor()) diff --git a/var/spack/repos/builtin/packages/hpccg/package.py b/var/spack/repos/builtin/packages/hpccg/package.py index 27779a7ef05371..eca4f30b26ae6b 100644 --- a/var/spack/repos/builtin/packages/hpccg/package.py +++ b/var/spack/repos/builtin/packages/hpccg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpcg/package.py b/var/spack/repos/builtin/packages/hpcg/package.py index 1f26ed13d49706..2f261b5836091e 100644 --- a/var/spack/repos/builtin/packages/hpcg/package.py +++ b/var/spack/repos/builtin/packages/hpcg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 8d58956508a1d9..fa9dbe45e86921 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -1,16 +1,18 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 configparser import os +import tempfile import llnl.util.tty as tty from spack.package import * -class Hpctoolkit(AutotoolsPackage): +class Hpctoolkit(AutotoolsPackage, MesonPackage): """HPCToolkit is an integrated suite of tools for measurement and analysis of program performance on computers ranging from multicore desktop systems to the nation's largest supercomputers. By using statistical sampling of @@ -26,6 +28,8 @@ class Hpctoolkit(AutotoolsPackage): test_requires_compiler = True + license("BSD-3-Clause") + version("develop", branch="develop") version("2023.08.stable", branch="release/2023.08") version("2023.08.1", tag="2023.08.1", commit="753a72affd584a5e72fe153d1e8c47a394a3886e") @@ -55,13 +59,14 @@ class Hpctoolkit(AutotoolsPackage): "cray", default=False, description="Build hpcprof-mpi for Cray systems (may require --dirty).", + when="build_system=autotools", ) variant( "cray-static", default=False, description="Build old rev of hpcprof-mpi statically on Cray systems.", - when="@:2022.09+cray", + when="@:2022.09+cray build_system=autotools", ) variant( @@ -102,13 +107,33 @@ class Hpctoolkit(AutotoolsPackage): variant("rocm", default=False, description="Support ROCM on AMD GPUs.", when="@2022.04:") # Other variants. - variant("debug", default=False, description="Build in debug (develop) mode.") + variant( + "debug", + default=False, + description="Build in debug (develop) mode.", + when="build_system=autotools", + ) variant("viewer", default=True, description="Include hpcviewer.") variant( "python", default=False, description="Support unwinding Python source.", when="@2023.03:" ) + build_system(conditional("meson", when="@develop"), "autotools", default="autotools") + + with when("@develop build_system=autotools"): + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + + with when("build_system=meson"): + depends_on("meson@1.1.0:", type="build") + depends_on("gmake", type="build") + depends_on("m4", type="build") + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + boost_libs = ( "+atomic +chrono +date_time +filesystem +system +thread +timer" " +graph +regex +shared +multithreaded visibility=global" @@ -136,7 +161,9 @@ class Hpctoolkit(AutotoolsPackage): depends_on("xerces-c transcoder=iconv") depends_on("xz+pic libs=static", type="link") depends_on("yaml-cpp@0.7.0: +shared", when="@2022.10:") - depends_on("zlib-api+shared") + + depends_on("zlib-api") + depends_on("zlib+shared", when="^[virtuals=zlib-api] zlib") depends_on("cuda", when="+cuda") depends_on("oneapi-level-zero", when="+level_zero") @@ -167,6 +194,7 @@ class Hpctoolkit(AutotoolsPackage): conflicts("^binutils@2.35:2.35.1", msg="avoid binutils 2.35 and 2.35.1 (spews errors)") conflicts("^xz@5.2.7:5.2.8", msg="avoid xz 5.2.7:5.2.8 (broken symbol versions)") + conflicts("^intel-xed@2023.08:", when="@:2023.09") conflicts("+cray", when="@2022.10.01", msg="hpcprof-mpi is not available in 2022.10.01") conflicts("+mpi", when="@2022.10.01", msg="hpcprof-mpi is not available in 2022.10.01") @@ -191,8 +219,41 @@ def patch(self): if os.access("hpcrun-fmt.txt", os.F_OK): os.rename("hpcrun-fmt.txt", "hpcrun-fmt.readme") - flag_handler = AutotoolsPackage.build_system_flags + # We only want hpctoolkit and hpcviewer paths and man paths in the + # module file. The run dependencies are all curried into hpctoolkit + # and we don't want to risk exposing a package if the application + # uses a different version of the same package. + def setup_run_environment(self, env): + spec = self.spec + env.clear() + env.prepend_path("PATH", spec.prefix.bin) + env.prepend_path("MANPATH", spec.prefix.share.man) + env.prepend_path("CPATH", spec.prefix.include) + env.prepend_path("LD_LIBRARY_PATH", spec.prefix.lib.hpctoolkit) + if "+viewer" in spec: + env.prepend_path("PATH", spec["hpcviewer"].prefix.bin) + env.prepend_path("MANPATH", spec["hpcviewer"].prefix.share.man) + + def test_sort(self): + """build and run selection sort unit test""" + exe = "tst-sort" + cxx = which(os.environ["CXX"]) + cxx(self.test_suite.current_test_data_dir.join("sort.cpp"), "-o", exe) + + hpcrun = which("hpcrun") + meas = "tst-sort.m" + hpcrun("-e", "REALTIME@5000", "-t", "-o", meas, "./" + exe) + hpcstruct = which("hpcstruct") + struct = "tst-sort.hpcstruct" + hpcstruct("-j", "4", "--time", "-o", struct, "./" + exe) + + hpcprof = which("hpcprof") + db = "tst-sort.d" + hpcprof("-S", struct, "-o", db, meas) + + +class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder): def configure_args(self): spec = self.spec @@ -283,29 +344,14 @@ def configure_args(self): return args - # We only want hpctoolkit and hpcviewer paths and man paths in the - # module file. The run dependencies are all curried into hpctoolkit - # and we don't want to risk exposing a package if the application - # uses a different version of the same package. - def setup_run_environment(self, env): - spec = self.spec - env.clear() - env.prepend_path("PATH", spec.prefix.bin) - env.prepend_path("MANPATH", spec.prefix.share.man) - env.prepend_path("CPATH", spec.prefix.include) - env.prepend_path("LD_LIBRARY_PATH", spec.prefix.lib.hpctoolkit) - if "+viewer" in spec: - env.prepend_path("PATH", spec["hpcviewer"].prefix.bin) - env.prepend_path("MANPATH", spec["hpcviewer"].prefix.share.man) + flag_handler = AutotoolsPackage.build_system_flags # Build tests (spack install --run-tests). Disable the default # spack tests and run autotools 'make check', but only from the # tests directory. build_time_test_callbacks = [] # type: List[str] - install_time_test_callbacks = [] # type: List[str] + install_time_test_callbacks = ["check_install"] # type: List[str] - @run_after("install") - @on_package_attributes(run_tests=True) def check_install(self): if not self.spec.satisfies("@2022:"): tty.warn("requires 2022.01.15 or later") @@ -314,25 +360,80 @@ def check_install(self): with working_dir("tests"): make("check") - # Post-Install tests (spack test run). These are the same tests - # but with a different Makefile that works outside the build - # directory. - @run_after("install") - def copy_test_files(self): - if self.spec.satisfies("@2022:"): - self.cache_extra_test_sources(["tests"]) - def test_run_sort(self): - """build and run selection sort unit test""" - if not self.spec.satisfies("@2022:"): - raise SkipTest("No tests exist for versions prior to 2022.01.15") +class MesonBuilder(spack.build_systems.meson.MesonBuilder): + def meson_args(self): + spec = self.spec + + args = [ + "-Dhpcprof_mpi=" + ("enabled" if "+mpi" in spec else "disabled"), + "-Dpython=" + ("enabled" if "+python" in spec else "disabled"), + "-Dpapi=" + ("enabled" if "+papi" in spec else "disabled"), + "-Dopencl=" + ("enabled" if "+opencl" in spec else "disabled"), + "-Dcuda=" + ("enabled" if "+cuda" in spec else "disabled"), + "-Drocm=" + ("enabled" if "+rocm" in spec else "disabled"), + "-Dlevel0=" + ("enabled" if "+level_zero" in spec else "disabled"), + "-Dgtpin=" + ("enabled" if "+gtpin" in spec else "disabled"), + ] + + # We use a native file to provide paths to all the dependencies. + cfg = configparser.ConfigParser() + cfg["properties"] = {} + cfg["binaries"] = {} + + cfg["properties"]["prefix_boost"] = f"'''{spec['boost'].prefix}'''" + cfg["properties"]["prefix_bzip"] = f"'''{spec['bzip2'].prefix}'''" + cfg["properties"]["prefix_dyninst"] = f"'''{spec['dyninst'].prefix}'''" + cfg["properties"]["prefix_elfutils"] = f"'''{spec['elfutils'].prefix}'''" + cfg["properties"]["prefix_tbb"] = f"'''{spec['intel-tbb'].prefix}'''" + cfg["properties"]["prefix_libmonitor"] = f"'''{spec['libmonitor'].prefix}'''" + cfg["properties"]["prefix_libunwind"] = f"'''{spec['libunwind'].prefix}'''" + cfg["properties"]["prefix_xerces"] = f"'''{spec['xerces-c'].prefix}'''" + cfg["properties"]["prefix_lzma"] = f"'''{spec['xz'].prefix}'''" + cfg["properties"]["prefix_zlib"] = f"'''{spec['zlib-api'].prefix}'''" + cfg["properties"]["prefix_libiberty"] = f"'''{spec['libiberty'].prefix}'''" + + if spec.target.family == "x86_64": + cfg["properties"]["prefix_xed"] = f"'''{spec['intel-xed'].prefix}'''" + + cfg["properties"]["prefix_memkind"] = f"'''{spec['memkind'].prefix}'''" + + if spec.satisfies("+papi"): + cfg["properties"]["prefix_papi"] = f"'''{spec['papi'].prefix}'''" + else: + cfg["properties"]["prefix_perfmon"] = f"'''{spec['libpfm4'].prefix}'''" + + cfg["properties"]["prefix_yaml_cpp"] = f"'''{spec['yaml-cpp'].prefix}'''" + + if "+cuda" in spec: + cfg["properties"]["prefix_cuda"] = f"'''{spec['cuda'].prefix}'''" + + if "+level_zero" in spec: + cfg["properties"]["prefix_level0"] = f"'''{spec['oneapi-level-zero'].prefix}'''" + + if "+gtpin" in spec: + cfg["properties"]["prefix_gtpin"] = f"'''{spec['intel-gtpin'].prefix}'''" + cfg["properties"]["prefix_igc"] = f"'''{spec['oneapi-igc'].prefix}'''" + + if "+opencl" in spec: + cfg["properties"]["prefix_opencl"] = f"'''{spec['opencl-c-headers'].prefix}'''" + + if "+rocm" in spec: + cfg["properties"]["prefix_rocm_hip"] = f"'''{spec['hip'].prefix}'''" + cfg["properties"]["prefix_rocm_hsa"] = f"'''{spec['hsa-rocr-dev'].prefix}'''" + cfg["properties"]["prefix_rocm_tracer"] = f"'''{spec['roctracer-dev'].prefix}'''" + cfg["properties"]["prefix_rocm_profiler"] = f"'''{spec['rocprofiler-dev'].prefix}'''" + + if "+python" in spec: + cfg["binaries"]["python"] = f"'''{spec['python'].command}'''" - test_dir = self.test_suite.current_test_cache_dir.tests - with working_dir(test_dir): - make = which("make") - make("-f", "Makefile.spack", "all") + if "+mpi" in spec: + cfg["binaries"]["mpicxx"] = f"'''{spec['mpi'].mpicxx}'''" - run_sort = which(join_path(".", "run-sort")) - assert run_sort, "run-sort is missing" + native_fd, native_path = tempfile.mkstemp( + prefix="spack-native.", suffix=".ini", dir=self.stage.path + ) + with os.fdopen(native_fd, "w") as native_f: + cfg.write(native_f) - run_sort() + return ["--native-file", native_path] + args diff --git a/var/spack/repos/builtin/packages/hpctoolkit/test/sort.cpp b/var/spack/repos/builtin/packages/hpctoolkit/test/sort.cpp new file mode 100644 index 00000000000000..afbe5cc4cedd23 --- /dev/null +++ b/var/spack/repos/builtin/packages/hpctoolkit/test/sort.cpp @@ -0,0 +1,54 @@ +// +// Copyright (c) 2002-2023, Rice University. +// See the file LICENSE for details. +// +// Simple selection sort, shows a couple of loops, some C++ +// templates. +// + +#include +#include +#include + +using namespace std; + +typedef list llist; + +int main(int argc, char **argv) +{ + llist olist, nlist; + long n, N, sum; + + N = 80000; + + if (argc > 1) { + N = atol(argv[1]); + } + + sum = 0; + for (n = 1; n <= N; n += 2) { + olist.push_front(n); + olist.push_back(n + 1); + sum += 2 * n + 1; + } + + cout << "orig list: " << N << " " << sum << endl; + + sum = 0; + while (olist.size() > 0) { + auto min = olist.begin(); + + for (auto it = olist.begin(); it != olist.end(); ++it) { + if (*it < *min) { + min = it; + } + } + sum += *min; + nlist.push_back(*min); + olist.erase(min); + } + + cout << "new list: " << N << " " << sum << endl; + + return 0; +} diff --git a/var/spack/repos/builtin/packages/hpcviewer/package.py b/var/spack/repos/builtin/packages/hpcviewer/package.py index 414cf47019a013..e874c093a17b3a 100644 --- a/var/spack/repos/builtin/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin/packages/hpcviewer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpcx-mpi/package.py b/var/spack/repos/builtin/packages/hpcx-mpi/package.py index 41124d608266cd..95b575d1675be3 100644 --- a/var/spack/repos/builtin/packages/hpcx-mpi/package.py +++ b/var/spack/repos/builtin/packages/hpcx-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpddm/package.py b/var/spack/repos/builtin/packages/hpddm/package.py index 85a81f26e75ccc..df75297679ea6b 100644 --- a/var/spack/repos/builtin/packages/hpddm/package.py +++ b/var/spack/repos/builtin/packages/hpddm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Hpddm(Package): maintainers("corentin-dev") + license("LGPL-3.0-or-later") + version("main", branch="main") version("2.2.3", commit="54228a5288a38cf1a144df13c96b00ac9240179c") diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py index 5818079c0dfacd..75a79367c9bc42 100644 --- a/var/spack/repos/builtin/packages/hpgmg/package.py +++ b/var/spack/repos/builtin/packages/hpgmg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Hpgmg(MakefilePackage): tags = ["proxy-app"] + license("BSD-2-Clause") + version("develop", branch="master") version("0.4", sha256="abdabfe09453487299500b5bd8da4e6dc3d88477199bcfa38ac41d0b3c780f6f") version( diff --git a/var/spack/repos/builtin/packages/hping/package.py b/var/spack/repos/builtin/packages/hping/package.py index bb584cc8bb93c9..187c5630c6bb54 100644 --- a/var/spack/repos/builtin/packages/hping/package.py +++ b/var/spack/repos/builtin/packages/hping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Hping(AutotoolsPackage): homepage = "http://www.hping.org" git = "https://github.com/antirez/hping.git" + license("GPL-2.0-only") + version("master", commit="3547c7691742c6eaa31f8402e0ccbb81387c1b99") patch("bpf.patch", sha256="99b9f91a308ffca306f69ccdb285e289ee3d280ec47ec7229e3a7669cca512f2") diff --git a/var/spack/repos/builtin/packages/hpl/package.py b/var/spack/repos/builtin/packages/hpl/package.py index ad3cb43eb0b7f6..8865405f21a81e 100644 --- a/var/spack/repos/builtin/packages/hpl/package.py +++ b/var/spack/repos/builtin/packages/hpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hpx-kokkos/package.py b/var/spack/repos/builtin/packages/hpx-kokkos/package.py index 27e88238294c6d..83e13413ed4f54 100644 --- a/var/spack/repos/builtin/packages/hpx-kokkos/package.py +++ b/var/spack/repos/builtin/packages/hpx-kokkos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class HpxKokkos(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/STEllAR-GROUP/hpx-kokkos.git" maintainers("G-071", "msimberg") + license("BSL-1.0") + version("master", branch="master") version("0.4.0", sha256="dafef55521cf4bf7ab28ebad546ea1d3fb83fac3a9932e292db4ab3666cd833f") version("0.3.0", sha256="83c1d11dab95552ad0abdae767c71f757811d7b51d82bd231653dc942e89a45d") diff --git a/var/spack/repos/builtin/packages/hpx/package.py b/var/spack/repos/builtin/packages/hpx/package.py index 5c0d390e590441..c0ec68df22e59b 100644 --- a/var/spack/repos/builtin/packages/hpx/package.py +++ b/var/spack/repos/builtin/packages/hpx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Hpx(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/STEllAR-GROUP/hpx.git" maintainers("msimberg", "albestro", "teonnik", "hkaiser") + license("BSL-1.0") + tags = ["e4s"] version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py index 2bc72630639c7a..147101cc2039d3 100644 --- a/var/spack/repos/builtin/packages/hpx5/package.py +++ b/var/spack/repos/builtin/packages/hpx5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index d6e42a83fcd640..6b64a0129b6fb6 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,15 +15,18 @@ class HsaRocrDev(CMakePackage): HSA ROCm kernel agents.AMD Heterogeneous System Architecture HSA - Linux HSA Runtime for Boltzmann (ROCm) platforms.""" - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime" - git = "https://github.com/RadeonOpenCompute/ROCR-Runtime.git" - url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCR-Runtime" + git = "https://github.com/ROCm/ROCR-Runtime.git" + url = "https://github.com/ROCm/ROCR-Runtime/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "haampie") libraries = ["libhsa-runtime64"] version("master", branch="master") + version("6.0.0", sha256="99e8fa1af52d0bf382f28468e1a345af1ff3452c35914a6a7b5eeaf69fc568db") + version("5.7.1", sha256="655e9bfef4b0b6ad3f9b89c934dc0a8377273bb0bccbda6c399ac5d5d2c1c04c") + version("5.7.0", sha256="2c56ec5c78a36f2b847afd4632cb25dbf6ecc58661eb2ae038c2552342e6ce23") version("5.6.1", sha256="4de9a57c2092edf9398d671c8a2c60626eb7daf358caf710da70d9c105490221") version("5.6.0", sha256="30875d440df9d8481ffb24d87755eae20a0efc1114849a72619ea954f1e9206c") version("5.5.1", sha256="53d84ad5ba5086ed4ad67ad892c52c0e4eba8ddfa85c2dd341bf825f4d5fe4ee") @@ -110,6 +113,7 @@ class HsaRocrDev(CMakePackage): variant("shared", default=True, description="Build shared or static library") variant("image", default=True, description="build with or without image support") + variant("asan", default=False, description="Build with address-sanitizer enabled or disabled") depends_on("cmake@3:", type="build") depends_on("pkgconfig", type="build", when="@5.3.0:") @@ -149,6 +153,9 @@ class HsaRocrDev(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) @@ -157,7 +164,8 @@ class HsaRocrDev(CMakePackage): depends_on( "rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver) ) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) # Both 3.5.0 and 3.7.0 force INSTALL_RPATH in different ways @@ -204,4 +212,7 @@ def cmake_args(self): if self.spec.satisfies("@5.6:"): args.append("-DCMAKE_INSTALL_LIBDIR=lib") + if self.spec.satisfies("@6.0:"): + args.append(self.define("ROCM_PATCH_VERSION", "60000")) + return args diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 444f7adcc1adb3..89be71a9ea6d1e 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,14 +14,17 @@ class HsakmtRoct(CMakePackage): Thunk Interface is a user-mode API interfaces used to interact with the ROCk driver.""" - homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" - git = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git" - url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCT-Thunk-Interface" + git = "https://github.com/ROCm/ROCT-Thunk-Interface.git" + url = "https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") version("master", branch="master") + version("6.0.0", sha256="9f4e80bd0a714ce45326941b906a62298c62025eff186dc6c48282ce84c787c7") + version("5.7.1", sha256="38bc3732886a52ca9cd477ec6fcde3ab17a0ba5dc8e2f7ac34c4de597bd00e8b") + version("5.7.0", sha256="52293e40c4ba0c653d796e2f6109f5fb4c79f5fb82310ecbfd9a5432acf9da43") version("5.6.1", sha256="d60b355bfd21a08e0e36270fd56f98d052c3c6edca47da887fa32bf32759c29b") version("5.6.0", sha256="cd009c5c09f664f046c428ba9843582ab468f7b88d560747eb949d8d7f8c5567") version("5.5.1", sha256="4ffde3fc1f91f24cdbf09263fd8e012a3995ad10854f4c1d866beab7b9f36bf4") @@ -107,6 +110,7 @@ class HsakmtRoct(CMakePackage): ) variant("shared", default=True, description="Build shared or static library") + variant("asan", default=False, description="Build with address-sanitizer enabled or disabled") depends_on("pkgconfig", type="build", when="@4.5.0:") depends_on("cmake@3:", type="build") @@ -116,11 +120,11 @@ class HsakmtRoct(CMakePackage): for ver in ["5.3.0", "5.4.0", "5.4.3"]: depends_on("llvm-amdgpu@" + ver, type="test", when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, type="test", when="@" + ver) - # See https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/72 + # See https://github.com/ROCm/ROCT-Thunk-Interface/issues/72 # and https://github.com/spack/spack/issues/28398 patch("0001-Remove-compiler-support-libraries-and-libudev-as-req.patch", when="@4.5.0:5.2") patch("0002-Remove-compiler-support-libraries-and-libudev-as-req-5.3.patch", when="@5.3.0:5.4") @@ -140,6 +144,9 @@ def cmake_args(self): args.append(self.define("BUILD_SHARED_LIBS", False)) if self.spec.satisfies("@5.4.3:"): args.append("-DCMAKE_INSTALL_LIBDIR=lib") + if self.spec.satisfies("@5.7.0:"): + args.append(self.define_from_variant("ADDRESS_SANITIZER", "asan")) + return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/hsakmt/package.py b/var/spack/repos/builtin/packages/hsakmt/package.py index bb5f47abf95adf..2a88f1fd486404 100644 --- a/var/spack/repos/builtin/packages/hsakmt/package.py +++ b/var/spack/repos/builtin/packages/hsakmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Hsakmt(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/amd/hsakmt/" xorg_mirror_path = "lib/hsakmt-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="3d46af85c27091937618f5e92f7446cff3e9e6378888645e6e238806461e5b77") diff --git a/var/spack/repos/builtin/packages/hsf-cmaketools/package.py b/var/spack/repos/builtin/packages/hsf-cmaketools/package.py index 0000e006bd35de..9c0c35c5190920 100644 --- a/var/spack/repos/builtin/packages/hsf-cmaketools/package.py +++ b/var/spack/repos/builtin/packages/hsf-cmaketools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hssp/package.py b/var/spack/repos/builtin/packages/hssp/package.py index 80ac2b3749279c..151644e4e84706 100644 --- a/var/spack/repos/builtin/packages/hssp/package.py +++ b/var/spack/repos/builtin/packages/hssp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Hssp(AutotoolsPackage): homepage = "https://github.com/cmbi/hssp" url = "https://github.com/cmbi/hssp/archive/3.0.10.tar.gz" + license("GPL-3.0-or-later") + version("3.1.5", sha256="9462608ce6b5b92f13a3a8d94b780d85a3cac68ab38449116193754cc22dc5d0") version("3.0.10", sha256="9b2cba9c498e65fd48730f0fc86ca2b480bf12903a2c131521023f3a161fe870") version("3.0.9", sha256="2f67743ffd233ed9c4cd298e8fc65a332b863052945fb62bd61d7f1776274da9") diff --git a/var/spack/repos/builtin/packages/hstr/package.py b/var/spack/repos/builtin/packages/hstr/package.py index 4e8c14cf9e017f..8ad7f1c9734e68 100644 --- a/var/spack/repos/builtin/packages/hstr/package.py +++ b/var/spack/repos/builtin/packages/hstr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Hstr(AutotoolsPackage): homepage = "https://github.com/dvorka/hstr" url = "https://github.com/dvorka/hstr/archive/1.22.tar.gz" + license("Apache-2.0") + version("1.22", sha256="384fee04e4c80a1964dcf443131c1da4a20dd474fb48132a51d3de0a946ba996") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/hto4l/package.py b/var/spack/repos/builtin/packages/hto4l/package.py index 3086cb5ef57b6c..921af275c6be08 100644 --- a/var/spack/repos/builtin/packages/hto4l/package.py +++ b/var/spack/repos/builtin/packages/hto4l/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/htop/package.py b/var/spack/repos/builtin/packages/htop/package.py index 1ffec3eaaf12fe..d3d2e9b1cdfd39 100644 --- a/var/spack/repos/builtin/packages/htop/package.py +++ b/var/spack/repos/builtin/packages/htop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Htop(AutotoolsPackage): url = "https://github.com/htop-dev/htop/archive/refs/tags/3.2.1.tar.gz" maintainers("sethrj") + license("GPL-2.0-or-later") + version("3.2.2", sha256="3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8") version("3.2.1", sha256="b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438") version("3.2.0", sha256="1a1dd174cc828521fe5fd0e052cff8c30aa50809cf80d3ce3a481c37d476ac54") diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 25caf7080655a6..8c7f319444a9bb 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,9 +9,15 @@ class Htslib(AutotoolsPackage): """C library for high-throughput sequencing data formats.""" + maintainers("jbeal-work") + homepage = "https://github.com/samtools/htslib" url = "https://github.com/samtools/htslib/releases/download/1.13/htslib-1.13.tar.bz2" + license("MIT AND BSD-3-Clause-Modification") + + version("1.19", sha256="8751c40c4fa7d1f23a6864c5b20a73744f8be68239535ae7729c5f7d394d0736") + version("1.18", sha256="f1ab53a593a2320a1bfadf4ef915dae784006c5b5c922c8a8174d7530a9af18f") version("1.17", sha256="763779288c40f07646ec7ad98b96c378c739171d162ad98398868783b721839f") version("1.16", sha256="606b7c7aff73734cf033ecd156f40529fa5792f54524952a28938ca0890d7924") version("1.15.1", sha256="8d7f8bf9658226942eeab70af2a22aca618577eaa8fe2ed9416ee306d5351aa1") diff --git a/var/spack/repos/builtin/packages/http-get/package.py b/var/spack/repos/builtin/packages/http-get/package.py index d9e515ff7fab23..380522ab4a18d1 100644 --- a/var/spack/repos/builtin/packages/http-get/package.py +++ b/var/spack/repos/builtin/packages/http-get/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/http-load/package.py b/var/spack/repos/builtin/packages/http-load/package.py index f94de62e9ccade..736c7988a400f8 100644 --- a/var/spack/repos/builtin/packages/http-load/package.py +++ b/var/spack/repos/builtin/packages/http-load/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/http-parser/package.py b/var/spack/repos/builtin/packages/http-parser/package.py index 351bd812d21a30..61af488281cb54 100644 --- a/var/spack/repos/builtin/packages/http-parser/package.py +++ b/var/spack/repos/builtin/packages/http-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class HttpParser(MakefilePackage): homepage = "https://github.com/nodejs/http-parser" url = "https://github.com/nodejs/http-parser/archive/v2.9.4.tar.gz" + license("MIT") + version("2.9.4", sha256="467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f") version("2.9.3", sha256="8fa0ab8770fd8425a9b431fdbf91623c4d7a9cdb842b9339289bd2b0b01b0d3d") version("2.9.2", sha256="5199500e352584852c95c13423edc5f0cb329297c81dd69c3c8f52a75496da08") diff --git a/var/spack/repos/builtin/packages/http-ping/package.py b/var/spack/repos/builtin/packages/http-ping/package.py index eb1a80883ba968..5e403a91b2fab3 100644 --- a/var/spack/repos/builtin/packages/http-ping/package.py +++ b/var/spack/repos/builtin/packages/http-ping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/http-post/package.py b/var/spack/repos/builtin/packages/http-post/package.py index 1381781367e42c..6429398c6ab3ed 100644 --- a/var/spack/repos/builtin/packages/http-post/package.py +++ b/var/spack/repos/builtin/packages/http-post/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/httpd/package.py b/var/spack/repos/builtin/packages/httpd/package.py index 759d65647e9d13..435c504b1ad74f 100644 --- a/var/spack/repos/builtin/packages/httpd/package.py +++ b/var/spack/repos/builtin/packages/httpd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Httpd(AutotoolsPackage): homepage = "https://httpd.apache.org/" url = "https://archive.apache.org/dist/httpd/httpd-2.4.43.tar.bz2" + license("Apache-2.0") + version("2.4.55", sha256="11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac") # https://nvd.nist.gov/vuln/detail/CVE-2022-31813 diff --git a/var/spack/repos/builtin/packages/httperf/package.py b/var/spack/repos/builtin/packages/httperf/package.py index c42ea6800481e8..e6a9fc2aa63473 100644 --- a/var/spack/repos/builtin/packages/httperf/package.py +++ b/var/spack/repos/builtin/packages/httperf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index f64ab12b076ef9..53d50abac2b2ee 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Httpie(PythonPackage): pypi = "httpie/httpie-2.6.0.tar.gz" maintainers("BoboTiG") + license("BSD-3-Clause") + version("3.2.1", sha256="c9c0032ca3a8d62492b7231b2dd83d94becf3b71baf8a4bbcd9ed1038537e3ec") version("2.6.0", sha256="ef929317b239bbf0a5bb7159b4c5d2edbfc55f8a0bcf9cd24ce597daec2afca5") version("2.5.0", sha256="fe6a8bc50fb0635a84ebe1296a732e39357c3e1354541bf51a7057b4877e47f9") diff --git a/var/spack/repos/builtin/packages/httping/package.py b/var/spack/repos/builtin/packages/httping/package.py index e67e44e6f2b666..69029424628a39 100644 --- a/var/spack/repos/builtin/packages/httping/package.py +++ b/var/spack/repos/builtin/packages/httping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Httping(AutotoolsPackage): homepage = "https://www.vanheusden.com/httping/" url = "https://github.com/flok99/httping/archive/2.5.tar.gz" + license("GPL-2.0-or-later") + version("2.5", sha256="2ad423097fa7a0d2d20a387050e34374326a703dddce897e152a8341e47ea500") version("2.3.4", sha256="45ed71a72fd8c9c3975e49706c739395f75e3977b91f96e7e25652addfa0f242") version("2.3.3", sha256="b76ec14cb4f6cd29b60a974254f4be37ed721c1660ecde9f6aac516ba521ab86") diff --git a/var/spack/repos/builtin/packages/httpress/package.py b/var/spack/repos/builtin/packages/httpress/package.py index 8b364dad948b8b..b0313557657404 100644 --- a/var/spack/repos/builtin/packages/httpress/package.py +++ b/var/spack/repos/builtin/packages/httpress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hub/package.py b/var/spack/repos/builtin/packages/hub/package.py index 861872b40956a7..0e636a072e2030 100644 --- a/var/spack/repos/builtin/packages/hub/package.py +++ b/var/spack/repos/builtin/packages/hub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,16 +15,40 @@ class Hub(Package): url = "https://github.com/github/hub/archive/v2.2.2.tar.gz" git = "https://github.com/github/hub.git" + license("MIT") + version("master", branch="master") - version("2.2.2", sha256="610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae") - version("2.2.1", sha256="9350aba6a8e3da9d26b7258a4020bf84491af69595f7484f922d75fc8b86dc10") - version("2.2.0", sha256="2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1") - version("1.12.4", sha256="b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117") + version("2.14.2", sha256="e19e0fdfd1c69c401e1c24dd2d4ecf3fd9044aa4bd3f8d6fd942ed1b2b2ad21a") + version( + "2.2.2", + sha256="610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae", + deprecated=True, + ) + version( + "2.2.1", + sha256="9350aba6a8e3da9d26b7258a4020bf84491af69595f7484f922d75fc8b86dc10", + deprecated=True, + ) + version( + "2.2.0", + sha256="2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1", + deprecated=True, + ) + version( + "1.12.4", + sha256="b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117", + deprecated=True, + ) extends("go") def install(self, spec, prefix): env = os.environ - env["GOPATH"] = self.stage.source_path + ":" + env["GOPATH"] - bash = which("bash") - bash(os.path.join("script", "build"), "-o", os.path.join(prefix, "bin", "hub")) + if spec.version < Version("2.14"): + env["GOPATH"] = self.stage.source_path + ":" + env["GOPATH"] + env["GO111MODULE"] = "off" + bash = which("bash") + bash(os.path.join("script", "build"), "-o", prefix.bin.hub) + return + env["GO111MODULE"] = "on" + go("build", "-o", prefix.bin.hub) diff --git a/var/spack/repos/builtin/packages/hudi/package.py b/var/spack/repos/builtin/packages/hudi/package.py index 3613365781f946..5bac21e23a466c 100644 --- a/var/spack/repos/builtin/packages/hudi/package.py +++ b/var/spack/repos/builtin/packages/hudi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Hudi(MavenPackage): homepage = "https://hudi.apache.org/" url = "https://github.com/apache/hudi/archive/release-0.5.3.tar.gz" + license("Apache-2.0") + version("0.5.3", sha256="8cbf52007fddd07eebd20c8962cd630b05a8ae4c597523fd63db837a45a0b227") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/hugo/package.py b/var/spack/repos/builtin/packages/hugo/package.py index 964a69ba09fa5c..2bb87852b1ebaa 100644 --- a/var/spack/repos/builtin/packages/hugo/package.py +++ b/var/spack/repos/builtin/packages/hugo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Hugo(Package): maintainers("alecbcs") + license("Apache-2.0") + version("0.118.2", sha256="915d7dcb44fba949c80858f9c2a55a11256162ba28a9067752f808cfe8faedaa") version("0.112.7", sha256="d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa") version("0.111.3", sha256="b6eeb13d9ed2e5d5c6895bae56480bf0fec24a564ad9d17c90ede14a7b240999") diff --git a/var/spack/repos/builtin/packages/hunspell/package.py b/var/spack/repos/builtin/packages/hunspell/package.py index f8e308a3140ff4..5b471af7a323da 100644 --- a/var/spack/repos/builtin/packages/hunspell/package.py +++ b/var/spack/repos/builtin/packages/hunspell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Hunspell(AutotoolsPackage): homepage = "https://hunspell.github.io/" url = "https://github.com/hunspell/hunspell/archive/v1.6.0.tar.gz" + license("GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1") + version("1.7.2", sha256="69fa312d3586c988789266eaf7ffc9861d9f6396c31fc930a014d551b59bbd6e") version("1.7.0", sha256="bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a") version("1.6.0", sha256="512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2") diff --git a/var/spack/repos/builtin/packages/hw-probe/package.py b/var/spack/repos/builtin/packages/hw-probe/package.py index 5d0b7788ced70f..bbbff9af15c1b2 100644 --- a/var/spack/repos/builtin/packages/hw-probe/package.py +++ b/var/spack/repos/builtin/packages/hw-probe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class HwProbe(MakefilePackage): homepage = "https://github.com/linuxhw/hw-probe" url = "https://github.com/linuxhw/hw-probe/archive/1.5.tar.gz" + license("LGPL-2.1-or-later OR BSD-4-Clause") + version("1.5", sha256="8bb7d6ff272c1412e26fcfd86e9df5c3e34e1584552404b930c281b8498b25ea") version("1.4", sha256="90f3ea83bf641348b209e4a2a910f65d836ae7828c0be0f660236ea413bc46bb") version("1.3", sha256="820ada4f16cb827e0990eb918e75423845fef54a863fdd88aa5bd23127354229") diff --git a/var/spack/repos/builtin/packages/hwdata/package.py b/var/spack/repos/builtin/packages/hwdata/package.py index c233c9297676a3..669c6d83fa5527 100644 --- a/var/spack/repos/builtin/packages/hwdata/package.py +++ b/var/spack/repos/builtin/packages/hwdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Hwdata(AutotoolsPackage): homepage = "https://github.com/vcrhonek/hwdata" url = "https://github.com/vcrhonek/hwdata/archive/v0.337.tar.gz" + license("GPL-2.0-or-later OR XFree86-1.1") + version("0.345", sha256="fafcc97421ba766e08a2714ccc3eebb0daabc99e67d53c2d682721dd01ccf7a7") version("0.340", sha256="e3a0ef18af6795a362345a2c2c7177be351cb27b4cc0ed9278b7409759258802") diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index a8cb2b5c287436..be41c6655fec85 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class Hwloc(AutotoolsPackage, CudaPackage, ROCmPackage): maintainers("bgoglin") executables = ["^hwloc-bind$"] + license("BSD-3-Clause") + version("master", branch="master") version("2.9.1", sha256="a440e2299f7451dc10a57ddbfa3f116c2a6c4be1bb97c663edd3b9c7b3b3b4cf") version("2.9.0", sha256="9d7d3450e0a5fea4cb80ca07dc8db939abb7ab62e2a7bb27f9376447658738ec") diff --git a/var/spack/repos/builtin/packages/hybpiper/package.py b/var/spack/repos/builtin/packages/hybpiper/package.py index f206620c9970b1..db890c6f73b4b0 100644 --- a/var/spack/repos/builtin/packages/hybpiper/package.py +++ b/var/spack/repos/builtin/packages/hybpiper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Hybpiper(Package): url = "https://github.com/mossmatters/HybPiper/archive/v1.2.0.tar.gz" git = "https://github.com/mossmatters/HybPiper/HybPiper.git" + license("GPL-3.0-or-later") + version("1.3.1", sha256="7ca07a9390d1ca52c72721774fa220546f18d3fa3b58500f68f3b2d89dbc0ecf") version("1.2.0", sha256="34c7b324e9bcacb6ccfe87dc50615d6f93866433b61a59291707efa858b6df57") diff --git a/var/spack/repos/builtin/packages/hybrid-lambda/package.py b/var/spack/repos/builtin/packages/hybrid-lambda/package.py index 02dd005bc8e32c..dcd5b6893b8bcb 100644 --- a/var/spack/repos/builtin/packages/hybrid-lambda/package.py +++ b/var/spack/repos/builtin/packages/hybrid-lambda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class HybridLambda(AutotoolsPackage): homepage = "https://github.com/hybridLambda/hybrid-Lambda" git = "https://github.com/hybridLambda/hybrid-Lambda.git" + license("GPL-3.0-only") + version("develop", submodules=True) depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/hybridsim/package.py b/var/spack/repos/builtin/packages/hybridsim/package.py index 793c0d1634f3f0..3d1d0a8e020def 100644 --- a/var/spack/repos/builtin/packages/hybridsim/package.py +++ b/var/spack/repos/builtin/packages/hybridsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hydra/package.py b/var/spack/repos/builtin/packages/hydra/package.py index 80e7c8676637b5..5d4e695e64d180 100644 --- a/var/spack/repos/builtin/packages/hydra/package.py +++ b/var/spack/repos/builtin/packages/hydra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class Hydra(AutotoolsPackage): list_url = "https://www.mpich.org/static/downloads/" list_depth = 1 + license("AGPL-3.0-or-later") + version("4.1.1", sha256="d4b915ccab426cd8368bbb2ee9d933fe07bea01493901fb56880b338a7f0b97e") version("3.2", sha256="f7a67ec91a773d95cbbd479a80e926d44bee1ff9fc70a8d1df075ea53ea33889") diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index df00235725b9f1..fc30587fb30ae1 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,254 +7,271 @@ from spack.package import * +# This limits the versions of lots of things pretty severely. +# +# - Only v1.5.2 and newer are buildable. +# - CMake must be v3.22 or newer. +# - CUDA must be v11.0.0 or newer. + -class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): +class Hydrogen(CachedCMakePackage, CudaPackage, ROCmPackage): """Hydrogen: Distributed-memory dense and sparse-direct linear algebra and optimization library. Based on the Elemental library.""" homepage = "https://libelemental.org" - url = "https://github.com/LLNL/Elemental/archive/v1.0.1.tar.gz" + url = "https://github.com/LLNL/Elemental/archive/v1.5.1.tar.gz" git = "https://github.com/LLNL/Elemental.git" tags = ["ecp", "radiuss"] maintainers("bvanessen") + license("GPL-2.0-or-later") + version("develop", branch="hydrogen") + version("1.5.3", sha256="faefbe738bd364d0e26ce9ad079a11c93a18c6f075719a365fd4fa5f1f7a989a") + version("1.5.2", sha256="a902cad3962471216cfa278ba0561c18751d415cd4d6b2417c02a43b0ab2ea33") version("1.5.1", sha256="447da564278f98366906d561d9c8bc4d31678c56d761679c2ff3e59ee7a2895c") - version("1.5.0", sha256="03dd487fb23b9fdbc715554a8ea48c3196a1021502e61b0172ef3fdfbee75180") - version("1.4.0", sha256="c13374ff4a6c4d1076e47ba8c8d91a7082588b9958d1ed89cffb12f1d2e1452e") - version("1.3.4", sha256="7979f6656f698f0bbad6798b39d4b569835b3013ff548d98089fce7c283c6741") - version("1.3.3", sha256="a51a1cfd40ac74d10923dfce35c2c04a3082477683f6b35e7b558ea9f4bb6d51") - version("1.3.2", sha256="50bc5e87955f8130003d04dfd9dcad63107e92b82704f8107baf95b0ccf98ed6") - version("1.3.1", sha256="a8b8521458e9e747f2b24af87c4c2749a06e500019c383e0cefb33e5df6aaa1d") - version("1.3.0", sha256="0f3006aa1d8235ecdd621e7344c99f56651c6836c2e1bc0cf006331b70126b36") - version("1.2.0", sha256="8545975139582ee7bfe5d00f8d83a8697afc285bf7026b0761e9943355974806") - version("1.1.0-1", sha256="73ce05e4166853a186469269cb00a454de71e126b2019f95bbae703b65606808") - version("1.1.0", sha256="b4c12913acd01c72d31f4522266bfeb8df1d4d3b4aef02e07ccbc9a477894e71") - version("1.0.1", sha256="27cf76e1ef1d58bd8f9b1e34081a14a682b7ff082fb5d1da56713e5e0040e528") - version("1.0", sha256="d8a97de3133f2c6b6bb4b80d32b4a4cc25eb25e0df4f0cec0f8cb19bf34ece98") - - variant("shared", default=True, description="Enables the build of shared libraries") - variant("openmp", default=True, description="Make use of OpenMP within CPU-kernels") - variant( - "openmp_blas", default=False, description="Use OpenMP for threading in the BLAS library" - ) - variant("quad", default=False, description="Enable quad precision") - variant("int64", default=False, description="Use 64bit integers") - variant("int64_blas", default=False, description="Use 64bit integers for BLAS.") - variant("scalapack", default=False, description="Build with ScaLAPACK library") + # Older versions are no longer supported. + + variant("shared", default=True, description="Enables the build of shared libraries.") variant( "build_type", default="Release", description="The build type to build", values=("Debug", "Release"), ) + variant("int64", default=False, description="Use 64-bit integers") + variant("al", default=True, sticky=True, description="Use Aluminum communication library") variant( - "blas", - default="openblas", - values=("openblas", "mkl", "accelerate", "essl", "libsci"), - description="Enable the use of OpenBlas/MKL/Accelerate/ESSL/LibSci", + "cub", default=True, when="+cuda", description="Use CUB/hipCUB for GPU memory management" ) variant( - "mpfr", - default=False, - description="Support GNU MPFR's" "arbitrary-precision floating-point arithmetic", + "cub", default=True, when="+rocm", description="Use CUB/hipCUB for GPU memory management" ) - variant("test", default=False, description="Builds test suite") - variant("al", default=False, description="Builds with Aluminum communication library") + variant("half", default=False, description="Support for FP16 precision data types") + + # TODO: Add netlib-lapack. For GPU-enabled builds, typical + # workflows don't touch host BLAS/LAPACK all that often, and even + # less frequently in performance-critical regions. + variant( + "blas", + default="any", + values=("any", "openblas", "mkl", "accelerate", "essl", "libsci"), + description="Specify a host BLAS library preference", + ) + variant("int64_blas", default=False, description="Use 64-bit integers for (host) BLAS.") + + variant("openmp", default=True, description="Make use of OpenMP within CPU kernels") variant( "omp_taskloops", + when="+openmp", default=False, - description="Use OpenMP taskloops instead of parallel for loops.", + description="Use OpenMP taskloops instead of parallel for loops", ) - variant("half", default=False, description="Builds with support for FP16 precision data types") - conflicts("~openmp", when="+omp_taskloops") + # Users should spec this on their own on the command line, no? + # This doesn't affect Hydrogen itself at all. Not one bit. + # variant( + # "openmp_blas", + # default=False, + # description="Use OpenMP for threading in the BLAS library") + + variant("test", default=False, description="Builds test suite") + conflicts("+cuda", when="+rocm", msg="CUDA and ROCm support are mutually exclusive") + conflicts("+half", when="+rocm", msg="FP16 support not implemented for ROCm.") - depends_on("cmake@3.21.0:", type="build", when="@1.5.2:") - depends_on("cmake@3.17.0:", type="build", when="@:1.5.1") - depends_on("cmake@3.22.0:", type="build", when="%cce") + depends_on("cmake@3.22.0:", type="build", when="@1.5.2:") + depends_on("cmake@3.17.0:", type="build", when="@1.5.1") depends_on("mpi") - depends_on("hwloc@1.11:") - depends_on("hwloc +cuda +nvml", when="+cuda") - depends_on("hwloc@2.3.0:", when="+rocm") + depends_on("blas") + depends_on("lapack") # Note that #1712 forces us to enumerate the different blas variants + # 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 threads=openmp", when="blas=openblas +openmp_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") - depends_on("intel-mkl threads=openmp", when="blas=mkl +openmp_blas") + # I don't think this is true... depends_on("veclibfort", when="blas=accelerate") - conflicts("blas=accelerate +openmp_blas") depends_on("essl", when="blas=essl") depends_on("essl +ilp64", when="blas=essl +int64_blas") - depends_on("essl threads=openmp", when="blas=essl +openmp_blas") + depends_on("netlib-lapack +external-blas", when="blas=essl") depends_on("cray-libsci", when="blas=libsci") - depends_on("cray-libsci +openmp", when="blas=libsci +openmp_blas") # Specify the correct version of Aluminum - depends_on("aluminum@:0.3", when="@:1.3 +al") - depends_on("aluminum@0.4.0:0.4", when="@1.4.0:1.4 +al") - depends_on("aluminum@0.6.0:0.6", when="@1.5.0:1.5.1 +al") - depends_on("aluminum@0.7.0:", when="@:1.0,1.5.2: +al") + depends_on("aluminum@0.7.0:", when="@1.5.2: +al") # Add Aluminum variants - depends_on("aluminum +cuda +nccl +cuda_rma", when="+al +cuda") - depends_on("aluminum +rocm +rccl", when="+al +rocm") + depends_on("aluminum +cuda +ht", when="+al +cuda") + depends_on("aluminum +rocm +ht", when="+al +rocm") for arch in CudaPackage.cuda_arch_values: - depends_on("aluminum cuda_arch=%s" % arch, when="+al +cuda cuda_arch=%s" % arch) + depends_on("aluminum +cuda cuda_arch=%s" % arch, when="+al +cuda cuda_arch=%s" % arch) # variants +rocm and amdgpu_targets are not automatically passed to # dependencies, so do it manually. for val in ROCmPackage.amdgpu_targets: - depends_on("aluminum amdgpu_target=%s" % val, when="+al +rocm amdgpu_target=%s" % val) - - # Note that this forces us to use OpenBLAS until #1712 is fixed - depends_on("lapack", when="blas=openblas ~openmp_blas") - - depends_on("scalapack", when="+scalapack") - depends_on("gmp", when="+mpfr") - depends_on("mpc", when="+mpfr") - depends_on("mpfr", when="+mpfr") + depends_on( + "aluminum +rocm amdgpu_target=%s" % val, when="+al +rocm amdgpu_target=%s" % val + ) - depends_on("cuda", when="+cuda") - depends_on("cub", when="^cuda@:10") - depends_on("hipcub", when="+rocm") + depends_on("cuda@11.0.0:", when="+cuda") + depends_on("hipcub +rocm", when="+rocm +cub") depends_on("half", when="+half") depends_on("llvm-openmp", when="%apple-clang +openmp") - conflicts( - "@0:0.98", - msg="Hydrogen did not exist before v0.99. " + "Did you mean to use Elemental instead?", - ) - - generator("ninja") - @property def libs(self): shared = True if "+shared" in self.spec else False - return find_libraries("libEl", root=self.prefix, shared=shared, recursive=True) + return find_libraries("libHydrogen", root=self.prefix, shared=shared, recursive=True) def cmake_args(self): + args = [] + return args + + def get_cuda_flags(self): spec = self.spec + args = [] + if spec.satisfies("^cuda+allow-unsupported-compilers"): + args.append("-allow-unsupported-compiler") + + if spec.satisfies("%clang"): + for flag in spec.compiler_flags["cxxflags"]: + if "gcc-toolchain" in flag: + args.append("-Xcompiler={0}".format(flag)) + return args - enable_gpu_fp16 = "+cuda" in spec and "+half" in spec - - args = [ - "-DCMAKE_CXX_STANDARD=17", - "-DCMAKE_INSTALL_MESSAGE:STRING=LAZY", - "-DBUILD_SHARED_LIBS:BOOL=%s" % ("+shared" in spec), - "-DHydrogen_ENABLE_OPENMP:BOOL=%s" % ("+openmp" in spec), - "-DHydrogen_ENABLE_QUADMATH:BOOL=%s" % ("+quad" in spec), - "-DHydrogen_USE_64BIT_INTS:BOOL=%s" % ("+int64" in spec), - "-DHydrogen_USE_64BIT_BLAS_INTS:BOOL=%s" % ("+int64_blas" in spec), - "-DHydrogen_ENABLE_MPC:BOOL=%s" % ("+mpfr" in spec), - "-DHydrogen_GENERAL_LAPACK_FALLBACK=ON", - "-DHydrogen_ENABLE_ALUMINUM=%s" % ("+al" in spec), - "-DHydrogen_ENABLE_CUB=%s" % ("+cuda" in spec or "+rocm" in spec), - "-DHydrogen_ENABLE_CUDA=%s" % ("+cuda" in spec), - "-DHydrogen_ENABLE_ROCM=%s" % ("+rocm" in spec), - "-DHydrogen_ENABLE_TESTING=%s" % ("+test" in spec), - "-DHydrogen_ENABLE_HALF=%s" % ("+half" in spec), - "-DHydrogen_ENABLE_GPU_FP16=%s" % enable_gpu_fp16, - ] - - if not spec.satisfies("^cmake@3.23.0"): - # There is a bug with using Ninja generator in this version - # of CMake - args.append("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON") - - if "+cuda" in spec: - if self.spec.satisfies("%clang"): - for flag in self.spec.compiler_flags["cxxflags"]: - if "gcc-toolchain" in flag: - args.append("-DCMAKE_CUDA_FLAGS=-Xcompiler={0}".format(flag)) - args.append("-DCMAKE_CUDA_STANDARD=14") - archs = spec.variants["cuda_arch"].value - if archs != "none": - arch_str = ";".join(archs) - args.append("-DCMAKE_CUDA_ARCHITECTURES=%s" % arch_str) - - if spec.satisfies("%cce") and spec.satisfies("^cuda+allow-unsupported-compilers"): - args.append("-DCMAKE_CUDA_FLAGS=-allow-unsupported-compiler") - - if "+rocm" in spec: - args.extend( - [ - "-DCMAKE_CXX_FLAGS=-std=c++17", - "-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix), - "-DHIP_CXX_COMPILER={0}".format(self.spec["hip"].hipcc), - ] - ) - archs = self.spec.variants["amdgpu_target"].value - if archs != "none": - arch_str = ",".join(archs) - cxxflags_str = " ".join(self.spec.compiler_flags["cxxflags"]) - args.append( - "-DHIP_HIPCC_FLAGS=--amdgpu-target={0}" - " -g -fsized-deallocation -fPIC {1}" - " -std=c++17".format(arch_str, cxxflags_str) - ) - args.extend( - [ - "-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str, - "-DAMDGPU_TARGETS=%s" % arch_str, - "-DGPU_TARGETS=%s" % arch_str, - ] - ) + def std_initconfig_entries(self): + entries = super(Hydrogen, self).std_initconfig_entries() + + # CMAKE_PREFIX_PATH, in CMake types, is a "STRING", not a "PATH". :/ + entries = [x for x in entries if "CMAKE_PREFIX_PATH" not in x] + cmake_prefix_path = os.environ["CMAKE_PREFIX_PATH"].replace(":", ";") + entries.append(cmake_cache_string("CMAKE_PREFIX_PATH", cmake_prefix_path)) + # IDK why this is here, but it was in the original recipe. So, yeah. + entries.append(cmake_cache_string("CMAKE_INSTALL_MESSAGE", "LAZY")) + return entries + + def initconfig_compiler_entries(self): + spec = self.spec + entries = super(Hydrogen, self).initconfig_compiler_entries() + + # FIXME: Enforce this better in the actual CMake. + entries.append(cmake_cache_string("CMAKE_CXX_STANDARD", "17")) + entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec)) + entries.append(cmake_cache_option("CMAKE_EXPORT_COMPILE_COMMANDS", True)) + + entries.append(cmake_cache_option("MPI_ASSUME_NO_BUILTIN_MPI", True)) - # Add support for OS X to find OpenMP (LLVM installed via brew) - if self.spec.satisfies("%clang +openmp platform=darwin"): + if spec.satisfies("%clang +openmp platform=darwin") or spec.satisfies( + "%clang +omp_taskloops platform=darwin" + ): clang = self.compiler.cc clang_bin = os.path.dirname(clang) clang_root = os.path.dirname(clang_bin) - args.extend(["-DOpenMP_DIR={0}".format(clang_root)]) + entries.append(cmake_cache_string("OpenMP_CXX_FLAGS", "-fopenmp=libomp")) + entries.append(cmake_cache_string("OpenMP_CXX_LIB_NAMES", "libomp")) + entries.append( + cmake_cache_string( + "OpenMP_libomp_LIBRARY", "{0}/lib/libomp.dylib".format(clang_root) + ) + ) + + return entries + + def initconfig_hardware_entries(self): + spec = self.spec + entries = super(Hydrogen, self).initconfig_hardware_entries() + + entries.append(cmake_cache_option("Hydrogen_ENABLE_CUDA", "+cuda" in spec)) + if spec.satisfies("+cuda"): + entries.append(cmake_cache_string("CMAKE_CUDA_STANDARD", "17")) + if not spec.satisfies("cuda_arch=none"): + archs = spec.variants["cuda_arch"].value + arch_str = ";".join(archs) + entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", arch_str)) + + # FIXME: Should this use the "cuda_flags" function of the + # CudaPackage class or something? There might be other + # flags in play, and we need to be sure to get them all. + cuda_flags = self.get_cuda_flags() + if len(cuda_flags) > 0: + entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", " ".join(cuda_flags))) + + entries.append(cmake_cache_option("Hydrogen_ENABLE_ROCM", "+rocm" in spec)) + if spec.satisfies("+rocm"): + entries.append(cmake_cache_string("CMAKE_HIP_STANDARD", "17")) + if not spec.satisfies("amdgpu_target=none"): + archs = self.spec.variants["amdgpu_target"].value + arch_str = ";".join(archs) + entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str)) + entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str)) + entries.append(cmake_cache_string("GPU_TARGETS", arch_str)) + entries.append(cmake_cache_path("HIP_ROOT_DIR", spec["hip"].prefix)) + + return entries + + def initconfig_package_entries(self): + spec = self.spec + entries = super(Hydrogen, self).initconfig_package_entries() + + # Basic Hydrogen options + entries.append(cmake_cache_option("Hydrogen_ENABLE_TESTING", "+test" in spec)) + entries.append(cmake_cache_option("Hydrogen_GENERAL_LAPACK_FALLBACK", True)) + entries.append(cmake_cache_option("Hydrogen_USE_64BIT_INTS", "+int64" in spec)) + entries.append(cmake_cache_option("Hydrogen_USE_64BIT_BLAS_INTS", "+int64_blas" in spec)) + + # Advanced dependency options + entries.append(cmake_cache_option("Hydrogen_ENABLE_ALUMINUM", "+al" in spec)) + entries.append(cmake_cache_option("Hydrogen_ENABLE_CUB", "+cub" in spec)) + entries.append(cmake_cache_option("Hydrogen_ENABLE_GPU_FP16", "+cuda +half" in spec)) + entries.append(cmake_cache_option("Hydrogen_ENABLE_HALF", "+half" in spec)) + entries.append(cmake_cache_option("Hydrogen_ENABLE_OPENMP", "+openmp" in spec)) + entries.append( + cmake_cache_option("Hydrogen_ENABLE_OMP_TASKLOOP", "+omp_taskloops" in spec) + ) + + # Note that CUDA/ROCm are handled above. if "blas=openblas" in spec: - args.extend( - [ - "-DHydrogen_USE_OpenBLAS:BOOL=%s" % ("blas=openblas" in spec), - "-DOpenBLAS_DIR:STRING={0}".format(spec["openblas"].prefix), - ] - ) - elif "blas=mkl" in spec: - args.extend(["-DHydrogen_USE_MKL:BOOL=%s" % ("blas=mkl" in spec)]) - elif "blas=accelerate" in spec: - args.extend(["-DHydrogen_USE_ACCELERATE:BOOL=TRUE"]) - elif "blas=essl" in spec: + entries.append(cmake_cache_option("Hydrogen_USE_OpenBLAS", "blas=openblas" in spec)) + # CMAKE_PREFIX_PATH should handle this + entries.append(cmake_cache_string("OpenBLAS_DIR", spec["openblas"].prefix)) + elif "blas=mkl" in spec or spec.satisfies("^intel-mkl"): + entries.append(cmake_cache_option("Hydrogen_USE_MKL", True)) + elif "blas=essl" in spec or spec.satisfies("^essl"): + entries.append(cmake_cache_string("BLA_VENDOR", "IBMESSL")) # IF IBM ESSL is used it needs help finding the proper LAPACK libraries - args.extend( - [ - "-DLAPACK_LIBRARIES=%s;-llapack;-lblas" - % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), - "-DBLAS_LIBRARIES=%s;-lblas" + entries.append( + cmake_cache_string( + "LAPACK_LIBRARIES", + "%s;-llapack;-lblas" % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), - ] + ) ) - - if "+omp_taskloops" in spec: - args.extend(["-DHydrogen_ENABLE_OMP_TASKLOOP:BOOL=%s" % ("+omp_taskloops" in spec)]) - - if "+al" in spec: - args.extend( - [ - "-DHydrogen_ENABLE_ALUMINUM:BOOL=%s" % ("+al" in spec), - "-DALUMINUM_DIR={0}".format(spec["aluminum"].prefix), - ] + entries.append( + cmake_cache_string( + "BLAS_LIBRARIES", + "%s;-lblas" + % ";".join("-l{0}".format(lib) for lib in self.spec["essl"].libs.names), + ) ) + elif "blas=accelerate" in spec: + entries.append(cmake_cache_option("Hydrogen_USE_ACCELERATE", True)) + elif spec.satisfies("^netlib-lapack"): + entries.append(cmake_cache_string("BLA_VENDOR", "Generic")) - return args + return entries def setup_build_environment(self, env): if self.spec.satisfies("%apple-clang +openmp"): diff --git a/var/spack/repos/builtin/packages/hypar/package.py b/var/spack/repos/builtin/packages/hypar/package.py index a6bc96606312a9..f8c69c30d6a613 100644 --- a/var/spack/repos/builtin/packages/hypar/package.py +++ b/var/spack/repos/builtin/packages/hypar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hyperfine/package.py b/var/spack/repos/builtin/packages/hyperfine/package.py index f6b2a611a2b356..e862d07392c561 100644 --- a/var/spack/repos/builtin/packages/hyperfine/package.py +++ b/var/spack/repos/builtin/packages/hyperfine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Hyperfine(Package): maintainers("michaelkuhn") + license("Apache-2.0 AND MIT") + version("1.17.0", sha256="3dcd86c12e96ab5808d5c9f3cec0fcc04192a87833ff009063c4a491d5487b58") version("1.16.1", sha256="ffb3298945cbe2c068ca1a074946d55b9add83c9df720eda2ed7f3d94d7e65d2") version("1.14.0", sha256="59018c22242dd2ad2bd5fb4a34c0524948b7921d02aa79419ccec4c1ffd3da14") diff --git a/var/spack/repos/builtin/packages/hyperqueue/package.py b/var/spack/repos/builtin/packages/hyperqueue/package.py index d3eeae49abe4da..b527366e048ea6 100644 --- a/var/spack/repos/builtin/packages/hyperqueue/package.py +++ b/var/spack/repos/builtin/packages/hyperqueue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Hyperqueue(Package): maintainers("Nortamo", "Kobzol") + license("MIT") + version("main", branch="main") version( "0.12.0-rc1", sha256="0c7b5d567bb6cb8dd4e7bafdf784b0379cef74b3aecb958c7f20248f8fedfbc1" diff --git a/var/spack/repos/builtin/packages/hyperscan/package.py b/var/spack/repos/builtin/packages/hyperscan/package.py index 769289a9b0fe8e..622601384f0ad9 100644 --- a/var/spack/repos/builtin/packages/hyperscan/package.py +++ b/var/spack/repos/builtin/packages/hyperscan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Hyperscan(CMakePackage): homepage = "https://www.hyperscan.io/" url = "https://github.com/intel/hyperscan/archive/v5.2.1.tar.gz" + license("BSD-2-Clause") + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) diff --git a/var/spack/repos/builtin/packages/hyphen/package.py b/var/spack/repos/builtin/packages/hyphen/package.py index e8352fe8af626b..607f4e5beacd37 100644 --- a/var/spack/repos/builtin/packages/hyphen/package.py +++ b/var/spack/repos/builtin/packages/hyphen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hyphy/package.py b/var/spack/repos/builtin/packages/hyphy/package.py index bebb338436b6a5..c63e67b50f3ed5 100644 --- a/var/spack/repos/builtin/packages/hyphy/package.py +++ b/var/spack/repos/builtin/packages/hyphy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/hypre-cmake/package.py b/var/spack/repos/builtin/packages/hypre-cmake/package.py index b3976f16ca22c3..8d6ad9bed8d5cf 100644 --- a/var/spack/repos/builtin/packages/hypre-cmake/package.py +++ b/var/spack/repos/builtin/packages/hypre-cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class HypreCmake(CMakePackage, CudaPackage): test_requires_compiler = True + license("Apache-2.0") + version("develop", branch="master") version("2.22.0", sha256="2c786eb5d3e722d8d7b40254f138bef4565b2d4724041e56a8fa073bda5cfbb5") diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 433d60a2ce7765..8a8166948f66bc 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,7 +23,10 @@ class Hypre(AutotoolsPackage, CudaPackage, ROCmPackage): test_requires_compiler = True + license("MIT") + version("develop", branch="master") + version("2.30.0", sha256="8e2af97d9a25bf44801c6427779f823ebc6f306438066bba7fcbc2a5f9b78421") version("2.29.0", sha256="98b72115407a0e24dbaac70eccae0da3465f8f999318b2c9241631133f42d511") version("2.28.0", sha256="2eea68740cdbc0b49a5e428f06ad7af861d1e169ce6a12d2cf0aa2fc28c4a2ae") version("2.27.0", sha256="507a3d036bb1ac21a55685ae417d769dd02009bde7e09785d0ae7446b4ae1f98") @@ -107,6 +110,7 @@ def patch(self): # fix sequential compilation in 'src/seq_mv' depends_on("rocthrust", when="+rocm") depends_on("rocrand", when="+rocm") depends_on("rocprim", when="+rocm") + depends_on("hipblas", when="+rocm +superlu-dist") depends_on("umpire", when="+umpire") depends_on("caliper", when="+caliper") @@ -184,10 +188,10 @@ def configure_args(self): "--with-blas-lib-dirs=%s" % " ".join(blas.directories), ] - if "+mpi" in spec: + if spec.satisfies("+mpi"): os.environ["CC"] = spec["mpi"].mpicc os.environ["CXX"] = spec["mpi"].mpicxx - if "+fortran" in spec: + if spec.satisfies("+fortran"): os.environ["F77"] = spec["mpi"].mpif77 os.environ["FC"] = spec["mpi"].mpifc configure_args.append("--with-MPI") @@ -198,7 +202,7 @@ def configure_args(self): configure_args.extend(self.with_or_without("openmp")) - if "+int64" in spec: + if spec.satisfies("+int64"): configure_args.append("--enable-bigint") else: configure_args.append("--disable-bigint") @@ -207,38 +211,38 @@ def configure_args(self): configure_args.extend(self.enable_or_disable("complex")) - if "+shared" in spec: + if spec.satisfies("+shared"): configure_args.append("--enable-shared") - if "~internal-superlu" in spec: + if spec.satisfies("~internal-superlu"): configure_args.append("--without-superlu") # MLI and FEI do not build without superlu on Linux configure_args.append("--without-mli") configure_args.append("--without-fei") - if "+superlu-dist" in spec: + if spec.satisfies("+superlu-dist"): configure_args.append( "--with-dsuperlu-include=%s" % spec["superlu-dist"].prefix.include ) configure_args.append("--with-dsuperlu-lib=%s" % spec["superlu-dist"].libs) configure_args.append("--with-dsuperlu") - if "+umpire" in spec: + if spec.satisfies("+umpire"): configure_args.append("--with-umpire-include=%s" % spec["umpire"].prefix.include) configure_args.append("--with-umpire-lib=%s" % spec["umpire"].libs) - if "~cuda~rocm" in spec: + if spec.satisfies("~cuda~rocm"): configure_args.append("--with-umpire-host") else: configure_args.append("--with-umpire") - if "+caliper" in spec: + if spec.satisfies("+caliper"): configure_args.append("--with-caliper") configure_args.append("--with-caliper-include=%s" % spec["caliper"].prefix.include) configure_args.append("--with-caliper-lib=%s" % spec["caliper"].libs) configure_args.extend(self.enable_or_disable("debug")) - if "+cuda" in spec: + if spec.satisfies("+cuda"): configure_args.extend(["--with-cuda", "--enable-curand", "--enable-cusparse"]) cuda_arch_vals = spec.variants["cuda_arch"].value if cuda_arch_vals: @@ -246,22 +250,23 @@ def configure_args(self): cuda_arch = cuda_arch_sorted[0] configure_args.append("--with-gpu-arch={0}".format(cuda_arch)) # New in 2.21.0: replaces --enable-cub - if "@2.21.0:" in spec: + if spec.satisfies("@2.21.0:"): configure_args.append("--enable-device-memory-pool") configure_args.append("--with-cuda-home={0}".format(spec["cuda"].prefix)) else: configure_args.append("--enable-cub") else: configure_args.extend(["--without-cuda", "--disable-curand", "--disable-cusparse"]) - if "@:2.20.99" in spec: + if spec.satisfies("@:2.20.99"): configure_args.append("--disable-cub") - if "+rocm" in spec: + if spec.satisfies("+rocm"): rocm_pkgs = ["rocsparse", "rocthrust", "rocprim", "rocrand"] + if spec.satisfies("+superlu-dist"): + rocm_pkgs.append("hipblas") rocm_inc = "" for pkg in rocm_pkgs: - if "^" + pkg in spec: - rocm_inc += spec[pkg].headers.include_flags + " " + rocm_inc += spec[pkg].headers.include_flags + " " configure_args.extend( [ "--with-hip", @@ -278,7 +283,7 @@ def configure_args(self): else: configure_args.extend(["--without-hip", "--disable-rocrand", "--disable-rocsparse"]) - if "+sycl" in spec: + if spec.satisfies("+sycl"): configure_args.append("--with-sycl") sycl_compatible_compilers = ["dpcpp", "icpx"] if not (os.path.basename(self.compiler.cxx) in sycl_compatible_compilers): @@ -287,10 +292,10 @@ def configure_args(self): + " or the oneAPI CXX (icpx) compiler." ) - if "+unified-memory" in spec: + if spec.satisfies("+unified-memory"): configure_args.append("--enable-unified-memory") - if "+magma" in spec: + if spec.satisfies("+magma"): configure_args.append("--with-magma-include=%s" % spec["magma"].prefix.include) configure_args.append("--with-magma-lib=%s" % spec["magma"].libs) configure_args.append("--with-magma") @@ -301,19 +306,19 @@ def configure_args(self): def setup_build_environment(self, env): spec = self.spec - if "+mpi" in spec: + if spec.satisfies("+mpi"): env.set("CC", spec["mpi"].mpicc) env.set("CXX", spec["mpi"].mpicxx) - if "+fortran" in spec: + if spec.satisfies("+fortan"): env.set("F77", spec["mpi"].mpif77) - if "+cuda" in spec: + if spec.satisfies("+cuda"): env.set("CUDA_HOME", spec["cuda"].prefix) env.set("CUDA_PATH", spec["cuda"].prefix) # In CUDA builds hypre currently doesn't handle flags correctly env.append_flags("CXXFLAGS", "-O2" if "~debug" in spec else "-g") - if "+rocm" in spec: + if spec.satisfies("+rocm"): # As of 2022/04/05, the following are set by 'llvm-amdgpu' and # override hypre's default flags, so we unset them. env.unset("CFLAGS") @@ -335,7 +340,7 @@ def install(self, spec, prefix): sstruct() sstruct("-in", "test/sstruct.in.default", "-solver", "40", "-rhsone") make("install") - if "+gptune" in self.spec: + if spec.satisfies("+gptune"): make("test") self.run_test("mkdir", options=["-p", self.prefix.bin]) self.run_test("cp", options=["test/ij", self.prefix.bin + "/."]) diff --git a/var/spack/repos/builtin/packages/hztool/package.py b/var/spack/repos/builtin/packages/hztool/package.py index 4cd44d04d53b64..60e2a60f3e645f 100644 --- a/var/spack/repos/builtin/packages/hztool/package.py +++ b/var/spack/repos/builtin/packages/hztool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Hztool(AutotoolsPackage): tags = ["hep"] + license("GPL-2.0-only") + version("4.3.2", sha256="2a8d334abd96a7a9f70d53cfbb46f35902ccd1108861333a87542f8357152fd4") version("4.3", sha256="af1a302c16e9f0bfbfdd77a486a5f47553d81d1d049bc83cc72321ba285af264") version("4.2", sha256="87b74b2e424a1e6bd990cc12a0bfcba15854a6451ffa20aff8dc4bdfed559160") diff --git a/var/spack/repos/builtin/packages/i3/package.py b/var/spack/repos/builtin/packages/i3/package.py index 5118a613f4070c..53d0ad53eb47af 100644 --- a/var/spack/repos/builtin/packages/i3/package.py +++ b/var/spack/repos/builtin/packages/i3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class I3(AutotoolsPackage): homepage = "https://i3wm.org/" url = "https://github.com/i3/i3/archive/4.14.1.tar.gz" + license("BSD-3-Clause") + version("4.14.1", sha256="28d8102d656f17445a6e1523b12c1a730cc3925a520add1f75b56b9c842932f9") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/ibm-databroker/package.py b/var/spack/repos/builtin/packages/ibm-databroker/package.py index fd49289e70a5ee..745240354b00ee 100644 --- a/var/spack/repos/builtin/packages/ibm-databroker/package.py +++ b/var/spack/repos/builtin/packages/ibm-databroker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class IbmDatabroker(CMakePackage, PythonExtension): # IBM dev team should take over maintainers("bhatiaharsh") + license("Apache-2.0") + version("master", branch="master") version("0.7.0", sha256="5460fa1c5c05ad25c759b2ee4cecee92980d4dde5bc7c5f6da9242806cf22bb8") version("0.6.1", sha256="2c7d6c6a269d4ae97aad4d770533e742f367da84758130c283733f25df83e535") diff --git a/var/spack/repos/builtin/packages/ibm-java/package.py b/var/spack/repos/builtin/packages/ibm-java/package.py index de2b87b1ee23b3..97d63d65c8a8d0 100644 --- a/var/spack/repos/builtin/packages/ibm-java/package.py +++ b/var/spack/repos/builtin/packages/ibm-java/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py index 3fc1c702f9913c..bb21460e04c43f 100644 --- a/var/spack/repos/builtin/packages/ibmisc/package.py +++ b/var/spack/repos/builtin/packages/ibmisc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Ibmisc(CMakePackage): maintainers("citibeth") + license("LGPL-3.0-only") + version("0.1.0", sha256="38481a8680aad4b40eca6723b2898b344cf0ef891ebc3581f5e99fbe420fa0d8") variant("everytrace", default=False, description="Report errors through Everytrace") diff --git a/var/spack/repos/builtin/packages/icarus/package.py b/var/spack/repos/builtin/packages/icarus/package.py index b290cd9fedbdfb..b652f7a6dabbee 100644 --- a/var/spack/repos/builtin/packages/icarus/package.py +++ b/var/spack/repos/builtin/packages/icarus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,11 @@ class Icarus(AutotoolsPackage): url = "https://github.com/steveicarus/iverilog/archive/refs/tags/v12_0.tar.gz" git = "https://github.com/steveicarus/iverilog.git" + maintainers("davekeeshan") + + license("GPL-2.0-only") + + version("master", branch="master") version("12_0", sha256="a68cb1ef7c017ef090ebedb2bc3e39ef90ecc70a3400afb4aa94303bc3beaa7d") version("11_0", sha256="6327fb900e66b46803d928b7ca439409a0dc32731d82143b20387be0833f1c95") version("10_3", commit="453c5465895eaca4a792d18b75e9ec14db6ea50e") @@ -38,3 +43,14 @@ def create_install_folders(self): mkdirp(join_path(prefix.lib, "ivl", "include")) mkdirp(join_path(prefix.share, "man")) mkdirp(join_path(prefix.share, "man", "man1")) + + # We need to fix the CC and CXX paths, as they point to the spack + # wrapper scripts which aren't usable without spack + @run_after("install") + def patch_compiler(self): + filter_file( + r"^CC\s*=.*", f"CC={self.compiler.cc}", join_path(self.prefix.bin, "iverilog-vpi") + ) + filter_file( + r"^CXX\s*=.*", f"CXX={self.compiler.cxx}", join_path(self.prefix.bin, "iverilog-vpi") + ) diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py index 1ca562c78783b2..051e9527eb5495 100644 --- a/var/spack/repos/builtin/packages/iceauth/package.py +++ b/var/spack/repos/builtin/packages/iceauth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Iceauth(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/iceauth" xorg_mirror_path = "app/iceauth-1.0.7.tar.gz" + license("MIT") + version("1.0.9", sha256="5ca274cf210453e7d7cf5c827a2fbc92149df83824f99a27cde17e1f20324dc6") version("1.0.7", sha256="6c9706cce276609876e768759ed4ee3b447cd17af4a61f9b5a374c7dda9696d8") diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index f5a191e3440f32..b1dfc2dd166a12 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Icedtea(AutotoolsPackage): homepage = "https://openjdk.java.net/projects/icedtea/" url = "https://icedtea.wildebeest.org/download/source/icedtea-3.4.0.tar.gz" + license("GPL-2.0-or-later") + version("3.9.0", sha256="84a63bc59f4e101ce8fa183060a59c7e8cbe270945310e90c92b8609a9b8bc88") version("3.8.0", sha256="ef1a9110294d0a905833f1db30da0c8a88bd2bde8d92ddb711d72ec763cd25b0") version("3.7.0", sha256="936302694e193791885e81cf72097eeadee5b68ba220889228b0aafbfb2cb654") diff --git a/var/spack/repos/builtin/packages/icet/package.py b/var/spack/repos/builtin/packages/icet/package.py index e0912ddeb3d379..72efff0787738c 100644 --- a/var/spack/repos/builtin/packages/icet/package.py +++ b/var/spack/repos/builtin/packages/icet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py index fa8e3f91f83ffa..4afb834fadd619 100644 --- a/var/spack/repos/builtin/packages/ico/package.py +++ b/var/spack/repos/builtin/packages/ico/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index d7ac12c317c0f5..fc5dbb21011ba2 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Icu4c(AutotoolsPackage): homepage = "http://site.icu-project.org/" url = "https://github.com/unicode-org/icu/releases/download/release-65-1/icu4c-65_1-src.tgz" + license("Unicode-TOU") + version("67.1", sha256="94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc") version("66.1", sha256="52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e") version("65.1", sha256="53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948") diff --git a/var/spack/repos/builtin/packages/id3lib/package.py b/var/spack/repos/builtin/packages/id3lib/package.py index 35395b80bb13a9..660897260ca1a0 100644 --- a/var/spack/repos/builtin/packages/id3lib/package.py +++ b/var/spack/repos/builtin/packages/id3lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Id3lib(AutotoolsPackage): homepage = "http://id3lib.sourceforge.net/" url = "https://downloads.sourceforge.net/project/id3lib/id3lib/3.8.3/id3lib-3.8.3.tar.gz" + license("GPL-2.0-only") + version("3.8.3", sha256="2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/idba/package.py b/var/spack/repos/builtin/packages/idba/package.py index 75587d0a49fc47..3213d2838f400d 100644 --- a/var/spack/repos/builtin/packages/idba/package.py +++ b/var/spack/repos/builtin/packages/idba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/idg/package.py b/var/spack/repos/builtin/packages/idg/package.py index 92a23f01447c75..42621b4ca9f7d0 100644 --- a/var/spack/repos/builtin/packages/idg/package.py +++ b/var/spack/repos/builtin/packages/idg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Idg(CMakePackage): maintainers("pelahi") + license("GPL-3.0-or-later") + version("1.2.0", commit="ccf8951283c12547326800adae99440c70177449") version("1.0.0", commit="3322756fb8b6e3bb1fe5293f3e07e40623ff8486") version("0.8.1", commit="a09f3c85094c592f9304fff4c31e920c7592c3c3") diff --git a/var/spack/repos/builtin/packages/idl/package.py b/var/spack/repos/builtin/packages/idl/package.py index 72552282cb7df0..8461f4df757f0d 100644 --- a/var/spack/repos/builtin/packages/idl/package.py +++ b/var/spack/repos/builtin/packages/idl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/iegenlib/package.py b/var/spack/repos/builtin/packages/iegenlib/package.py index 882bbcdd0c4e7a..459e96591f25c6 100644 --- a/var/spack/repos/builtin/packages/iegenlib/package.py +++ b/var/spack/repos/builtin/packages/iegenlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Iegenlib(CMakePackage): maintainers("dhuth") + license("BSD-2-Clause") + version("master", branch="master") version( "2018-07-03", diff --git a/var/spack/repos/builtin/packages/ignite/package.py b/var/spack/repos/builtin/packages/ignite/package.py index 78cf2d3578c8ea..5b5fea1b353888 100644 --- a/var/spack/repos/builtin/packages/ignite/package.py +++ b/var/spack/repos/builtin/packages/ignite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ignite(Package): homepage = "https://ignite.apache.org/" url = "https://archive.apache.org/dist/ignite/2.6.0/apache-ignite-hadoop-2.6.0-bin.zip" + license("CC0-1.0") + version("2.6.0", sha256="be40350f301a308a0ab09413a130d421730bf253d200e054b82a7d0c275c69f2") version("2.5.0", sha256="00bd35b6c50754325b966d50c7eee7067e0558f3d52b3dee27aff981b6da38be") version("2.4.0", sha256="3d4f44fbb1c46731cf6ad4acce26da72960b292b307221cec55057b4f305abd9") diff --git a/var/spack/repos/builtin/packages/igprof/package.py b/var/spack/repos/builtin/packages/igprof/package.py index 4e7abba5399acd..97e80795d1b959 100644 --- a/var/spack/repos/builtin/packages/igprof/package.py +++ b/var/spack/repos/builtin/packages/igprof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/igraph/package.py b/var/spack/repos/builtin/packages/igraph/package.py index 62108600daf98d..ec5051d0540c78 100644 --- a/var/spack/repos/builtin/packages/igraph/package.py +++ b/var/spack/repos/builtin/packages/igraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Igraph(CMakePackage, AutotoolsPackage): homepage = "https://igraph.org/" url = "https://github.com/igraph/igraph/releases/download/0.7.1/igraph-0.7.1.tar.gz" + license("GPL-2.0-or-later") + version("0.10.6", sha256="99bf91ee90febeeb9a201f3e0c1d323c09214f0b5f37a4290dc3b63f52839d6d") version("0.7.1", sha256="d978030e27369bf698f3816ab70aa9141e9baf81c56cc4f55efbe5489b46b0df") diff --git a/var/spack/repos/builtin/packages/igv/package.py b/var/spack/repos/builtin/packages/igv/package.py index 5f630cee35da9a..62c4817c9cae9d 100644 --- a/var/spack/repos/builtin/packages/igv/package.py +++ b/var/spack/repos/builtin/packages/igv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Igv(Package): maintainers("snehring") + version("2.16.2", sha256="489d34ed4e807a3d32a3720f11248d2ddf1e21d264b06bea44fbe1ccb74b3aa2") version("2.12.3", sha256="c87a109deb35994e1b28dee80b5acfd623ec3257f031fcd9cfce008cd32a4cf2") version("2.8.0", sha256="33f3ac57017907b931f90c35b63b2de2e4f8d2452f0fbb5be39d30288fc9b2c6") diff --git a/var/spack/repos/builtin/packages/igvtools/package.py b/var/spack/repos/builtin/packages/igvtools/package.py index a191d8becee8dd..995cc1fa33a2bb 100644 --- a/var/spack/repos/builtin/packages/igvtools/package.py +++ b/var/spack/repos/builtin/packages/igvtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ike-scan/package.py b/var/spack/repos/builtin/packages/ike-scan/package.py index e0552dcc2f1ed7..b6aef8a42d6c3f 100644 --- a/var/spack/repos/builtin/packages/ike-scan/package.py +++ b/var/spack/repos/builtin/packages/ike-scan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class IkeScan(AutotoolsPackage): homepage = "https://github.com/royhills/ike-scan" url = "https://github.com/royhills/ike-scan/releases/download/1.9/ike-scan-1.9.tar.gz" + license("GPL-2.0-or-later") + version("1.9", sha256="05d15c7172034935d1e46b01dacf1101a293ae0d06c0e14025a4507656f1a7b6") diff --git a/var/spack/repos/builtin/packages/ilmbase/package.py b/var/spack/repos/builtin/packages/ilmbase/package.py index df6ab2a8d0944a..e3d47d3e30a126 100644 --- a/var/spack/repos/builtin/packages/ilmbase/package.py +++ b/var/spack/repos/builtin/packages/ilmbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ima-evm-utils/package.py b/var/spack/repos/builtin/packages/ima-evm-utils/package.py index 57e78b0db1ba2c..11728627b91094 100644 --- a/var/spack/repos/builtin/packages/ima-evm-utils/package.py +++ b/var/spack/repos/builtin/packages/ima-evm-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class ImaEvmUtils(AutotoolsPackage): "https://sourceforge.net/projects/linux-ima/files/ima-evm-utils/ima-evm-utils-1.3.2.tar.gz" ) + license("LGPL-2.1-or-later") + version("1.3.2", sha256="c2b206e7f9fbe62a938b7ae59e31906fefae4d5351fe01db739bd8346b75d4a7") version("1.3.1", sha256="5304271f31a3601a2af5984942d9bd6c7532597c5a97250c9a4524074fc39925") version("1.3", sha256="62e90e8dc6b131a4f34a356114cdcb5bef844f110abbdd5d8b53c449aecc609f") diff --git a/var/spack/repos/builtin/packages/imagemagick/package.py b/var/spack/repos/builtin/packages/imagemagick/package.py index cbdcd08a4d72f4..318ea03b8969e6 100644 --- a/var/spack/repos/builtin/packages/imagemagick/package.py +++ b/var/spack/repos/builtin/packages/imagemagick/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Imagemagick(AutotoolsPackage): homepage = "https://www.imagemagick.org" url = "https://github.com/ImageMagick/ImageMagick/archive/7.0.2-7.tar.gz" + license("ImageMagick") + version("7.1.1-11", sha256="98bb2783da7d5b06e7543529bd07b50d034fba611ff15e8817a0f4f73957d934") version("7.0.8-7", sha256="fadb36b59f310e9eee5249ecb2326b323a64da6cc716dd6d08ece8ea2c780b81") version("7.0.5-9", sha256="b85b269e0ed1628e88e840053823f8a33c314b2271f04762f43d33e9d0b4d264") @@ -20,19 +22,24 @@ class Imagemagick(AutotoolsPackage): version("7.0.2-6", sha256="7d49ca8030f895c683cae69c52d8edfc4876de651f5b8bfdbea907e222480bd3") variant("ghostscript", default=False, description="Compile with Ghostscript support") + variant("rsvg", default=False, description="Enable RSVG support") - depends_on("jpeg") - depends_on("pango") + depends_on("pkgconfig@0.20:", type="build") depends_on("libtool", type="build") - depends_on("libtool", when="@7.0.8:", type=("build", "link")) - depends_on("libpng") - depends_on("freetype") - depends_on("fontconfig") - depends_on("libtiff") + + depends_on("fontconfig@2.1:") + depends_on("freetype@2.8:") + depends_on("jpeg") + depends_on("pango@1.28.1:") + depends_on("libpng@1:") + depends_on("librsvg@2.9:", when="+rsvg") + depends_on("libtiff@4:") depends_on("ghostscript", when="+ghostscript") depends_on("ghostscript-fonts", when="+ghostscript") + + # TODO: are these actually required? depends_on("libsm") - depends_on("pkgconfig", type="build") + depends_on("libtool") def configure_args(self): args = [] @@ -43,6 +50,7 @@ def configure_args(self): args.append("--with-gs-font-dir={0}".format(gs_font_dir)) else: args.append("--without-gslib") + args.extend(self.with_or_without("rsvg")) return args @property diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index d41854ef12ebd7..f209554cd30937 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Imake(AutotoolsPackage, XorgPackage): homepage = "http://www.snake.net/software/imake-stuff/" xorg_mirror_path = "util/imake-1.0.7.tar.gz" + license("custom") + version("1.0.9", sha256="ca53ad18c683091490596d72fee8dbee4c6ddb7693709e25f26da140d29687c1") version("1.0.7", sha256="6bda266a07eb33445d513f1e3c82a61e4822ccb94d420643d58e1be5f881e5cb") diff --git a/var/spack/repos/builtin/packages/imath/package.py b/var/spack/repos/builtin/packages/imath/package.py index 053d1c207417e8..1937e754fa8f95 100644 --- a/var/spack/repos/builtin/packages/imath/package.py +++ b/var/spack/repos/builtin/packages/imath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Imath(CMakePackage): homepage = "https://github.com/AcademySoftwareFoundation/Imath" url = "https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.5.tar.gz" + license("BSD-3-Clause") + version("3.1.9", sha256="f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3") version("3.1.7", sha256="bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47") version("3.1.5", sha256="1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb") diff --git a/var/spack/repos/builtin/packages/imgui/package.py b/var/spack/repos/builtin/packages/imgui/package.py index 54fc7e35ef2d4f..c233e4abe90332 100644 --- a/var/spack/repos/builtin/packages/imgui/package.py +++ b/var/spack/repos/builtin/packages/imgui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Imgui(Package): homepage = "https://github.com/ocornut/imgui" url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.85.tar.gz" + license("MIT") + version("1.85", sha256="7ed49d1f4573004fa725a70642aaddd3e06bb57fcfe1c1a49ac6574a3e895a77") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/imlib2/package.py b/var/spack/repos/builtin/packages/imlib2/package.py index 13965ae3b5644f..d77907c81bdecd 100644 --- a/var/spack/repos/builtin/packages/imlib2/package.py +++ b/var/spack/repos/builtin/packages/imlib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Imlib2(AutotoolsPackage, SourceforgePackage): maintainers("TheQueasle") + license("Imlib2") + version("1.7.1", sha256="033a6a639dcbc8e03f65ff05e57068e7346d50ee2f2fff304bb9095a1b2bc407") version("1.7.0", sha256="1976ca3db48cbae79cd0fc737dabe39cc81494fc2560e1d22821e7dc9c22b37d") version("1.6.1", sha256="4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d") diff --git a/var/spack/repos/builtin/packages/imp/package.py b/var/spack/repos/builtin/packages/imp/package.py index c68435fa226aa9..e8af0247af5401 100644 --- a/var/spack/repos/builtin/packages/imp/package.py +++ b/var/spack/repos/builtin/packages/imp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Imp(CMakePackage): homepage = "https://integrativemodeling.org" url = "https://github.com/salilab/imp/archive/2.8.0.tar.gz" + license("LGPL-2.1-or-later") + version("2.8.0", sha256="0b46b8988febd7cdfc5838849007f9a547493ed4b6c752fe54571467eeb1acd2") depends_on("python@2.7:") diff --git a/var/spack/repos/builtin/packages/impalajit/package.py b/var/spack/repos/builtin/packages/impalajit/package.py index e5a36c5c58134a..ad823160d10577 100644 --- a/var/spack/repos/builtin/packages/impalajit/package.py +++ b/var/spack/repos/builtin/packages/impalajit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Impalajit(CMakePackage): homepage = "https://github.com/manuel-fasching/ImpalaJIT/blob/master/README.md" + license("MIT-0") + version( "main", git="https://github.com/manuel-fasching/ImpalaJIT.git", diff --git a/var/spack/repos/builtin/packages/improved-rdock/package.py b/var/spack/repos/builtin/packages/improved-rdock/package.py index 413a13b3ee1fa7..3f78946a2435e0 100644 --- a/var/spack/repos/builtin/packages/improved-rdock/package.py +++ b/var/spack/repos/builtin/packages/improved-rdock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class ImprovedRdock(MakefilePackage): homepage = "https://github.com/clinfo/improved_rDock" git = "https://github.com/clinfo/improved_rDock.git" + license("LGPL-3.0-or-later") + version("main", branch="main") depends_on("popt") diff --git a/var/spack/repos/builtin/packages/impute2/package.py b/var/spack/repos/builtin/packages/impute2/package.py index 26cf9f21efea58..7564e821f8a4d5 100644 --- a/var/spack/repos/builtin/packages/impute2/package.py +++ b/var/spack/repos/builtin/packages/impute2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/infernal/package.py b/var/spack/repos/builtin/packages/infernal/package.py index bdb9f9aaf25d94..a69ca987b20e11 100644 --- a/var/spack/repos/builtin/packages/infernal/package.py +++ b/var/spack/repos/builtin/packages/infernal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/influxdb/package.py b/var/spack/repos/builtin/packages/influxdb/package.py index e8d0d801d111ec..7e95e253179f8f 100644 --- a/var/spack/repos/builtin/packages/influxdb/package.py +++ b/var/spack/repos/builtin/packages/influxdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/iniparser/package.py b/var/spack/repos/builtin/packages/iniparser/package.py index f6c53dcd4557b9..ba99ed31bcca17 100644 --- a/var/spack/repos/builtin/packages/iniparser/package.py +++ b/var/spack/repos/builtin/packages/iniparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Iniparser(MakefilePackage): homepage = "http://ndevilla.free.fr/iniparser/" url = "https://github.com/ndevilla/iniparser/archive/v4.1.tar.gz" + license("MIT") + version("4.1", sha256="960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae") version("4.0", sha256="e0bbd664bb3f0d64c21ac2d67a843b1c7a3a9710e96393344d170ab8b33e92ba") version("3.2", sha256="4a60b8e29d33d24b458749404e1ff2bcbfedd53ad800757daeed7955599fdce4") diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py index 373b1e4fa460b6..943291764ffa4e 100644 --- a/var/spack/repos/builtin/packages/inputproto/package.py +++ b/var/spack/repos/builtin/packages/inputproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/intel-daal/package.py b/var/spack/repos/builtin/packages/intel-daal/package.py index 64ad89cd5cdebe..f992c40cbafcc4 100644 --- a/var/spack/repos/builtin/packages/intel-daal/package.py +++ b/var/spack/repos/builtin/packages/intel-daal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,101 +21,121 @@ class IntelDaal(IntelPackage): "2020.2.254", sha256="08528bc150dad312ff2ae88ce12d6078ed8ba2f378f4bf3daf0fbbb9657dce1e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16822/l_daal_2020.2.254.tgz", + deprecated=True, ) version( "2020.1.217", sha256="3f84dea0ce1038ac1b9c25b3e2c02e9fac440fa36cc8adfce69edfc06fe0edda", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16536/l_daal_2020.1.217.tgz", + deprecated=True, ) version( "2020.0.166", sha256="695166c9ab32ac5d3006d6d35162db3c98734210507144e315ed7c3b7dbca9c1", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16234/l_daal_2020.0.166.tgz", + deprecated=True, ) version( "2019.5.281", sha256="e92aaedbe35c9daf1c9483260cb2363da8a85fa1aa5566eb38cf4b1f410bc368", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15818/l_daal_2019.5.281.tgz", + deprecated=True, ) version( "2019.4.243", sha256="c74486a555ca5636c2ac1b060d5424726c022468f3ee0898bb46e333cda6f7b8", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15552/l_daal_2019.4.243.tgz", + deprecated=True, ) version( "2019.3.199", sha256="1f7d9cdecc1091b03f1ee6303fc7566179d1e3f1813a98ef7a6239f7d456b8ef", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15277/l_daal_2019.3.199.tgz", + deprecated=True, ) version( "2019.2.187", sha256="2982886347e9376e892a5c4e22fa1d4b7b843e1ae988a107dd2d0a639f257765", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15097/l_daal_2019.2.187.tgz", + deprecated=True, ) version( "2019.1.144", sha256="1672afac568c93e185283cf7e044d511381092ebc95d7204c4dccb83cc493197", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14869/l_daal_2019.1.144.tgz", + deprecated=True, ) version( "2019.0.117", sha256="85ac8e983bc9b9cc635e87cb4ec775ffd3695e44275d20fdaf53c19ed280d69f", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13577/l_daal_2019.0.117.tgz", + deprecated=True, ) version( "2018.3.222", sha256="378fec529a36508dd97529037e1164ff98e0e062a9a47ede99ccf9e91493d1e2", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13007/l_daal_2018.3.222.tgz", + deprecated=True, ) version( "2018.2.199", sha256="cee30299b3ffaea515f5a9609f4df0f644579c8a1ba2b61747b390f6caf85b14", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12727/l_daal_2018.2.199.tgz", + deprecated=True, ) version( "2018.1.163", sha256="ac96b5a6c137cda18817d9b3505975863f8f53347225ebb6ccdaaf4bdb8dc349", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_daal_2018.1.163.tgz", + deprecated=True, ) version( "2018.0.128", sha256="d13a7cd1b6779971f2ba46797447de9409c98a4d2f0eb0dc9622d9d63ac8990f", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12072/l_daal_2018.0.128.tgz", + deprecated=True, ) version( "2017.4.239", sha256="cc4b608f59f3b2fafee16389102a763d27c46f6d136a6cfa89847418a8ea7460", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12148/l_daal_2017.4.239.tgz", + deprecated=True, ) version( "2017.3.196", sha256="cfa863f342dd1c5fe8f1c7b6fd69589140370fc92742a19d82c8594e4e1e46ce", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11546/l_daal_2017.3.196.tgz", + deprecated=True, ) version( "2017.2.174", sha256="5ee838b08d4cda7fc3e006e1deeed41671cbd7cfd11b64ec3b762c94dfc2b660", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11308/l_daal_2017.2.174.tgz", + deprecated=True, ) version( "2017.1.132", sha256="6281105d3947fc2860e67401ea0218198cc4753fd2d4b513528a89143248e4f3", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10983/l_daal_2017.1.132.tgz", + deprecated=True, ) version( "2017.0.098", sha256="a7064425653b4f5f0fe51e25358d267d8ae023179eece61e08da891b67d79fe5", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9664/l_daal_2017.0.098.tgz", + deprecated=True, ) version( "2016.3.210", sha256="367eaef21ea0143c11ae3fd56cd2a05315768c059e14caa15894bcf96853687c", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9099/l_daal_2016.3.210.tgz", + deprecated=True, ) version( "2016.2.181", sha256="afdb65768957784d28ac537b4933a86eb4193c68a636157caed17b29ccdbfacb", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8687/l_daal_2016.2.181.tgz", + deprecated=True, ) provides("daal") diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py index a86292649667d2..afef3bc25f1b67 100644 --- a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py +++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/intel-gtpin/package.py b/var/spack/repos/builtin/packages/intel-gtpin/package.py index 3b99e031123583..77d03e3c99743a 100644 --- a/var/spack/repos/builtin/packages/intel-gtpin/package.py +++ b/var/spack/repos/builtin/packages/intel-gtpin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -36,6 +36,8 @@ class IntelGtpin(Package): maintainers("rashawnlk") + license("MIT") + version( "3.2.2", sha256="6c51b08451935ed8c86778d197e2ff36d4b91883f41292968ff413b53ac8910a", diff --git a/var/spack/repos/builtin/packages/intel-ipp/package.py b/var/spack/repos/builtin/packages/intel-ipp/package.py index 9ee7ea4600ce4c..ef7d4ed83df0cf 100644 --- a/var/spack/repos/builtin/packages/intel-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-ipp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,92 +21,110 @@ class IntelIpp(IntelPackage): "2020.2.254", sha256="18266ad1eec9b5b17e76da24f1aa9a9147300e5bd345e6bdad58d7187392fa77", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16846/l_ipp_2020.2.254.tgz", + deprecated=True, ) version( "2020.1.217", sha256="0bf8ac7e635e7e602cf201063a1a7dea3779b093104563fdb15e6b7ecf2f00a7", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16534/l_ipp_2020.1.217.tgz", + deprecated=True, ) version( "2020.0.166", sha256="6844007892ba524e828f245355cee44e8149f4c233abbbea16f7bb55a7d6ecff", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16233/l_ipp_2020.0.166.tgz", + deprecated=True, ) version( "2019.5.281", sha256="61d1e1da1a4a50f1cf02a3ed44e87eed05e94d58b64ef1e67a3bdec363bee713", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15817/l_ipp_2019.5.281.tgz", + deprecated=True, ) version( "2019.4.243", sha256="d4f4232323e66b010d8440c75189aeb6a3249966e05035242b21982238a7a7f2", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15541/l_ipp_2019.4.243.tgz", + deprecated=True, ) version( "2019.3.199", sha256="02545383206c1ae4dd66bfa6a38e2e14480ba11932eeed632df8ab798aa15ccd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15276/l_ipp_2019.3.199.tgz", + deprecated=True, ) version( "2019.2.187", sha256="280e9081278a0db3892fe82474c1201ec780a6f7c8d1f896494867f4b3bd8421", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15096/l_ipp_2019.2.187.tgz", + deprecated=True, ) version( "2019.1.144", sha256="1eb7cd0fba74615aeafa4e314c645414497eb73f1705200c524fe78f00620db3", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14887/l_ipp_2019.1.144.tgz", + deprecated=True, ) version( "2019.0.117", sha256="d552ba49fba58f0e94da2048176f21c5dfd490dca7c5ce666dfc2d18db7fd551", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13576/l_ipp_2019.0.117.tgz", + deprecated=True, ) version( "2018.4.274", sha256="bdc6082c65410c98ccf6daf239e0a6625d15ec5e0ddc1c0563aad42b6ba9063c", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13726/l_ipp_2018.4.274.tgz", + deprecated=True, ) version( "2018.3.222", sha256="bb783c5e6220e240f19136ae598cd1c1d647496495139ce680de58d3d5496934", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13006/l_ipp_2018.3.222.tgz", + deprecated=True, ) version( "2018.2.199", sha256="55cb5c910b2c1e2bd798163fb5019b992b1259a0692e328bb9054778cf01562b", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12726/l_ipp_2018.2.199.tgz", + deprecated=True, ) version( "2018.0.128", sha256="da568ceec1b7acbcc8f666b73d4092788b037b1b03c0436974b82155056ed166", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12071/l_ipp_2018.0.128.tgz", + deprecated=True, ) version( "2017.3.196", sha256="50d49a1000a88a8a58bd610466e90ae28d07a70993a78cbbf85d44d27c4232b6", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11545/l_ipp_2017.3.196.tgz", + deprecated=True, ) version( "2017.2.174", sha256="92f866c9dce8503d7e04223ec35f281cfeb0b81cf94208c3becb11aacfda7b99", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11307/l_ipp_2017.2.174.tgz", + deprecated=True, ) version( "2017.1.132", sha256="2908bdeab3057d4ebcaa0b8ff5b00eb47425d35961a96f14780be68554d95376", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11031/l_ipp_2017.1.132.tgz", + deprecated=True, ) version( "2017.0.098", sha256="7633d16e2578be64533892336c8a15c905139147b0f74eaf9f281358ad7cdcba", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9663/l_ipp_2017.0.098.tgz", + deprecated=True, ) # built from parallel_studio_xe_2016.3.067 version( "9.0.3.210", sha256="8ce7bf17f4a0bbf8c441063de26be7f6e0f6179789e23f24eaa8b712632b3cdd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9067/l_ipp_9.0.3.210.tgz", + deprecated=True, ) provides("ipp") diff --git a/var/spack/repos/builtin/packages/intel-llvm/package.py b/var/spack/repos/builtin/packages/intel-llvm/package.py index 2338fe2c7f22f4..630e2df9960610 100644 --- a/var/spack/repos/builtin/packages/intel-llvm/package.py +++ b/var/spack/repos/builtin/packages/intel-llvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class IntelLlvm(CMakePackage): family = "compiler" + license("Apache-2.0") + version("sycl", branch="sycl") depends_on("cmake@3.4.3:", type="build") diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index c66235f382dae8..7653d676f10a00 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,118 +23,141 @@ class IntelMkl(IntelPackage): "2020.4.304", sha256="2314d46536974dbd08f2a4e4f9e9a155dc7e79e2798c74e7ddfaad00a5917ea5", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_2020.4.304.tgz", + deprecated=True, ) version( "2020.3.279", sha256="2b8e434ecc9462491130ba25a053927fd1a2eca05e12acb5936b08c486857a04", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_2020.3.279.tgz", + deprecated=True, ) version( "2020.2.254", sha256="ed00a267af362a6c14212bd259ab1673d64337e077263033edeef8ac72c10223", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_2020.2.254.tgz", + deprecated=True, ) version( "2020.1.217", sha256="082a4be30bf4f6998e4d6e3da815a77560a5e66a68e254d161ab96f07086066d", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_2020.1.217.tgz", + deprecated=True, ) version( "2020.0.166", sha256="f6d92deb3ff10b11ba3df26b2c62bb4f0f7ae43e21905a91d553e58f0f5a8ae0", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16232/l_mkl_2020.0.166.tgz", + deprecated=True, ) version( "2019.5.281", sha256="9995ea4469b05360d509c9705e9309dc983c0a10edc2ae3a5384bc837326737e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_2019.5.281.tgz", + deprecated=True, ) version( "2019.4.243", sha256="fcac7b0369665d93f0c4dd98afe2816aeba5410e2b760655fe55fc477f8f33d0", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15540/l_mkl_2019.4.243.tgz", + deprecated=True, ) version( "2019.3.199", sha256="06de2b54f4812e7c39a118536259c942029fe1d6d8918ad9df558a83c4162b8f", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_2019.3.199.tgz", + deprecated=True, ) version( "2019.2.187", sha256="2bf004e6b5adb4f956993d6c20ea6ce289bb630314dd501db7f2dd5b9978ed1d", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15095/l_mkl_2019.2.187.tgz", + deprecated=True, ) version( "2019.1.144", sha256="5205a460a9c685f7a442868367389b2d0c25e1455346bc6a37c5b8ff90a20fbb", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14895/l_mkl_2019.1.144.tgz", + deprecated=True, ) version( "2019.0.117", sha256="4e1fe2c705cfc47050064c0d6c4dee1a8c6740ac1c4f64dde9c7511c4989c7ad", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_2019.0.117.tgz", + deprecated=True, ) version( "2018.4.274", sha256="18eb3cde3e6a61a88f25afff25df762a560013f650aaf363f7d3d516a0d04881", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13725/l_mkl_2018.4.274.tgz", + deprecated=True, ) version( "2018.3.222", sha256="108d59c0927e58ce8c314db6c2b48ee331c3798f7102725f425d6884eb6ed241", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13005/l_mkl_2018.3.222.tgz", + deprecated=True, ) version( "2018.2.199", sha256="e28d12173bef9e615b0ded2f95f59a42b3e9ad0afa713a79f8801da2bfb31936", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12725/l_mkl_2018.2.199.tgz", + deprecated=True, ) version( "2018.1.163", sha256="f6dc263fc6f3c350979740a13de1b1e8745d9ba0d0f067ece503483b9189c2ca", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mkl_2018.1.163.tgz", + deprecated=True, ) version( "2018.0.128", sha256="c368baa40ca88057292512534d7fad59fa24aef06da038ea0248e7cd1e280cec", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12070/l_mkl_2018.0.128.tgz", + deprecated=True, ) version( "2017.4.239", sha256="dcac591ed1e95bd72357fd778edba215a7eab9c6993236373231cc16c200c92a", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12147/l_mkl_2017.4.239.tgz", + deprecated=True, ) version( "2017.3.196", sha256="fd7295870fa164d6138c9818304f25f2bb263c814a6c6539c9fe4e104055f1ca", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11544/l_mkl_2017.3.196.tgz", + deprecated=True, ) version( "2017.2.174", sha256="0b8a3fd6bc254c3c3d9d51acf047468c7f32bf0baff22aa1e064d16d9fea389f", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11306/l_mkl_2017.2.174.tgz", + deprecated=True, ) version( "2017.1.132", sha256="8c6bbeac99326d59ef3afdc2a95308c317067efdaae50240d2f4a61f37622e69", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11024/l_mkl_2017.1.132.tgz", + deprecated=True, ) version( "2017.0.098", sha256="f2233e8e011f461d9c15a853edf7ed0ae8849aa665a1ec765c1ff196fd70c4d9", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9662/l_mkl_2017.0.098.tgz", + deprecated=True, ) # built from parallel_studio_xe_2016.3.x version( "11.3.3.210", sha256="ff858f0951fd698e9fb30147ea25a8a810c57f0126c8457b3b0cdf625ea43372", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9068/l_mkl_11.3.3.210.tgz", + deprecated=True, ) # built from parallel_studio_xe_2016.2.062 version( "11.3.2.181", sha256="bac04a07a1fe2ae4996a67d1439ee90c54f31305e8663d1ccfce043bed84fc27", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8711/l_mkl_11.3.2.181.tgz", + deprecated=True, ) depends_on("cpio", type="build") diff --git a/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py b/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py index ff0371a7c92d7c..764394ea1f9bb7 100644 --- a/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi-benchmarks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,12 @@ class IntelMpiBenchmarks(MakefilePackage): url = "https://github.com/intel/mpi-benchmarks/archive/IMB-v2021.3.tar.gz" maintainers("carsonwoods") + license("BSD-3-Clause") + + version("2021.7", sha256="acee02cc719a74e6853194576cb7e6bf1fdc74f8971578e1b2141306c3c19477") + version("2021.6", sha256="57d1bcc0027f8fc7bffe323ab70cc9d3f1d7482d456c47b4a9e7c4337089bd54") + version("2021.5", sha256="ac144dbfad8759e4956d99569dfcbec25758ba10abfb5ae2d83831660f27be60") + version("2021.4", sha256="786570f0ff46aab01c4e5ecbde72c8051682809b23a04e55554f265b761ddde3") version("2021.3", sha256="9b58a4a7eef7c0c877513152340948402fd87cb06270d2d81308dc2ef740f4c7") version("2021.2", sha256="ade3bfe18b4313a31fc09f0bf038e0a6c169c4145089bfc6f1f827687b81be6a") version("2021.1", sha256="9089bb81e3091af3481e03b898b339fb2d9fb6574d4ef059adb1f5410112b23a") diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py index 070cdbed700ba4..9ea647c77abad8 100644 --- a/var/spack/repos/builtin/packages/intel-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,7 +8,7 @@ @IntelOneApiPackage.update_description class IntelMpi(IntelPackage): - """Intel MPI. This package has been replaced by intel-oneapi-mpi.""" + """Intel MPI. This package has been deprecated. Use intel-oneapi-mpi instead.""" maintainers("rscohn2") @@ -18,107 +18,128 @@ class IntelMpi(IntelPackage): "2019.10.317", sha256="28e1b615e63d2170a99feedc75e3b0c5a7e1a07dcdaf0a4181831b07817a5346", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17534/l_mpi_2019.10.317.tgz", + deprecated=True, ) version( "2019.9.304", sha256="618a5dc2de54306645e6428c5eb7d267b54b11b5a83dfbcad7d0f9e0d90bb2e7", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17263/l_mpi_2019.9.304.tgz", + deprecated=True, ) version( "2019.8.254", sha256="fa163b4b79bd1b7509980c3e7ad81b354fc281a92f9cf2469bf4d323899567c0", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16814/l_mpi_2019.8.254.tgz", + deprecated=True, ) version( "2019.7.217", sha256="90383b0023f84ac003a55d8bb29dbcf0c639f43a25a2d8d8698a16e770ac9c07", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16546/l_mpi_2019.7.217.tgz", + deprecated=True, ) version( "2019.6.166", sha256="119be69f1117c93a9e5e9b8b4643918e55d2a55a78ad9567f77d16cdaf18cd6e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16120/l_mpi_2019.6.166.tgz", + deprecated=True, ) version( "2019.5.281", sha256="9c59da051f1325b221e5bc4d8b689152e85d019f143069fa39e17989306811f4", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15838/l_mpi_2019.5.281.tgz", + deprecated=True, ) version( "2019.4.243", sha256="233a8660b92ecffd89fedd09f408da6ee140f97338c293146c9c080a154c5fcd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15553/l_mpi_2019.4.243.tgz", + deprecated=True, ) version( "2019.3.199", sha256="5304346c863f64de797250eeb14f51c5cfc8212ff20813b124f20e7666286990", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15260/l_mpi_2019.3.199.tgz", + deprecated=True, ) version( "2019.2.187", sha256="6a3305933b5ef9e3f7de969e394c91620f3fa4bb815a4f439577739d04778b20", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15040/l_mpi_2019.2.187.tgz", + deprecated=True, ) version( "2019.1.144", sha256="dac86a5db6b86503313742b17535856a432955604f7103cb4549a9bfc256c3cd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14879/l_mpi_2019.1.144.tgz", + deprecated=True, ) version( "2019.0.117", sha256="dfb403f49c1af61b337aa952b71289c7548c3a79c32c57865eab0ea0f0e1bc08", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13584/l_mpi_2019.0.117.tgz", + deprecated=True, ) version( "2018.4.274", sha256="a1114b3eb4149c2f108964b83cad02150d619e50032059d119ac4ffc9d5dd8e0", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13741/l_mpi_2018.4.274.tgz", + deprecated=True, ) version( "2018.3.222", sha256="5021d14b344fc794e89f146e4d53d70184d7048610895d7a6a1e8ac0cf258999", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13112/l_mpi_2018.3.222.tgz", + deprecated=True, ) version( "2018.2.199", sha256="0927f1bff90d10974433ba2892e3fd38e6fee5232ab056a9f9decf565e814460", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12748/l_mpi_2018.2.199.tgz", + deprecated=True, ) version( "2018.1.163", sha256="130b11571c3f71af00a722fa8641db5a1552ac343d770a8304216d8f5d00e75c", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mpi_2018.1.163.tgz", + deprecated=True, ) version( "2018.0.128", sha256="debaf2cf80df06db9633dfab6aa82213b84a665a55ee2b0178403906b5090209", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12120/l_mpi_2018.0.128.tgz", + deprecated=True, ) version( "2017.4.239", sha256="5a1048d284dce8bc75b45789471c83c94b3c59f8f159cab43d783fc44302510b", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12209/l_mpi_2017.4.239.tgz", + deprecated=True, ) version( "2017.3.196", sha256="dad9efbc5bbd3fd27cce7e1e2507ad77f342d5ecc929747ae141c890e7fb87f0", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11595/l_mpi_2017.3.196.tgz", + deprecated=True, ) version( "2017.2.174", sha256="106a4b362c13ddc6978715e50f5f81c58c1a4c70cd2d20a99e94947b7e733b88", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11334/l_mpi_2017.2.174.tgz", + deprecated=True, ) version( "2017.1.132", sha256="8d30a63674fe05f17b0a908a9f7d54403018bfed2de03c208380b171ab99be82", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11014/l_mpi_2017.1.132.tgz", + deprecated=True, ) # built from parallel_studio_xe_2016.3.068 version( "5.1.3.223", sha256="544f4173b09609beba711fa3ba35567397ff3b8390e4f870a3307f819117dd9b", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9278/l_mpi_p_5.1.3.223.tgz", + deprecated=True, ) provides("mpi") diff --git a/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py b/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py index fe2b7f34387c26..6b1c114cac76fc 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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 @@ -24,6 +24,18 @@ class IntelOneapiAdvisor(IntelOneApiPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/advisor.html" ) + version( + "2024.0.1", + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d6b30ed-c7ea-4ad1-b138-91614f8242e8/l_oneapi_advisor_p_2024.0.1.17_offline.sh", + sha256="3b34ff2b13737c7e0b7b97ee9544cf0718feab80f2a8e7728e4149e66d09a14a", + expand=False, + ) + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/88c5bdaa-7a2d-491f-9871-7170fadc3d52/l_oneapi_advisor_p_2024.0.0.49522_offline.sh", + sha256="0ef3cf39c2fbb39371ac2470dad7d0d8cc0a2709c4f78dcab58d115b446c81c4", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/0b0e8bf2-30e4-4a26-b1ef-e369b0181b35/l_oneapi_advisor_p_2023.2.0.49489_offline.sh", @@ -73,6 +85,10 @@ class IntelOneapiAdvisor(IntelOneApiPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "advisor" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py index 2d300a55ff63ef..a8f9aac4f6ba17 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,24 @@ class IntelOneapiCcl(IntelOneApiLibraryPackage): depends_on("intel-oneapi-mpi") + version( + "2021.11.2", + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7a2bbe23-9cf2-47a3-945f-fc160b9d868a/l_oneapi_ccl_p_2021.11.2.7_offline.sh", + sha256="095be44ae21348ead46008844667a30da92a0afac305f722777c345394e50a14", + expand=False, + ) + version( + "2021.11.1", + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/07958f2f-8d95-422d-8c18-a4c7352b005c/l_oneapi_ccl_p_2021.11.1.9_offline.sh", + sha256="35817d40f57c0d35b9bacf3935cedc1c82fc8d809513d82580561f63f31cac17", + expand=False, + ) + version( + "2021.11.0", + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/9e63eba5-2b3d-4032-ad22-21f02e35b518/l_oneapi_ccl_p_2021.11.0.49161_offline.sh", + sha256="35fde9862d620c211064addfd3c15c4fc33bcaac6fe050163eb59a006fb9d476", + expand=False, + ) version( "2021.10.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3230823d-f799-4d1f-8ef3-a17f086a7719/l_oneapi_ccl_p_2021.10.0.49084_offline.sh", @@ -100,6 +118,10 @@ class IntelOneapiCcl(IntelOneApiLibraryPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2021.11:" + @property def component_dir(self): return "ccl" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py index 4fca5381e6f7ef..d5c409f7346c84 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -36,8 +36,10 @@ class IntelOneapiCompilersClassic(Package): "2021.8.0": "2023.0.0", "2021.9.0": "2023.1.0", "2021.10.0": "2023.2.0", + "2021.11.1": "2024.0.2", }.items(): - version(ver) + # prefer 2021.10.0 because it is the last one that has a C compiler + version(ver, preferred=(ver == "2021.10.0")) depends_on("intel-oneapi-compilers@" + oneapi_ver, when="@" + ver, type="run") # icc@2021.6.0 does not support gcc@12 headers diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py index 84b65a576181e0..de9cd5ac60cb2e 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py @@ -1,12 +1,58 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os + from spack.build_environment import dso_suffix from spack.package import * versions = [ + { + "version": "2024.0.2", + "cpp": { + "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/bb99984f-370f-413d-bbec-38928d2458f2/l_dpcpp-cpp-compiler_p_2024.0.2.29_offline.sh", + "sha256": "0ec22d69f4207fea4b7488d1c9e62adbc14fb6daa1574d6edcadc912da007b3c", + }, + "ftn": { + "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/41df6814-ec4b-4698-a14d-421ee2b02aa7/l_fortran-compiler_p_2024.0.2.28_offline.sh", + "sha256": "396ac4fbcb3799d5c1a866a60cf81f85f7cab8c6f35289f61c5cda63c7101b5e", + }, + }, + { + "version": "2024.0.1", + "cpp": { + "url": "https://registrationcenter-download.intel.com/akdlm//IRC_NAS/c68c8f0a-47f5-4f26-8e8e-fa2627271279/l_dpcpp-cpp-compiler_p_2024.0.1.29_offline.sh", + "sha256": "22497c46bfb916c82677489775c113141510423799b7eca35f35dffeb2a14104", + }, + "ftn": { + "url": "https://registrationcenter-download.intel.com/akdlm//IRC_NAS/4eedf77e-e097-40de-b62d-5fb70efecb59/l_fortran-compiler_p_2024.0.1.31_offline.sh", + "sha256": "9d49ecc1862c60eb0627bfdd80d63a47118095af0ff5adeeda10ec36aaffc82c", + }, + }, + { + "version": "2024.0.0", + "cpp": { + "url": "https://registrationcenter-download.intel.com/akdlm//IRC_NAS/5c8e686a-16a7-4866-b585-9cf09e97ef36/l_dpcpp-cpp-compiler_p_2024.0.0.49524_offline.sh", + "sha256": "d10bad2009c98c631fbb834aae62012548daeefc806265ea567316cd9180a684", + }, + "ftn": { + "url": "https://registrationcenter-download.intel.com/akdlm//IRC_NAS/89b0fcf9-5c00-448a-93a1-5ee4078e008e/l_fortran-compiler_p_2024.0.0.49493_offline.sh", + "sha256": "57faf854b8388547ee4ef2db387a9f6f3b4d0cebd67b765cf5e844a0a970d1f9", + }, + }, + { + "version": "2023.2.3", + "cpp": { + "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d85fbeee-44ec-480a-ba2f-13831bac75f7/l_dpcpp-cpp-compiler_p_2023.2.3.12_offline.sh", + "sha256": "b80119a3e54306b85198e907589b00b11c072f107ac39c1686a1996f76466b26", + }, + "ftn": { + "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0ceccee5-353c-4fd2-a0cc-0aecb7492f87/l_fortran-compiler_p_2023.2.3.13_offline.sh", + "sha256": "ef8d95b7165d42da8576bf89a100bd21be7253d0aec039ff76c9213fa2aa9c62", + }, + }, { "version": "2023.2.1", "cpp": { @@ -174,21 +220,38 @@ class IntelOneapiCompilers(IntelOneApiPackage): for v in versions: version(v["version"], expand=False, **v["cpp"]) - resource( - name="fortran-installer", - placement="fortran-installer", - when="@{0}".format(v["version"]), - expand=False, - **v["ftn"], - ) + if "ftn" in v: + resource( + name="fortran-installer", + placement="fortran-installer", + when="@{0}".format(v["version"]), + expand=False, + **v["ftn"], + ) + + @property + def v2_layout_versions(self): + return "@2024:" @property def component_dir(self): return "compiler" + @property + def _llvm_bin(self): + return self.component_prefix.bin if self.v2_layout else self.component_prefix.linux.bin + + @property + def _classic_bin(self): + return ( + self.component_prefix.bin + if self.v2_layout + else self.component_prefix.linux.bin.intel64 + ) + @property def compiler_search_prefix(self): - return self.prefix.compiler.join(str(self.version)).linux.bin + return self._llvm_bin def setup_run_environment(self, env): """Adds environment variables to the generated module file. @@ -203,29 +266,47 @@ def setup_run_environment(self, env): """ super().setup_run_environment(env) - env.set("CC", self.component_prefix.linux.bin.icx) - env.set("CXX", self.component_prefix.linux.bin.icpx) - env.set("F77", self.component_prefix.linux.bin.ifx) - env.set("FC", self.component_prefix.linux.bin.ifx) + env.set("CC", self._llvm_bin.icx) + env.set("CXX", self._llvm_bin.icpx) + env.set("F77", self._llvm_bin.ifx) + env.set("FC", self._llvm_bin.ifx) def install(self, spec, prefix): # Copy instead of install to speed up debugging # install_tree("/opt/intel/oneapi/compiler", self.prefix) + # return # install cpp super().install(spec, prefix) # install fortran - self.install_component(find("fortran-installer", "*")[0]) + ftn = find("fortran-installer", "*") + if ftn: + self.install_component(ftn[0]) - # Some installers have a bug and do not return an error code when failing - if not is_exe(self.component_prefix.linux.bin.intel64.ifort): - raise RuntimeError("install failed") + # Some installers have a bug and do not return an error code when failing + if not is_exe(self._llvm_bin.ifx): + raise RuntimeError("Fortran install failed") @run_after("install") def inject_rpaths(self): - # Sets rpath so the compilers can work without setting LD_LIBRARY_PATH. + # The oneapi compilers cannot find their own internal shared + # libraries. If you are using an externally installed oneapi, + # then you need to source setvars.sh, which will set + # LD_LIBRARY_PATH. If you are using spack to install the + # compilers, then we patch the binaries that have this + # problem. Over time, intel has corrected most of the + # issues. I am using the 2024 release as a milestone to stop + # patching everything and just patching the binaries that have + # a problem. patchelf = which("patchelf") + if self.spec.satisfies("@2024:"): + patchelf.add_default_arg("--set-rpath", self.component_prefix.lib) + patchelf(self.component_prefix.bin.join("sycl-post-link")) + patchelf(self.component_prefix.bin.compiler.join("llvm-spirv")) + return + + # Sets rpath so the compilers can work without setting LD_LIBRARY_PATH. patchelf.add_default_arg("--set-rpath", ":".join(self._ld_library_path())) for pd in ["bin", "lib", join_path("compiler", "lib", "intel64_lin")]: for file in find(self.component_prefix.linux.join(pd), "*", recursive=False): @@ -235,10 +316,14 @@ def inject_rpaths(self): def write_config_file(self, flags, path, compilers): for compiler in compilers: - p = path.join(compiler + ".cfg") - with open(p, "w") as f: - f.write(" ".join(flags)) - set_install_permissions(p) + # Tolerate missing compilers. + # Initially, we installed icx/ifx/icc/ifort into a single prefix. + # Starting in 2024, there is no icc. 2023.2.3 does not have an ifx. + if os.path.exists(compiler): + p = path.join(compiler + ".cfg") + with open(p, "w") as f: + f.write(" ".join(flags)) + set_install_permissions(p) @run_after("install") def extend_config_flags(self): @@ -254,7 +339,10 @@ def extend_config_flags(self): # TODO: it is unclear whether we should really use all elements of # _ld_library_path because it looks like the only rpath that needs to be # injected is self.component_prefix.linux.compiler.lib.intel64_lin. - common_flags = ["-Wl,-rpath,{}".format(d) for d in self._ld_library_path()] + if self.v2_layout: + common_flags = ["-Wl,-rpath,{}".format(self.component_prefix.lib)] + else: + common_flags = ["-Wl,-rpath,{}".format(d) for d in self._ld_library_path()] # Make sure that underlying clang gets the right GCC toolchain by default llvm_flags = ["--gcc-toolchain={}".format(self.compiler.prefix)] @@ -266,20 +354,13 @@ def extend_config_flags(self): # The cfg flags are treated as command line flags apparently. Newer versions # do not trigger these warnings. In some build systems these warnings can # cause feature detection to fail, so we silence them with -Wno-unused-... - if self.spec.version < Version("2022.1.0"): + if self.spec.satisfies("@:2022.0"): llvm_flags.append("-Wno-unused-command-line-argument") - self.write_config_file( - common_flags + llvm_flags, self.component_prefix.linux.bin, ["icx", "icpx"] - ) - self.write_config_file( - common_flags + classic_flags, self.component_prefix.linux.bin, ["ifx"] - ) - self.write_config_file( - common_flags + classic_flags, - self.component_prefix.linux.bin.intel64, - ["icc", "icpc", "ifort"], - ) + self.write_config_file(common_flags + llvm_flags, self._llvm_bin, ["icx", "icpx"]) + self.write_config_file(common_flags + classic_flags, self._llvm_bin, ["ifx"]) + self.write_config_file(common_flags + classic_flags, self._classic_bin, ["ifort"]) + self.write_config_file(common_flags + classic_flags, self._classic_bin, ["icc", "icpc"]) def _ld_library_path(self): # Returns an iterable of directories that might contain shared runtime libraries diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py index 29984f04381c80..1c509113d07ce6 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,12 @@ class IntelOneapiDal(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onedal.html" ) + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/37364086-b3cd-4a54-8736-7893732c1a86/l_daal_oneapi_p_2024.0.0.49569_offline.sh", + sha256="45e71c7cbf38b04a34c47e36e2d86a48847f2f0485bafbc3445077a9ba3fa73c", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/fa218373-4b06-451f-8f4c-66b7d14b8e8b/l_daal_oneapi_p_2023.2.0.49574_offline.sh", @@ -104,6 +110,10 @@ class IntelOneapiDal(IntelOneApiLibraryPackage): provides("daal") provides("onedal") + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "dal" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py index 0c8a0aeb76f513..81764743dcbf0c 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,12 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onednn.html" ) + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/dc309221-d210-4f3a-9406-d897df8deab8/l_onednn_p_2024.0.0.49548_offline.sh", + sha256="17fbd5cc5d08de33625cf2879c0cceec53c91bbcd0b863e8f29d27885bac88c9", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d218b97-0175-4f8c-8dba-b528cec24d55/l_onednn_p_2023.2.0.49517_offline.sh", @@ -101,16 +107,25 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage): depends_on("tbb") + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "dnnl" + def __target(self): + if self.v2_layout: + return self.component_prefix + else: + return self.component_prefix.cpu_dpcpp_gpu_dpcpp + @property def headers(self): - include_path = join_path(self.component_prefix, "cpu_dpcpp_gpu_dpcpp", "include") - return find_headers("dnnl", include_path) + return find_headers("dnnl", self.__target().include) @property def libs(self): - lib_path = join_path(self.component_prefix, "cpu_dpcpp_gpu_dpcpp", "lib") - return find_libraries(["libdnnl", "libmkldnn"], root=lib_path, shared=True) + # libmkldnn was removed before 2024, but not sure when + return find_libraries(["libdnnl", "libmkldnn"], self.__target().lib) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dpct/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dpct/package.py index 3c4fa410f598bb..ac1dee0736c743 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dpct/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dpct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,12 @@ class IntelOneapiDpct(IntelOneApiPackage): homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compatibility-tool.html#gs.2p8km6" + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/6633bc4b-5356-471a-9aae-d5e63e7acd95/l_dpcpp-ct_p_2024.0.0.49394_offline.sh", + sha256="5fdba92edf24084187d98f083f9a6e17ee6b33ad8a736d6c9cdd3dbd4e0eab8a", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/764119eb-2959-4b51-bb3c-3cf581c16186/l_dpcpp-ct_p_2023.2.0.49333_offline.sh", @@ -56,6 +62,10 @@ class IntelOneapiDpct(IntelOneApiPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "dpcpp-ct" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py index 05282f92f4c4b4..42b778222c18a2 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,12 @@ class IntelOneapiDpl(IntelOneApiLibraryPackage): homepage = "https://github.com/oneapi-src/oneDPL" + version( + "2022.3.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/be027095-148a-4433-aff4-c6e8582da3ca/l_oneDPL_p_2022.3.0.49386_offline.sh", + sha256="1e40c6562bc41fa5a46c80c09222bf12d36d8e82f749476d0a7e97503d4659df", + expand=False, + ) version( "2022.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/44f88a97-7526-48f0-8515-9bf1356eb7bb/l_oneDPL_p_2022.2.0.49287_offline.sh", @@ -77,16 +83,16 @@ class IntelOneapiDpl(IntelOneApiLibraryPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2022.3:" + @property def component_dir(self): return "dpl" @property def headers(self): - include_path = join_path(self.component_prefix, "linux", "include") - headers = find_headers("*", include_path, recursive=True) - # Force this directory to be added to include path, even - # though no files are here because all includes are relative - # to this path - headers.directories = [include_path] - return headers + return self.header_directories( + [self.component_prefix.include, self.component_prefix.linux.include] + ) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py b/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py index 0c1e0f79abaf31..457afb84302384 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-inspector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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, @@ -24,6 +24,12 @@ class IntelOneapiInspector(IntelOneApiPackage): homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/inspector.html" + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/44ae6846-719c-49bd-b196-b16ce5835a1e/l_inspector_oneapi_p_2024.0.0.49433_offline.sh", + sha256="2b281c3a704a242aa3372284960ea8ed5ed1ba293cc2f70c2f873db3300c80a3", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/2a99eafd-5109-41a1-9762-aee0c7ecbeb7/l_inspector_oneapi_p_2023.2.0.49304_offline.sh", @@ -79,6 +85,10 @@ class IntelOneapiInspector(IntelOneApiPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "inspector" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py index c29fb423b21a2f..923e19301fce78 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ipp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,12 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" ) + version( + "2021.10.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/2d48c7d9-e716-4c73-8fe5-77a9599a405f/l_ipp_oneapi_p_2021.10.0.670_offline.sh", + sha256="c4ad98f96760b0a821dbcd59963c5148fd9dc4eb790af0e6e765a5f36525d202", + expand=False, + ) version( "2021.9.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/616a3fba-4ab6-4317-a17b-2be4b737fc37/l_ipp_oneapi_p_2021.9.0.49454_offline.sh", @@ -104,6 +110,10 @@ class IntelOneapiIpp(IntelOneApiLibraryPackage): provides("ipp") + @property + def v2_layout_versions(self): + return "@2021.10:" + @property def component_dir(self): return "ipp" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py b/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py index 4d0d6fe3c20733..6e8bb450784991 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-ippcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,12 @@ class IntelOneapiIppcp(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/ipp.html" ) + version( + "2021.9.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/6792a758-2d69-4ff3-ad24-233fb3bf56e4/l_ippcp_oneapi_p_2021.9.0.533_offline.sh", + sha256="5eca6fd18d9117f8cb7c599cee418b9cc3d7d5d5404f1350d47289095b6a1254", + expand=False, + ) version( "2021.8.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/f488397a-bd8f-449f-9127-04de8426aa35/l_ippcp_oneapi_p_2021.8.0.49493_offline.sh", @@ -101,6 +107,10 @@ class IntelOneapiIppcp(IntelOneApiLibraryPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2021.9:" + @property def component_dir(self): return "ippcp" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-itac/package.py b/var/spack/repos/builtin/packages/intel-oneapi-itac/package.py index 3b53af927348de..c24c6029818a62 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-itac/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-itac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,12 @@ class IntelOneapiItac(IntelOneApiPackage): maintainers("rscohn2") + version( + "2022.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/e83526f5-7e0f-4708-9e0d-47f1e65f29aa/l_itac_oneapi_p_2022.0.0.49690_offline.sh", + sha256="6ab2888afcfc981273aed3df316463fbaf511faf83ee091ca79016459b03b79e", + expand=False, + ) version( "2021.10.0", url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/226adf12-b7f6-407e-95a9-8e9ab76d7631/l_itac_oneapi_p_2021.10.0.14_offline.sh", @@ -58,6 +64,10 @@ class IntelOneapiItac(IntelOneApiPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2022:" + @property def component_dir(self): return "itac" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py index db3fdd6d7ea8c0..3bf6dfd2257068 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,12 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onemkl.html" ) + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/86d6a4c1-c998-4c6b-9fff-ca004e9f7455/l_onemkl_p_2024.0.0.49673_offline.sh", + sha256="2a3be7d01d75ba8cc3059f9a32ae72e5bfc93e68e72e94e79d7fa6ea2f7814de", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/adb8a02c-4ee7-4882-97d6-a524150da358/l_onemkl_p_2023.2.0.49497_offline.sh", @@ -128,13 +134,27 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage): provides("mkl") provides("lapack", "blas") + @run_after("install") + def fixup_installation(self): + # fixup missing path in mkl cmake files. This issue was new in + # 2024.0.0 and expected to be fixed in the next release. + if self.spec.satisfies("@2024.0.0"): + # cannot use spack patch because this is applied to the + # installed mkl, not sources + filter_file( + 'PATH_SUFFIXES "lib"', + 'PATH_SUFFIXES "lib" "../../compiler/latest/lib"', + self.component_prefix.lib.cmake.mkl.join("MKLConfig.cmake"), + backup=False, + ) + @property - def component_dir(self): - return "mkl" + def v2_layout_versions(self): + return "@2024:" @property - def headers(self): - return find_headers("*", self.component_prefix.include) + def component_dir(self): + return "mkl" @property def libs(self): @@ -152,10 +172,14 @@ def setup_dependent_build_environment(self, env, dependent_spec): # Only if environment modifications are desired (default is +envmods) if self.spec.satisfies("+envmods"): env.set("MKLROOT", self.component_prefix) + # 2023.1.0 has the pkgconfig files in lib/pkgconfig, 2021.3.0 has them in + # tools/pkgconfig, just including both in PKG_CONFIG_PATH env.append_path("PKG_CONFIG_PATH", self.component_prefix.lib.pkgconfig) + env.append_path("PKG_CONFIG_PATH", self.component_prefix.tools.pkgconfig) def _find_mkl_libs(self, shared): libs = [] + threading_libs = [] if self.spec.satisfies("+cluster"): libs.extend([self._xlp64_lib("libmkl_scalapack"), "libmkl_cdft_core"]) @@ -168,6 +192,12 @@ def _find_mkl_libs(self, shared): libs.append("libmkl_intel_thread") else: libs.append("libmkl_gnu_thread") + + # this is slightly different than what link-line advisor suggests. + # here it uses what the compiler suggests to use to enable openmp, + # instead of being explicit about in which path openmp libraries + # are located (e.g. intel libiomp5, gcc libgomp, clang libomp). + threading_libs += [self.compiler.openmp_flag] else: libs.append("libmkl_sequential") @@ -198,10 +228,15 @@ def _find_mkl_libs(self, shared): ) ) - lib_path = self.component_prefix.lib.intel64 + lib_path = ( + self.component_prefix.lib if self.v2_layout else self.component_prefix.lib.intel64 + ) lib_path = lib_path if isdir(lib_path) else dirname(lib_path) + # resolved_libs is populated as follows + # MKL-related + MPI-related + threading-related resolved_libs = find_libraries(libs, lib_path, shared=shared) + # Add MPI libraries for cluster support. If MPI is not in the # spec, then MKL is externally installed and application must # link with MPI libaries. If MPI is in spec, but there are no @@ -212,6 +247,9 @@ def _find_mkl_libs(self, shared): resolved_libs = resolved_libs + self.spec["mpi"].libs except spack.error.NoLibrariesError: pass + + resolved_libs += threading_libs + return resolved_libs def _xlp64_lib(self, lib): @@ -219,5 +257,11 @@ def _xlp64_lib(self, lib): @run_after("install") def fixup_prefix(self): + # The motivation was to provide a more standard layout so mkl + # would be more likely to work as a virtual dependence. I am + # not sure if this mechanism is useful and it became a problem + # for mpi so disabling for v2_layout. + if self.v2_layout: + return self.symlink_dir(self.component_prefix.include, self.prefix.include) self.symlink_dir(self.component_prefix.lib, self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index fab6c8ca1f466b..ab3c438bdf18c9 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,12 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/mpi-library.html" + version( + "2021.11.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/2c45ede0-623c-4c8e-9e09-bed27d70fa33/l_mpi_oneapi_p_2021.11.0.49513_offline.sh", + sha256="9a96caeb7abcf5aa08426216db38a2c7936462008b9825036266bc79cb0e30d8", + expand=False, + ) version( "2021.10.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/4f5871da-0533-4f62-b563-905edfb2e9b7/l_mpi_oneapi_p_2021.10.0.49374_offline.sh", @@ -107,6 +113,14 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): provides("mpi@:3.1") + @property + def mpiexec(self): + return self.component_prefix.bin.mpiexec + + @property + def v2_layout_versions(self): + return "@2021.11:" + @property def component_dir(self): return "mpi" @@ -155,10 +169,9 @@ def setup_dependent_build_environment(self, env, dependent_spec): @property def headers(self): - headers = find_headers("*", self.component_prefix.include) - if "+ilp64" in self.spec: - headers += find_headers("*", self.component_prefix.include.ilp64) - return headers + return self.header_directories( + [self.component_prefix.include, self.component_prefix.include.ilp64] + ) @property def libs(self): @@ -192,6 +205,13 @@ def fix_wrappers(self): @run_after("install") def fixup_prefix(self): + # The motivation was to provide a more standard layout so impi + # would be more likely to work as a virtual dependence. It + # does not work for v2_layout because of a library conflict. I + # am not sure if this mechanism is useful so disabling for + # v2_layout rather than try to make it work. + if self.v2_layout: + return self.symlink_dir(self.component_prefix.include, self.prefix.include) self.symlink_dir(self.component_prefix.lib, self.prefix.lib) self.symlink_dir(self.component_prefix.lib.release, self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py index 6e169cbd84fe56..dba598f34226b1 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-tbb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,12 @@ class IntelOneapiTbb(IntelOneApiLibraryPackage): "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onetbb.html" ) + version( + "2021.11.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/af3ad519-4c87-4534-87cb-5c7bda12754e/l_tbb_oneapi_p_2021.11.0.49527_offline.sh", + sha256="dd878ee979d7b6da4eb973adfebf814d9d7eed86b875d31e3662d100b2fa0956", + expand=False, + ) version( "2021.10.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c95cd995-586b-4688-b7e8-2d4485a1b5bf/l_tbb_oneapi_p_2021.10.0.49543_offline.sh", @@ -101,7 +107,17 @@ class IntelOneapiTbb(IntelOneApiLibraryPackage): def component_dir(self): return "tbb" + @property + def v2_layout_versions(self): + return "@2021.11:" + @run_after("install") def fixup_prefix(self): + # The motivation was to provide a more standard layout so tbb + # would be more likely to work as a virtual dependence. I am + # not sure if this mechanism is useful and it became a problem + # for mpi so disabling for v2_layout. + if self.v2_layout: + return self.symlink_dir(self.component_prefix.include, self.prefix.include) self.symlink_dir(self.component_prefix.lib, self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py index 18d93b6afc0344..ebee643db88471 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-vpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -74,6 +74,12 @@ class IntelOneapiVpl(IntelOneApiLibraryPackage): expand=False, ) + # VPL no longer releases as part of oneapi, so there will never be + # a 2024 release + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "vpl" diff --git a/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py b/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py index c2ed3f164e42af..55c4aa45b135ae 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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 @@ -25,6 +25,18 @@ class IntelOneapiVtune(IntelOneApiPackage): homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/vtune-profiler.html" + version( + "2024.0.1", + url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/56d0db2b-1ff1-4abe-857a-72ca9be22bd3/l_oneapi_vtune_p_2024.0.1.14_offline.sh", + sha256="2c9b28ed91562deeea211b341cb257cc55051ac29c064b9cf65b4517b958724d", + expand=False, + ) + version( + "2024.0.0", + url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/1722cc83-ceb2-4304-b4dc-2813780222a3/l_oneapi_vtune_p_2024.0.0.49503_offline.sh", + sha256="09537329bdf6e105b0e164f75dc8ae122adc99a64441f6a52225509bcff3b848", + expand=False, + ) version( "2023.2.0", url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/dfae6f23-6c90-4b9f-80e2-fa2a5037fe36/l_oneapi_vtune_p_2023.2.0.49485_offline.sh", @@ -80,6 +92,10 @@ class IntelOneapiVtune(IntelOneApiPackage): expand=False, ) + @property + def v2_layout_versions(self): + return "@2024:" + @property def component_dir(self): return "vtune" diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 50e7021de85d41..20830ea23add9e 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,156 +32,186 @@ class IntelParallelStudio(IntelPackage): "cluster.2020.4", sha256="f36e49da97b6ce24d2d464d73d7ff49d71cff20e1698c20e607919819602a9f5", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17113/parallel_studio_xe_2020_update4_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2020.2", sha256="4795c44374e8988b91da20ac8f13022d7d773461def4a26ca210a8694f69f133", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16744/parallel_studio_xe_2020_update2_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2020.1", sha256="fd11d8de72b2bd60474f8bce7b463e4cbb2255969b9eaf24f689575aa2a2abab", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16526/parallel_studio_xe_2020_update1_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2020.0", sha256="573b1d20707d68ce85b70934cfad15b5ad9cc14124a261c17ddd7717ba842c64", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16225/parallel_studio_xe_2020_cluster_edition.tgz", + deprecated=True, ) # version( "cluster.2019.5", sha256="c03421de616bd4e640ed25ce4103ec9c5c85768a940a5cb5bd1e97b45be33904", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15809/parallel_studio_xe_2019_update5_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2019.4", sha256="32aee12de3b5ca14caf7578313c06b205795c67620f4a9606ea45696ee3b3d9e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15533/parallel_studio_xe_2019_update4_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2019.3", sha256="b5b022366d6d1a98dbb63b60221c62bc951c9819653ad6f5142192e89f78cf63", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15268/parallel_studio_xe_2019_update3_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2019.2", sha256="8c526bdd95d1da454e5cada00f7a2353089b86d0c9df2088ca7f842fe3ff4cae", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15088/parallel_studio_xe_2019_update2_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2019.1", sha256="3a1eb39f15615f7a2688426b9835e5e841e0c030f21dcfc899fe23e09bd2c645", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14850/parallel_studio_xe_2019_update1_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2019.0", sha256="1096dd4139bdd4b3abbda69a17d1e229a606759f793f5b0ba0d39623928ee4a1", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13589/parallel_studio_xe_2019_cluster_edition.tgz", + deprecated=True, ) # version( "cluster.2018.4", sha256="210a5904a860e11b861720e68416f91fd47a459e4500976853291fa8b0478566", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13717/parallel_studio_xe_2018_update4_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2018.3", sha256="23c64b88cea5056eaeef7b4ae0f4c6a86485c97f5e41d6c8419cb00aa4929287", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12998/parallel_studio_xe_2018_update3_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2018.2", sha256="550bc4758f7dd70e75830d329947532ad8b7cbb85225b8ec6db7e78a3f1d6d84", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12717/parallel_studio_xe_2018_update2_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2018.1", sha256="f7a94e83248d2641eb7ae2c1abf681067203a5b4372619e039861b468744774c", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12374/parallel_studio_xe_2018_update1_cluster_edition.tgz", + deprecated=True, ) version( "cluster.2018.0", sha256="526e5e71c420dc9b557b0bae2a81abb33eedb9b6a28ac94996ccbcf71cf53774", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12058/parallel_studio_xe_2018_cluster_edition.tgz", + deprecated=True, ) # version( "cluster.2017.7", sha256="133c3aa99841a4fe48149938a90f971467452a82f033be10cd9464ba810f6360", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12856/parallel_studio_xe_2017_update7.tgz", + deprecated=True, ) version( "cluster.2017.6", sha256="d771b00d3658934c424f294170125dc58ae9b03639aa898a2f115d7a7482dd3a", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12534/parallel_studio_xe_2017_update6.tgz", + deprecated=True, ) version( "cluster.2017.5", sha256="36e496d1d1d7d7168cc3ba8f5bca9b52022339f30b62a87ed064b77a5cbccc09", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz", + deprecated=True, ) version( "cluster.2017.4", sha256="27d34625adfc635d767c136b5417a372f322fabe6701b651d858a8fe06d07f2d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz", + deprecated=True, ) version( "cluster.2017.3", sha256="856950c0493de3e8b4150e18f8821675c1cf75c2eea5ff0804f59eb301414bbe", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz", + deprecated=True, ) version( "cluster.2017.2", sha256="83a655f0c2969409758488d70d6719fb5ea81a84b6da3feb641ce67bb240bc8a", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz", + deprecated=True, ) version( "cluster.2017.1", sha256="c808be744c98f7471c61258144859e8e8fc92771934281a16135803e941fd9b0", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz", + deprecated=True, ) version( "cluster.2017.0", sha256="f380a56a25cf17941eb691a640035e79f92516346500e0df80fbdd46c5c1b301", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz", + deprecated=True, ) # version( "cluster.2016.4", sha256="ea43c150ed6f9967bc781fe4253169a0447c69bac4fe2c563016a1ad2875ae23", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz", + deprecated=True, ) version( "cluster.2016.3", sha256="aa7c6f1a6603fae07c2b01409c12de0811aa5947eaa71dfb1fe9898076c2773e", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz", + deprecated=True, ) version( "cluster.2016.2", sha256="280bf39c75d7f52f206759ca4d8b6334ab92d5970957b90f5aa286bb0aa8d65e", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz", + deprecated=True, ) version( "cluster.2016.1", sha256="f5a3ab9fb581e19bf1bd966f7d40a11905e002a2bfae1c4a2140544288ca3e48", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8365/parallel_studio_xe_2016_update1.tgz", + deprecated=True, ) version( "cluster.2016.0", sha256="fd4c32352fd78fc919601bedac5658ad5ac48efbc5700d9a8d42ed7d53bd8bb7", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/7997/parallel_studio_xe_2016.tgz", + deprecated=True, ) # version( "cluster.2015.6", sha256="e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz", + deprecated=True, ) version( "cluster.2015.1", sha256="84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4992/parallel_studio_xe_2015_update1.tgz", + deprecated=True, ) # Professional Edition (middle tier; excluded: MPI/TAC/Cluster Checker) @@ -193,156 +223,186 @@ class IntelParallelStudio(IntelPackage): "professional.2020.4", sha256="f9679a40c63575191385837f4f1bdafbcfd3736f09ac51d0761248b9ca9cc9e6", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17114/parallel_studio_xe_2020_update4_professional_edition.tgz", + deprecated=True, ) version( "professional.2020.2", sha256="96f9bca551a43e09d9648e8cba357739a759423adb671d1aa5973b7a930370c5", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16756/parallel_studio_xe_2020_update2_professional_edition.tgz", + deprecated=True, ) version( "professional.2020.1", sha256="5b547be92ecf50cb338b3038a565f5609135b27aa98a8b7964879eb2331eb29a", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16527/parallel_studio_xe_2020_update1_professional_edition.tgz", + deprecated=True, ) version( "professional.2020.0", sha256="e88cad18d28da50ed9cb87b12adccf13efd91bf94731dc33290481306c6f15ac", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16226/parallel_studio_xe_2020_professional_edition.tgz", + deprecated=True, ) # version( "professional.2019.5", sha256="0ec638330214539361f8632e20759f385a5a78013dcc980ee93743d86d354452", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15810/parallel_studio_xe_2019_update5_professional_edition.tgz", + deprecated=True, ) version( "professional.2019.4", sha256="9b2818ea5739ade100841e99ce79ef7f4049a2513beb2ce20fc94706f1ba0231", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15534/parallel_studio_xe_2019_update4_professional_edition.tgz", + deprecated=True, ) version( "professional.2019.3", sha256="92a8879106d0bdf1ecf4670cd97fbcdc67d78b13bdf484f2c516a533aa7a27f9", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15269/parallel_studio_xe_2019_update3_professional_edition.tgz", + deprecated=True, ) version( "professional.2019.2", sha256="cdb629d74612d135ca197f1f64e6a081e31df68cda92346a29e1223bb06e64ea", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15089/parallel_studio_xe_2019_update2_professional_edition.tgz", + deprecated=True, ) version( "professional.2019.1", sha256="bc83ef5a728903359ae11a2b90ad7dae4ae61194afb28bb5bb419f6a6aea225d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14825/parallel_studio_xe_2019_update1_professional_edition.tgz", + deprecated=True, ) version( "professional.2019.0", sha256="94b9714e353e5c4f58d38cb236e2f8911cbef31c4b42a148d60c988e926411e2", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13578/parallel_studio_xe_2019_professional_edition.tgz", + deprecated=True, ) # version( "professional.2018.4", sha256="54ab4320da849108602096fa7a34aa21751068467e0d1584aa8f16352b77d323", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13718/parallel_studio_xe_2018_update4_professional_edition.tgz", + deprecated=True, ) version( "professional.2018.3", sha256="3d8e72ccad31f243e43b72a925ad4a6908e2955682433898640ab783decf9960", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12999/parallel_studio_xe_2018_update3_professional_edition.tgz", + deprecated=True, ) version( "professional.2018.2", sha256="fc577b29fb2c687441d4faea14a6fb6da529fc78fcb778cbface59f40e128e02", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12718/parallel_studio_xe_2018_update2_professional_edition.tgz", + deprecated=True, ) version( "professional.2018.1", sha256="dd3e118069d87eebb614336732323b48172c8c8a653cde673a8ef02f7358e94d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz", + deprecated=True, ) version( "professional.2018.0", sha256="72308ffa088391ea65726a79d7a73738206fbb1d8ed8563e3d06eab3120fb1a0", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12062/parallel_studio_xe_2018_professional_edition.tgz", + deprecated=True, ) # version( "professional.2017.7", sha256="133c3aa99841a4fe48149938a90f971467452a82f033be10cd9464ba810f6360", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12856/parallel_studio_xe_2017_update7.tgz", + deprecated=True, ) version( "professional.2017.6", sha256="d771b00d3658934c424f294170125dc58ae9b03639aa898a2f115d7a7482dd3a", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12534/parallel_studio_xe_2017_update6.tgz", + deprecated=True, ) version( "professional.2017.5", sha256="36e496d1d1d7d7168cc3ba8f5bca9b52022339f30b62a87ed064b77a5cbccc09", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12138/parallel_studio_xe_2017_update5.tgz", + deprecated=True, ) version( "professional.2017.4", sha256="27d34625adfc635d767c136b5417a372f322fabe6701b651d858a8fe06d07f2d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11537/parallel_studio_xe_2017_update4.tgz", + deprecated=True, ) version( "professional.2017.3", sha256="856950c0493de3e8b4150e18f8821675c1cf75c2eea5ff0804f59eb301414bbe", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11460/parallel_studio_xe_2017_update3.tgz", + deprecated=True, ) version( "professional.2017.2", sha256="83a655f0c2969409758488d70d6719fb5ea81a84b6da3feb641ce67bb240bc8a", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11298/parallel_studio_xe_2017_update2.tgz", + deprecated=True, ) version( "professional.2017.1", sha256="c808be744c98f7471c61258144859e8e8fc92771934281a16135803e941fd9b0", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10973/parallel_studio_xe_2017_update1.tgz", + deprecated=True, ) version( "professional.2017.0", sha256="f380a56a25cf17941eb691a640035e79f92516346500e0df80fbdd46c5c1b301", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9651/parallel_studio_xe_2017.tgz", + deprecated=True, ) # version( "professional.2016.4", sha256="ea43c150ed6f9967bc781fe4253169a0447c69bac4fe2c563016a1ad2875ae23", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9781/parallel_studio_xe_2016_update4.tgz", + deprecated=True, ) version( "professional.2016.3", sha256="aa7c6f1a6603fae07c2b01409c12de0811aa5947eaa71dfb1fe9898076c2773e", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9061/parallel_studio_xe_2016_update3.tgz", + deprecated=True, ) version( "professional.2016.2", sha256="280bf39c75d7f52f206759ca4d8b6334ab92d5970957b90f5aa286bb0aa8d65e", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8676/parallel_studio_xe_2016_update2.tgz", + deprecated=True, ) version( "professional.2016.1", sha256="f5a3ab9fb581e19bf1bd966f7d40a11905e002a2bfae1c4a2140544288ca3e48", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8365/parallel_studio_xe_2016_update1.tgz", + deprecated=True, ) version( "professional.2016.0", sha256="fd4c32352fd78fc919601bedac5658ad5ac48efbc5700d9a8d42ed7d53bd8bb7", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/7997/parallel_studio_xe_2016.tgz", + deprecated=True, ) # version( "professional.2015.6", sha256="e604ed2bb45d227b151dd2898f3edd93526d58d1db1cb9d6b6f614907864f392", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8469/parallel_studio_xe_2015_update6.tgz", + deprecated=True, ) version( "professional.2015.1", sha256="84fdf48d1de20e1d580ba5d419a5bc1c55d217a4f5dc1807190ecffe0229a62b", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4992/parallel_studio_xe_2015_update1.tgz", + deprecated=True, ) # Composer Edition (basic tier; excluded: MPI/..., Advisor/Inspector/Vtune) @@ -350,135 +410,161 @@ class IntelParallelStudio(IntelPackage): "composer.2020.4", sha256="ac1efeff608a8c3a416e6dfe20364061e8abf62d35fbaacdffe3fc9676fc1aa3", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16759/parallel_studio_xe_2020_update2_composer_edition.tgz", + deprecated=True, ) version( "composer.2020.2", sha256="42af16e9a91226978bb401d9f17b628bc279aa8cb104d4a38ba0808234a79bdd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16759/parallel_studio_xe_2020_update2_composer_edition.tgz", + deprecated=True, ) version( "composer.2020.1", sha256="26c7e7da87b8a83adfd408b2a354d872be97736abed837364c1bf10f4469b01e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16530/parallel_studio_xe_2020_update1_composer_edition.tgz", + deprecated=True, ) version( "composer.2020.0", sha256="9168045466139b8e280f50f0606b9930ffc720bbc60bc76f5576829ac15757ae", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16229/parallel_studio_xe_2020_composer_edition.tgz", + deprecated=True, ) # version( "composer.2019.5", sha256="e8c8e4b9b46826a02c49325c370c79f896858611bf33ddb7fb204614838ad56c", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15813/parallel_studio_xe_2019_update5_composer_edition.tgz", + deprecated=True, ) version( "composer.2019.4", sha256="1915993445323e1e78d6de73702a88fa3df2036109cde03d74ee38fef9f1abf2", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15537/parallel_studio_xe_2019_update4_composer_edition.tgz", + deprecated=True, ) version( "composer.2019.3", sha256="15373ac6df2a84e6dd9fa0eac8b5f07ab00cdbb67f494161fd0d4df7a71aff8e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15272/parallel_studio_xe_2019_update3_composer_edition.tgz", + deprecated=True, ) version( "composer.2019.2", sha256="1e0f400be1f458592a8c2e7d55c1b2a4506f68f22bacbf1175af947809a4cd87", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15092/parallel_studio_xe_2019_update2_composer_edition.tgz", + deprecated=True, ) version( "composer.2019.1", sha256="db000cb2ebf411f6e91719db68a0c68b8d3f7d38ad7f2049ea5b2f1b5f006c25", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14832/parallel_studio_xe_2019_update1_composer_edition.tgz", + deprecated=True, ) version( "composer.2019.0", sha256="e1a29463038b063e01f694e2817c0fcf1a8e824e24f15a26ce85f20afa3f963a", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13581/parallel_studio_xe_2019_composer_edition.tgz", + deprecated=True, ) # version( "composer.2018.4", sha256="94aca8f091dff9535b02f022a37aef150b36925c8ef069335621496f8e4db267", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13722/parallel_studio_xe_2018_update4_composer_edition.tgz", + deprecated=True, ) version( "composer.2018.3", sha256="f21f7759709a3d3e3390a8325fa89ac79b1fce8890c292e73b2ba3ec576ebd2b", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz", + deprecated=True, ) version( "composer.2018.2", sha256="02d2a9fb10d9810f85dd77700215c4348d2e4475e814e4f086eb1442462667ff", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12722/parallel_studio_xe_2018_update2_composer_edition.tgz", + deprecated=True, ) version( "composer.2018.1", sha256="db9aa417da185a03a63330c9d76ee8e88496ae6b771584d19003a29eedc7cab5", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz", + deprecated=True, ) version( "composer.2018.0", sha256="ecad64360fdaff2548a0ea250a396faf680077c5a83c3c3ce2c55f4f4270b904", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz", + deprecated=True, ) # version( "composer.2017.7", sha256="661e33b68e47bf335694d2255f5883955234e9085c8349783a5794eed2a937ad", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12860/parallel_studio_xe_2017_update7_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.6", sha256="771f50746fe130ea472394c42e25d2c7edae049ad809d2050945ef637becf65f", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12538/parallel_studio_xe_2017_update6_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.5", sha256="ede4ea9351fcf263103588ae0f130b4c2a79395529cdb698b0d6e866c4871f78", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12144/parallel_studio_xe_2017_update5_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.4", sha256="4304766f80206a27709be61641c16782fccf2b3fcf7285782cce921ddc9b10ff", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.3", sha256="3648578d7bba993ebb1da37c173979bfcfb47f26e7f4e17f257e78dea8fd96ab", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.2", sha256="abd26ab2a703e73ab93326984837818601c391782a6bce52da8b2a246798ad40", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.1", sha256="bc592abee829ba6e00a4f60961b486b80c15987ff1579d6560186407c84add6f", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz", + deprecated=True, ) version( "composer.2017.0", sha256="d218db66a5bb57569bea00821ac95d4647eda7422bf8a178d1586b0fb314935a", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz", + deprecated=True, ) # version( "composer.2016.4", sha256="17606c52cab6f5114223a2425923c8dd69f1858f5a3bdf280e0edea49ebd430d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz", + deprecated=True, ) version( "composer.2016.3", sha256="fcec90ba97533e4705077e0701813b5a3bcc197b010b03e96f83191a35c26acf", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz", + deprecated=True, ) version( "composer.2016.2", sha256="6309ef8be1abba7737d3c1e17af64ca2620672b2da57afe2c3c643235f65b4c7", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz", + deprecated=True, ) # # Pre-2016, the only product was "Composer XE"; dir structure is different. @@ -486,11 +572,13 @@ class IntelParallelStudio(IntelPackage): "composer.2015.6", sha256="b1e09833469ca76a2834cd0a5bb5fea11ec9986da85abf4c6eed42cd96ec24cb", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8432/l_compxe_2015.6.233.tgz", + deprecated=True, ) version( "composer.2015.1", sha256="8a438fe20103e27bfda132955616d0c886aa6cfdd86dcd9764af5d937a8799d9", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4933/l_compxe_2015.1.133.tgz", + deprecated=True, ) # Generic Variants diff --git a/var/spack/repos/builtin/packages/intel-pin/package.py b/var/spack/repos/builtin/packages/intel-pin/package.py index d0d80550d94bac..6cf07b72579dca 100644 --- a/var/spack/repos/builtin/packages/intel-pin/package.py +++ b/var/spack/repos/builtin/packages/intel-pin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class IntelPin(Package): homepage = "http://www.pintool.org" maintainers("matthiasdiener") + license("MIT") + version( "3.27", sha256="e7d44d25668632007d5a109e5033415e91db543b8ce9e665893a05e852b67707", diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 14da30b2d430fe..deda008f6b70f2 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class IntelTbb(CMakePackage, MakefilePackage): # Note: when adding new versions, please check and update the # patches, filters and url_for_version() below as needed. + license("Apache-2.0") + version("master", branch="master") version("2021.9.0", sha256="1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e") version("2021.8.0", sha256="eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b") diff --git a/var/spack/repos/builtin/packages/intel-xed/package.py b/var/spack/repos/builtin/packages/intel-xed/package.py index 555d4154a220fd..3e21a6e28dc9dc 100644 --- a/var/spack/repos/builtin/packages/intel-xed/package.py +++ b/var/spack/repos/builtin/packages/intel-xed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class IntelXed(Package): # Current versions now have actual releases and tags. version("main", branch="main") + version("2023.10.11", tag="v2023.10.11", commit="d7d46c73fb04a1742e99c9382a4acb4ed07ae272") + version("2023.08.21", tag="v2023.08.21", commit="01a6da8090af84cd52f6c1070377ae6e885b078f") version("2023.07.09", tag="v2023.07.09", commit="539a6a349cf7538a182ed3ee1f48bb9317eb185f") version("2023.06.07", tag="v2023.06.07", commit="4dc77137f651def2ece4ac0416607b215c18e6e4") version("2023.04.16", tag="v2023.04.16", commit="a3055cd0209f5c63c88e280bbff9579b1e2942e2") @@ -40,7 +42,12 @@ class IntelXed(Package): # Match xed more closely with the version of mbuild at the time. resource( - name="mbuild", placement=mdir, git=mbuild_git, tag="v2022.07.28", when="@2022.07:9999" + name="mbuild", + placement=mdir, + git=mbuild_git, + tag="v2022.07.28", + commit="75cb46e6536758f1a3cdb3d6bd83a4a9fd0338bb", + when="@2022.07:9999", ) resource( @@ -48,7 +55,7 @@ class IntelXed(Package): placement=mdir, git=mbuild_git, tag="v2022.04.17", - commit="ef19f00de14a9c2c253c1c9b1119e1617280e3f2", + commit="b41485956bf65d51b8c2379768de7eaaa7a4245b", when="@:2022.06", ) diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index fea1c020c1a5aa..e051bf0ba20ddb 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,61 +29,73 @@ class Intel(IntelPackage): "20.0.4", sha256="ac1efeff608a8c3a416e6dfe20364061e8abf62d35fbaacdffe3fc9676fc1aa3", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17117/parallel_studio_xe_2020_update4_composer_edition.tgz", + deprecated=True, ) version( "20.0.2", sha256="42af16e9a91226978bb401d9f17b628bc279aa8cb104d4a38ba0808234a79bdd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16759/parallel_studio_xe_2020_update2_composer_edition.tgz", + deprecated=True, ) version( "20.0.1", sha256="26c7e7da87b8a83adfd408b2a354d872be97736abed837364c1bf10f4469b01e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16530/parallel_studio_xe_2020_update1_composer_edition.tgz", + deprecated=True, ) version( "20.0.0", sha256="9168045466139b8e280f50f0606b9930ffc720bbc60bc76f5576829ac15757ae", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16229/parallel_studio_xe_2020_composer_edition.tgz", + deprecated=True, ) version( "19.1.2", sha256="42af16e9a91226978bb401d9f17b628bc279aa8cb104d4a38ba0808234a79bdd", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16759/parallel_studio_xe_2020_update2_composer_edition.tgz", + deprecated=True, ) version( "19.1.1", sha256="26c7e7da87b8a83adfd408b2a354d872be97736abed837364c1bf10f4469b01e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16530/parallel_studio_xe_2020_update1_composer_edition.tgz", + deprecated=True, ) version( "19.1.0", sha256="9168045466139b8e280f50f0606b9930ffc720bbc60bc76f5576829ac15757ae", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16229/parallel_studio_xe_2020_composer_edition.tgz", + deprecated=True, ) version( "19.0.5", sha256="e8c8e4b9b46826a02c49325c370c79f896858611bf33ddb7fb204614838ad56c", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15813/parallel_studio_xe_2019_update5_composer_edition.tgz", + deprecated=True, ) version( "19.0.4", sha256="1915993445323e1e78d6de73702a88fa3df2036109cde03d74ee38fef9f1abf2", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15537/parallel_studio_xe_2019_update4_composer_edition.tgz", + deprecated=True, ) version( "19.0.3", sha256="15373ac6df2a84e6dd9fa0eac8b5f07ab00cdbb67f494161fd0d4df7a71aff8e", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15272/parallel_studio_xe_2019_update3_composer_edition.tgz", + deprecated=True, ) version( "19.0.1", sha256="db000cb2ebf411f6e91719db68a0c68b8d3f7d38ad7f2049ea5b2f1b5f006c25", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/14832/parallel_studio_xe_2019_update1_composer_edition.tgz", + deprecated=True, ) version( "19.0.0", sha256="e1a29463038b063e01f694e2817c0fcf1a8e824e24f15a26ce85f20afa3f963a", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13581/parallel_studio_xe_2019_composer_edition.tgz", + deprecated=True, ) # Version 18.0.5 comes with parallel studio 2018 update 4. See: @@ -92,83 +104,99 @@ class Intel(IntelPackage): "18.0.5", sha256="94aca8f091dff9535b02f022a37aef150b36925c8ef069335621496f8e4db267", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13722/parallel_studio_xe_2018_update4_composer_edition.tgz", + deprecated=True, ) version( "18.0.3", sha256="f21f7759709a3d3e3390a8325fa89ac79b1fce8890c292e73b2ba3ec576ebd2b", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13002/parallel_studio_xe_2018_update3_composer_edition.tgz", + deprecated=True, ) version( "18.0.2", sha256="02d2a9fb10d9810f85dd77700215c4348d2e4475e814e4f086eb1442462667ff", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12722/parallel_studio_xe_2018_update2_composer_edition.tgz", + deprecated=True, ) version( "18.0.1", sha256="db9aa417da185a03a63330c9d76ee8e88496ae6b771584d19003a29eedc7cab5", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12381/parallel_studio_xe_2018_update1_composer_edition.tgz", + deprecated=True, ) version( "18.0.0", sha256="ecad64360fdaff2548a0ea250a396faf680077c5a83c3c3ce2c55f4f4270b904", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12067/parallel_studio_xe_2018_composer_edition.tgz", + deprecated=True, ) # version( "17.0.7", sha256="661e33b68e47bf335694d2255f5883955234e9085c8349783a5794eed2a937ad", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12860/parallel_studio_xe_2017_update7_composer_edition.tgz", + deprecated=True, ) version( "17.0.6", sha256="771f50746fe130ea472394c42e25d2c7edae049ad809d2050945ef637becf65f", url="https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12538/parallel_studio_xe_2017_update6_composer_edition.tgz", + deprecated=True, ) version( "17.0.5", sha256="ede4ea9351fcf263103588ae0f130b4c2a79395529cdb698b0d6e866c4871f78", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12144/parallel_studio_xe_2017_update5_composer_edition.tgz", + deprecated=True, ) version( "17.0.4", sha256="4304766f80206a27709be61641c16782fccf2b3fcf7285782cce921ddc9b10ff", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz", + deprecated=True, ) version( "17.0.3", sha256="3648578d7bba993ebb1da37c173979bfcfb47f26e7f4e17f257e78dea8fd96ab", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11464/parallel_studio_xe_2017_update3_composer_edition.tgz", + deprecated=True, ) version( "17.0.2", sha256="abd26ab2a703e73ab93326984837818601c391782a6bce52da8b2a246798ad40", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11302/parallel_studio_xe_2017_update2_composer_edition.tgz", + deprecated=True, ) version( "17.0.1", sha256="bc592abee829ba6e00a4f60961b486b80c15987ff1579d6560186407c84add6f", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/10978/parallel_studio_xe_2017_update1_composer_edition.tgz", + deprecated=True, ) version( "17.0.0", sha256="d218db66a5bb57569bea00821ac95d4647eda7422bf8a178d1586b0fb314935a", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9656/parallel_studio_xe_2017_composer_edition.tgz", + deprecated=True, ) # version( "16.0.4", sha256="17606c52cab6f5114223a2425923c8dd69f1858f5a3bdf280e0edea49ebd430d", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9785/parallel_studio_xe_2016_composer_edition_update4.tgz", + deprecated=True, ) version( "16.0.3", sha256="fcec90ba97533e4705077e0701813b5a3bcc197b010b03e96f83191a35c26acf", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/9063/parallel_studio_xe_2016_composer_edition_update3.tgz", + deprecated=True, ) version( "16.0.2", sha256="6309ef8be1abba7737d3c1e17af64ca2620672b2da57afe2c3c643235f65b4c7", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8680/parallel_studio_xe_2016_composer_edition_update2.tgz", + deprecated=True, ) # # Grandfathered release; different directory structure. @@ -176,11 +204,13 @@ class Intel(IntelPackage): "15.0.6", sha256="b1e09833469ca76a2834cd0a5bb5fea11ec9986da85abf4c6eed42cd96ec24cb", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/8432/l_compxe_2015.6.233.tgz", + deprecated=True, ) version( "15.0.1", sha256="8a438fe20103e27bfda132955616d0c886aa6cfdd86dcd9764af5d937a8799d9", url="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4933/l_compxe_2015.1.133.tgz", + deprecated=True, ) variant("rpath", default=True, description="Add rpath to .cfg files") diff --git a/var/spack/repos/builtin/packages/interproscan/package.py b/var/spack/repos/builtin/packages/interproscan/package.py index 4143dc6ff2899b..2af5c6e4016191 100644 --- a/var/spack/repos/builtin/packages/interproscan/package.py +++ b/var/spack/repos/builtin/packages/interproscan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Interproscan(Package): url = "https://github.com/ebi-pf-team/interproscan/archive/5.36-75.0.tar.gz" maintainers("snehring") + license("Apache-2.0") + version("5.63-95.0", sha256="3d7babd09e64da3d7104c58f1e5104a298d69425e3210952331bc3f1ddf89ca6") version("5.61-93.0", sha256="70aca3b14983733fe5119b6978cb707156d006d7f737aa60ce6c9addd6c288e4") version("5.56-89.0", sha256="75e6a8f86ca17356a2f77f75b07d6d8fb7b397c9575f6e9716b64983e490b230") diff --git a/var/spack/repos/builtin/packages/intltool/package.py b/var/spack/repos/builtin/packages/intltool/package.py index 174858bf3aef97..070644f41d4268 100644 --- a/var/spack/repos/builtin/packages/intltool/package.py +++ b/var/spack/repos/builtin/packages/intltool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Intltool(AutotoolsPackage): url = "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz" list_url = "https://launchpad.net/intltool/+download" + license("GPL-2.0-or-later") + version("0.51.0", sha256="67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd") # requires XML::Parser perl module diff --git a/var/spack/repos/builtin/packages/ioapi/package.py b/var/spack/repos/builtin/packages/ioapi/package.py index 448dd7e7d605bb..fcc640734ecfd0 100644 --- a/var/spack/repos/builtin/packages/ioapi/package.py +++ b/var/spack/repos/builtin/packages/ioapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ior/package.py b/var/spack/repos/builtin/packages/ior/package.py index bad21c959ce475..78eb17fdbf89f8 100644 --- a/var/spack/repos/builtin/packages/ior/package.py +++ b/var/spack/repos/builtin/packages/ior/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/iozone/package.py b/var/spack/repos/builtin/packages/iozone/package.py index 00ab49a78a59e3..86b31db056a584 100644 --- a/var/spack/repos/builtin/packages/iozone/package.py +++ b/var/spack/repos/builtin/packages/iozone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Iozone(MakefilePackage): homepage = "https://www.iozone.org/" url = "https://www.iozone.org/src/current/iozone3_465.tar" + license("custom") + version("3_506", sha256="114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7") version("3_491", sha256="2cc4842d382e46a585d1df9ae1e255695480dcc0fc05c3b1cb32ef3493d0ec9a") version("3_465", sha256="2e3d72916e7d7340a7c505fc0c3d28553fcc5ff2daf41d811368e55bd4e6a293") diff --git a/var/spack/repos/builtin/packages/ip/package.py b/var/spack/repos/builtin/packages/ip/package.py index 86c9f9592d818a..b0b9c844ff3f6a 100644 --- a/var/spack/repos/builtin/packages/ip/package.py +++ b/var/spack/repos/builtin/packages/ip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,7 @@ class Ip(CMakePackage): maintainers("AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA") version("develop", branch="develop") + version("5.0.0", sha256="54b2987bd4f94adc1f7595d2a384e646019c22d163bcd30840a916a6abd7df71") version("4.4.0", sha256="858d9201ce0bc4d16b83581ef94a4a0262f498ed1ea1b0535de2e575da7a8b8c") version("4.3.0", sha256="799308a868dea889d2527d96a0405af7b376869581410fe4cff681205e9212b4") # Note that versions 4.0-4.2 contain constants_mod module, and should not be used when @@ -50,14 +51,20 @@ class Ip(CMakePackage): description="Set precision (_4/_d/_8 library versions)", when="@4.2:", ) + variant( + "deprecated", + default=False, + description="Build deprecated spectral interpolation functions", + when="@5.0:", + ) conflicts("+shared ~pic") - depends_on("sp") + depends_on("sp", when="@:4") depends_on("sp@:2.3.3", when="@:4.0") - depends_on("sp precision=4", when="precision=4") - depends_on("sp precision=d", when="precision=d") - depends_on("sp precision=8", when="precision=8") + depends_on("sp precision=4", when="@4.1:4 precision=4") + depends_on("sp precision=d", when="@4.1:4 precision=d") + depends_on("sp precision=8", when="@4.1:4 precision=8") def cmake_args(self): args = [ @@ -78,6 +85,9 @@ def cmake_args(self): if self.spec.satisfies("@4.2:"): args.append(self.define("BUILD_8", self.spec.satisfies("precision=8"))) + if self.spec.satisfies("@5:"): + args.append(self.define_from_variant("BUILD_DEPRECATED", "deprecated")) + return args def setup_run_environment(self, env): @@ -94,6 +104,7 @@ def setup_run_environment(self, env): env.set("IP_LIB" + suffix, lib[0]) env.set("IP_INC" + suffix, join_path(self.prefix, "include_" + suffix)) + @when("@4:") def check(self): with working_dir(self.builder.build_directory): make("test") diff --git a/var/spack/repos/builtin/packages/ip2/package.py b/var/spack/repos/builtin/packages/ip2/package.py index 13d6e15dbebcfc..92640926706500 100644 --- a/var/spack/repos/builtin/packages/ip2/package.py +++ b/var/spack/repos/builtin/packages/ip2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ipcalc/package.py b/var/spack/repos/builtin/packages/ipcalc/package.py index dbc211278e5127..06fa24b10abc9f 100644 --- a/var/spack/repos/builtin/packages/ipcalc/package.py +++ b/var/spack/repos/builtin/packages/ipcalc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Ipcalc(MakefilePackage): homepage = "https://gitlab.com/ipcalc/ipcalc" url = "https://github.com/nmav/ipcalc/archive/0.2.3.tar.gz" + license("GPL-2.0-or-later") + version("0.2.3", sha256="c416f34d381a7333ad8aa8982fcfc88434818b3cc35a33b62a75c10f2a6af3c9") version("0.2.2", sha256="bf1b95eca219e564c85fa4233fe65342963cf3e8a303a7e10b4dd7269c864794") version("0.2.0", sha256="c965c1296172a6acc50d54dfe81f7e5d589f9762b5d9ae459eee00349675336b") diff --git a/var/spack/repos/builtin/packages/iperf2/package.py b/var/spack/repos/builtin/packages/iperf2/package.py index c5a06d1ab27db8..81970527e4dbfc 100644 --- a/var/spack/repos/builtin/packages/iperf2/package.py +++ b/var/spack/repos/builtin/packages/iperf2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/iperf3/package.py b/var/spack/repos/builtin/packages/iperf3/package.py index 162ea1b65a454b..aaaf24f5456296 100644 --- a/var/spack/repos/builtin/packages/iperf3/package.py +++ b/var/spack/repos/builtin/packages/iperf3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Iperf3(AutotoolsPackage): homepage = "https://software.es.net/iperf/" url = "https://github.com/esnet/iperf/archive/3.6.tar.gz" + license("BSD-3-Clause-LBNL") + version("3.6", sha256="1ad23f70a8eb4b892a3cbb247cafa956e0f5c7d8b8601b1d9c8031c2a806f23f") diff --git a/var/spack/repos/builtin/packages/ipm/package.py b/var/spack/repos/builtin/packages/ipm/package.py index 654707a96abdf2..1c8a18ea59293b 100644 --- a/var/spack/repos/builtin/packages/ipm/package.py +++ b/var/spack/repos/builtin/packages/ipm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Ipm(AutotoolsPackage): maintainers("Christoph-TU") + license("LGPL-2.1-or-later") + version("master", branch="master", preferred=True) version("2.0.6", tag="2.0.6", commit="b008141ee16d39b33e20bffde615564afa107575") diff --git a/var/spack/repos/builtin/packages/ipopt/package.py b/var/spack/repos/builtin/packages/ipopt/package.py index 8557cb20c7788c..b5fc7b0cc7ef8d 100644 --- a/var/spack/repos/builtin/packages/ipopt/package.py +++ b/var/spack/repos/builtin/packages/ipopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ipopt(AutotoolsPackage): url = "https://github.com/coin-or/Ipopt/archive/refs/tags/releases/3.13.2.tar.gz" maintainers("goxberry") + license("EPL-2.0") + version("3.14.9", sha256="e12eba451269ec30f4cf6e2acb8b35399f0d029c97dff10465416f5739c8cf7a") version("3.14.5", sha256="9ebbbbf14a64e998e3fba5d2662a8f9bd03f97b1406017e78ae54e5d105ae932") version("3.14.4", sha256="60865150b6fad19c5968395b57ff4a0892380125646c3afa2a714926f5ac9487") diff --git a/var/spack/repos/builtin/packages/iproute2/package.py b/var/spack/repos/builtin/packages/iproute2/package.py index 9a7a8da5e80205..98430a131aef8e 100644 --- a/var/spack/repos/builtin/packages/iproute2/package.py +++ b/var/spack/repos/builtin/packages/iproute2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Iproute2(AutotoolsPackage): depends_on("flex", type="build") depends_on("libmnl") + license("GPL-2.0-or-later") + version("5.11.0", sha256="16b79e6ce65d4d5fd425cef2fd92a58c403a93faeeed0e0a3202b36a8e857d1f") version("5.10.0", sha256="164f1de457eefbdadb98d82c309a0977542b34e7a2dfe81e497a0b93675cb3d2") version("5.9.0", sha256="1afde56d416f136b1236ac2f8276e4edbe114ca3c2ab12f11af11b84cf0992e4") diff --git a/var/spack/repos/builtin/packages/iptraf-ng/package.py b/var/spack/repos/builtin/packages/iptraf-ng/package.py index cea29494213da6..4f1bb59cb0b7db 100644 --- a/var/spack/repos/builtin/packages/iptraf-ng/package.py +++ b/var/spack/repos/builtin/packages/iptraf-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class IptrafNg(MakefilePackage): homepage = "https://github.com/iptraf-ng/iptraf-ng" url = "https://github.com/iptraf-ng/iptraf-ng/archive/v1.2.0.tar.gz" + license("GPL-2.0-only") + version("1.2.1", sha256="9f5cef584065420dea1ba32c86126aede1fa9bd25b0f8362b0f9fd9754f00870") version("1.2.0", sha256="9725115e501d083674d50a7686029d3a08f920abd35c9a2d4a28b5ddb782417f") version("1.1.4", sha256="16b9b05bf5d3725d86409b901696639ad46944d02de6def87b1ceae5310dd35c") diff --git a/var/spack/repos/builtin/packages/iq-tree/package.py b/var/spack/repos/builtin/packages/iq-tree/package.py index 7226dce4bc045c..4a5bb01c25338c 100644 --- a/var/spack/repos/builtin/packages/iq-tree/package.py +++ b/var/spack/repos/builtin/packages/iq-tree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class IqTree(CMakePackage): git = "https://github.com/iqtree/iqtree2.git" url = "https://github.com/Cibiv/IQ-TREE/archive/v1.6.12.tar.gz" + license("GPL-2.0-or-later") + version( "2.2.2.7", tag="v2.2.2.7", diff --git a/var/spack/repos/builtin/packages/iqtree2/package.py b/var/spack/repos/builtin/packages/iqtree2/package.py index c84cb6e8e6299d..36b28af74f1f82 100644 --- a/var/spack/repos/builtin/packages/iqtree2/package.py +++ b/var/spack/repos/builtin/packages/iqtree2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,31 @@ class Iqtree2(CMakePackage): homepage = "http://www.iqtree.org" url = "https://github.com/iqtree/iqtree2/archive/refs/tags/v2.1.2.tar.gz" + license("GPL-2.0-or-later") + + version("2.2.2.7", sha256="407a1a56d352ba9c2152a1d708cd29db872a41c252fbdc7acd8e0de0da8af008") version("2.2.2", sha256="2e9ce79427b140bca5f48b31fb098f394a21a7c5116bbbada1e3eabdd6efe982") version("2.1.2", sha256="3aaf5ac7f60d852ac8b733fb82832c049ca48b7203a6a865e99c5af359fcca5a") + variant("lsd2", default=False, description="Build with LSD2 support") + depends_on("boost", type="link") depends_on("eigen", type="link") depends_on("zlib-api", type="link") + + resource( + name="lsd2-rsrc", + url="https://github.com/tothuhien/lsd2/archive/refs/tags/v.2.4.1.tar.gz", + sha256="3d0921c96edb8f30498dc8a27878a76d785516043fbede4a72eefd84b5955458", + destination="lsd2-rsrc", + when="+lsd2", + ) + + @run_before("cmake") + def expand_resource(self): + copy_tree(join_path("lsd2-rsrc", "*"), "lsd2") + + def cmake_cargs(self): + args = [self.define_from_variant("USE_LSD2", variant="lsd2")] + + return args diff --git a/var/spack/repos/builtin/packages/irep/package.py b/var/spack/repos/builtin/packages/irep/package.py index b89df7fb909a28..2210f7bac5cdec 100644 --- a/var/spack/repos/builtin/packages/irep/package.py +++ b/var/spack/repos/builtin/packages/irep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Irep(CMakePackage): maintainers("tomstitt", "kennyweiss") + license("MIT") + version("1.0.0", sha256="b84203ac92de824dbdc672de45cfdb9609373791c4ee84a5201fa6e4ccecc1a4") depends_on("lua-lang") diff --git a/var/spack/repos/builtin/packages/isa-l-crypto/package.py b/var/spack/repos/builtin/packages/isa-l-crypto/package.py index 0a468c74f2f87c..f6aa7e762d8eae 100644 --- a/var/spack/repos/builtin/packages/isa-l-crypto/package.py +++ b/var/spack/repos/builtin/packages/isa-l-crypto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class IsaLCrypto(AutotoolsPackage): git = "https://github.com/intel/isa-l_crypto.git" maintainers("hyoklee") + license("BSD-3-Clause") + version("master", branch="master") # Current diff --git a/var/spack/repos/builtin/packages/isa-l/package.py b/var/spack/repos/builtin/packages/isa-l/package.py index 113a8c2d8bc0a0..2d56fbcebb3cbd 100644 --- a/var/spack/repos/builtin/packages/isa-l/package.py +++ b/var/spack/repos/builtin/packages/isa-l/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class IsaL(AutotoolsPackage): git = "https://github.com/intel/isa-l.git" maintainers("hyoklee") + license("BSD-3-Clause") + version("master", branch="master") # Current diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index b09b00d7012167..16fc1c6b547f1c 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class IsaacServer(CMakePackage): maintainers("ax3l") + license("LGPL-3.0-only") + version("develop", branch="dev") version("master", branch="master") version("1.5.2", sha256="9cedd72bea06f387b697b17a0db076e50fb3b85b74f21d3a6d99ed0d664a9ef2") diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py index 3608da86d66927..36e13abbe36843 100644 --- a/var/spack/repos/builtin/packages/isaac/package.py +++ b/var/spack/repos/builtin/packages/isaac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Isaac(CMakePackage): maintainers("ax3l") + license("LGPL-3.0-only") + version("develop", branch="dev") version("master", branch="master") version("1.5.2", sha256="9cedd72bea06f387b697b17a0db076e50fb3b85b74f21d3a6d99ed0d664a9ef2") diff --git a/var/spack/repos/builtin/packages/isc-dhcp/package.py b/var/spack/repos/builtin/packages/isc-dhcp/package.py index 16d1282eade074..23e223acb560d2 100644 --- a/var/spack/repos/builtin/packages/isc-dhcp/package.py +++ b/var/spack/repos/builtin/packages/isc-dhcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class IscDhcp(AutotoolsPackage): parallel = False + license("MPL-2.0") + version("4.4.2", sha256="1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521") version("4.4.1", sha256="2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608") version("4.4.0", sha256="4a90be0f22ad81c987f5584661b60a594f1b21c581b82bfba3ae60f89ae44397") diff --git a/var/spack/repos/builtin/packages/isescan/package.py b/var/spack/repos/builtin/packages/isescan/package.py index a53f1b2663f4de..ea130c0e591772 100644 --- a/var/spack/repos/builtin/packages/isescan/package.py +++ b/var/spack/repos/builtin/packages/isescan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Isescan(Package): homepage = "https://github.com/xiezhq/ISEScan" url = "https://github.com/xiezhq/ISEScan/archive/refs/tags/v1.7.2.1.tar.gz" + license("Apache-2.0") + version("1.7.2.3", sha256="90ef6bc660e471347f65864bd3563f769ed4b79b1a932195f353c5e86351ab05") version("1.7.2.1", sha256="b971a3e86a8cddaa4bcd520ba9e75425bbe93190466f81a3791ae0cb4baf5e5d") diff --git a/var/spack/repos/builtin/packages/isl/package.py b/var/spack/repos/builtin/packages/isl/package.py index d0a7a7299a42a2..43a1d0c4c5eb30 100644 --- a/var/spack/repos/builtin/packages/isl/package.py +++ b/var/spack/repos/builtin/packages/isl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Isl(AutotoolsPackage): homepage = "https://libisl.sourceforge.io/" url = "https://libisl.sourceforge.io/isl-0.21.tar.bz2" + license("MIT") + version("0.25", sha256="4305c54d4eebc4bf3ce365af85f04984ef5aa97a52e01128445e26da5b1f467a") version("0.24", sha256="fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0") version("0.21", sha256="d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859") diff --git a/var/spack/repos/builtin/packages/iso-codes/package.py b/var/spack/repos/builtin/packages/iso-codes/package.py index 14302a0daf08eb..7cc06fcc2f913b 100644 --- a/var/spack/repos/builtin/packages/iso-codes/package.py +++ b/var/spack/repos/builtin/packages/iso-codes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class IsoCodes(AutotoolsPackage): homepage = "https://salsa.debian.org/iso-codes-team/iso-codes" url = "https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.3.orig.tar.xz" + license("LGPL-2.1-or-later") + version("4.15.0", sha256="3d50750bf1d62d83b6085f5815ceb8392df34266a15f16bcf8d4cf7eb15d245c") version("4.13.0", sha256="2d4d0e5c02327f52cf7c029202da72f2074348472c26904b7104d2be3e0750ef") version("4.3", sha256="643eb83b2d714e8650ed7112706968d057bf5b101ba71c8ef219e20f1737b141") diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 8bef2ce2f584c1..bae4d9ceb5e56e 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,7 +24,11 @@ class Ispc(CMakePackage): executables = ["^ispc$"] + license("BSD-3-Clause") + version("main", branch="main") + version("1.21.1", sha256="99bbb1d1f15bc4433d6a63b5bb35b321af3e3af753c3b28a61850d1748e8a89f") + version("1.21.0", sha256="023782f721bfb5893bac24bc2153a8214c916be82c290bf63a3ec6678949b5ef") version("1.20.0", sha256="8bd30ded7f96859451ead1cecf6f58ac8e937288fe0e5b98c56f6eba4be370b4") version("1.19.0", sha256="c1aeae4bdfb28004a6949394ea1b3daa3fdf12f646e17fcc0614861077dc8b6a") version("1.18.1", sha256="fee76d42fc0129f81489b7c2b9143e22a44c281940693c1c13cf1e3dd2ab207f") @@ -45,15 +49,17 @@ class Ispc(CMakePackage): depends_on("tbb", type="link", when="platform=linux @1.20:") depends_on("llvm+clang") depends_on("llvm libcxx=none", when="platform=darwin") - depends_on("llvm@13:15", when="@1.19:") - depends_on("llvm@11.0:14.0", when="@1.18") - depends_on("llvm@11:14", when="@1.17") - depends_on("llvm@:12", when="@:1.16") - depends_on("llvm@11:", when="@1.16") - depends_on("llvm@10:11", when="@1.15.0:1.15") - depends_on("llvm@10.0:10", when="@1.13:1.14") depends_on("llvm targets=arm,aarch64", when="target=arm:") depends_on("llvm targets=arm,aarch64", when="target=aarch64:") + depends_on("llvm@:17", when="@:1.21") + depends_on("llvm@:15", when="@:1.20") + depends_on("llvm@:14", when="@:1.18") + depends_on("llvm@:12", when="@:1.16") + depends_on("llvm@:11", when="@:1.15") + depends_on("llvm@:10", when="@:1.14") + depends_on("llvm@13:", when="@1.19:") + depends_on("llvm@11:", when="@1.16:") + depends_on("llvm@10:", when="@1.13:") patch( "don-t-assume-that-ncurses-zlib-are-system-libraries.patch", diff --git a/var/spack/repos/builtin/packages/istio/package.py b/var/spack/repos/builtin/packages/istio/package.py index 7cb7f550459437..76161511121f4b 100644 --- a/var/spack/repos/builtin/packages/istio/package.py +++ b/var/spack/repos/builtin/packages/istio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class Istio(Package): list_url = "https://github.com/istio/istio/releases/download" list_depth = 1 + license("Apache-2.0") + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) sha_val = packages.get(key) diff --git a/var/spack/repos/builtin/packages/itensor/package.py b/var/spack/repos/builtin/packages/itensor/package.py index 7e21581cdca0ca..037050af2c87e1 100644 --- a/var/spack/repos/builtin/packages/itensor/package.py +++ b/var/spack/repos/builtin/packages/itensor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Itensor(MakefilePackage): homepage = "https://itensor.org/index.html" url = "https://github.com/ITensor/ITensor/archive/v3.1.6.tar.gz" + license("Apache-2.0") + version("3.1.11", sha256="bc6c48d34c4d4281d15116d7d95d7e6e2b6878b9a60ce33372b8967a96826e95") version("3.1.10", sha256="68c149e23a1ab936ef8175ea11fedc0ec64031c3686ede93c3a5ab0c893774f6") version("3.1.9", sha256="4dd71b251b63fb7775ef854212df6f1d5d3ac4d6d1905dc03b1e6d2a0a620a17") @@ -78,10 +80,10 @@ def edit(self, spec, prefix): vinc += " -fpermissive" vinc += " -DHAVE_LAPACK_CONFIG_H" vinc += " -DLAPACK_COMPLEX_STRUCTURE" - filter_file("#PLATFORM=lapack", vinc, mf, String=True) + filter_file("#PLATFORM=lapack", vinc, mf, string=True) elif ltype == "intel-mkl": vpla = "PLATFORM=mkl" - filter_file("#PLATFORM=lapack", vinc, mf, String=True) + filter_file("#PLATFORM=lapack", vinc, mf, string=True) filter_file(r"^PLATFORM.+", vpla, mf) filter_file(r"^BLAS_LAPACK_LIBFLAGS.+", vlib, mf) diff --git a/var/spack/repos/builtin/packages/itk/package.py b/var/spack/repos/builtin/packages/itk/package.py index 0a956f3dfdb30a..f5f46daa7fa853 100644 --- a/var/spack/repos/builtin/packages/itk/package.py +++ b/var/spack/repos/builtin/packages/itk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Itk(CMakePackage): homepage = "https://itk.org/" url = "https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.1.1/InsightToolkit-5.1.1.tar.gz" + license("Apache-2.0") + version("5.3.0", sha256="57a4471133dc8f76bde3d6eb45285c440bd40d113428884a1487472b7b71e383") version("5.3rc02", sha256="163aaf4a6cecd5b70ff718c1a986c746581797212fd1b629fa81f12ae4756d14") version( diff --git a/var/spack/repos/builtin/packages/itstool/package.py b/var/spack/repos/builtin/packages/itstool/package.py index b9cbf526df3a1e..1847302407d53c 100644 --- a/var/spack/repos/builtin/packages/itstool/package.py +++ b/var/spack/repos/builtin/packages/itstool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Itstool(AutotoolsPackage): maintainers("agoodLANL") + license("GPL-3.0-or-later") + version("2.0.7", sha256="6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca") depends_on("libxml2+python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/itsx/package.py b/var/spack/repos/builtin/packages/itsx/package.py index f4ec3bccbb55ff..03211ad25bf663 100644 --- a/var/spack/repos/builtin/packages/itsx/package.py +++ b/var/spack/repos/builtin/packages/itsx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Itsx(Package): homepage = "https://microbiology.se/software/itsx/" url = "https://microbiology.se/sw/ITSx_1.0.11.tar.gz" + license("GPL-3.0-or-later") + version("1.0.11", sha256="8f4f76fc9c43b61f4dd4cd8dc4e495e9687943e15515396583f7a757651d435e") depends_on("perl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/iwyu/package.py b/var/spack/repos/builtin/packages/iwyu/package.py index 20a3c1c1223368..1c28fb9e805d70 100644 --- a/var/spack/repos/builtin/packages/iwyu/package.py +++ b/var/spack/repos/builtin/packages/iwyu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class Iwyu(CMakePackage): homepage = "https://include-what-you-use.org" url = "https://include-what-you-use.org/downloads/include-what-you-use-0.13.src.tar.gz" + git = "https://github.com/include-what-you-use/include-what-you-use.git" maintainers("sethrj") @@ -24,6 +25,9 @@ class Iwyu(CMakePackage): executables = ["^include-what-you-use$"] + version("0.21", sha256="6a351919ff89bda7c95c895472601868db3daab96a958b38e0362890d58760b6") + version("0.20", sha256="75fce1e6485f280f8f13f4c2d090b11d2fd2102b50857507c8413a919b7af899") + version("0.19", sha256="2b10157b60ea08adc08e3896b4921c73fcadd5ec4eb652b29a34129d501e5ee0") version("0.18", sha256="9102fc8419294757df86a89ce6ec305f8d90a818d1f2598a139d15eb1894b8f3") version("0.17", sha256="eca7c04f8b416b6385ed00e33669a7fa4693cd26cb72b522cde558828eb0c665") version("0.16", sha256="8d6fc9b255343bc1e5ec459e39512df1d51c60e03562985e0076036119ff5a1c") @@ -35,6 +39,9 @@ class Iwyu(CMakePackage): patch("iwyu-013-cmake.patch", when="@0.13:0.14") + depends_on("llvm+clang@17.0:17", when="@0.21") + depends_on("llvm+clang@16.0:16", when="@0.20") + depends_on("llvm+clang@15.0:15", when="@0.19") depends_on("llvm+clang@14.0:14", when="@0.18") depends_on("llvm+clang@13.0:13", when="@0.17") depends_on("llvm+clang@12.0:12", when="@0.16") @@ -55,7 +62,11 @@ def determine_version(cls, exe): match = re.search(r"include-what-you-use\s+(\S+)", output) return match.group(1) if match else None - @when("@0.14:") + @when("@0.19:") + def cmake_args(self): + return [self.define("CMAKE_CXX_STANDARD", 17), self.define("CMAKE_CXX_EXTENSIONS", False)] + + @when("@0.14:0.18") def cmake_args(self): return [self.define("CMAKE_CXX_STANDARD", 14), self.define("CMAKE_CXX_EXTENSIONS", False)] diff --git a/var/spack/repos/builtin/packages/jackcess/package.py b/var/spack/repos/builtin/packages/jackcess/package.py index 0256381e99e12b..72d92fdebca616 100644 --- a/var/spack/repos/builtin/packages/jackcess/package.py +++ b/var/spack/repos/builtin/packages/jackcess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/jafka/package.py b/var/spack/repos/builtin/packages/jafka/package.py index b0e048114a75f4..d77e48ea186373 100644 --- a/var/spack/repos/builtin/packages/jafka/package.py +++ b/var/spack/repos/builtin/packages/jafka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jafka(Package): homepage = "https://github.com/adyliu/jafka" url = "https://github.com/adyliu/jafka/releases/download/3.0.6/jafka-3.0.6.tgz" + license("Apache-2.0") + version("3.0.6", sha256="89c9456360ace5d43c3af52b5d2e712fc49be2f88b1b3dcfe0c8f195a3244e17") version("3.0.5", sha256="43f1b4188a092c30f48f9cdd0bddd3074f331a9b916b6cb566da2e9e40bc09a7") version("3.0.4", sha256="a5334fc9280764f9fd4b5eb156154c721f074c1bcc1e5496189af7c06cd16b45") diff --git a/var/spack/repos/builtin/packages/jags/package.py b/var/spack/repos/builtin/packages/jags/package.py index 6aaec30308062f..bff7d1574b8160 100644 --- a/var/spack/repos/builtin/packages/jags/package.py +++ b/var/spack/repos/builtin/packages/jags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Jags(AutotoolsPackage): homepage = "http://mcmc-jags.sourceforge.net/" url = "https://downloads.sourceforge.net/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.2.0.tar.gz" + license("GPL-2.0-or-later") + version("4.3.0", sha256="8ac5dd57982bfd7d5f0ee384499d62f3e0bb35b5f1660feb368545f1186371fc") version("4.2.0", sha256="af3e9d2896d3e712f99e2a0c81091c6b08f096650af6aa9d0c631c0790409cf7") diff --git a/var/spack/repos/builtin/packages/jali/package.py b/var/spack/repos/builtin/packages/jali/package.py index 65fc676138f601..ce7b62ac54f09e 100644 --- a/var/spack/repos/builtin/packages/jali/package.py +++ b/var/spack/repos/builtin/packages/jali/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Jali(CMakePackage): maintainers("raovgarimella") + license("BSD-3-Clause") + version("master", branch="master") version("1.1.6", sha256="a2f4e4f238c60ea78486e0c9ea5b3e2cdd9d91c2ae5ea006a1d33a12e9eafa3a") version("1.1.5", sha256="4f18f3e8b50f20a89918e99596a7226c215944d84df642bc1fb2d6c31464b95b") diff --git a/var/spack/repos/builtin/packages/jansi-native/package.py b/var/spack/repos/builtin/packages/jansi-native/package.py index 770ba363ae86dd..26903db65248e9 100644 --- a/var/spack/repos/builtin/packages/jansi-native/package.py +++ b/var/spack/repos/builtin/packages/jansi-native/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class JansiNative(MavenPackage): homepage = "https://fusesource.github.io/jansi/" url = "https://github.com/fusesource/jansi-native/archive/jansi-native-1.8.tar.gz" + license("Apache-2.0") + version("1.8", sha256="053808f58495a5657c7e7f388008b02065fbbb3f231454bfcfa159adc2e2fcea") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/jansi/package.py b/var/spack/repos/builtin/packages/jansi/package.py index 4fbcecf2f36421..0aa6371b108aad 100644 --- a/var/spack/repos/builtin/packages/jansi/package.py +++ b/var/spack/repos/builtin/packages/jansi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jansi(MavenPackage): homepage = "https://fusesource.github.io/jansi/" url = "https://github.com/fusesource/jansi/archive/jansi-project-1.18.tar.gz" + license("Apache-2.0") + version("1.18", sha256="73cd47ecf370a33c6e76afb5d9a8abf99489361d7bd191781dbd9b7efd082aa5") version("1.17.1", sha256="3d7280eb14edc82e480d66b225470ed6a1da5c5afa4faeab7804a1f15e53b2cd") version("1.17", sha256="aa30765df4912d8bc1a00b1cb9e50b3534c060dec84f35f1d0c6fbf40ad71b67") diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py index 9d0f8ee37d701c..034040dcadba11 100644 --- a/var/spack/repos/builtin/packages/jansson/package.py +++ b/var/spack/repos/builtin/packages/jansson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jansson(CMakePackage): url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz" maintainers("ax3l") + license("MIT") + version("2.14", sha256="c739578bf6b764aa0752db9a2fdadcfe921c78f1228c7ec0bb47fa804c55d17b") version("2.13.1", sha256="f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0") version("2.13", sha256="beb47da10cb27668de3012cc193a1873a898ad5710a1126be9e6d3357beb5b30") diff --git a/var/spack/repos/builtin/packages/jasper/package.py b/var/spack/repos/builtin/packages/jasper/package.py index 912c45e8b3e474..a90cffe4c12d27 100644 --- a/var/spack/repos/builtin/packages/jasper/package.py +++ b/var/spack/repos/builtin/packages/jasper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/javafx/package.py b/var/spack/repos/builtin/packages/javafx/package.py index ceceb9f1c43f2f..fe3d767c8ef12e 100644 --- a/var/spack/repos/builtin/packages/javafx/package.py +++ b/var/spack/repos/builtin/packages/javafx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/jbigkit/package.py b/var/spack/repos/builtin/packages/jbigkit/package.py index 0072365b931b99..6a95bd304be4bf 100644 --- a/var/spack/repos/builtin/packages/jbigkit/package.py +++ b/var/spack/repos/builtin/packages/jbigkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/jblob/package.py b/var/spack/repos/builtin/packages/jblob/package.py index 00291609db39fb..e9c67f366c6e5b 100644 --- a/var/spack/repos/builtin/packages/jblob/package.py +++ b/var/spack/repos/builtin/packages/jblob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/jchronoss/package.py b/var/spack/repos/builtin/packages/jchronoss/package.py index d06d7823e3739d..c6a991b33dd9ac 100644 --- a/var/spack/repos/builtin/packages/jchronoss/package.py +++ b/var/spack/repos/builtin/packages/jchronoss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jchronoss(CMakePackage): homepage = "https://jchronoss.hpcframework.com" url = "https://fs.paratools.com/mpc/contrib/apps/jchronoss/JCHRONOSS-1.2.tar.gz" + license("CECILL-C") + version("1.2.1", sha256="ee5620f694d0adb584d19c63da16e284683b89fa76d0fc680c4e5e481cd5766a") version("1.2", sha256="52a565a28c0b83b433065060863d29f2b3e4b05f4f26b7a5893a21a2c66d6eba") version("1.1.1", sha256="5a11463b7295817f503c58dda1a82c0d3568bdee5e9d13d59e00d337ba84dc45") diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 90cbeb900e474d..b0bdf2e8e3721b 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/jedi-cmake/package.py b/var/spack/repos/builtin/packages/jedi-cmake/package.py index 84759fb50611ba..145afe532acdb0 100644 --- a/var/spack/repos/builtin/packages/jedi-cmake/package.py +++ b/var/spack/repos/builtin/packages/jedi-cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class JediCmake(CMakePackage): maintainers("climbfuji") + license("Apache-2.0") + version("master", branch="master", no_cache=True) version("develop", branch="develop", no_cache=True) version( diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index 47f78b7d5ea481..6bd9df99244fca 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Jellyfish(AutotoolsPackage): url = "https://github.com/gmarcais/Jellyfish/releases/download/v2.3.0/jellyfish-2.3.0.tar.gz" list_url = "https://github.com/gmarcais/Jellyfish/releases" + license("GPL-3.0-only") + version("2.3.0", sha256="e195b7cf7ba42a90e5e112c0ed27894cd7ac864476dc5fb45ab169f5b930ea5a") version( "2.2.7", diff --git a/var/spack/repos/builtin/packages/jemalloc/package.py b/var/spack/repos/builtin/packages/jemalloc/package.py index 646120ebb02913..938e506b2ac610 100644 --- a/var/spack/repos/builtin/packages/jemalloc/package.py +++ b/var/spack/repos/builtin/packages/jemalloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,7 @@ 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") + license("BSD-2-Clause") version("5.3.0", sha256="2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa") version("5.2.1", sha256="34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6") diff --git a/var/spack/repos/builtin/packages/jetty-project/package.py b/var/spack/repos/builtin/packages/jetty-project/package.py index 2ec507c9881717..fa0eb17fc5a44f 100644 --- a/var/spack/repos/builtin/packages/jetty-project/package.py +++ b/var/spack/repos/builtin/packages/jetty-project/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class JettyProject(MavenPackage): homepage = "https://www.eclipse.org/jetty" url = "https://github.com/eclipse/jetty.project/archive/jetty-9.4.31.v20200723.tar.gz" + license("Apache-2.0") + version( "9.4.31.v20200723", sha256="3cab80ddc14763764509552d79d5f1f17b565a3eb0a1951991d4a6fcfee9b4b1", diff --git a/var/spack/repos/builtin/packages/jhpcn-df/package.py b/var/spack/repos/builtin/packages/jhpcn-df/package.py index 6854ced077e33a..5f266d1936a883 100644 --- a/var/spack/repos/builtin/packages/jhpcn-df/package.py +++ b/var/spack/repos/builtin/packages/jhpcn-df/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class JhpcnDf(CMakePackage): homepage = "https://avr-aics-riken.github.io/JHPCN-DF/" url = "https://github.com/avr-aics-riken/JHPCN-DF/archive/1.1.0.tar.gz" + license("BSD-2-Clause") + version("1.1.0", sha256="106d99cc4faac5c76e51e8bfe3193c1d3dc91648072cf418d868ed830592b04b") variant("lz4", default=False, description="Enable lz4") diff --git a/var/spack/repos/builtin/packages/jimtcl/package.py b/var/spack/repos/builtin/packages/jimtcl/package.py index 4160d080aa0648..35fc0ed7d09acc 100644 --- a/var/spack/repos/builtin/packages/jimtcl/package.py +++ b/var/spack/repos/builtin/packages/jimtcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Jimtcl(AutotoolsPackage): homepage = "http://jim.tcl.tk/" url = "https://github.com/msteveb/jimtcl/archive/0.79.tar.gz" + license("BSD-2-Clause") + version("0.82", sha256="e8af929b815e4d30e54ff116b2b933e56c00a02b9110529d1a58660b2469aea7") version("0.79", sha256="ab8204cd03b946f5149e1273af9c86d8e73b146084a0fbeb1d4f41a75b0b3411") version("0.78", sha256="cf801795c9fd98bfff6882c14afdf96424ba86dead58c2a4e15978b176d3e12b") diff --git a/var/spack/repos/builtin/packages/jline3/package.py b/var/spack/repos/builtin/packages/jline3/package.py index c1ae78d2956561..7b2399fe01a0bb 100644 --- a/var/spack/repos/builtin/packages/jline3/package.py +++ b/var/spack/repos/builtin/packages/jline3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Jline3(MavenPackage): homepage = "https://github.com/jline/jline3/" url = "https://github.com/jline/jline3/archive/jline-parent-3.16.0.tar.gz" + license("BSD-3-Clause") + version("3.22.0", sha256="610ff2fca902f006d230d05be4eb6d62f345bb64371a279d521373c7b61a6279") version("3.16.0", sha256="d2de8dfe55a55e20752aeb082a75192bf835baaab75f257d3fab90ce350fdbcb") version("3.15.0", sha256="3953c22efad2d525f1d1fbf8f02baa302da21c18f3f60a19ee216e819fab9ac1") diff --git a/var/spack/repos/builtin/packages/jmol/package.py b/var/spack/repos/builtin/packages/jmol/package.py index 12cf0611281f8c..a3eba1e202394c 100644 --- a/var/spack/repos/builtin/packages/jmol/package.py +++ b/var/spack/repos/builtin/packages/jmol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Jmol(Package): homepage = "http://jmol.sourceforge.net/" url = "https://sourceforge.net/projects/jmol/files/Jmol/Version%2014.8/Jmol%2014.8.0/Jmol-14.8.0-binary.tar.gz" + license("LGPL-2.1-or-later") + version("14.31.0", sha256="eee0703773607c8bd6d51751d0d062c3e10ce44c11e1d7828e4ea3d5f710e892") version("14.8.0", sha256="8ec45e8d289aa0762194ca71848edc7d736121ddc72276031a253a3651e6d588") diff --git a/var/spack/repos/builtin/packages/jogl/package.py b/var/spack/repos/builtin/packages/jogl/package.py index 21351c4ef88010..0e03ff63194461 100644 --- a/var/spack/repos/builtin/packages/jogl/package.py +++ b/var/spack/repos/builtin/packages/jogl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Jogl(Package): homepage = "https://jogamp.org/jogl/www/" git = "https://github.com/WadeWalker/jogl.git" + license("Apache-2.0") + version("java-11-fixes", branch="java-11-fixes", submodules=True) depends_on("ant", type="build") diff --git a/var/spack/repos/builtin/packages/jose/package.py b/var/spack/repos/builtin/packages/jose/package.py index 47f46787336fac..3f997647f9e7bd 100644 --- a/var/spack/repos/builtin/packages/jose/package.py +++ b/var/spack/repos/builtin/packages/jose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Jose(AutotoolsPackage): homepage = "https://github.com/latchset/jose/" url = "https://github.com/latchset/jose/releases/download/v10/jose-10.tar.bz2" + license("Apache-2.0") + version("10", sha256="5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72") version("9", sha256="64262b1344d92fc183f70ca93db6100cd97b3dfa7cddea1e08e8588e6cd681eb") version("8", sha256="24e3d71e3da5a7913ab3c299381d76dfde488d91cb108b1a9527454bf1e9dc51") diff --git a/var/spack/repos/builtin/packages/jpegoptim/package.py b/var/spack/repos/builtin/packages/jpegoptim/package.py index a829fefd89f8c3..070889c15ea9ad 100644 --- a/var/spack/repos/builtin/packages/jpegoptim/package.py +++ b/var/spack/repos/builtin/packages/jpegoptim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Jpegoptim(AutotoolsPackage): homepage = "https://www.iki.fi/tjko/projects.html" url = "https://github.com/tjko/jpegoptim/archive/RELEASE.1.4.6.tar.gz" + license("GPL-2.0-or-later") + version("1.4.6", sha256="c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52") version("1.4.5", sha256="53207f479f96c4f792b3187f31abf3534d69c88fe23720d0c23f5310c5d2b2f5") version("1.4.4", sha256="bc6b018ae8c3eb12d07596693d54243e214780a2a2303a6578747d3671f45da3") diff --git a/var/spack/repos/builtin/packages/jq/package.py b/var/spack/repos/builtin/packages/jq/package.py index bf18be3cea9374..effafa8ee2b2a2 100644 --- a/var/spack/repos/builtin/packages/jq/package.py +++ b/var/spack/repos/builtin/packages/jq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Jq(AutotoolsPackage): homepage = "https://stedolan.github.io/jq/" url = "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz" + license("MIT") + version("1.6", sha256="5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72") version("1.5", sha256="c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c") diff --git a/var/spack/repos/builtin/packages/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py index 26f9101985be73..c5ebb20a458fce 100644 --- a/var/spack/repos/builtin/packages/json-c/package.py +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class JsonC(CMakePackage, AutotoolsPackage): homepage = "https://github.com/json-c/json-c/wiki" url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz" + license("MIT") + version("0.16", sha256="8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b") version("0.15", sha256="b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6") version("0.14", sha256="b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870") diff --git a/var/spack/repos/builtin/packages/json-cwx/package.py b/var/spack/repos/builtin/packages/json-cwx/package.py index aff0d77ecd779d..b0b0091c9e903b 100644 --- a/var/spack/repos/builtin/packages/json-cwx/package.py +++ b/var/spack/repos/builtin/packages/json-cwx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class JsonCwx(AutotoolsPackage): homepage = "https://github.com/LLNL/json-cwx" url = "https://github.com/LLNL/json-cwx/archive/0.12.tar.gz" + license("JSON") + version("0.12", sha256="3bfae1f23eacba53ee130dbd1a6acf617af4627a9b4e4581d64b20a99b4e2b60") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/json-fortran/package.py b/var/spack/repos/builtin/packages/json-fortran/package.py index 65557695fe7f83..334cd6093ec69b 100644 --- a/var/spack/repos/builtin/packages/json-fortran/package.py +++ b/var/spack/repos/builtin/packages/json-fortran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class JsonFortran(CMakePackage): url = "https://github.com/jacobwilliams/json-fortran/archive/8.3.0.tar.gz" git = "https://github.com/jacobwilliams" + license("BSD-3-Clause") + version("master", branch="master") version("8.3.0", sha256="5fe9ad709a726416cec986886503e0526419742e288c4e43f63c1c22026d1e8a") version("8.2.5", sha256="16eec827f64340c226ba9a8463f001901d469bc400a1e88b849f258f9ef0d100") diff --git a/var/spack/repos/builtin/packages/json-glib/package.py b/var/spack/repos/builtin/packages/json-glib/package.py index 7090768ce076fc..75a8856c9f516a 100644 --- a/var/spack/repos/builtin/packages/json-glib/package.py +++ b/var/spack/repos/builtin/packages/json-glib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class JsonGlib(MesonPackage): list_url = "https://ftp.gnome.org/pub/gnome/sources/json-glib/" list_depth = 1 + license("LGPL-2.1-or-later") + version("1.6.6", sha256="96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e") version( "1.5.2", diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index bd20e2b22e1a23..8c5050761f5590 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Jsoncpp(CMakePackage, MesonPackage): url = "https://github.com/open-source-parsers/jsoncpp/archive/1.7.3.tar.gz" tags = ["windows"] + license("Public-Domain") + version("1.9.5", sha256="f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2") version("1.9.4", sha256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999") version("1.9.3", sha256="8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d") diff --git a/var/spack/repos/builtin/packages/jsonnet/package.py b/var/spack/repos/builtin/packages/jsonnet/package.py index c9f8fba1d2207c..e5db816c56a13d 100644 --- a/var/spack/repos/builtin/packages/jsonnet/package.py +++ b/var/spack/repos/builtin/packages/jsonnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Jsonnet(MakefilePackage): maintainers("jcpunk") + license("Apache-2.0") + version("master", branch="master") version("0.18.0", sha256="85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4") version("0.17.0", sha256="076b52edf888c01097010ad4299e3b2e7a72b60a41abbc65af364af1ed3c8dbe") diff --git a/var/spack/repos/builtin/packages/jstorm/package.py b/var/spack/repos/builtin/packages/jstorm/package.py index 58eb594e2bfc4c..49e9405c1a4384 100644 --- a/var/spack/repos/builtin/packages/jstorm/package.py +++ b/var/spack/repos/builtin/packages/jstorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jstorm(Package): homepage = "https://github.com/alibaba/jstorm" url = "https://github.com/alibaba/jstorm/releases/download/2.4.0/jstorm-2.4.0.tgz" + license("Apache-2.0") + version("2.4.0", sha256="8a3965cb51ff95395a40e8d9fd83f12b0aad15c2726c74a796d8085cccc9d69f") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/jube/package.py b/var/spack/repos/builtin/packages/jube/package.py index e63ec08abc484d..dac82cac148734 100644 --- a/var/spack/repos/builtin/packages/jube/package.py +++ b/var/spack/repos/builtin/packages/jube/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Jube(PythonPackage): homepage = "https://www.fz-juelich.de/jsc/jube/" url = "https://apps.fz-juelich.de/jsc/jube/jube2/download.php?version=2.2.2" + license("GPL-3.0-or-later") + version( "2.5.1", sha256="4c9a754b0e6f2b5e8cd0f5bd643dcfd7863a96b05cd02141d5eb301f2b89f6a3", diff --git a/var/spack/repos/builtin/packages/judy/package.py b/var/spack/repos/builtin/packages/judy/package.py index afa5294cde5fd0..7dec30271082b5 100644 --- a/var/spack/repos/builtin/packages/judy/package.py +++ b/var/spack/repos/builtin/packages/judy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Judy(AutotoolsPackage): homepage = "http://judy.sourceforge.net/" url = "http://downloads.sourceforge.net/project/judy/judy/Judy-1.0.5/Judy-1.0.5.tar.gz" + license("LGPL-2.0-only") + version("1.0.5", sha256="d2704089f85fdb6f2cd7e77be21170ced4b4375c03ef1ad4cf1075bd414a63eb") parallel = False diff --git a/var/spack/repos/builtin/packages/julea/package.py b/var/spack/repos/builtin/packages/julea/package.py index 6447e9602c4058..4d1f336fd77fa9 100644 --- a/var/spack/repos/builtin/packages/julea/package.py +++ b/var/spack/repos/builtin/packages/julea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Julea(MesonPackage): tags = ["HPC", "I/O", "storage"] maintainers("michaelkuhn") + license("LGPL-3.0-or-later") + version("master", branch="master") variant("hdf5", default=True, description="Enable HDF5 support") diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 4115f148726d13..1b9199e3cf670b 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,7 @@ class Julia(MakefilePackage): maintainers("vchuravy", "haampie", "giordano") version("master", branch="master") + version("1.9.3", sha256="8d7dbd8c90e71179e53838cdbe24ff40779a90d7360e29766609ed90d982081d") version("1.9.2", sha256="015438875d591372b80b09d01ba899657a6517b7c72ed41222298fef9d4ad86b") version("1.9.0", sha256="48f4c8a7d5f33d0bc6ce24226df20ab49e385c2d0c3767ec8dfdb449602095b2") version("1.8.5", sha256="d31026cc6b275d14abce26fd9fd5b4552ac9d2ce8bde4291e494468af5743031") @@ -59,6 +60,7 @@ class Julia(MakefilePackage): depends_on("libuv", when="@:1.7") depends_on("libuv-julia@1.42.0", when="@1.8.0:1.8.1") depends_on("libuv-julia@1.44.2", when="@1.8.2:") + depends_on("suite-sparse@5.4:5.10", when="@1.6:1.9") with when("@1.9.0:1.9"): # libssh2.so.1, libpcre2-8.so.0, mbedtls.so.14, mbedcrypto.so.7, mbedx509.so.1 @@ -123,24 +125,24 @@ class Julia(MakefilePackage): "llvm", when="^llvm@12.0.1", patches=patch( - "https://github.com/JuliaLang/llvm-project/compare/fed41342a82f5a3a9201819a82bf7a48313e296b...980d2f60a8524c5546397db9e8bbb7d6ea56c1b7.patch", - sha256="37f2f6193e1205ea49b9a56100a70b038b64abf402115f263c6132cdf0df80c3", + "https://raw.githubusercontent.com/spack/patches/master/julia/10cb42f80c2eaad3e9c87cb818b6676f1be26737bdf972c77392d71707386aa4.patch", + sha256="10cb42f80c2eaad3e9c87cb818b6676f1be26737bdf972c77392d71707386aa4", ), ) depends_on( "llvm", when="^llvm@13.0.1", patches=patch( - "https://github.com/JuliaLang/llvm-project/compare/75e33f71c2dae584b13a7d1186ae0a038ba98838...2f4460bd46aa80d4fe0d80c3dabcb10379e8d61b.patch", - sha256="d9e7f0befeddddcba40eaed3895c4f4734980432b156c39d7a251bc44abb13ca", + "https://raw.githubusercontent.com/spack/patches/master/julia/45f72c59ae5cf45461e9cd8b224ca49b739d885c79b3786026433c6c22f83b5f.patch", + sha256="45f72c59ae5cf45461e9cd8b224ca49b739d885c79b3786026433c6c22f83b5f", ), ) depends_on( "llvm", when="^llvm@14.0.6", patches=patch( - "https://github.com/JuliaLang/llvm-project/compare/f28c006a5895fc0e329fe15fead81e37457cb1d1...381043941d2c7a5157a011510b6d0386c171aae7.diff", - sha256="f3fd1803459bdaac0e26d0f3b1874b0e3f97e9411a9e98043d36f788ab4fd00e", + "https://raw.githubusercontent.com/spack/patches/master/julia/f3def26930832532bbcd861d41b31ae03db993bc2b3510f89ef831a30bd3e099.patch", + sha256="f3def26930832532bbcd861d41b31ae03db993bc2b3510f89ef831a30bd3e099", ), ) @@ -163,9 +165,11 @@ class Julia(MakefilePackage): ) # patchelf 0.13 is required because the rpath patch uses --add-rpath - depends_on("patchelf@0.13:", type="build") + # patchelf 0.18 breaks (at least) libjulia-internal.so + depends_on("patchelf@0.13:0.17", type="build") depends_on("perl", type="build") depends_on("libwhich", type="build") + depends_on("which", type="build") # for detecting 7z, lld, dsymutil depends_on("python", type="build") depends_on("blas") # note: for now openblas is fixed... @@ -194,6 +198,13 @@ class Julia(MakefilePackage): patch("use-add-rpath.patch", when="@:1.8.0") patch("use-add-rpath-2.patch", when="@1.8.1:1.8") + # Fix the path to Spack llvm's lld and dsymutil + patch( + "https://github.com/JuliaLang/julia/commit/55c13d234c1523861b278f7989b1af105ef0e88f.patch?full_index=1", + sha256="00569f40e1845329060a714813e509677949e633a0e833c40a3c70dcf9269cc1", + when="@1.9:1.10", + ) + # Fix libstdc++ not being found (https://github.com/JuliaLang/julia/issues/47987) patch( "https://github.com/JuliaLang/julia/pull/48342.patch?full_index=1", diff --git a/var/spack/repos/builtin/packages/junit4/package.py b/var/spack/repos/builtin/packages/junit4/package.py index 22ad602b501ed8..4784f2bd4d41d8 100644 --- a/var/spack/repos/builtin/packages/junit4/package.py +++ b/var/spack/repos/builtin/packages/junit4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Junit4(MavenPackage): homepage = "https://github.com/junit-team/junit4/wiki" url = "https://github.com/junit-team/junit4/archive/r4.13.tar.gz" + license("EPL-1.0") + version("4.13.2", sha256="1b6d700fc374c82951d247f6d80238951d87c61661ceb151f9fbf40f65413561") version("4.13", sha256="c4e8f5681ad387a386a5aebe05ed4b73ffbfff963e154fbc4d77090f230777c7") version("4.12", sha256="9a5b458258c6537df0d2df7122a06895a26b9c7c8061e5991a0be81d76b10d24") diff --git a/var/spack/repos/builtin/packages/justbuild/package.py b/var/spack/repos/builtin/packages/justbuild/package.py index 06a350821fbcba..90f465933191c8 100644 --- a/var/spack/repos/builtin/packages/justbuild/package.py +++ b/var/spack/repos/builtin/packages/justbuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,11 @@ class Justbuild(Package): maintainers("asartori86") + license("Apache-2.0") + version("master", branch="master") + version("1.2.4", tag="v1.2.4", commit="215e6afab93d28aeea54cb2c657afda0e5453307") + version("1.2.3", tag="v1.2.3", commit="45e9c1c85399f00372ad8b72894979a0002d8f95") version("1.2.2", tag="v1.2.2", commit="e1ee04684c34ae30ac3c91b6753e99a81a9dc51c") version("1.2.1", tag="v1.2.1", commit="959cd90083d0c783389cd09e187c98322c16469f") version("1.1.4", tag="v1.1.4", commit="32e96afd159f2158ca129fd00bf02c273d8e1e48") diff --git a/var/spack/repos/builtin/packages/jwt-cpp/package.py b/var/spack/repos/builtin/packages/jwt-cpp/package.py index 42175687e63b5c..f0a97848247dc7 100644 --- a/var/spack/repos/builtin/packages/jwt-cpp/package.py +++ b/var/spack/repos/builtin/packages/jwt-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class JwtCpp(CMakePackage): maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb") + license("MIT") + version("0.6.0", sha256="0227bd6e0356b211341075c7997c837f0b388c01379bd256aa525566a5553f03") version("0.5.2", sha256="d3188f9611597eb1bb285169879e1d87202bf10a08e4e7734c9f2097bfd4a850") version("0.5.1", sha256="d8f5ffb361824630b3b6f4aad26c730c915081071040c232ac57947d6177ef4f") diff --git a/var/spack/repos/builtin/packages/jxrlib-debian/package.py b/var/spack/repos/builtin/packages/jxrlib-debian/package.py index 8caeed9557702c..b1c239aa37beff 100644 --- a/var/spack/repos/builtin/packages/jxrlib-debian/package.py +++ b/var/spack/repos/builtin/packages/jxrlib-debian/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class JxrlibDebian(MakefilePackage): variant("shared", default=False, description="Build shared libs") + license("BSD-2-Clause") + version( "1.2_git20170615.f752187-5", sha256="3d9d5d6ca972b51259efe1f37a8e42892e90920b13308d70b8a24eb9a82bf34c", diff --git a/var/spack/repos/builtin/packages/k8/package.py b/var/spack/repos/builtin/packages/k8/package.py index 9ca18bf6784006..14452606a6a38d 100644 --- a/var/spack/repos/builtin/packages/k8/package.py +++ b/var/spack/repos/builtin/packages/k8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kadath/package.py b/var/spack/repos/builtin/packages/kadath/package.py index ae266997042a13..ec6ac84b9a861e 100644 --- a/var/spack/repos/builtin/packages/kadath/package.py +++ b/var/spack/repos/builtin/packages/kadath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Kadath(CMakePackage): maintainers("eschnett") + license("GPL-3.0-or-later") + version("fuka", branch="fuka") variant("mpi", default=True, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/kafka/package.py b/var/spack/repos/builtin/packages/kafka/package.py index 228bd8e0a3f194..62397025a08a4a 100644 --- a/var/spack/repos/builtin/packages/kafka/package.py +++ b/var/spack/repos/builtin/packages/kafka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Kafka(Package): list_url = "https://www-eu.apache.org/dist/kafka/" list_depth = 1 + license("EPL-2.0") + version( "2.13-3.5.1", sha256="f7b74d544023f2c0ec52a179de59975cb64e34ea03650d829328b407b560e4da" ) diff --git a/var/spack/repos/builtin/packages/kahip/package.py b/var/spack/repos/builtin/packages/kahip/package.py index 83368070631567..a623635468ffa4 100644 --- a/var/spack/repos/builtin/packages/kahip/package.py +++ b/var/spack/repos/builtin/packages/kahip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Kahip(CMakePackage): git = "https://github.com/KaHIP/KaHIP.git" maintainers("ma595") + license("MIT") + version("develop", branch="master") version("3.14", sha256="9da04f3b0ea53b50eae670d6014ff54c0df2cb40f6679b2f6a96840c1217f242") version("3.13", sha256="fae21778a4ce8e59ccb98e5cbb6c01f0af7e594657d21f6c0eb2c6e74398deb1") diff --git a/var/spack/repos/builtin/packages/kaiju/package.py b/var/spack/repos/builtin/packages/kaiju/package.py index 9d9a4fabe2b0c2..b15b030360cdf4 100644 --- a/var/spack/repos/builtin/packages/kaiju/package.py +++ b/var/spack/repos/builtin/packages/kaiju/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Kaiju(MakefilePackage): homepage = "https://github.com/bioinformatics-centre/kaiju" url = "https://github.com/bioinformatics-centre/kaiju/archive/v1.6.2.zip" + license("GPL-3.0-or-later") + version("1.6.2", sha256="2685fed7e27ddeb26530fd60a4b388f2d5f3e29aaa79f8e2e6abcbac64075db8") build_directory = "src" diff --git a/var/spack/repos/builtin/packages/kakoune/package.py b/var/spack/repos/builtin/packages/kakoune/package.py index bf251636a9d607..345a69f3ae887e 100644 --- a/var/spack/repos/builtin/packages/kakoune/package.py +++ b/var/spack/repos/builtin/packages/kakoune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,11 @@ class Kakoune(MakefilePackage): maintainers("Bambi") + license("Unlicense") + + version( + "2023.08.05", sha256="3e45151e0addd3500de2d6a29b5aacf2267c42bb256d44a782e73defb29cda5c" + ) version( "2021.11.08", sha256="aa30889d9da11331a243a8f40fe4f6a8619321b19217debac8f565e06eddb5f4" ) @@ -23,6 +28,8 @@ class Kakoune(MakefilePackage): depends_on("ncurses") conflicts("%gcc@:8", when="@2021.11.08", msg="GCC version must be at least 9.0!") + conflicts("%gcc@:10.2", when="@2023.08.05", msg="GCC version must be at least 10.3!") + conflicts("%llvm@:10", when="@2023.08.05", msg="Clang version must be at least 11!") build_targets = ["all", "man"] diff --git a/var/spack/repos/builtin/packages/kaks-calculator/package.py b/var/spack/repos/builtin/packages/kaks-calculator/package.py index 114419d4ef8110..c82f20469c2ecf 100644 --- a/var/spack/repos/builtin/packages/kaks-calculator/package.py +++ b/var/spack/repos/builtin/packages/kaks-calculator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 8d55c9e22e9401..576c0850da5d4f 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Kaldi(Package): # Does not use Autotools homepage = "https://github.com/kaldi-asr/kaldi" git = "https://github.com/kaldi-asr/kaldi.git" + license("Apache-2.0") + version("master") version("2021-11-16", commit="6e03a3f5f99d6d8c22494d90b7e7f9ceb0117ac8") version("2019-09-29", commit="6ffde4b41c58de778245149690927d592cd5956a") diff --git a/var/spack/repos/builtin/packages/kalign/package.py b/var/spack/repos/builtin/packages/kalign/package.py index 949fbbc6289c93..a4c0632c083198 100644 --- a/var/spack/repos/builtin/packages/kalign/package.py +++ b/var/spack/repos/builtin/packages/kalign/package.py @@ -1,20 +1,32 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack.package import * -class Kalign(AutotoolsPackage): +class Kalign(AutotoolsPackage, CMakePackage): """A fast multiple sequence alignment program for biological sequences.""" homepage = "https://github.com/TimoLassmann/kalign" url = "https://github.com/TimoLassmann/kalign/archive/refs/tags/v3.3.1.tar.gz" + license("GPL-3.0-or-later") + + version("3.4.0", sha256="67d1a562d54b3b7622cc3164588c05b9e2bf8f1a5140bb48a4e816c61a87d4a8") version("3.3.1", sha256="7f10acf9a3fa15deabbc0304e7c14efa25cea39108318c9f02b47257de2d7390") - depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("libtool", type="build") + build_system( + conditional("cmake", when="@3.4.0:"), + conditional("autotools", when="@3.3.1"), + default="cmake", + ) + + with when("build_system=cmake"): + depends_on("cmake@3.18:", type="build") + + with when("build_system=autotools"): + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py index 2e8cc2da93404e..a0cba6850c066f 100644 --- a/var/spack/repos/builtin/packages/kallisto/package.py +++ b/var/spack/repos/builtin/packages/kallisto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Kallisto(CMakePackage): homepage = "https://pachterlab.github.io/kallisto" url = "https://github.com/pachterlab/kallisto/archive/v0.43.1.tar.gz" + license("BSD-2-Clause") + version("0.48.0", sha256="1797ac4d1f0771e3f1f25dd7972bded735fcb43f853cf52184d3d9353a6269b0") version("0.46.2", sha256="c447ca8ddc40fcbd7d877d7c868bc8b72807aa8823a8a8d659e19bdd515baaf2") version("0.43.1", sha256="7baef1b3b67bcf81dc7c604db2ef30f5520b48d532bf28ec26331cb60ce69400") diff --git a/var/spack/repos/builtin/packages/karma/package.py b/var/spack/repos/builtin/packages/karma/package.py index 6849bafdfb4abc..2eb1a78ef8b4c3 100644 --- a/var/spack/repos/builtin/packages/karma/package.py +++ b/var/spack/repos/builtin/packages/karma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kassiopeia/package.py b/var/spack/repos/builtin/packages/kassiopeia/package.py index 004d47756841c1..17adf4970f587b 100644 --- a/var/spack/repos/builtin/packages/kassiopeia/package.py +++ b/var/spack/repos/builtin/packages/kassiopeia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kbd/package.py b/var/spack/repos/builtin/packages/kbd/package.py index 75e5ad08fbf9a4..561f5ae57bc35e 100644 --- a/var/spack/repos/builtin/packages/kbd/package.py +++ b/var/spack/repos/builtin/packages/kbd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Kbd(AutotoolsPackage): homepage = "https://kbd-project.org/" url = "https://github.com/legionus/kbd/archive/v2.3.0.tar.gz" + license("GPL-2.0-or-later") + version("2.3.0", sha256="28f05450cfde08259341b9641d222027844c075f77a2bac6ce143b3f33a6eb4e") version("2.2.90", sha256="a310a915f474c85ee28cd860677a34a529aca940daa44634a428dd6df58c196e") version("2.2.0", sha256="5dec023c7a05b4d11d8ae795f59fab2b0bacfcc5c20a3d534dc7566cfe47ccf7") diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py index 9468833eeead85..c8e61288a9dffb 100644 --- a/var/spack/repos/builtin/packages/kbproto/package.py +++ b/var/spack/repos/builtin/packages/kbproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kcov/package.py b/var/spack/repos/builtin/packages/kcov/package.py index 2c7a4009372c35..f0cfb30ec95ef1 100644 --- a/var/spack/repos/builtin/packages/kcov/package.py +++ b/var/spack/repos/builtin/packages/kcov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Kcov(CMakePackage): homepage = "https://simonkagstrom.github.io/kcov/index.html" url = "https://github.com/SimonKagstrom/kcov/archive/38.tar.gz" + license("GPL-2.0-or-later") + version("38", sha256="b37af60d81a9b1e3b140f9473bdcb7975af12040feb24cc666f9bb2bb0be68b4") depends_on("cmake@2.8.4:", type="build") diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py index 94f63f31d5fba3..3dc83d23b0c05d 100644 --- a/var/spack/repos/builtin/packages/kdiff3/package.py +++ b/var/spack/repos/builtin/packages/kdiff3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Kdiff3(Package): homepage = "http://kdiff3.sourceforge.net/" url = "https://downloads.sourceforge.net/project/kdiff3/kdiff3/0.9.98/kdiff3-0.9.98.tar.gz" + license("GPL-2.0-or-later") + version("0.9.98", sha256="802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668") depends_on("qt@:4,5.2.0:") diff --git a/var/spack/repos/builtin/packages/kea/package.py b/var/spack/repos/builtin/packages/kea/package.py index ebc4077398cff6..58d7e5e5fa868e 100644 --- a/var/spack/repos/builtin/packages/kea/package.py +++ b/var/spack/repos/builtin/packages/kea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Kea(AutotoolsPackage): homepage = "https://www.isc.org/kea/" url = "https://downloads.isc.org/isc/kea/1.6.2/kea-1.6.2.tar.gz" + license("MPL-2.0") + version("1.6.2", sha256="2af7336027143c3e98d8d1d44165b2c2cbb0252a92bd88f6dd4d2c6adb69d7b5") depends_on("m4", type="build") diff --git a/var/spack/repos/builtin/packages/kealib/package.py b/var/spack/repos/builtin/packages/kealib/package.py index 3d9bdd7629c6b2..f7691cfc83848e 100644 --- a/var/spack/repos/builtin/packages/kealib/package.py +++ b/var/spack/repos/builtin/packages/kealib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,12 +24,15 @@ class Kealib(CMakePackage): """ homepage = "http://www.kealib.org/" - url = "https://github.com/ubarsc/kealib/releases/download/kealib-1.5.2/kealib-1.5.2.tar.gz" + url = "https://github.com/ubarsc/kealib/releases/download/kealib-1.5.3/kealib-1.5.3.tar.gz" git = "https://github.com/ubarsc/kealib" maintainers("gillins", "neilflood", "petebunting") + license("MIT") + version("develop", git=git) + version("1.5.3", sha256="32b2e3c90553a03cf1e8d03781c3710500ca919bca674bc370e86f15338ee93e") version("1.5.2", sha256="c4e17c472761a39e45184b5fa687395b319ac75430e0f6584dbf4cec6e335572") version("1.5.1", sha256="06cd547b1e40394b9539beaf6982bd249e8ee93d6150295e9cd9161d00829657") version("1.5.0", sha256="d19a0fb051019f87fe413bda76472bf4fff8fca52ede92e0ffd983caeafd05b8") diff --git a/var/spack/repos/builtin/packages/keepalived/package.py b/var/spack/repos/builtin/packages/keepalived/package.py index d8116266a8a891..e7f2333d1d7de8 100644 --- a/var/spack/repos/builtin/packages/keepalived/package.py +++ b/var/spack/repos/builtin/packages/keepalived/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Keepalived(AutotoolsPackage): homepage = "https://www.keepalived.org" url = "https://www.keepalived.org/software/keepalived-1.2.0.tar.gz" + license("GPL-2.0-only") + version("2.0.19", sha256="0e2f8454765bc6a5fa26758bd9cec18aae42882843cdd24848aff0ae65ce4ca7") version("2.0.18", sha256="1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0") version("2.0.17", sha256="8965ffa2ffe243014f9c0245daa65f00a9930cf746edf33525d28a86f97497b4") diff --git a/var/spack/repos/builtin/packages/keepassxc/package.py b/var/spack/repos/builtin/packages/keepassxc/package.py index 2ecc7d894dba9c..677c72ecfa5ca0 100644 --- a/var/spack/repos/builtin/packages/keepassxc/package.py +++ b/var/spack/repos/builtin/packages/keepassxc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Keepassxc(CMakePackage): maintainers("cessenat") + license("GPL-2.0-only OR GPL-3.0-only") + version("master", branch="master") version("2.7.1", sha256="6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7") version("2.7.0", sha256="83be76890904cd6703343fa097d68bcfdd99bb525cf518fa62a7df9293026aa7") diff --git a/var/spack/repos/builtin/packages/kentutils/package.py b/var/spack/repos/builtin/packages/kentutils/package.py index 0d096165a6ec7f..f1deffdcb64321 100644 --- a/var/spack/repos/builtin/packages/kentutils/package.py +++ b/var/spack/repos/builtin/packages/kentutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/keyutils/package.py b/var/spack/repos/builtin/packages/keyutils/package.py index f845b9ae172adb..45fbb4de5beeb6 100644 --- a/var/spack/repos/builtin/packages/keyutils/package.py +++ b/var/spack/repos/builtin/packages/keyutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Keyutils(MakefilePackage): homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/" url = "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.0-or-later") + version("1.6.1", sha256="3c71dcfc6900d07b02f4e061d8fb218a4ae6519c1d283d6a57b8e27718e2f557") version("1.6", sha256="c6a27b4e3d0122d921f3dcea4b1f02a8616ca844535960d6af76ef67d015b5cf") version("1.5.10", sha256="e1fdbde234c786b65609a4cf080a2c5fbdb57f049249c139160c85fc3dfa7da9") diff --git a/var/spack/repos/builtin/packages/kibana/package.py b/var/spack/repos/builtin/packages/kibana/package.py index 3f2a85ebfaf119..266a79685432d5 100644 --- a/var/spack/repos/builtin/packages/kibana/package.py +++ b/var/spack/repos/builtin/packages/kibana/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kicad/package.py b/var/spack/repos/builtin/packages/kicad/package.py index f6e5906126591e..81db728ecc0400 100644 --- a/var/spack/repos/builtin/packages/kicad/package.py +++ b/var/spack/repos/builtin/packages/kicad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Kicad(CMakePackage): url = "https://gitlab.com/kicad/code/kicad/-/archive/5.1.8/kicad-5.1.8.tar.gz" maintainers("aweits") + license("GPL-3.0-or-later") + version("7.0.2", sha256="8df56648226061c91ddd1d2ca970c66190fc70c7ace23c99cc28c209713e4dfc") version("5.1.9", sha256="841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b") version("5.1.8", sha256="bf24f8ef427b4a989479b8e4af0b8ae5c54766755f12748e2e88a922c5344ca4") diff --git a/var/spack/repos/builtin/packages/kim-api/package.py b/var/spack/repos/builtin/packages/kim-api/package.py index 6f0629d02ef072..0273fc2d6cac87 100644 --- a/var/spack/repos/builtin/packages/kim-api/package.py +++ b/var/spack/repos/builtin/packages/kim-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class KimApi(CMakePackage): maintainers("ellio167") + license("CDDL-1.0") + version("develop", branch="devel") version("2.2.1", sha256="1d5a12928f7e885ebe74759222091e48a7e46f77e98d9147e26638c955efbc8e") version("2.1.3", sha256="88a5416006c65a2940d82fad49de0885aead05bfa8b59f87d287db5516b9c467") diff --git a/var/spack/repos/builtin/packages/kinesis/package.py b/var/spack/repos/builtin/packages/kinesis/package.py index 7ed9dc37d57077..f40b566dfbf6b3 100644 --- a/var/spack/repos/builtin/packages/kinesis/package.py +++ b/var/spack/repos/builtin/packages/kinesis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Kinesis(MavenPackage): homepage = "https://aws.amazon.com/kinesis" url = "https://github.com/awslabs/amazon-kinesis-client/archive/v2.2.10.tar.gz" + license("Apache-2.0") + version("2.4.8", sha256="f69564aee09310e9e08864160f9b021da196c0957f2042468a0cdf74a48b2e8e") version("2.2.10", sha256="ab1fa33466d07c41d0bbf0d1c7d2380d6f5d2957dea040ca5fe911be83bfe9f9") version("2.2.9", sha256="8d743c2dae127ce7c08627e7944aad4ccf025b4d71aa5486b57469c32daf20e6") diff --git a/var/spack/repos/builtin/packages/kineto/package.py b/var/spack/repos/builtin/packages/kineto/package.py index 8f0ed34d057682..4c174114003c6a 100644 --- a/var/spack/repos/builtin/packages/kineto/package.py +++ b/var/spack/repos/builtin/packages/kineto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Kineto(CMakePackage): homepage = "https://github.com/pytorch/kineto" git = "https://github.com/pytorch/kineto.git" + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version( "2021-05-12", commit="a631215ac294805d5360e0ecceceb34de6557ba8", submodules=True diff --git a/var/spack/repos/builtin/packages/kitty/package.py b/var/spack/repos/builtin/packages/kitty/package.py index ee21b7ecc733cf..8ff092a50ba22e 100644 --- a/var/spack/repos/builtin/packages/kitty/package.py +++ b/var/spack/repos/builtin/packages/kitty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Kitty(Package): url = "https://github.com/kovidgoyal/kitty/archive/v0.12.3.tar.gz" git = "https://github.com/kovidgoyal/kitty.git" + license("GPL-3.0-only") + version("0.12.3", sha256="8d8a1f9c48519e618ac53b614056cf4589edb02fd1d19aa26d5f478e7067887e") version("0.12.2", sha256="f1ffb3d10adb9532f9591fc0bbeca527dda50d6d2b6b3934f0799300fd4eefc2") version("0.12.1", sha256="a3bf33e3d014635c6951fe4e3f2a0681173a1f44a9fa7a8ed4b60d20de53534a") diff --git a/var/spack/repos/builtin/packages/kmergenie/package.py b/var/spack/repos/builtin/packages/kmergenie/package.py index f7ed2aaab12dcf..962042f5a8904f 100644 --- a/var/spack/repos/builtin/packages/kmergenie/package.py +++ b/var/spack/repos/builtin/packages/kmergenie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Kmergenie(MakefilePackage): homepage = "http://kmergenie.bx.psu.edu/" url = "http://kmergenie.bx.psu.edu/kmergenie-1.7044.tar.gz" + license("CECILL-1.1") + version("1.7051", sha256="13148e5a2c700359cffca363b66ffa8f23c5db6af6eec03f739139ffdfee763f") version("1.7044", sha256="46f2a08a2d7b1885414143e436829dd7e61fcc31ec4e429433e516a168d2978e") diff --git a/var/spack/repos/builtin/packages/kmod/package.py b/var/spack/repos/builtin/packages/kmod/package.py index ca478f5863e263..3c0d1a2c15d876 100644 --- a/var/spack/repos/builtin/packages/kmod/package.py +++ b/var/spack/repos/builtin/packages/kmod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Kmod(AutotoolsPackage): homepage = "https://github.com/lucasdemarchi/kmod" url = "https://github.com/lucasdemarchi/kmod/archive/v27.tar.gz" + license("GPL-2.0-or-later") + version("27", sha256="969c4573b01f4c9e1d3e3c9d179bd16ec999bbb99dd55b7623f42551328478c3") version("26", sha256="f28bc40ead548dce4a8e956fccfc36fd80f2b40884d270b812f1bfbd886e858c") version("25", sha256="16a8bbd3ee321d0847847256ea2fd124f6250257c055c8cf97e78f18bf27559c") diff --git a/var/spack/repos/builtin/packages/knem/package.py b/var/spack/repos/builtin/packages/knem/package.py index 3e1bcd925c8b3b..ae6713cd3d1709 100644 --- a/var/spack/repos/builtin/packages/knem/package.py +++ b/var/spack/repos/builtin/packages/knem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py index fffaed9afc3219..c0582f19560fa9 100644 --- a/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-kernels-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kokkos-kernels/package.py b/var/spack/repos/builtin/packages/kokkos-kernels/package.py index 9f1cb88c4d72d9..2147046bf1fe00 100644 --- a/var/spack/repos/builtin/packages/kokkos-kernels/package.py +++ b/var/spack/repos/builtin/packages/kokkos-kernels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,10 +19,15 @@ class KokkosKernels(CMakePackage, CudaPackage): maintainers("lucbv", "srajama1", "brian-kelley") + license("BSD-3-Clause") + # generate checksum for each release tarball with the following command # openssl sha256 kokkos-kernels-x.y.z.tar.gz version("develop", branch="develop") version("master", branch="master") + version("4.2.00", sha256="c65df9a101dbbef2d8fd43c60c9ea85f2046bb3535fa1ad16e7c661ddd60401e") + version("4.1.00", sha256="d6a4108444ea226e43bf6a9c0dfc557f223a72b1142bf81aa78dd60e16ac2d56") + version("4.0.01", sha256="3f493fcb0244b26858ceb911be64092fbf7785616ad62c81abde0ea1ce86688a") version("4.0.00", sha256="750079d0be1282d18ecd280e130ca303044ac399f1e5864488284b92f5ce0a86") version("3.7.01", sha256="b2060f5894bdaf7f7d4793b90444fac260460cfa80595afcbcb955518864b446") version("3.7.00", sha256="51bc6db3995392065656848e2b152cfd1c3a95a951ab18a3934278113d59f32b") @@ -41,6 +46,9 @@ class KokkosKernels(CMakePackage, CudaPackage): depends_on("kokkos") depends_on("kokkos@master", when="@master") depends_on("kokkos@develop", when="@develop") + depends_on("kokkos@4.2.00", when="@4.2.00") + depends_on("kokkos@4.1.00", when="@4.1.00") + depends_on("kokkos@4.0.01", when="@4.0.01") depends_on("kokkos@4.0.00", when="@4.0.00") depends_on("kokkos@3.7.01", when="@3.7.01") depends_on("kokkos@3.7.00", when="@3.7.00") diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py index 4bf7e8584436fb..54548c0ae1472f 100644 --- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py b/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py index 1ecc52340c5b4e..e3bdc634719fc8 100644 --- a/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py +++ b/var/spack/repos/builtin/packages/kokkos-nvcc-wrapper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class KokkosNvccWrapper(Package): maintainers("Rombur") + license("BSD-3-Clause") + version("4.1.00", sha256="cf725ea34ba766fdaf29c884cfe2daacfdc6dc2d6af84042d1c78d0f16866275") version("4.0.01", sha256="bb942de8afdd519fd6d5d3974706bfc22b6585a62dd565c12e53bdb82cd154f0") version("4.0.00", sha256="1829a423883d4b44223c7c3a53d3c51671145aad57d7d23e6a1a4bebf710dcf6") diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 5eb7ce5cca0ac3..cf3faf8b295810 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,8 +23,11 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): maintainers("janciesko", "crtrott") + license("BSD-3-Clause") + version("master", branch="master") version("develop", branch="develop") + version("4.2.00", sha256="ac08765848a0a6ac584a0a46cd12803f66dd2a2c2db99bb17c06ffc589bf5be8") version("4.1.00", sha256="cf725ea34ba766fdaf29c884cfe2daacfdc6dc2d6af84042d1c78d0f16866275") version("4.0.01", sha256="bb942de8afdd519fd6d5d3974706bfc22b6585a62dd565c12e53bdb82cd154f0") version("4.0.00", sha256="1829a423883d4b44223c7c3a53d3c51671145aad57d7d23e6a1a4bebf710dcf6") @@ -155,6 +158,8 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): "gfx906": "vega906", "gfx908": "vega908", "gfx90a": "vega90A", + "gfx940": "amd_gfx940", + "gfx942": "amd_gfx942", "gfx1030": "navi1030", "gfx1100": "navi1100", } @@ -189,6 +194,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): for dev, (dflt, desc) in devices_variants.items(): variant(dev, default=dflt, description=desc) conflicts("+cuda", when="+rocm", msg="CUDA and ROCm are not compatible in Kokkos.") + depends_on("intel-oneapi-dpl", when="+sycl") for opt, (dflt, desc) in options_variants.items(): variant(opt, default=dflt, description=desc, when=("+cuda" if "cuda" in opt else None)) @@ -234,6 +240,13 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): # Patches patch("hpx_profiling_fences.patch", when="@3.5.00 +hpx") + patch("sycl_bhalft_test.patch", when="@4.2.00 +sycl") + # adds amd_gfx940 support to Kokkos 4.2.00 (upstreamed in https://github.com/kokkos/kokkos/pull/6671) + patch( + "https://github.com/rbberger/kokkos/commit/293319c5844f4d8eea51eb9cd1457115a5016d3f.patch?full_index=1", + sha256="145619e87dbf26b66ea23e76906576e2a854a3b09f2a2dd70363e61419fa6a6e", + when="@4.2.00", + ) variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch b/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch new file mode 100644 index 00000000000000..483bfc493ad075 --- /dev/null +++ b/var/spack/repos/builtin/packages/kokkos/sycl_bhalft_test.patch @@ -0,0 +1,14 @@ +diff -ruN spack-src/core/unit_test/TestNumericTraits.hpp spack-src-patched/core/unit_test/TestNumericTraits.hpp +--- spack-src/core/unit_test/TestNumericTraits.hpp 2023-11-20 13:26:46.000000000 -0800 ++++ spack-src-patched/core/unit_test/TestNumericTraits.hpp 2023-11-28 12:06:44.216150685 -0800 +@@ -110,8 +110,8 @@ + + KOKKOS_FUNCTION void operator()(Epsilon, int, int& e) const { + using Kokkos::Experimental::epsilon; +- auto const eps = epsilon::value; +- auto const one = T(1); ++ T const eps = epsilon::value; ++ T const one = 1; + // Avoid higher precision intermediate representation + compare() = one + eps; + e += (int)!(compare() != one); diff --git a/var/spack/repos/builtin/packages/kraken/package.py b/var/spack/repos/builtin/packages/kraken/package.py index f25f116aef37b0..6bfaef69c93f60 100644 --- a/var/spack/repos/builtin/packages/kraken/package.py +++ b/var/spack/repos/builtin/packages/kraken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Kraken(Package): homepage = "https://ccb.jhu.edu/software/kraken/" url = "https://github.com/DerrickWood/kraken/archive/v1.0.tar.gz" + license("GPL-3.0-or-later") + version("1.1.1", sha256="73e48f40418f92b8cf036ca1da727ca3941da9b78d4c285b81ba3267326ac4ee") version("1.0", sha256="bade6d83233c26226d02bd427fe0a4d6cd6dc5c0300927e30d41e885a478c378") diff --git a/var/spack/repos/builtin/packages/kraken2/package.py b/var/spack/repos/builtin/packages/kraken2/package.py index 057b7d8a4fc48f..efe7513656cdc3 100644 --- a/var/spack/repos/builtin/packages/kraken2/package.py +++ b/var/spack/repos/builtin/packages/kraken2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Kraken2(Package): maintainers("rberg2") + license("MIT") + version("2.1.2", sha256="e5f431e8bc3d5493a79e1d8125f4aacbad24f9ea2cc9657b66da06a32bef6ff3") version("2.1.1", sha256="8f3e928cdb32b9e8e6f55b44703d1557b2a5fc3f30f63e8d16e465e19a81dee4") version( diff --git a/var/spack/repos/builtin/packages/krakenuniq/package.py b/var/spack/repos/builtin/packages/krakenuniq/package.py index 44171008af4018..c4610dac2f2bf5 100644 --- a/var/spack/repos/builtin/packages/krakenuniq/package.py +++ b/var/spack/repos/builtin/packages/krakenuniq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Krakenuniq(Package): homepage = "https://genomebiology.biomedcentral.com/articles/10.1186/s13059-018-1568-0" url = "https://github.com/fbreitwieser/krakenuniq/archive/refs/tags/v0.7.3.tar.gz" + license("GPL-3.0-only") + version("1.0.4", sha256="5e2ef21878c1c4ce92be9925e47b9ccae0ecb59a79d71cc4cbb53d057e0de9ec") version("0.7.3", sha256="140dccbabec00153c8231ac3c92eb8aecc0277c8947055d4d41abe949ae658c3") version("0.7.2", sha256="e6b4c04dbe8276c44fa9e2613cca78429439d75d59e22303094e6577ba333627") diff --git a/var/spack/repos/builtin/packages/krb5/freebsd-link.patch b/var/spack/repos/builtin/packages/krb5/freebsd-link.patch new file mode 100644 index 00000000000000..76f49a44fd2d19 --- /dev/null +++ b/var/spack/repos/builtin/packages/krb5/freebsd-link.patch @@ -0,0 +1,11 @@ +--- a/src/config/shlib.conf ++++ b/src/config/shlib.conf +@@ -327,7 +327,7 @@ mips-*-netbsd*) + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' + SHLIBEXT=.so +- LDCOMBINE='ld -Bshareable' ++ LDCOMBINE='$(CC) -shared' + SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py index 84dc616066e01d..d32f86991e76fd 100644 --- a/var/spack/repos/builtin/packages/krb5/package.py +++ b/var/spack/repos/builtin/packages/krb5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Krb5(AutotoolsPackage): list_url = "https://kerberos.org/dist/krb5/" list_depth = 1 + license("MIT") + version("1.20.1", sha256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851") version("1.19.4", sha256="41f5981c5a4de0a26b3937e679a116cd5b3739641fd253124aac91f7179b54eb") version("1.19.3", sha256="56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0") @@ -34,6 +36,7 @@ class Krb5(AutotoolsPackage): depends_on("openssl@:1", when="@:1.19") depends_on("openssl") depends_on("gettext") + depends_on("perl", type="build") depends_on("findutils", type="build") depends_on("pkgconfig", type="build", when="^openssl~shared") @@ -42,6 +45,7 @@ class Krb5(AutotoolsPackage): ) # This patch is applied in newer upstream releases patch("mit-krb5-1.17-static-libs.patch", level=0, when="@:1.18.9") + patch("freebsd-link.patch", when="platform=freebsd") configure_directory = "src" build_directory = "src" diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py index b29a687f658706..3d07b1a5b6e5f2 100644 --- a/var/spack/repos/builtin/packages/krims/package.py +++ b/var/spack/repos/builtin/packages/krims/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Krims(CMakePackage): maintainers("mfherbst") + license("LGPL-3.0-or-later") + # # Versions # diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py index 36768b0ff22a90..8c41fbc9402b11 100644 --- a/var/spack/repos/builtin/packages/kripke/package.py +++ b/var/spack/repos/builtin/packages/kripke/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Kripke(CMakePackage, CudaPackage, ROCmPackage): maintainers("vsrana01") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=False) version( "1.2.4", submodules=False, tag="v1.2.4", commit="d85c6bc462f17a2382b11ba363059febc487f771" diff --git a/var/spack/repos/builtin/packages/kubectl/package.py b/var/spack/repos/builtin/packages/kubectl/package.py index 7c53d06fb3dcb7..786a948c816529 100644 --- a/var/spack/repos/builtin/packages/kubectl/package.py +++ b/var/spack/repos/builtin/packages/kubectl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Kubectl(Package): maintainers("alecbcs") + license("Apache-2.0") + version("1.27.1", sha256="3a3f7c6b8cf1d9f03aa67ba2f04669772b1205b89826859f1636062d5f8bec3f") version("1.27.0", sha256="536025dba2714ee5e940bb0a6b1df9ca97c244fa5b00236e012776a69121c323") diff --git a/var/spack/repos/builtin/packages/kubernetes/package.py b/var/spack/repos/builtin/packages/kubernetes/package.py index 176076844f2ecc..84ba7935c4da99 100644 --- a/var/spack/repos/builtin/packages/kubernetes/package.py +++ b/var/spack/repos/builtin/packages/kubernetes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Kubernetes(Package): maintainers("alecbcs") + license("Apache-2.0") + version("1.27.2", sha256="c6fcfddd38f877ce49c49318973496f9a16672e83a29874a921242950cd1c5d2") version("1.27.1", sha256="3a3f7c6b8cf1d9f03aa67ba2f04669772b1205b89826859f1636062d5f8bec3f") version("1.27.0", sha256="536025dba2714ee5e940bb0a6b1df9ca97c244fa5b00236e012776a69121c323") diff --git a/var/spack/repos/builtin/packages/kumi/package.py b/var/spack/repos/builtin/packages/kumi/package.py index 997c67d4af6367..2ccd22dbbb9e36 100644 --- a/var/spack/repos/builtin/packages/kumi/package.py +++ b/var/spack/repos/builtin/packages/kumi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Kumi(CMakePackage): maintainers("jfalcou") git = "https://github.com/jfalcou/kumi.git" + license("BSL-1.0") + version("main", branch="main") version("3.0", sha256="166b621e475935d2a3a195d13937a285060812c1fd7a95575a9c7b1dc425f2a1") version("2.1", sha256="34fc756780d463db35716e40eecd89b1505917926281262c74af425556a5260c") diff --git a/var/spack/repos/builtin/packages/kvasir-mpl/package.py b/var/spack/repos/builtin/packages/kvasir-mpl/package.py index 19fd0d0e0cc214..d1627d064c87b0 100644 --- a/var/spack/repos/builtin/packages/kvasir-mpl/package.py +++ b/var/spack/repos/builtin/packages/kvasir-mpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class KvasirMpl(Package): homepage = "https://github.com/kvasir-io/mpl" git = "https://github.com/kvasir-io/mpl.git" + license("BSL-1.0") + version("develop", branch="development") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/kvtree/package.py b/var/spack/repos/builtin/packages/kvtree/package.py index 8177e76c8f117d..042c5a75912932 100644 --- a/var/spack/repos/builtin/packages/kvtree/package.py +++ b/var/spack/repos/builtin/packages/kvtree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Kvtree(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("1.4.0", sha256="48a36fd578f0d1198a9c1512d6446c830b915ace5bb97539eec615495bee5a51") version("1.3.0", sha256="8281e075772d3534183c46133553d5765455d79ed98a895743663db891755ca9") diff --git a/var/spack/repos/builtin/packages/kylin/package.py b/var/spack/repos/builtin/packages/kylin/package.py index 988c02bdfc7ffa..623b23273e0e6c 100644 --- a/var/spack/repos/builtin/packages/kylin/package.py +++ b/var/spack/repos/builtin/packages/kylin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Kylin(MavenPackage): homepage = "https://kylin.apache.org" url = "https://github.com/apache/kylin/archive/kylin-3.1.0.tar.gz" + license("Apache-2.0") + version("3.1.0", sha256="84073ff16a0dad6e0611fea9fbf2b977b6bac307107a222b7f576a3a3b712157") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/kyotocabinet/package.py b/var/spack/repos/builtin/packages/kyotocabinet/package.py new file mode 100644 index 00000000000000..409fbc1532209e --- /dev/null +++ b/var/spack/repos/builtin/packages/kyotocabinet/package.py @@ -0,0 +1,31 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Kyotocabinet(AutotoolsPackage): + """Kyoto Cabinet is a library of routines for managing a database.""" + + homepage = "https://dbmx.net/kyotocabinet/" + url = "https://dbmx.net/kyotocabinet/pkg/kyotocabinet-1.2.80.tar.gz" + + maintainers("EbiArnie") + + license("GPL-3.0-or-later") + + version("1.2.80", sha256="4c85d736668d82920bfdbdb92ac3d66b7db1108f09581a769dd9160a02def349") + + depends_on("zlib-api@1.2.3:", type=("build", "link")) + depends_on("lzo", type=("build", "link")) + depends_on("xz", type=("build", "link")) + + def configure_args(self): + args = [] + + args.append("--enable-lzo") + args.append("--enable-lzma") + + return args diff --git a/var/spack/repos/builtin/packages/ladot/package.py b/var/spack/repos/builtin/packages/ladot/package.py index 6db62a19e6f885..1042d32e684bd6 100644 --- a/var/spack/repos/builtin/packages/ladot/package.py +++ b/var/spack/repos/builtin/packages/ladot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ladot(Package): homepage = "https://brighten.bigw.org/projects/ladot/" url = "https://brighten.bigw.org/projects/ladot/ladot-1.2.tar.gz" + license("GPL-2.0-or-later") + version("1.2", sha256="f829eeca829b82c0315cd87bffe410bccab96309b86b1c883b3ddaa93170f25e") depends_on("perl", type=("run", "test")) diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 7fb318c1ca89e8..de5a4f09c73495 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Laghos(MakefilePackage): maintainers("v-dobrev", "tzanio", "vladotomov") + license("BSD-2-Clause") + version("develop", branch="master") version("3.1", sha256="49b65edcbf9732c7f6c228958620e18980c43ad8381315a8ba9957ecb7534cd5") version("3.0", sha256="4db56286e15b42ecdc8d540c4888a7dec698b019df9c7ccb8319b7ea1f92d8b4") diff --git a/var/spack/repos/builtin/packages/lame/package.py b/var/spack/repos/builtin/packages/lame/package.py index 58b89fcd46d45f..3f0625c9737624 100644 --- a/var/spack/repos/builtin/packages/lame/package.py +++ b/var/spack/repos/builtin/packages/lame/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Lame(AutotoolsPackage): homepage = "http://lame.sourceforge.net/" url = "https://download.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz" + license("LGPL-2.0-or-later") + version("3.100", sha256="ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e") depends_on("nasm", type="build") diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py index b2d3d111334b8e..8588f5fdf6045d 100644 --- a/var/spack/repos/builtin/packages/lammps/package.py +++ b/var/spack/repos/builtin/packages/lammps/package.py @@ -1,15 +1,16 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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 datetime as dt +import os import archspec from spack.package import * -class Lammps(CMakePackage, CudaPackage, ROCmPackage): +class Lammps(CMakePackage, CudaPackage, ROCmPackage, PythonExtension): """LAMMPS stands for Large-scale Atomic/Molecular Massively Parallel Simulator. """ @@ -22,16 +23,29 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage): maintainers("rbberger") + license("GPL-2.0-or-later") + # rules for new versions and deprecation # * new stable versions should be added to stable_versions set # * a stable version that has updates and any of its outdated update releases should be # marked deprecated=True # * patch releases older than a stable release should be marked deprecated=True version("develop", branch="develop") + version("20231121", sha256="704d8a990874a425bcdfe0245faf13d712231ba23f014a3ebc27bc14398856f1") + version( + "20230802.2", + sha256="3bcecabc9cad08d0a4e4d989b52d29c58505f7ead8ebacf43c9db8d9fd3d564a", + preferred=True, + ) + version( + "20230802.1", + sha256="0e5568485e5ee080412dba44a1b7a93f864f1b5c75121f11d528854269953ed0", + deprecated=True, + ) version( "20230802", sha256="48dc8b0b0583689e80ea2052275acbc3e3fce89707ac557e120db5564257f7df", - preferred=True, + deprecated=True, ) version( "20230615", @@ -343,6 +357,8 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage): ) stable_versions = { + "20230802.2", + "20230802.1", "20230802", "20220623.4", "20220623.3", @@ -437,7 +453,7 @@ def url_for_version(self, version): "mofff": {"when": "@20210702:"}, "molecule": {"default": True}, "molfile": {"when": "@20210702:"}, - "mpiio": {}, + "mpiio": {"when": "@:20230802.1"}, "netcdf": {"when": "@20210702:"}, "openmp-package": {}, "opt": {}, @@ -530,7 +546,12 @@ def url_for_version(self, version): variant("ffmpeg", default=False, description="Build with ffmpeg support") variant("openmp", default=True, description="Build with OpenMP") variant("opencl", default=False, description="Build with OpenCL") - variant("exceptions", default=False, description="Build with lammps exceptions") + variant( + "exceptions", + default=False, + description="Build with lammps exceptions", + when="@:20230802.1", + ) variant( "cuda_mps", default=False, @@ -563,6 +584,7 @@ def url_for_version(self, version): multi=False, ) + depends_on("cmake@3.16:", when="@20231121:") depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpiio") depends_on("fftw-api@3", when="+kspace") @@ -602,11 +624,14 @@ def url_for_version(self, version): depends_on("plumed", when="+plumed") depends_on("eigen@3:", when="+user-smd") depends_on("eigen@3:", when="+machdyn") - depends_on("py-cython", when="+mliap+python") - depends_on("py-cython", when="+ml-iap+python") - depends_on("py-numpy", when="+python") - depends_on("py-mpi4py", when="+python+mpi") - depends_on("py-setuptools", when="@20220217:+python", type="build") + depends_on("py-cython", when="+mliap+python", type="build") + depends_on("py-cython", when="+ml-iap+python", type="build") + depends_on("py-pip", when="+python", type="build") + depends_on("py-wheel", when="+python", type="build") + depends_on("py-build", when="+python", type="build") + depends_on("py-numpy", when="+python", type=("build", "run")) + depends_on("py-mpi4py", when="+python+mpi", type=("build", "run")) + depends_on("py-setuptools@42:", when="@20220217:+python", type=("build", "run")) depends_on("n2p2@2.1.4:", when="+user-hdnnp") depends_on("n2p2@2.1.4:", when="+ml-hdnnp") depends_on("n2p2+shared", when="+lib ^n2p2") @@ -686,8 +711,8 @@ def url_for_version(self, version): # Older LAMMPS does not compile with Kokkos 4.x conflicts( "^kokkos@4:", - when="@:20230802", - msg="LAMMPS is incompatible with Kokkos 4.x until @20230802", + when="@:20230802.1", + msg="LAMMPS is incompatible with Kokkos 4.x until @20230802.1", ) patch("lib.patch", when="@20170901") @@ -706,6 +731,16 @@ def url_for_version(self, version): ) patch("hip_cmake.patch", when="@20220623:20221222 ~kokkos+rocm") + # Add large potential files + resource( + name="C_10_10.mesocnt", + url="https://download.lammps.org/potentials/C_10_10.mesocnt", + sha256="923f600a081d948eb8b4510f84aa96167b5a6c3e1aba16845d2364ae137dc346", + expand=False, + placement={"C_10_10.mesocnt": "potentials/C_10_10.mesocnt"}, + when="+mesont", + ) + root_cmakelists_dir = "cmake" def cmake_args(self): @@ -723,6 +758,7 @@ def cmake_args(self): self.define_from_variant("{}_MPI".format(mpi_prefix), "mpi"), self.define_from_variant("BUILD_OMP", "openmp"), self.define("ENABLE_TESTING", self.run_tests), + self.define("DOWNLOAD_POTENTIALS", False), ] if "~kokkos" in spec: # LAMMPS can be build with the GPU package OR the KOKKOS package @@ -833,5 +869,20 @@ def setup_build_environment(self, env): def setup_run_environment(self, env): env.set("LAMMPS_POTENTIALS", self.prefix.share.lammps.potentials) if "+python" in self.spec: - env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib) - env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib64) + if self.spec.platform == "darwin": + env.prepend_path("DYLD_FALLBACK_LIBRARY_PATH", self.prefix.lib) + env.prepend_path("DYLD_FALLBACK_LIBRARY_PATH", self.prefix.lib64) + else: + env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib) + env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib64) + + @run_after("install") + def install_python(self): + # do LAMMPS Python package installation using pip + if self.spec.satisfies("@20230328: +python"): + with working_dir("python"): + os.environ["LAMMPS_VERSION_FILE"] = join_path( + self.stage.source_path, "src", "version.h" + ) + args = std_pip_args + ["--prefix=" + self.prefix, "."] + pip(*args) diff --git a/var/spack/repos/builtin/packages/landsfcutil/package.py b/var/spack/repos/builtin/packages/landsfcutil/package.py index 64752d3e1ea6ac..26bac1ecf27e92 100644 --- a/var/spack/repos/builtin/packages/landsfcutil/package.py +++ b/var/spack/repos/builtin/packages/landsfcutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py b/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py index 6023b4c1fff331..7b387f27a98ffd 100644 --- a/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py +++ b/var/spack/repos/builtin/packages/lanl-cmake-modules/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lapackpp/package.py b/var/spack/repos/builtin/packages/lapackpp/package.py index a69e4e7bdffe16..fcea2cc87574a8 100644 --- a/var/spack/repos/builtin/packages/lapackpp/package.py +++ b/var/spack/repos/builtin/packages/lapackpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,7 @@ _versions = [ # LAPACK++, BLAS++ ["master", "master"], + ["2023.11.05", "2023.11.05"], ["2023.08.25", "2023.08.25"], ["2023.06.00", "2023.06.00"], ["2022.07.00", "2022.07.00"], @@ -32,7 +33,12 @@ class Lapackpp(CMakePackage, CudaPackage, ROCmPackage): url = "https://github.com/icl-utk-edu/lapackpp/releases/download/v2023.01.00/lapackpp-2023.01.00.tar.gz" maintainers("teonnik", "Sely85", "G-Ragghianti", "mgates3") + license("BSD-3-Clause") + version("master", branch="master") + version( + "2023.11.05", sha256="9a505ef4e76504b6714cc19eb1b58939694f9ab51427a5bb915b016d615570ca" + ) version( "2023.08.25", sha256="9effdd616a4a183a9b37c2ad33c85ddd3d6071b183e8c35e02243fbaa7333d4d" ) diff --git a/var/spack/repos/builtin/packages/last/package.py b/var/spack/repos/builtin/packages/last/package.py index a59da3ef5382be..bbc2e87a22df0e 100644 --- a/var/spack/repos/builtin/packages/last/package.py +++ b/var/spack/repos/builtin/packages/last/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Last(MakefilePackage): git = "https://gitlab.com/mcfrith/last.git" maintainers("snehring") + license("GPL-3.0-only") + version("1499", commit="2cc68d3ba8ae5ca46ceeb69302aef18b9db04f46") version("1282", commit="4368be912f4759e52b549940276f1adf087f489a") version("869", sha256="6371a6282bc1bb02a5e5013cc463625f2ce3e7746ff2ea0bdf9fe6b15605a67c") diff --git a/var/spack/repos/builtin/packages/lastz/package.py b/var/spack/repos/builtin/packages/lastz/package.py index 505044f4c0fff0..6f366e74b75762 100644 --- a/var/spack/repos/builtin/packages/lastz/package.py +++ b/var/spack/repos/builtin/packages/lastz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lastz(MakefilePackage): homepage = "https://lastz.github.io/lastz" url = "https://github.com/lastz/lastz/archive/1.04.00.tar.gz" + license("MIT") + version("1.04.22", sha256="4c829603ba4aed7ddf64255b528cd88850e4557382fca29580d3576c25c5054a") version("1.04.15", sha256="46a5cfb1fd41911a36fce5d3a2721ebfec9146952943b302e78b0dfffddd77f8") version("1.04.03", sha256="c58ed8e37c4b0e82492b3a2b3e12447a3c40286fb8358906d19f10b0a713e9f4") diff --git a/var/spack/repos/builtin/packages/laszip/package.py b/var/spack/repos/builtin/packages/laszip/package.py index bdd9e097b2af35..b6d5d763c3fb8f 100644 --- a/var/spack/repos/builtin/packages/laszip/package.py +++ b/var/spack/repos/builtin/packages/laszip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Laszip(CMakePackage): homepage = "https://laszip.org/" url = "https://github.com/LASzip/LASzip/releases/download/3.4.1/laszip-src-3.4.1.tar.gz" + license("LGPL-2.0-or-later") + version("3.4.3", sha256="53f546a7f06fc969b38d1d71cceb1862b4fc2c4a0965191a0eee81a57c7b373d") version("3.4.1", sha256="5d9b0ffaf8b7319c2fa216da3f3f878bb8f4e5b4b14d2c154d441a351da2be37") diff --git a/var/spack/repos/builtin/packages/latex2html/package.py b/var/spack/repos/builtin/packages/latex2html/package.py index d2076085dc0ea9..18ea8babd2e49e 100644 --- a/var/spack/repos/builtin/packages/latex2html/package.py +++ b/var/spack/repos/builtin/packages/latex2html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Latex2html(AutotoolsPackage): maintainers("cessenat") + license("GPL-2.0-only") + version("master", branch="master") version("2022.2", sha256="b1d5bba7bab7d0369d1241f2d8294137a52b7cb7df11239bfa15ec0a2546c093") version("2021", sha256="872fe7a53f91ababaafc964847639e3644f2b9fab3282ea059788e4e18cbba47") diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py index 3efa9fdbc4be86..ca5605f7248134 100644 --- a/var/spack/repos/builtin/packages/latte/package.py +++ b/var/spack/repos/builtin/packages/latte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Latte(CMakePackage): tags = ["ecp", "ecp-apps"] + license("LGPL-2.0-or-later") + version("master", branch="master") version("1.2.2", sha256="ab1346939dbd70ffd89c5e5bf8d24946cb3655dc25b203bec7fc59c6c63e4c79") version("1.2.1", sha256="a21dda5ebdcefa56e9ff7296d74ef03f89c200d2e110a02af7a84612668bf702") diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index 7ca4b607adf0aa..4ca7b03b1f8ae3 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lazygit/package.py b/var/spack/repos/builtin/packages/lazygit/package.py new file mode 100644 index 00000000000000..de68d64575d995 --- /dev/null +++ b/var/spack/repos/builtin/packages/lazygit/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class Lazygit(GoPackage): + """A simple terminal UI for git commands""" + + homepage = "https://github.com/jesseduffield/lazygit" + url = "https://github.com/jesseduffield/lazygit/archive/refs/tags/v0.40.2.tar.gz" + + maintainers("twrs") + + license("MIT") + + version("0.40.2", sha256="146bd63995fcf2f2373bbc2143b3565b7a2be49a1d4e385496265ac0f69e4128") diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py index f7e8f1793aecd8..b155958a882450 100644 --- a/var/spack/repos/builtin/packages/lazyten/package.py +++ b/var/spack/repos/builtin/packages/lazyten/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Lazyten(CMakePackage): maintainers("mfherbst") + license("GPL-3.0-only") + # # Versions # diff --git a/var/spack/repos/builtin/packages/lbann/lbann_v0.104_build_cleanup.patch b/var/spack/repos/builtin/packages/lbann/lbann_v0.104_build_cleanup.patch new file mode 100644 index 00000000000000..3020af37b07d9d --- /dev/null +++ b/var/spack/repos/builtin/packages/lbann/lbann_v0.104_build_cleanup.patch @@ -0,0 +1,39 @@ +diff --git a/src/callbacks/memory_profiler.cpp b/src/callbacks/memory_profiler.cpp +index 0d5cec5d2..6f40705af 100644 +--- a/src/callbacks/memory_profiler.cpp ++++ b/src/callbacks/memory_profiler.cpp +@@ -158,7 +158,10 @@ struct MemUsage + size_t total_mem; + + MemUsage(const std::string& r, size_t m) : report(r), total_mem(m) {} +- bool operator<(const MemUsage& other) { return total_mem < other.total_mem; } ++ bool operator<(const MemUsage& other) const ++ { ++ return total_mem < other.total_mem; ++ } + }; + } // namespace + +diff --git a/src/optimizers/adam.cpp b/src/optimizers/adam.cpp +index d00dfbe7c..1d9ad3949 100644 +--- a/src/optimizers/adam.cpp ++++ b/src/optimizers/adam.cpp +@@ -34,14 +34,12 @@ + + namespace lbann { + +-#if defined (LBANN_HAS_ROCM) && defined (LBANN_HAS_GPU_FP16) ++#if defined(LBANN_HAS_ROCM) && defined(LBANN_HAS_GPU_FP16) + namespace { +-bool isfinite(fp16 const& x) +-{ +- return std::isfinite(float(x)); +-} +-} ++bool isfinite(fp16 const& x) { return std::isfinite(float(x)); } ++} // namespace + #endif ++using std::isfinite; + + template + adam::adam(TensorDataType learning_rate, diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 315307e376591a..482d591a1c03af 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -1,12 +1,12 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os import socket -import sys +import spack.platforms.cray from spack.package import * @@ -23,110 +23,45 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): maintainers("bvanessen") + license("Apache-2.0") + version("develop", branch="develop") - version("0.102", sha256="3734a76794991207e2dd2221f05f0e63a86ddafa777515d93d99d48629140f1a") - version( - "0.101", - sha256="69d3fe000a88a448dc4f7e263bcb342c34a177bd9744153654528cd86335a1f7", - deprecated=True, - ) - version( - "0.100", - sha256="d1bab4fb6f1b80ae83a7286cc536a32830890f6e5b0c3107a17c2600d0796912", - deprecated=True, - ) - version( - "0.99", - sha256="3358d44f1bc894321ce07d733afdf6cb7de39c33e3852d73c9f31f530175b7cd", - deprecated=True, - ) - version( - "0.98.1", - sha256="9a2da8f41cd8bf17d1845edf9de6d60f781204ebd37bffba96d8872036c10c66", - deprecated=True, - ) - version( - "0.98", - sha256="8d64b9ac0f1d60db553efa4e657f5ea87e790afe65336117267e9c7ae6f68239", - deprecated=True, - ) - version( - "0.97.1", - sha256="2f2756126ac8bb993202cf532d72c4d4044e877f4d52de9fdf70d0babd500ce4", - deprecated=True, - ) - version( - "0.97", - sha256="9794a706fc7ac151926231efdf74564c39fbaa99edca4acb745ee7d20c32dae7", - deprecated=True, - ) - version( - "0.96", - sha256="97af78e9d3c405e963361d0db96ee5425ee0766fa52b43c75b8a5670d48e4b4a", - deprecated=True, - ) - version( - "0.95", - sha256="d310b986948b5ee2bedec36383a7fe79403721c8dc2663a280676b4e431f83c2", - deprecated=True, - ) - version( - "0.94", - sha256="567e99b488ebe6294933c98a212281bffd5220fc13a0a5cd8441f9a3761ceccf", - deprecated=True, - ) - version( - "0.93", - sha256="77bfd7fe52ee7495050f49bcdd0e353ba1730e3ad15042c678faa5eeed55fb8c", - deprecated=True, - ) - version( - "0.92", - sha256="9187c5bcbc562c2828fe619d53884ab80afb1bcd627a817edb935b80affe7b84", - deprecated=True, - ) + version("benchmarking", branch="benchmarking") + version("0.104", sha256="a847c7789082ab623ed5922ab1248dd95f5f89d93eed44ac3d6a474703bbc0bf") + version("0.103", sha256="9da1bf308f38323e30cb07f8ecf8efa05c7f50560e8683b9cd961102b1b3e25a") version( - "0.91", - sha256="b69f470829f434f266119a33695592f74802cff4b76b37022db00ab32de322f5", + "0.102", + sha256="3734a76794991207e2dd2221f05f0e63a86ddafa777515d93d99d48629140f1a", deprecated=True, ) - variant("al", default=True, description="Builds with support for Aluminum Library") variant( "build_type", default="Release", description="The build type to build", values=("Debug", "Release"), ) - variant( - "conduit", - default=True, - description="Builds with support for Conduit Library " - "(note that for v0.99 conduit is required)", - ) variant( "deterministic", default=False, description="Builds with support for deterministic execution", ) - variant( - "dihydrogen", default=True, description="Builds with support for DiHydrogen Tensor Library" - ) variant( "distconv", default=False, + sticky=True, description="Builds with support for spatial, filter, or channel " "distributed convolutions", ) variant( "dtype", default="float", + sticky=True, description="Type for floating point representation of weights", values=("float", "double"), ) variant("fft", default=False, description="Support for FFT operations") variant("half", default=False, description="Builds with support for FP16 precision data types") - variant("hwloc", default=True, description="Add support for topology aware algorithms") variant("nvprof", default=False, description="Build with region annotations for NVPROF") variant( "numpy", default=False, description="Builds with support for processing NumPy data files" @@ -139,7 +74,9 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): variant("vtune", default=False, description="Builds with support for Intel VTune") variant("onednn", default=False, description="Support for OneDNN") variant("onnx", default=False, description="Support for exporting models into ONNX format") - variant("nvshmem", default=False, description="Support for NVSHMEM") + variant( + "nvshmem", default=False, sticky=True, description="Support for NVSHMEM", when="+distconv" + ) variant( "python", default=True, @@ -168,20 +105,13 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): # Don't expose this a dependency until Spack can find the external properly # depends_on('binutils+gold', type='build', when='+gold') + patch("lbann_v0.104_build_cleanup.patch", when="@0.104:") + # Variant Conflicts - conflicts("@:0.90,0.99:", when="~conduit") - conflicts("@0.90:0.101", when="+fft") - conflicts("@:0.90,0.102:", when="~dihydrogen") conflicts("~cuda", when="+nvprof") - conflicts("~hwloc", when="+al") conflicts("~cuda", when="+nvshmem") conflicts("+cuda", when="+rocm", msg="CUDA and ROCm support are mutually exclusive") - conflicts("~vision", when="@0.91:0.101") - conflicts("~numpy", when="@0.91:0.101") - conflicts("~python", when="@0.91:0.101") - conflicts("~pfe", when="@0.91:0.101") - requires("%clang", when="+lld") conflicts("+lld", when="+gold") @@ -191,86 +121,71 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("cmake@3.17.0:", type="build") depends_on("cmake@3.21.0:", type="build", when="@0.103:") - # Specify the correct versions of Hydrogen - depends_on("hydrogen@:1.3.4", when="@0.95:0.100") - depends_on("hydrogen@1.4.0:1.4", when="@0.101:0.101.99") - depends_on("hydrogen@1.5.0:", when="@:0.90,0.102:") + # Specify the core libraries: Hydrogen, DiHydrogen, Aluminum + depends_on("hydrogen@1.5.3:") + depends_on("aluminum@1.4.1:") + depends_on("dihydrogen@0.2.0:") + + # Align the following variants across Hydrogen and DiHydrogen + forwarded_variants = ["cuda", "rocm", "half", "nvshmem"] + for v in forwarded_variants: + if v != "nvshmem": + depends_on("hydrogen +{0}".format(v), when="+{0}".format(v)) + depends_on("hydrogen ~{0}".format(v), when="~{0}".format(v)) + if v != "al" and v != "half": + depends_on("dihydrogen +{0}".format(v), when="+{0}".format(v)) + depends_on("dihydrogen ~{0}".format(v), when="~{0}".format(v)) + if v == "cuda" or v == "rocm": + depends_on("aluminum +{0} +nccl".format(v), when="+{0}".format(v)) # Add Hydrogen variants depends_on("hydrogen +openmp +shared +int64") - depends_on("hydrogen +openmp_blas", when=sys.platform != "darwin") - depends_on("hydrogen ~al", when="~al") - depends_on("hydrogen +al", when="+al") - depends_on("hydrogen ~cuda", when="~cuda") - depends_on("hydrogen +cuda", when="+cuda") - depends_on("hydrogen ~half", when="~half") - depends_on("hydrogen +half", when="+half") - depends_on("hydrogen ~rocm", when="~rocm") - depends_on("hydrogen +rocm", when="+rocm") depends_on("hydrogen build_type=Debug", when="build_type=Debug") - # Older versions depended on Elemental not Hydrogen - depends_on("elemental +openmp_blas +shared +int64", when="@0.91:0.94") - depends_on( - "elemental +openmp_blas +shared +int64 build_type=Debug", - when="build_type=Debug @0.91:0.94", - ) - - # Specify the correct version of Aluminum - depends_on("aluminum@:0.3", when="@0.95:0.100 +al") - depends_on("aluminum@0.4.0:0.4", when="@0.101:0.101.99 +al") - depends_on("aluminum@0.5.0:", when="@:0.90,0.102: +al") + # Add DiHydrogen variants + depends_on("dihydrogen +distconv", when="+distconv") + depends_on("dihydrogen@develop", when="@develop") # Add Aluminum variants - depends_on("aluminum +cuda +nccl", when="+al +cuda") - depends_on("aluminum +rocm +rccl", when="+al +rocm") - - depends_on("dihydrogen@0.2.0:", when="@:0.90,0.102:") - depends_on("dihydrogen +openmp", when="+dihydrogen") - depends_on("dihydrogen +openmp_blas", when=sys.platform != "darwin") - depends_on("dihydrogen ~cuda", when="+dihydrogen ~cuda") - depends_on("dihydrogen +cuda", when="+dihydrogen +cuda") - depends_on("dihydrogen ~al", when="+dihydrogen ~al") - depends_on("dihydrogen +al", when="+dihydrogen +al") - depends_on("dihydrogen +distconv +cuda", when="+distconv +cuda") - depends_on("dihydrogen +distconv +rocm", when="+distconv +rocm") - depends_on("dihydrogen ~half", when="+dihydrogen ~half") - depends_on("dihydrogen +half", when="+dihydrogen +half") - depends_on("dihydrogen ~nvshmem", when="+dihydrogen ~nvshmem") - depends_on("dihydrogen +nvshmem", when="+dihydrogen +nvshmem") - depends_on("dihydrogen ~rocm", when="+dihydrogen ~rocm") - depends_on("dihydrogen +rocm", when="+dihydrogen +rocm") - depends_on("dihydrogen@0.1", when="@0.101:0.101.99 +dihydrogen") - depends_on("dihydrogen@:0.0,0.2:", when="@:0.90,0.102: +dihydrogen") - conflicts("~dihydrogen", when="+distconv") + depends_on("aluminum@master", when="@develop") + + # Note that while Aluminum typically includes the dependency for the AWS OFI + # plugins, if Aluminum is pre-built, LBANN needs to make sure that the module + # is loaded + with when("+cuda"): + if spack.platforms.cray.slingshot_network(): + depends_on("aws-ofi-nccl") # Note: NOT a CudaPackage + + with when("+rocm"): + if spack.platforms.cray.slingshot_network(): + depends_on("aws-ofi-rccl") depends_on("hdf5+mpi", when="+distconv") for arch in CudaPackage.cuda_arch_values: depends_on("hydrogen cuda_arch=%s" % arch, when="+cuda cuda_arch=%s" % arch) - depends_on("aluminum cuda_arch=%s" % arch, when="+al +cuda cuda_arch=%s" % arch) - depends_on("dihydrogen cuda_arch=%s" % arch, when="+dihydrogen +cuda cuda_arch=%s" % arch) + depends_on("aluminum cuda_arch=%s" % arch, when="+cuda cuda_arch=%s" % arch) + depends_on("dihydrogen cuda_arch=%s" % arch, when="+cuda cuda_arch=%s" % arch) depends_on("nccl cuda_arch=%s" % arch, when="+cuda cuda_arch=%s" % arch) + depends_on("hwloc cuda_arch=%s" % arch, when="+cuda cuda_arch=%s" % arch) # variants +rocm and amdgpu_targets are not automatically passed to # dependencies, so do it manually. for val in ROCmPackage.amdgpu_targets: - depends_on("hydrogen amdgpu_target=%s" % val, when="amdgpu_target=%s" % val) - depends_on("aluminum amdgpu_target=%s" % val, when="+al amdgpu_target=%s" % val) - depends_on("dihydrogen amdgpu_target=%s" % val, when="+dihydrogen amdgpu_target=%s" % val) + depends_on("hydrogen amdgpu_target=%s" % val, when="+rocm amdgpu_target=%s" % val) + depends_on("aluminum amdgpu_target=%s" % val, when="+rocm amdgpu_target=%s" % val) + depends_on("dihydrogen amdgpu_target=%s" % val, when="+rocm amdgpu_target=%s" % val) + depends_on(f"hwloc amdgpu_target={val}", when=f"+rocm amdgpu_target={val}") depends_on("roctracer-dev", when="+rocm +distconv") - depends_on("cudnn", when="@0.90:0.100 +cuda") - depends_on("cudnn@8.0.2:", when="@:0.90,0.101: +cuda") - depends_on("cub", when="@0.94:0.98.2 +cuda ^cuda@:10") - depends_on("cutensor", when="@:0.90,0.102: +cuda") + depends_on("cudnn@8.0.2:", when="+cuda") + depends_on("cutensor", when="+cuda") depends_on("hipcub", when="+rocm") depends_on("mpi") - depends_on("hwloc@1.11:", when="@:0.90,0.102: +hwloc") - depends_on("hwloc@1.11.0:1.11", when="@0.95:0.101 +hwloc") - depends_on("hwloc +cuda +nvml", when="+cuda") - depends_on("hwloc@2.3.0:", when="+rocm") + depends_on("hwloc@1.11:") + depends_on("hwloc +cuda +nvml ~rocm", when="+cuda") + depends_on("hwloc@2.3.0: +rocm ~cuda", when="+rocm") depends_on("hiptt", when="+rocm") depends_on("half", when="+half") @@ -296,9 +211,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): # Note that conduit defaults to +fortran +parmetis +python, none of which are # necessary by LBANN: you may want to disable those options in your # packages.yaml - depends_on("conduit@0.4.0: +hdf5", when="@0.94:0 +conduit") - depends_on("conduit@0.5.0:0.6 +hdf5", when="@0.100:0.101 +conduit") - depends_on("conduit@0.6.0: +hdf5", when="@:0.90,0.99:") + depends_on("conduit@0.6.0: +hdf5") # LBANN can use Python in two modes 1) as part of an extensible framework # and 2) to drive the front end model creation and launch @@ -308,12 +221,12 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): extends("python", when="+python") # Python front end and possible extra packages - depends_on("python@3: +shared", type=("build", "run"), when="@:0.90,0.99: +pfe") + depends_on("python@3: +shared", type=("build", "run"), when="+pfe") extends("python", when="+pfe") depends_on("py-setuptools", type="build", when="+pfe") - depends_on("py-protobuf+cpp@3.10.0:", type=("build", "run"), when="@:0.90,0.99: +pfe") + depends_on("py-protobuf+cpp@3.10.0:4.21.12", type=("build", "run"), when="+pfe") - depends_on("protobuf+shared@3.10.0:", when="@:0.90,0.99:") + depends_on("protobuf@3.10.0:3.21.12") depends_on("zlib-api", when="^protobuf@3.11.0:") # using cereal@1.3.1 and above requires changing the @@ -328,7 +241,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): depends_on("onnx", when="+onnx") depends_on("nvshmem", when="+nvshmem") - depends_on("spdlog", when="@:0.90,0.102:") + depends_on("spdlog@1.11.0:1.12.0") depends_on("zstr") depends_on("caliper+adiak+mpi", when="+caliper") @@ -336,6 +249,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage): generator("ninja") def setup_build_environment(self, env): + env.append_flags("CXXFLAGS", "-fno-omit-frame-pointer") if self.spec.satisfies("%apple-clang"): env.append_flags("CPPFLAGS", self.compiler.openmp_flag) env.append_flags("CFLAGS", self.spec["llvm-openmp"].headers.include_flags) @@ -357,7 +271,7 @@ def libs(self): def cache_name(self): hostname = socket.gethostname() # Get a hostname that has no node identifier - hostname = hostname.rstrip("1234567890") + hostname = hostname.rstrip("1234567890-") return "LBANN_{0}_{1}-{2}-{3}@{4}.cmake".format( hostname, self.spec.version, @@ -376,15 +290,36 @@ def initconfig_compiler_entries(self): # of CMake entries.append(cmake_cache_option("CMAKE_EXPORT_COMPILE_COMMANDS", True)) + entries.append(cmake_cache_string("CMAKE_INSTALL_RPATH_USE_LINK_PATH", "ON")) + linker_flags = "-Wl,--disable-new-dtags" + entries.append(cmake_cache_string("CMAKE_EXE_LINKER_FLAGS", linker_flags)) + entries.append(cmake_cache_string("CMAKE_SHARED_LINKER_FLAGS", linker_flags)) + # Use lld high performance linker if "+lld" in spec: - entries.append(cmake_cache_string("CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=lld")) - entries.append(cmake_cache_string("CMAKE_SHARED_LINKER_FLAGS", "-fuse-ld=lld")) + entries.append( + cmake_cache_string( + "CMAKE_EXE_LINKER_FLAGS", "{0} -fuse-ld=lld".format(linker_flags) + ) + ) + entries.append( + cmake_cache_string( + "CMAKE_SHARED_LINKER_FLAGS", "{0} -fuse-ld=lld".format(linker_flags) + ) + ) # Use gold high performance linker if "+gold" in spec: - entries.append(cmake_cache_string("CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=gold")) - entries.append(cmake_cache_string("CMAKE_SHARED_LINKER_FLAGS", "-fuse-ld=gold")) + entries.append( + cmake_cache_string( + "CMAKE_EXE_LINKER_FLAGS", "{0} -fuse-ld=gold".format(linker_flags) + ) + ) + entries.append( + cmake_cache_string( + "CMAKE_SHARED_LINKER_FLAGS", "{0} -fuse-ld=gold".format(linker_flags) + ) + ) # Set the generator in the cached config if self.spec.satisfies("generator=make"): @@ -440,12 +375,9 @@ def initconfig_package_entries(self): cmake_variant_fields = [ ("LBANN_WITH_CNPY", "numpy"), ("LBANN_DETERMINISTIC", "deterministic"), - ("LBANN_WITH_HWLOC", "hwloc"), - ("LBANN_WITH_ALUMINUM", "al"), ("LBANN_WITH_ADDRESS_SANITIZER", "asan"), ("LBANN_WITH_BOOST", "boost"), ("LBANN_WITH_CALIPER", "caliper"), - ("LBANN_WITH_CONDUIT", "conduit"), ("LBANN_WITH_NVSHMEM", "nvshmem"), ("LBANN_WITH_FFT", "fft"), ("LBANN_WITH_ONEDNN", "onednn"), @@ -460,6 +392,9 @@ def initconfig_package_entries(self): for opt, val in cmake_variant_fields: entries.append(self.define_cmake_cache_from_variant(opt, val)) + entries.append(cmake_cache_option("LBANN_WITH_ALUMINUM", True)) + entries.append(cmake_cache_option("LBANN_WITH_CONDUIT", True)) + entries.append(cmake_cache_option("LBANN_WITH_HWLOC", True)) entries.append(cmake_cache_option("LBANN_WITH_ROCTRACER", "+rocm +distconv" in spec)) entries.append(cmake_cache_option("LBANN_WITH_TBINF", False)) entries.append( @@ -492,7 +427,7 @@ def initconfig_package_entries(self): ) ) - entries.append(self.define_cmake_cache_from_variant("LBANN_WITH_DIHYDROGEN", "dihydrogen")) + entries.append(cmake_cache_option("LBANN_WITH_DIHYDROGEN", True)) entries.append(self.define_cmake_cache_from_variant("LBANN_WITH_DISTCONV", "distconv")) # IF IBM ESSL is used it needs help finding the proper LAPACK libraries diff --git a/var/spack/repos/builtin/packages/lbfgspp/package.py b/var/spack/repos/builtin/packages/lbfgspp/package.py index 70f5865d9d8552..eef7277bd6db90 100644 --- a/var/spack/repos/builtin/packages/lbfgspp/package.py +++ b/var/spack/repos/builtin/packages/lbfgspp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lbfgspp(CMakePackage): homepage = "https://lbfgspp.statr.me/" url = "https://github.com/yixuan/LBFGSpp/archive/refs/tags/v0.2.0.tar.gz" + license("MIT") + version("0.2.0", sha256="7101744a538c3aff52e10c82267305847b0b5e9d39f9974b4b29812cd1398ff9") depends_on("eigen @3:") diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py index a6c0eca48f3e01..4e6765a9c6c691 100644 --- a/var/spack/repos/builtin/packages/lbxproxy/package.py +++ b/var/spack/repos/builtin/packages/lbxproxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lbzip2/package.py b/var/spack/repos/builtin/packages/lbzip2/package.py index 195e224caac909..b0faa00b3a1603 100644 --- a/var/spack/repos/builtin/packages/lbzip2/package.py +++ b/var/spack/repos/builtin/packages/lbzip2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lcals/package.py b/var/spack/repos/builtin/packages/lcals/package.py index 221ab2a9678b3b..27f044874b67f2 100644 --- a/var/spack/repos/builtin/packages/lcals/package.py +++ b/var/spack/repos/builtin/packages/lcals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lcc/package.py b/var/spack/repos/builtin/packages/lcc/package.py index e61ed13531407c..4ed9f48ee2c477 100644 --- a/var/spack/repos/builtin/packages/lcc/package.py +++ b/var/spack/repos/builtin/packages/lcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Lcc(CMakePackage): maintainers("cnegre") + license("BSD-3-Clause") + version("main", branch="main", preferred=True) version("1.0.1", sha256="fa13364dcdf3b1f8d80fc768f0e7ad3849f8d98091fb96926100a6764f836020") version("1.0.0", sha256="750ce09e809a4e85ae3219fd537dc84a923fe3d3683b26b5d915eccfd1f0120c") diff --git a/var/spack/repos/builtin/packages/lcgenv/package.py b/var/spack/repos/builtin/packages/lcgenv/package.py index 720b88f270ab4f..d1987410f21511 100644 --- a/var/spack/repos/builtin/packages/lcgenv/package.py +++ b/var/spack/repos/builtin/packages/lcgenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Lcgenv(Package): maintainers("haralmha") + license("MIT") + version("1.3.19", sha256="b091743705cf84ff5de60487f2f73cbf9d10676577cd1d99bbde00d3616d0751") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/lcio/package.py b/var/spack/repos/builtin/packages/lcio/package.py index 8f02063af4c760..e01edbc21791b6 100644 --- a/var/spack/repos/builtin/packages/lcio/package.py +++ b/var/spack/repos/builtin/packages/lcio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,11 @@ class Lcio(CMakePackage): maintainers("gaede", "vvolkl", "jmcarcell") + license("BSD-3-Clause") + version("master", branch="master") + version("2.20.2", sha256="b37cee344c28ccddc590e5317721b375ef19f4392ae067bc86583107acaf2374") + version("2.20.1", sha256="125f657297de12b40694cb0dddec1d1ce3379058492f2a6a2a6f992ee51604d6") version("2.20", sha256="5ef92c9ef04ce468ffb48be0ec6010377a400b064e352cb50f9f4c9599e7e990") version("2.19", sha256="2d6b37094d8d556ab0ba0efa632f10d8b851f533ca5c767e436397df18cb57c7") version("2.18", sha256="e722df7f4a6adcc2459ea1c6488a2a6e40bb04f7ee99536fdc60b51e6c80f565") diff --git a/var/spack/repos/builtin/packages/lcms/package.py b/var/spack/repos/builtin/packages/lcms/package.py index 4620a208a550f1..5fcf28bf7f9722 100644 --- a/var/spack/repos/builtin/packages/lcms/package.py +++ b/var/spack/repos/builtin/packages/lcms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Lcms(AutotoolsPackage): homepage = "https://www.littlecms.com" url = "http://downloads.sourceforge.net/project/lcms/lcms/2.9/lcms2-2.9.tar.gz" + license("MIT") + version("2.13.1", sha256="d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88") version("2.9", sha256="48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20") version("2.8", sha256="66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22") diff --git a/var/spack/repos/builtin/packages/lcov/package.py b/var/spack/repos/builtin/packages/lcov/package.py index dc7d3aa1b637c3..9794fb69e533ba 100644 --- a/var/spack/repos/builtin/packages/lcov/package.py +++ b/var/spack/repos/builtin/packages/lcov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,14 +13,44 @@ class Lcov(MakefilePackage): supports statement, function and branch coverage measurement.""" homepage = "http://ltp.sourceforge.net/coverage/lcov.php" - url = "https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz" + url = "https://github.com/linux-test-project/lcov/releases/download/v2.0/lcov-2.0.tar.gz" maintainers("KineticTheory") + license("GPL-2.0-or-later") + + version("2.0", sha256="1857bb18e27abe8bcec701a907d5c47e01db4d4c512fc098d1a6acd29267bf46") version("1.16", sha256="987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b") version("1.15", sha256="c1cda2fa33bec9aa2c2c73c87226cfe97de0831887176b45ee523c5e30f8053a") version("1.14", sha256="14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a") - depends_on("perl") + # dependencies from + # https://github.com/linux-test-project/lcov/blob/02ece21d54ccd16255d74f8b00f8875b6c15653a/README#L91-L111 + depends_on("perl", type=("build", "run")) + depends_on("perl-b-hooks-endofscope", type=("run")) + depends_on("perl-capture-tiny", type=("run")) + depends_on("perl-class-inspector", type=("run")) + depends_on("perl-class-singleton", type=("run")) + depends_on("perl-datetime", type=("run")) + depends_on("perl-datetime-locale", type=("run")) + depends_on("perl-datetime-timezone", type=("run")) + depends_on("perl-devel-cover", type=("run")) + depends_on("perl-devel-stacktrace", type=("run")) + depends_on("perl-digest-md5", type=("run")) + depends_on("perl-eval-closure", type=("run")) + depends_on("perl-exception-class", type=("run")) + depends_on("perl-file-sharedir", type=("run")) + depends_on("perl-file-spec", type=("run")) + depends_on("perl-json", type=("run")) + depends_on("perl-memory-process", type=("run")) + depends_on("perl-module-implementation", type=("run")) + depends_on("perl-mro-compat", type=("run")) + depends_on("perl-namespace-clean", type=("run")) + depends_on("perl-package-stash", type=("run")) + depends_on("perl-params-validationcompiler", type=("run")) + depends_on("perl-role-tiny", type=("run")) + depends_on("perl-specio", type=("run")) + depends_on("perl-sub-identify", type=("run")) + depends_on("perl-time-hires", type=("run")) def install(self, spec, prefix): make( diff --git a/var/spack/repos/builtin/packages/ldak/package.py b/var/spack/repos/builtin/packages/ldak/package.py index d074d90ea6830b..94209a9e76b5ef 100644 --- a/var/spack/repos/builtin/packages/ldak/package.py +++ b/var/spack/repos/builtin/packages/ldak/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ldak(Package): maintainers("snehring") + license("GPL-3.0-only") + version("5.2", sha256="ba3de4eb4f2d664b3c2a54bef2eb66d1a498ac423179e97a5795d010161b1805") version( "5.1", diff --git a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py index 68e0e36c9ba849..7c9730c03d011a 100644 --- a/var/spack/repos/builtin/packages/ldc-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/ldc-bootstrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class LdcBootstrap(CMakePackage): homepage = "https://dlang.org/" url = "https://github.com/ldc-developers/ldc/releases/download/v0.17.4/ldc-0.17.4-src.tar.gz" + license("LGPL-2.1-or-later") + # This is the last version that does not require a D compiler to bootstrap version("0.17.4", sha256="48428afde380415640f3db4e38529345f3c8485b1913717995547f907534c1c3") diff --git a/var/spack/repos/builtin/packages/ldc/package.py b/var/spack/repos/builtin/packages/ldc/package.py index af76fcc5194e9c..a297edf5b7f126 100644 --- a/var/spack/repos/builtin/packages/ldc/package.py +++ b/var/spack/repos/builtin/packages/ldc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Ldc(CMakePackage): homepage = "https://dlang.org/" url = "https://github.com/ldc-developers/ldc/releases/download/v1.3.0/ldc-1.3.0-src.tar.gz" + license("BSD-3-Clause AND BSL-1.0 AND ( Artistic-1.0 OR GPL-2.0-or-later ) AND NCSA AND MIT") + version("1.3.0", sha256="efe31a639bcb44e1f5b752da21713376d9410a01279fecc8aab8572065a3050b") variant("shared", default=True, description="Build runtime and tooling as shared libs") diff --git a/var/spack/repos/builtin/packages/legion/package.py b/var/spack/repos/builtin/packages/legion/package.py index 65b703f10ed9f7..7cc446cded60ef 100644 --- a/var/spack/repos/builtin/packages/legion/package.py +++ b/var/spack/repos/builtin/packages/legion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,10 +50,10 @@ class Legion(CMakePackage, ROCmPackage): depends_on("ucx", when="network=ucx") depends_on("ucx", when="conduit=ucx") depends_on("mpi", when="conduit=mpi") - depends_on("cuda@10.0:11.9", when="+cuda_unsupported_compiler @:23.03.0") - depends_on("cuda@10.0:11.9", when="+cuda @:23.03.0") - depends_on("cuda@10.0:12.2", when="+cuda_unsupported_compiler @23.06.0:") - depends_on("cuda@10.0:12.2", when="+cuda @23.06.0:") + depends_on("cuda@10.0:11.9", when="+cuda_unsupported_compiler @21.03.0:23.03.0") + depends_on("cuda@10.0:11.9", when="+cuda @21.03.0:23.03.0") + depends_on("cuda@10.0:12.2", when="+cuda_unsupported_compiler") + depends_on("cuda@10.0:12.2", when="+cuda") depends_on("hdf5", when="+hdf5") depends_on("hwloc", when="+hwloc") @@ -74,6 +74,16 @@ class Legion(CMakePackage, ROCmPackage): # https://github.com/spack/spack/issues/37232#issuecomment-1553376552 patch("hip-offload-arch.patch", when="@23.03.0 +rocm") + patch("update-hip-path-legion-23.06.0.patch", when="@23.06.0 ^hip@6.0.0 +rocm") + + def patch(self): + if "network=gasnet conduit=ofi-slingshot11 ^cray-mpich+wrappers" in self.spec: + filter_file( + r"--with-mpi-cc=cc", + f"--with-mpi-cc={self.spec['mpi'].mpicc}", + "stanfordgasnet/gasnet/configs/config.ofi-slingshot11.release", + string=True, + ) # HIP specific variant( @@ -268,11 +278,6 @@ def validate_gasnet_root(value): description="Maximum number of nodes supported by Legion.", ) - def setup_build_environment(self, build_env): - spec = self.spec - if "+rocm" in spec: - build_env.set("HIP_PATH", "{0}/hip".format(spec["hip"].prefix)) - def cmake_args(self): spec = self.spec cmake_cxx_flags = [] @@ -344,6 +349,11 @@ def cmake_args(self): options.append(from_variant("Legion_HIP_TARGET", "hip_target")) options.append(from_variant("Legion_HIP_ARCH", "amdgpu_target")) options.append(from_variant("Legion_HIJACK_HIP", "hip_hijack")) + options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix))) + if "^hip@:5.7" in spec: + options.append(self.define("HIP_PATH", "{0}/hip".format(spec["hip"].prefix))) + elif "^hip@6.0:" in spec: + options.append(self.define("HIP_PATH", "{0}".format(spec["hip"].prefix))) if "+fortran" in spec: # default is off. diff --git a/var/spack/repos/builtin/packages/legion/update-hip-path-legion-23.06.0.patch b/var/spack/repos/builtin/packages/legion/update-hip-path-legion-23.06.0.patch new file mode 100644 index 00000000000000..9f7f6a7a86d114 --- /dev/null +++ b/var/spack/repos/builtin/packages/legion/update-hip-path-legion-23.06.0.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindHIP.cmake b/cmake/FindHIP.cmake +index f86edd2..24492ad 100644 +--- a/cmake/FindHIP.cmake ++++ b/cmake/FindHIP.cmake +@@ -22,7 +22,7 @@ if(NOT DEFINED HIP_PATH) + set(HIP_PATH $ENV{HIP_PATH} CACHE PATH "Path to where HIP has been installed") + endif() + endif() +-include(${HIP_PATH}/cmake/FindHIP.cmake) ++include(${HIP_PATH}/lib/cmake/hip/FindHIP.cmake) + + if(NOT HIP_INCLUDE_DIRS) + list(APPEND HIP_INCLUDE_DIRS diff --git a/var/spack/repos/builtin/packages/lemon/package.py b/var/spack/repos/builtin/packages/lemon/package.py index bcf759ea198ec7..21effe4636ef64 100644 --- a/var/spack/repos/builtin/packages/lemon/package.py +++ b/var/spack/repos/builtin/packages/lemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,3 +16,30 @@ class Lemon(CMakePackage): url = "https://lemon.cs.elte.hu/pub/sources/lemon-1.3.1.tar.gz" version("1.3.1", sha256="71b7c725f4c0b4a8ccb92eb87b208701586cf7a96156ebd821ca3ed855bad3c8") + + # variant("coin", default=False, description="Enable Coin solver backend") #TODO build fails + variant("ilog", default=False, description="Enable ILOG (CPLEX) solver backend") + variant("glpk", default=True, description="Enable GLPK solver backend") + # soplex not mentioned in docs but shown in cmakecache + # variant("soplex", default=False, description="Enable SOPLEX solver backend") #TODO + + depends_on("glpk", when="+glpk") + depends_on("cplex", when="+ilog") + # depends_on("coinutils", when="+coin") # just a guess + # depends_on("cbc", when="+coin") + # depends_on("clp", when="+coin") + # depends_on("bzip2", when="+coin") + # depends_on("soplex", when="+soplex") # no such package in Spack yet. TODO + + def cmake_args(self): + spec = self.spec + args = [] + args.extend( + [ + # f"-DLEMON_ENABLE_COIN={spec.variants['coin'].value}", #TODO + f"-DLEMON_ENABLE_ILOG={spec.variants['ilog'].value}", + f"-DLEMON_ENABLE_GLPK={spec.variants['glpk'].value}", + # f"-DLEMON_ENABLE_SOPLEX={spec.variants['soplex'].value}", #TODO + ] + ) + return args diff --git a/var/spack/repos/builtin/packages/leptonica/package.py b/var/spack/repos/builtin/packages/leptonica/package.py index ffe6f6b0931718..2f941a289fed3a 100644 --- a/var/spack/repos/builtin/packages/leptonica/package.py +++ b/var/spack/repos/builtin/packages/leptonica/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Leptonica(CMakePackage): homepage = "http://www.leptonica.org/" url = "https://github.com/DanBloomberg/leptonica/archive/1.80.0.tar.gz" + license("custom") + version("1.83.1", sha256="4289d0a4224b614010072253531c0455a33a4d7c7a0017fe7825ed382290c0da") version("1.81.0", sha256="70ebc04ff8b9684205bd1d01843c635a8521255b74813bf7cce9a33368f7952c") version("1.80.0", sha256="3952b974ec057d24267aae48c54bca68ead8275604bf084a73a4b953ff79196e") diff --git a/var/spack/repos/builtin/packages/lerc/package.py b/var/spack/repos/builtin/packages/lerc/package.py index 826e5b9750935d..0e7137118099cc 100644 --- a/var/spack/repos/builtin/packages/lerc/package.py +++ b/var/spack/repos/builtin/packages/lerc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Lerc(CMakePackage): homepage = "https://github.com/Esri/lerc" url = "https://github.com/Esri/lerc/archive/refs/tags/v3.0.tar.gz" + license("Apache-2.0") + version("4.0.0", sha256="91431c2b16d0e3de6cbaea188603359f87caed08259a645fd5a3805784ee30a0") version("3.0", sha256="8c0148f5c22d823eff7b2c999b0781f8095e49a7d3195f13c68c5541dd5740a1") diff --git a/var/spack/repos/builtin/packages/less/package.py b/var/spack/repos/builtin/packages/less/package.py index e395157a0d7c2b..3e4b402deec5b0 100644 --- a/var/spack/repos/builtin/packages/less/package.py +++ b/var/spack/repos/builtin/packages/less/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Less(AutotoolsPackage): depends_on("ncurses") + license("GPL-3.0-or-later OR BSD-2-Clause") + version("643", sha256="3bb417c4b909dfcb0adafc371ab87f0b22e8b15f463ec299d156c495fc9aa196") version("590", sha256="69056021c365b16504cf5bd3864436a5e50cb2f98b76cd68b99b457064139375") version("551", sha256="2630db16ef188e88b513b3cc24daa9a798c45643cc7da06e549c9c00cfd84244") diff --git a/var/spack/repos/builtin/packages/lesstif/package.py b/var/spack/repos/builtin/packages/lesstif/package.py index 497494693424d9..8c936d91566274 100644 --- a/var/spack/repos/builtin/packages/lesstif/package.py +++ b/var/spack/repos/builtin/packages/lesstif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lesstif(AutotoolsPackage): homepage = "https://sourceforge.net/projects/lesstif" url = "https://sourceforge.net/projects/lesstif/files/lesstif/0.95.2/lesstif-0.95.2.tar.bz2/download" + license("LGPL-2.0-only") + version("0.95.2", sha256="eb4aa38858c29a4a3bcf605cfe7d91ca41f4522d78d770f69721e6e3a4ecf7e3") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index d6a1fd3ec5276a..1eaadf2058daa6 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Leveldb(CMakePackage): url = "https://github.com/google/leveldb/archive/1.22.tar.gz" git = "https://github.com/google/leveldb.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.23", sha256="9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76") version("1.22", sha256="55423cac9e3306f4a9502c738a001e4a339d1a38ffbee7572d4a07d5d63949b2") @@ -70,10 +72,11 @@ def cmake_args(self): else: args.append("-DBUILD_SHARED_LIBS=OFF") - # The tarball is missing the benchmark and test submodules - if self.spec.satisfies("@1.23:"): - args.append("-DLEVELDB_BUILD_BENCHMARKS=OFF") - args.append("-DLEVELDB_BUILD_TESTS=OFF") + # 1.23 tarball is missing the benchmark and test submodules + # and for older versions, some compilers fail to compile the + # benchmarks + args.append("-DLEVELDB_BUILD_BENCHMARKS=OFF") + args.append("-DLEVELDB_BUILD_TESTS=OFF") return args diff --git a/var/spack/repos/builtin/packages/lfortran/package.py b/var/spack/repos/builtin/packages/lfortran/package.py index 0f574f0c857f3d..ded409d0677197 100644 --- a/var/spack/repos/builtin/packages/lfortran/package.py +++ b/var/spack/repos/builtin/packages/lfortran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,11 @@ class Lfortran(CMakePackage): git = "https://github.com/lfortran/lfortran.git" maintainers = ["certik"] + license("BSD-3-Clause") + # The build process uses 'git describe --tags' to get the package version version("main", branch="main", get_full_repo=True) + version("0.30.0", sha256="aafdfbfe81d69ceb3650ae1cf9bcd8a1f1532d895bf88f3071fe9610859bcd6f") version("0.19.0", sha256="d496f61d7133b624deb3562677c0cbf98e747262babd4ac010dbd3ab4303d805") variant("llvm", default=True, description="Build with LLVM support") @@ -23,7 +26,8 @@ class Lfortran(CMakePackage): depends_on("python@3:", type="build", when="@main") depends_on("cmake", type="build") - depends_on("llvm@11:15", type=("build", "run"), when="+llvm") + depends_on("llvm@11:15", type=("build", "run"), when="@0.19.0+llvm") + depends_on("llvm@11:16", type=("build", "run"), when="@0.30.0:+llvm") depends_on("zlib-api") depends_on("re2c", type="build", when="@main") depends_on("bison@:3.4", type="build", when="@main") diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 3e1e2969307994..eebdb596a487aa 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Lftp(AutotoolsPackage): homepage = "https://lftp.yar.ru/" url = "https://lftp.yar.ru/ftp/lftp-4.9.2.tar.gz" + license("GPL-3.0-or-later") + version("4.9.2", sha256="a37589c61914073f53c5da0e68bd233b41802509d758a022000e1ae2076da733") version("4.8.1", sha256="6117866215cd889dab30ff73292cd1d35fe0e12a9af5cd76d093500d07ab65a3") version("4.7.7", sha256="7bce216050094a1146ed05bed8fe5b3518224764ffe98884a848d44dc76fff8f") diff --git a/var/spack/repos/builtin/packages/lhapdf/package.py b/var/spack/repos/builtin/packages/lhapdf/package.py index 41c3887f89fdba..2a9bc2583cd4fd 100644 --- a/var/spack/repos/builtin/packages/lhapdf/package.py +++ b/var/spack/repos/builtin/packages/lhapdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Lhapdf(AutotoolsPackage): maintainers("vvolkl", "wdconinc") + license("GPL-3.0-or-later") + version("6.5.4", sha256="ace8913781044ad542e378697fcd95a8535d510818bb74a6665f9fd2b132ac0f") version("6.5.3", sha256="90fe7254d5a48a9b2d424fcbac1bf9708b0e54690efec4c78e9ad28b9203bfcd") version("6.5.2", sha256="23972ec46289c82a63df60b55b62f219418b4d80f94b8d570feb2b5e48014054") diff --git a/var/spack/repos/builtin/packages/lhapdf5/package.py b/var/spack/repos/builtin/packages/lhapdf5/package.py index 6581edc314230d..94fa2b369c2dc0 100644 --- a/var/spack/repos/builtin/packages/lhapdf5/package.py +++ b/var/spack/repos/builtin/packages/lhapdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Lhapdf5(AutotoolsPackage): homepage = "https://lhapdf.hepforge.org/lhapdf5/" url = "https://lhapdf.hepforge.org/downloads?f=old/lhapdf-5.9.1.tar.gz" + license("GPL-2.0-or-later") + version("5.9.1", sha256="86b9b046d7f25627ce2aab6847ef1c5534972f4bae18de98225080cf5086919c") version("5.9.0", sha256="64b9018ce6102ae7b6a92c990ca6afa841fb992d87b1abf5756c3d04c4d46b9c") version("5.8.9", sha256="b90a83512fc5f51e4cd419f1e79ad6e6fcd0e19636bb07464e41f47ee0509d3c") diff --git a/var/spack/repos/builtin/packages/lhapdfsets/package.py b/var/spack/repos/builtin/packages/lhapdfsets/package.py index 996eda271cd2e2..deb654c067332f 100644 --- a/var/spack/repos/builtin/packages/lhapdfsets/package.py +++ b/var/spack/repos/builtin/packages/lhapdfsets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py index 43585f1b310b7d..1d5cf3071f3de6 100644 --- a/var/spack/repos/builtin/packages/libabigail/package.py +++ b/var/spack/repos/builtin/packages/libabigail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libabigail(AutotoolsPackage): url = "https://mirrors.kernel.org/sourceware/libabigail/libabigail-2.0.tar.gz" git = "https://sourceware.org/git/libabigail.git" + license("Apache-2.0 WITH LLVM-exception") + version("master", branch="master") version("2.0", sha256="3704ae97a56bf076ca08fb5dea6b21db998fbbf14c4f9de12824b78db53b6fda") version("1.8", sha256="1cbf260b894ccafc61b2673ba30c020c3f67dbba9dfa88dca3935dff661d665c") diff --git a/var/spack/repos/builtin/packages/libaec/package.py b/var/spack/repos/builtin/packages/libaec/package.py index 5d6511d5c7b83a..5c2a21a5c6671f 100644 --- a/var/spack/repos/builtin/packages/libaec/package.py +++ b/var/spack/repos/builtin/packages/libaec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libaec(CMakePackage): provides("szip") + license("BSD-2-Clause") + version("1.0.6", sha256="abab8c237d85c982bb4d6bde9b03c1f3d611dcacbd58bca55afac2496d61d4be") version("1.0.5", sha256="7bf7be828dc3caefcc968e98a59b997b6b3b06e4123137e9e0b0988dc1be3b2f") version("1.0.4", sha256="7456adff4e817f94fc57a3eca824db1c203770ffb7a9253c435093ac5e239e31") diff --git a/var/spack/repos/builtin/packages/libaio/package.py b/var/spack/repos/builtin/packages/libaio/package.py index d3ffd4e195cb34..9e01952ff898c7 100644 --- a/var/spack/repos/builtin/packages/libaio/package.py +++ b/var/spack/repos/builtin/packages/libaio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Libaio(MakefilePackage): "https://debian.inf.tu-dresden.de/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz" ) + license("LGPL-2.1-or-later") + version("0.3.113", sha256="2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b") version("0.3.110", sha256="e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e") diff --git a/var/spack/repos/builtin/packages/libao/package.py b/var/spack/repos/builtin/packages/libao/package.py index ecc408e2f22dd2..d93e765e2ff9f8 100644 --- a/var/spack/repos/builtin/packages/libao/package.py +++ b/var/spack/repos/builtin/packages/libao/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libao(AutotoolsPackage): homepage = "https://github.com/xiph/libao/" url = "https://github.com/xiph/libao/archive/1.2.2.tar.gz" + license("GPL-2.0-or-later") + version("1.2.2", sha256="df8a6d0e238feeccb26a783e778716fb41a801536fe7b6fce068e313c0e2bf4d") version("1.2.0", sha256="5ec2d15ee39f218e93a87f5cc8508aaebf5c8b544f42488dcb2b504d97392c99") version("1.1.0", sha256="69edc39fa2759133edfcdee0ec47559067a1a8e7cd718db0eb3c82ca4254aa6b") diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py index 8ca7ba47eee4de..d3d4d579ffebf3 100644 --- a/var/spack/repos/builtin/packages/libapplewm/package.py +++ b/var/spack/repos/builtin/packages/libapplewm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libapplewm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libAppleWM" xorg_mirror_path = "lib/libAppleWM-1.4.1.tar.gz" + license("MIT") + version("1.4.1", sha256="d7fb098d65ad4d840f60e5c92de7f58f1725bd70d0d132755ea453462fd50049") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libapreq2/package.py b/var/spack/repos/builtin/packages/libapreq2/package.py index 2551acc5129d40..39bad41c7b1147 100644 --- a/var/spack/repos/builtin/packages/libapreq2/package.py +++ b/var/spack/repos/builtin/packages/libapreq2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libapreq2(AutotoolsPackage): homepage = "https://github.com/gitpan/libapreq2" url = "https://github.com/gitpan/libapreq2/archive/gitpan_version/2.13.tar.gz" + license("Apache-2.0") + version("2.13", sha256="477ce8207e89869e1e4520286697a56d4bd6af348899849ecef43c88bf0872d1") version("2.12", sha256="75cc1daa60e781270178c8f9fbe9c68231a7bc96bcc5c7a970cfce75d784b568") version("2.08", sha256="9f491588957415ebe0decdf6758fcb5c0d3eaf05a573bdd51de499ae111ffc53") diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index b8ab7600d454d3..25354511097260 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libarchive(AutotoolsPackage): maintainers("haampie") + license("BSD-2-Clause AND BSD-3-Clause AND Public-Domain") + version("3.7.1", sha256="5d24e40819768f74daf846b99837fc53a3a9dcdf3ce1c2003fe0596db850f0f0") version("3.7.0", sha256="d937886a14b48c4287c4d343644feb294a14b31b7926ba9a4f1777123ce7c2cc") version("3.6.2", sha256="ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3") diff --git a/var/spack/repos/builtin/packages/libasr/package.py b/var/spack/repos/builtin/packages/libasr/package.py index 2ae600e4615b97..f4bd5bde80deab 100644 --- a/var/spack/repos/builtin/packages/libasr/package.py +++ b/var/spack/repos/builtin/packages/libasr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Libasr(AutotoolsPackage): homepage = "https://github.com/OpenSMTPD/libasr" url = "https://github.com/OpenSMTPD/libasr/releases/download/1.0.4/libasr-1.0.4.tar.gz" + license("WTFPL") + version("1.0.4", sha256="19fb6bed10d15c9775c8d008cd1130155917ae4e801c729fe85e6d88a545dab4") version("1.0.3", sha256="9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d") diff --git a/var/spack/repos/builtin/packages/libassuan/package.py b/var/spack/repos/builtin/packages/libassuan/package.py index 02c15940eb2062..8ba17f71443dfe 100644 --- a/var/spack/repos/builtin/packages/libassuan/package.py +++ b/var/spack/repos/builtin/packages/libassuan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libassuan(AutotoolsPackage): maintainers("alalazo") + license("LGPL-2.1-or-later") + version("2.5.6", sha256="e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426") version("2.5.5", sha256="8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4") version("2.5.4", sha256="c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0") diff --git a/var/spack/repos/builtin/packages/libatasmart/package.py b/var/spack/repos/builtin/packages/libatasmart/package.py index 736205938d44f7..ee2dd4dfeaa94a 100644 --- a/var/spack/repos/builtin/packages/libatasmart/package.py +++ b/var/spack/repos/builtin/packages/libatasmart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libatasmart(AutotoolsPackage): homepage = "https://github.com/ebe-forks/libatasmart" url = "https://github.com/ebe-forks/libatasmart/archive/v0.19.tar.gz" + license("LGPL-2.1-or-later") + version("0.19", sha256="10bb5321a254e28bd60fd297f284bfc81cce4fde92e150187640e62ec667e5fb") version("0.18", sha256="4a6e93fbaec2d4caffb06ddd47c2c35ea4ad2d3d22e805bf284adba949f64ddf") version("0.17", sha256="353b2ec097814254989a809fd495f95a315e608fdf320c2b96dc52d70392e955") diff --git a/var/spack/repos/builtin/packages/libatomic-ops/package.py b/var/spack/repos/builtin/packages/libatomic-ops/package.py index 5315fa70c4ce47..f03e9588627aca 100644 --- a/var/spack/repos/builtin/packages/libatomic-ops/package.py +++ b/var/spack/repos/builtin/packages/libatomic-ops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class LibatomicOps(AutotoolsPackage): homepage = "https://www.hboehm.info/gc/" url = "https://github.com/ivmai/libatomic_ops/releases/download/v7.8.0/libatomic_ops-7.8.0.tar.gz" + license("GPL-2.0-only") + version("7.8.0", sha256="15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31") version("7.6.14", sha256="390f244d424714735b7050d056567615b3b8f29008a663c262fb548f1802d292") version("7.6.12", sha256="f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e") diff --git a/var/spack/repos/builtin/packages/libbacktrace/package.py b/var/spack/repos/builtin/packages/libbacktrace/package.py index a9a9dd7a03dc19..7c258776272afd 100644 --- a/var/spack/repos/builtin/packages/libbacktrace/package.py +++ b/var/spack/repos/builtin/packages/libbacktrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,7 +17,14 @@ class Libbacktrace(AutotoolsPackage): version("master", branch="master") version("2020-02-19", commit="ca0de0517f3be44fedf5a2c01cfaf6437d4cae68") + variant("shared", default=False, description="Additionally build shared library") + depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") + + def configure_args(self): + args = [] + args.extend(self.enable_or_disable("shared")) + return args diff --git a/var/spack/repos/builtin/packages/libbeagle/package.py b/var/spack/repos/builtin/packages/libbeagle/package.py index 8b177a943893da..4fff19fe9c09dc 100644 --- a/var/spack/repos/builtin/packages/libbeagle/package.py +++ b/var/spack/repos/builtin/packages/libbeagle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libbeagle(AutotoolsPackage, CudaPackage): homepage = "https://github.com/beagle-dev/beagle-lib" url = "https://github.com/beagle-dev/beagle-lib/archive/v3.1.2.tar.gz" + license("LGPL-3.0-or-later") + version("3.1.2", sha256="dd872b484a3a9f0bce369465e60ccf4e4c0cd7bd5ce41499415366019f236275") version( "2.1.2", diff --git a/var/spack/repos/builtin/packages/libbeato/package.py b/var/spack/repos/builtin/packages/libbeato/package.py index 744724ea75d5b2..2179a6de315987 100644 --- a/var/spack/repos/builtin/packages/libbeato/package.py +++ b/var/spack/repos/builtin/packages/libbeato/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Libbeato(AutotoolsPackage): homepage = "https://github.com/CRG-Barcelona/libbeato" git = "https://github.com/CRG-Barcelona/libbeato.git" + license("GPL-3.0-or-later") + version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/libbigwig/package.py b/var/spack/repos/builtin/packages/libbigwig/package.py index b3d41a6fd1a857..430c6d5593c899 100644 --- a/var/spack/repos/builtin/packages/libbigwig/package.py +++ b/var/spack/repos/builtin/packages/libbigwig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libbigwig(CMakePackage): url = "https://github.com/dpryan79/libBigWig/archive/refs/tags/0.4.7.tar.gz" maintainers("snehring") + license("MIT") + version("0.4.7", sha256="8e057797011d93fa00e756600898af4fe6ca2d48959236efc9f296abe94916d9") variant("curl", default=True, description="Build with curl support") diff --git a/var/spack/repos/builtin/packages/libbinio/package.py b/var/spack/repos/builtin/packages/libbinio/package.py index 0acbd82f8456f2..3d086a555020d5 100644 --- a/var/spack/repos/builtin/packages/libbinio/package.py +++ b/var/spack/repos/builtin/packages/libbinio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Libbinio(AutotoolsPackage): homepage = "https://github.com/adplug/libbinio" url = "https://github.com/adplug/libbinio/releases/download/libbinio-1.5/libbinio-1.5.tar.bz2" + license("LGPL-2.1-or-later") + version("1.5", sha256="398b2468e7838d2274d1f62dbc112e7e043433812f7ae63ef29f5cb31dc6defd") version("1.4", sha256="4a32d3154517510a3fe4f2dc95e378dcc818a4a921fc0cb992bdc0d416a77e75") diff --git a/var/spack/repos/builtin/packages/libblastrampoline/package.py b/var/spack/repos/builtin/packages/libblastrampoline/package.py index fb9f43ea23df91..c7c498e97d70c0 100644 --- a/var/spack/repos/builtin/packages/libblastrampoline/package.py +++ b/var/spack/repos/builtin/packages/libblastrampoline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libblastrampoline(MakefilePackage): maintainers("haampie", "giordano") + license("MIT") + version("5.8.0", sha256="aeceb01ebebdd1068a1147b636451c46c16d64f9e22694075abda4dddfffe13d") version("5.4.0", sha256="e1a2258b0ad31cc41e6e9b8ba36f5c239fd1a267f2657ef3d3f669cc5b811f6a") version("5.3.0", sha256="95bca73f1567e2acd1110d0dfe5bb58fc86718555cd6eab89f0a769534df3b62") diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py index 070ebd7656a12a..d880d3fd4e677f 100644 --- a/var/spack/repos/builtin/packages/libbsd/package.py +++ b/var/spack/repos/builtin/packages/libbsd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libbsd(AutotoolsPackage): "https://mirrors.dotsrc.org/pub/mirrors/exherbo/libbsd-0.9.1.tar.xz", ] + license("BSD-3-Clause") + version("0.11.7", sha256="9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261") version("0.11.6", sha256="19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df") version("0.11.5", sha256="1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd") @@ -35,6 +37,8 @@ class Libbsd(AutotoolsPackage): patch("cdefs.h.patch", when="@0.8.6 %gcc@:4") patch("local-elf.h.patch", when="@:0.10 %intel") + conflicts("platform=freebsd") + # https://gitlab.freedesktop.org/libbsd/libbsd/issues/1 conflicts("platform=darwin") diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 082c50a6acd258..f394f6684110b8 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libbytesize/package.py b/var/spack/repos/builtin/packages/libbytesize/package.py index 4f87a9650e1b69..9c36c2d8aa9b04 100644 --- a/var/spack/repos/builtin/packages/libbytesize/package.py +++ b/var/spack/repos/builtin/packages/libbytesize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libbytesize(AutotoolsPackage): homepage = "https://github.com/storaged-project/libbytesize" url = "https://github.com/storaged-project/libbytesize/releases/download/2.4/libbytesize-2.4.tar.gz" + license("LGPL-2.1-or-later") + version("2.4", sha256="25ccb5762bb8c860b63ed1d40e0c5564e3e0084693fbe6554467a8ca1c1d8c7f") version("2.3", sha256="3c74113fc8cd1a2fbd8870fa0ed7cef2ef24d60ef91e7145fbc041f9aa144479") version("2.2", sha256="b93c54b502880c095c9f5767a42464853e2687db2e5e3084908a615bafe73baa") diff --git a/var/spack/repos/builtin/packages/libc/package.py b/var/spack/repos/builtin/packages/libc/package.py index 31a80b5aad20ef..2a1f13739b1606 100644 --- a/var/spack/repos/builtin/packages/libc/package.py +++ b/var/spack/repos/builtin/packages/libc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libcanberra/package.py b/var/spack/repos/builtin/packages/libcanberra/package.py index db83e6e711744b..ba94f92309136b 100644 --- a/var/spack/repos/builtin/packages/libcanberra/package.py +++ b/var/spack/repos/builtin/packages/libcanberra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libcanberra(AutotoolsPackage): homepage = "https://0pointer.de/lennart/projects/libcanberra/" url = "https://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz" + license("LGPL-2.1-or-later") + version("0.30", sha256="c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72") # TODO: Add variants and dependencies for the following audio support: diff --git a/var/spack/repos/builtin/packages/libcap-ng/package.py b/var/spack/repos/builtin/packages/libcap-ng/package.py index ddc0ba492b5ede..373cf7c3999eed 100644 --- a/var/spack/repos/builtin/packages/libcap-ng/package.py +++ b/var/spack/repos/builtin/packages/libcap-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LibcapNg(AutotoolsPackage): homepage = "https://github.com/stevegrubb/libcap-ng/" url = "https://github.com/stevegrubb/libcap-ng/archive/v0.8.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("0.8.3", sha256="e542e9139961f0915ab5878427890cdc7762949fbe216bd0cb4ceedb309bb854") version("0.8", sha256="836ea8188ae7c658cdf003e62a241509dd542f3dec5bc40c603f53a5aadaa93f") version("0.7.11", sha256="78f32ff282b49b7b91c56d317fb6669df26da332c6fc9462870cec2573352222") diff --git a/var/spack/repos/builtin/packages/libcap/package.py b/var/spack/repos/builtin/packages/libcap/package.py index c9750a42a9966a..6dedb75748f140 100644 --- a/var/spack/repos/builtin/packages/libcap/package.py +++ b/var/spack/repos/builtin/packages/libcap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libcap(MakefilePackage): homepage = "https://sites.google.com/site/fullycapable/" url = "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.25.tar.gz" + license("BSD-3-Clause OR GPL-2.0-only") + version("2.68", sha256="046e55716e0643b565efcd1dab1d26c5625709fcd0b5c271290c7ea1524cf906") version("2.67", sha256="2d0b679a431c06afd8651a8ada906303eda8b3ac67c308e5fe1937eea5c018aa") version("2.66", sha256="5f65dc5b2e9f63a0748ea1b05be7965a38548db1cbfd53b30271ff02186b3a4a") diff --git a/var/spack/repos/builtin/packages/libcatalyst/package.py b/var/spack/repos/builtin/packages/libcatalyst/package.py index 9000ca137fc158..ce3a4c7e9f4819 100644 --- a/var/spack/repos/builtin/packages/libcatalyst/package.py +++ b/var/spack/repos/builtin/packages/libcatalyst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libcatalyst(CMakePackage): git = "https://gitlab.kitware.com/paraview/catalyst.git" url = "https://gitlab.kitware.com/api/v4/projects/paraview%2Fcatalyst/packages/generic/catalyst/v2.0.0/catalyst-v2.0.0.tar.gz" + license("BSD-3-Clause") + maintainers("mathstuf", "ayenpure") version("master", branch="master") version("2.0.0-rc4", sha256="cb491e4ccd344156cc2494f65b9f38885598c16d12e1016c36e2ee0bc3640863") diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py index e74468646b824c..d24e5151e16520 100644 --- a/var/spack/repos/builtin/packages/libceed/package.py +++ b/var/spack/repos/builtin/packages/libceed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,10 @@ class Libceed(MakefilePackage, CudaPackage, ROCmPackage): maintainers("jedbrown", "v-dobrev", "tzanio", "jeremylt") + license("BSD-2-Clause") + version("develop", branch="main") - version("0.12.0", tag="v0.12.0", commit="60ef3feef7f5137af55ea7336903743d94ee71a8") + version("0.12.0", tag="v0.12.0", commit="4018a20a98d451fac24765d3ddb936861647ce8d") version("0.11.0", tag="v0.11.0", commit="8ec64e9ae9d5df169dba8c8ee61d8ec8907b8f80") version("0.10.1", tag="v0.10.1", commit="74532b27052d94e943eb8bc76257fbd710103614") version("0.9", tag="v0.9.0", commit="d66340f5aae79e564186ab7514a1cd08b3a1b06b") diff --git a/var/spack/repos/builtin/packages/libcerf/package.py b/var/spack/repos/builtin/packages/libcerf/package.py index 6a3dfdc395a073..fb84326608de62 100644 --- a/var/spack/repos/builtin/packages/libcerf/package.py +++ b/var/spack/repos/builtin/packages/libcerf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libcgroup/package.py b/var/spack/repos/builtin/packages/libcgroup/package.py index 8ddb721a4bd870..8c564733515b56 100644 --- a/var/spack/repos/builtin/packages/libcgroup/package.py +++ b/var/spack/repos/builtin/packages/libcgroup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libcgroup(AutotoolsPackage): homepage = "https://sourceforge.net/projects/libcg/" url = "https://sourceforge.net/projects/libcg/files/libcgroup/v0.41/libcgroup-0.41.tar.bz2" + license("LGPL-2.1-only") + version("0.41", sha256="e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51") version("0.37", sha256="15c8f3febb546530d3495af4e4904b3189c273277ca2d8553dec882cde1cd0f6") version("0.36", sha256="8dcd2ae220435b3de736d3efb0023fdf1192d7a7f4032b439f3cf5342cff7b4c") diff --git a/var/spack/repos/builtin/packages/libcint/package.py b/var/spack/repos/builtin/packages/libcint/package.py index 47e022032d5cff..8273d63b3804c0 100644 --- a/var/spack/repos/builtin/packages/libcint/package.py +++ b/var/spack/repos/builtin/packages/libcint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libcint(CMakePackage): url = "https://github.com/sunqm/libcint/archive/v3.0.4.tar.gz" maintainers("mfherbst") + license("BSD-2-Clause") + # # Versions # diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py index 8b65ec9d09d755..115164fd99ad0f 100644 --- a/var/spack/repos/builtin/packages/libcircle/package.py +++ b/var/spack/repos/builtin/packages/libcircle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libconfig/package.py b/var/spack/repos/builtin/packages/libconfig/package.py index a7fe9319c1d342..a798afa49ceaed 100644 --- a/var/spack/repos/builtin/packages/libconfig/package.py +++ b/var/spack/repos/builtin/packages/libconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libconfig(AutotoolsPackage): force_autoreconf = True + license("LGPL-2.1-or-later") + version("1.7.3", sha256="68757e37c567fd026330c8a8449aa5f9cac08a642f213f2687186b903bd7e94e") version("1.7.2", sha256="f67ac44099916ae260a6c9e290a90809e7d782d96cdd462cac656ebc5b685726") version("1.7.1", sha256="d288e6ae817f4ef78df43cdb2647f768dc97899ee82fcc41f857e8eb9fd7fbdb") diff --git a/var/spack/repos/builtin/packages/libconfuse/package.py b/var/spack/repos/builtin/packages/libconfuse/package.py index 7a738cbb18d8dc..e04391ba89c842 100644 --- a/var/spack/repos/builtin/packages/libconfuse/package.py +++ b/var/spack/repos/builtin/packages/libconfuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libconfuse(AutotoolsPackage): homepage = "https://github.com/martinh/libconfuse" url = "https://github.com/martinh/libconfuse/archive/v3.2.2.tar.gz" + license("0BSD") + version("3.3", sha256="cb90c06f2dbec971792af576d5b9a382fb3c4ca2b1deea55ea262b403f4e641e") version("3.2.2", sha256="2cf7e032980aff8f488efba61510dc3fb95e9a4b9183f985dea457a5651b0e2c") version("3.2.1", sha256="2eff8e3c300c4ed1d67fdb13f9d31a72a68e31874b4640db15334305bc40cebd") diff --git a/var/spack/repos/builtin/packages/libcroco/package.py b/var/spack/repos/builtin/packages/libcroco/package.py index 685fb9f2188cf4..851b364f8de8cc 100644 --- a/var/spack/repos/builtin/packages/libcroco/package.py +++ b/var/spack/repos/builtin/packages/libcroco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libcroco(AutotoolsPackage): homepage = "https://developer.gnome.org/libcroco" url = "http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.12.tar.xz" + license("LGPL-2.0-or-later") + version("0.6.13", sha256="767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4") version("0.6.12", sha256="ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860") diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py index 353ee54dd11952..d1ac1b924429bc 100644 --- a/var/spack/repos/builtin/packages/libctl/package.py +++ b/var/spack/repos/builtin/packages/libctl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libctl(AutotoolsPackage): git = "https://github.com/NanoComp/libctl.git" url = "https://github.com/NanoComp/libctl/releases/download/v4.2.0/libctl-4.2.0.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("4.5.1", sha256="fcfeb2f13dda05b560f0ec6872757d9318fdfe8f4bc587eb2053a29ba328ae25") version("4.5.0", sha256="621e46a238c4d5e8ce0866183f8e04abac6e1a94d90932af0d56ee61370ea153") version("4.2.0", sha256="0341ad6ea260ecda2efb3d4b679abb3d05ca6211792381979b036177a9291975") diff --git a/var/spack/repos/builtin/packages/libcudf/package.py b/var/spack/repos/builtin/packages/libcudf/package.py index c9bbc52a299e34..f3b56e93b470d5 100644 --- a/var/spack/repos/builtin/packages/libcudf/package.py +++ b/var/spack/repos/builtin/packages/libcudf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libcudf(CMakePackage): homepage = "https://rapids.ai" url = "https://github.com/rapidsai/cudf/archive/v0.15.0.tar.gz" + license("Apache-2.0") + version("0.15.0", sha256="2570636b72cce4c52f71e36307f51f630e2f9ea94a1abc018d40ce919ba990e4") depends_on("cmake@3.14:", type="build") diff --git a/var/spack/repos/builtin/packages/libcuml/package.py b/var/spack/repos/builtin/packages/libcuml/package.py index 67af9b46f1ca2d..7d2b27346c311d 100644 --- a/var/spack/repos/builtin/packages/libcuml/package.py +++ b/var/spack/repos/builtin/packages/libcuml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libcumlprims/package.py b/var/spack/repos/builtin/packages/libcumlprims/package.py index 29bc31d2d67507..eaf7fab4559460 100644 --- a/var/spack/repos/builtin/packages/libcumlprims/package.py +++ b/var/spack/repos/builtin/packages/libcumlprims/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py b/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py index 7f2055ae9b75d0..9cdcfea1f8ed6d 100644 --- a/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py +++ b/var/spack/repos/builtin/packages/libcxxwrap-julia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class LibcxxwrapJulia(CMakePackage): maintainers("eloop") + license("MIT") + # note: use the @main branch version if you're building for julia 1.7 version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/libcyaml/package.py b/var/spack/repos/builtin/packages/libcyaml/package.py index c9cb3cf39d1b0b..c1d79006978bc2 100644 --- a/var/spack/repos/builtin/packages/libcyaml/package.py +++ b/var/spack/repos/builtin/packages/libcyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libcyaml(MakefilePackage): homepage = "https://github.com/tlsa/libcyaml" url = "https://github.com/tlsa/libcyaml/archive/v1.1.0.tar.gz" + license("ISC") + version("1.4.0", sha256="e803fef0e254aa1f302c622c2d25cff989e04e9b2bebb7d22abd91386373122f") version("1.1.0", sha256="37a00ed8ec206b60a712acfd44196bef063b8f02e376d8e86f61a7007a81daea") diff --git a/var/spack/repos/builtin/packages/libdaemon/package.py b/var/spack/repos/builtin/packages/libdaemon/package.py index 25ccd9d73c5c81..a73e9947c0a7c0 100644 --- a/var/spack/repos/builtin/packages/libdaemon/package.py +++ b/var/spack/repos/builtin/packages/libdaemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libdaemon(AutotoolsPackage): homepage = "https://0pointer.de/lennart/projects/libdaemon/" url = "https://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz" + license("LGPL-2.1-or-later") + version("0.14", sha256="fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834") version("0.13", sha256="bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709") version("0.12", sha256="39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0") diff --git a/var/spack/repos/builtin/packages/libdap4/package.py b/var/spack/repos/builtin/packages/libdap4/package.py index 2603abab8c03a9..cad0ed7ba28f75 100644 --- a/var/spack/repos/builtin/packages/libdap4/package.py +++ b/var/spack/repos/builtin/packages/libdap4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libdap4(AutotoolsPackage): maintainers("tjhei") + license("LGPL-2.1-or-later") + version("3.20.6", sha256="e44e83043c158d8c9d0a37a1821626ab0db4a1a6578b02182440170c0b060e6d") version("3.20.4", sha256="c39fa310985cc8963029ad0d0aba784e7dbf1f70c566bd7ae58242f1bb06d24a") @@ -32,6 +34,14 @@ class Libdap4(AutotoolsPackage): depends_on("curl") depends_on("libxml2") depends_on("uuid") + depends_on("rpc") + + def setup_build_environment(self, env): + # Configure script will search for RPC library, but not actually add RPC library references + # during configure tests. This can cause a failure with libtirpc if the following variable + # is not set. + if self.spec.satisfies("^libtirpc"): + env.set("TIRPC_LIBS", self.spec["rpc"].libs) def configure_args(self): # libxml2 exports ./include/libxml2/ instead of ./include/, which we diff --git a/var/spack/repos/builtin/packages/libdatrie/package.py b/var/spack/repos/builtin/packages/libdatrie/package.py index 906a71e6444a3e..f2534674bd3174 100644 --- a/var/spack/repos/builtin/packages/libdatrie/package.py +++ b/var/spack/repos/builtin/packages/libdatrie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libdatrie(AutotoolsPackage): homepage = "https://linux.thai.net/projects/datrie" url = "https://github.com/tlwg/libdatrie/releases/download/v0.2.12/libdatrie-0.2.12.tar.xz" + license("LGPL-2.1-or-later") + version("0.2.12", sha256="452dcc4d3a96c01f80f7c291b42be11863cd1554ff78b93e110becce6e00b149") version("0.2.11", sha256="547c7bd2ab9e10ad65f3270cae8ca7027f52db9c30f7327d24354ad41a98e94b") diff --git a/var/spack/repos/builtin/packages/libdc1394/package.py b/var/spack/repos/builtin/packages/libdc1394/package.py index 9e708122aeaf61..b8151a70d9df88 100644 --- a/var/spack/repos/builtin/packages/libdc1394/package.py +++ b/var/spack/repos/builtin/packages/libdc1394/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libdc1394(AutotoolsPackage): maintainers("traversaro") + license("LGPL-2.1-or-later") + version("2.2.6", sha256="2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/libde265/package.py b/var/spack/repos/builtin/packages/libde265/package.py index b360661bee4b8f..7e6db94a658944 100644 --- a/var/spack/repos/builtin/packages/libde265/package.py +++ b/var/spack/repos/builtin/packages/libde265/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libde265(CMakePackage): maintainers("benkirk") + license("LGPL-3.0-or-later") + version("1.0.9", sha256="153554f407718a75f1e0ae197d35b43147ce282118a54f894554dbe27c32163d") depends_on("cmake@3.13:", type="build") diff --git a/var/spack/repos/builtin/packages/libdeflate/package.py b/var/spack/repos/builtin/packages/libdeflate/package.py index 91d823f55a929e..f140cb57a3f487 100644 --- a/var/spack/repos/builtin/packages/libdeflate/package.py +++ b/var/spack/repos/builtin/packages/libdeflate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libdeflate(MakefilePackage, CMakePackage): maintainers("dorton21") + license("MIT") + version("1.18", sha256="225d982bcaf553221c76726358d2ea139bb34913180b20823c782cede060affd") version("1.14", sha256="89e7df898c37c3427b0f39aadcf733731321a278771d20fc553f92da8d4808ac") version("1.10", sha256="5c1f75c285cd87202226f4de49985dcb75732f527eefba2b3ddd70a8865f2533") diff --git a/var/spack/repos/builtin/packages/libdicom/package.py b/var/spack/repos/builtin/packages/libdicom/package.py new file mode 100644 index 00000000000000..4ee90bfebf974b --- /dev/null +++ b/var/spack/repos/builtin/packages/libdicom/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Libdicom(MesonPackage): + """libdicom is a C library and a set of command-line tools for reading DICOM WSI files.""" + + homepage = "https://github.com/ImagingDataCommons/libdicom" + url = "https://github.com/ImagingDataCommons/libdicom/archive/refs/tags/v1.0.5.tar.gz" + + license("MIT") + + version("1.0.5", sha256="ebf5f7c0d1a0f802c1801f2f762537f014f2a431be3e063142f6ed3c96878abb") + + depends_on("meson@0.50:", type="build") + depends_on("ninja", type="build") + depends_on("pkgconfig", type="build") + depends_on("cmake", type="build") + depends_on("uthash") + depends_on("check@0.9.6:", type=("build", "test")) + + def meson_args(self): + return ["-Dwrap_mode=nofallback"] diff --git a/var/spack/repos/builtin/packages/libdistributed/package.py b/var/spack/repos/builtin/packages/libdistributed/package.py index f036c5cb5dd36f..83d5aab986237a 100644 --- a/var/spack/repos/builtin/packages/libdistributed/package.py +++ b/var/spack/repos/builtin/packages/libdistributed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libdivsufsort/package.py b/var/spack/repos/builtin/packages/libdivsufsort/package.py index c0c82e6b100709..bebbc0c57b19c2 100644 --- a/var/spack/repos/builtin/packages/libdivsufsort/package.py +++ b/var/spack/repos/builtin/packages/libdivsufsort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libdivsufsort(CMakePackage): homepage = "https://github.com/y-256/libdivsufsort" url = "https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz" + license("MIT") + version("2.0.1", sha256="9164cb6044dcb6e430555721e3318d5a8f38871c2da9fd9256665746a69351e0") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index d4c3205bc03ec0..80122777e866d9 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py index b4b61b5f2fe7a2..0b7497efdd75bb 100644 --- a/var/spack/repos/builtin/packages/libdrm/package.py +++ b/var/spack/repos/builtin/packages/libdrm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libdrm(Package): maintainers("wdconinc") + license("MIT") + version("2.4.115", sha256="554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb") version("2.4.114", sha256="3049cf843a47d12e5eeefbc3be3496d782fa09f42346bf0b7defe3d1e598d026") version("2.4.113", sha256="7fd7eb2967f63beb4606f22d50e277d993480d05ef75dd88a9bd8e677323e5e1") diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 93659acd0cd5bb..f935a7ca79147f 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Libdwarf(Package): url = "https://www.prevanders.net/libdwarf-20160507.tar.gz" list_url = homepage + license("LGPL-2.1-only") + version("20180129", sha256="8bd91b57064b0c14ade5a009d3a1ce819f1b6ec0e189fc876eb8f42a8720d8a6") version("20160507", sha256="12ae39376e3915bf8fa92555989f3ad5f2f4f332b590a628541ce68987b337af") version("20130729", sha256="b6455d8616baf2883e2af91f006d6cbd583128fdfff46e3d1fae460bc223bb7b") diff --git a/var/spack/repos/builtin/packages/libeatmydata/package.py b/var/spack/repos/builtin/packages/libeatmydata/package.py index c5eef93c3d5200..02c69137c38b0b 100644 --- a/var/spack/repos/builtin/packages/libeatmydata/package.py +++ b/var/spack/repos/builtin/packages/libeatmydata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libeatmydata(AutotoolsPackage): homepage = "https://www.flamingspork.com/projects/libeatmydata/" url = "https://www.flamingspork.com/projects/libeatmydata/libeatmydata-105.tar.gz" + license("GPL-3.0-or-later") + version("131", sha256="cf18a8c52138a38541be3478af446c06048108729d7e18476492d62d54baabc4") version("105", sha256="bdd2d068b6b27cf47cd22aa4c5da43b3d4a05944cfe0ad1b0d843d360ed3a8dd") diff --git a/var/spack/repos/builtin/packages/libecpint/package.py b/var/spack/repos/builtin/packages/libecpint/package.py index 86c9966d910b1c..d7021a053426fd 100644 --- a/var/spack/repos/builtin/packages/libecpint/package.py +++ b/var/spack/repos/builtin/packages/libecpint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libecpint(CMakePackage): url = "https://github.com/robashaw/libecpint/archive/v1.0.4.tar.gz" git = "https://github.com/robashaw/libecpint" + license("MIT") + version("master", branch="master") version("1.0.5", sha256="3ad5ff342b1bc870f5992c296e8bd8aa590c21a9b14333958c601f8916d6f532") version("1.0.4", sha256="fad9d1ac98f8dcd40f7bee69aef653bfa3079f016e43277cbd554e06890aa186") diff --git a/var/spack/repos/builtin/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py index 9ecf148c45d17c..0d3f20c5a482ec 100644 --- a/var/spack/repos/builtin/packages/libedit/package.py +++ b/var/spack/repos/builtin/packages/libedit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libedit(AutotoolsPackage): homepage = "https://thrysoee.dk/editline/" url = "https://thrysoee.dk/editline/libedit-20170329-3.1.tar.gz" + license("BSD-3-Clause") + version( "3.1-20210216", sha256="2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a" ) diff --git a/var/spack/repos/builtin/packages/libefence/package.py b/var/spack/repos/builtin/packages/libefence/package.py index df8d0d8b89eba2..a0178ed080925e 100644 --- a/var/spack/repos/builtin/packages/libefence/package.py +++ b/var/spack/repos/builtin/packages/libefence/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libefence(MakefilePackage): maintainers("cessenat") + license("GPL-2.0-or-later") + version("2.2.6", sha256="a949e0dedb06cbcd444566cce1457223f2c41abd3513f21663f30f19ccc48e24") def build(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libelf/package.py b/var/spack/repos/builtin/packages/libelf/package.py index 015978d5731e21..dfce6aac727a07 100644 --- a/var/spack/repos/builtin/packages/libelf/package.py +++ b/var/spack/repos/builtin/packages/libelf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Libelf(AutotoolsPackage): "https://ftp.osuosl.org/pub/blfs/conglomeration/libelf/libelf-0.8.13.tar.gz", ] + license("LGPL-2.0-only") + version("0.8.13", sha256="591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d") provides("elf@0") diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py index b55f707f1ce549..514358dd18b39b 100644 --- a/var/spack/repos/builtin/packages/libemos/package.py +++ b/var/spack/repos/builtin/packages/libemos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libemos(CMakePackage): ) list_url = "https://software.ecmwf.int/wiki/display/EMOS/Releases" + license("Apache-2.0") + version("4.5.1", sha256="c982d9fd7dcd15c3a4d1e1115b90430928b660e17f73f7d4e360dd9f87f68c46") version("4.5.0", sha256="debe474603224c318f8ed4a1c209a4d1416807c594c3faa196059b2228824393") version("4.4.9", sha256="61af7dfcd37875b4f834e2e4371922ec529a8c03879c52e8fb911b35e4c0d413") diff --git a/var/spack/repos/builtin/packages/libepoxy/package.py b/var/spack/repos/builtin/packages/libepoxy/package.py index 7e5690ad621ba2..1736ae80d75a11 100644 --- a/var/spack/repos/builtin/packages/libepoxy/package.py +++ b/var/spack/repos/builtin/packages/libepoxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libepoxy(AutotoolsPackage): url = "https://github.com/anholt/libepoxy/releases/download/1.4.3/libepoxy-1.4.3.tar.xz" list_url = "https://github.com/anholt/libepoxy/releases" + license("MIT") + version("1.4.3", sha256="0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/libestr/package.py b/var/spack/repos/builtin/packages/libestr/package.py index e12c9a156e9c9a..1f8a2cf0d004b1 100644 --- a/var/spack/repos/builtin/packages/libestr/package.py +++ b/var/spack/repos/builtin/packages/libestr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libestr(AutotoolsPackage): homepage = "https://libestr.adiscon.com/" url = "https://github.com/rsyslog/libestr/archive/v0.1.11.tar.gz" + license("LGPL-2.1-or-later") + version("0.1.11", sha256="46b53b80f875fd82981d927a45f0c9df9d17ee1d0e29efab76aaa9cd54a46bb4") version("0.1.10", sha256="e8756b071540314abef25c044f893d6b5d249e46709329a4b3e7361403c29a1e") version("0.1.9", sha256="efa0b90b5fe22844bac26042f988de6e8b2770e28dbd84bf49b9982d9c3e34f8") diff --git a/var/spack/repos/builtin/packages/libev/package.py b/var/spack/repos/builtin/packages/libev/package.py index ffb6a32e592ce3..4a9836ead6b540 100644 --- a/var/spack/repos/builtin/packages/libev/package.py +++ b/var/spack/repos/builtin/packages/libev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libev(AutotoolsPackage): url = "http://dist.schmorp.de/libev/Attic/libev-4.24.tar.gz" git = "https://github.com/enki/libev.git" + license("BSD-2-Clause OR GPL-2.0-or-later") + version("develop", branch="master") version("4.24", sha256="973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821") diff --git a/var/spack/repos/builtin/packages/libevdev/package.py b/var/spack/repos/builtin/packages/libevdev/package.py index 00d8501a842730..3bd9774d30ab89 100644 --- a/var/spack/repos/builtin/packages/libevdev/package.py +++ b/var/spack/repos/builtin/packages/libevdev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libevdev(AutotoolsPackage): homepage = "https://cgit.freedesktop.org/libevdev" url = "https://github.com/whot/libevdev/archive/libevdev-1.5.4.tar.gz" + license("MIT") + version("1.5.4", sha256="11ef3510970c049b0e30985be3149d27b4b36b7cbe14ca678746aac1ca86744d") version("1.5.3", sha256="14575ecac843af1f05dd90099a3163086da5b7a888da9d14263036b7b93894eb") version("1.5.2", sha256="75780467d76ee93ecaf62cfd0fa6020629231289230548dae04638936af1e1c8") diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py index 7969fb63d58d23..9caeea8d033966 100644 --- a/var/spack/repos/builtin/packages/libevent/package.py +++ b/var/spack/repos/builtin/packages/libevent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libevent(AutotoolsPackage): url = "https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz" list_url = "https://libevent.org/old-releases.html" + license("BSD-3-Clause") + version("2.1.12", sha256="92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb") version("2.1.11", sha256="a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d") version("2.1.10", sha256="e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0") @@ -59,7 +61,7 @@ def libs(self): return LibraryList(libs) def autoreconf(self, spec, prefix): - Executable("./autogen.sh")() + autoreconf("--force", "--install", "--symlink") def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/libevpath/package.py b/var/spack/repos/builtin/packages/libevpath/package.py index b4bdae31bf689e..0b88d6c597c977 100644 --- a/var/spack/repos/builtin/packages/libevpath/package.py +++ b/var/spack/repos/builtin/packages/libevpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libexif/package.py b/var/spack/repos/builtin/packages/libexif/package.py index 2a4f80de9cb02b..185be43a3669dd 100644 --- a/var/spack/repos/builtin/packages/libexif/package.py +++ b/var/spack/repos/builtin/packages/libexif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class Libexif(AutotoolsPackage, SourceforgePackage): maintainers("TheQueasle") + license("LGPL-2.0-or-later") + version("0.6.21", sha256="16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index fe0c9c6a40e70d..87fa608ba8daed 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,11 @@ class Libfabric(AutotoolsPackage): executables = ["^fi_info$"] + license("GPL-2.0-or-later") + version("main", branch="main") + version("1.20.1", sha256="fd88d65c3139865d42a6eded24e121aadabd6373239cef42b76f28630d6eed76") + version("1.20.0", sha256="7fbbaeb0e15c7c4553c0ac5f54e4ef7aecaff8a669d4ba96fa04b0fc780b9ddc") version("1.19.0", sha256="f14c764be9103e80c46223bde66e530e5954cb28b3835b57c8e728479603ef9e") version("1.18.2", sha256="64d7837853ca84d2a413fdd96534b6a81e6e777cc13866e28cf86cd0ccf1b93e") version("1.18.1", sha256="4615ae1e22009e59c72ae03c20adbdbd4a3dce95aeefbc86cc2bf1acc81c9e38") @@ -72,6 +76,7 @@ class Libfabric(AutotoolsPackage): "shm", "sockets", "tcp", + "ucx", "udp", "usnic", "verbs", @@ -97,6 +102,8 @@ class Libfabric(AutotoolsPackage): variant("debug", default=False, description="Enable debugging") + variant("uring", default=False, when="@1.17.0:", description="Enable uring support") + # For version 1.9.0: # headers: fix forward-declaration of enum fi_collective_op with C++ patch( @@ -114,8 +121,10 @@ class Libfabric(AutotoolsPackage): depends_on("opa-psm2", when="fabrics=psm2") depends_on("psm", when="fabrics=psm") depends_on("ucx", when="fabrics=mlx") + depends_on("ucx", when="@1.18.0: fabrics=ucx") depends_on("uuid", when="fabrics=opx") depends_on("numactl", when="fabrics=opx") + depends_on("liburing@2.1:", when="+uring") depends_on("m4", when="@main", type="build") depends_on("autoconf", when="@main", type="build") @@ -124,6 +133,12 @@ class Libfabric(AutotoolsPackage): conflicts("@1.9.0", when="platform=darwin", msg="This distribution is missing critical files") conflicts("fabrics=opx", when="@:1.14.99") + conflicts( + "fabrics=opx", + when="@1.20.0", + msg="Libfabric 1.20.0 uses values in memory that are not correctly " + "set by OPX, resulting in undefined behavior.", + ) flag_handler = build_system_flags @@ -182,6 +197,9 @@ def configure_args(self): else: args.append("--with-kdreg=no") + if self.spec.satisfies("+uring"): + args.append("--with-uring=yes") + for fabric in [f if isinstance(f, str) else f[0].value for f in self.fabrics]: if "fabrics=" + fabric in self.spec: args.append("--enable-{0}=yes".format(fabric)) diff --git a/var/spack/repos/builtin/packages/libfastcommon/package.py b/var/spack/repos/builtin/packages/libfastcommon/package.py index e8907fd7cae062..b66f8a3b73fc16 100644 --- a/var/spack/repos/builtin/packages/libfastcommon/package.py +++ b/var/spack/repos/builtin/packages/libfastcommon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libfastjson/package.py b/var/spack/repos/builtin/packages/libfastjson/package.py index 0fc419bec7d453..445f7a3604eb4e 100644 --- a/var/spack/repos/builtin/packages/libfastjson/package.py +++ b/var/spack/repos/builtin/packages/libfastjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libfastjson(AutotoolsPackage): homepage = "https://github.com/rsyslog/libfastjson" url = "https://github.com/rsyslog/libfastjson/archive/v0.99.8.tar.gz" + license("MIT") + version("0.99.8", sha256="7e49057b26a5a9e3c6623e024f95f9fd9a14b571b9150aeb89d6d475fc3633e3") version("0.99.7", sha256="a142a6e5fa5c9c4ac32615c42fc663a1a14bff305c922e55192b6abf7d1ce1d8") version("0.99.6", sha256="617373e5205c84b5f674354df6ee9cba53ef8a227f0d1aa928666ed8a16d5547") diff --git a/var/spack/repos/builtin/packages/libffi/package.py b/var/spack/repos/builtin/packages/libffi/package.py index c67bd82ddd2f52..703ce16d3a9360 100644 --- a/var/spack/repos/builtin/packages/libffi/package.py +++ b/var/spack/repos/builtin/packages/libffi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libffi(AutotoolsPackage): homepage = "https://sourceware.org/libffi/" url = "https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz" + license("MIT") + version("3.4.4", sha256="d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676") version("3.4.3", sha256="4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8") version("3.4.2", sha256="540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620") @@ -32,6 +34,11 @@ class Libffi(AutotoolsPackage): patch("clang-powerpc-3.2.1.patch", when="@3.2.1%clang platform=linux") # ref.: https://github.com/libffi/libffi/pull/561 patch("powerpc-3.3.patch", when="@3.3") + patch( + "https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4.patch?full_index=1", + sha256="070b1f3aa87f2b56f83aff38afc42157e1692bfaa580276ecdbad2048b818ed7", + when="@3.4.3:3.4.4", + ) @property def headers(self): diff --git a/var/spack/repos/builtin/packages/libffs/package.py b/var/spack/repos/builtin/packages/libffs/package.py index 4efe1b719bd659..0623e1637bb733 100644 --- a/var/spack/repos/builtin/packages/libffs/package.py +++ b/var/spack/repos/builtin/packages/libffs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libfirefly/package.py b/var/spack/repos/builtin/packages/libfirefly/package.py index a4fc6b00a03876..40ef846e163233 100644 --- a/var/spack/repos/builtin/packages/libfirefly/package.py +++ b/var/spack/repos/builtin/packages/libfirefly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libfirefly(CMakePackage): maintainers("tbhaxor") + license("GPL-3.0-or-later") + version("master", branch="master") version("2.1.0", sha256="4de4b216c73199a1826de7a0d45205b401603315347d7947d8b5950d3e6b893d") diff --git a/var/spack/repos/builtin/packages/libfive/package.py b/var/spack/repos/builtin/packages/libfive/package.py index 873772c771da1c..71935c8128e1b2 100644 --- a/var/spack/repos/builtin/packages/libfive/package.py +++ b/var/spack/repos/builtin/packages/libfive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libfive(CMakePackage): homepage = "https://libfive.com" git = "https://github.com/libfive/libfive.git" + license("GPL-2.0") + # https://libfive.com/download/ recommends working from the master branch # and currently, all tags are from 2017: version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/libflame/package.py b/var/spack/repos/builtin/packages/libflame/package.py index 62704f3f03d857..f92c306aba207a 100644 --- a/var/spack/repos/builtin/packages/libflame/package.py +++ b/var/spack/repos/builtin/packages/libflame/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -127,6 +127,8 @@ class Libflame(LibflameBase): url = "https://github.com/flame/libflame/archive/5.1.0.tar.gz" git = "https://github.com/flame/libflame.git" + license("BSD-3-Clause") + version("master", branch="master") version("5.2.0", sha256="997c860f351a5c7aaed8deec00f502167599288fd0559c92d5bfd77d0b4d475c") version("5.1.0", sha256="e7189b750890bd781fe773f366b374518dd1d89a6513d3d6261bf549826384d1") diff --git a/var/spack/repos/builtin/packages/libfms/package.py b/var/spack/repos/builtin/packages/libfms/package.py index 8c806968b9d6c3..a7e30c70dbe1ef 100644 --- a/var/spack/repos/builtin/packages/libfms/package.py +++ b/var/spack/repos/builtin/packages/libfms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libfms(CMakePackage): maintainers("v-dobrev", "tzanio", "cwsmith") + license("BSD-2-Clause") + version("develop", branch="master") version("0.2.0", tag="v0.2", commit="a66cb96711cc404c411f1bf07ca8db09b6f894eb") diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py index 58eecb3496ea79..91774ced2513b0 100644 --- a/var/spack/repos/builtin/packages/libfontenc/package.py +++ b/var/spack/repos/builtin/packages/libfontenc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libfontenc(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libfontenc" xorg_mirror_path = "lib/libfontenc-1.1.3.tar.gz" + license("MIT") + version("1.1.7", sha256="5e5f210329823f08f97bfe9fd5b4105070c789bc5aef88ce01d86d8203d4aa9f") version("1.1.3", sha256="6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb") diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py index 52edbdc7735a91..05a557246dd06e 100644 --- a/var/spack/repos/builtin/packages/libfs/package.py +++ b/var/spack/repos/builtin/packages/libfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libfuse/package.py b/var/spack/repos/builtin/packages/libfuse/package.py index 7180fa8181a9f1..6aabffb453b89d 100644 --- a/var/spack/repos/builtin/packages/libfuse/package.py +++ b/var/spack/repos/builtin/packages/libfuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libfyaml/package.py b/var/spack/repos/builtin/packages/libfyaml/package.py index 36dbd411b8991d..9f19520e3ee037 100644 --- a/var/spack/repos/builtin/packages/libfyaml/package.py +++ b/var/spack/repos/builtin/packages/libfyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libfyaml(AutotoolsPackage): homepage = "https://github.com/pantoniou/libfyaml" url = "https://github.com/pantoniou/libfyaml/releases/download/v0.5.7/libfyaml-0.5.7.tar.gz" + license("MIT") + version("0.8", sha256="dc4d4348eedca68e8e2394556d57f71410e7d61791a71cbe178302ebe5f26b99") version("0.7.12", sha256="485342c6920e9fdc2addfe75e5c3e0381793f18b339ab7393c1b6edf78bf8ca8") version("0.5.7", sha256="3221f31bb3feba97e544a82d0d5e4711ff0e4101cca63923dc5a1a001c187590") diff --git a/var/spack/repos/builtin/packages/libgain/package.py b/var/spack/repos/builtin/packages/libgain/package.py index 2ac151df810f4c..dfe0bdc2924756 100644 --- a/var/spack/repos/builtin/packages/libgain/package.py +++ b/var/spack/repos/builtin/packages/libgain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libgain(AutotoolsPackage): homepage = "https://bigdft.org/" git = "https://gitlab.com/l_sim/bigdft-suite.git" + license("GPL-3.0-only") + version( "1.0.0", sha256="3e02637433272f5edfee74ea47abf93ab7e3f1ce717664d22329468a5bd45c3a", diff --git a/var/spack/repos/builtin/packages/libgcrypt/package.py b/var/spack/repos/builtin/packages/libgcrypt/package.py index cd207db083c0c2..8a5165923dd310 100644 --- a/var/spack/repos/builtin/packages/libgcrypt/package.py +++ b/var/spack/repos/builtin/packages/libgcrypt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class Libgcrypt(AutotoolsPackage): maintainers("alalazo") + license("LGPL-2.1-or-later AND GPL-2.0-or-later") + + version("1.10.3", sha256="8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa") version("1.10.2", sha256="3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03") version("1.10.1", sha256="ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de") version("1.10.0", sha256="6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81") diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index e4e6ae19923e2e..e01c81d74c5d4d 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libgdsii/package.py b/var/spack/repos/builtin/packages/libgdsii/package.py index 8cd399ca2b162e..660ad7e479b07f 100644 --- a/var/spack/repos/builtin/packages/libgdsii/package.py +++ b/var/spack/repos/builtin/packages/libgdsii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libgdsii(AutotoolsPackage): homepage = "https://github.com/HomerReid/libGDSII" url = "https://github.com/HomerReid/libGDSII/archive/refs/tags/v0.21.tar.gz" + license("GPL-2.0-or-later") + version("0.21", sha256="1adc571c6b53df4c08d108f9ac4f4a7fd6fbefd4bc56f74e0b7b2801353671b8") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libgeotiff/package.py b/var/spack/repos/builtin/packages/libgeotiff/package.py index f1024d7b5cf736..1b35c5eb98cbfa 100644 --- a/var/spack/repos/builtin/packages/libgeotiff/package.py +++ b/var/spack/repos/builtin/packages/libgeotiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libgeotiff(AutotoolsPackage): maintainers("adamjstewart") + license("Public-Domain") + version("1.7.1", sha256="05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6") version("1.7.0", sha256="fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e") version("1.6.0", sha256="9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca") diff --git a/var/spack/repos/builtin/packages/libgff/package.py b/var/spack/repos/builtin/packages/libgff/package.py index df3451a37c25fd..bfced2214727bd 100644 --- a/var/spack/repos/builtin/packages/libgff/package.py +++ b/var/spack/repos/builtin/packages/libgff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index dd09fd8e1e843c..773771ffdc5e45 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -83,6 +83,7 @@ class Libgit2(CMakePackage): depends_on("cmake@2.8:", type="build", when="@:0.28") depends_on("cmake@3.5:", type="build", when="@0.99:") depends_on("pkgconfig", type="build") + depends_on("python", type="test") # Runtime Dependencies depends_on("libssh2", when="+ssh") @@ -123,5 +124,6 @@ def cmake_args(self): # Control tests args.append(self.define("BUILD_CLAR", self.run_tests)) + args.append(self.define("BUILD_TESTS", self.run_tests)) return args diff --git a/var/spack/repos/builtin/packages/libgpg-error/package.py b/var/spack/repos/builtin/packages/libgpg-error/package.py index e2eeb228b48d5b..73258b5140cb18 100644 --- a/var/spack/repos/builtin/packages/libgpg-error/package.py +++ b/var/spack/repos/builtin/packages/libgpg-error/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class LibgpgError(AutotoolsPackage): maintainers("alalazo") + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("1.47", sha256="9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb") version("1.46", sha256="b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d") version("1.45", sha256="570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26") diff --git a/var/spack/repos/builtin/packages/libgpuarray/package.py b/var/spack/repos/builtin/packages/libgpuarray/package.py index bf770815760513..fb989c250406f6 100644 --- a/var/spack/repos/builtin/packages/libgpuarray/package.py +++ b/var/spack/repos/builtin/packages/libgpuarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libgridxc/package.py b/var/spack/repos/builtin/packages/libgridxc/package.py index ada5af06a02357..90473c0b0b9abe 100644 --- a/var/spack/repos/builtin/packages/libgridxc/package.py +++ b/var/spack/repos/builtin/packages/libgridxc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libgssglue/package.py b/var/spack/repos/builtin/packages/libgssglue/package.py index 00fc1d49e23d1e..a3accd3280b4a3 100644 --- a/var/spack/repos/builtin/packages/libgssglue/package.py +++ b/var/spack/repos/builtin/packages/libgssglue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libgssglue(AutotoolsPackage): homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/" url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/libgssglue-0.4.tar.gz" + license("BSD-3-Clause") + version("0.4", sha256="3f791a75502ba723e5e85e41e5e0c711bb89e2716b7c0ec6e74bd1df6739043a") version("0.3", sha256="d98a022af432b61fe2a1eb811b5916743ccb781e383da680f1a00fd1005a5174") version("0.2", sha256="3de4974e19e54048acdc465d3b3c6c006cb66d2952d36e6b0afc10012184dc91") diff --git a/var/spack/repos/builtin/packages/libgta/package.py b/var/spack/repos/builtin/packages/libgta/package.py index c22da2a1f7fdf2..022be5a31d9abe 100644 --- a/var/spack/repos/builtin/packages/libgta/package.py +++ b/var/spack/repos/builtin/packages/libgta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libgta(CMakePackage): homepage = "https://marlam.de/gta/" url = "https://marlam.de/gta/releases/libgta-1.2.1.tar.xz" + license("LGPL-2.1-or-later") + version("1.2.1", sha256="d445667e145f755f0bc34ac89b63a6bfdce1eea943f87ee7a3f23dc0dcede8b1") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/libgtextutils/package.py b/var/spack/repos/builtin/packages/libgtextutils/package.py index 1ff16f2cea9766..c10e53bcb29666 100644 --- a/var/spack/repos/builtin/packages/libgtextutils/package.py +++ b/var/spack/repos/builtin/packages/libgtextutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Libgtextutils(AutotoolsPackage): homepage = "https://github.com/agordon/libgtextutils" url = "https://github.com/agordon/libgtextutils/releases/download/0.7/libgtextutils-0.7.tar.gz" + license("AGPL-3.0-only") + patch("text_line_reader.patch") version("0.7", sha256="792e0ea3c96ffe3ad65617a104b7dc50684932bc96d2adab501c952fd65c3e4a") diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index b575c51ed1fab3..baebd257b70089 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libharu(AutotoolsPackage): url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz" git = "https://github.com/libharu/libharu.git" + license("custom") + version("master", branch="master") version("2.3.0", sha256="8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2") version("2.2.0", sha256="5e63246d2da0272a9dbe5963fd827c7efa6e29d97a2d047c0d4c5f0b780f10b5") diff --git a/var/spack/repos/builtin/packages/libhbaapi/package.py b/var/spack/repos/builtin/packages/libhbaapi/package.py index 5be13d642b01a2..b61bcf2d7952cd 100644 --- a/var/spack/repos/builtin/packages/libhbaapi/package.py +++ b/var/spack/repos/builtin/packages/libhbaapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libhbaapi(AutotoolsPackage): homepage = "https://github.com/cleech/libHBAAPI" url = "https://github.com/cleech/libHBAAPI/archive/v3.11.tar.gz" + license("SNIA") + version("3.11", sha256="c7b2530d616fd7bee46e214e7eb91c91803aec3297a7c6bbf73467a1edad4e10") version("3.10", sha256="ca4f4ec3defa057c1b51bc87cc749efe5d54579e055d7a51688d18cc35166462") version("3.9", sha256="8e60616abde44488fed05254988f9b41653d2204a7218072714d6623e099c863") diff --git a/var/spack/repos/builtin/packages/libheif/package.py b/var/spack/repos/builtin/packages/libheif/package.py index 3dac010d25542b..fd45ec6bba262d 100644 --- a/var/spack/repos/builtin/packages/libheif/package.py +++ b/var/spack/repos/builtin/packages/libheif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libheif(CMakePackage): homepage = "https://github.com/strukturag/libheif" url = "https://github.com/strukturag/libheif/archive/refs/tags/v1.12.0.tar.gz" + license("LGPL-3.0-or-later") + version("1.12.0", sha256="086145b0d990182a033b0011caadb1b642da84f39ab83aa66d005610650b3c65") depends_on("cmake@3.13:", type="build") diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py index a394c701972f58..e978ede51507e0 100644 --- a/var/spack/repos/builtin/packages/libhio/package.py +++ b/var/spack/repos/builtin/packages/libhio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libhugetlbfs/package.py b/var/spack/repos/builtin/packages/libhugetlbfs/package.py index bf00975ee31685..ba0bd486808f0d 100644 --- a/var/spack/repos/builtin/packages/libhugetlbfs/package.py +++ b/var/spack/repos/builtin/packages/libhugetlbfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libhugetlbfs(MakefilePackage): homepage = "https://github.com/libhugetlbfs/libhugetlbfs" url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/2.22/libhugetlbfs-2.22.tar.gz" + license("LGPL-2.1-or-later") + version("2.22", sha256="94dca9ea2c527cd77bf28904094fe4708865a85122d416bfccc8f4b73b9a6785") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libiberty/package.py b/var/spack/repos/builtin/packages/libiberty/package.py index 4c82320a186cb8..41f2f3ac691ce5 100644 --- a/var/spack/repos/builtin/packages/libiberty/package.py +++ b/var/spack/repos/builtin/packages/libiberty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libiberty(AutotoolsPackage, GNUMirrorPackage): gnu_mirror_path = "binutils/binutils-2.31.1.tar.xz" maintainers("mwkrentel") + license("LGPL-2.0-or-later") + version("2.41", sha256="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450") version("2.40", sha256="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1") version("2.37", sha256="820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c") diff --git a/var/spack/repos/builtin/packages/libibumad/package.py b/var/spack/repos/builtin/packages/libibumad/package.py index 31e167e50d9008..2601b3ffbe49e2 100644 --- a/var/spack/repos/builtin/packages/libibumad/package.py +++ b/var/spack/repos/builtin/packages/libibumad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libibumad(CMakePackage): homepage = "https://github.com/linux-rdma/" url = "https://github.com/linux-rdma/rdma-core/archive/v25.0.tar.gz" + license("GPL-2.0-only OR BSD-2-Clause") + version("46.0", sha256="23fd2a5a656f7d147796660c3d3728b31287bc70a3e913e28ea5da7f39269229") version("44.1", sha256="1dec7e25dd248f1ff4d262e5674297205ad9113a4ff25ab7ecbb75a824adac27") version("25.0", sha256="d735bd091d13e8a68ce650e432b5bdc934fc7f1d5fb42a6045278a5b3f7fe48b") diff --git a/var/spack/repos/builtin/packages/libical/package.py b/var/spack/repos/builtin/packages/libical/package.py index d121f64fb4c177..8ba00a19efcf40 100644 --- a/var/spack/repos/builtin/packages/libical/package.py +++ b/var/spack/repos/builtin/packages/libical/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libical(CMakePackage): homepage = "https://github.com/libical/libical" url = "https://github.com/libical/libical/archive/v3.0.8.tar.gz" + license("LGPL-2.1-only OR MPL-2.0") + version("3.0.11", sha256="1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1") version("3.0.8", sha256="09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f") diff --git a/var/spack/repos/builtin/packages/libicd/package.py b/var/spack/repos/builtin/packages/libicd/package.py index a5468064eefac1..a8c7521e4495b4 100644 --- a/var/spack/repos/builtin/packages/libicd/package.py +++ b/var/spack/repos/builtin/packages/libicd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libicd(CMakePackage): homepage = "https://github.com/lucianpls/libicd" git = "https://github.com/lucianpls/libicd.git" + license("Apache-2.0") + version("main", branch="main") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py index 4288ddbd4e1dc1..1005cbb6c55276 100644 --- a/var/spack/repos/builtin/packages/libice/package.py +++ b/var/spack/repos/builtin/packages/libice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,13 @@ class Libice(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libICE" xorg_mirror_path = "lib/libICE-1.0.9.tar.gz" + license("X11") + + maintainers("wdconinc") + + version("1.1.1", sha256="04fbd34a11ba08b9df2e3cdb2055c2e3c1c51b3257f683d7fcf42dabcf8e1210") + version("1.1.0", sha256="7a735ec530d7a437955747eabac06bbc0b695da77fd1b4d1df3b0a483d823875") + version("1.0.10", sha256="1116bc64c772fd127a0d0c0ffa2833479905e3d3d8197740b3abd5f292f22d2d") version("1.0.9", sha256="7812a824a66dd654c830d21982749b3b563d9c2dfe0b88b203cefc14a891edc0") depends_on("xproto") diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index dbb1214ef7ad34..afc0f1cc8fcf71 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libiconv(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/libiconv/" gnu_mirror_path = "libiconv/libiconv-1.16.tar.gz" + license("LGPL-2.1-or-later") + version("1.17", sha256="8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313") version("1.16", sha256="e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04") version("1.15", sha256="ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178") diff --git a/var/spack/repos/builtin/packages/libid3tag/package.py b/var/spack/repos/builtin/packages/libid3tag/package.py index e62e143922195d..2d28ded9c643d4 100644 --- a/var/spack/repos/builtin/packages/libid3tag/package.py +++ b/var/spack/repos/builtin/packages/libid3tag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libid3tag(AutotoolsPackage): maintainers("TheQueasle") + license("GPL-2.0-or-later") + version("0.15.1b", sha256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/libidl/package.py b/var/spack/repos/builtin/packages/libidl/package.py index 196b2ad35e6e67..5074329b40c405 100644 --- a/var/spack/repos/builtin/packages/libidl/package.py +++ b/var/spack/repos/builtin/packages/libidl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libidl(AutotoolsPackage): homepage = "https://developer.gnome.org/" url = "https://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2" + license("LGPL-2.0-or-later") + version("0.8.14", sha256="c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220") depends_on("flex", type="build") diff --git a/var/spack/repos/builtin/packages/libidn/package.py b/var/spack/repos/builtin/packages/libidn/package.py new file mode 100644 index 00000000000000..c46f2078bd0153 --- /dev/null +++ b/var/spack/repos/builtin/packages/libidn/package.py @@ -0,0 +1,24 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Libidn(AutotoolsPackage, GNUMirrorPackage): + """GNU Libidn is a fully documented implementation of the Stringprep, + Punycode and IDNA 2003 specifications. Libidn's purpose is to + encode and decode internationalized domain names.""" + + homepage = "https://www.gnu.org/software/libidn/" + gnu_mirror_path = "libidn/libidn-1.42.tar.gz" + + maintainers("snehring") + + license("LGPL-2.1-or-later", checked_by="snehring") + + version("1.42", sha256="d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723") + version("1.38", sha256="de00b840f757cd3bb14dd9a20d5936473235ddcba06d4bc2da804654b8bbf0f6") + version("1.34", sha256="3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c") + version("1.28", sha256="dd357a968449abc97c7e5fa088a4a384de57cb36564f9d4e0d898ecc6373abfb") diff --git a/var/spack/repos/builtin/packages/libidn2/package.py b/var/spack/repos/builtin/packages/libidn2/package.py index ffbc8522ce029b..561d999f52d121 100644 --- a/var/spack/repos/builtin/packages/libidn2/package.py +++ b/var/spack/repos/builtin/packages/libidn2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libidn2(AutotoolsPackage, GNUMirrorPackage): # URL must remain http:// so Spack can bootstrap curl gnu_mirror_path = "libidn/libidn2-2.0.5.tar.gz" + license("GPL-2.0-or-later OR LGPL-3.0-or-later") + version("2.3.4", sha256="93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f") version("2.3.3", sha256="f3ac987522c00d33d44b323cae424e2cffcb4c63c6aa6cd1376edacbf1c36eb0") version("2.3.2", sha256="76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91") diff --git a/var/spack/repos/builtin/packages/libimagequant/package.py b/var/spack/repos/builtin/packages/libimagequant/package.py index 5d72697e0813bc..e4f22875f3b0cb 100644 --- a/var/spack/repos/builtin/packages/libimagequant/package.py +++ b/var/spack/repos/builtin/packages/libimagequant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libimagequant(MakefilePackage): homepage = "https://pngquant.org/lib/" url = "https://github.com/ImageOptim/libimagequant/archive/2.12.6.tar.gz" + license("GPL-3.0-or-later") + version("2.12.6", sha256="b34964512c0dbe550c5f1b394c246c42a988cd73b71a76c5838aa2b4a96e43a0") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libimobiledevice/package.py b/var/spack/repos/builtin/packages/libimobiledevice/package.py index f3f1506e6d89ca..b257c2f7434efb 100644 --- a/var/spack/repos/builtin/packages/libimobiledevice/package.py +++ b/var/spack/repos/builtin/packages/libimobiledevice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libimobiledevice(AutotoolsPackage): url = "https://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2" git = "https://git.libimobiledevice.org/libimobiledevice.git" + license("LGPL-2.1-or-later") + version("master", branch="master") version("1.2.0", sha256="786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037") diff --git a/var/spack/repos/builtin/packages/libinih/package.py b/var/spack/repos/builtin/packages/libinih/package.py index a72044b9fe4631..8ed231a4cce81b 100644 --- a/var/spack/repos/builtin/packages/libinih/package.py +++ b/var/spack/repos/builtin/packages/libinih/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 74f273a8b28256..889e98776e024f 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class Libint(AutotoolsPackage): maintainers("dev-zero") + license("LGPL-3.0-only") + version("2.6.0", sha256="4ae47e8f0b5632c3d2a956469a7920896708e9f0e396ec10071b8181e4c8d9fa") version("2.4.2", sha256="86dff38065e69a3a51d15cfdc638f766044cb87e5c6682d960c14f9847e2eac3") version("2.4.1", sha256="0513be124563fdbbc7cd3c7043e221df1bda236a037027ba9343429a27db8ce4") diff --git a/var/spack/repos/builtin/packages/libisal/package.py b/var/spack/repos/builtin/packages/libisal/package.py index d8af65ce7f9fbf..e812129e6ee1a4 100644 --- a/var/spack/repos/builtin/packages/libisal/package.py +++ b/var/spack/repos/builtin/packages/libisal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libisal(AutotoolsPackage): homepage = "https://github.com/intel/isa-l" url = "https://github.com/intel/isa-l/archive/v2.29.0.tar.gz" + license("BSD-3-Clause") + version("2.29.0", sha256="832d9747ef3f0c8c05d39e3d7fd6ee5299a844e1ee7382fc8c8b52a268f36eda") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libiscsi/package.py b/var/spack/repos/builtin/packages/libiscsi/package.py index 62f95e9e2ab2a5..9fe50b24b9befe 100644 --- a/var/spack/repos/builtin/packages/libiscsi/package.py +++ b/var/spack/repos/builtin/packages/libiscsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py index cf7b54b113e480..7644943cb051d6 100644 --- a/var/spack/repos/builtin/packages/libjpeg-turbo/package.py +++ b/var/spack/repos/builtin/packages/libjpeg-turbo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class LibjpegTurbo(CMakePackage, AutotoolsPackage): homepage = "https://libjpeg-turbo.org/" url = "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.3.tar.gz" + license("BSD-3-Clause AND IJG AND Zlib") + version("3.0.0", sha256="171dae5d73560bc94006a7c0c3281bd9bfde6a34f7e41e66f930a1a9162bd7df") version("2.1.5.1", sha256="61846251941e5791005fb7face196eec24541fce04f12570c308557529e92c75") version("2.1.5", sha256="254f3642b04e309fee775123133c6464181addc150499561020312ec61c1bf7c") @@ -60,6 +62,22 @@ class LibjpegTurbo(CMakePackage, AutotoolsPackage): variant("static", default=True, description="Build static libs") variant("jpeg8", default=False, description="Emulate libjpeg v8 API/ABI") variant("pic", default=True, description="Enable position independent code") + variant( + "partial_decoder", + default=False, + description="add partial_decode_scale functionality required for rocAL", + ) + + patch( + "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/09c71da06a6346dca132db66f26f959f7e4dd5ad.patch?full_index=1", + sha256="4d5bdfb5de5b04399144254ea383f5357ab7beb830b398aeb35b65f21dd6b4b0", + when="@2.0.6 +partial_decoder", + ) + patch( + "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb.patch?full_index=1", + sha256="dc1ec567c2356b652100ecdc28713bbf25f544e46f7d2947f31a2395c362cc48", + when="@2.0.6 +partial_decoder", + ) # Can use either of these. But in the current version of the package # only nasm is used. In order to use yasm an environmental variable diff --git a/var/spack/repos/builtin/packages/libjpeg/package.py b/var/spack/repos/builtin/packages/libjpeg/package.py index 55dbd77fe7845e..e2733c41ced7c9 100644 --- a/var/spack/repos/builtin/packages/libjpeg/package.py +++ b/var/spack/repos/builtin/packages/libjpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libjpeg(AutotoolsPackage): homepage = "http://www.ijg.org" url = "https://www.ijg.org/files/jpegsrc.v9d.tar.gz" + license("BitTorrent-1.0") + version("9e", sha256="4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d") version("9d", sha256="6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee") version("9c", sha256="650250979303a649e21f87b5ccd02672af1ea6954b911342ea491f351ceb7122") diff --git a/var/spack/repos/builtin/packages/libjson/package.py b/var/spack/repos/builtin/packages/libjson/package.py index c01d6c8de3f4a1..e2f393bab09895 100644 --- a/var/spack/repos/builtin/packages/libjson/package.py +++ b/var/spack/repos/builtin/packages/libjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libjwt/package.py b/var/spack/repos/builtin/packages/libjwt/package.py index c5b21cd0f985b1..ae372d3c4de5cc 100644 --- a/var/spack/repos/builtin/packages/libjwt/package.py +++ b/var/spack/repos/builtin/packages/libjwt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libjwt(AutotoolsPackage): maintainers("bollig") + license("MPL-2.0") + version("1.15.3", sha256="cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f") version("1.15.2", sha256="a366531ad7d5d559b1f8c982e7bc7cece7eaefacf7e91ec36d720609c01dc410") version("1.13.1", sha256="4df55ac89c6692adaf3badb43daf3241fd876612c9ab627e250dfc4bb59993d9") diff --git a/var/spack/repos/builtin/packages/libjxl/package.py b/var/spack/repos/builtin/packages/libjxl/package.py index 9e1403bb5967ab..e4828c90a09333 100644 --- a/var/spack/repos/builtin/packages/libjxl/package.py +++ b/var/spack/repos/builtin/packages/libjxl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libjxl(CMakePackage): url = "https://github.com/libjxl/libjxl/archive/refs/tags/v0.6.1.tar.gz" git = "https://github.com/libjxl/libjxl.git" + license("Apache-2.0") + version("main", branch="main", submodules=True) version( "0.7.0", tag="v0.7.0", commit="f95da131cf7c7ccd4da256356fde2fec1fa23bb5", submodules=True diff --git a/var/spack/repos/builtin/packages/libkcapi/package.py b/var/spack/repos/builtin/packages/libkcapi/package.py index 02f5d047f9eceb..7ca711e4ca0929 100644 --- a/var/spack/repos/builtin/packages/libkcapi/package.py +++ b/var/spack/repos/builtin/packages/libkcapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libkcapi(AutotoolsPackage): homepage = "https://github.com/smuellerDD/libkcapi" url = "https://github.com/smuellerDD/libkcapi/archive/v1.2.0.tar.gz" + license("BSD-3-Clause OR GPL-2.0-only") + version("1.2.0", sha256="8be75173c56342c8fe1c63a901c0d9cb750405abdc23288d04f549a960862867") version("1.1.5", sha256="ca38bf4d750dd2d3531ddb94d502feedb0f926bd9b29fb97e253b83bbceb6611") version("1.1.4", sha256="241ffa4f2813c6da442b1c1e152d489905ffab35a6c50e76aca5ee6fe60319dd") diff --git a/var/spack/repos/builtin/packages/libkml/package.py b/var/spack/repos/builtin/packages/libkml/package.py index ab59d6d720b29a..69f98eea8219c5 100644 --- a/var/spack/repos/builtin/packages/libkml/package.py +++ b/var/spack/repos/builtin/packages/libkml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libkml(CMakePackage): homepage = "https://github.com/libkml/libkml" url = "https://github.com/libkml/libkml/archive/1.3.0.tar.gz" + license("BSD-3-Clause") + version("1.3.0", sha256="8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963") variant("java", default=False, description="Build java bindings") diff --git a/var/spack/repos/builtin/packages/libksba/package.py b/var/spack/repos/builtin/packages/libksba/package.py index 5230bcb6a5bf42..c92d7ac0420f1f 100644 --- a/var/spack/repos/builtin/packages/libksba/package.py +++ b/var/spack/repos/builtin/packages/libksba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,9 @@ class Libksba(AutotoolsPackage): maintainers("alalazo") + license("LGPL-3.0-only AND GPL-2.0-only AND GPL-3.0-only") + + version("1.6.5", sha256="a564628c574c99287998753f98d750babd91a4e9db451f46ad140466ef2a6d16") version("1.6.4", sha256="bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b") version("1.6.3", sha256="3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c") diff --git a/var/spack/repos/builtin/packages/liblas/package.py b/var/spack/repos/builtin/packages/liblas/package.py index 6ead6a5b46a39f..de77219900dca2 100644 --- a/var/spack/repos/builtin/packages/liblas/package.py +++ b/var/spack/repos/builtin/packages/liblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Liblas(CMakePackage): homepage = "https://liblas.org/" url = "https://download.osgeo.org/liblas/libLAS-1.8.1.tar.bz2" + license("BSD-3-Clause") + version("1.8.1", sha256="9adb4a98c63b461ed2bc82e214ae522cbd809cff578f28511122efe6c7ea4e76") # libLAS linkage of GDAL and libgeotiff enhances spatial coordinate system diff --git a/var/spack/repos/builtin/packages/liblbfgs/package.py b/var/spack/repos/builtin/packages/liblbfgs/package.py index 410eaa7b31a3cb..1ba7df48882b1c 100644 --- a/var/spack/repos/builtin/packages/liblbfgs/package.py +++ b/var/spack/repos/builtin/packages/liblbfgs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Liblbfgs(AutotoolsPackage): maintainers("RemiLacroix-IDRIS") + license("MIT") + version("master", branch="master") version("1.10", sha256="4158ab7402b573e5c69d5f6b03c973047a91e16ca5737d3347e3af9c906868cf") diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py index 0be107cb184771..8a8e47cbbb131c 100644 --- a/var/spack/repos/builtin/packages/liblbxutil/package.py +++ b/var/spack/repos/builtin/packages/liblbxutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Liblbxutil(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/liblbxutil" xorg_mirror_path = "lib/liblbxutil-1.1.0.tar.gz" + license("libtiff") + version("1.1.0", sha256="285c1bc688cc71ec089e9284f2566d1780cc5d90816e9997890af8689f386951") depends_on("xextproto@7.0.99.1:") diff --git a/var/spack/repos/builtin/packages/liblockfile/package.py b/var/spack/repos/builtin/packages/liblockfile/package.py index 4be7713673c8d5..91a9f04209b47d 100644 --- a/var/spack/repos/builtin/packages/liblockfile/package.py +++ b/var/spack/repos/builtin/packages/liblockfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Liblockfile(AutotoolsPackage): homepage = "https://github.com/miquels/liblockfile" url = "https://github.com/miquels/liblockfile/archive/v1.14.tar.gz" + license("LGPL-2.0-or-later AND GPL-2.0-or-later") + version("1.14", sha256="be85dba347889d9b65cbd361a611e6b88e044fdca9c98e5139d5fbc9ba37ccc8") patch("install_as_nonroot.patch") diff --git a/var/spack/repos/builtin/packages/liblognorm/package.py b/var/spack/repos/builtin/packages/liblognorm/package.py index 601334a341ce9a..1512db8232adda 100644 --- a/var/spack/repos/builtin/packages/liblognorm/package.py +++ b/var/spack/repos/builtin/packages/liblognorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Liblognorm(AutotoolsPackage): homepage = "https://www.liblognorm.com/" url = "https://github.com/rsyslog/liblognorm/archive/v2.0.6.tar.gz" + license("LGPL-2.1-or-later AND Apache-2.0") + version("2.0.6", sha256="594ea3318ef419cb7f21cf81c513db35a838b32207999a11a82b709da9ff9a2b") version("2.0.5", sha256="dd779b6992de37995555e1d54caf0716a694765efc65480eed2c713105ab46fe") version("2.0.4", sha256="af4d7d8ce11fb99514169f288163f87cb9ade1cb79595656d96b51b2482c493d") diff --git a/var/spack/repos/builtin/packages/liblouis/package.py b/var/spack/repos/builtin/packages/liblouis/package.py index 788c12ec2a1073..d8428ca73aad52 100644 --- a/var/spack/repos/builtin/packages/liblouis/package.py +++ b/var/spack/repos/builtin/packages/liblouis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Liblouis(AutotoolsPackage): homepage = "http://liblouis.org/" url = "https://github.com/liblouis/liblouis/releases/download/v3.15.0/liblouis-3.15.0.tar.gz" + license("GPL-3.0-or-later") + version("3.25.0", sha256="d720aa5fcd51de925a28ae801b8b2ca76ee67e2360b40055c679bce8e565f251") version("3.17.0", sha256="78c71476467850935d145010c8fcb26b513df1843505b3eb4c41888541a0113d") version("3.15.0", sha256="3a381b132b140747e5fcd47354da6cf43959da2167f8bc598430bbac51224467") diff --git a/var/spack/repos/builtin/packages/libluv/package.py b/var/spack/repos/builtin/packages/libluv/package.py index ff9a9db5e62d09..3993e5dbf7502b 100644 --- a/var/spack/repos/builtin/packages/libluv/package.py +++ b/var/spack/repos/builtin/packages/libluv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libluv(CMakePackage): homepage = "https://github.com/luvit/luv" url = "https://github.com/luvit/luv/releases/download/1.36.0-0/luv-1.36.0-0.tar.gz" + license("Apache-2.0") + version("1.45.0-0", sha256="fa6c46fb09f88320afa7f88017efd7b0d2b3a0158c5ba5b6851340b0332a2b81") version("1.44.2-1", sha256="3eb5c7bc44f61fbc4148ea30e3221d410263e0ffa285672851fc19debf9e5c30") version("1.44.2-0", sha256="30639f8e0fac7fb0c3a04b94a00f73c6d218c15765347ceb0998a6b72464b6cf") diff --git a/var/spack/repos/builtin/packages/liblzf/package.py b/var/spack/repos/builtin/packages/liblzf/package.py index fc4f96a9ef2806..91c60937e09d07 100644 --- a/var/spack/repos/builtin/packages/liblzf/package.py +++ b/var/spack/repos/builtin/packages/liblzf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class Liblzf(AutotoolsPackage): homepage = "http://oldhome.schmorp.de/marc/liblzf.html" url = "http://dist.schmorp.de/liblzf/liblzf-3.6.tar.gz" + license("BSD-2-Clause") + version("3.6", sha256="9c5de01f7b9ccae40c3f619d26a7abec9986c06c36d260c179cedd04b89fb46a") diff --git a/var/spack/repos/builtin/packages/libmacaroons/package.py b/var/spack/repos/builtin/packages/libmacaroons/package.py index 82a407c0777199..37d433f852b9c2 100644 --- a/var/spack/repos/builtin/packages/libmacaroons/package.py +++ b/var/spack/repos/builtin/packages/libmacaroons/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmacaroons(AutotoolsPackage): homepage = "https://github.com/rescrv/libmacaroons/" url = "https://github.com/rescrv/libmacaroons/archive/releases/0.3.0.tar.gz" + license("BSD-3-Clause") + version("0.3.0", sha256="e1db403c01b0407a276a84b2aaf54515faebe1a5c1a31ec10857a1917161d109") version("0.2.0", sha256="fa2146d89a4e844703896ece778f0c42b2b0ee3d09dea350ff34fd6873e72018") version("0.1.0", sha256="0aa413d8a793f004874695466f93eed9c8e721524765704fe410694583928007") diff --git a/var/spack/repos/builtin/packages/libmad/package.py b/var/spack/repos/builtin/packages/libmad/package.py index 976c9a94029a71..3d221d03ed3922 100644 --- a/var/spack/repos/builtin/packages/libmad/package.py +++ b/var/spack/repos/builtin/packages/libmad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libmad(AutotoolsPackage): url = "ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz" list_url = "ftp://ftp.mars.org/pub/mpeg/" + license("GPL-2.0-or-later") + version("0.15.1b", sha256="bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py index 9c798938cd032c..abdd74882c28b9 100644 --- a/var/spack/repos/builtin/packages/libmatheval/package.py +++ b/var/spack/repos/builtin/packages/libmatheval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libmatheval(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/libmatheval/" gnu_mirror_path = "libmatheval/libmatheval-1.1.11.tar.gz" + license("GPL-3.0-or-later") + version("1.1.11", sha256="474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab") # Only needed for unit tests, but configure crashes without it diff --git a/var/spack/repos/builtin/packages/libmaus2/package.py b/var/spack/repos/builtin/packages/libmaus2/package.py index 9fe872841da907..fe4c0528f83b99 100644 --- a/var/spack/repos/builtin/packages/libmaus2/package.py +++ b/var/spack/repos/builtin/packages/libmaus2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libmaxminddb/package.py b/var/spack/repos/builtin/packages/libmaxminddb/package.py index de067f60141334..adf0a6f24b5d57 100644 --- a/var/spack/repos/builtin/packages/libmaxminddb/package.py +++ b/var/spack/repos/builtin/packages/libmaxminddb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmaxminddb(AutotoolsPackage): "https://github.com/maxmind/libmaxminddb/releases/download/1.3.2/libmaxminddb-1.3.2.tar.gz" ) + license("Apache-2.0") + version("1.7.1", sha256="e8414f0dedcecbc1f6c31cb65cd81650952ab0677a4d8c49cab603b3b8fb083e") version("1.3.2", sha256="e6f881aa6bd8cfa154a44d965450620df1f714c6dc9dd9971ad98f6e04f6c0f0") diff --git a/var/spack/repos/builtin/packages/libmbim/package.py b/var/spack/repos/builtin/packages/libmbim/package.py index a3dc8e473acd77..6f86673daf61c8 100644 --- a/var/spack/repos/builtin/packages/libmbim/package.py +++ b/var/spack/repos/builtin/packages/libmbim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmbim(AutotoolsPackage): homepage = "https://github.com/linux-mobile-broadband/libmbim/" url = "https://github.com/linux-mobile-broadband/libmbim/archive/1.20.4.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("1.20.4", sha256="edb56afb862a7756dc097086d8fa791c93332f6f1daf27759eff6ddc99a0f50d") version("1.18.0", sha256="47003bfdf78bf32009a1d917f30c063079fa5bd4afc739d6d8ec356070b270df") version("1.16.2", sha256="06b7a9e8430c6ab213d96c71a71469aefc86deb52cffd5e4f75121d9a79545e2") diff --git a/var/spack/repos/builtin/packages/libmcrypt/package.py b/var/spack/repos/builtin/packages/libmcrypt/package.py index 64972445870564..013c2a55ea7c75 100644 --- a/var/spack/repos/builtin/packages/libmcrypt/package.py +++ b/var/spack/repos/builtin/packages/libmcrypt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Libmcrypt(AutotoolsPackage): homepage = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" url = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz" + license("LGPL-2.1-or-later") + version("2.5.8", sha256="e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e") diff --git a/var/spack/repos/builtin/packages/libmd/package.py b/var/spack/repos/builtin/packages/libmd/package.py index 7a5d8588eac2c7..6d813bfed4f897 100644 --- a/var/spack/repos/builtin/packages/libmd/package.py +++ b/var/spack/repos/builtin/packages/libmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index e47039a5037965..6f262646144c67 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libmesh(AutotoolsPackage): url = "https://github.com/libMesh/libmesh/releases/download/v1.0.0/libmesh-1.0.0.tar.bz2" git = "https://github.com/libMesh/libmesh.git" + license("LGPL-2.1-or-later") + version("master", branch="master", submodules=True) version("1.4.1", sha256="67eb7d5a9c954d891ca1386b70f138333a87a141d9c44213449ca6be69a66414") diff --git a/var/spack/repos/builtin/packages/libmetalink/package.py b/var/spack/repos/builtin/packages/libmetalink/package.py index f207a047d6022b..b4465b86aa694c 100644 --- a/var/spack/repos/builtin/packages/libmetalink/package.py +++ b/var/spack/repos/builtin/packages/libmetalink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmetalink(AutotoolsPackage): homepage = "https://launchpad.net/libmetalink" url = "https://github.com/metalink-dev/libmetalink/archive/release-0.1.3.tar.gz" + license("MIT") + version("0.1.3", sha256="7469c4a64b9dd78c3f23fa575fe001bbfd548c181492a2067b59609872122d7a") version("0.1.2", sha256="64af0979c11658f7a1659ca97ebc3c7bac8104253bf504015ac3b9c363382bae") version("0.1.1", sha256="e9b8dff68b0b999884c21f68d9b1cc0c1993270e3e1f639f82e27b1eb960cb66") diff --git a/var/spack/repos/builtin/packages/libmicrodns/package.py b/var/spack/repos/builtin/packages/libmicrodns/package.py index 4d3e4c6371bfd1..6a48c55266e4d1 100644 --- a/var/spack/repos/builtin/packages/libmicrodns/package.py +++ b/var/spack/repos/builtin/packages/libmicrodns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libmicrodns(MesonPackage): homepage = "https://github.com/videolabs/libmicrodns/" url = "https://github.com/videolabs/libmicrodns/releases/download/0.2.0/microdns-0.2.0.tar.xz" + license("LGPL-2.1-or-later") + version("0.2.0", sha256="2da28e7dda4861d76f797f92ac3e6c3e048333b95f9e4fc3a6548ad8afd8c446") version("0.1.2", sha256="666c4b9d86b5b3c37357bb78453c7e8b72cd65ade22d0a7963bfbefe51509b5c") version("0.1.1", sha256="498c81fd07718f449267a207948536cbb527610942d91999488eaea6de301c52") diff --git a/var/spack/repos/builtin/packages/libmicrohttpd/package.py b/var/spack/repos/builtin/packages/libmicrohttpd/package.py index 0b657d51fae312..fc9b25ba00554d 100644 --- a/var/spack/repos/builtin/packages/libmicrohttpd/package.py +++ b/var/spack/repos/builtin/packages/libmicrohttpd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libmicrohttpd(AutotoolsPackage): maintainers("hainest") + license("LGPL-2.1-or-later") + version("0.9.76", sha256="f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c") version("0.9.75", sha256="9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb") version("0.9.74", sha256="42035d0261373324bfb434018f4ab892514b10253d1af232e41b4cc2c11e650b") diff --git a/var/spack/repos/builtin/packages/libmmtf-cpp/package.py b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py index 31d9c975aa2dd4..5109f7623bd649 100644 --- a/var/spack/repos/builtin/packages/libmmtf-cpp/package.py +++ b/var/spack/repos/builtin/packages/libmmtf-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libmng/package.py b/var/spack/repos/builtin/packages/libmng/package.py index 1b582b22f5c94f..db1b8c35474bdd 100644 --- a/var/spack/repos/builtin/packages/libmng/package.py +++ b/var/spack/repos/builtin/packages/libmng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmng(CMakePackage): homepage = "https://sourceforge.net/projects/libmng/" url = "http://downloads.sourceforge.net/project/libmng/libmng-devel/2.0.3/libmng-2.0.3.tar.gz" + license("custom") + version("2.0.3", sha256="cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa") version("2.0.2", sha256="4908797bb3541fb5cd8fffbe0b1513ed163509f2a4d57a78b26a96f8d1dd05a2") diff --git a/var/spack/repos/builtin/packages/libmnl/package.py b/var/spack/repos/builtin/packages/libmnl/package.py index 957164781d1237..f3bda9932706e3 100644 --- a/var/spack/repos/builtin/packages/libmnl/package.py +++ b/var/spack/repos/builtin/packages/libmnl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libmnl(AutotoolsPackage): homepage = "https://github.com/threatstack/libmnl" url = "https://github.com/threatstack/libmnl/archive/libmnl-1.0.3.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.3", sha256="14405da1bb3a679c24e0fe1f2845d47359ed2de8055e588df4b6b19cab68e901") version("1.0.2", sha256="2caec4716aceb245130f4e42f8c118b92618e37db8bb94e2799aff42b95c269f") version("1.0.1", sha256="60fe2a6ce59f6118b75b598dc11fc89b97e20ff8633fbea26fc568c45bbb672b") diff --git a/var/spack/repos/builtin/packages/libmo-unpack/package.py b/var/spack/repos/builtin/packages/libmo-unpack/package.py index bb63439d58f7a2..6f7daacbe7d64a 100644 --- a/var/spack/repos/builtin/packages/libmo-unpack/package.py +++ b/var/spack/repos/builtin/packages/libmo-unpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class LibmoUnpack(CMakePackage): homepage = "https://github.com/SciTools/libmo_unpack" url = "https://github.com/SciTools/libmo_unpack/archive/v3.1.2.tar.gz" + license("BSD-3-Clause") + version("3.1.2", sha256="e09ef3e6f1075144acc5d6466b4ef70b2fe32ed4ab1840dd4fb7e15a40f3d370") depends_on("check") diff --git a/var/spack/repos/builtin/packages/libmodbus/package.py b/var/spack/repos/builtin/packages/libmodbus/package.py index 9ae6410f59acb2..e27e0aafa276ee 100644 --- a/var/spack/repos/builtin/packages/libmodbus/package.py +++ b/var/spack/repos/builtin/packages/libmodbus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libmodbus(AutotoolsPackage): homepage = "https://libmodbus.org/" url = "https://libmodbus.org/releases/libmodbus-3.0.8.tar.gz" + license("LGPL-2.1-or-later") + version("3.1.6", sha256="d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16") version("3.1.5", sha256="f7a9538f23a8786b1ee62a4b75879b5c0e194e728350de1b741ce7d595970f06") version("3.1.4", sha256="c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637") diff --git a/var/spack/repos/builtin/packages/libmolgrid/package.py b/var/spack/repos/builtin/packages/libmolgrid/package.py index 20932dac869ecd..86bb4e7e0db606 100644 --- a/var/spack/repos/builtin/packages/libmolgrid/package.py +++ b/var/spack/repos/builtin/packages/libmolgrid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libmolgrid(CMakePackage): maintainers("RMeli") + license("Apache-2.0") + version("0.5.3", sha256="a9f7a62cdeb516bc62a06b324cdd33b095a787df175c6166d74a8d30b6916abb") version("0.5.2", sha256="e732d13a96c2f374d57a73999119bef700172d392c195c751214aa6ac6680c3a") @@ -33,9 +35,4 @@ def cmake_args(self): ob_incl = os.path.join(self.spec["openbabel"].prefix.include, "openbabel3") ob_libs = self.spec["openbabel"].libs.joined(";") - args = [ - "-DOPENBABEL3_INCLUDE_DIR=" + ob_incl, - "-DOPENBABEL3_LIBRARIES=" + ob_libs, - f"-DPYTHON_EXECUTABLE={self.spec['python'].command.path}", - ] - return args + return ["-DOPENBABEL3_INCLUDE_DIR=" + ob_incl, "-DOPENBABEL3_LIBRARIES=" + ob_libs] diff --git a/var/spack/repos/builtin/packages/libmonitor/package.py b/var/spack/repos/builtin/packages/libmonitor/package.py index bb28dcabffd402..3eb4ca6060bcf5 100644 --- a/var/spack/repos/builtin/packages/libmonitor/package.py +++ b/var/spack/repos/builtin/packages/libmonitor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libmonitor(AutotoolsPackage): git = "https://github.com/HPCToolkit/libmonitor.git" maintainers("mwkrentel") + license("BSD-3-Clause") + version("master", branch="master") version("2023.03.15", commit="48520940b915352748950ea718fadc82f87f659d") version("2023.02.13", commit="6db182b25202552f75a087116ab57193652d150f") diff --git a/var/spack/repos/builtin/packages/libmpdclient/package.py b/var/spack/repos/builtin/packages/libmpdclient/package.py index 5c84d37e042405..6182050e945f31 100644 --- a/var/spack/repos/builtin/packages/libmpdclient/package.py +++ b/var/spack/repos/builtin/packages/libmpdclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libmpdclient(MesonPackage): homepage = "https://www.musicpd.org/" url = "https://github.com/MusicPlayerDaemon/libmpdclient/archive/v2.19.tar.gz" + license("BSD-3-Clause") + version("2.19", sha256="12b566b75c3b6789ff8fc94698497d1f3fbaf0cbf9fa6c3a1e3906ef0d2bcbbb") version("2.18", sha256="9b97d00022f2053c06d87bff40b319dfab930ee2b5fa9b8dec208a2911ca3efc") version("2.17", sha256="06eb4b67c63f64d647e97257ff5f8506bf9c2a26b314bf5d0dd5944995b59fc9") diff --git a/var/spack/repos/builtin/packages/libmypaint/package.py b/var/spack/repos/builtin/packages/libmypaint/package.py index 8db1f48890e06d..4714394c715a48 100644 --- a/var/spack/repos/builtin/packages/libmypaint/package.py +++ b/var/spack/repos/builtin/packages/libmypaint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libmypaint(AutotoolsPackage): maintainers("benkirk") + license("ISC") + version("1.6.1", sha256="741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f") version("1.6.0", sha256="a5ec3624ba469b7b35fd66b6fbee7f07285b7a7813d02291ac9b10e46618140e") version("1.5.1", sha256="aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b") diff --git a/var/spack/repos/builtin/packages/libnbc/package.py b/var/spack/repos/builtin/packages/libnbc/package.py index 6e36ab630b2dd1..7507ff362e7762 100644 --- a/var/spack/repos/builtin/packages/libnbc/package.py +++ b/var/spack/repos/builtin/packages/libnbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libnbc(AutotoolsPackage): homepage = "http://unixer.de/research/nbcoll/libnbc/" url = "http://unixer.de/research/nbcoll/libnbc/libNBC-1.1.1.tar.gz" + license("BSD-3-Clause-Open-MPI") + version("1.1.1", sha256="63aa5f75f84c191da0688cb551ebd0e9e46928edfba350b2a534eb0c704dd9c3") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/libndp/package.py b/var/spack/repos/builtin/packages/libndp/package.py index 9e9d5cd13b42ce..242f447b3fb253 100644 --- a/var/spack/repos/builtin/packages/libndp/package.py +++ b/var/spack/repos/builtin/packages/libndp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libndp(AutotoolsPackage): homepage = "http://www.libndp.org/" url = "https://github.com/jpirko/libndp/archive/v1.7.tar.gz" + license("LGPL-2.1-or-later") + version("1.7", sha256="44be73630ee785ed9f571f9aaaeba0e1d375fa337fd841270034c813b5b0e6fd") version("1.6", sha256="565d6c4167f83ec697c762ea002f23e8f0b00828d0749b1ce928f068543e5aad") version("1.5", sha256="42c0a8938d4302c72a42e2d954deef7e4903bb3974da6804a929a3cd0b5b6aa7") diff --git a/var/spack/repos/builtin/packages/libnet/package.py b/var/spack/repos/builtin/packages/libnet/package.py index 73358d1f994031..99a3d4c3db7320 100644 --- a/var/spack/repos/builtin/packages/libnet/package.py +++ b/var/spack/repos/builtin/packages/libnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libnet(AutotoolsPackage): homepage = "https://github.com/libnet/libnet" url = "https://github.com/libnet/libnet/archive/v1.2.tar.gz" + license("BSD-2-Clause") + version("1.2", sha256="b7a371a337d242c017f3471d70bea2963596bec5bd3bd0e33e8517550e2311ef") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py b/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py index 0e52adbab2b7a8..fcbc19b9029614 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-conntrack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class LibnetfilterConntrack(AutotoolsPackage): homepage = "https://netfilter.org" url = "https://github.com/Distrotech/libnetfilter_conntrack/archive/libnetfilter_conntrack-1.0.4.tar.gz" + license("GPL-2.0-or-later") + version("1.0.4", sha256="68168697b9d6430b7797ddd579e13a2cef06ea15c154dfd14e18be64e035ea6e") version("1.0.3", sha256="e2129d7c0346c7140355d643da8e3409cbd755689ea889bc0d6dbd557f1b5671") version("1.0.2", sha256="97f641a2e47053bd87bc817292519d6661e8f84a22d3314724b83b9f5eaddbff") diff --git a/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py b/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py index 2e59cc20e0dd29..cd99be3b0d0e15 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-cthelper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LibnetfilterCthelper(AutotoolsPackage): homepage = "https://github.com/vyos/libnetfilter-cthelper/" url = "https://github.com/vyos/libnetfilter-cthelper/archive/VyOS_1.2-2019Q4.tar.gz" + license("GPL-2.0-or-later") + version( "1.2-2019Q4", sha256="15a7b13999d1428d75e720c8116318cd51bec1d365852ae1778d3c85b93a9777" ) diff --git a/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py b/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py index 926f5d951cf384..b16dddd76c6bca 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-cttimeout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LibnetfilterCttimeout(AutotoolsPackage): homepage = "https://github.com/vyos/libnetfilter-cttimeout/" url = "https://github.com/vyos/libnetfilter-cttimeout/archive/VyOS_1.2-2019Q4.tar.gz" + license("GPL-2.0-only") + version( "1.2-2019Q4", sha256="71cebdf07a578901b160a54199062a4b4cd445e14742e2c7badc0900d8ae56b6" ) diff --git a/var/spack/repos/builtin/packages/libnetfilter-queue/package.py b/var/spack/repos/builtin/packages/libnetfilter-queue/package.py index 7563e76a145813..e1ab35dab31f62 100644 --- a/var/spack/repos/builtin/packages/libnetfilter-queue/package.py +++ b/var/spack/repos/builtin/packages/libnetfilter-queue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LibnetfilterQueue(AutotoolsPackage): homepage = "https://github.com/vyos/libnetfilter-queue/" url = "https://github.com/vyos/libnetfilter-queue/archive/VyOS_1.2-2019Q4.tar.gz" + license("GPL-2.0-only") + version( "1.2-2019Q4", sha256="73b87e600b492cf9e3aa8fb6e9855e1ccc523a7bc466c1fd1a0e6ffa424d746e" ) diff --git a/var/spack/repos/builtin/packages/libnetworkit/package.py b/var/spack/repos/builtin/packages/libnetworkit/package.py index dd003efd898444..2ef31c7413fa72 100644 --- a/var/spack/repos/builtin/packages/libnetworkit/package.py +++ b/var/spack/repos/builtin/packages/libnetworkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Libnetworkit(CMakePackage): maintainers("fabratu") + license("MIT") + version("9.0", sha256="c574473bc7d86934f0f4b3049c0eeb9c4444cfa873e5fecda194ee5b1930f82c") version("8.1", sha256="0a22eb839606b9fabfa68c7add12c4de5eee735c6f8bb34420e5916ce5d7f829") version("8.0", sha256="cdf9571043edbe76c447622ed33efe9cba2880f887ca231d98f6d3c22027e20e") diff --git a/var/spack/repos/builtin/packages/libnfnetlink/package.py b/var/spack/repos/builtin/packages/libnfnetlink/package.py index 57e8ee15beca74..041a15e1ca2906 100644 --- a/var/spack/repos/builtin/packages/libnfnetlink/package.py +++ b/var/spack/repos/builtin/packages/libnfnetlink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libnfnetlink(AutotoolsPackage): homepage = "https://netfilter.org" url = "https://github.com/Distrotech/libnfnetlink/archive/libnfnetlink-1.0.1.tar.gz" + license("GPL-2.0-only") + version("1.0.1", sha256="11dd8a1045b03d47c878535eeb6b9eb34db295d21903a4dfd2c2cc63f45e675b") version("1.0.0", sha256="1d43456e51d5ff2e8bc84b68d8acad3bb15603cfaa806ba9693eea4f2aa1abeb") version("0.0.41", sha256="84381ad3aec4fc4884c020c7774a241160d92ed50c9f93a2660db94e212cbb72") diff --git a/var/spack/repos/builtin/packages/libnfs/package.py b/var/spack/repos/builtin/packages/libnfs/package.py index ed0189a296819d..bfbced8b343cd7 100644 --- a/var/spack/repos/builtin/packages/libnfs/package.py +++ b/var/spack/repos/builtin/packages/libnfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libnfs(CMakePackage): homepage = "https://sites.google.com/site/libnfstarballs/" url = "https://github.com/sahlberg/libnfs/archive/libnfs-4.0.0.tar.gz" + license("LGPL-2.1-or-later") + version("4.0.0", sha256="6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d") version("3.0.0", sha256="445d92c5fc55e4a5b115e358e60486cf8f87ee50e0103d46a02e7fb4618566a5") version("2.0.0", sha256="7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e") diff --git a/var/spack/repos/builtin/packages/libnfsidmap/package.py b/var/spack/repos/builtin/packages/libnfsidmap/package.py index 593420284f944a..5643540c9511d7 100644 --- a/var/spack/repos/builtin/packages/libnfsidmap/package.py +++ b/var/spack/repos/builtin/packages/libnfsidmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libnftnl/package.py b/var/spack/repos/builtin/packages/libnftnl/package.py index 61de009d23ac6a..35494bc2830995 100644 --- a/var/spack/repos/builtin/packages/libnftnl/package.py +++ b/var/spack/repos/builtin/packages/libnftnl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libnftnl(AutotoolsPackage): homepage = "https://git.netfilter.org/libnftnl/" url = "http://ftp.netfilter.org/pub/libnftnl/libnftnl-1.1.5.tar.bz2" + license("GPL-2.0-or-later") + version("1.1.6", sha256="c1eb5a696fc1d4b3b412770586017bc01af93da3ddd25233d34a62979dee1eca") version("1.1.5", sha256="66de4d05227c0a1a731c369b193010d18a05b1185c2735211e0ecf658eeb14f3") version("1.1.4", sha256="c8c7988347adf261efac5bba59f8e5f995ffb65f247a88cc144e69620573ed20") diff --git a/var/spack/repos/builtin/packages/libnids/package.py b/var/spack/repos/builtin/packages/libnids/package.py index ace62c22b184eb..9d8d2968bc26ef 100644 --- a/var/spack/repos/builtin/packages/libnids/package.py +++ b/var/spack/repos/builtin/packages/libnids/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libnids(AutotoolsPackage): url = "https://github.com/MITRECND/libnids/archive/1.25.tar.gz" git = "https://github.com/MITRECND/libnids.git" + license("GPL-2.0-only") + version("master", branch="master") version("1.25", sha256="47aa634bd0cdad81e092fac3aef6f12ee346c2f536a1eff4d3d5dacdb6dfcec1") diff --git a/var/spack/repos/builtin/packages/libnl/package.py b/var/spack/repos/builtin/packages/libnl/package.py index 30803d70b8868f..7212ff3f08fb1e 100644 --- a/var/spack/repos/builtin/packages/libnl/package.py +++ b/var/spack/repos/builtin/packages/libnl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libnl(AutotoolsPackage): homepage = "https://www.infradead.org/~tgr/libnl/" url = "https://github.com/thom311/libnl/releases/download/libnl3_3_0/libnl-3.3.0.tar.gz" + license("LGPL-2.1-or-later") + version("3.3.0", sha256="705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4") depends_on("bison", type="build") diff --git a/var/spack/repos/builtin/packages/libnotify/package.py b/var/spack/repos/builtin/packages/libnotify/package.py index 65ef5d7b7e2c59..4fab7677f669ab 100644 --- a/var/spack/repos/builtin/packages/libnotify/package.py +++ b/var/spack/repos/builtin/packages/libnotify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libnotify(MesonPackage): homepage = "https://github.com/GNOME/libnotify" url = "https://github.com/GNOME/libnotify/archive/0.7.9.tar.gz" + license("LGPL-2.1-or-later") + version("0.7.9", sha256="9bd4f5fa911d27567e7cc2d2d09d69356c16703c4e8d22c0b49a5c45651f3af0") # Libnotify is having trouble with finding the DTD and XSLT for docbook, diff --git a/var/spack/repos/builtin/packages/libnova/package.py b/var/spack/repos/builtin/packages/libnova/package.py index a83834faeafed3..471be31eff65e3 100644 --- a/var/spack/repos/builtin/packages/libnova/package.py +++ b/var/spack/repos/builtin/packages/libnova/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libnova(AutotoolsPackage): homepage = "http://libnova.sourceforge.net" url = "https://sourceforge.net/projects/libnova/files/libnova/v%200.15.0/libnova-0.15.0.tar.gz/download" + license("LGPL-2.0-only") + version("0.15.0", sha256="7c5aa33e45a3e7118d77df05af7341e61784284f1e8d0d965307f1663f415bb1") depends_on("m4") diff --git a/var/spack/repos/builtin/packages/libnrm/package.py b/var/spack/repos/builtin/packages/libnrm/package.py index 62e2fc89891190..2b91d482d14193 100644 --- a/var/spack/repos/builtin/packages/libnrm/package.py +++ b/var/spack/repos/builtin/packages/libnrm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class Libnrm(AutotoolsPackage): homepage = "https://xgitlab.cels.anl.gov/argo/libnrm" url = "https://www.mcs.anl.gov/research/projects/argo/downloads/libnrm-0.1.0.tar.gz" + + license("BSD-3-Clause") + version("0.1.0", sha256="f849ada384025fa41251acc2a43aa335e0cb1b9cd1c8ab8b9d1808a036ae551e") tags = ["e4s"] diff --git a/var/spack/repos/builtin/packages/libnsl/package.py b/var/spack/repos/builtin/packages/libnsl/package.py index 2e102cd79d964d..8d0cefc6b2fa48 100644 --- a/var/spack/repos/builtin/packages/libnsl/package.py +++ b/var/spack/repos/builtin/packages/libnsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libnsl(AutotoolsPackage): homepage = "https://github.com/thkukuk/libnsl" url = "https://github.com/thkukuk/libnsl/archive/v1.3.0.tar.gz" + license("LGPL-2.0-or-later") + version("2.0.0", sha256="eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40") version("1.3.0", sha256="8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f") version("1.2.0", sha256="a5a28ef17c4ca23a005a729257c959620b09f8c7f99d0edbfe2eb6b06bafd3f8") diff --git a/var/spack/repos/builtin/packages/libogg/package.py b/var/spack/repos/builtin/packages/libogg/package.py index ef736b8ff7a164..45613a654c9237 100644 --- a/var/spack/repos/builtin/packages/libogg/package.py +++ b/var/spack/repos/builtin/packages/libogg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libogg(CMakePackage, AutotoolsPackage, Package): homepage = "https://www.xiph.org/ogg/" url = "http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz" + license("BSD-3-Clause") + version("1.3.5", sha256="0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664") version("1.3.4", sha256="fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e") version("1.3.2", sha256="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692") diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py index 91e59b489e5e96..b65a99ae1678eb 100644 --- a/var/spack/repos/builtin/packages/liboldx/package.py +++ b/var/spack/repos/builtin/packages/liboldx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libopts/package.py b/var/spack/repos/builtin/packages/libopts/package.py index 5993c462187b5f..78f48985a6da71 100644 --- a/var/spack/repos/builtin/packages/libopts/package.py +++ b/var/spack/repos/builtin/packages/libopts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libopts(AutotoolsPackage): homepage = "https://github.com/jppbsi/LibOPT/" git = "https://github.com/jppbsi/LibOPT.git" + license("Apache-2.0") + version("master", branch="master") parallel = False diff --git a/var/spack/repos/builtin/packages/libp11/package.py b/var/spack/repos/builtin/packages/libp11/package.py index 678e45767321c3..69463c1669786c 100644 --- a/var/spack/repos/builtin/packages/libp11/package.py +++ b/var/spack/repos/builtin/packages/libp11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libp11(AutotoolsPackage): homepage = "https://github.com/OpenSC/libp11/wiki" url = "https://github.com/OpenSC/libp11/archive/libp11-0.4.10.tar.gz" + license("LGPL-2.1-or-later") + version("0.4.11", sha256="56d6149879bda379613d89adfd3486ce5a3c20af6c1e3f9e83d15d900ab9e4bc") version("0.4.10", sha256="123c1525fa7ce7a34060f9a4148a30717482c517a378f428b704459820c1bf35") version("0.4.9", sha256="9d1c76d74c21ca224f96204982097ebc6b956f645b2b0b5f9c502a20e9ffcfd8") diff --git a/var/spack/repos/builtin/packages/libpam/package.py b/var/spack/repos/builtin/packages/libpam/package.py index 461cebd18a97f2..85d888b07a367c 100644 --- a/var/spack/repos/builtin/packages/libpam/package.py +++ b/var/spack/repos/builtin/packages/libpam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libpam(AutotoolsPackage): homepage = "https://github.com/google/google-authenticator-libpam" url = "https://github.com/google/google-authenticator-libpam/archive/1.09.tar.gz" + license("Apache-2.0") + version("1.09", sha256="ab1d7983413dc2f11de2efa903e5c326af8cb9ea37765dacb39949417f7cd037") version("1.08", sha256="6f6d7530261ba9e2ece84214f1445857d488b7851c28a58356b49f2d9fd36290") version("1.07", sha256="104a158e013585e20287f8d33935e93c711b96281e6dda621a5c19575d0b0405") diff --git a/var/spack/repos/builtin/packages/libpaper/package.py b/var/spack/repos/builtin/packages/libpaper/package.py index 270bbb0fef0f5e..5723a25ea1260b 100644 --- a/var/spack/repos/builtin/packages/libpaper/package.py +++ b/var/spack/repos/builtin/packages/libpaper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libpaper(AutotoolsPackage): homepage = "https://packages.debian.org/unstable/source/libpaper" url = "https://deb.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.28.tar.gz" + license("LGPL-2.1-or-later") + version("1.1.28", sha256="c8bb946ec93d3c2c72bbb1d7257e90172a22a44a07a07fb6b802a5bb2c95fddc") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libpcap/package.py b/var/spack/repos/builtin/packages/libpcap/package.py index cc4a109adaa24d..19276cfd3de0b2 100644 --- a/var/spack/repos/builtin/packages/libpcap/package.py +++ b/var/spack/repos/builtin/packages/libpcap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libpcap(AutotoolsPackage): list_url = "https://www.tcpdump.org/release/" url = "https://www.tcpdump.org/release/libpcap-1.8.1.tar.gz" + license("BSD-3-Clause") + version("1.10.4", sha256="ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f") version("1.10.3", sha256="2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6") version("1.10.0", sha256="8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e") diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py index d28355eb29f7ae..90c9b543cab616 100644 --- a/var/spack/repos/builtin/packages/libpciaccess/package.py +++ b/var/spack/repos/builtin/packages/libpciaccess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libpciaccess(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libpciaccess/" xorg_mirror_path = "lib/libpciaccess-0.13.5.tar.gz" + license("X11") + version("0.17", sha256="bf6985a77d2ecb00e2c79da3edfb26b909178ffca3f2e9d14ed0620259ab733b") version("0.16", sha256="84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27") version("0.13.5", sha256="fe26ec788732b4ef60b550f2d3fa51c605d27f646e18ecec878f061807a3526e") diff --git a/var/spack/repos/builtin/packages/libpeas/package.py b/var/spack/repos/builtin/packages/libpeas/package.py deleted file mode 100644 index 70f4dde7723b1f..00000000000000 --- a/var/spack/repos/builtin/packages/libpeas/package.py +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -import os - -from spack.package import * - - -class Libpeas(AutotoolsPackage): - """libpeas is a gobject-based plugins engine, and is targeted at - giving every application the chance to assume its own - extensibility.""" - - homepage = "http://developer.gnome.org/libpeas/stable" - url = "https://download.gnome.org/sources/libpeas/1.22/libpeas-1.22.0.tar.xz" - - version("1.22.0", sha256="5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962") - - depends_on("m4", type="build") - depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("libtool", type="build") - depends_on("gettext", type="build") - depends_on("pkgconfig", type="build") - depends_on("atk") - depends_on("intltool@0.40.0:") - depends_on("xmlto", type="build") - depends_on("perl", type="build") - depends_on("perl-xml-parser", type="build") - depends_on("glib@2.10:") - depends_on("gobject-introspection") - depends_on("libffi") - depends_on("gtkplus") - depends_on("gdk-pixbuf") - depends_on("pango") - depends_on("gnome-common") - depends_on("py-pygobject@3:", type="build") - depends_on("python@3:3.7.9", type="build") - - def url_for_version(self, version): - url = "https://download.gnome.org/sources/libpeas/" - url += "{0}/libpeas-{1}.tar.xz" - return url.format(version.up_to(2), version) - - def setup_dependent_build_environment(self, env, dependent_spec): - env.prepend_path("XDG_DATA_DIRS", self.prefix.share) - - def setup_dependent_run_environment(self, env, dependent_spec): - env.prepend_path("XDG_DATA_DIRS", self.prefix.share) - - def setup_build_environment(self, env): - # Let - # - # python = self.spec['python'] - # prefix = python.prefix - # pyversion = python.version.up_to(2) - # python_lib_path = os.path.join(prefix, 'Frameworks', - # 'Python.framework', 'Versions', - # pyversion) - # - # self.spec['python'].libs.ld_flags returns (on macOS) - # '-L{0} -lPython'.format(python_lib_path) - # - # e.g., for python@3.7.4 on macOS via Homebrew, python_lib_path is - # /usr/local/opt/python/Frameworks/Python.framework/Versions/3.7 - # - # This directory is correct for many purposes, but libpeas uses the - # link flag '-lpython{0}m'.format(pyversion) and does not use an - # appropriate -L flag to locate this library, so the correct -L flag - # must be appended to LDFLAGS. Furthermore, this library is not found - # in python_lib_path. However, pkg-config returns the correct - # directory, so pkg-config is used to generate the correct paths for - # LDFLAGS. - pkg_config = which("pkg-config") - python_prefix = self.spec["python"].prefix.lib.pkgconfig - python_pc_file = os.path.join(python_prefix, "python3.pc") - python_ldflags = pkg_config("--libs", python_pc_file, output=str) - - env.append_path("LDFLAGS", python_ldflags) - env.prepend_path("XDG_DATA_DIRS", self.prefix.share) - - def setup_run_environment(self, env): - env.prepend_path("XDG_DATA_DIRS", self.prefix.share) - - def autoreconf(self, spec, prefix): - autoreconf_args = ["-ivf"] - aclocal_pkg_list = [ - "pkgconfig", - "gettext", - "intltool", - "glib", - "gobject-introspection", - "gnome-common", - "gtkplus", - ] - aclocal_path = os.path.join("share", "aclocal") - - for pkg in aclocal_pkg_list: - autoreconf_args += ["-I", os.path.join(spec[pkg].prefix, aclocal_path)] - - autoreconf = which("autoreconf") - autoreconf(*autoreconf_args) - - def configure_args(self): - args = ["--disable-silent-rules", "--enable-gtk", "--enable-python3", "--disable-python2"] - return args diff --git a/var/spack/repos/builtin/packages/libpfm4/package.py b/var/spack/repos/builtin/packages/libpfm4/package.py index 4758e3847cbb02..9ce27303269ab8 100644 --- a/var/spack/repos/builtin/packages/libpfm4/package.py +++ b/var/spack/repos/builtin/packages/libpfm4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libpfm4(MakefilePackage): url = "https://downloads.sourceforge.net/project/perfmon2/libpfm4/libpfm-4.12.0.tar.gz" maintainers("mwkrentel") + license("MIT") + version("4.13.0", sha256="d18b97764c755528c1051d376e33545d0eb60c6ebf85680436813fa5b04cc3d1") version("4.12.0", sha256="4b0c1f53f39a61525b69bebf532c68040c1b984d7544a8ae0844b13cd91e1ee4") version("4.11.0", sha256="5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc") diff --git a/var/spack/repos/builtin/packages/libpipeline/package.py b/var/spack/repos/builtin/packages/libpipeline/package.py index 6dc966761ea62f..b35c34559959fc 100644 --- a/var/spack/repos/builtin/packages/libpipeline/package.py +++ b/var/spack/repos/builtin/packages/libpipeline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libpipeline(AutotoolsPackage): git = "https://gitlab.com/cjwatson/libpipeline" url = "https://download.savannah.nongnu.org/releases/libpipeline/libpipeline-1.5.5.tar.gz" + license("GPL-3.0-or-later") + version("1.5.7", sha256="b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0") version("1.5.5", sha256="0c8367f8b82bb721b50647a647115b6e62a37e3b2e954a9685e4d933f30c00cc") version("1.4.2", sha256="fef1fc9aa40ce8796f18cd1aecd888a9484a9556c8b0f8d07c863578277679be") diff --git a/var/spack/repos/builtin/packages/libplist/package.py b/var/spack/repos/builtin/packages/libplist/package.py index c7a11b53c397f8..d92235b13f96e5 100644 --- a/var/spack/repos/builtin/packages/libplist/package.py +++ b/var/spack/repos/builtin/packages/libplist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libplist(AutotoolsPackage): url = "https://github.com/libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2" git = "https://git.libimobiledevice.org/libplist.git" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("master", branch="master") version("2.2.0", sha256="4a5517e5377ec421df84c586ba85bb4e1d26f11ad203d7d450a907c0156fbd9a") version("2.0.0", sha256="3a7e9694c2d9a85174ba1fa92417cfabaea7f6d19631e544948dc7e17e82f602") diff --git a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py index 688941c7670df1..d4e43270ca758f 100644 --- a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py +++ b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpng/package.py b/var/spack/repos/builtin/packages/libpng/package.py index 7187c99706d1d4..395f2694c57cad 100644 --- a/var/spack/repos/builtin/packages/libpng/package.py +++ b/var/spack/repos/builtin/packages/libpng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libpng(CMakePackage): maintainers("AlexanderRichert-NOAA") + license("Libpng") + version("1.6.39", sha256="1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937") version("1.6.37", sha256="505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca") # From http://www.libpng.org/pub/png/libpng.html (2019-04-15) diff --git a/var/spack/repos/builtin/packages/libpostal/package.py b/var/spack/repos/builtin/packages/libpostal/package.py index d04b67e51f3b43..e594a00b689581 100644 --- a/var/spack/repos/builtin/packages/libpostal/package.py +++ b/var/spack/repos/builtin/packages/libpostal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libpostal(AutotoolsPackage): maintainers("jgaeb") + license("MIT") + version("1.1", sha256="8cc473a05126895f183f2578ca234428d8b58ab6fadf550deaacd3bd0ae46032") version("1.0.0", sha256="3035af7e15b2894069753975d953fa15a86d968103913dbf8ce4b8aa26231644") version("0.3.4", sha256="8b3b95660c5b5d4fe48045b9acb000d1a0eb19d58d0c2d2041e78d9a96d88716") diff --git a/var/spack/repos/builtin/packages/libpressio-adios2/package.py b/var/spack/repos/builtin/packages/libpressio-adios2/package.py index c22dcce1c445c2..d4aefcbb8566b9 100644 --- a/var/spack/repos/builtin/packages/libpressio-adios2/package.py +++ b/var/spack/repos/builtin/packages/libpressio-adios2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-errorinjector/package.py b/var/spack/repos/builtin/packages/libpressio-errorinjector/package.py index 3c8b5d1d0e0e4a..8ed53ad6704f83 100644 --- a/var/spack/repos/builtin/packages/libpressio-errorinjector/package.py +++ b/var/spack/repos/builtin/packages/libpressio-errorinjector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-nvcomp/package.py b/var/spack/repos/builtin/packages/libpressio-nvcomp/package.py index d74bf844adb012..d496bff18dd710 100644 --- a/var/spack/repos/builtin/packages/libpressio-nvcomp/package.py +++ b/var/spack/repos/builtin/packages/libpressio-nvcomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-opt/package.py b/var/spack/repos/builtin/packages/libpressio-opt/package.py index 42eb74e1b0d2c3..07c4f3b03deba8 100644 --- a/var/spack/repos/builtin/packages/libpressio-opt/package.py +++ b/var/spack/repos/builtin/packages/libpressio-opt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-rmetric/package.py b/var/spack/repos/builtin/packages/libpressio-rmetric/package.py index 49e826eeba151f..a024871bae6813 100644 --- a/var/spack/repos/builtin/packages/libpressio-rmetric/package.py +++ b/var/spack/repos/builtin/packages/libpressio-rmetric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-sperr/package.py b/var/spack/repos/builtin/packages/libpressio-sperr/package.py index 35576e33a7a08a..193ac867375fe9 100644 --- a/var/spack/repos/builtin/packages/libpressio-sperr/package.py +++ b/var/spack/repos/builtin/packages/libpressio-sperr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LibpressioSperr(CMakePackage): maintainers("robertu94") + license("GPL-3.0-only") + version("master", branch="master") version("0.0.4", sha256="97f2879460b1a28ed8ebf0c300c1cf7ceeb2c7aa7b8a1307ed19bf8cce0b7941") version("0.0.3", sha256="e0d1fd083419aaaa243cbf780b7de17aeb96533000071088aa21ec238d358ecc") diff --git a/var/spack/repos/builtin/packages/libpressio-tools/package.py b/var/spack/repos/builtin/packages/libpressio-tools/package.py index 39c8d911652658..a72f1b4c8b29d9 100644 --- a/var/spack/repos/builtin/packages/libpressio-tools/package.py +++ b/var/spack/repos/builtin/packages/libpressio-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpressio-tthresh/package.py b/var/spack/repos/builtin/packages/libpressio-tthresh/package.py index 1af05a5534ca07..c37bcb8ededb9e 100644 --- a/var/spack/repos/builtin/packages/libpressio-tthresh/package.py +++ b/var/spack/repos/builtin/packages/libpressio-tthresh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LibpressioTthresh(CMakePackage): maintainers("robertu94") + license("LGPL-3.0-or-later") + version("main", branch="main") version("0.0.7", sha256="5e364ef72dd1ed1cf786d2b7aef89624fdcf1a0ca845777ce54c365b35a75be2") version("0.0.6", sha256="e9dc4754421d892a86516c6bb892f6ff582e9ea3c242c1c052104e4f6944cbec") diff --git a/var/spack/repos/builtin/packages/libpressio/package.py b/var/spack/repos/builtin/packages/libpressio/package.py index 2c2bfa48e3da3d..f1828bcf51c886 100644 --- a/var/spack/repos/builtin/packages/libpressio/package.py +++ b/var/spack/repos/builtin/packages/libpressio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -278,7 +278,6 @@ def cmake_args(self): if "+python" in self.spec: args.append("-DLIBPRESSIO_PYTHON_SITELIB={0}".format(python_platlib)) args.append("-DBUILD_PYTHON_WRAPPER=ON") - args.append("-DPython3_EXECUTABLE={0}".format(self.spec["python"].command)) if "+mpi" in self.spec: args.append("-DLIBPRESSIO_HAS_MPI4PY=ON") if "+hdf5" in self.spec: diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index 65915bb1f55549..70158c0bf90e8b 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libproxy(CMakePackage): homepage = "https://libproxy.github.io/libproxy/" url = "https://github.com/libproxy/libproxy/archive/0.4.15.tar.gz" + license("LGPL-2.0-or-later") + version("0.4.17", sha256="88c624711412665515e2800a7e564aabb5b3ee781b9820eca9168035b0de60a9") version("0.4.16", sha256="9e7959d6ae1d6c817f0ac1e253105ce8d99f55d7821c1b6eaef32bf6879c6f0a") version("0.4.15", sha256="18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0") diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py index f4d4991f7912d4..f6ea835e9a5df8 100644 --- a/var/spack/repos/builtin/packages/libpsl/package.py +++ b/var/spack/repos/builtin/packages/libpsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libpsl(AutotoolsPackage): url = "https://github.com/rockdaboot/libpsl/releases/download/0.21.2/libpsl-0.21.2.tar.gz" list_url = "https://github.com/rockdaboot/libpsl/tags" + license("MIT") + version("0.21.2", sha256="e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f") version("0.20.2", sha256="7aa949fd3fdba61b0dc7b3f4c2520263b942c189746e157f48436386eca3398e") version("0.19.1", sha256="9b47387a087bcac2af31ea0c94f644bfa32e0be6d079bfa430452b7521ad8c57") diff --git a/var/spack/repos/builtin/packages/libpsm3/package.py b/var/spack/repos/builtin/packages/libpsm3/package.py index 620777fc17af5a..8ce2995bfdd1ae 100644 --- a/var/spack/repos/builtin/packages/libpsm3/package.py +++ b/var/spack/repos/builtin/packages/libpsm3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,10 +16,11 @@ class Libpsm3(AutotoolsPackage): git = "https://github.com/intel/eth-psm3-fi.git" version( - "11.4.1.0", - sha256="272adb9ec10edf709bfcfccc6b6e9296d25d892c36b845ad577caeb82b70c9ac", + "11.5.1.1", + sha256="59fe731f4dd2cfcd90c8274df1c6ca9014a45cdebfdf1f1a830fcb8fcb65bb79", preferred=True, ) + version("11.4.1.0", sha256="272adb9ec10edf709bfcfccc6b6e9296d25d892c36b845ad577caeb82b70c9ac") variant("atomics", default=True, description="Enable atomics") variant("debug", default=False, description="Enable debugging") diff --git a/var/spack/repos/builtin/packages/libpsml/package.py b/var/spack/repos/builtin/packages/libpsml/package.py index 194c60f6a971a2..b6fb93a282a009 100644 --- a/var/spack/repos/builtin/packages/libpsml/package.py +++ b/var/spack/repos/builtin/packages/libpsml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libpsml(AutotoolsPackage): git = "https://gitlab.com/siesta-project/libraries/libpsml.git" url = "https://gitlab.com/siesta-project/libraries/libpsml/-/archive/libpsml-1.1.10/libpsml-libpsml-1.1.10.tar.gz" + license("BSD-3-Clause") + version("1.1.10", sha256="ba87ece7d443a42a5db3a119c555a29a391a060dd6f3f5039a2c6ea248b7fe84") version("1.1.9", sha256="04b8de33c555ae94a790116cd3cf7b6c9e8ec9a018562edff544a2e04876cf0c") version("1.1.8", sha256="77498783be1bc7006819f36c42477b5913464b8c660203f7d6b7f7e25aa29145") diff --git a/var/spack/repos/builtin/packages/libpspio/package.py b/var/spack/repos/builtin/packages/libpspio/package.py new file mode 100644 index 00000000000000..97744468e17310 --- /dev/null +++ b/var/spack/repos/builtin/packages/libpspio/package.py @@ -0,0 +1,37 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Libpspio(AutotoolsPackage): + """Library to perform I/O operations on pseudopotential data files.""" + + homepage = "https://gitlab.com/ElectronicStructureLibrary/libpspio" + url = "https://gitlab.com/ElectronicStructureLibrary/libpspio/-/archive/0.3.0/libpspio-0.3.0.tar.gz" + + maintainers("hmenke") + + license("MPL-2.0") + + version("0.3.0", sha256="4dc092457e481e5cd703eeecd87e6f17749941fe274043550c8a2557a649afc5") + + variant("fortran", default=False, description="Enable Fortran bindings") + + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + depends_on("m4", type="build") + depends_on("pkgconfig", type="build") + + depends_on("check") + depends_on("gsl") + + def autoreconf(self, spec, prefix): + Executable("./autogen.sh")() + + def configure_args(self): + args = self.enable_or_disable("fortran") + return args diff --git a/var/spack/repos/builtin/packages/libpthread-stubs/package.py b/var/spack/repos/builtin/packages/libpthread-stubs/package.py index a32aba7d9708ff..cdf5143b5b5b2c 100644 --- a/var/spack/repos/builtin/packages/libpthread-stubs/package.py +++ b/var/spack/repos/builtin/packages/libpthread-stubs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libpulsar/package.py b/var/spack/repos/builtin/packages/libpulsar/package.py index 5fc0306b04cd4d..cb24450f499b1c 100644 --- a/var/spack/repos/builtin/packages/libpulsar/package.py +++ b/var/spack/repos/builtin/packages/libpulsar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libpulsar(CMakePackage): maintainers("aahmed-se") + license("Apache-2.0") + version("2.7.0", sha256="5bf8e5115075e12c848a9e4474cd47067c3200f7ff13c45f624f7383287e8e5e") depends_on("zstd") diff --git a/var/spack/repos/builtin/packages/libqglviewer/package.py b/var/spack/repos/builtin/packages/libqglviewer/package.py index 4b54a27d60077f..a75b4b285ca423 100644 --- a/var/spack/repos/builtin/packages/libqglviewer/package.py +++ b/var/spack/repos/builtin/packages/libqglviewer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libqglviewer(QMakePackage): url = "http://libqglviewer.com/src/libQGLViewer-2.7.2.tar.gz" git = "https://github.com/GillesDebunne/libQGLViewer.git" + license("GPL-2.0-or-later") + version("2.7.2", sha256="e2d2799dec5cff74548e951556a1fa06a11d9bcde2ce6593f9c27a17543b7c08") # http://libqglviewer.com/installUnix.html diff --git a/var/spack/repos/builtin/packages/libqrencode/package.py b/var/spack/repos/builtin/packages/libqrencode/package.py index 6b7c21a6ce073d..d3db70755e1e59 100644 --- a/var/spack/repos/builtin/packages/libqrencode/package.py +++ b/var/spack/repos/builtin/packages/libqrencode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libqrencode(AutotoolsPackage): maintainers("cessenat") + license("LGPL-2.1-or-later") + version("master", branch="master") version("4.1.1", sha256="5385bc1b8c2f20f3b91d258bf8ccc8cf62023935df2d2676b5b67049f31a049c") diff --git a/var/spack/repos/builtin/packages/libquo/package.py b/var/spack/repos/builtin/packages/libquo/package.py index 49bff95ebac2eb..5aa5d0d7cbfb9e 100644 --- a/var/spack/repos/builtin/packages/libquo/package.py +++ b/var/spack/repos/builtin/packages/libquo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libquo(AutotoolsPackage): tags = ["e4s"] + license("BSD-3-Clause") + version("master", branch="master") version("1.3.1", sha256="407f7c61cc80aa934cf6086f3516a31dee3b803047713c297102452c3d7d6ed1") version("1.3", sha256="61b0beff15eae4be94b5d3cbcbf7bf757659604465709ed01827cbba45efcf90") diff --git a/var/spack/repos/builtin/packages/libraqm/package.py b/var/spack/repos/builtin/packages/libraqm/package.py index 338e10abaaf0bb..745dc9f1a9002e 100644 --- a/var/spack/repos/builtin/packages/libraqm/package.py +++ b/var/spack/repos/builtin/packages/libraqm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libraqm(MesonPackage): url = "https://github.com/HOST-Oman/libraqm/releases/download/v0.9.0/raqm-0.9.0.tar.xz" git = "https://github.com/HOST-Oman/libraqm.git" + license("MIT") + version("0.9.0", sha256="9ed6fdf41da6391fc9bf7038662cbe412c330aa6eb22b19704af2258e448107c") variant( diff --git a/var/spack/repos/builtin/packages/libraw1394/package.py b/var/spack/repos/builtin/packages/libraw1394/package.py index 7e17b25b52a4c4..89a9262f34a377 100644 --- a/var/spack/repos/builtin/packages/libraw1394/package.py +++ b/var/spack/repos/builtin/packages/libraw1394/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class Libraw1394(AutotoolsPackage): homepage = "https://sourceforge.net/projects/libraw1394/" url = "https://sourceforge.net/projects/libraw1394/files/libraw1394/1.2.0/libraw1394-1.2.0.tar.gz" + license("LGPL-2.1-or-later") + version("1.2.0", sha256="1fdcfa4c5a0938705b925d06f17da9be6ec3f8f065040bb7f33082ef3fc63fad") diff --git a/var/spack/repos/builtin/packages/librdkafka/package.py b/var/spack/repos/builtin/packages/librdkafka/package.py index b097d2513da017..53cb81e2f8d717 100644 --- a/var/spack/repos/builtin/packages/librdkafka/package.py +++ b/var/spack/repos/builtin/packages/librdkafka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Librdkafka(AutotoolsPackage): homepage = "https://github.com/edenhill/librdkafka" url = "https://github.com/edenhill/librdkafka/archive/v1.5.0.tar.gz" + license("BSD-2-Clause") + version("2.2.0", sha256="af9a820cbecbc64115629471df7c7cecd40403b6c34bfdbb9223152677a47226") version("2.1.1", sha256="7be1fc37ab10ebdc037d5c5a9b35b48931edafffae054b488faaff99e60e0108") version("2.1.0", sha256="d8e76c4b1cde99e283a19868feaaff5778aa5c6f35790036c5ef44bc5b5187aa") diff --git a/var/spack/repos/builtin/packages/librelp/package.py b/var/spack/repos/builtin/packages/librelp/package.py index f2cd7e31ddedeb..3113da14f317e9 100644 --- a/var/spack/repos/builtin/packages/librelp/package.py +++ b/var/spack/repos/builtin/packages/librelp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Librelp(AutotoolsPackage): homepage = "https://www.rsyslog.com/librelp/" url = "https://github.com/rsyslog/librelp/archive/v1.7.0.tar.gz" + license("GPL-3.0-or-later") + version("1.7.0", sha256="ff46bdd74798934663d1388d010270325dc6a6ed6d44358ca69b280a8304b1e9") version("1.6.0", sha256="acaaa6b8e295ecd8e9d9b70c1c3c8fb3cc3c95a9ed5ce1689688510d0eecb37e") version("1.5.0", sha256="ce7f463944417ba77d7b586590e41e276f7b107d3e35a77ce768cf3889b5e1a6") diff --git a/var/spack/repos/builtin/packages/libreproc/package.py b/var/spack/repos/builtin/packages/libreproc/package.py index 3417e4dcf85b43..353819c54d4831 100644 --- a/var/spack/repos/builtin/packages/libreproc/package.py +++ b/var/spack/repos/builtin/packages/libreproc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libreproc(CMakePackage): maintainers("charmoniumQ") + license("MIT") + version("14.2.4", sha256="55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd") variant("cxx", default=False, description="Build reproc C++ bindings") diff --git a/var/spack/repos/builtin/packages/libressl/package.py b/var/spack/repos/builtin/packages/libressl/package.py index 0fca30e3539129..fbdf8a956d8f90 100644 --- a/var/spack/repos/builtin/packages/libressl/package.py +++ b/var/spack/repos/builtin/packages/libressl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libressl(AutotoolsPackage): maintainers("eschnett") + license("custom") + version("3.7.2", sha256="b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7") version("3.6.3", sha256="87b1bbe36e9eec8d0ae5f04c83d36b2c5b0e581784c7eb0817025ed29eadea37") version("3.6.1", sha256="acfac61316e93b919c28d62d53037ca734de85c46b4d703f19fd8395cf006774") diff --git a/var/spack/repos/builtin/packages/libristra/package.py b/var/spack/repos/builtin/packages/libristra/package.py index f87dbf17d58005..74eb576d0b0bcc 100644 --- a/var/spack/repos/builtin/packages/libristra/package.py +++ b/var/spack/repos/builtin/packages/libristra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/librmm/package.py b/var/spack/repos/builtin/packages/librmm/package.py index 36510a3465f7f2..4e885df76d49da 100644 --- a/var/spack/repos/builtin/packages/librmm/package.py +++ b/var/spack/repos/builtin/packages/librmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Librmm(CMakePackage): homepage = "https://github.com/rapidsai/rmm" url = "https://github.com/rapidsai/rmm/archive/v0.15.0.tar.gz" + license("Apache-2.0") + version("0.15.0", sha256="599f97b95d169a90d11296814763f7e151a8a1e060ba10bc6c8f4684a5cd7972") depends_on("cuda@9.0:") diff --git a/var/spack/repos/builtin/packages/librom/package.py b/var/spack/repos/builtin/packages/librom/package.py index 94f28aa318ac2e..b46c9e0976bb40 100644 --- a/var/spack/repos/builtin/packages/librom/package.py +++ b/var/spack/repos/builtin/packages/librom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Librom(AutotoolsPackage): homepage = "https://github.com/LLNL/libROM" git = "https://github.com/LLNL/libROM.git" + license("Apache-2.0") + version("develop", branch="master") depends_on("lapack") diff --git a/var/spack/repos/builtin/packages/librsb/package.py b/var/spack/repos/builtin/packages/librsb/package.py index 2d5b9f0a16ce40..19981ce8b0ccc0 100644 --- a/var/spack/repos/builtin/packages/librsb/package.py +++ b/var/spack/repos/builtin/packages/librsb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Librsb(AutotoolsPackage): url = "http://download.sourceforge.net/librsb/librsb-1.3.0.1.tar.gz" list_url = "https://sourceforge.net/projects/librsb/files/" + license("LGPL-3.0-only") + version("1.3.0.1", sha256="3fc024a410f94aca2a7139ae79f4d713b11fa83304293630c363786874c17db4") version("1.3.0.0", sha256="2ac8725d1f988f57df9383ae6b0bb2ed221ec935187d31ebb62ea95ee868a790") version("1.2.0.11", sha256="0686be29bbe277e227c6021de6bd0564e4fc83f996b787886437d28048057bc8") diff --git a/var/spack/repos/builtin/packages/librsvg/package.py b/var/spack/repos/builtin/packages/librsvg/package.py index f338a5d83fb159..93ec2e714683a1 100644 --- a/var/spack/repos/builtin/packages/librsvg/package.py +++ b/var/spack/repos/builtin/packages/librsvg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Librsvg(AutotoolsPackage): homepage = "https://wiki.gnome.org/Projects/LibRsvg" url = "https://download.gnome.org/sources/librsvg/2.44/librsvg-2.44.14.tar.xz" + license("LGPL-2.1-or-later") + version("2.56.2", sha256="3ec3c4d8f73e0ba4b9130026969e8371c092b734298d36e2fdb3eb4afcec1200") version("2.51.0", sha256="89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038") version("2.50.2", sha256="6211f271ce4cd44a7318190d36712e9cea384a933d3e3570004edeb210a056d3") diff --git a/var/spack/repos/builtin/packages/librtlsdr/package.py b/var/spack/repos/builtin/packages/librtlsdr/package.py index a574ffcd58b652..0eaed4a6d0954d 100644 --- a/var/spack/repos/builtin/packages/librtlsdr/package.py +++ b/var/spack/repos/builtin/packages/librtlsdr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Librtlsdr(CMakePackage): homepage = "https://osmocom.org/projects/rtl-sdr/wiki" url = "https://github.com/steve-m/librtlsdr/archive/0.6.0.tar.gz" + license("GPL-2.0-or-later") + version("0.6.0", sha256="80a5155f3505bca8f1b808f8414d7dcd7c459b662a1cde84d3a2629a6e72ae55") version("0.5.4", sha256="6fd0d298c1a18fc8005b0c2f6199b08bc15e3fb4f4312f551eea2ae269c940c5") diff --git a/var/spack/repos/builtin/packages/librttopo/package.py b/var/spack/repos/builtin/packages/librttopo/package.py index a391acf6c85ff6..082ca655c3c23d 100644 --- a/var/spack/repos/builtin/packages/librttopo/package.py +++ b/var/spack/repos/builtin/packages/librttopo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Librttopo(AutotoolsPackage): url = "https://git.osgeo.org/gitea/rttopo/librttopo/archive/librttopo-1.1.0.tar.gz" git = "https://git.osgeo.org/gitea/rttopo/librttopo.git" + license("GPL-2.0-or-later") + version("1.1.0", sha256="2e2fcabb48193a712a6c76ac9a9be2a53f82e32f91a2bc834d9f1b4fa9cd879f") depends_on("geos") diff --git a/var/spack/repos/builtin/packages/libsakura/package.py b/var/spack/repos/builtin/packages/libsakura/package.py index 196988a7723d42..788327f3fa9529 100644 --- a/var/spack/repos/builtin/packages/libsakura/package.py +++ b/var/spack/repos/builtin/packages/libsakura/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libsakura(CMakePackage): maintainers("mpokorny") + license("LGPL-3.0-only") + version("4.0.2065", sha256="3fde3713b1ca539f0b2397ec72a0086a3138ef63f89dce4be51ee60585df995f") version("3.0.2025", sha256="381a49d57cbc88dea15e08f7ed64ba57481d25bce8e5f68938dd4b6a30589c16") diff --git a/var/spack/repos/builtin/packages/libsamplerate/package.py b/var/spack/repos/builtin/packages/libsamplerate/package.py index 34cce41827d445..35fc19520b2080 100644 --- a/var/spack/repos/builtin/packages/libsamplerate/package.py +++ b/var/spack/repos/builtin/packages/libsamplerate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libsamplerate(AutotoolsPackage): homepage = "http://www.mega-nerd.com/libsamplerate/history.html" url = "http://www.mega-nerd.com/libsamplerate/libsamplerate-0.1.9.tar.gz" + license("BSD-2-Clause") + version("0.1.9", sha256="0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1") version("0.1.8", sha256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06") diff --git a/var/spack/repos/builtin/packages/libseccomp/package.py b/var/spack/repos/builtin/packages/libseccomp/package.py index ac6e807830a53c..8b87dbff48f165 100644 --- a/var/spack/repos/builtin/packages/libseccomp/package.py +++ b/var/spack/repos/builtin/packages/libseccomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libseccomp(AutotoolsPackage): homepage = "https://github.com/seccomp/libseccomp" url = "https://github.com/seccomp/libseccomp/releases/download/v2.5.3/libseccomp-2.5.3.tar.gz" + license("LGPL-2.1-or-later") + version("2.5.4", sha256="d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb") version("2.5.3", sha256="59065c8733364725e9721ba48c3a99bbc52af921daf48df4b1e012fbc7b10a76") version("2.3.3", sha256="7fc28f4294cc72e61c529bedf97e705c3acf9c479a8f1a3028d4cd2ca9f3b155") diff --git a/var/spack/repos/builtin/packages/libsecret/package.py b/var/spack/repos/builtin/packages/libsecret/package.py index 6201aeee9b7bfc..ba7c8aa26584c1 100644 --- a/var/spack/repos/builtin/packages/libsecret/package.py +++ b/var/spack/repos/builtin/packages/libsecret/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libsecret(AutotoolsPackage): homepage = "https://wiki.gnome.org/Projects/Libsecret" url = "http://ftp.gnome.org/pub/gnome/sources/libsecret/0.18/libsecret-0.18.8.tar.xz" + license("LGPL-2.1-or-later") + version("0.18.8", sha256="3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15") variant("gcrypt", default=True, description="Build with libgcrypt") diff --git a/var/spack/repos/builtin/packages/libsharp/package.py b/var/spack/repos/builtin/packages/libsharp/package.py index e923931db1236f..482439306a8845 100644 --- a/var/spack/repos/builtin/packages/libsharp/package.py +++ b/var/spack/repos/builtin/packages/libsharp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libsharp(AutotoolsPackage): homepage = "https://github.com/Libsharp/libsharp" git = "https://github.com/Libsharp/libsharp.git" + license("GPL-2.0-or-later") + version("1.0.0", commit="cc4753ff4b0ef393f0d4ada41a175c6d1dd85d71", preferred=True) version("2018-01-17", commit="593d4eba67d61827191c32fb94bf235cb31205e1") diff --git a/var/spack/repos/builtin/packages/libshm/package.py b/var/spack/repos/builtin/packages/libshm/package.py index 520327b3419c9e..6bbe6cd94e602e 100644 --- a/var/spack/repos/builtin/packages/libshm/package.py +++ b/var/spack/repos/builtin/packages/libshm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libshm(Package): homepage = "https://github.com/afeldman/libshm" git = "https://github.com/afeldman/libshm.git" + license("MIT") + version("master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libsigcpp/package.py b/var/spack/repos/builtin/packages/libsigcpp/package.py index 1dc6add3c7f0b8..318851ac097d88 100644 --- a/var/spack/repos/builtin/packages/libsigcpp/package.py +++ b/var/spack/repos/builtin/packages/libsigcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libsigcpp(AutotoolsPackage): list_url = "https://ftp.acc.umu.se/pub/GNOME/sources/libsigc++/" list_depth = 1 + license("LGPL-3.0-only") + version("2.99.12", sha256="d902ae277f5baf2d56025586e2153cc2f158472e382723c67f49049f7c6690a8") version("2.9.3", sha256="0bf9b301ad6198c550986c51150a646df198e8d1d235270c16486b0dda30097f") version("2.1.1", sha256="7a2bd0b521544b31051c476205a0e74ace53771ec1a939bfec3c297b50c9fd78") diff --git a/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py b/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py index 27fa1a2421e735..1b3bd1c1b4ffd3 100644 --- a/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py +++ b/var/spack/repos/builtin/packages/libsignal-protocol-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class LibsignalProtocolC(CMakePackage): maintainers("pwablito") + license("GPL-3.0-only") + version("2.3.3", sha256="c22e7690546e24d46210ca92dd808f17c3102e1344cd2f9a370136a96d22319d") diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index c9ceb87d47a802..f2dc840891898b 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libsigsegv(AutotoolsPackage, GNUMirrorPackage): test_requires_compiler = True + license("GPL-2.0-or-later") + version("2.14", sha256="cdac3941803364cf81a908499beb79c200ead60b6b5b40cad124fd1e06caa295") version("2.13", sha256="be78ee4176b05f7c75ff03298d84874db90f4b6c9d5503f0da1226b3a3c48119") version("2.12", sha256="3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6") diff --git a/var/spack/repos/builtin/packages/libslirp/package.py b/var/spack/repos/builtin/packages/libslirp/package.py index 56a1a1322b4122..cb75c8bcf87710 100644 --- a/var/spack/repos/builtin/packages/libslirp/package.py +++ b/var/spack/repos/builtin/packages/libslirp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libslirp(MesonPackage): url = "https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.6.1/libslirp-v4.6.1.tar.gz" maintainers("bernhardkaindl") + license("BSD-3-Clause") + version("4.7.0", sha256="9398f0ec5a581d4e1cd6856b88ae83927e458d643788c3391a39e61b75db3d3b") version("4.6.1", sha256="69ad4df0123742a29cc783b35de34771ed74d085482470df6313b6abeb799b11") diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py index ae8f4e92f54c09..6f89ff6d3dfc9c 100644 --- a/var/spack/repos/builtin/packages/libsm/package.py +++ b/var/spack/repos/builtin/packages/libsm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,15 @@ class Libsm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libSM" xorg_mirror_path = "lib/libSM-1.2.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.2.4", sha256="51464ce1abce323d5b6707ceecf8468617106e1a8a98522f8342db06fd024c15") version("1.2.3", sha256="1e92408417cb6c6c477a8a6104291001a40b3bb56a4a60608fdd9cd2c5a0f320") version("1.2.2", sha256="14bb7c669ce2b8ff712fbdbf48120e3742a77edcd5e025d6b3325ed30cf120f4") + depends_on("libice@1.1.0:", when="@1.2.4:") depends_on("libice@1.0.5:") depends_on("uuid") diff --git a/var/spack/repos/builtin/packages/libsndfile/package.py b/var/spack/repos/builtin/packages/libsndfile/package.py index 6b82b65a3b529e..031517c7552fca 100644 --- a/var/spack/repos/builtin/packages/libsndfile/package.py +++ b/var/spack/repos/builtin/packages/libsndfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libsndfile(AutotoolsPackage): homepage = "http://www.mega-nerd.com/libsndfile/" url = "http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.28", sha256="1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9") variant("alsa", default=False, description="Use alsa in example programs") diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index d58dbd8a065715..b825fc7192b4b6 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Libsodium(AutotoolsPackage): url = "https://download.libsodium.org/libsodium/releases/libsodium-1.0.13.tar.gz" list_url = "https://download.libsodium.org/libsodium/releases/old" + license("ISC") + version("1.0.18", sha256="6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1") version("1.0.17", sha256="0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1") version("1.0.16", sha256="eeadc7e1e1bcef09680fb4837d448fbdf57224978f865ac1c16745868fbd0533") diff --git a/var/spack/repos/builtin/packages/libsolv/package.py b/var/spack/repos/builtin/packages/libsolv/package.py index f58e7463a13e12..c75731358ea458 100644 --- a/var/spack/repos/builtin/packages/libsolv/package.py +++ b/var/spack/repos/builtin/packages/libsolv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libsolv(CMakePackage): maintainers("charmoniumQ") + license("BSD-3-Clause") + version("0.7.22", sha256="968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/libspatialindex/package.py b/var/spack/repos/builtin/packages/libspatialindex/package.py index ffb87c4a12af58..0f59f80bcb5fb8 100644 --- a/var/spack/repos/builtin/packages/libspatialindex/package.py +++ b/var/spack/repos/builtin/packages/libspatialindex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libspatialindex(CMakePackage): homepage = "https://libspatialindex.org/" url = "https://github.com/libspatialindex/libspatialindex/archive/refs/tags/1.8.5.tar.gz" + license("MIT") + version("1.9.3", sha256="7b44340a3edc55c11abfc453bb60f148b29f569cef9e1148583e76132e9c7379") version("1.8.5", sha256="93cce77269612f45287b521d5afdfb245be2b93b8b6438d92f8b9e0bdb37059d") diff --git a/var/spack/repos/builtin/packages/libspatialite/package.py b/var/spack/repos/builtin/packages/libspatialite/package.py index f9f49044bd5739..1865bb1f7e6822 100644 --- a/var/spack/repos/builtin/packages/libspatialite/package.py +++ b/var/spack/repos/builtin/packages/libspatialite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libspatialite(AutotoolsPackage): url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0a.tar.gz" manual_download = True + license("MPL-1.1") + version("5.0.1", sha256="eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98") version("5.0.0", sha256="7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac") # Must download manually from: diff --git a/var/spack/repos/builtin/packages/libspiro/package.py b/var/spack/repos/builtin/packages/libspiro/package.py index 69c29ec2837728..99dc733c5eded9 100644 --- a/var/spack/repos/builtin/packages/libspiro/package.py +++ b/var/spack/repos/builtin/packages/libspiro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libspiro(AutotoolsPackage): homepage = "https://github.com/fontforge/" url = "https://github.com/fontforge/libspiro/archive/20200505.tar.gz" + license("GPL-3.0-or-later") + version("20221101", sha256="d5d8af0648e33fe2344c41824823974a32c4e880c4ae9d846ec4414836a421c4") version("20200505", sha256="00be530b5c0ea9274baadf6c05521f0b192d4c3c1db636ac8b08efd44aaea8f5") version("20190731", sha256="24c7d1ccc7c7fe44ff10c376aa9f96e20e505f417ee72b63dc91a9b34eeac354") diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 6df12beb7da6d6..b431a80f357fc9 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Libsplash(CMakePackage): git = "https://github.com/ComputationalRadiationPhysics/libSplash.git" maintainers("ax3l") + license("LGPL-3.0-only") + version("develop", branch="dev") version("master", branch="master") version("1.7.0", sha256="51ab17c54233a8be86d7c5d59c755fb63a4a197315a510e5c49b20b070ebab73") diff --git a/var/spack/repos/builtin/packages/libspng/package.py b/var/spack/repos/builtin/packages/libspng/package.py index 3d6f727f74d5a1..e227ec8869ff1b 100644 --- a/var/spack/repos/builtin/packages/libspng/package.py +++ b/var/spack/repos/builtin/packages/libspng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Libspng(CMakePackage): homepage = "https://github.com/randy408/libspng" url = "https://github.com/randy408/libspng/archive/refs/tags/v0.7.2.tar.gz" + license("BSD-2-Clause") + version("0.7.2", sha256="4acf25571d31f540d0b7ee004f5461d68158e0a13182505376805da99f4ccc4e") diff --git a/var/spack/repos/builtin/packages/libssh/package.py b/var/spack/repos/builtin/packages/libssh/package.py index e239f3fb3ca3bd..8bd652d384dd03 100644 --- a/var/spack/repos/builtin/packages/libssh/package.py +++ b/var/spack/repos/builtin/packages/libssh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py index 34b4127301a295..3a66e97f180f18 100644 --- a/var/spack/repos/builtin/packages/libssh2/package.py +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libssh2(AutotoolsPackage, CMakePackage): homepage = "https://www.libssh2.org/" url = "https://www.libssh2.org/download/libssh2-1.7.0.tar.gz" + license("BSD-3-Clause") + version("1.11.0", sha256="3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461") version("1.10.0", sha256="2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51") version("1.9.0", sha256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd") diff --git a/var/spack/repos/builtin/packages/libstdcompat/package.py b/var/spack/repos/builtin/packages/libstdcompat/package.py index 069eea1dc33a01..279cd3367a38be 100644 --- a/var/spack/repos/builtin/packages/libstdcompat/package.py +++ b/var/spack/repos/builtin/packages/libstdcompat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libsvm/package.py b/var/spack/repos/builtin/packages/libsvm/package.py index 007ca25ac849e9..8d1089337fe870 100644 --- a/var/spack/repos/builtin/packages/libsvm/package.py +++ b/var/spack/repos/builtin/packages/libsvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libsvm(MakefilePackage): homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/" url = "https://github.com/cjlin1/libsvm/archive/v322.tar.gz" + license("BSD-3-Clause") + version("323", sha256="7a466f90f327a98f8ed1cb217570547bcb00077933d1619f3cb9e73518f38196") version("322", sha256="a3469436f795bb3f8b1e65ea761e14e5599ec7ee941c001d771c07b7da318ac6") diff --git a/var/spack/repos/builtin/packages/libszip/package.py b/var/spack/repos/builtin/packages/libszip/package.py index fea9c5fe829ad9..2aa2974fc40943 100644 --- a/var/spack/repos/builtin/packages/libszip/package.py +++ b/var/spack/repos/builtin/packages/libszip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libtar/package.py b/var/spack/repos/builtin/packages/libtar/package.py index 0449ce95110be1..bf5757ab7242c0 100644 --- a/var/spack/repos/builtin/packages/libtar/package.py +++ b/var/spack/repos/builtin/packages/libtar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libtasn1/package.py b/var/spack/repos/builtin/packages/libtasn1/package.py index 4c953a6df0be88..07abb9199d97e6 100644 --- a/var/spack/repos/builtin/packages/libtasn1/package.py +++ b/var/spack/repos/builtin/packages/libtasn1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libtasn1(Package): homepage = "https://www.gnu.org/software/libtasn1/" url = "https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.13.tar.gz" + license("LGPL-2.1-or-later") + version("4.19.0", sha256="1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a") version("4.13", sha256="7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca") version("4.12", sha256="6753da2e621257f33f5b051cc114d417e5206a0818fe0b1ecfd6153f70934753") diff --git a/var/spack/repos/builtin/packages/libtermkey/package.py b/var/spack/repos/builtin/packages/libtermkey/package.py index 500729d2bece21..817438a516c64d 100644 --- a/var/spack/repos/builtin/packages/libtermkey/package.py +++ b/var/spack/repos/builtin/packages/libtermkey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libtermkey(MakefilePackage): homepage = "http://www.leonerd.org.uk/code/libtermkey/" url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.18.tar.gz" + license("MIT") + version("0.22", sha256="6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600") version("0.18", sha256="239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926") version("0.17", sha256="68949364ed5eaad857b3dea10071cde74b00b9f236dfbb702169f246c3cef389") diff --git a/var/spack/repos/builtin/packages/libthai/package.py b/var/spack/repos/builtin/packages/libthai/package.py index 3edf1a0f397c52..5ae2db3dbd9fa0 100644 --- a/var/spack/repos/builtin/packages/libthai/package.py +++ b/var/spack/repos/builtin/packages/libthai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libthai(AutotoolsPackage): homepage = "https://linux.thai.net" url = "https://github.com/tlwg/libthai/releases/download/v0.1.28/libthai-0.1.28.tar.xz" + license("LGPL-2.1-or-later") + version("0.1.29", sha256="fc80cc7dcb50e11302b417cebd24f2d30a8b987292e77e003267b9100d0f4bcd") version("0.1.28", sha256="ffe0a17b4b5aa11b153c15986800eca19f6c93a4025ffa5cf2cab2dcdf1ae911") version("0.1.27", sha256="1659fa1b7b1d6562102d7feb8c8c3fd94bb2dc5761ed7dbaae4f300e1c03eff6") diff --git a/var/spack/repos/builtin/packages/libtheora/package.py b/var/spack/repos/builtin/packages/libtheora/package.py index 6ec88aa91ccf24..f12f67c4607921 100644 --- a/var/spack/repos/builtin/packages/libtheora/package.py +++ b/var/spack/repos/builtin/packages/libtheora/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Libtheora(AutotoolsPackage, MSBuildPackage): url = "http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz" git = "https://gitlab.xiph.org/xiph/theora.git" + license("BSD-3-Clause") + version("master", branch="master") version("stable", branch="theora-1.1") version("1.1.1", sha256="f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61") diff --git a/var/spack/repos/builtin/packages/libtiff/package.py b/var/spack/repos/builtin/packages/libtiff/package.py index 5977520d4ec136..9380bee14bd5c0 100644 --- a/var/spack/repos/builtin/packages/libtiff/package.py +++ b/var/spack/repos/builtin/packages/libtiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -38,6 +38,8 @@ class Libtiff(CMakePackage, AutotoolsPackage): maintainers("adamjstewart") + license("libtiff") + version("4.5.1", sha256="d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b") version("4.5.0", sha256="c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464") version("4.4.0", sha256="917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed") diff --git a/var/spack/repos/builtin/packages/libtirpc/package.py b/var/spack/repos/builtin/packages/libtirpc/package.py index cd11256d2f77b5..245bea4136262a 100644 --- a/var/spack/repos/builtin/packages/libtirpc/package.py +++ b/var/spack/repos/builtin/packages/libtirpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libtirpc(AutotoolsPackage): homepage = "https://sourceforge.net/projects/libtirpc/" url = "https://sourceforge.net/projects/libtirpc/files/libtirpc/1.1.4/libtirpc-1.1.4.tar.bz2/download" + license("BSD-3-Clause") + version("1.3.3", sha256="6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3") version("1.2.6", sha256="4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc") version("1.1.4", sha256="2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d") diff --git a/var/spack/repos/builtin/packages/libtlx/package.py b/var/spack/repos/builtin/packages/libtlx/package.py index 14a79df407470a..8c852a11c2919d 100644 --- a/var/spack/repos/builtin/packages/libtlx/package.py +++ b/var/spack/repos/builtin/packages/libtlx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Libtlx(CMakePackage): maintainers("fabratu") + license("BSL-1.0") + version("0.6.1", sha256="24dd1acf36dd43b8e0414420e3f9adc2e6bb0e75047e872a06167961aedad769") version( "0.5.20200222", sha256="99e63691af3ada066682243f3a65cd6eb32700071cdd6cfedb18777b5ff5ff4d" diff --git a/var/spack/repos/builtin/packages/libtomlc99/package.py b/var/spack/repos/builtin/packages/libtomlc99/package.py index b62e2bb272765f..c1cef890bd37a6 100644 --- a/var/spack/repos/builtin/packages/libtomlc99/package.py +++ b/var/spack/repos/builtin/packages/libtomlc99/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libtomlc99(Package): homepage = "https://github.com/cktan/tomlc99" git = "https://github.com/cktan/tomlc99.git" + license("MIT") + # Since there is no official versioning, yet, just use the date and prefix # with '0.' to make switching to proper versioning easier later. version("0.2020.12.23", commit="e97a56633e54297990158ab56a7e50a089cddf7d") diff --git a/var/spack/repos/builtin/packages/libtommath/package.py b/var/spack/repos/builtin/packages/libtommath/package.py index 72709ed5314376..8eb61d9d915264 100644 --- a/var/spack/repos/builtin/packages/libtommath/package.py +++ b/var/spack/repos/builtin/packages/libtommath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libtommath(MakefilePackage): homepage = "https://www.libtom.net/" url = "https://github.com/libtom/libtommath/archive/v1.2.0.tar.gz" + license("Unlicense") + version("1.2.0", sha256="f3c20ab5df600d8d89e054d096c116417197827d12732e678525667aa724e30f") version("1.1.0", sha256="71b6f3f99341b7693393ab4b58f03b79b6afc2ee5288666cc4538b4b336355f4") diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index eaa83c387d8ea5..d5926669e4fe17 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libtool(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/libtool/" gnu_mirror_path = "libtool/libtool-2.4.6.tar.gz" + license("LGPL-2.0-or-later AND GPL-2.0-or-later") + version( "develop", git="https://git.savannah.gnu.org/git/libtool.git", @@ -32,6 +34,12 @@ class Libtool(AutotoolsPackage, GNUMirrorPackage): depends_on("m4@1.4.6:", type="build") + # the following are places in which libtool depends on findutils + # https://github.com/autotools-mirror/libtool/blob/v2.4.7/build-aux/ltmain.in#L3296 + # https://github.com/autotools-mirror/libtool/blob/v2.4.6/build-aux/ltmain.in#L3278 + # https://github.com/autotools-mirror/libtool/blob/v2.4.2/libltdl/config/ltmain.m4sh#L3028 + depends_on("findutils", type="run") + with when("@2.4.2"): depends_on("autoconf", type="build") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/libtorrent/package.py b/var/spack/repos/builtin/packages/libtorrent/package.py index 9b5b81274119a3..900cdf59c6a5bb 100644 --- a/var/spack/repos/builtin/packages/libtorrent/package.py +++ b/var/spack/repos/builtin/packages/libtorrent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libtorrent(AutotoolsPackage): homepage = "https://github.com/rakshasa/libtorrent" url = "https://github.com/rakshasa/libtorrent/archive/v0.13.8.tar.gz" + license("GPL-2.0-or-later") + version("0.13.8", sha256="0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722") def autoreconf(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libtree/package.py b/var/spack/repos/builtin/packages/libtree/package.py index d79243c45899bb..85eff7b2c8a3b1 100644 --- a/var/spack/repos/builtin/packages/libtree/package.py +++ b/var/spack/repos/builtin/packages/libtree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libtree(MakefilePackage, CMakePackage): url = "https://github.com/haampie/libtree/archive/refs/tags/v2.0.0.tar.gz" maintainers("haampie") + license("MIT") + version("master", branch="master") version("3.1.1", sha256="6148436f54296945d22420254dd78e1829d60124bb2f5b9881320a6550f73f5c") version("3.1.0", sha256="8057edb2dd77b0acf6ceab6868741993979dccd41fc41a58bde743f11666d781") diff --git a/var/spack/repos/builtin/packages/libuecc/package.py b/var/spack/repos/builtin/packages/libuecc/package.py index 8e74110781c0b2..8f916905bae261 100644 --- a/var/spack/repos/builtin/packages/libuecc/package.py +++ b/var/spack/repos/builtin/packages/libuecc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class Libuecc(CMakePackage): homepage = "https://github.com/fars/libuecc" url = "https://github.com/fars/libuecc/archive/v7.tar.gz" + license("BSD-2-Clause") + version("7", sha256="465a6584c991c13fddf36700328c44fee9a3baff9025fb5f232b34d003d715e0") version("6", sha256="ad813abd91462a6b10608e51862a65998649651b22ab5d82f920622cc93befd7") diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index e5c7bff2fb6a60..370b4f9d65c1f8 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libunistring(AutotoolsPackage, GNUMirrorPackage): git = "https://git.savannah.gnu.org/git/libunistring.git" maintainers("bernhardkaindl") + license("GPL-2.0-or-later OR LGPL-3.0-or-later") + version("master", branch="master") version("1.1", sha256="827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98") version("1.0", sha256="5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741") diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index b9115455a2a03e..c389cbda7b15e0 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libunwind(AutotoolsPackage): git = "https://github.com/libunwind/libunwind" maintainers("mwkrentel") + license("MIT") + version("master", branch="master") version("1.6-stable", branch="v1.6-stable") version("1.6.2", sha256="4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976") diff --git a/var/spack/repos/builtin/packages/liburing/package.py b/var/spack/repos/builtin/packages/liburing/package.py index 7a7d80139b2eaa..7e2d433a6f6941 100644 --- a/var/spack/repos/builtin/packages/liburing/package.py +++ b/var/spack/repos/builtin/packages/liburing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Liburing(AutotoolsPackage): url = "https://github.com/axboe/liburing/archive/refs/tags/liburing-2.3.tar.gz" git = "https://github.com/axboe/liburing.git" + license("LGPL-2.1-or-later OR MIT") + version("master", branch="master") version("2.3", sha256="60b367dbdc6f2b0418a6e0cd203ee0049d9d629a36706fcf91dfb9428bae23c8") diff --git a/var/spack/repos/builtin/packages/libusb/package.py b/var/spack/repos/builtin/packages/libusb/package.py index c4016299567e16..f51e9690167de9 100644 --- a/var/spack/repos/builtin/packages/libusb/package.py +++ b/var/spack/repos/builtin/packages/libusb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libusb(AutotoolsPackage): url = "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2" git = "https://github.com/libusb/libusb" + license("LGPL-2.1-or-later") + version("master", branch="master") version("1.0.22", sha256="75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157") version("1.0.21", sha256="7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b") diff --git a/var/spack/repos/builtin/packages/libusbmuxd/package.py b/var/spack/repos/builtin/packages/libusbmuxd/package.py index a51b4624c425d2..9a55b019b281bb 100644 --- a/var/spack/repos/builtin/packages/libusbmuxd/package.py +++ b/var/spack/repos/builtin/packages/libusbmuxd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libusbmuxd(AutotoolsPackage): url = "https://www.libimobiledevice.org/downloads/libusbmuxd-1.0.10.tar.bz2" git = "https://git.libimobiledevice.org/libusbmuxd.git" + license("LGPL-2.1-or-later") + version("master", branch="master") version("1.0.10", sha256="1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2") version("1.0.9", sha256="2e3f708a3df30ad7832d2d2389eeb29f68f4e4488a42a20149cc99f4f9223dfc") diff --git a/var/spack/repos/builtin/packages/libuser/package.py b/var/spack/repos/builtin/packages/libuser/package.py index a33d88a97c1a8d..5edc7db485b766 100644 --- a/var/spack/repos/builtin/packages/libuser/package.py +++ b/var/spack/repos/builtin/packages/libuser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libuser(AutotoolsPackage): homepage = "https://pagure.io/libuser" url = "https://releases.pagure.org/libuser/libuser-0.62.tar.xz" + license("LGPL-2.0-or-later") + version("0.62", sha256="a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b") version("0.61", sha256="0a114a52446e12781e2ffdf26f59df0d14e7809c7db5e551d3cf61c4e398751d") version("0.60", sha256="b1f73408ebfee79eb01a47c5879a2cdef6a00b75ee24870de7df1b816ff483eb") diff --git a/var/spack/repos/builtin/packages/libuuid/package.py b/var/spack/repos/builtin/packages/libuuid/package.py index 480b1b1b89dfcb..6fa16449cc8dae 100644 --- a/var/spack/repos/builtin/packages/libuuid/package.py +++ b/var/spack/repos/builtin/packages/libuuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libuv-julia/package.py b/var/spack/repos/builtin/packages/libuv-julia/package.py index ee53bbb26acca0..8e668ca22f8fc2 100644 --- a/var/spack/repos/builtin/packages/libuv-julia/package.py +++ b/var/spack/repos/builtin/packages/libuv-julia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LibuvJulia(AutotoolsPackage): url = "https://github.com/JuliaLang/libuv/archive/refs/heads/julia-uv2-1.44.2.tar.gz" git = "https://github.com/JuliaLang/libuv.git" + license("CC-BY-4.0") + # julia's libuv fork doesn't tag (all?) releases, so we fix commits. version("1.44.3", commit="2723e256e952be0b015b3c0086f717c3d365d97e") version("1.44.2", commit="e6f0e4900e195c8352f821abe2b3cffc3089547b") diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index 5c838db449a850..39bb4ee62fcce3 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libuv(AutotoolsPackage): list_url = "https://dist.libuv.org/dist" list_depth = 1 + license("MIT") + version("1.46.0", sha256="94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094") version("1.45.0", sha256="3793d8c0d6fa587721d010d0555b7e82443fd4e8b3c91e529eb6607592f52b87") version("1.44.2", sha256="8ff28f6ac0d6d2a31d2eeca36aff3d7806706c7d3f5971f5ee013ddb0bdd2e9e") diff --git a/var/spack/repos/builtin/packages/libvdwxc/package.py b/var/spack/repos/builtin/packages/libvdwxc/package.py index 81384e8f06fd22..f83ccd52ee8b76 100644 --- a/var/spack/repos/builtin/packages/libvdwxc/package.py +++ b/var/spack/repos/builtin/packages/libvdwxc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libvdwxc(AutotoolsPackage): homepage = "https://libvdwxc.gitlab.io/libvdwxc/" url = "https://launchpad.net/libvdwxc/stable/0.4.0/+download/libvdwxc-0.4.0.tar.gz" + license("GPL-3.0-or-later") + version("0.4.0", sha256="3524feb5bb2be86b4688f71653502146b181e66f3f75b8bdaf23dd1ae4a56b33") variant("mpi", default=True, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/libverto/package.py b/var/spack/repos/builtin/packages/libverto/package.py index e266ba109f7b8b..0698c553e1163d 100644 --- a/var/spack/repos/builtin/packages/libverto/package.py +++ b/var/spack/repos/builtin/packages/libverto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libverto(AutotoolsPackage): homepage = "https://github.com/latchset/libverto/" url = "https://github.com/latchset/libverto/archive/0.3.1.tar.gz" + license("MIT") + version("0.3.2", sha256="b1005607e58961bf74945b87f36b8bdb94266a692685998b09a63190e3994dc1") version("0.3.1", sha256="02c7e679577ae7608ed35fe740bec2ef8c58142344cef247f2797ef788d41adc") version("0.3.0", sha256="fad201d9d0ac1abf1283d2d78bb3a615f72cfd2a2141673589d93c0cb762b3f1") diff --git a/var/spack/repos/builtin/packages/libvips/package.py b/var/spack/repos/builtin/packages/libvips/package.py index 95f7cf08ae83e5..f5e64f6a9b44ba 100644 --- a/var/spack/repos/builtin/packages/libvips/package.py +++ b/var/spack/repos/builtin/packages/libvips/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libvips(AutotoolsPackage): url = "https://github.com/libvips/libvips/releases/download/v8.9.0/vips-8.9.0.tar.gz" git = "https://github.com/libvips/libvips.git" + license("LGPL-2.1-or-later") + version("8.13.3", sha256="4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c") version("8.10.5", sha256="a4eef2f5334ab6dbf133cd3c6d6394d5bdb3e76d5ea4d578b02e1bc3d9e1cfd8") version("8.9.1", sha256="45633798877839005016c9d3494e98dee065f5cb9e20f4552d3b315b8e8bce91") @@ -32,6 +34,7 @@ class Libvips(AutotoolsPackage): # TODO: Add more variants! + depends_on("pkgconfig", type="build") depends_on("glib") depends_on("expat") diff --git a/var/spack/repos/builtin/packages/libvorbis/package.py b/var/spack/repos/builtin/packages/libvorbis/package.py index cfd0420ca36bd8..922e9c57e9bb01 100644 --- a/var/spack/repos/builtin/packages/libvorbis/package.py +++ b/var/spack/repos/builtin/packages/libvorbis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Libvorbis(AutotoolsPackage): homepage = "https://xiph.org/vorbis/" url = "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz" + license("BSD-3-Clause") + version("1.3.7", sha256="0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab") version("1.3.5", sha256="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce") diff --git a/var/spack/repos/builtin/packages/libvori/package.py b/var/spack/repos/builtin/packages/libvori/package.py index 5bb97e86f6b3ef..47fb3be91a4b59 100644 --- a/var/spack/repos/builtin/packages/libvori/package.py +++ b/var/spack/repos/builtin/packages/libvori/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,16 @@ class Libvori(CMakePackage): maintainers("dev-zero", "mtaillefumier") + license("LGPL-3.0-only") + version("220621", sha256="1cfa98c564814bddacf1c0e7f11582137d758668f6307e6eb392c72317984c14") version("210412", sha256="331886aea9d093d8c44b95a07fab13d47f101b1f94a0640d7d670eb722bf90ac") version("201229", sha256="da0afb292c94f8de2aaebfd0b692d15ffd86083cb8a48478b07ca93823decc06") version("201224", sha256="16f6c49eaa17ea23868925dbaae2eca71bdacbe50418c97d6c55e05728038f31") version("201217", sha256="6ad456ed6ca5d28cadcc0d90eabe8fff5caa77b99f12764323de5e3ae21cddf5") + + variant("pic", default=True, description="Compile the library with position independent code") + + def cmake_args(self): + args = [self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")] + return args diff --git a/var/spack/repos/builtin/packages/libvpx/package.py b/var/spack/repos/builtin/packages/libvpx/package.py index 1ee76727a60304..063c76c9bc1083 100644 --- a/var/spack/repos/builtin/packages/libvpx/package.py +++ b/var/spack/repos/builtin/packages/libvpx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libvpx(AutotoolsPackage): homepage = "https://chromium.googlesource.com/webm/libvpx" url = "https://github.com/webmproject/libvpx/archive/refs/tags/v1.10.0.tar.gz" + license("BSD-3-Clause") + version("1.10.0", sha256="85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a") variant("pic", default=True, description="Produce position-independent code (for shared libs)") diff --git a/var/spack/repos/builtin/packages/libvterm/package.py b/var/spack/repos/builtin/packages/libvterm/package.py index 0954967bd61bb4..2c7481fb959a34 100644 --- a/var/spack/repos/builtin/packages/libvterm/package.py +++ b/var/spack/repos/builtin/packages/libvterm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class Libvterm(MakefilePackage): homepage = "http://www.leonerd.org.uk/code/libvterm/" url = "http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz" + license("MIT") + + version("0.3.3", sha256="09156f43dd2128bd347cbeebe50d9a571d32c64e0cf18d211197946aff7226e0") version("0.3.1", sha256="25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397") version("0.3", sha256="61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358") version("0.2", sha256="4c5150655438cfb8c57e7bd133041140857eb04defd0e544521c0e469258e105") diff --git a/var/spack/repos/builtin/packages/libwebp/package.py b/var/spack/repos/builtin/packages/libwebp/package.py index a77c259c692717..f74efe9a11b14b 100644 --- a/var/spack/repos/builtin/packages/libwebp/package.py +++ b/var/spack/repos/builtin/packages/libwebp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libwebp(AutotoolsPackage): homepage = "https://developers.google.com/speed/webp/" url = "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.3.tar.gz" + license("BSD-3-Clause") + version("1.2.4", sha256="7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df") version("1.2.3", sha256="f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9") version("1.2.2", sha256="7656532f837af5f4cec3ff6bafe552c044dc39bf453587bd5b77450802f4aee6") diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py index db15138ff6c17e..59fae25a809f4d 100644 --- a/var/spack/repos/builtin/packages/libwebsockets/package.py +++ b/var/spack/repos/builtin/packages/libwebsockets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libwebsockets(CMakePackage): url = "https://github.com/warmcat/libwebsockets/archive/v2.1.0.tar.gz" maintainers("ax3l") + license("MIT") + version("2.2.1", sha256="e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2") version("2.1.1", sha256="96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d") version("2.1.0", sha256="bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66") diff --git a/var/spack/repos/builtin/packages/libwhich/package.py b/var/spack/repos/builtin/packages/libwhich/package.py index fece55039ddb5b..37ec3fc115ed3f 100644 --- a/var/spack/repos/builtin/packages/libwhich/package.py +++ b/var/spack/repos/builtin/packages/libwhich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libwhich(Package): maintainers("dmageeLANL") + license("MIT") + version("master", branch="master") version("1.1.0", sha256="f1c30bf7396859ad437a5db74e9e328fb4b4e1379457121e28a3524b1e3a0b3f") version("1.0.0", sha256="61d5d643d4cbd4b340b9b48922e1b4fd2a35729b7cfdcc7283aab82a6f742a6c") diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py index 1fa600cd5820ba..dd533742c1bcf2 100644 --- a/var/spack/repos/builtin/packages/libwindowswm/package.py +++ b/var/spack/repos/builtin/packages/libwindowswm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libwindowswm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libWindowsWM" xorg_mirror_path = "lib/libWindowsWM-1.0.1.tar.gz" + license("MIT") + version("1.0.1", sha256="94f9c0add3bad38ebd84bc43d854207c4deaaa74fb15339276e022546124b98a") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libwmf/package.py b/var/spack/repos/builtin/packages/libwmf/package.py index 040bf9dc9514eb..63d32c1b20f531 100644 --- a/var/spack/repos/builtin/packages/libwmf/package.py +++ b/var/spack/repos/builtin/packages/libwmf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libwmf(AutotoolsPackage): parallel = False + license("LGPL-2.0-or-later") + version("0.2.12", sha256="464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2") version("0.2.11", sha256="e2a2664afd5abc71a42be7ad3c200f64de2b8889bf088eac1d32e205ce843803") diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 828ba55279fdf7..d1d59561c27bc8 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,12 +12,30 @@ class Libx11(AutotoolsPackage, XorgPackage): homepage = "https://www.x.org/" xorg_mirror_path = "lib/libX11-1.6.7.tar.gz" + license("X11") + + maintainers("wdconinc") + + version("1.8.7", sha256="793ebebf569f12c864b77401798d38814b51790fce206e01a431e5feb982e20b") + version("1.8.6", sha256="5ff0d26c94d82ebb94a944b9f1f55cd01b9713fd461fe93f62f3527ce14ad94e") + version("1.8.5", sha256="d84a35c324d5a1724692eafc1ed76f1689c833021e0062933773ec437f91a56b") version("1.8.4", sha256="efd3a3a43c1f177edc2c205bedb0719b6648203595e54c0b83a32576aeaca7cd") + version("1.8.3", sha256="5a55945b7da86ce94733faf229342f75867e9c1090685f47f4d82b7f88602a14") + version("1.8.2", sha256="f1bc56187bee0f830e1179ac5068ac93b78c51ace94eb27702ffb2efd116587b") + version("1.8.1", sha256="d52f0a7c02a45449f37b0831d99ff936d92eb4ce8b4c97dc17a63cea79ce5a76") + version("1.8", sha256="68e0a30c4248b9f41492891a4b49672c3b0c59e84c4868144f03eef01ebc5eea") + version("1.7.5", sha256="78992abcd2bfdebe657699203ad8914e7ae77025175460e04a1045387192a978") + version("1.7.4", sha256="252fb028524caa878e6507729efc115d7434f867f6549fe087e7869a66adfa2c") + version("1.7.3.1", sha256="d9d2c45f89687cfc915a766aa91f01843ae97607baa1d1027fd208f8e014f71e") + version("1.7.3", sha256="029acf61e7e760a3150716b145a58ce5052ee953e8cccc8441d4f550c420debb") + version("1.7.2", sha256="2c26ccd08f43a6214de89110554fbe97c71692eeb7e7d4829f3004ae6fafd2c0") + version("1.7.1", sha256="7e6d4120696e90995e66ac24f1042d4f11c14fbefd7aab48de0ed1fe3c4b922b") version("1.7.0", sha256="c48ec61785ec68fc6a9a6aca0a9578393414fe2562e3cc9cca30234345c7b6ac") version("1.6.7", sha256="f62ab88c2a87b55e1dc338726a55bb6ed8048084fe6a3294a7ae324ca45159d1") version("1.6.5", sha256="3abce972ba62620611fab5b404dafb852da3da54e7c287831c30863011d28fb3") version("1.6.3", sha256="0b03b9d22f4c9e59b4ba498f294e297f013cae27050dfa0f3496640200db5376") + depends_on("libxcb@1.11.1:", when="@1.6.4:") depends_on("libxcb@1.1.92:") depends_on("xproto@7.0.25:", when="@1.7.0:") diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py index f29d50343b1042..491a67c1aa91dd 100644 --- a/var/spack/repos/builtin/packages/libxau/package.py +++ b/var/spack/repos/builtin/packages/libxau/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,13 @@ class Libxau(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXau/" xorg_mirror_path = "lib/libXau-1.0.8.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.0.11", sha256="3a321aaceb803577a4776a5efe78836eb095a9e44bbc7a465d29463e1a14f189") + version("1.0.10", sha256="51a54da42475d4572a0b59979ec107c27dacf6c687c2b7b04e5cf989a7c7e60c") + version("1.0.9", sha256="1f123d8304b082ad63a9e89376400a3b1d4c29e67e3ea07b3f659cccca690eea") version("1.0.8", sha256="c343b4ef66d66a6b3e0e27aa46b37ad5cab0f11a5c565eafb4a1c7590bc71d7b") depends_on("xproto") diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py index 8a12c5a3a89ee7..4d5c54e5881f24 100644 --- a/var/spack/repos/builtin/packages/libxaw/package.py +++ b/var/spack/repos/builtin/packages/libxaw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,12 @@ class Libxaw(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXaw" xorg_mirror_path = "lib/libXaw-1.0.13.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.0.15", sha256="ca8a613884c922985202075b3cc8ee8821bfa83a5eb066189ae3cca131e63972") + version("1.0.14", sha256="59cfed2712cc80bbfe62dd1aacf24f58d74a76dd08329a922077b134a8d8048f") version("1.0.13", sha256="7e74ac3e5f67def549722ff0333d6e6276b8becd9d89615cda011e71238ab694") version("1.0.12", sha256="e32abc68d759ffb643f842329838f8b6c157e31023cc91059aabf730e7222ad2") diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py index 50d4694965bb9b..cf70c53b255e5d 100644 --- a/var/spack/repos/builtin/packages/libxaw3d/package.py +++ b/var/spack/repos/builtin/packages/libxaw3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,10 @@ class Libxaw3d(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXaw3d" xorg_mirror_path = "lib/libXaw3d-1.6.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + version("1.6.4", sha256="09fecfdab9d7d5953567883e2074eb231bc7a122a06e5055f9c119090f1f76a7") version("1.6.2", sha256="847dab01aeac1448916e3b4edb4425594b3ac2896562d9c7141aa4ac6c898ba9") diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py index 1652ae772aeeba..720095b1904efd 100644 --- a/var/spack/repos/builtin/packages/libxc/package.py +++ b/var/spack/repos/builtin/packages/libxc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libxc(AutotoolsPackage, CudaPackage): homepage = "https://tddft.org/programs/libxc/" url = "https://gitlab.com/libxc/libxc/-/archive/6.1.0/libxc-6.1.0.tar.gz" + license("MPL-2.0-no-copyleft-exception") + version("6.2.2", sha256="3b0523924579cf494cafc6fea92945257f35692b004217d3dfd3ea7ca780e8dc") version("6.2.1", sha256="b5f3b4514db6bc4ccda1da90ac6176ea1f82e12241cc66427c58cbc4a5197b9b") version("6.2.0", sha256="3d25878782b5f94e7e4d41bd6de27f98983584cd0be0c65e69a9ada986b56b4d") diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 1db0f5de5a1840..1f11a79ef9abb4 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,12 @@ class Libxcb(AutotoolsPackage): homepage = "https://xcb.freedesktop.org/" url = "https://xorg.freedesktop.org/archive/individual/lib/libxcb-1.14.tar.xz" + license("MIT") + + maintainers("wdconinc") + + version("1.16", sha256="4348566aa0fbf196db5e0a576321c65966189210cb51328ea2bb2be39c711d71") + version("1.15", sha256="cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059") version("1.14", sha256="a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34") version("1.13", sha256="0bb3cfd46dbd90066bf4d7de3cad73ec1024c7325a4a0cbf5f4a0d4fa91155fb") @@ -24,6 +30,7 @@ class Libxcb(AutotoolsPackage): # libxcb 1.X requires xcb-proto >= 1.X depends_on("xcb-proto") + depends_on("xcb-proto@1.15:", when="@1.15") depends_on("xcb-proto@1.14:", when="@1.14") depends_on("xcb-proto@1.13:", when="@1.13") diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py index 0d892f5abb3384..8b4dd5d551e56b 100644 --- a/var/spack/repos/builtin/packages/libxcomposite/package.py +++ b/var/spack/repos/builtin/packages/libxcomposite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,10 @@ class Libxcomposite(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXcomposite" xorg_mirror_path = "lib/libXcomposite-0.4.4.tar.gz" + license("MIT") + + maintainers("wdconinc") + version("0.4.6", sha256="3599dfcd96cd48d45e6aeb08578aa27636fa903f480f880c863622c2b352d076") version("0.4.4", sha256="83c04649819c6f52cda1b0ce8bcdcc48ad8618428ad803fb07f20b802f1bdad1") @@ -20,5 +24,6 @@ class Libxcomposite(AutotoolsPackage, XorgPackage): depends_on("libxfixes") depends_on("fixesproto@0.4:") depends_on("compositeproto@0.4:") + depends_on("xproto@7.0.22:", when="@0.4.6") depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") diff --git a/var/spack/repos/builtin/packages/libxcrypt/package.py b/var/spack/repos/builtin/packages/libxcrypt/package.py index 428720add35372..fe641d3d3e40de 100644 --- a/var/spack/repos/builtin/packages/libxcrypt/package.py +++ b/var/spack/repos/builtin/packages/libxcrypt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,7 @@ class Libxcrypt(AutotoolsPackage): homepage = "https://github.com/besser82/libxcrypt" url = "https://github.com/besser82/libxcrypt/releases/download/v4.4.30/libxcrypt-4.4.30.tar.xz" + tags = ["build-tools"] maintainers("haampie") def url_for_version(self, version): @@ -20,6 +21,8 @@ def url_for_version(self, version): version, version ) + license("LGPL-2.1-or-later") + version("4.4.35", sha256="a8c935505b55f1df0d17f8bfd59468c7c6709a1d31831b0f8e3e045ab8fd455d") version("4.4.34", sha256="bb3f467af21c48046ce662186eb2ddf078ca775c441fdf1c3628448a3833a230") version("4.4.33", sha256="e87acf9c652c573a4713d5582159f98f305d56ed5f754ce64f57d4194d6b3a6f") diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py index 796c68d0d39723..9f6471a1090a34 100644 --- a/var/spack/repos/builtin/packages/libxcursor/package.py +++ b/var/spack/repos/builtin/packages/libxcursor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,10 @@ class Libxcursor(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXcursor" xorg_mirror_path = "lib/libXcursor-1.1.14.tar.gz" + license("MIT") + + maintainers("wdconinc") + version("1.2.1", sha256="77f96b9ad0a3c422cfa826afabaf1e02b9bfbfc8908c5fa1a45094faad074b98") version("1.1.14", sha256="be0954faf274969ffa6d95b9606b9c0cfee28c13b6fc014f15606a0c8b05c17b") diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py index 36a04e20d7b662..0090ce624b8415 100644 --- a/var/spack/repos/builtin/packages/libxdamage/package.py +++ b/var/spack/repos/builtin/packages/libxdamage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class Libxdamage(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXdamage" xorg_mirror_path = "lib/libXdamage-1.1.4.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.6", sha256="2afcc139eb6eb926ffe344494b1fc023da25def42874496e6e6d3aa8acef8595") + version("1.1.5", sha256="630ec53abb8c2d6dac5cd9f06c1f73ffb4a3167f8118fdebd77afd639dbc2019") version("1.1.4", sha256="4bb3e9d917f5f593df2277d452926ee6ad96de7b7cd1017cbcf4579fe5d3442b") depends_on("libxfixes") diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py index e7a7e51a4003e9..d72a1ac61e5280 100644 --- a/var/spack/repos/builtin/packages/libxdmcp/package.py +++ b/var/spack/repos/builtin/packages/libxdmcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,12 @@ class Libxdmcp(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXdmcp" xorg_mirror_path = "lib/libXdmcp-1.1.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + version("1.1.4", sha256="55041a8ff8992ab02777478c4b19c249c0f8399f05a752cb4a1a868a9a0ccb9a") + version("1.1.3", sha256="2ef9653d32e09d1bf1b837d0e0311024979653fe755ad3aaada8db1aa6ea180c") version("1.1.2", sha256="6f7c7e491a23035a26284d247779174dedc67e34e93cc3548b648ffdb6fc57c0") depends_on("xproto") diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py index 4293ac973f987d..2dd724510c0273 100644 --- a/var/spack/repos/builtin/packages/libxevie/package.py +++ b/var/spack/repos/builtin/packages/libxevie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libxevie(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXevie" xorg_mirror_path = "lib/libXevie-1.0.3.tar.gz" + license("MIT") + version("1.0.3", sha256="3759bb1f7fdade13ed99bfc05c0717bc42ce3f187e7da4eef80beddf5e461258") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index 3e713e33188a46..b167d90d3bc921 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class Libxext(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXext" xorg_mirror_path = "lib/libXext-1.3.3.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.3.5", sha256="1a3dcda154f803be0285b46c9338515804b874b5ccc7a2b769ab7fd76f1035bd") + version("1.3.4", sha256="8ef0789f282826661ff40a8eef22430378516ac580167da35cc948be9041aac1") version("1.3.3", sha256="eb0b88050491fef4716da4b06a4d92b4fc9e76f880d6310b2157df604342cfe5") depends_on("libx11@1.6:") diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py index 8b45a7249108c7..26f4a1204b6487 100644 --- a/var/spack/repos/builtin/packages/libxfixes/package.py +++ b/var/spack/repos/builtin/packages/libxfixes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,12 +13,21 @@ class Libxfixes(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXfixes" xorg_mirror_path = "lib/libXfixes-5.0.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + + # Newer versions are blocked by https://github.com/spack/spack/issues/41688 + # version("6.0.1", sha256="e69eaa321173c748ba6e2f15c7cf8da87f911d3ea1b6af4b547974aef6366bec") + # version("6.0.0", sha256="82045da5625350838390c9440598b90d69c882c324ca92f73af9f0e992cb57c7") + version("5.0.3", sha256="9ab6c13590658501ce4bd965a8a5d32ba4d8b3bb39a5a5bc9901edffc5666570") version("5.0.2", sha256="ad8df1ecf3324512b80ed12a9ca07556e561b14256d94216e67a68345b23c981") depends_on("libx11@1.6:") depends_on("xproto") - depends_on("fixesproto@5.0:") + depends_on("fixesproto@5.0:", when="@5") + # depends_on("fixesproto@6.0:", when="@6") depends_on("xextproto") depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py index 68e49939955c8a..7647d81fdbcfb0 100644 --- a/var/spack/repos/builtin/packages/libxfont/package.py +++ b/var/spack/repos/builtin/packages/libxfont/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libxfont(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXfont" xorg_mirror_path = "lib/libXfont-1.5.2.tar.gz" + license("MIT") + version("1.5.4", sha256="59be6eab53f7b0feb6b7933c11d67d076ae2c0fd8921229c703fc7a4e9a80d6e") version("1.5.2", sha256="a7350c75171d03d06ae0d623e42240356d6d3e1ac7dfe606639bf20f0d653c93") diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py index a4d15ed1c00700..417dfd23239e3d 100644 --- a/var/spack/repos/builtin/packages/libxfont2/package.py +++ b/var/spack/repos/builtin/packages/libxfont2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libxfont2(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXfont" xorg_mirror_path = "lib/libXfont2-2.0.1.tar.gz" + license("MIT") + version("2.0.6", sha256="a944df7b6837c8fa2067f6a5fc25d89b0acc4011cd0bc085106a03557fb502fc") version("2.0.1", sha256="381b6b385a69343df48a082523c856aed9042fbbc8ee0a6342fb502e4321230a") diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py index 61ba14ef51db81..ea1d7486708891 100644 --- a/var/spack/repos/builtin/packages/libxfontcache/package.py +++ b/var/spack/repos/builtin/packages/libxfontcache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libxfontcache(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXfontcache" xorg_mirror_path = "lib/libXfontcache-1.0.5.tar.gz" + license("BSD-2-Clause") + version("1.0.5", sha256="fdba75307a0983d2566554e0e9effa7079551f1b7b46e8de642d067998619659") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py index 9fa5ea29df0ef0..d4ff5a4461e060 100644 --- a/var/spack/repos/builtin/packages/libxft/package.py +++ b/var/spack/repos/builtin/packages/libxft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,16 @@ class Libxft(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXft" xorg_mirror_path = "lib/libXft-2.3.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("2.3.8", sha256="32e48fe2d844422e64809e4e99b9d8aed26c1b541a5acf837c5037b8d9f278a8") + version("2.3.7", sha256="75b4378644f5df3a15f684f8f0b5ff1324d37aacd5a381f3b830a2fbe985f660") + version("2.3.6", sha256="b7e59f69e0bbabe9438088775f7e5a7c16a572e58b11f9722519385d38192df5") + version("2.3.5", sha256="f7324aa0664115223672bae55086f3a9ae8f6ad4cdca87a8dd620295ee459e1a") + version("2.3.4", sha256="1eca71bec9cb483165ce1ab94f5cd3036269f5268651df6a2d99c4a7ab644d79") + version("2.3.3", sha256="3c3cf88b1a96e49a3d87d67d9452d34b6e25e96ae83959b8d0a980935014d701") version("2.3.2", sha256="26cdddcc70b187833cbe9dc54df1864ba4c03a7175b2ca9276de9f05dce74507") depends_on("freetype@2.1.6:") diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py index 4fda82a5722fe9..c2e4f1b37c0854 100644 --- a/var/spack/repos/builtin/packages/libxi/package.py +++ b/var/spack/repos/builtin/packages/libxi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,17 @@ class Libxi(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXi" xorg_mirror_path = "lib/libXi-1.7.6.tar.gz" + license("MIT AND X11") + + maintainers("wdconinc") + + # Newer versions are blocked by https://github.com/spack/spack/issues/41688 + # version("1.8.1", sha256="3b5f47c223e4b63d7f7fe758886b8bf665b20a7edb6962c423892fd150e326ea") + # version("1.8", sha256="c80fd200a1190e4406bb4cc6958839d9651638cb47fa546a595d4bebcd3b9e2d") + version("1.7.10", sha256="b51e106c445a49409f3da877aa2f9129839001b24697d75a54e5c60507e9a5e3") + version("1.7.9", sha256="463cc5370191404bc0f8a450fdbf6d9159efbbf274e5e0f427a60191fed9cf4b") + version("1.7.8", sha256="7466d0c626a9cc2e53fd78c811815e82924cd7582236a82401df3d282a9c2889") + version("1.7.7", sha256="501f49e9c85609da17614d711aa4931fd128011042ff1cae53a16ce03e51ff5e") version("1.7.6", sha256="4e88fa7decd287e58140ea72238f8d54e4791de302938c83695fc0c9ac102b7e") depends_on("pkgconfig", type="build") @@ -21,7 +32,8 @@ class Libxi(AutotoolsPackage, XorgPackage): depends_on("fixesproto@5.0:") depends_on("xproto@7.0.13:") depends_on("xextproto@7.0.3:") - depends_on("inputproto@2.2.99.1:") + depends_on("inputproto@2.2.99.1:", when="@1.7:") + # depends_on("inputproto@2.3.99.1:", when="@1.8:") @property def libs(self): diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py index 90004f9d9c1612..ac6fad3a23f283 100644 --- a/var/spack/repos/builtin/packages/libxinerama/package.py +++ b/var/spack/repos/builtin/packages/libxinerama/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class Libxinerama(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXinerama" xorg_mirror_path = "lib/libXinerama-1.1.3.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.5", sha256="2efa855cb42dc620eff3b77700d8655695e09aaa318f791f201fa60afa72b95c") + version("1.1.4", sha256="64de45e18cc76b8e703cb09b3c9d28bd16e3d05d5cd99f2d630de2d62c3acc18") version("1.1.3", sha256="0ba243222ae5aba4c6a3d7a394c32c8b69220a6872dbb00b7abae8753aca9a44") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxkbcommon/package.py b/var/spack/repos/builtin/packages/libxkbcommon/package.py index 2ab85c99b37812..2da7b2e9cc75a4 100644 --- a/var/spack/repos/builtin/packages/libxkbcommon/package.py +++ b/var/spack/repos/builtin/packages/libxkbcommon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Libxkbcommon(MesonPackage, AutotoolsPackage): conditional("meson", when="@0.9:"), conditional("autotools", when="@:0.8"), default="meson" ) + license("MIT") + version("1.5.0", sha256="560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017") version("1.4.1", sha256="943c07a1e2198026d8102b17270a1f406e4d3d6bbc4ae105b9e1b82d7d136b39") version("1.4.0", sha256="106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031") diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py index 4ad1d62c3ff011..2b8f39215a5dd2 100644 --- a/var/spack/repos/builtin/packages/libxkbfile/package.py +++ b/var/spack/repos/builtin/packages/libxkbfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,13 @@ class Libxkbfile(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libxkbfile" xorg_mirror_path = "lib/libxkbfile-1.0.9.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.2", sha256="d1a7e659bc7ae1aa1fc1ecced261c734df5ad5d86af1ef7a946be0e2d841e51d") + version("1.1.1", sha256="87faee6d4873c5631e8bb53e85134084b862185da682de8617f08ca18d82e216") + version("1.1.0", sha256="2a92adda3992aa7cbad758ef0b8dfeaedebb49338b772c64ddf369d78c1c51d3") version("1.0.9", sha256="95df50570f38e720fb79976f603761ae6eff761613eb56f258c3cb6bab4fd5e3") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py index 8b389d3af7227a..4167ed1629e851 100644 --- a/var/spack/repos/builtin/packages/libxkbui/package.py +++ b/var/spack/repos/builtin/packages/libxkbui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index dd598cdbc37187..122e57e006f9b7 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -1,9 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import spack.builder from spack.build_systems import autotools, nmake from spack.package import * @@ -25,6 +26,8 @@ def url_for_version(self, version): return url.format(version.up_to(2), version) return "http://xmlsoft.org/sources/libxml2-{0}.tar.gz".format(version) + license("MIT") + version("2.10.3", sha256="5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c") version("2.10.2", sha256="d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265") version("2.10.1", sha256="21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8") @@ -220,7 +223,7 @@ def test_xmllint(self): xmllint("--dtdvalid", dtd_path, data_dir.join("info.xml")) -class RunAfter: +class BaseBuilder(metaclass=spack.builder.PhaseCallbacksMeta): @run_after("install") @on_package_attributes(run_tests=True) def import_module_test(self): @@ -229,7 +232,7 @@ def import_module_test(self): python("-c", "import libxml2") -class AutotoolsBuilder(autotools.AutotoolsBuilder, RunAfter): +class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder): def configure_args(self): spec = self.spec @@ -255,7 +258,7 @@ def configure_args(self): return args -class NMakeBuilder(nmake.NMakeBuilder, RunAfter): +class NMakeBuilder(BaseBuilder, nmake.NMakeBuilder): phases = ("configure", "build", "install") @property diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py index 72aeb72e4c400f..723f326fee1977 100644 --- a/var/spack/repos/builtin/packages/libxmu/package.py +++ b/var/spack/repos/builtin/packages/libxmu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,10 @@ class Libxmu(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXmu" xorg_mirror_path = "lib/libXmu-1.1.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + version("1.1.4", sha256="3091d711cdc1d8ea0f545a13b90d1464c3c3ab64778fd121f0d789b277a80289") version("1.1.2", sha256="e5fd4bacef068f9509b8226017205040e38d3fba8d2de55037200e7176c13dba") diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py index 4d19aa4c3cd662..03513df5ecb48c 100644 --- a/var/spack/repos/builtin/packages/libxp/package.py +++ b/var/spack/repos/builtin/packages/libxp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class Libxp(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXp" xorg_mirror_path = "lib/libXp-1.0.3.tar.gz" + maintainers("wdconinc") + + version("1.0.4", sha256="05e46af1ccb68f1752cca5879774a4fb9bf3b19fe088eb745034956e0c6fadba") version("1.0.3", sha256="f6b8cc4ef05d3eafc9ef5fc72819dd412024b4ed60197c0d5914758125817e9c") depends_on("libx11@1.6:") diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index a0dfa0617b3802..2943749de8f8ef 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,15 @@ class Libxpm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXpm" xorg_mirror_path = "lib/libXpm-3.5.12.tar.gz" + license("X11") + + maintainers("wdconinc") + + version("3.5.17", sha256="959466c7dfcfcaa8a65055bfc311f74d4c43d9257900f85ab042604d286df0c6") + version("3.5.16", sha256="43a70e6f9b67215fb223ca270d83bdcb868c513948441d5b781ea0765df6bfb4") + version("3.5.15", sha256="2a9bd419e31270593e59e744136ee2375ae817322447928d2abb6225560776f9") + version("3.5.14", sha256="18861cc64dfffc0e7fe317b0eeb935adf64858fd5d82004894c4906d909dabf8") + version("3.5.13", sha256="e3dfb0fb8c1f127432f2a498c7856b37ce78a61e8da73f1aab165a73dd97ad00") version("3.5.12", sha256="2523acc780eac01db5163267b36f5b94374bfb0de26fc0b5a7bee76649fd8501") version("3.5.11", sha256="53ddf924441b7ed2de994d4934358c13d9abf4828b1b16e1255ade5032b31df7") version("3.5.10", sha256="f73f06928a140fd2090c439d1d55c6682095044495af6bf886f8e66cf21baee5") @@ -23,6 +32,7 @@ class Libxpm(AutotoolsPackage, XorgPackage): depends_on("libx11") depends_on("xproto") + depends_on("ncompress", when="@3.5.15") depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py index fdaa17f636bdd1..e17ca584f9bb89 100644 --- a/var/spack/repos/builtin/packages/libxpresent/package.py +++ b/var/spack/repos/builtin/packages/libxpresent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,11 @@ class Libxpresent(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXpresent/" xorg_mirror_path = "lib/libXpresent-1.0.0.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.0.1", sha256="8ebf8567a8f6afe5a64275a2ecfd4c84e957970c27299d964350f60be9f3541d") version("1.0.0", sha256="92f1bdfb67ae2ffcdb25ad72c02cac5e4912dc9bc792858240df1d7f105946fa") depends_on("libx11", type="link") diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py index 34382355b10a77..990e29e18f8046 100644 --- a/var/spack/repos/builtin/packages/libxprintapputil/package.py +++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py index f440b0cfac4b06..c23f59de90922b 100644 --- a/var/spack/repos/builtin/packages/libxprintutil/package.py +++ b/var/spack/repos/builtin/packages/libxprintutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py index 828542cc388cc2..3f476394825ab2 100644 --- a/var/spack/repos/builtin/packages/libxrandr/package.py +++ b/var/spack/repos/builtin/packages/libxrandr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,11 @@ class Libxrandr(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXrandr" xorg_mirror_path = "lib/libXrandr-1.5.0.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.5.4", sha256="c72c94dc3373512ceb67f578952c5d10915b38cc9ebb0fd176a49857b8048e22") version("1.5.3", sha256="3ad316c1781fe2fe22574b819e81f0eff087a8560377f521ba932238b41b251f") version("1.5.0", sha256="1b594a149e6b124aab7149446f2fd886461e2935eca8dca43fe83a70cf8ec451") diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py index 32fbf86354c140..ee72890dd4b1fe 100644 --- a/var/spack/repos/builtin/packages/libxrender/package.py +++ b/var/spack/repos/builtin/packages/libxrender/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,11 @@ class Libxrender(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXrender" xorg_mirror_path = "lib/libXrender-0.9.10.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("0.9.11", sha256="6aec3ca02e4273a8cbabf811ff22106f641438eb194a12c0ae93c7e08474b667") version("0.9.10", sha256="770527cce42500790433df84ec3521e8bf095dfe5079454a92236494ab296adf") version("0.9.9", sha256="beeac64ff8d225f775019eb7c688782dee9f4cc7b412a65538f8dde7be4e90fe") diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py index 91b7757659cf20..1b3c88f3adff79 100644 --- a/var/spack/repos/builtin/packages/libxres/package.py +++ b/var/spack/repos/builtin/packages/libxres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,12 +12,21 @@ class Libxres(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXRes" xorg_mirror_path = "lib/libXres-1.0.7.tar.gz" + license("custom") + + maintainers("wdconinc") + + version("1.2.2", sha256="8abce597ced4a7ab89032aee91f6f784d9960adc772b2b59f17e515cd4127950") + version("1.2.1", sha256="918fb33c3897b389a1fbb51571c5c04c6b297058df286d8b48faa5af85e88bcc") + version("1.2.0", sha256="5b62feee09f276d74054787df030fceb41034de84174abec6d81c591145e043a") version("1.0.7", sha256="488c9fa14b38f794d1f019fe62e6b06514a39f1a7538e55ece8faf22482fefcd") depends_on("libx11") depends_on("libxext") depends_on("xextproto") - depends_on("resourceproto@1.0:") + depends_on("resourceproto@1.0:", when="@1.0") + depends_on("resourceproto@1.2:", when="@1.2") + depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py index f50da4df405a6c..9fbf54120b79b5 100644 --- a/var/spack/repos/builtin/packages/libxscrnsaver/package.py +++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class Libxscrnsaver(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXScrnSaver" xorg_mirror_path = "lib/libXScrnSaver-1.2.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.2.4", sha256="0656b2630475104d6df75d91ebb8e0153e61d14e9871ef1f403bcda4a62a838a") + version("1.2.3", sha256="4f74e7e412144591d8e0616db27f433cfc9f45aae6669c6c4bb03e6bf9be809a") version("1.2.2", sha256="e12ba814d44f7b58534c0d8521e2d4574f7bf2787da405de4341c3b9f4cc8d96") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py index 1607ab69d7c54d..fa05f7ee5965b3 100644 --- a/var/spack/repos/builtin/packages/libxshmfence/package.py +++ b/var/spack/repos/builtin/packages/libxshmfence/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libxshmfence(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libxshmfence/" xorg_mirror_path = "lib/libxshmfence-1.3.tar.bz2" + license("MIT") + version("1.3", sha256="b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7") version("1.2", sha256="d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c") diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index 0680d47dea444c..102d5d2d34b620 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Libxslt(AutotoolsPackage): homepage = "http://www.xmlsoft.org/XSLT/index.html" url = "http://xmlsoft.org/sources/libxslt-1.1.32.tar.gz" + license("X11") + version("1.1.33", sha256="8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8") version("1.1.32", sha256="526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460") version("1.1.29", sha256="b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce") diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py index 4de81dace46dd2..71e60f77032ff0 100644 --- a/var/spack/repos/builtin/packages/libxsmm/package.py +++ b/var/spack/repos/builtin/packages/libxsmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,7 +20,14 @@ class Libxsmm(MakefilePackage): maintainers("hfp") + license("BSD-3-Clause") + + # 2.0 release is planned for Jan / Feb 2024. This commit from main is added + # as a stable version that supports other targets than x86. Remove this + # after 2.0 release. + version("main-2023-11", commit="0d9be905527ba575c14ca5d3b4c9673916c868b2") version("main", branch="main") + version("1.17", sha256="8b642127880e92e8a75400125307724635ecdf4020ca4481e5efe7640451bb92") version("1.16.3", sha256="e491ccadebc5cdcd1fc08b5b4509a0aba4e2c096f53d7880062a66b82a0baf84") version("1.16.2", sha256="bdc7554b56b9e0a380fc9c7b4f4394b41be863344858bc633bc9c25835c4c64e") @@ -82,8 +89,9 @@ class Libxsmm(MakefilePackage): # (). depends_on("binutils+ld+gas@2.33:", type="build", when="@:1.17") - # Intel Architecture or compatible CPU required - requires("target=x86_64:") + # Version 2.0 supports both x86_64 and aarch64 + requires("target=x86_64:", "target=aarch64:") + requires("target=x86_64:", when="@:1") @property def libs(self): diff --git a/var/spack/repos/builtin/packages/libxstream/package.py b/var/spack/repos/builtin/packages/libxstream/package.py index a89a3026994e9c..6cf99d43907078 100644 --- a/var/spack/repos/builtin/packages/libxstream/package.py +++ b/var/spack/repos/builtin/packages/libxstream/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libxstream(Package): homepage = "https://github.com/hfp/libxstream" url = "https://github.com/hfp/libxstream/archive/0.9.0.tar.gz" + license("BSD-3-Clause") + version("0.9.0", sha256="03365f23b337533b8e5a049a24bc5a91c0f1539dd042ca5312abccc8f713b473") def patch(self): diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py index 004bfbbd711f08..74f1614b751135 100644 --- a/var/spack/repos/builtin/packages/libxt/package.py +++ b/var/spack/repos/builtin/packages/libxt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,13 @@ class Libxt(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXt" xorg_mirror_path = "lib/libXt-1.1.5.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.3.0", sha256="de4a80c4cc7785b9620e572de71026805f68e85a2bf16c386009ef0e50be3f77") + version("1.2.1", sha256="6da1bfa9dd0ed87430a5ce95b129485086394df308998ebe34d98e378e3dfb33") + version("1.2.0", sha256="d4bee88898fc5e1dc470e361430c72fbc529b9cdbbb6c0ed3affea3a39f97d8d") version("1.1.5", sha256="b59bee38a9935565fa49dc1bfe84cb30173e2e07e1dcdf801430d4b54eb0caa3") depends_on("libsm") diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py index def32f83d1ef87..7027e0e6e42732 100644 --- a/var/spack/repos/builtin/packages/libxtrap/package.py +++ b/var/spack/repos/builtin/packages/libxtrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py index 7f469fbf4d3ca5..3fbe336f8d46c3 100644 --- a/var/spack/repos/builtin/packages/libxtst/package.py +++ b/var/spack/repos/builtin/packages/libxtst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,12 @@ class Libxtst(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXtst" xorg_mirror_path = "lib/libXtst-1.2.2.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.2.4", sha256="01366506aeb033f6dffca5326af85f670746b0cabbfd092aabefb046cf48c445") + version("1.2.3", sha256="a0c83acce02d4923018c744662cb28eb0dbbc33b4adc027726879ccf68fbc2c2") version("1.2.2", sha256="221838960c7b9058cd6795c1c3ee8e25bae1c68106be314bc3036a4f26be0e6c") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py index ae1b533b5e4078..bc1019e575d3c7 100644 --- a/var/spack/repos/builtin/packages/libxv/package.py +++ b/var/spack/repos/builtin/packages/libxv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,12 @@ class Libxv(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXv" xorg_mirror_path = "lib/libXv-1.0.10.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.0.12", sha256="ce706619a970a580a0e35e9b5c98bdd2af243ac6494c65f44608a89a86100126") + version("1.0.11", sha256="c4112532889b210e21cf05f46f0f2f8354ff7e1b58061e12d7a76c95c0d47bb1") version("1.0.10", sha256="89a664928b625558268de81c633e300948b3752b0593453d7815f8775bab5293") depends_on("libx11@1.6:") diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py index 2c1412ad00fd67..a970c24a34aab6 100644 --- a/var/spack/repos/builtin/packages/libxvmc/package.py +++ b/var/spack/repos/builtin/packages/libxvmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,14 @@ class Libxvmc(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXvMC" xorg_mirror_path = "lib/libXvMC-1.0.9.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.0.13", sha256="e630b4373af8c67a7c8f07ebe626a1269a613d262d1f737b57231a06f7c34b4e") + version("1.0.12", sha256="024c9ec4f001f037eeca501ee724c7e51cf287eb69ced8c6126e16e7fa9864b5") + version("1.0.11", sha256="0b931d216b23b95df87cc65f7bb7acef4120d9263adb0a4d90856ba1f7a390da") + version("1.0.10", sha256="d8306f71c798d10409bb181b747c2644e1d60c05773c742c12304ab5aa5c8436") version("1.0.9", sha256="090f087fe65b30b3edfb996c79ff6cf299e473fb25e955fff1c4e9cb624da2c2") depends_on("libx11@1.6:") diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py index 54737ddc0df645..c0d1300ef640fc 100644 --- a/var/spack/repos/builtin/packages/libxxf86dga/package.py +++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class Libxxf86dga(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86dga" xorg_mirror_path = "lib/libXxf86dga-1.1.4.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.6", sha256="87c7482b1e29b4eeb415815641c4f69c00545a8138e1b73ff1f361f7d9c22ac4") + version("1.1.5", sha256="715e2bf5caf6276f0858eb4b11a1aef1a26beeb40dce2942387339da395bef69") version("1.1.4", sha256="e6361620a15ceba666901ca8423e8be0c6ed0271a7088742009160349173766b") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py index 936182b4158bb9..f9cd5db8a79a32 100644 --- a/var/spack/repos/builtin/packages/libxxf86misc/package.py +++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Libxxf86misc(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86misc" xorg_mirror_path = "lib/libXxf86misc-1.0.3.tar.gz" + maintainers("wdconinc") + version("1.0.4", sha256="63a68b2fafd03236f9b0135de21976e9194d6d811ca2fd774c13a6b4be576676") version("1.0.3", sha256="358f692f793af00f6ef4c7a8566c1bcaeeea37e417337db3f519522cc1df3946") diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py index df820636f31d36..970ff1991f6016 100644 --- a/var/spack/repos/builtin/packages/libxxf86vm/package.py +++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,11 @@ class Libxxf86vm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libXxf86vm" xorg_mirror_path = "lib/libXxf86vm-1.1.4.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.5", sha256="f3f1c29fef8accb0adbd854900c03c6c42f1804f2bc1e4f3ad7b2e1f3b878128") version("1.1.4", sha256="5108553c378a25688dcb57dca383664c36e293d60b1505815f67980ba9318a99") depends_on("libx11@1.6:") diff --git a/var/spack/repos/builtin/packages/libyaml/package.py b/var/spack/repos/builtin/packages/libyaml/package.py index e992e88a564e9e..e3f46d0367453e 100644 --- a/var/spack/repos/builtin/packages/libyaml/package.py +++ b/var/spack/repos/builtin/packages/libyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libyaml(AutotoolsPackage): url = "https://pyyaml.org/download/libyaml/yaml-0.2.4.tar.gz" git = "https://github.com/yaml/libyaml.git" + license("MIT") + version("master", branch="master") version("0.2.5", sha256="c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4") version("0.2.4", sha256="d80aeda8747b7c26fbbfd87ab687786e58394a8435ae3970e79cb97882e30557") diff --git a/var/spack/repos/builtin/packages/libyogrt/package.py b/var/spack/repos/builtin/packages/libyogrt/package.py index 34a6a97fcc5a14..f63d1736b9dfdb 100644 --- a/var/spack/repos/builtin/packages/libyogrt/package.py +++ b/var/spack/repos/builtin/packages/libyogrt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Libyogrt(AutotoolsPackage): homepage = "https://github.com/LLNL/libyogrt" url = "https://github.com/LLNL/libyogrt/releases/download/1.21/libyogrt-1.21.tar.gz" + license("LGPL-2.1-or-later") + version("1.33", sha256="797d20c49cdc4f6beae8660b4f41ba7ac13f7e93a0344b47f0bdc64f780d1398") version("1.27", sha256="c57ce60770b61aa20bc83fe34ff52b5e444964338df3786f282d0d9bcdd26138") version("1.24", sha256="36695030e72b24b1f22bfcfe42bfd1d3c87f9c0eea5e94ce0120782581ea522f") diff --git a/var/spack/repos/builtin/packages/libzip/package.py b/var/spack/repos/builtin/packages/libzip/package.py index f475541864173f..79c31a8696b8c9 100644 --- a/var/spack/repos/builtin/packages/libzip/package.py +++ b/var/spack/repos/builtin/packages/libzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Libzip(AutotoolsPackage): homepage = "https://nih.at/libzip/index.html" url = "https://nih.at/libzip/libzip-1.2.0.tar.gz" + license("BSD-3-Clause") + version("1.3.2", sha256="ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457") version("1.2.0", sha256="6cf9840e427db96ebf3936665430bab204c9ebbd0120c326459077ed9c907d9f") diff --git a/var/spack/repos/builtin/packages/libzmq/package.py b/var/spack/repos/builtin/packages/libzmq/package.py index f8adbfc37b15db..2028dcd55e026d 100644 --- a/var/spack/repos/builtin/packages/libzmq/package.py +++ b/var/spack/repos/builtin/packages/libzmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Libzmq(AutotoolsPackage): maintainers("dennisklein") + license("MPL-2.0") + version("master", branch="master") version("4.3.5", sha256="6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43") version("4.3.4", sha256="c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5") diff --git a/var/spack/repos/builtin/packages/liggghts/package.py b/var/spack/repos/builtin/packages/liggghts/package.py index dac43ff3655115..d67890824cb16d 100644 --- a/var/spack/repos/builtin/packages/liggghts/package.py +++ b/var/spack/repos/builtin/packages/liggghts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Liggghts(MakefilePackage): maintainers("SofiaXu") + license("GPL-2.0-only") + version("3.8.0", sha256="9cb2e6596f584463ac2f80e3ff7b9588b7e3638c44324635b6329df87b90ab03") variant("mpi", default=True, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/lighttpd/package.py b/var/spack/repos/builtin/packages/lighttpd/package.py index 4b67767800eab0..7048111b6561ba 100644 --- a/var/spack/repos/builtin/packages/lighttpd/package.py +++ b/var/spack/repos/builtin/packages/lighttpd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Lighttpd(CMakePackage): homepage = "https://www.lighttpd.net" url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.50.tar.gz" + license("BSD-3-Clause") + version("1.4.69", sha256="657010184c4c470ad98944abbf0a8e2281800fa2bb1836c7a2cd4a8874e97b28") version("1.4.55", sha256="065259fb618774df516add13df22a52cac76a8f59e4561f143fe3ec810f4a03a") version("1.4.54", sha256="5151d38cb7c4c40effa13710e77ebdbef899f945b062cf32befc02d128ac424c") diff --git a/var/spack/repos/builtin/packages/ligra/package.py b/var/spack/repos/builtin/packages/ligra/package.py index 0c6c063282b39a..749cceeab26b59 100644 --- a/var/spack/repos/builtin/packages/ligra/package.py +++ b/var/spack/repos/builtin/packages/ligra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ligra(MakefilePackage): homepage = "https://jshun.github.io/ligra/" url = "https://github.com/jshun/ligra/archive/v.1.5.tar.gz" + license("MIT") + version("1.5", sha256="74113a5a3c19a0e319a5b9ebefc8a67c5d18d4d2a9670363092a966f4163f6b7") version("1.4", sha256="bb70a1428c71cf2f7e1512cdedcd8330c754f5a2c8309ab9d9666591cff6a4e1") version("1.3", sha256="df848038734bb9724d6c9bd95595c91eb6b07027642be93bff161f020ff257e4") diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index f7ebb21048c4c4..eaa3c301a3c557 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,9 @@ class Likwid(Package): git = "https://github.com/RRZE-HPC/likwid.git" maintainers("TomTheBear") + license("GPL-3.0-only") + + version("5.3.0", sha256="c290e554c4253124ac2ab8b056e14ee4d23966b8c9fbfa10ba81f75ae543ce4e") version("5.2.2", sha256="7dda6af722e04a6c40536fc9f89766ce10f595a8569b29e80563767a6a8f940e") version("5.2.1", sha256="1b8e668da117f24302a344596336eca2c69d2bc2f49fa228ca41ea0688f6cbc2") version("5.2.0", sha256="aa6dccacfca59e52d8f3be187ffcf292b2a2fa1f51a81bf8912b9d48e5a257e0") @@ -61,10 +64,11 @@ class Likwid(Package): patch( "https://github.com/RRZE-HPC/likwid/releases/download/v5.2.0/likwid-icx-mem-group-fix.patch", sha256="af4ce278ef20cd1df26d8749a6b0e2716e4286685dae5a5e1eb4af8c383f7d10", - when="@5.2.0:", + when="@5.2.0:5.2.2", ) variant("fortran", default=True, description="with fortran interface") variant("cuda", default=False, description="with Nvidia GPU profiling support") + variant("rocm", default=False, description="with AMD GPU profiling support") variant( "accessmode", @@ -83,6 +87,10 @@ class Likwid(Package): depends_on("lua", when="@5.0.2:") depends_on("cuda", when="@5: +cuda") depends_on("hwloc", when="@5.2.0:") + depends_on("rocprofiler-dev", when="@5.3: +rocm") + depends_on("rocm-core", when="@5.3: +rocm") + depends_on("rocm-smi", when="@5.3: +rocm") + depends_on("rocm-smi-lib", when="@5.3: +rocm") # TODO: check # depends_on('gnuplot', type='run') @@ -103,6 +111,31 @@ def setup_run_environment(self, env): ) for lib in libs.directories: env.append_path("LD_LIBRARY_PATH", lib) + if "+rocm" in self.spec: + libs = find_libraries( + "librocprofiler64.so.1", + root=self.spec["rocprofiler-dev"].prefix, + shared=True, + recursive=True, + ) + for lib in libs.directories: + env.append_path("LD_LIBRARY_PATH", lib) + libs = find_libraries( + "libhsa-runtime64.so", + root=self.spec["rocm-core"].prefix, + shared=True, + recursive=True, + ) + for lib in libs.directories: + env.append_path("LD_LIBRARY_PATH", lib) + libs = find_libraries( + "librocm_smi64.so", + root=self.spec["rocm-smi-lib"].prefix, + shared=True, + recursive=True, + ) + for lib in libs.directories: + env.append_path("LD_LIBRARY_PATH", lib) @run_before("install") def filter_sbang(self): @@ -170,6 +203,13 @@ def install(self, spec, prefix): else: filter_file("^NVIDIA_INTERFACE.*", "NVIDIA_INTERFACE = false", "config.mk") + if "+rocm" in self.spec: + env["ROCM_HOME"] = spec["rocm-core"].prefix + filter_file("^ROCM_INTERFACE.*", "ROCM_INTERFACE = true", "config.mk") + filter_file("^BUILDAPPDAEMON.*", "BUILDAPPDAEMON = true", "config.mk") + else: + filter_file("^ROCM_INTERFACE.*", "ROCM_INTERFACE = false", "config.mk") + if spec.satisfies("^lua"): filter_file( "^#LUA_INCLUDE_DIR.*", diff --git a/var/spack/repos/builtin/packages/linaro-forge/package.py b/var/spack/repos/builtin/packages/linaro-forge/package.py index e67613fef1f621..adf698e049987a 100644 --- a/var/spack/repos/builtin/packages/linaro-forge/package.py +++ b/var/spack/repos/builtin/packages/linaro-forge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,10 @@ class LinaroForge(Package): maintainers("kenche-linaro") if platform.machine() in ["aarch64", "arm64"]: + version( + "23.1.1", sha256="6e95a9c9f894caad073e58590733c4ce4489aec0d8db6553050e71a59e41e6f8" + ) + version("23.1", sha256="c9889b95729f97bcffaf0f15b930efbd27081b7cf2ebc958eede3a186cc4d93a") version( "23.0.4", sha256="a19e6b247badaa52f78815761f71fb95a565024b7f79bdfb2f602f18b47a881c" ) @@ -43,6 +47,10 @@ class LinaroForge(Package): "21.1.3", sha256="4a4ff7372aad5a31fc9e18b7b6c493691ab37d8d44a3158584e62d1ab82b0eeb" ) elif platform.machine() == "ppc64le": + version( + "23.1.1", sha256="9d4dfa440ef1cc9c6a7cb4f7eeec49fc77f0b6b75864fbe018a41783ac5fc5df" + ) + version("23.1", sha256="39a522c1d9a29f0a35bba5201f3e23c56d87543410505df30c85128816dd455b") version( "23.0.4", sha256="927c1ba733cf63027243060586b196f8262e545d898712044c359a6af6fc5795" ) @@ -66,6 +74,10 @@ class LinaroForge(Package): "21.1.3", sha256="eecbc5686d60994c5468b2d7cd37bebe5d9ac0ba37bd1f98fbfc69b071db541e" ) elif platform.machine() == "x86_64": + version( + "23.1.1", sha256="6dcd39fc582088eb4b13233ae1e9b38e12bfa07babf77d89b869473a3c2b66e6" + ) + version("23.1", sha256="31185d5f9855fd03701089907cdf7b38eb72c484ee730f8341decbbd8f9b5930") version( "23.0.4", sha256="41a81840a273ea9a232efb4f031149867c5eff7a6381d787e18195f1171caac4" ) diff --git a/var/spack/repos/builtin/packages/linkphase3/package.py b/var/spack/repos/builtin/packages/linkphase3/package.py index 2b41a18fc2aea4..6eec3c55cd37d5 100644 --- a/var/spack/repos/builtin/packages/linkphase3/package.py +++ b/var/spack/repos/builtin/packages/linkphase3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Linkphase3(Package): homepage = "https://github.com/tdruet/LINKPHASE3" git = "https://github.com/tdruet/LINKPHASE3.git" + license("GPL-3.0-only") + version("2017-06-14", commit="559913593fc818bb1adb29796a548cf5bf323827") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/linktest/package.py b/var/spack/repos/builtin/packages/linktest/package.py index 6456382001a046..ef8e510d06f9fc 100644 --- a/var/spack/repos/builtin/packages/linktest/package.py +++ b/var/spack/repos/builtin/packages/linktest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/linsys-v/package.py b/var/spack/repos/builtin/packages/linsys-v/package.py index f0a4e089d7dd72..a0a28355b41b60 100644 --- a/var/spack/repos/builtin/packages/linsys-v/package.py +++ b/var/spack/repos/builtin/packages/linsys-v/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py index 8e1d995695b069..703e783352b081 100644 --- a/var/spack/repos/builtin/packages/linux-headers/package.py +++ b/var/spack/repos/builtin/packages/linux-headers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class LinuxHeaders(Package): list_url = "https://www.kernel.org/pub/linux/kernel" list_depth = 2 + license("GPL-2.0-only") + version("6.5.2", sha256="2027e14057d568ad3ddc100dadf4c8853a49b031270478a61d88f6011572650f") version("6.2.8", sha256="fed0ad87d42f83a70ce019ff2800bc30a855e672e72bf6d54a014d98d344f665") version("4.9.10", sha256="bd6e05476fd8d9ea4945e11598d87bc97806bbc8d03556abbaaf809707661525") diff --git a/var/spack/repos/builtin/packages/linux-pam/package.py b/var/spack/repos/builtin/packages/linux-pam/package.py index 63566260775ea8..24f70243e1a69a 100644 --- a/var/spack/repos/builtin/packages/linux-pam/package.py +++ b/var/spack/repos/builtin/packages/linux-pam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LinuxPam(AutotoolsPackage): homepage = "http://www.linux-pam.org/" url = "https://github.com/linux-pam/linux-pam/releases/download/v1.5.2/Linux-PAM-1.5.2.tar.xz" + license("BSD-3-Clause") + version("1.5.1", sha256="201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc") version("1.5.2", sha256="e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d") version("1.5.0", sha256="02d39854b508fae9dc713f7733bbcdadbe17b50de965aedddd65bcb6cc7852c8") diff --git a/var/spack/repos/builtin/packages/lis/package.py b/var/spack/repos/builtin/packages/lis/package.py index 5556f446a1e5f9..973be730ff7c1a 100644 --- a/var/spack/repos/builtin/packages/lis/package.py +++ b/var/spack/repos/builtin/packages/lis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py index 779f9ecee7abec..800f161b844636 100644 --- a/var/spack/repos/builtin/packages/listres/package.py +++ b/var/spack/repos/builtin/packages/listres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Listres(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/listres" xorg_mirror_path = "app/listres-1.0.3.tar.gz" + license("X11") + version("1.0.5", sha256="ed068e63dfb6e42cfbcea568d161e53e1d120d99da9aa16c1f822803ebb38504") version("1.0.3", sha256="87d5698b8aa4d841e45e6556932c9914210cbd8b10003d664b31185b087981be") diff --git a/var/spack/repos/builtin/packages/lizard/package.py b/var/spack/repos/builtin/packages/lizard/package.py index c9c7b67fbeaaeb..60ce4e9cc4d398 100644 --- a/var/spack/repos/builtin/packages/lizard/package.py +++ b/var/spack/repos/builtin/packages/lizard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lksctp-tools/package.py b/var/spack/repos/builtin/packages/lksctp-tools/package.py index 16dd2a189900e5..957e4a1774c86c 100644 --- a/var/spack/repos/builtin/packages/lksctp-tools/package.py +++ b/var/spack/repos/builtin/packages/lksctp-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LksctpTools(AutotoolsPackage): homepage = "https://github.com/sctp/lksctp-tools" url = "https://github.com/sctp/lksctp-tools/archive/v1.0.18.tar.gz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later") + version("1.0.18", sha256="3e9ab5b3844a8b65fc8152633aafe85f406e6da463e53921583dfc4a443ff03a") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/0001-update-HIP_PATH-deduction-for-5.7.0.patch b/var/spack/repos/builtin/packages/llvm-amdgpu/0001-update-HIP_PATH-deduction-for-5.7.0.patch new file mode 100644 index 00000000000000..98a3e38387f67a --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/0001-update-HIP_PATH-deduction-for-5.7.0.patch @@ -0,0 +1,56 @@ +From 520d86b859bd6640fbd7f22b6a326a3b040c3671 Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Thu, 23 Nov 2023 09:31:49 +0000 +Subject: [PATCH] update HIP_PATH deduction for 5.7.0 + +--- + clang/lib/Driver/ToolChains/AMDGPU.cpp | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp +index fe36646..8706f08 100644 +--- a/clang/lib/Driver/ToolChains/AMDGPU.cpp ++++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp +@@ -437,12 +437,13 @@ void RocmInstallationDetector::detectDeviceLibrary() { + void RocmInstallationDetector::detectHIPRuntime() { + SmallVector HIPSearchDirs; + if (!HIPPathArg.empty()) +- HIPSearchDirs.emplace_back(HIPPathArg.str(), /*StrictChecking=*/true); ++ HIPSearchDirs.emplace_back(HIPPathArg.str()); + else if (std::optional HIPPathEnv = + llvm::sys::Process::GetEnv("HIP_PATH")) { + if (!HIPPathEnv->empty()) + HIPSearchDirs.emplace_back(std::move(*HIPPathEnv)); +- } else ++ } ++ if (HIPSearchDirs.empty()) + HIPSearchDirs.append(getInstallationPathCandidates()); + auto &FS = D.getVFS(); + +@@ -464,10 +465,21 @@ void RocmInstallationDetector::detectHIPRuntime() { + SharePath = InstallPath; + llvm::sys::path::append(SharePath, "share"); + ++ // Get parent of InstallPath and append "share" ++ SmallString<0> ParentSharePath = llvm::sys::path::parent_path(InstallPath); ++ llvm::sys::path::append(ParentSharePath, "share"); ++ ++ auto Append = [](SmallString<0> &path, const Twine &a, const Twine &b = "", ++ const Twine &c = "", const Twine &d = "") { ++ SmallString<0> newpath = path; ++ llvm::sys::path::append(newpath, a, b, c, d); ++ return newpath; ++ }; + // If HIP version file can be found and parsed, use HIP version from there. + for (const auto &VersionFilePath : +- {std::string(SharePath) + "/hip/version", +- std::string(BinPath) + "/.hipVersion"}) { ++ {Append(SharePath, "hip", "version"), ++ Append(ParentSharePath, "hip", "version"), ++ Append(BinPath, ".hipVersion")}) { + llvm::ErrorOr> VersionFile = + FS.getBufferForFile(VersionFilePath); + if (!VersionFile) +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/001-Add-i1-mul-patterns-5.7.patch b/var/spack/repos/builtin/packages/llvm-amdgpu/001-Add-i1-mul-patterns-5.7.patch new file mode 100644 index 00000000000000..52ee52cc591197 --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/001-Add-i1-mul-patterns-5.7.patch @@ -0,0 +1,671 @@ +From 92c7d307a51fc0e6c7cbd2b760014ae77bdc0a3f Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Fri, 3 Nov 2023 02:58:08 +0000 +Subject: [PATCH] Upcoming fix from PR 67291 + +--- + llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 2 + + llvm/test/CodeGen/AMDGPU/mul.ll | 400 ++++++++++++++++++---- + 2 files changed, 326 insertions(+), 76 deletions(-) + +diff --git a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp +index 3f816c01a..30129fb4a 100644 +--- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp ++++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp +@@ -743,6 +743,8 @@ SITargetLowering::SITargetLowering(const TargetMachine &TM, + MVT::i8}, + Custom); + ++ setOperationAction(ISD::MUL, MVT::i1, Promote); ++ + setTargetDAGCombine({ISD::ADD, + ISD::ADDCARRY, + ISD::SUB, +diff --git a/llvm/test/CodeGen/AMDGPU/mul.ll b/llvm/test/CodeGen/AMDGPU/mul.ll +index 68c8f7d58..ed930e429 100644 +--- a/llvm/test/CodeGen/AMDGPU/mul.ll ++++ b/llvm/test/CodeGen/AMDGPU/mul.ll +@@ -1058,6 +1058,254 @@ entry: + store i32 %result, ptr addrspace(1) %out + ret void + } ++define amdgpu_kernel void @s_mul_i1(ptr addrspace(1) %out, [8 x i32], i1 %a, [8 x i32], i1 %b) nounwind { ++; SI-LABEL: s_mul_i1: ++; SI: ; %bb.0: ; %entry ++; SI-NEXT: s_load_dword s4, s[0:1], 0x13 ++; SI-NEXT: s_load_dword s5, s[0:1], 0x1c ++; SI-NEXT: s_load_dwordx2 s[0:1], s[0:1], 0x9 ++; SI-NEXT: s_mov_b32 s3, 0xf000 ++; SI-NEXT: s_mov_b32 s2, -1 ++; SI-NEXT: s_waitcnt lgkmcnt(0) ++; SI-NEXT: s_mul_i32 s4, s4, s5 ++; SI-NEXT: s_and_b32 s4, s4, 1 ++; SI-NEXT: v_mov_b32_e32 v0, s4 ++; SI-NEXT: buffer_store_byte v0, off, s[0:3], 0 ++; SI-NEXT: s_endpgm ++; ++; VI-LABEL: s_mul_i1: ++; VI: ; %bb.0: ; %entry ++; VI-NEXT: s_load_dword s4, s[0:1], 0x70 ++; VI-NEXT: s_load_dword s5, s[0:1], 0x4c ++; VI-NEXT: s_load_dwordx2 s[0:1], s[0:1], 0x24 ++; VI-NEXT: s_mov_b32 s3, 0xf000 ++; VI-NEXT: s_mov_b32 s2, -1 ++; VI-NEXT: s_waitcnt lgkmcnt(0) ++; VI-NEXT: v_mov_b32_e32 v0, s4 ++; VI-NEXT: v_mul_lo_u16_e32 v0, s5, v0 ++; VI-NEXT: v_and_b32_e32 v0, 1, v0 ++; VI-NEXT: buffer_store_byte v0, off, s[0:3], 0 ++; VI-NEXT: s_endpgm ++; ++; GFX9-LABEL: s_mul_i1: ++; GFX9: ; %bb.0: ; %entry ++; GFX9-NEXT: s_load_dword s2, s[0:1], 0x70 ++; GFX9-NEXT: s_load_dword s3, s[0:1], 0x4c ++; GFX9-NEXT: s_load_dwordx2 s[4:5], s[0:1], 0x24 ++; GFX9-NEXT: s_mov_b32 s7, 0xf000 ++; GFX9-NEXT: s_mov_b32 s6, -1 ++; GFX9-NEXT: s_waitcnt lgkmcnt(0) ++; GFX9-NEXT: v_mov_b32_e32 v0, s2 ++; GFX9-NEXT: v_mul_lo_u16_e32 v0, s3, v0 ++; GFX9-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX9-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; GFX9-NEXT: s_endpgm ++; ++; GFX10-LABEL: s_mul_i1: ++; GFX10: ; %bb.0: ; %entry ++; GFX10-NEXT: s_clause 0x2 ++; GFX10-NEXT: s_load_dword s2, s[0:1], 0x4c ++; GFX10-NEXT: s_load_dword s3, s[0:1], 0x70 ++; GFX10-NEXT: s_load_dwordx2 s[4:5], s[0:1], 0x24 ++; GFX10-NEXT: s_mov_b32 s7, 0x31016000 ++; GFX10-NEXT: s_mov_b32 s6, -1 ++; GFX10-NEXT: s_waitcnt lgkmcnt(0) ++; GFX10-NEXT: v_mul_lo_u16 v0, s2, s3 ++; GFX10-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX10-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; GFX10-NEXT: s_endpgm ++; ++; GFX11-LABEL: s_mul_i1: ++; GFX11: ; %bb.0: ; %entry ++; GFX11-NEXT: s_clause 0x2 ++; GFX11-NEXT: s_load_b32 s2, s[0:1], 0x4c ++; GFX11-NEXT: s_load_b32 s3, s[0:1], 0x70 ++; GFX11-NEXT: s_load_b64 s[0:1], s[0:1], 0x24 ++; GFX11-NEXT: s_waitcnt lgkmcnt(0) ++; GFX11-NEXT: v_mul_lo_u16 v0, s2, s3 ++; GFX11-NEXT: s_mov_b32 s3, 0x31016000 ++; GFX11-NEXT: s_mov_b32 s2, -1 ++; GFX11-NEXT: s_delay_alu instid0(VALU_DEP_1) ++; GFX11-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX11-NEXT: buffer_store_b8 v0, off, s[0:3], 0 ++; GFX11-NEXT: s_nop 0 ++; GFX11-NEXT: s_sendmsg sendmsg(MSG_DEALLOC_VGPRS) ++; GFX11-NEXT: s_endpgm ++; ++; EG-LABEL: s_mul_i1: ++; EG: ; %bb.0: ; %entry ++; EG-NEXT: ALU 0, @10, KC0[], KC1[] ++; EG-NEXT: TEX 1 @6 ++; EG-NEXT: ALU 12, @11, KC0[CB0:0-32], KC1[] ++; EG-NEXT: MEM_RAT MSKOR T0.XW, T1.X ++; EG-NEXT: CF_END ++; EG-NEXT: PAD ++; EG-NEXT: Fetch clause starting at 6: ++; EG-NEXT: VTX_READ_8 T1.X, T0.X, 72, #3 ++; EG-NEXT: VTX_READ_8 T0.X, T0.X, 108, #3 ++; EG-NEXT: ALU clause starting at 10: ++; EG-NEXT: MOV * T0.X, 0.0, ++; EG-NEXT: ALU clause starting at 11: ++; EG-NEXT: AND_INT T0.W, KC0[2].Y, literal.x, ++; EG-NEXT: MULLO_INT * T0.X, T1.X, T0.X, ++; EG-NEXT: 3(4.203895e-45), 0(0.000000e+00) ++; EG-NEXT: AND_INT T1.W, PS, 1, ++; EG-NEXT: LSHL * T0.W, PV.W, literal.x, ++; EG-NEXT: 3(4.203895e-45), 0(0.000000e+00) ++; EG-NEXT: LSHL T0.X, PV.W, PS, ++; EG-NEXT: LSHL * T0.W, literal.x, PS, ++; EG-NEXT: 255(3.573311e-43), 0(0.000000e+00) ++; EG-NEXT: MOV T0.Y, 0.0, ++; EG-NEXT: MOV * T0.Z, 0.0, ++; EG-NEXT: LSHR * T1.X, KC0[2].Y, literal.x, ++; EG-NEXT: 2(2.802597e-45), 0(0.000000e+00) ++entry: ++ %mul = mul i1 %a, %b ++ store i1 %mul, ptr addrspace(1) %out, align 4 ++ ret void ++} ++ ++define amdgpu_kernel void @v_mul_i1(ptr addrspace(1) %out, ptr addrspace(1) %in) { ++; SI-LABEL: v_mul_i1: ++; SI: ; %bb.0: ; %entry ++; SI-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x9 ++; SI-NEXT: s_mov_b32 s7, 0xf000 ++; SI-NEXT: s_mov_b32 s6, -1 ++; SI-NEXT: s_mov_b32 s10, s6 ++; SI-NEXT: s_mov_b32 s11, s7 ++; SI-NEXT: s_waitcnt lgkmcnt(0) ++; SI-NEXT: s_mov_b32 s8, s2 ++; SI-NEXT: s_mov_b32 s9, s3 ++; SI-NEXT: buffer_load_ubyte v0, off, s[8:11], 0 ++; SI-NEXT: buffer_load_ubyte v1, off, s[8:11], 0 offset:4 ++; SI-NEXT: s_mov_b32 s4, s0 ++; SI-NEXT: s_mov_b32 s5, s1 ++; SI-NEXT: s_waitcnt vmcnt(0) ++; SI-NEXT: v_mul_lo_u32 v0, v0, v1 ++; SI-NEXT: v_and_b32_e32 v0, 1, v0 ++; SI-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; SI-NEXT: s_endpgm ++; ++; VI-LABEL: v_mul_i1: ++; VI: ; %bb.0: ; %entry ++; VI-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 ++; VI-NEXT: s_mov_b32 s7, 0xf000 ++; VI-NEXT: s_mov_b32 s6, -1 ++; VI-NEXT: s_mov_b32 s10, s6 ++; VI-NEXT: s_mov_b32 s11, s7 ++; VI-NEXT: s_waitcnt lgkmcnt(0) ++; VI-NEXT: s_mov_b32 s8, s2 ++; VI-NEXT: s_mov_b32 s9, s3 ++; VI-NEXT: buffer_load_ubyte v0, off, s[8:11], 0 ++; VI-NEXT: buffer_load_ubyte v1, off, s[8:11], 0 offset:4 ++; VI-NEXT: s_mov_b32 s4, s0 ++; VI-NEXT: s_mov_b32 s5, s1 ++; VI-NEXT: s_waitcnt vmcnt(0) ++; VI-NEXT: v_mul_lo_u16_e32 v0, v0, v1 ++; VI-NEXT: v_and_b32_e32 v0, 1, v0 ++; VI-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; VI-NEXT: s_endpgm ++; ++; GFX9-LABEL: v_mul_i1: ++; GFX9: ; %bb.0: ; %entry ++; GFX9-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 ++; GFX9-NEXT: s_mov_b32 s7, 0xf000 ++; GFX9-NEXT: s_mov_b32 s6, -1 ++; GFX9-NEXT: s_mov_b32 s10, s6 ++; GFX9-NEXT: s_mov_b32 s11, s7 ++; GFX9-NEXT: s_waitcnt lgkmcnt(0) ++; GFX9-NEXT: s_mov_b32 s8, s2 ++; GFX9-NEXT: s_mov_b32 s9, s3 ++; GFX9-NEXT: buffer_load_ubyte v0, off, s[8:11], 0 ++; GFX9-NEXT: buffer_load_ubyte v1, off, s[8:11], 0 offset:4 ++; GFX9-NEXT: s_mov_b32 s4, s0 ++; GFX9-NEXT: s_mov_b32 s5, s1 ++; GFX9-NEXT: s_waitcnt vmcnt(0) ++; GFX9-NEXT: v_mul_lo_u16_e32 v0, v0, v1 ++; GFX9-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX9-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; GFX9-NEXT: s_endpgm ++; ++; GFX10-LABEL: v_mul_i1: ++; GFX10: ; %bb.0: ; %entry ++; GFX10-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 ++; GFX10-NEXT: s_mov_b32 s6, -1 ++; GFX10-NEXT: s_mov_b32 s7, 0x31016000 ++; GFX10-NEXT: s_mov_b32 s10, s6 ++; GFX10-NEXT: s_mov_b32 s11, s7 ++; GFX10-NEXT: s_waitcnt lgkmcnt(0) ++; GFX10-NEXT: s_mov_b32 s8, s2 ++; GFX10-NEXT: s_mov_b32 s9, s3 ++; GFX10-NEXT: s_clause 0x1 ++; GFX10-NEXT: buffer_load_ubyte v0, off, s[8:11], 0 ++; GFX10-NEXT: buffer_load_ubyte v1, off, s[8:11], 0 offset:4 ++; GFX10-NEXT: s_mov_b32 s4, s0 ++; GFX10-NEXT: s_mov_b32 s5, s1 ++; GFX10-NEXT: s_waitcnt vmcnt(0) ++; GFX10-NEXT: v_mul_lo_u16 v0, v0, v1 ++; GFX10-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX10-NEXT: buffer_store_byte v0, off, s[4:7], 0 ++; GFX10-NEXT: s_endpgm ++; ++; GFX11-LABEL: v_mul_i1: ++; GFX11: ; %bb.0: ; %entry ++; GFX11-NEXT: s_load_b128 s[0:3], s[0:1], 0x24 ++; GFX11-NEXT: s_mov_b32 s6, -1 ++; GFX11-NEXT: s_mov_b32 s7, 0x31016000 ++; GFX11-NEXT: s_mov_b32 s10, s6 ++; GFX11-NEXT: s_mov_b32 s11, s7 ++; GFX11-NEXT: s_waitcnt lgkmcnt(0) ++; GFX11-NEXT: s_mov_b32 s8, s2 ++; GFX11-NEXT: s_mov_b32 s9, s3 ++; GFX11-NEXT: s_clause 0x1 ++; GFX11-NEXT: buffer_load_u8 v0, off, s[8:11], 0 ++; GFX11-NEXT: buffer_load_u8 v1, off, s[8:11], 0 offset:4 ++; GFX11-NEXT: s_mov_b32 s4, s0 ++; GFX11-NEXT: s_mov_b32 s5, s1 ++; GFX11-NEXT: s_waitcnt vmcnt(0) ++; GFX11-NEXT: v_mul_lo_u16 v0, v0, v1 ++; GFX11-NEXT: s_delay_alu instid0(VALU_DEP_1) ++; GFX11-NEXT: v_and_b32_e32 v0, 1, v0 ++; GFX11-NEXT: buffer_store_b8 v0, off, s[4:7], 0 ++; GFX11-NEXT: s_nop 0 ++; GFX11-NEXT: s_sendmsg sendmsg(MSG_DEALLOC_VGPRS) ++; GFX11-NEXT: s_endpgm ++; ++; EG-LABEL: v_mul_i1: ++; EG: ; %bb.0: ; %entry ++; EG-NEXT: ALU 0, @10, KC0[CB0:0-32], KC1[] ++; EG-NEXT: TEX 1 @6 ++; EG-NEXT: ALU 12, @11, KC0[CB0:0-32], KC1[] ++; EG-NEXT: MEM_RAT MSKOR T0.XW, T1.X ++; EG-NEXT: CF_END ++; EG-NEXT: PAD ++; EG-NEXT: Fetch clause starting at 6: ++; EG-NEXT: VTX_READ_8 T1.X, T0.X, 4, #1 ++; EG-NEXT: VTX_READ_8 T0.X, T0.X, 0, #1 ++; EG-NEXT: ALU clause starting at 10: ++; EG-NEXT: MOV * T0.X, KC0[2].Z, ++; EG-NEXT: ALU clause starting at 11: ++; EG-NEXT: AND_INT T0.W, KC0[2].Y, literal.x, ++; EG-NEXT: MULLO_INT * T0.X, T0.X, T1.X, ++; EG-NEXT: 3(4.203895e-45), 0(0.000000e+00) ++; EG-NEXT: AND_INT T1.W, PS, 1, ++; EG-NEXT: LSHL * T0.W, PV.W, literal.x, ++; EG-NEXT: 3(4.203895e-45), 0(0.000000e+00) ++; EG-NEXT: LSHL T0.X, PV.W, PS, ++; EG-NEXT: LSHL * T0.W, literal.x, PS, ++; EG-NEXT: 255(3.573311e-43), 0(0.000000e+00) ++; EG-NEXT: MOV T0.Y, 0.0, ++; EG-NEXT: MOV * T0.Z, 0.0, ++; EG-NEXT: LSHR * T1.X, KC0[2].Y, literal.x, ++; EG-NEXT: 2(2.802597e-45), 0(0.000000e+00) ++entry: ++ %b_ptr = getelementptr i32, ptr addrspace(1) %in, i32 1 ++ %a = load i1, ptr addrspace(1) %in ++ %b = load i1, ptr addrspace(1) %b_ptr ++ %result = mul i1 %a, %b ++ store i1 %result, ptr addrspace(1) %out ++ ret void ++} + + ; A standard 64-bit multiply. The expansion should be around 6 instructions. + ; It would be difficult to match the expansion correctly without writing +@@ -1213,7 +1461,7 @@ define amdgpu_kernel void @v_mul_i64(ptr addrspace(1) %out, ptr addrspace(1) %ap + ; SI-NEXT: v_mul_hi_u32 v4, v2, v0 + ; SI-NEXT: v_mul_lo_u32 v3, v3, v0 + ; SI-NEXT: v_mul_lo_u32 v0, v2, v0 +-; SI-NEXT: v_add_i32_e32 v1, vcc, v4, v1 ++; SI-NEXT: v_add_i32_e32 v1, vcc, v1, v4 + ; SI-NEXT: v_add_i32_e32 v1, vcc, v3, v1 + ; SI-NEXT: buffer_store_dwordx2 v[0:1], off, s[0:3], 0 + ; SI-NEXT: s_endpgm +@@ -1367,30 +1615,30 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; SI-NEXT: s_load_dwordx2 s[2:3], s[0:1], 0xd + ; SI-NEXT: s_waitcnt lgkmcnt(0) + ; SI-NEXT: s_cmp_lg_u32 s2, 0 +-; SI-NEXT: s_cbranch_scc0 .LBB11_2 ++; SI-NEXT: s_cbranch_scc0 .LBB13_2 + ; SI-NEXT: ; %bb.1: ; %else + ; SI-NEXT: s_mul_i32 s6, s2, s3 + ; SI-NEXT: s_mov_b64 s[4:5], 0 +-; SI-NEXT: s_branch .LBB11_3 +-; SI-NEXT: .LBB11_2: ++; SI-NEXT: s_branch .LBB13_3 ++; SI-NEXT: .LBB13_2: + ; SI-NEXT: s_mov_b64 s[4:5], -1 + ; SI-NEXT: ; implicit-def: $sgpr6 +-; SI-NEXT: .LBB11_3: ; %Flow ++; SI-NEXT: .LBB13_3: ; %Flow + ; SI-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x9 + ; SI-NEXT: s_andn2_b64 vcc, exec, s[4:5] + ; SI-NEXT: s_waitcnt lgkmcnt(0) + ; SI-NEXT: s_mov_b64 vcc, vcc +-; SI-NEXT: s_cbranch_vccnz .LBB11_5 ++; SI-NEXT: s_cbranch_vccnz .LBB13_5 + ; SI-NEXT: ; %bb.4: ; %if + ; SI-NEXT: s_mov_b32 s7, 0xf000 + ; SI-NEXT: s_mov_b32 s6, -1 + ; SI-NEXT: s_mov_b32 s4, s2 + ; SI-NEXT: s_mov_b32 s5, s3 + ; SI-NEXT: buffer_load_dword v0, off, s[4:7], 0 +-; SI-NEXT: s_branch .LBB11_6 +-; SI-NEXT: .LBB11_5: ++; SI-NEXT: s_branch .LBB13_6 ++; SI-NEXT: .LBB13_5: + ; SI-NEXT: v_mov_b32_e32 v0, s6 +-; SI-NEXT: .LBB11_6: ; %endif ++; SI-NEXT: .LBB13_6: ; %endif + ; SI-NEXT: s_mov_b32 s3, 0xf000 + ; SI-NEXT: s_mov_b32 s2, -1 + ; SI-NEXT: s_waitcnt vmcnt(0) +@@ -1402,18 +1650,18 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; VI-NEXT: s_load_dwordx2 s[2:3], s[0:1], 0x34 + ; VI-NEXT: s_waitcnt lgkmcnt(0) + ; VI-NEXT: s_cmp_lg_u32 s2, 0 +-; VI-NEXT: s_cbranch_scc0 .LBB11_2 ++; VI-NEXT: s_cbranch_scc0 .LBB13_2 + ; VI-NEXT: ; %bb.1: ; %else + ; VI-NEXT: s_mul_i32 s6, s2, s3 + ; VI-NEXT: s_mov_b64 s[4:5], 0 +-; VI-NEXT: s_branch .LBB11_3 +-; VI-NEXT: .LBB11_2: ++; VI-NEXT: s_branch .LBB13_3 ++; VI-NEXT: .LBB13_2: + ; VI-NEXT: s_mov_b64 s[4:5], -1 + ; VI-NEXT: ; implicit-def: $sgpr6 +-; VI-NEXT: .LBB11_3: ; %Flow ++; VI-NEXT: .LBB13_3: ; %Flow + ; VI-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 + ; VI-NEXT: s_andn2_b64 vcc, exec, s[4:5] +-; VI-NEXT: s_cbranch_vccnz .LBB11_5 ++; VI-NEXT: s_cbranch_vccnz .LBB13_5 + ; VI-NEXT: ; %bb.4: ; %if + ; VI-NEXT: s_mov_b32 s7, 0xf000 + ; VI-NEXT: s_mov_b32 s6, -1 +@@ -1421,10 +1669,10 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; VI-NEXT: s_mov_b32 s4, s2 + ; VI-NEXT: s_mov_b32 s5, s3 + ; VI-NEXT: buffer_load_dword v0, off, s[4:7], 0 +-; VI-NEXT: s_branch .LBB11_6 +-; VI-NEXT: .LBB11_5: ++; VI-NEXT: s_branch .LBB13_6 ++; VI-NEXT: .LBB13_5: + ; VI-NEXT: v_mov_b32_e32 v0, s6 +-; VI-NEXT: .LBB11_6: ; %endif ++; VI-NEXT: .LBB13_6: ; %endif + ; VI-NEXT: s_waitcnt lgkmcnt(0) + ; VI-NEXT: s_mov_b32 s3, 0xf000 + ; VI-NEXT: s_mov_b32 s2, -1 +@@ -1437,18 +1685,18 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX9-NEXT: s_load_dwordx2 s[2:3], s[0:1], 0x34 + ; GFX9-NEXT: s_waitcnt lgkmcnt(0) + ; GFX9-NEXT: s_cmp_lg_u32 s2, 0 +-; GFX9-NEXT: s_cbranch_scc0 .LBB11_2 ++; GFX9-NEXT: s_cbranch_scc0 .LBB13_2 + ; GFX9-NEXT: ; %bb.1: ; %else + ; GFX9-NEXT: s_mul_i32 s6, s2, s3 + ; GFX9-NEXT: s_mov_b64 s[4:5], 0 +-; GFX9-NEXT: s_branch .LBB11_3 +-; GFX9-NEXT: .LBB11_2: ++; GFX9-NEXT: s_branch .LBB13_3 ++; GFX9-NEXT: .LBB13_2: + ; GFX9-NEXT: s_mov_b64 s[4:5], -1 + ; GFX9-NEXT: ; implicit-def: $sgpr6 +-; GFX9-NEXT: .LBB11_3: ; %Flow ++; GFX9-NEXT: .LBB13_3: ; %Flow + ; GFX9-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 + ; GFX9-NEXT: s_andn2_b64 vcc, exec, s[4:5] +-; GFX9-NEXT: s_cbranch_vccnz .LBB11_5 ++; GFX9-NEXT: s_cbranch_vccnz .LBB13_5 + ; GFX9-NEXT: ; %bb.4: ; %if + ; GFX9-NEXT: s_mov_b32 s7, 0xf000 + ; GFX9-NEXT: s_mov_b32 s6, -1 +@@ -1456,10 +1704,10 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX9-NEXT: s_mov_b32 s4, s2 + ; GFX9-NEXT: s_mov_b32 s5, s3 + ; GFX9-NEXT: buffer_load_dword v0, off, s[4:7], 0 +-; GFX9-NEXT: s_branch .LBB11_6 +-; GFX9-NEXT: .LBB11_5: ++; GFX9-NEXT: s_branch .LBB13_6 ++; GFX9-NEXT: .LBB13_5: + ; GFX9-NEXT: v_mov_b32_e32 v0, s6 +-; GFX9-NEXT: .LBB11_6: ; %endif ++; GFX9-NEXT: .LBB13_6: ; %endif + ; GFX9-NEXT: s_waitcnt lgkmcnt(0) + ; GFX9-NEXT: s_mov_b32 s3, 0xf000 + ; GFX9-NEXT: s_mov_b32 s2, -1 +@@ -1473,17 +1721,17 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX10-NEXT: s_mov_b32 s4, 0 + ; GFX10-NEXT: s_waitcnt lgkmcnt(0) + ; GFX10-NEXT: s_cmp_lg_u32 s2, 0 +-; GFX10-NEXT: s_cbranch_scc0 .LBB11_2 ++; GFX10-NEXT: s_cbranch_scc0 .LBB13_2 + ; GFX10-NEXT: ; %bb.1: ; %else + ; GFX10-NEXT: s_mul_i32 s5, s2, s3 +-; GFX10-NEXT: s_branch .LBB11_3 +-; GFX10-NEXT: .LBB11_2: ++; GFX10-NEXT: s_branch .LBB13_3 ++; GFX10-NEXT: .LBB13_2: + ; GFX10-NEXT: s_mov_b32 s4, -1 + ; GFX10-NEXT: ; implicit-def: $sgpr5 + ; GFX10-NEXT: .LBB11_3: ; %Flow + ; GFX10-NEXT: s_load_dwordx4 s[0:3], s[0:1], 0x24 + ; GFX10-NEXT: s_andn2_b32 vcc_lo, exec_lo, s4 +-; GFX10-NEXT: s_cbranch_vccnz .LBB11_5 ++; GFX10-NEXT: s_cbranch_vccnz .LBB13_5 + ; GFX10-NEXT: ; %bb.4: ; %if + ; GFX10-NEXT: s_mov_b32 s7, 0x31016000 + ; GFX10-NEXT: s_mov_b32 s6, -1 +@@ -1491,10 +1739,10 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX10-NEXT: s_mov_b32 s4, s2 + ; GFX10-NEXT: s_mov_b32 s5, s3 + ; GFX10-NEXT: buffer_load_dword v0, off, s[4:7], 0 +-; GFX10-NEXT: s_branch .LBB11_6 +-; GFX10-NEXT: .LBB11_5: ++; GFX10-NEXT: s_branch .LBB13_6 ++; GFX10-NEXT: .LBB13_5: + ; GFX10-NEXT: v_mov_b32_e32 v0, s5 +-; GFX10-NEXT: .LBB11_6: ; %endif ++; GFX10-NEXT: .LBB13_6: ; %endif + ; GFX10-NEXT: s_waitcnt lgkmcnt(0) + ; GFX10-NEXT: s_mov_b32 s3, 0x31016000 + ; GFX10-NEXT: s_mov_b32 s2, -1 +@@ -1508,17 +1756,17 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX11-NEXT: s_mov_b32 s4, 0 + ; GFX11-NEXT: s_waitcnt lgkmcnt(0) + ; GFX11-NEXT: s_cmp_lg_u32 s2, 0 +-; GFX11-NEXT: s_cbranch_scc0 .LBB11_2 ++; GFX11-NEXT: s_cbranch_scc0 .LBB13_2 + ; GFX11-NEXT: ; %bb.1: ; %else + ; GFX11-NEXT: s_mul_i32 s5, s2, s3 +-; GFX11-NEXT: s_branch .LBB11_3 +-; GFX11-NEXT: .LBB11_2: ++; GFX11-NEXT: s_branch .LBB13_3 ++; GFX11-NEXT: .LBB13_2: + ; GFX11-NEXT: s_mov_b32 s4, -1 + ; GFX11-NEXT: ; implicit-def: $sgpr5 +-; GFX11-NEXT: .LBB11_3: ; %Flow ++; GFX11-NEXT: .LBB13_3: ; %Flow + ; GFX11-NEXT: s_load_b128 s[0:3], s[0:1], 0x24 + ; GFX11-NEXT: s_and_not1_b32 vcc_lo, exec_lo, s4 +-; GFX11-NEXT: s_cbranch_vccnz .LBB11_5 ++; GFX11-NEXT: s_cbranch_vccnz .LBB13_5 + ; GFX11-NEXT: ; %bb.4: ; %if + ; GFX11-NEXT: s_mov_b32 s7, 0x31016000 + ; GFX11-NEXT: s_mov_b32 s6, -1 +@@ -1526,10 +1774,10 @@ define amdgpu_kernel void @mul32_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX11-NEXT: s_mov_b32 s4, s2 + ; GFX11-NEXT: s_mov_b32 s5, s3 + ; GFX11-NEXT: buffer_load_b32 v0, off, s[4:7], 0 +-; GFX11-NEXT: s_branch .LBB11_6 +-; GFX11-NEXT: .LBB11_5: ++; GFX11-NEXT: s_branch .LBB13_6 ++; GFX11-NEXT: .LBB13_5: + ; GFX11-NEXT: v_mov_b32_e32 v0, s5 +-; GFX11-NEXT: .LBB11_6: ; %endif ++; GFX11-NEXT: .LBB13_6: ; %endif + ; GFX11-NEXT: s_waitcnt lgkmcnt(0) + ; GFX11-NEXT: s_mov_b32 s3, 0x31016000 + ; GFX11-NEXT: s_mov_b32 s2, -1 +@@ -1601,7 +1849,7 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; SI-NEXT: s_waitcnt lgkmcnt(0) + ; SI-NEXT: v_cmp_ne_u64_e64 s[10:11], s[4:5], 0 + ; SI-NEXT: s_and_b64 vcc, exec, s[10:11] +-; SI-NEXT: s_cbranch_vccz .LBB12_4 ++; SI-NEXT: s_cbranch_vccz .LBB14_4 + ; SI-NEXT: ; %bb.1: ; %else + ; SI-NEXT: v_mov_b32_e32 v0, s6 + ; SI-NEXT: v_mul_hi_u32 v0, s4, v0 +@@ -1612,22 +1860,22 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; SI-NEXT: v_add_i32_e32 v1, vcc, s5, v0 + ; SI-NEXT: v_mov_b32_e32 v0, s4 + ; SI-NEXT: s_andn2_b64 vcc, exec, s[8:9] +-; SI-NEXT: s_cbranch_vccnz .LBB12_3 +-; SI-NEXT: .LBB12_2: ; %if ++; SI-NEXT: s_cbranch_vccnz .LBB14_3 ++; SI-NEXT: .LBB14_2: ; %if + ; SI-NEXT: s_mov_b32 s7, 0xf000 + ; SI-NEXT: s_mov_b32 s6, -1 + ; SI-NEXT: s_mov_b32 s4, s2 + ; SI-NEXT: s_mov_b32 s5, s3 + ; SI-NEXT: buffer_load_dwordx2 v[0:1], off, s[4:7], 0 +-; SI-NEXT: .LBB12_3: ; %endif ++; SI-NEXT: .LBB14_3: ; %endif + ; SI-NEXT: s_mov_b32 s3, 0xf000 + ; SI-NEXT: s_mov_b32 s2, -1 + ; SI-NEXT: s_waitcnt vmcnt(0) + ; SI-NEXT: buffer_store_dwordx2 v[0:1], off, s[0:3], 0 + ; SI-NEXT: s_endpgm +-; SI-NEXT: .LBB12_4: ++; SI-NEXT: .LBB14_4: + ; SI-NEXT: ; implicit-def: $vgpr0_vgpr1 +-; SI-NEXT: s_branch .LBB12_2 ++; SI-NEXT: s_branch .LBB14_2 + ; + ; VI-LABEL: mul64_in_branch: + ; VI: ; %bb.0: ; %entry +@@ -1635,7 +1883,7 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; VI-NEXT: s_mov_b64 s[8:9], 0 + ; VI-NEXT: s_waitcnt lgkmcnt(0) + ; VI-NEXT: s_cmp_lg_u64 s[4:5], 0 +-; VI-NEXT: s_cbranch_scc0 .LBB12_4 ++; VI-NEXT: s_cbranch_scc0 .LBB14_4 + ; VI-NEXT: ; %bb.1: ; %else + ; VI-NEXT: v_mov_b32_e32 v0, s6 + ; VI-NEXT: v_mad_u64_u32 v[0:1], s[10:11], s4, v0, 0 +@@ -1644,22 +1892,22 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; VI-NEXT: s_mul_i32 s4, s5, s6 + ; VI-NEXT: v_add_u32_e32 v1, vcc, s4, v1 + ; VI-NEXT: s_andn2_b64 vcc, exec, s[8:9] +-; VI-NEXT: s_cbranch_vccnz .LBB12_3 +-; VI-NEXT: .LBB12_2: ; %if ++; VI-NEXT: s_cbranch_vccnz .LBB14_3 ++; VI-NEXT: .LBB14_2: ; %if + ; VI-NEXT: s_mov_b32 s7, 0xf000 + ; VI-NEXT: s_mov_b32 s6, -1 + ; VI-NEXT: s_mov_b32 s4, s2 + ; VI-NEXT: s_mov_b32 s5, s3 + ; VI-NEXT: buffer_load_dwordx2 v[0:1], off, s[4:7], 0 +-; VI-NEXT: .LBB12_3: ; %endif ++; VI-NEXT: .LBB14_3: ; %endif + ; VI-NEXT: s_mov_b32 s3, 0xf000 + ; VI-NEXT: s_mov_b32 s2, -1 + ; VI-NEXT: s_waitcnt vmcnt(0) + ; VI-NEXT: buffer_store_dwordx2 v[0:1], off, s[0:3], 0 + ; VI-NEXT: s_endpgm +-; VI-NEXT: .LBB12_4: ++; VI-NEXT: .LBB14_4: + ; VI-NEXT: ; implicit-def: $vgpr0_vgpr1 +-; VI-NEXT: s_branch .LBB12_2 ++; VI-NEXT: s_branch .LBB14_2 + ; + ; GFX9-LABEL: mul64_in_branch: + ; GFX9: ; %bb.0: ; %entry +@@ -1667,7 +1915,7 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX9-NEXT: s_mov_b64 s[8:9], 0 + ; GFX9-NEXT: s_waitcnt lgkmcnt(0) + ; GFX9-NEXT: s_cmp_lg_u64 s[4:5], 0 +-; GFX9-NEXT: s_cbranch_scc0 .LBB12_3 ++; GFX9-NEXT: s_cbranch_scc0 .LBB14_3 + ; GFX9-NEXT: ; %bb.1: ; %else + ; GFX9-NEXT: s_mul_i32 s7, s4, s7 + ; GFX9-NEXT: s_mul_hi_u32 s10, s4, s6 +@@ -1676,21 +1924,21 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX9-NEXT: s_add_i32 s5, s7, s5 + ; GFX9-NEXT: s_mul_i32 s4, s4, s6 + ; GFX9-NEXT: s_andn2_b64 vcc, exec, s[8:9] +-; GFX9-NEXT: s_cbranch_vccnz .LBB12_4 +-; GFX9-NEXT: .LBB12_2: ; %if ++; GFX9-NEXT: s_cbranch_vccnz .LBB14_4 ++; GFX9-NEXT: .LBB14_2: ; %if + ; GFX9-NEXT: s_mov_b32 s7, 0xf000 + ; GFX9-NEXT: s_mov_b32 s6, -1 + ; GFX9-NEXT: s_mov_b32 s4, s2 + ; GFX9-NEXT: s_mov_b32 s5, s3 + ; GFX9-NEXT: buffer_load_dwordx2 v[0:1], off, s[4:7], 0 +-; GFX9-NEXT: s_branch .LBB12_5 +-; GFX9-NEXT: .LBB12_3: ++; GFX9-NEXT: s_branch .LBB14_5 ++; GFX9-NEXT: .LBB14_3: + ; GFX9-NEXT: ; implicit-def: $sgpr4_sgpr5 +-; GFX9-NEXT: s_branch .LBB12_2 +-; GFX9-NEXT: .LBB12_4: ++; GFX9-NEXT: s_branch .LBB14_2 ++; GFX9-NEXT: .LBB14_4: + ; GFX9-NEXT: v_mov_b32_e32 v0, s4 + ; GFX9-NEXT: v_mov_b32_e32 v1, s5 +-; GFX9-NEXT: .LBB12_5: ; %endif ++; GFX9-NEXT: .LBB14_5: ; %endif + ; GFX9-NEXT: s_mov_b32 s3, 0xf000 + ; GFX9-NEXT: s_mov_b32 s2, -1 + ; GFX9-NEXT: s_waitcnt vmcnt(0) +@@ -1702,7 +1950,7 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX10-NEXT: s_load_dwordx8 s[0:7], s[0:1], 0x24 + ; GFX10-NEXT: s_waitcnt lgkmcnt(0) + ; GFX10-NEXT: s_cmp_lg_u64 s[4:5], 0 +-; GFX10-NEXT: s_cbranch_scc0 .LBB12_3 ++; GFX10-NEXT: s_cbranch_scc0 .LBB14_3 + ; GFX10-NEXT: ; %bb.1: ; %else + ; GFX10-NEXT: s_mul_i32 s7, s4, s7 + ; GFX10-NEXT: s_mul_hi_u32 s8, s4, s6 +@@ -1711,22 +1959,22 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX10-NEXT: s_mul_i32 s4, s4, s6 + ; GFX10-NEXT: s_add_i32 s5, s7, s5 + ; GFX10-NEXT: s_mov_b32 s6, 0 +-; GFX10-NEXT: s_cbranch_execnz .LBB12_4 +-; GFX10-NEXT: .LBB12_2: ; %if ++; GFX10-NEXT: s_cbranch_execnz .LBB14_4 ++; GFX10-NEXT: .LBB14_2: ; %if + ; GFX10-NEXT: s_mov_b32 s7, 0x31016000 + ; GFX10-NEXT: s_mov_b32 s6, -1 + ; GFX10-NEXT: s_mov_b32 s4, s2 + ; GFX10-NEXT: s_mov_b32 s5, s3 + ; GFX10-NEXT: buffer_load_dwordx2 v[0:1], off, s[4:7], 0 +-; GFX10-NEXT: s_branch .LBB12_5 +-; GFX10-NEXT: .LBB12_3: ++; GFX10-NEXT: s_branch .LBB14_5 ++; GFX10-NEXT: .LBB14_3: + ; GFX10-NEXT: s_mov_b32 s6, -1 + ; GFX10-NEXT: ; implicit-def: $sgpr4_sgpr5 +-; GFX10-NEXT: s_branch .LBB12_2 +-; GFX10-NEXT: .LBB12_4: ++; GFX10-NEXT: s_branch .LBB14_2 ++; GFX10-NEXT: .LBB14_4: + ; GFX10-NEXT: v_mov_b32_e32 v0, s4 + ; GFX10-NEXT: v_mov_b32_e32 v1, s5 +-; GFX10-NEXT: .LBB12_5: ; %endif ++; GFX10-NEXT: .LBB14_5: ; %endif + ; GFX10-NEXT: s_mov_b32 s3, 0x31016000 + ; GFX10-NEXT: s_mov_b32 s2, -1 + ; GFX10-NEXT: s_waitcnt vmcnt(0) +@@ -1738,7 +1986,7 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX11-NEXT: s_load_b256 s[0:7], s[0:1], 0x24 + ; GFX11-NEXT: s_waitcnt lgkmcnt(0) + ; GFX11-NEXT: s_cmp_lg_u64 s[4:5], 0 +-; GFX11-NEXT: s_cbranch_scc0 .LBB12_3 ++; GFX11-NEXT: s_cbranch_scc0 .LBB14_3 + ; GFX11-NEXT: ; %bb.1: ; %else + ; GFX11-NEXT: s_mul_i32 s7, s4, s7 + ; GFX11-NEXT: s_mul_hi_u32 s8, s4, s6 +@@ -1747,21 +1995,21 @@ define amdgpu_kernel void @mul64_in_branch(ptr addrspace(1) %out, ptr addrspace( + ; GFX11-NEXT: s_mul_i32 s4, s4, s6 + ; GFX11-NEXT: s_add_i32 s5, s7, s5 + ; GFX11-NEXT: s_mov_b32 s6, 0 +-; GFX11-NEXT: s_cbranch_execnz .LBB12_4 +-; GFX11-NEXT: .LBB12_2: ; %if ++; GFX11-NEXT: s_cbranch_execnz .LBB14_4 ++; GFX11-NEXT: .LBB14_2: ; %if + ; GFX11-NEXT: s_mov_b32 s7, 0x31016000 + ; GFX11-NEXT: s_mov_b32 s6, -1 + ; GFX11-NEXT: s_mov_b32 s4, s2 + ; GFX11-NEXT: s_mov_b32 s5, s3 + ; GFX11-NEXT: buffer_load_b64 v[0:1], off, s[4:7], 0 +-; GFX11-NEXT: s_branch .LBB12_5 +-; GFX11-NEXT: .LBB12_3: ++; GFX11-NEXT: s_branch .LBB14_5 ++; GFX11-NEXT: .LBB14_3: + ; GFX11-NEXT: s_mov_b32 s6, -1 + ; GFX11-NEXT: ; implicit-def: $sgpr4_sgpr5 +-; GFX11-NEXT: s_branch .LBB12_2 +-; GFX11-NEXT: .LBB12_4: ++; GFX11-NEXT: s_branch .LBB14_2 ++; GFX11-NEXT: .LBB14_4: + ; GFX11-NEXT: v_dual_mov_b32 v0, s4 :: v_dual_mov_b32 v1, s5 +-; GFX11-NEXT: .LBB12_5: ; %endif ++; GFX11-NEXT: .LBB14_5: ; %endif + ; GFX11-NEXT: s_mov_b32 s3, 0x31016000 + ; GFX11-NEXT: s_mov_b32 s2, -1 + ; GFX11-NEXT: s_waitcnt vmcnt(0) +-- +2.31.1 + diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 8f975b70720c19..99a2e674881791 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,16 +14,21 @@ class LlvmAmdgpu(CMakePackage): """Toolkit for the construction of highly optimized compilers, optimizers, and run-time environments.""" - homepage = "https://github.com/RadeonOpenCompute/llvm-project" - git = "https://github.com/RadeonOpenCompute/llvm-project.git" - url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/llvm-project" + git = "https://github.com/ROCm/llvm-project.git" + url = "https://github.com/ROCm/llvm-project/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] executables = [r"amdclang", r"amdclang\+\+", r"amdflang", r"clang.*", r"flang.*", "llvm-.*"] generator("ninja") maintainers("srekolam", "renjithravindrankannath", "haampie") + license("Apache-2.0") + version("master", branch="amd-stg-open") + version("6.0.0", sha256="c673708d413d60ca8606ee75c77e9871b6953c59029c987b92f2f6e85f683626") + version("5.7.1", sha256="6b54c422e45ad19c9bf5ab090ec21753e7f7d854ca78132c30eb146657b168eb") + version("5.7.0", sha256="4abdf00b297a77c5886cedb37e63acda2ba11cb9f4c0a64e133b05800aadfcf0") version("5.6.1", sha256="045e43c0c4a3f4f2f1db9fb603a4f1ea3d56e128147e19ba17909eb57d7f08e5") version("5.6.0", sha256="e922bd492b54d99e56ed88c81e2009ed6472059a180b10cc56ce1f9bd2d7b6ed") version("5.5.1", sha256="7d7181f20f89cb0715191aa32914186c67a34258c13457055570d47e15296553") @@ -134,7 +139,8 @@ class LlvmAmdgpu(CMakePackage): provides("libllvm@13", when="@4.3:4.9") provides("libllvm@14", when="@5:5.2") provides("libllvm@15", when="@5.3:5.4") - provides("libllvm@16", when="@5.5:") + provides("libllvm@16", when="@5.5:5.6") + provides("libllvm@17", when="@5.7:") depends_on("cmake@3.4.3:", type="build", when="@:3.8") depends_on("cmake@3.13.4:", type="build", when="@3.9.0:") @@ -162,17 +168,19 @@ class LlvmAmdgpu(CMakePackage): # as per 5.2.0 llvm code. It used to be llvm/bin/../lib/libdevice. # Below patch is to look in the old path. patch("adjust-openmp-bitcode-directory-for-llvm-link.patch", when="@5.2.0:5.6") + patch("0001-update-HIP_PATH-deduction-for-5.7.0.patch", when="@5.7.0:6.0") # Below patch is to set the flag -mcode-object-version=none until # the below fix is available in device-libs release code. - # https://github.com/RadeonOpenCompute/ROCm-Device-Libs/commit/f0356159dbdc93ea9e545f9b61a7842f9c881fdf - patch("patch-llvm-5.5.0.patch", when="@5.5: +rocm-device-libs") + # https://github.com/ROCm/ROCm-Device-Libs/commit/f0356159dbdc93ea9e545f9b61a7842f9c881fdf + patch("patch-llvm-5.5.0.patch", when="@5.5:5.7 +rocm-device-libs") # i1 muls can sometimes happen after SCEV. # They resulted in ISel failures because we were missing the patterns for them. # This fix is targeting 6.1 rocm release. # Need patch until https://github.com/llvm/llvm-project/pull/67291 is merged. patch("001-Add-i1-mul-patterns.patch", when="@5.6") + patch("001-Add-i1-mul-patterns-5.7.patch", when="@5.7") conflicts("^cmake@3.19.0") @@ -181,6 +189,9 @@ class LlvmAmdgpu(CMakePackage): # Add device libs sources so they can be an external LLVM project for d_version, d_shasum in [ + ("6.0.0", "198df4550d4560537ba60ac7af9bde31d59779c8ec5d6309627f77a43ab6ef6f"), + ("5.7.1", "703de8403c0bd0d80f37c970a698f10f148daf144d34f982e4484d04f7c7bbef"), + ("5.7.0", "0f8780b9098573f1c456bdc84358de924dcf00604330770a383983e1775bf61e"), ("5.6.1", "f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c"), ("5.6.0", "efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921"), ("5.5.1", "3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833"), @@ -212,7 +223,7 @@ class LlvmAmdgpu(CMakePackage): resource( name="rocm-device-libs", placement="rocm-device-libs", - url="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-{0}.tar.gz".format( + url="https://github.com/ROCm/ROCm-Device-Libs/archive/rocm-{0}.tar.gz".format( d_version ), sha256=d_shasum, @@ -222,45 +233,50 @@ class LlvmAmdgpu(CMakePackage): resource( name="rocm-device-libs", placement="rocm-device-libs", - git="https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git", + git="https://github.com/ROCm/ROCm-Device-Libs.git", branch="amd-stg-open", when="@master +rocm-device-libs", ) - for d_version, d_shasum in [ + ("6.0.0", "99e8fa1af52d0bf382f28468e1a345af1ff3452c35914a6a7b5eeaf69fc568db"), + ("5.7.1", "655e9bfef4b0b6ad3f9b89c934dc0a8377273bb0bccbda6c399ac5d5d2c1c04c"), + ("5.7.0", "2c56ec5c78a36f2b847afd4632cb25dbf6ecc58661eb2ae038c2552342e6ce23"), ("5.6.1", "4de9a57c2092edf9398d671c8a2c60626eb7daf358caf710da70d9c105490221"), ("5.6.0", "30875d440df9d8481ffb24d87755eae20a0efc1114849a72619ea954f1e9206c"), ]: resource( name="hsa-runtime", placement="hsa-runtime", - url=f"https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-{d_version}.tar.gz", + url=f"https://github.com/ROCm/ROCR-Runtime/archive/rocm-{d_version}.tar.gz", sha256=d_shasum, when="@{0}".format(d_version), ) resource( name="hsa-runtime", placement="hsa-runtime", - git="https://github.com/RadeonOpenCompute/ROCR-Runtime.git", + git="https://github.com/ROCm/ROCR-Runtime.git", branch="master", when="@master", ) for d_version, d_shasum in [ + ("6.0.0", "04353d27a512642a5e5339532a39d0aabe44e0964985de37b150a2550385800a"), + ("5.7.1", "3b9433b4a0527167c3e9dfc37a3c54e0550744b8d4a8e1be298c8d4bcedfee7c"), + ("5.7.0", "e234bcb93d602377cfaaacb59aeac5796edcd842a618162867b7e670c3a2c42c"), ("5.6.1", "0a85d84619f98be26ca7a32c71f94ed3c4e9866133789eabb451be64ce739300"), ("5.6.0", "9396a7238b547ee68146c669b10b9d5de8f1d76527c649133c75d8076a185a72"), ]: resource( name="comgr", placement="comgr", - url=f"https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-{d_version}.tar.gz", + url=f"https://github.com/ROCm/ROCm-CompilerSupport/archive/rocm-{d_version}.tar.gz", sha256=d_shasum, when="@{0}".format(d_version), ) resource( name="comgr", placement="comgr", - git="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git", + git="https://github.com/ROCm/ROCm-CompilerSupport.git", branch="amd-stg-open", when="@master", ) @@ -330,6 +346,9 @@ def cmake_args(self): if self.spec.satisfies("@5.5.0:"): args.append("-DCLANG_DEFAULT_RTLIB=compiler-rt") args.append("-DCLANG_DEFAULT_UNWINDLIB=libgcc") + if self.spec.satisfies("@5.5.0:"): + args.append("-DCLANG_DEFAULT_RTLIB=compiler-rt") + args.append("-DCLANG_DEFAULT_UNWINDLIB=libgcc") if self.spec.satisfies("@5.6.0:"): hsainc_path = os.path.join(self.stage.source_path, "hsa-runtime/src/inc") comgrinc_path = os.path.join(self.stage.source_path, "comgr/lib/comgr/include") diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index d3a91114ad55b6..8402e0c7434b81 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -405,13 +405,11 @@ def cmake_args(self): define = self.define from_variant = self.define_from_variant - python = spec["python"] cmake_args = [ define("LLVM_REQUIRES_RTTI", True), define("LLVM_ENABLE_RTTI", True), define("LLVM_ENABLE_EH", True), define("CLANG_DEFAULT_OPENMP_RUNTIME", "libomp"), - define("PYTHON_EXECUTABLE", python.command.path), define("LIBOMP_USE_HWLOC", True), define("LIBOMP_HWLOC_INSTALL_DIR", spec["hwloc"].prefix), ] @@ -420,11 +418,6 @@ def cmake_args(self): if version_suffix != "none": cmake_args.append(define("LLVM_VERSION_SUFFIX", version_suffix)) - if python.version >= Version("3"): - cmake_args.append(define("Python3_EXECUTABLE", python.command.path)) - else: - cmake_args.append(define("Python2_EXECUTABLE", python.command.path)) - projects = [] runtimes = [] diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index 930e9e7077972f..cb35ca36d25981 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LlvmOpenmpOmpt(CMakePackage): homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" git = "https://github.com/OpenMPToolsInterface/LLVM-openmp.git" + license("MIT") + # tr6_forwards branch (last commit from 2017) version("tr6_forwards", commit="4b29de49ce90cfb5c3cbc6bb7d91660b70bddb5d") version("3.9.2b2", commit="5cdca5dd3c0c336d42a335ca7cff622e270c9d47") diff --git a/var/spack/repos/builtin/packages/llvm-openmp/package.py b/var/spack/repos/builtin/packages/llvm-openmp/package.py index ce27b342efac93..b826e86a366f5e 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LlvmOpenmp(CMakePackage): homepage = "https://openmp.llvm.org/" url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/openmp-14.0.6.src.tar.xz" + license("Apache-2.0") + version("16.0.0", sha256="e30f69c6533157ec4399193ac6b158807610815accfbed98695d72074e4bedd0") version("14.0.6", sha256="4f731ff202add030d9d68d4c6daabd91d3aeed9812e6a5b4968815cfdff0eb1f") version("12.0.1", sha256="60fe79440eaa9ebf583a6ea7f81501310388c02754dbe7dc210776014d06b091") diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 383871353fe9fa..266922926b3d29 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -34,6 +34,8 @@ class Llvm(CMakePackage, CudaPackage): family = "compiler" # Used by lmod + license("Apache-2.0") + version("main", branch="main") version("17.0.4", sha256="46200b79f52a02fe26d0a43fd856ab6ceff49ab2a0b7c240ac4b700a6ada700c") version("17.0.3", sha256="1e3d9d04fb5fbd8d0080042ad72c7e2a5c68788b014b186647a604dbbdd625d2") @@ -246,6 +248,7 @@ class Llvm(CMakePackage, CudaPackage): description="Enable zstd support for static analyzer / lld", ) + provides("libllvm@17", when="@17.0.0:17") provides("libllvm@16", when="@16.0.0:16") provides("libllvm@15", when="@15.0.0:15") provides("libllvm@14", when="@14.0.0:14") @@ -308,14 +311,14 @@ class Llvm(CMakePackage, CudaPackage): depends_on("swig", when="+python") depends_on("xz") - # Use ^swig cause it's triggered by both python & lua scripting in lldb - with when("^swig"): - depends_on("swig@2:", when="@10:") - depends_on("swig@3:", when="@12:") - depends_on("swig@4:", when="@17:") - # Commits f0a25fe0b746f56295d5c02116ba28d2f965c175 and - # 81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63 fixed swig 4.1 support - depends_on("swig@:4.0", when="@:15") + for _when_spec in ("+lldb+python", "+lldb+lua"): + with when(_when_spec): + depends_on("swig@2:", when="@10:") + depends_on("swig@3:", when="@12:") + depends_on("swig@4:", when="@17:") + # Commits f0a25fe0b746f56295d5c02116ba28d2f965c175 and + # 81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63 fixed swig 4.1 support + depends_on("swig@:4.0", when="@:15") # gold support, required for some features depends_on("binutils+gold+ld+plugins+headers", when="+gold") @@ -428,6 +431,12 @@ class Llvm(CMakePackage, CudaPackage): when="@14:15", ) + # missing 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)): @@ -565,6 +574,8 @@ class Llvm(CMakePackage, CudaPackage): patch("add-include-for-libelf-llvm-12-14.patch", when="@12:14") patch("add-include-for-libelf-llvm-15.patch", when="@15") + patch("sanitizer-platform-limits-posix-xdr-macos.patch", when="@10:14 platform=darwin") + @when("@14:17") def patch(self): # https://github.com/llvm/llvm-project/pull/69458 @@ -755,6 +766,14 @@ def setup_build_environment(self, env): os.symlink(bin, sym) env.prepend_path("PATH", self.stage.path) + def setup_run_environment(self, env): + if "+clang" in self.spec: + env.set("CC", join_path(self.spec.prefix.bin, "clang")) + env.set("CXX", join_path(self.spec.prefix.bin, "clang++")) + if "+flang" in self.spec: + env.set("FC", join_path(self.spec.prefix.bin, "flang")) + env.set("F77", join_path(self.spec.prefix.bin, "flang")) + root_cmakelists_dir = "llvm" def cmake_args(self): @@ -762,13 +781,11 @@ def cmake_args(self): define = self.define from_variant = self.define_from_variant - python = spec["python"] cmake_args = [ define("LLVM_REQUIRES_RTTI", True), define("LLVM_ENABLE_RTTI", True), define("LLVM_ENABLE_LIBXML2", False), define("CLANG_DEFAULT_OPENMP_RUNTIME", "libomp"), - define("PYTHON_EXECUTABLE", python.command.path), define("LIBOMP_USE_HWLOC", True), define("LIBOMP_HWLOC_INSTALL_DIR", spec["hwloc"].prefix), from_variant("LLVM_ENABLE_ZSTD", "zstd"), @@ -792,11 +809,6 @@ def cmake_args(self): if shlib_symbol_version is not None and shlib_symbol_version.value != "none": cmake_args.append(define("LLVM_SHLIB_SYMBOL_VERSION", shlib_symbol_version.value)) - if python.version >= Version("3"): - cmake_args.append(define("Python3_EXECUTABLE", python.command.path)) - else: - cmake_args.append(define("Python2_EXECUTABLE", python.command.path)) - projects = [] runtimes = [] @@ -829,6 +841,12 @@ def cmake_args(self): cmake_args.append(from_variant("LIBOMPTARGET_ENABLE_DEBUG", "libomptarget_debug")) + if spec.satisfies("@14:"): + # The hsa-rocr-dev package may be pulled in through hwloc, which can lead to cmake + # finding libhsa and enabling the AMDGPU plugin. Since we don't support this yet, + # disable explicitly. See commit a05a0c3c2f8eefc80d84b7a87a23a4452d4a3087. + cmake_args.append(define("LIBOMPTARGET_BUILD_AMDGPU_PLUGIN", False)) + if "+lldb" in spec: projects.append("lldb") cmake_args.extend( @@ -933,6 +951,26 @@ def cmake_args(self): # Semicolon seperated list of runtimes to enable if runtimes: + # The older versions are not careful enough with the order of the runtimes. + # Instead of applying + # https://github.com/llvm/llvm-project/commit/06400a0142af8297b5d39b8f34a7c59db6f9910c, + # which might be incompatible with the version that we install, + # we sort the runtimes here according to the same order as + # in the aforementioned commit: + if self.spec.satisfies("@:14"): + runtimes_order = [ + "libc", + "libunwind", + "libcxxabi", + "libcxx", + "compiler-rt", + "openmp", + ] + runtimes.sort( + key=lambda x: runtimes_order.index(x) + if x in runtimes_order + else len(runtimes_order) + ) cmake_args.extend( [ define("LLVM_ENABLE_RUNTIMES", runtimes), @@ -977,7 +1015,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) diff --git a/var/spack/repos/builtin/packages/llvm/sanitizer-platform-limits-posix-xdr-macos.patch b/var/spack/repos/builtin/packages/llvm/sanitizer-platform-limits-posix-xdr-macos.patch new file mode 100644 index 00000000000000..d4477390f529ce --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm/sanitizer-platform-limits-posix-xdr-macos.patch @@ -0,0 +1,11 @@ +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -1250,7 +1250,7 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd); + CHECK_SIZE_AND_OFFSET(group, gr_gid); + CHECK_SIZE_AND_OFFSET(group, gr_mem); + +-#if HAVE_RPC_XDR_H ++#if HAVE_RPC_XDR_H && !SANITIZER_MAC + CHECK_TYPE_SIZE(XDR); + CHECK_SIZE_AND_OFFSET(XDR, x_op); + CHECK_SIZE_AND_OFFSET(XDR, x_ops); diff --git a/var/spack/repos/builtin/packages/lm-sensors/package.py b/var/spack/repos/builtin/packages/lm-sensors/package.py index 9f4fe23a6a648d..bdef319cbf7cbd 100644 --- a/var/spack/repos/builtin/packages/lm-sensors/package.py +++ b/var/spack/repos/builtin/packages/lm-sensors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class LmSensors(MakefilePackage): url = "https://github.com/groeck/lm-sensors/archive/V3-4-0.tar.gz" maintainers("G-Ragghianti") + license("LGPL-2.1-or-later AND GPL-2.0-or-later") + version("3-6-0", sha256="0591f9fa0339f0d15e75326d0365871c2d4e2ed8aa1ff759b3a55d3734b7d197") version("3-5-0", sha256="f671c1d63a4cd8581b3a4a775fd7864a740b15ad046fe92038bcff5c5134d7e0") version("3-4-0", sha256="e334c1c2b06f7290e3e66bdae330a5d36054701ffd47a5dde7a06f9a7402cb4e") diff --git a/var/spack/repos/builtin/packages/lmbench/package.py b/var/spack/repos/builtin/packages/lmbench/package.py index 8564e10cc7de7e..a94a2793ab0851 100644 --- a/var/spack/repos/builtin/packages/lmbench/package.py +++ b/var/spack/repos/builtin/packages/lmbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lmbench(MakefilePackage): homepage = "http://lmbench.sourceforge.net/" git = "https://github.com/intel/lmbench.git" + license("GPL-2.0-only") + version("master", branch="master") depends_on("libtirpc") diff --git a/var/spack/repos/builtin/packages/lmdb/package.py b/var/spack/repos/builtin/packages/lmdb/package.py index 68a89213dd18d9..6e8c9667a904e9 100644 --- a/var/spack/repos/builtin/packages/lmdb/package.py +++ b/var/spack/repos/builtin/packages/lmdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lmdb(MakefilePackage): homepage = "https://lmdb.tech/" url = "https://github.com/LMDB/lmdb/archive/LMDB_0.9.21.tar.gz" + license("OLDAP-2.8") + version("0.9.31", sha256="dd70a8c67807b3b8532b3e987b0a4e998962ecc28643e1af5ec77696b081c9b0") version("0.9.29", sha256="22054926b426c66d8f2bc22071365df6e35f3aacf19ad943bc6167d4cae3bebb") version("0.9.24", sha256="44602436c52c29d4f301f55f6fd8115f945469b868348e3cddaf91ab2473ea26") diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index af3b8a7b6cbf3b..b1b0fd4e1579ac 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Lmod(AutotoolsPackage): homepage = "https://www.tacc.utexas.edu/research-development/tacc-projects/lmod" url = "https://github.com/TACC/Lmod/archive/8.5.6.tar.gz" + license("MIT") + version("8.7.24", sha256="8451267652059b6507b652e1b563929ecf9b689ffb20830642085eb6a55bd539") version("8.7.20", sha256="c04deff7d2ca354610a362459a7aa9a1c642a095e45a4b0bb2471bb3254e85f4") version("8.7.18", sha256="b9912caca1557dd0c17113bceb1a4952e0ae75331d38df6361601db3f80366af") diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py index 810d621d5e8d4d..3c34408946f129 100644 --- a/var/spack/repos/builtin/packages/lndir/package.py +++ b/var/spack/repos/builtin/packages/lndir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lodepng/package.py b/var/spack/repos/builtin/packages/lodepng/package.py index 5554e2d370d817..0fe2cc6375b1f9 100644 --- a/var/spack/repos/builtin/packages/lodepng/package.py +++ b/var/spack/repos/builtin/packages/lodepng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lodepng(MakefilePackage): homepage = "https://lodev.org/lodepng/" git = "https://github.com/lvandeve/lodepng.git" + license("Zlib") + version("master", branch="master") depends_on("sdl2") diff --git a/var/spack/repos/builtin/packages/log4c/package.py b/var/spack/repos/builtin/packages/log4c/package.py index d4384251bfdf6d..95fbd8fe3a8ea0 100644 --- a/var/spack/repos/builtin/packages/log4c/package.py +++ b/var/spack/repos/builtin/packages/log4c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Log4c(AutotoolsPackage): homepage = "http://log4c.sourceforge.net/" url = "https://downloads.sourceforge.net/project/log4c/log4c/1.2.4/log4c-1.2.4.tar.gz" + license("LGPL-2.1-or-later") + version("1.2.4", sha256="5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea") depends_on("expat@1.95.1:") diff --git a/var/spack/repos/builtin/packages/log4cplus/package.py b/var/spack/repos/builtin/packages/log4cplus/package.py index cb29bc6efb845d..6c3e6377817658 100644 --- a/var/spack/repos/builtin/packages/log4cplus/package.py +++ b/var/spack/repos/builtin/packages/log4cplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Log4cplus(CMakePackage): homepage = "https://sourceforge.net/projects/log4cplus/" url = "https://download.sourceforge.net/project/log4cplus/log4cplus-stable/2.0.1/log4cplus-2.0.1.tar.bz2" + license("Apache-2.0 AND BSD-2-Clause") + version("2.0.7", sha256="8fadbafee2ba4e558a0f78842613c9fb239c775d83f23340d091084c0e1b12ab") version("2.0.1", sha256="43baa7dec3db1ecc97dd9ecf3b50220439d2c7041d15860c36aa1d48dcf480b5") version("1.2.1", sha256="ada80be050033d7636beb894eb54de5575ceca95a5572e9437b0fc4ed7d877c4") diff --git a/var/spack/repos/builtin/packages/log4cpp/package.py b/var/spack/repos/builtin/packages/log4cpp/package.py index 771ad6a0d12908..165ed73b7fb3b4 100644 --- a/var/spack/repos/builtin/packages/log4cpp/package.py +++ b/var/spack/repos/builtin/packages/log4cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class Log4cpp(AutotoolsPackage): homepage = "http://log4cpp.sourceforge.net/" url = "http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.3.tar.gz" + license("LGPL-2.1-or-later") + version("1.1.3", sha256="2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d") diff --git a/var/spack/repos/builtin/packages/log4cxx/package.py b/var/spack/repos/builtin/packages/log4cxx/package.py index ff2991fa5c615e..b8554125319bac 100644 --- a/var/spack/repos/builtin/packages/log4cxx/package.py +++ b/var/spack/repos/builtin/packages/log4cxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Log4cxx(CMakePackage): maintainers("nicmcd") + license("Apache-2.0") + version("0.12.1", sha256="7bea5cb477f0e31c838f0e1f4f498cc3b30c2eae74703ddda923e7e8c2268d22") version("0.12.0", sha256="bd5b5009ca914c8fa7944b92ea6b4ca6fb7d146f65d526f21bf8b3c6a0520e44") diff --git a/var/spack/repos/builtin/packages/logrotate/package.py b/var/spack/repos/builtin/packages/logrotate/package.py index 59e691585d3bf8..4983a7fb8b56e6 100644 --- a/var/spack/repos/builtin/packages/logrotate/package.py +++ b/var/spack/repos/builtin/packages/logrotate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Logrotate(AutotoolsPackage): homepage = "https://github.com/logrotate/logrotate" url = "https://github.com/logrotate/logrotate/archive/3.17.0.tar.gz" + license("GPL-2.0-or-later") + version("3.21.0", sha256="7f58d6ab7e4eab3403528a88d3747a91b03e83e866a8fb966551016e0df527bb") version("3.17.0", sha256="c25ea219018b024988b791e91e9f6070c34d2056efa6ffed878067866c0ed765") version("3.16.0", sha256="bc6acfd09925045d48b5ff553c24c567cfd5f59d513c4ac34bfb51fa6b79dc8a") diff --git a/var/spack/repos/builtin/packages/logstash/package.py b/var/spack/repos/builtin/packages/logstash/package.py index b37f6ac87fafde..c7b922b06a1f5f 100644 --- a/var/spack/repos/builtin/packages/logstash/package.py +++ b/var/spack/repos/builtin/packages/logstash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/loki/package.py b/var/spack/repos/builtin/packages/loki/package.py index c43fc5c4819f2e..46e670640230d5 100644 --- a/var/spack/repos/builtin/packages/loki/package.py +++ b/var/spack/repos/builtin/packages/loki/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Loki(MakefilePackage): url = "https://downloads.sourceforge.net/project/loki-lib/Loki/Loki%200.1.7/loki-0.1.7.tar.bz2" tags = ["e4s"] + license("Apache-2.0") + version("0.1.7", sha256="07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198") variant("shared", default=True, description="Build shared libraries") diff --git a/var/spack/repos/builtin/packages/looptools/package.py b/var/spack/repos/builtin/packages/looptools/package.py index 5c5ac66506b75a..52d56aca59565a 100644 --- a/var/spack/repos/builtin/packages/looptools/package.py +++ b/var/spack/repos/builtin/packages/looptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Looptools(AutotoolsPackage): homepage = "http://www.feynarts.de/looptools/" url = "http://www.feynarts.de/looptools/LoopTools-2.15.tar.gz" + license("LGPL-3.0-or-later") + version("2.16", sha256="412731a5950f10e2ea3877ceec8655ae18ca856610364e4b6616a8a25d592f2c") version("2.15", sha256="a065ffdc4fe6882aa3bb926134ba8ec875d6c0a633c3d4aa5f70db26542713f2") version("2.8", sha256="2395518d0eac9b0883a2c249b9a5ba80df443929c520c45e60f5a4284166eb42") diff --git a/var/spack/repos/builtin/packages/lordec/package.py b/var/spack/repos/builtin/packages/lordec/package.py index f441c2859f4553..24e6f2d9a28bfb 100644 --- a/var/spack/repos/builtin/packages/lordec/package.py +++ b/var/spack/repos/builtin/packages/lordec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lordec(MakefilePackage): homepage = "http://www.atgc-montpellier.fr/lordec/" url = "https://gite.lirmm.fr/lordec/lordec-releases/uploads/e3116a5f251e46e47f7a3b7ddb2bd7f6/lordec-src_0.8.tar.gz" + license("CECILL-2.1") + version("0.9", sha256="8108b82a8404fbf44c7e300d3abb43358ccc28993f90546168a20ca82536923b") version("0.8", sha256="3894a7c57649a3545b598f92a48d55eda66d729ab51606b00470c50611b12823") diff --git a/var/spack/repos/builtin/packages/lorene/package.py b/var/spack/repos/builtin/packages/lorene/package.py index 519e433e85f0b9..76ad46d1e141f2 100644 --- a/var/spack/repos/builtin/packages/lorene/package.py +++ b/var/spack/repos/builtin/packages/lorene/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lp-solve/package.py b/var/spack/repos/builtin/packages/lp-solve/package.py index aeb18adc4f0a12..4f4b36117dc6a2 100644 --- a/var/spack/repos/builtin/packages/lp-solve/package.py +++ b/var/spack/repos/builtin/packages/lp-solve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lrslib/package.py b/var/spack/repos/builtin/packages/lrslib/package.py index 00b7c8506c822b..b07e73e42449b1 100644 --- a/var/spack/repos/builtin/packages/lrslib/package.py +++ b/var/spack/repos/builtin/packages/lrslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lrslib(Package): homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html" url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-062.tar.gz" + license("GPL-2.0-only") + version("6.2", sha256="adf92f9c7e70c001340b9c28f414208d49c581df46b550f56ab9a360348e4f09") version("6.1", sha256="6d5b30ee67e1fdcd6bf03e14717616f18912d59b3707f6d53f9c594c1674ec45") version("6.0", sha256="1a569786ecd89ef4f2ddee5ebc32e321f0339505be40f4ffbd2daa95fed1c505") diff --git a/var/spack/repos/builtin/packages/lrzip/package.py b/var/spack/repos/builtin/packages/lrzip/package.py index 88b66f4fc33c0b..34224cad8b70b4 100644 --- a/var/spack/repos/builtin/packages/lrzip/package.py +++ b/var/spack/repos/builtin/packages/lrzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Lrzip(Package): url = "https://github.com/ckolivas/lrzip/archive/v0.630.tar.gz" git = "https://github.com/ckolivas/lrzip.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("0.651", sha256="f4c84de778a059123040681fd47c17565fcc4fec0ccc68fcf32d97fad16cd892") version("0.630", sha256="7b9bf6415fb2294a8e83a5a1c6a8d7da17a19f4730567c8fa16e3016d79250a6") diff --git a/var/spack/repos/builtin/packages/lsd/package.py b/var/spack/repos/builtin/packages/lsd/package.py new file mode 100644 index 00000000000000..c7d63d41ddb989 --- /dev/null +++ b/var/spack/repos/builtin/packages/lsd/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Lsd(CargoPackage): + """A rewrite of GNU ls with lots of added features like colors, icons, tree-view, + more formatting options etc.""" + + homepage = "https://github.com/lsd-rs/lsd" + url = "https://github.com/lsd-rs/lsd/archive/refs/tags/v1.0.0.tar.gz" + + maintainers("trws") + + license("Apache-2.0") + + version("1.0.0", sha256="ab34e9c85bc77cfa42b43bfb54414200433a37419f3b1947d0e8cfbb4b7a6325") + + depends_on("rust@1.63:") diff --git a/var/spack/repos/builtin/packages/lsf/package.py b/var/spack/repos/builtin/packages/lsf/package.py index 572f5b4b77cf23..bb990706a9c76d 100644 --- a/var/spack/repos/builtin/packages/lsf/package.py +++ b/var/spack/repos/builtin/packages/lsf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lshw/package.py b/var/spack/repos/builtin/packages/lshw/package.py index 6950a5cabb5074..dd6e49a0f49f2a 100644 --- a/var/spack/repos/builtin/packages/lshw/package.py +++ b/var/spack/repos/builtin/packages/lshw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Lshw(MakefilePackage): homepage = "https://github.com/lyonel/lshw" url = "https://github.com/lyonel/lshw/archive/B.02.18.tar.gz" + license("GPL-3.0-or-later") + version("02.18", sha256="aa8cb2eebf36e9e46dfc227f24784aa8c87181ec96e57ee6c455da8a0ce4fa77") version("02.17", sha256="0bb76c7df7733dc9b80d5d35f9d9752409ddb506e190453a2cc960461de5ddeb") version("02.16", sha256="58a7731d204791dd33db5eb3fde9808d1235283e069e6c33a193637ccec27b3e") diff --git a/var/spack/repos/builtin/packages/lsof/package.py b/var/spack/repos/builtin/packages/lsof/package.py index 16a2ad86bbe6f4..7506504c339598 100644 --- a/var/spack/repos/builtin/packages/lsof/package.py +++ b/var/spack/repos/builtin/packages/lsof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Lsof(Package): url = "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.91.tar.gz" list_url = "https://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/" + license("custom") + version("4.91", sha256="3ca57887470fdf223a8e8aae4559cd3a26787bea93b94336c90ee8062e29e352") version("4.90", sha256="27794d3d6499fd5f0f08710b4518b33aed8a4580951d1adf27f6c25898685c9e") version("4.89", sha256="5d08da7ebe049c9d9a6472d6afb81aa5af54c4733a3f8822cbc22b57867633c9") diff --git a/var/spack/repos/builtin/packages/lsscsi/package.py b/var/spack/repos/builtin/packages/lsscsi/package.py index aaa48e57800af4..2042e3b6b89126 100644 --- a/var/spack/repos/builtin/packages/lsscsi/package.py +++ b/var/spack/repos/builtin/packages/lsscsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lsscsi(AutotoolsPackage): homepage = "https://sg.danny.cz/scsi/lsscsi.html" url = "https://sg.danny.cz/scsi/lsscsi-0.31.tgz" + license("GPL-2.0-or-later") + version("0.32", sha256="0a800e9e94dca2ab702d65d72777ae8cae078e3d74d0bcbed64ba0849e8029a1") version("0.31", sha256="12bf1973014803c6fd6d547e7594a4c049f0eef3bf5d22190d4be29d7c09f3ca") version("0.30", sha256="619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15") diff --git a/var/spack/repos/builtin/packages/ltp/package.py b/var/spack/repos/builtin/packages/ltp/package.py index f4fe0472361d40..f2dc4a280cbcb1 100644 --- a/var/spack/repos/builtin/packages/ltp/package.py +++ b/var/spack/repos/builtin/packages/ltp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ltp(AutotoolsPackage): homepage = "https://github.com/linux-test-project/ltp" url = "https://github.com/linux-test-project/ltp/archive/20190517.tar.gz" + license("GPL-2.0-only") + version("20230516", sha256="6f2578fa1687093acf615544ab5ea814b792461bd314c79738bac4d511e3a10c") version("20230127", sha256="ecefb6147dff5abd821a7f621ec2845ade22b8adf3022c0a451f79ecd02ab6f7") version("20190930", sha256="eca11dbe11a61f3035561a2aa272d578ca9380563440f9ba876c0c4755a42533") diff --git a/var/spack/repos/builtin/packages/ltr-retriever/package.py b/var/spack/repos/builtin/packages/ltr-retriever/package.py index 5d5fd52004d13d..e54698684b56b9 100644 --- a/var/spack/repos/builtin/packages/ltr-retriever/package.py +++ b/var/spack/repos/builtin/packages/ltr-retriever/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class LtrRetriever(Package): maintainers("snehring") + license("GPL-3.0-only") + version("2.9.4", sha256="a9f4668113d2d75ab97cd85b456f11b00afd4876848a8ef099622ec0d9e505e7") version("2.8.7", sha256="29ca6f699c57b5e964aa0ee6c7d3e1e4cd5362dadd789e5f0e8c82fe0bb29369") diff --git a/var/spack/repos/builtin/packages/ltrace/package.py b/var/spack/repos/builtin/packages/ltrace/package.py index 1886e3d679c0d2..3db1d32379e986 100644 --- a/var/spack/repos/builtin/packages/ltrace/package.py +++ b/var/spack/repos/builtin/packages/ltrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ltrace(AutotoolsPackage): homepage = "https://www.ltrace.org" url = "https://www.ltrace.org/ltrace_0.7.3.orig.tar.bz2" + license("GPL-2.0-or-later") + version("0.7.3", sha256="0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503") conflicts("platform=darwin", msg="ltrace runs only on Linux.") diff --git a/var/spack/repos/builtin/packages/lua-bit32/package.py b/var/spack/repos/builtin/packages/lua-bit32/package.py index 18d154833ff5a4..2dcd24dd34adff 100644 --- a/var/spack/repos/builtin/packages/lua-bit32/package.py +++ b/var/spack/repos/builtin/packages/lua-bit32/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LuaBit32(LuaPackage): homepage = "https://luarocks.org/modules/siffiejoe/bit32/" url = "https://luarocks.org/manifests/siffiejoe/bit32-5.3.5.1-1.src.rock" + license("MIT") + version( "5.3.5.1-1", sha256="0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c", diff --git a/var/spack/repos/builtin/packages/lua-bitlib/package.py b/var/spack/repos/builtin/packages/lua-bitlib/package.py index 9ec3fb68cac273..a125690f45e309 100644 --- a/var/spack/repos/builtin/packages/lua-bitlib/package.py +++ b/var/spack/repos/builtin/packages/lua-bitlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lua-ffi/package.py b/var/spack/repos/builtin/packages/lua-ffi/package.py index 76b6f2b5d1592e..cecf7a11d58e3d 100644 --- a/var/spack/repos/builtin/packages/lua-ffi/package.py +++ b/var/spack/repos/builtin/packages/lua-ffi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LuaFfi(LuaPackage): maintainers("trws") + license("BSD-3-Clause") + version( "0.0.1.fakever", git="https://github.com/facebook/luaffifb/", diff --git a/var/spack/repos/builtin/packages/lua-lpeg/package.py b/var/spack/repos/builtin/packages/lua-lpeg/package.py index 0713efd8bd1a28..0e00475866a172 100644 --- a/var/spack/repos/builtin/packages/lua-lpeg/package.py +++ b/var/spack/repos/builtin/packages/lua-lpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class LuaLpeg(LuaPackage): homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/" url = "https://luarocks.org/manifests/gvvaughan/lpeg-1.0.2-1.src.rock" + license("MIT") + version( "1.0.2-1", sha256="e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc", diff --git a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py index 5dd291d6349691..7e072a5f37676e 100644 --- a/var/spack/repos/builtin/packages/lua-luafilesystem/package.py +++ b/var/spack/repos/builtin/packages/lua-luafilesystem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ def url_for_version(self, version): url = "https://github.com/lunarmodules/luafilesystem/archive/refs/tags/v{0}.tar.gz" return url.format(version.underscored) + license("MIT") + version("1.8.0", sha256="16d17c788b8093f2047325343f5e9b74cccb1ea96001e45914a58bbae8932495") version("1.7.0-2", sha256="23b4883aeb4fb90b2d0f338659f33a631f9df7a7e67c54115775a77d4ac3cc59") version("1.6.3", sha256="11c7b1fc2e560c0a521246b84e6257138d97dddde5a19e405714dbabcb9436ca") diff --git a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py index 081e07fe6c2e10..e6d21a5c76a03f 100644 --- a/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit-openresty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LuaLuajitOpenresty(LuaImplPackage): homepage = "https://openresty.org/en/luajit.html" url = "https://github.com/openresty/luajit2/archive/refs/tags/v2.1-20230410.tar.gz" + license("MIT") + version( "2.1-20220111", sha256="1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3" ) diff --git a/var/spack/repos/builtin/packages/lua-luajit/package.py b/var/spack/repos/builtin/packages/lua-luajit/package.py index dfe9f51cd0bd8b..d771de3e9aa921 100644 --- a/var/spack/repos/builtin/packages/lua-luajit/package.py +++ b/var/spack/repos/builtin/packages/lua-luajit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LuaLuajit(LuaImplPackage): homepage = "https://www.luajit.org" url = "https://luajit.org/download/LuaJIT-2.0.5.tar.gz" + license("MIT") + version( "2.1.0-beta3", sha256="1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3" ) diff --git a/var/spack/repos/builtin/packages/lua-luaposix/package.py b/var/spack/repos/builtin/packages/lua-luaposix/package.py index 54c93051bcf465..1f2cc52f92bb6f 100644 --- a/var/spack/repos/builtin/packages/lua-luaposix/package.py +++ b/var/spack/repos/builtin/packages/lua-luaposix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LuaLuaposix(LuaPackage): homepage = "https://github.com/luaposix/luaposix/" url = "https://github.com/luaposix/luaposix/archive/release-v33.4.0.tar.gz" + license("MIT") + version( "35.0", sha256="a4edf2f715feff65acb009e8d1689e57ec665eb79bc36a6649fae55eafd56809", diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index 3b3c4b55a13d27..da4cd89c4de4c4 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class LuaMpack(LuaPackage): depends_on("msgpack-c") + license("MIT") + version("1.0.9", sha256="0fd07e709c3f6f201c2ffc9f77cef1b303b02c12413f0c15670a32bf6c959e9e") version("1.0.8", sha256="ed6b1b4bbdb56f26241397c1e168a6b1672f284989303b150f7ea8d39d1bc9e9") version("1.0.7", sha256="68565484a3441d316bd51bed1cacd542b7f84b1ecfd37a8bd18dd0f1a20887e8") diff --git a/var/spack/repos/builtin/packages/lua-sol2/package.py b/var/spack/repos/builtin/packages/lua-sol2/package.py index 9ed7440b5932bb..50134e380e65fd 100644 --- a/var/spack/repos/builtin/packages/lua-sol2/package.py +++ b/var/spack/repos/builtin/packages/lua-sol2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py index ab65586205751d..94cb17f409cb0b 100644 --- a/var/spack/repos/builtin/packages/lua/package.py +++ b/var/spack/repos/builtin/packages/lua/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lucene/package.py b/var/spack/repos/builtin/packages/lucene/package.py index f3f8bda27686af..04991b6b8f6b55 100644 --- a/var/spack/repos/builtin/packages/lucene/package.py +++ b/var/spack/repos/builtin/packages/lucene/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Lucene(Package): list_url = "https://archive.apache.org/dist/lucene/java/" list_depth = 1 + license("BSD-2-Clause") + version("9.5.0", sha256="547277a2b6ce283422eccd14e9ee7ffb28b1af3975936959716c9b4d85843555") version("8.3.1", sha256="acd61ad458d16f3c98b9dd4653c6a34dd666a965842e461f7cdf8947fa041e1a") version("8.3.0", sha256="67c4f8081f24ff9f4eb4f2b999ac19f7a639b416e5b6f1c1c74e0524a481fc7e") diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py index 6ce2364fb15ebe..1f9e7ca6424033 100644 --- a/var/spack/repos/builtin/packages/luit/package.py +++ b/var/spack/repos/builtin/packages/luit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Luit(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/luit" xorg_mirror_path = "app/luit-1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="87b0be0bd01f3b857a53e6625bdd31cef18418c95394b7f4387f8ecef78e45da") depends_on("libfontenc") diff --git a/var/spack/repos/builtin/packages/lulesh/package.py b/var/spack/repos/builtin/packages/lulesh/package.py index 6025944989092c..d991975c2ee737 100644 --- a/var/spack/repos/builtin/packages/lulesh/package.py +++ b/var/spack/repos/builtin/packages/lulesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lumpy-sv/package.py b/var/spack/repos/builtin/packages/lumpy-sv/package.py index 4bda72ee322de8..71f316db949860 100644 --- a/var/spack/repos/builtin/packages/lumpy-sv/package.py +++ b/var/spack/repos/builtin/packages/lumpy-sv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class LumpySv(MakefilePackage): homepage = "https://github.com/arq5x/lumpy-sv" url = "https://github.com/arq5x/lumpy-sv/archive/0.2.13.tar.gz" + license("MIT") + version("0.2.13", sha256="3672b86ef0190ebe520648a6140077ee9f15b0549cb233dca18036e63bbf6375") depends_on("htslib") diff --git a/var/spack/repos/builtin/packages/lustre/package.py b/var/spack/repos/builtin/packages/lustre/package.py index 23e01143b56739..661631101b6194 100644 --- a/var/spack/repos/builtin/packages/lustre/package.py +++ b/var/spack/repos/builtin/packages/lustre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lvarray/package.py b/var/spack/repos/builtin/packages/lvarray/package.py index e5c9a3d507f41f..86c7dd07801570 100644 --- a/var/spack/repos/builtin/packages/lvarray/package.py +++ b/var/spack/repos/builtin/packages/lvarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -40,6 +40,8 @@ class Lvarray(CMakePackage, CudaPackage): maintainers("corbett5") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=False) version("main", branch="main", submodules=False) version( diff --git a/var/spack/repos/builtin/packages/lvm2/package.py b/var/spack/repos/builtin/packages/lvm2/package.py index aad5dfce7c3c65..cc005e970a0606 100644 --- a/var/spack/repos/builtin/packages/lvm2/package.py +++ b/var/spack/repos/builtin/packages/lvm2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Lvm2(AutotoolsPackage, SourcewarePackage): homepage = "https://www.sourceware.org/lvm2" sourceware_mirror_path = "lvm2/LVM2.2.03.14.tgz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause") + version("2.03.14", sha256="4a63bc8a084a8ae3c7bc5e6530cac264139d218575c64416c8b99e3fe039a05c") version("2.03.05", sha256="ca52815c999b20c6d25e3192f142f081b93d01f07b9d787e99664b169dba2700") version("2.03.04", sha256="f151f36fc0039997d2d9369b607b9262568b1a268afe19fd1535807355402142") diff --git a/var/spack/repos/builtin/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py index bb7de3c1660a72..a22fcd5e71c3b2 100644 --- a/var/spack/repos/builtin/packages/lwgrp/package.py +++ b/var/spack/repos/builtin/packages/lwgrp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lwm2/package.py b/var/spack/repos/builtin/packages/lwm2/package.py index f4386ebdd2f69c..50b5f48fc29a33 100644 --- a/var/spack/repos/builtin/packages/lwm2/package.py +++ b/var/spack/repos/builtin/packages/lwm2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/lwtnn/package.py b/var/spack/repos/builtin/packages/lwtnn/package.py index e55266c2ea017d..a823f7cb9ad855 100644 --- a/var/spack/repos/builtin/packages/lwtnn/package.py +++ b/var/spack/repos/builtin/packages/lwtnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Lwtnn(CMakePackage): maintainers("haralmha") + license("MIT") + version("2.13", sha256="d5c1cede00f9d9cc0a25f070f744999453aec477dae6ef02701c11543c5b9553") version("2.12.1", sha256="b820e698d4ed60737e646ca87a42354e8ac548403348b7f2940e8fda1c0f8203") version("2.10", sha256="bf84b290c44da582226344b0d5febf7fdbd1cbdee94fcc8bcac972c7355564ed") diff --git a/var/spack/repos/builtin/packages/lxc/package.py b/var/spack/repos/builtin/packages/lxc/package.py index 0474517e7a6f5b..abc2c88f70be4f 100644 --- a/var/spack/repos/builtin/packages/lxc/package.py +++ b/var/spack/repos/builtin/packages/lxc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Lxc(AutotoolsPackage): homepage = "https://linuxcontainers.org/lxc/" url = "https://github.com/lxc/lxc/archive/lxc-4.0.2.tar.gz" + license("LGPL-2.1-or-later") + version("4.0.2", sha256="89a9f1c6c9c0c43ffc4ec4d281381d60dcf698af1578effa491be97885ab282a") version("4.0.1", sha256="5b17c48db24d93f8a687bf4557358e252126c50a66f5756b3e0ea2cf04a60d05") version("4.0.0", sha256="8cd36f002f656bbcd01679e6b8892f81ed036d5589aed45b36358014b32277dd") diff --git a/var/spack/repos/builtin/packages/lynx/package.py b/var/spack/repos/builtin/packages/lynx/package.py index a1c69da230295d..7b8fb3673fa9d5 100644 --- a/var/spack/repos/builtin/packages/lynx/package.py +++ b/var/spack/repos/builtin/packages/lynx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lynx(AutotoolsPackage): homepage = "https://lynx.invisible-island.net/" url = "https://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.9rel.1.tar.gz" + license("GPL-2.0-only") + version("2.8.9.1", sha256="a46e4167b8f02c066d2fe2eafcc5603367be0e3fe2e59e9fc4eb016f306afc8e") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index d12789f395bf36..039ed14d040abd 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,9 @@ class Lz4(CMakePackage, MakefilePackage): maintainers("AlexanderRichert-NOAA") + # liblz4 is BSD-2-clause; programs, manpages, and everything else are GPL2 + license("BSD-2-Clause AND GPL-2.0-only", checked_by="tgamblin") + version("1.9.4", sha256="0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b") version("1.9.3", sha256="030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1") version("1.9.2", sha256="658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc") diff --git a/var/spack/repos/builtin/packages/lzma/package.py b/var/spack/repos/builtin/packages/lzma/package.py index 14d9b346de3539..46749cfcf445f5 100644 --- a/var/spack/repos/builtin/packages/lzma/package.py +++ b/var/spack/repos/builtin/packages/lzma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,4 +19,6 @@ class Lzma(AutotoolsPackage): homepage = "https://tukaani.org/lzma/" url = "https://tukaani.org/lzma/lzma-4.32.7.tar.gz" + license("LGPL-2.1-or-later") + version("4.32.7", sha256="9f337a8c51e5ded198d1032f5087ba3fe438f2a54e9df419e513a151775b032c") diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py index 59436a1e8e8800..6bb7f3b449e9aa 100644 --- a/var/spack/repos/builtin/packages/lzo/package.py +++ b/var/spack/repos/builtin/packages/lzo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Lzo(AutotoolsPackage): homepage = "https://www.oberhumer.com/opensource/lzo/" url = "https://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz" + license("GPL-2.0-or-later") + version("2.10", sha256="c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072") version("2.09", sha256="f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c") version("2.08", sha256="ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614") diff --git a/var/spack/repos/builtin/packages/lzop/package.py b/var/spack/repos/builtin/packages/lzop/package.py index b490f0623d7139..1d95066711eddb 100644 --- a/var/spack/repos/builtin/packages/lzop/package.py +++ b/var/spack/repos/builtin/packages/lzop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Lzop(CMakePackage): homepage = "https://www.lzop.org" url = "https://www.lzop.org/download/lzop-1.03.tar.gz" + license("GPL-2.0-only") + version("1.04", sha256="7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41") version("1.03", sha256="c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9") version("1.01", sha256="28acd94d933befbc3af986abcfe833173fb7563b66533fdb4ac592f38bb944c7") diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index 7e665557dc1305..cfe1745549b403 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class M4(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/m4/m4.html" gnu_mirror_path = "m4/m4-1.4.18.tar.gz" + license("GPL-3.0-or-later") + version("1.4.19", sha256="3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70") version("1.4.18", sha256="ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab") version("1.4.17", sha256="3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e") diff --git a/var/spack/repos/builtin/packages/macfuse/package.py b/var/spack/repos/builtin/packages/macfuse/package.py index 256068fa40bd03..05de77cd740a59 100644 --- a/var/spack/repos/builtin/packages/macfuse/package.py +++ b/var/spack/repos/builtin/packages/macfuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 188e817b1cfab3..0e601b32d1ea3e 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mad-numdiff/package.py b/var/spack/repos/builtin/packages/mad-numdiff/package.py index 7a65623dd38a8f..b08a180dad5985 100644 --- a/var/spack/repos/builtin/packages/mad-numdiff/package.py +++ b/var/spack/repos/builtin/packages/mad-numdiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class MadNumdiff(CMakePackage): url = "https://github.com/quinoacomputing/ndiff/tarball/20150724" git = "https://github.com/quinoacomputing/ndiff.git" + license("GPL-3.0-only") + version("develop", branch="master") version("20150724", sha256="33130b48416f8dcb6402acbcb8906cdec35b7242fe2f3ad49b7d7c063d75377b") diff --git a/var/spack/repos/builtin/packages/madgraph5amc/package.py b/var/spack/repos/builtin/packages/madgraph5amc/package.py index e83ece249d34cc..eb08e306bdc244 100644 --- a/var/spack/repos/builtin/packages/madgraph5amc/package.py +++ b/var/spack/repos/builtin/packages/madgraph5amc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/madis/package.py b/var/spack/repos/builtin/packages/madis/package.py index 0f860aa6921c40..dbc8c545b02454 100644 --- a/var/spack/repos/builtin/packages/madis/package.py +++ b/var/spack/repos/builtin/packages/madis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/madx/package.py b/var/spack/repos/builtin/packages/madx/package.py index 4a11980ce2e79e..d05ce5197e760e 100644 --- a/var/spack/repos/builtin/packages/madx/package.py +++ b/var/spack/repos/builtin/packages/madx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/maeparser/package.py b/var/spack/repos/builtin/packages/maeparser/package.py index 97f141608f1fb8..da0ef74d0f2a6a 100644 --- a/var/spack/repos/builtin/packages/maeparser/package.py +++ b/var/spack/repos/builtin/packages/maeparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Maeparser(CMakePackage): maintainers("RMeli") + license("MIT") + version("1.3.1", sha256="a8d80f67d1b9be6e23b9651cb747f4a3200132e7d878a285119c86bf44568e36") version("1.3.0", sha256="fa8f9336de1e5d1cabec29a6da04547b1fb040bb32ba511ff30b4a14097c751c") diff --git a/var/spack/repos/builtin/packages/mafft/package.py b/var/spack/repos/builtin/packages/mafft/package.py index 1dd03aa4cea1fb..799dbbc3525ab0 100644 --- a/var/spack/repos/builtin/packages/mafft/package.py +++ b/var/spack/repos/builtin/packages/mafft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 49bf9ab2bc675f..27328311575c50 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Magics(CMakePackage): url = "https://confluence.ecmwf.int/download/attachments/3473464/Magics-4.2.4-Source.tar.gz?api=v2" list_url = "https://software.ecmwf.int/wiki/display/MAGP/Releases" + license("Apache-2.0") + # The policy on which minor releases remain available and which get deleted # after a newer version becomes available is unclear. version("4.9.3", sha256="c01ee7c4b05c5512e93e573748d2766d299fa1a60c226f2a0d0989f3d7c5239b") diff --git a/var/spack/repos/builtin/packages/magma/0001-fix-magma-build-error-with-rocm-6.0.0.patch b/var/spack/repos/builtin/packages/magma/0001-fix-magma-build-error-with-rocm-6.0.0.patch new file mode 100644 index 00000000000000..accc2714194aa1 --- /dev/null +++ b/var/spack/repos/builtin/packages/magma/0001-fix-magma-build-error-with-rocm-6.0.0.patch @@ -0,0 +1,99 @@ +From 4f7d9ff22996ba3000ee344a0f84f73c27257f47 Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Wed, 17 Jan 2024 11:44:32 +0000 +Subject: [PATCH] Fix Build Failure with rocm-6.0.0 . Add extra parameter for + hipblasZtrmm(),hipblasCtrmm()etc + +--- + interface_hip/blas_c_v2.cpp | 3 ++- + interface_hip/blas_d_v2.cpp | 3 ++- + interface_hip/blas_s_v2.cpp | 3 ++- + interface_hip/blas_z_v2.cpp | 3 ++- + interface_hip/interface.cpp | 5 ++--- + 5 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/interface_hip/blas_c_v2.cpp b/interface_hip/blas_c_v2.cpp +index 6147857..a406faf 100644 +--- a/interface_hip/blas_c_v2.cpp ++++ b/interface_hip/blas_c_v2.cpp +@@ -1858,7 +1858,8 @@ magma_ctrmm( + hipblas_diag_const( diag ), + int(m), int(n), + (hipblasComplex*)&alpha, (const hipblasComplex*)dA, int(ldda), +- (hipblasComplex*)dB, int(lddb) ); ++ (hipblasComplex*)dB, int(lddb), ++ (hipblasComplex*)dB, int(lddb) ); /* C same as B; less efficient */ + #else + hipblasCtrmm( + queue->hipblas_handle(), +diff --git a/interface_hip/blas_d_v2.cpp b/interface_hip/blas_d_v2.cpp +index 340f0b2..8c1ecd4 100644 +--- a/interface_hip/blas_d_v2.cpp ++++ b/interface_hip/blas_d_v2.cpp +@@ -1858,7 +1858,8 @@ magma_dtrmm( + hipblas_diag_const( diag ), + int(m), int(n), + (double*)&alpha, (const double*)dA, int(ldda), +- (double*)dB, int(lddb) ); ++ (double*)dB, int(lddb), ++ (double*)dB, int(lddb) ); /* C same as B; less efficient */ + #else + hipblasDtrmm( + queue->hipblas_handle(), +diff --git a/interface_hip/blas_s_v2.cpp b/interface_hip/blas_s_v2.cpp +index 87aeba3..a2cfc02 100644 +--- a/interface_hip/blas_s_v2.cpp ++++ b/interface_hip/blas_s_v2.cpp +@@ -1858,7 +1858,8 @@ magma_strmm( + hipblas_diag_const( diag ), + int(m), int(n), + (float*)&alpha, (const float*)dA, int(ldda), +- (float*)dB, int(lddb) ); ++ (float*)dB, int(lddb), ++ (float*)dB, int(lddb) ); /* C same as B; less efficient */ + #else + hipblasStrmm( + queue->hipblas_handle(), +diff --git a/interface_hip/blas_z_v2.cpp b/interface_hip/blas_z_v2.cpp +index 3c7e87a..eb9e2e6 100644 +--- a/interface_hip/blas_z_v2.cpp ++++ b/interface_hip/blas_z_v2.cpp +@@ -1858,7 +1858,8 @@ magma_ztrmm( + hipblas_diag_const( diag ), + int(m), int(n), + (hipblasDoubleComplex*)&alpha, (const hipblasDoubleComplex*)dA, int(ldda), +- (hipblasDoubleComplex*)dB, int(lddb) ); ++ (hipblasDoubleComplex*)dB, int(lddb), ++ (hipblasDoubleComplex*)dB, int(lddb) ); /* C same as B; less efficient */ + #else + hipblasZtrmm( + queue->hipblas_handle(), +diff --git a/interface_hip/interface.cpp b/interface_hip/interface.cpp +index 2b35b34..7c76426 100644 +--- a/interface_hip/interface.cpp ++++ b/interface_hip/interface.cpp +@@ -209,11 +209,10 @@ magma_init() + else { + g_magma_devices[dev].memory = prop.totalGlobalMem; + g_magma_devices[dev].shmem_block = prop.sharedMemPerBlock; +- #ifdef MAGMA_HAVE_CUDA + g_magma_devices[dev].cuda_arch = prop.major*100 + prop.minor*10; ++ #ifdef MAGMA_HAVE_CUDA + g_magma_devices[dev].shmem_multiproc = prop.sharedMemPerMultiprocessor; + #elif defined(MAGMA_HAVE_HIP) +- g_magma_devices[dev].cuda_arch = prop.gcnArch; + g_magma_devices[dev].shmem_multiproc = prop.maxSharedMemoryPerMultiProcessor; + #endif + +@@ -464,7 +463,7 @@ magma_print_environment() + prop.name, + prop.clockRate / 1000., + prop.totalGlobalMem / (1024.*1024.), +- prop.gcnArch ); ++ prop.gcnArchName ); + #endif + } + +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/magma/package.py b/var/spack/repos/builtin/packages/magma/package.py index 0aa38f91cdf493..585f360a7b0fc3 100644 --- a/var/spack/repos/builtin/packages/magma/package.py +++ b/var/spack/repos/builtin/packages/magma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -78,6 +78,7 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage): patch("magma-2.5.0.patch", when="@2.5.0") patch("magma-2.5.0-cmake.patch", when="@2.5.0") patch("cmake-W.patch", when="@2.5.0:%nvhpc") + patch("0001-fix-magma-build-error-with-rocm-6.0.0.patch", when="@2.7.2 ^hip@6.0.0 + rocm") @run_before("cmake") def generate_gpu_config(self): @@ -146,7 +147,7 @@ def cmake_args(self): if "+rocm" in spec: options.append(define("MAGMA_ENABLE_HIP", True)) options.append(define("CMAKE_CXX_COMPILER", spec["hip"].hipcc)) - # See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/322 + # See https://github.com/ROCm/rocFFT/issues/322 if spec.satisfies("^cmake@3.21.0:3.21.2"): options.append(define("__skip_rocmclang", True)) else: diff --git a/var/spack/repos/builtin/packages/mahout/package.py b/var/spack/repos/builtin/packages/mahout/package.py index 4bb78b648ac6a7..51df7ab110af06 100644 --- a/var/spack/repos/builtin/packages/mahout/package.py +++ b/var/spack/repos/builtin/packages/mahout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mahout(MavenPackage): list_url = "https://archive.apache.org/dist/mahout" list_depth = 1 + license("Apache-2.0") + version("0.13.0", sha256="bbe5a584fa83eb4ea3e0c146256e3e913c225426434759458d1423508da7c519") version("0.12.2", sha256="cac9a3fd4f11b2cb850b86d1bd23aec90e960cfae91850c49056c2eaae71afba") version("0.12.1", sha256="32e334115e4b2bfa21ba58e888fc47cdde2ca32c915d1694ed6761bda3b05dbb") diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index d1b288340c8834..ec6fc74c2aedd8 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Makedepend(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/util/makedepend" xorg_mirror_path = "util/makedepend-1.0.5.tar.gz" + license("MIT-open-group") + version("1.0.8", sha256="275f0d2b196bfdc740aab9f02bb48cb7a97e4dfea011a7b468ed5648d0019e54") version("1.0.5", sha256="503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004") diff --git a/var/spack/repos/builtin/packages/maker/package.py b/var/spack/repos/builtin/packages/maker/package.py index be68f32f9836a8..3989bafdcf08fd 100644 --- a/var/spack/repos/builtin/packages/maker/package.py +++ b/var/spack/repos/builtin/packages/maker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py index 5f3ece11f619c1..a9b0fbb2a86368 100644 --- a/var/spack/repos/builtin/packages/mallocmc/package.py +++ b/var/spack/repos/builtin/packages/mallocmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Mallocmc(CMakePackage): maintainers("ax3l") + license("MIT") + version("develop", branch="dev") version("master", branch="master") version("2.2.0crp", sha256="1b500ee7fcea45a67a81fc0e1c294b4b0c413cd1f76168522f35ade7d44be9b6") diff --git a/var/spack/repos/builtin/packages/maloc/package.py b/var/spack/repos/builtin/packages/maloc/package.py index 163a0c6cbec002..19e94e98fa6a3b 100644 --- a/var/spack/repos/builtin/packages/maloc/package.py +++ b/var/spack/repos/builtin/packages/maloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/malt/package.py b/var/spack/repos/builtin/packages/malt/package.py index d5ecec6fad1963..b2d1ba4c959f88 100644 --- a/var/spack/repos/builtin/packages/malt/package.py +++ b/var/spack/repos/builtin/packages/malt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Malt(CMakePackage): url = "https://github.com/memtt/malt/archive/v1.2.2.tar.gz" maintainers("svalat") + license("CECILL-C") + # Versions version("1.2.2", sha256="e19f49ad97bf2deedf0557eb00267f4dcf1c932c494dd07ada07fcdf5421935f") version("1.2.1", sha256="0e4c0743561f9fcc04dc83457386167a9851fc9289765f8b4f9390384ae3618a") diff --git a/var/spack/repos/builtin/packages/man-db/package.py b/var/spack/repos/builtin/packages/man-db/package.py index 62108e323e6948..836c0c2a27d79e 100644 --- a/var/spack/repos/builtin/packages/man-db/package.py +++ b/var/spack/repos/builtin/packages/man-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class ManDb(AutotoolsPackage): git = "https://gitlab.com/cjwatson/man-db" url = "https://download.savannah.nongnu.org/releases/man-db/man-db-2.10.1.tar.xz" + license("GPL-2.0-or-later") + version("2.11.2", sha256="cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d") version("2.10.2", sha256="ee97954d492a13731903c9d0727b9b01e5089edbd695f0cdb58d405a5af5514d") version("2.10.1", sha256="2ffd8f2e80122fe72e60c740c851e6a3e15c9a7921185eb4752c1c672824bed6") diff --git a/var/spack/repos/builtin/packages/mapl/package.py b/var/spack/repos/builtin/packages/mapl/package.py index 1546073cd4c59d..a6917930bed2d0 100644 --- a/var/spack/repos/builtin/packages/mapl/package.py +++ b/var/spack/repos/builtin/packages/mapl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,9 +33,21 @@ class Mapl(CMakePackage): "AlexanderRichert-NOAA", ) + license("Apache-2.0") + version("develop", branch="develop") version("main", branch="main") + version("2.43.0", sha256="1be99d64ca46001ac94f7db3607c345e144976dc34fe184e734e212bf3955d01") + version("2.42.4", sha256="f6b643cc45f2dc55df96a316c84d84ace341bb6e06f81f83b5de258d9978b3d4") + version("2.42.3", sha256="4ccac684dcbbca36cd7b30cb1515b52f05d7c06ca93399e60ccf42726d147018") + version("2.42.2", sha256="cc70be57942a3d7f7a53d4762cb972cebcb9ae1737be7e03f195e4d4eefbc68a") + version("2.42.1", sha256="78fdcc17f99f525feded05fc360f5b76e6f2c07057e0b16ce3177da2a534dc33") + version("2.42.0", sha256="9b6c3434919c14ef79004db5f76cb3dd8ef375584227101c230a372bb0470fdd") + version("2.41.2", sha256="73e1f0961f1b70e8159c0a2ce3499eb5158f3ca6d081f4c7826af7854ebfb44d") + version("2.41.1", sha256="2b384bd4fbaac1bff4ef009922c436c4ab54832172a5cd4d312ea44e32c1ae7c") + version("2.41.0", sha256="1142f9395e161174e3ec1654fba8bda1d0bd93edc7438b1927d8f5d7b42a0a86") + version("2.40.4", sha256="fb843b118d6e56cd4fc4b114c4d6f91956d5c8b3d9389ada56da1dfdbc58904f") version("2.40.3", sha256="4b82a314c88a035fc2b91395750aa7950d6bee838786178ed16a3f39a1e45519") version("2.40.2", sha256="7327f6f5bce6e09e7f7b930013fba86ee7cbfe8ed4c7c087fc9ab5acbf6640fd") version("2.40.1", sha256="6f40f946fabea6ba73b0764092e495505d220455b191b4e454736a0a25ee058c") @@ -116,6 +128,12 @@ class Mapl(CMakePackage): # Versions later than 3.14 remove FindESMF.cmake # from ESMA_CMake. + resource( + name="esma_cmake", + git="https://github.com/GEOS-ESM/ESMA_cmake.git", + tag="v3.36.0", + when="@2.42.0:", + ) resource( name="esma_cmake", git="https://github.com/GEOS-ESM/ESMA_cmake.git", @@ -159,13 +177,11 @@ class Mapl(CMakePackage): # Patch to add missing MPI Fortran target to top-level CMakeLists.txt patch("mapl-2.12.3-mpi-fortran.patch", when="@:2.12.3") - # Patch for mpich4 for selected older versions of mapl used by UFS - # https://github.com/GEOS-ESM/MAPL/pull/2381 - patch("backport-b571b3f-from-develop-to-v2.40.3.patch", when="@2.40.3") - patch("backport-b571b3f-from-develop-to-v2.35.2.patch", when="@2.35.2") - conflicts("mpich@4", when="@2.40.4:") - conflicts("mpich@4", when="@2.35.3:2.40.2") - conflicts("mpich@4", when="@:2.35.1") + # MAPL only compiles with MPICH from version 2.42.0 and higher so we conflict + # with older versions. Also, it's only been tested with MPICH 4, so we don't + # allow older MPICH + conflicts("mpich@:3") + conflicts("mpich@4", when="@:2.41") variant("flap", default=False, description="Build with FLAP support", when="@:2.39") variant("pflogger", default=True, description="Build with pFlogger support") diff --git a/var/spack/repos/builtin/packages/mapnik/package.py b/var/spack/repos/builtin/packages/mapnik/package.py index e49463d3341050..ba8622595c768d 100644 --- a/var/spack/repos/builtin/packages/mapnik/package.py +++ b/var/spack/repos/builtin/packages/mapnik/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mapserver/package.py b/var/spack/repos/builtin/packages/mapserver/package.py index f4f82b7cc250be..e26951531e1175 100644 --- a/var/spack/repos/builtin/packages/mapserver/package.py +++ b/var/spack/repos/builtin/packages/mapserver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mapserver(CMakePackage): homepage = "https://www.mapserver.org/" url = "https://download.osgeo.org/mapserver/mapserver-7.2.1.tar.gz" + license("MIT") + version("8.0.1", sha256="79d23595ef95d61d3d728ae5e60850a3dbfbf58a46953b4fdc8e6e0ffe5748ba") version("7.2.1", sha256="9459a7057d5a85be66a41096a5d804f74665381186c37077c94b56e784db6102") diff --git a/var/spack/repos/builtin/packages/mapsplice2/package.py b/var/spack/repos/builtin/packages/mapsplice2/package.py index 7fb6c1f2c2c226..4d3141a77be812 100644 --- a/var/spack/repos/builtin/packages/mapsplice2/package.py +++ b/var/spack/repos/builtin/packages/mapsplice2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/maq/package.py b/var/spack/repos/builtin/packages/maq/package.py index 26a7bd01d1e1f2..3c6dee69c3afda 100644 --- a/var/spack/repos/builtin/packages/maq/package.py +++ b/var/spack/repos/builtin/packages/maq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Maq(AutotoolsPackage): list_url = "https://sourceforge.net/projects/maq/files/maq/" maintainers("snehring") + license("GPL-3.0-only") + version("0.7.1", sha256="e1671e0408b0895f5ab943839ee8f28747cf5f55dc64032c7469b133202b6de2") version("0.5.0", sha256="c292c19baf291b2415b460d687d43a71ece00a7d178cc5984bc8fc30cfce2dfb") diff --git a/var/spack/repos/builtin/packages/margo/package.py b/var/spack/repos/builtin/packages/margo/package.py index b4b58465c6495b..2412849e50ba98 100644 --- a/var/spack/repos/builtin/packages/margo/package.py +++ b/var/spack/repos/builtin/packages/margo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mariadb-c-client/package.py b/var/spack/repos/builtin/packages/mariadb-c-client/package.py index 148fc1e81199fa..57db5bc17f166b 100644 --- a/var/spack/repos/builtin/packages/mariadb-c-client/package.py +++ b/var/spack/repos/builtin/packages/mariadb-c-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class MariadbCClient(CMakePackage): list_url = "https://downloads.mariadb.com/Connectors/c/" list_depth = 1 + license("LGPL-2.1-or-later") + version("3.3.7", sha256="975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf") version("3.3.5", sha256="ca72eb26f6db2befa77e48ff966f71bcd3cb44b33bd8bbb810b65e6d011c1e5c") version("3.3.4", sha256="486e5fdf976a8e7fadf583ae912128655e013ac575fa79b2d1af0fb8827a78ed") diff --git a/var/spack/repos/builtin/packages/mariadb/package.py b/var/spack/repos/builtin/packages/mariadb/package.py index 3acca3dbbf2020..d1392fe893fb1b 100644 --- a/var/spack/repos/builtin/packages/mariadb/package.py +++ b/var/spack/repos/builtin/packages/mariadb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Mariadb(CMakePackage): homepage = "https://mariadb.org/about/" url = "http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-10.2.8/source/mariadb-10.2.8.tar.gz" + license("GPL-2.0-or-later") + version("10.8.2", sha256="14e0f7f8817a41bbcb5ebdd2345a9bd44035fde7db45c028b6d4c35887ae956c") version("10.4.12", sha256="fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208") version("10.4.8", sha256="10cc2c3bdb76733c9c6fd1e3c6c860d8b4282c85926da7d472d2a0e00fffca9b") diff --git a/var/spack/repos/builtin/packages/mark/package.py b/var/spack/repos/builtin/packages/mark/package.py index 3301f84e4b8192..5a24d8ea7811fa 100644 --- a/var/spack/repos/builtin/packages/mark/package.py +++ b/var/spack/repos/builtin/packages/mark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/masa/package.py b/var/spack/repos/builtin/packages/masa/package.py index a6953f5deead1a..b14b700bc9ab10 100644 --- a/var/spack/repos/builtin/packages/masa/package.py +++ b/var/spack/repos/builtin/packages/masa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Masa(AutotoolsPackage): homepage = "https://github.com/manufactured-solutions/MASA" git = "https://github.com/manufactured-solutions/MASA.git" + license("LGPL-2.1-or-later") + version("master", branch="master") variant("fortran", default=True, description="Compile with Fortran interfaces") diff --git a/var/spack/repos/builtin/packages/mash/package.py b/var/spack/repos/builtin/packages/mash/package.py index 7148bbe1e21638..8a33d72816e214 100644 --- a/var/spack/repos/builtin/packages/mash/package.py +++ b/var/spack/repos/builtin/packages/mash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index 24f42ebe48d93f..a81f957b5364e1 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Masurca(Package): homepage = "http://www.genome.umd.edu/masurca.html" url = "https://github.com/alekseyzimin/masurca/releases/download/v3.3.1/MaSuRCA-3.3.1.tar.gz" + license("GPL-3.0-only") + version("4.1.0", sha256="15078e24c79fe5aabe42748d64f95d15f3fbd7708e84d88fc07c4b7f2e4b0902") version("4.0.9", sha256="a31c2f786452f207c0b0b20e646b6c85b7357dcfd522b697c1009d902d3ed4cf") version("4.0.5", sha256="db525c26f2b09d6b359a2830fcbd4a3fdc65068e9a116c91076240fd1f5924ed") diff --git a/var/spack/repos/builtin/packages/mathematica/package.py b/var/spack/repos/builtin/packages/mathematica/package.py index 069625a3d86fed..d9d380ade2c67f 100644 --- a/var/spack/repos/builtin/packages/mathematica/package.py +++ b/var/spack/repos/builtin/packages/mathematica/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/matio/package.py b/var/spack/repos/builtin/packages/matio/package.py index 9f3d237398c295..5607fe29cd8e31 100644 --- a/var/spack/repos/builtin/packages/matio/package.py +++ b/var/spack/repos/builtin/packages/matio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Matio(AutotoolsPackage): git = "https://github.com/tbeu/matio" url = "https://github.com/tbeu/matio/releases/download/v1.5.9/matio-1.5.9.tar.gz" + license("BSD-2-Clause") + version("1.5.17", sha256="5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400") version("1.5.16", sha256="47ba3d5d269d5709b8d9a7385c88c8b5fb5ff875ef781a1ced4892b5b03c4f44") version("1.5.15", sha256="21bf4587bb7f0231dbb4fcc88728468f1764c06211d5a0415cd622036f09b1cf") diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index 728d5608a2444f..249213ac7934a3 100644 --- a/var/spack/repos/builtin/packages/matlab/package.py +++ b/var/spack/repos/builtin/packages/matlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/maven/package.py b/var/spack/repos/builtin/packages/maven/package.py index 8ee6f441c5cbf6..348e88d521a81d 100644 --- a/var/spack/repos/builtin/packages/maven/package.py +++ b/var/spack/repos/builtin/packages/maven/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Maven(Package): homepage = "https://maven.apache.org/index.html" url = "https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.tar.gz" + license("Apache-2.0") + version("3.8.4", sha256="2cdc9c519427bb20fdc25bef5a9063b790e4abd930e7b14b4e9f4863d6f9f13c") version("3.6.3", sha256="26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5") version("3.6.2", sha256="3fbc92d1961482d6fbd57fbf3dd6d27a4de70778528ee3fb44aa7d27eb32dfdc") diff --git a/var/spack/repos/builtin/packages/maverick/package.py b/var/spack/repos/builtin/packages/maverick/package.py index b9b03124cddce1..fa0df4f84a60f4 100644 --- a/var/spack/repos/builtin/packages/maverick/package.py +++ b/var/spack/repos/builtin/packages/maverick/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mawk/package.py b/var/spack/repos/builtin/packages/mawk/package.py index ad301a8fa5c058..614a240f33778b 100644 --- a/var/spack/repos/builtin/packages/mawk/package.py +++ b/var/spack/repos/builtin/packages/mawk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Mawk(AutotoolsPackage): homepage = "https://invisible-island.net/mawk/mawk.html" url = "https://invisible-mirror.net/archives/mawk/mawk-1.3.4.tgz" + license("GPL-2.0-only") + version( "1.3.4-20171017", sha256="db17115d1ed18ed1607c8b93291db9ccd4fe5e0f30d2928c3c5d127b23ec9e5b" ) diff --git a/var/spack/repos/builtin/packages/mbdyn/package.py b/var/spack/repos/builtin/packages/mbdyn/package.py index de28a2c59a0ae7..c7276ad216ca17 100644 --- a/var/spack/repos/builtin/packages/mbdyn/package.py +++ b/var/spack/repos/builtin/packages/mbdyn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mbdyn(AutotoolsPackage): homepage = "https://www.mbdyn.org/" url = "https://www.mbdyn.org/userfiles/downloads/mbdyn-1.7.3.tar.gz" + license("GPL-2.0-or-later") + version("1.7.3", sha256="3cf05cd1cb14c1af3d987aac119b6ecf0d835bc1aee06bc4cf7cc5a245c1f36d") # Failed to build mbdyn with gcc@4.8.5 and gcc@9.2.0 diff --git a/var/spack/repos/builtin/packages/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py index e71614a71f04c0..0585a2529c6193 100644 --- a/var/spack/repos/builtin/packages/mbedtls/package.py +++ b/var/spack/repos/builtin/packages/mbedtls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mbedtls(MakefilePackage): url = "https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.2.1.tar.gz" maintainers("haampie") + license("Apache-2.0 OR GPL-2.0-or-later") + # version 3.x version("3.3.0", sha256="a22ff38512697b9cd8472faa2ea2d35e320657f6d268def3a64765548b81c3ec") version( diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index c9d39cefde3338..890efee8c55494 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Mc(AutotoolsPackage): homepage = "https://midnight-commander.org" url = "http://ftp.midnight-commander.org/mc-4.8.20.tar.bz2" + license("GPL-3.0-or-later") + version("4.8.28", sha256="6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c") version("4.8.26", sha256="9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1") version("4.8.23", sha256="238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d") diff --git a/var/spack/repos/builtin/packages/mcl/package.py b/var/spack/repos/builtin/packages/mcl/package.py index a84c8e9176b58b..8de3dcc57ddf54 100644 --- a/var/spack/repos/builtin/packages/mcl/package.py +++ b/var/spack/repos/builtin/packages/mcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mcl(AutotoolsPackage): homepage = "https://www.micans.org/mcl/index.html" url = "https://www.micans.org/mcl/src/mcl-14-137.tar.gz" + license("GPL-3.0-or-later") + version("14-137", sha256="b5786897a8a8ca119eb355a5630806a4da72ea84243dba85b19a86f14757b497") @when("%gcc@10:") diff --git a/var/spack/repos/builtin/packages/mcpp/package.py b/var/spack/repos/builtin/packages/mcpp/package.py index 10b6f848b65349..bc0530cc512432 100644 --- a/var/spack/repos/builtin/packages/mcpp/package.py +++ b/var/spack/repos/builtin/packages/mcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mct/package.py b/var/spack/repos/builtin/packages/mct/package.py index acae639b9e4525..1f6852c55138e9 100644 --- a/var/spack/repos/builtin/packages/mct/package.py +++ b/var/spack/repos/builtin/packages/mct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mctc-lib/package.py b/var/spack/repos/builtin/packages/mctc-lib/package.py index fb086b258daee1..bcbed778e8096b 100644 --- a/var/spack/repos/builtin/packages/mctc-lib/package.py +++ b/var/spack/repos/builtin/packages/mctc-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class MctcLib(MesonPackage): maintainers("awvwgk") + license("Apache-2.0") + version("main", branch="main") version("0.3.1", sha256="a5032a0bbbbacc952037c5215b71aa6b438767a84bafb60fda25ba43c8835513") version("0.3.0", sha256="81f3edbf322e6e28e621730a796278498b84af0f221f785c537a315312059bf0") diff --git a/var/spack/repos/builtin/packages/mcutils/package.py b/var/spack/repos/builtin/packages/mcutils/package.py index 97d00223573def..82526e0144413c 100644 --- a/var/spack/repos/builtin/packages/mcutils/package.py +++ b/var/spack/repos/builtin/packages/mcutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mcutils(MakefilePackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("1.3.5", tag="mcutils-1.3.5", commit="d0e65bb7b6f80d6df50a71a25c54683b0db997a5") version("1.3.4", tag="mcutils-1.3.4", commit="ddb527e5d03b8e4d13ae4e6d78fbcd7d35f7153b") version("1.3.3", tag="mcutils-1.3.3", commit="638aabe930b05f8ecfe272bdd2f2a7ed65e5fc45") diff --git a/var/spack/repos/builtin/packages/mdspan/package.py b/var/spack/repos/builtin/packages/mdspan/package.py index 1e4978ca00d595..bb5be2536bc34d 100644 --- a/var/spack/repos/builtin/packages/mdspan/package.py +++ b/var/spack/repos/builtin/packages/mdspan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mdsplus/package.py b/var/spack/repos/builtin/packages/mdsplus/package.py index a4b39400cbd0d7..f4dad7bc6335f5 100644 --- a/var/spack/repos/builtin/packages/mdsplus/package.py +++ b/var/spack/repos/builtin/packages/mdsplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mdsplus(AutotoolsPackage): parallel = False + license("BSD-2-Clause") + version( "stable_release-7-96-17", tag="stable_release-7-96-17", diff --git a/var/spack/repos/builtin/packages/mdtest/package.py b/var/spack/repos/builtin/packages/mdtest/package.py index b822c70cd3c746..9dc575f6720ae8 100644 --- a/var/spack/repos/builtin/packages/mdtest/package.py +++ b/var/spack/repos/builtin/packages/mdtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/med/package.py b/var/spack/repos/builtin/packages/med/package.py index 75c1250a37bf74..1d8aab4f536830 100644 --- a/var/spack/repos/builtin/packages/med/package.py +++ b/var/spack/repos/builtin/packages/med/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Med(CMakePackage): maintainers("likask") + license("LGPL-3.0-only") + # 4.1.0 does not compile in static mode version("4.1.0", sha256="847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce") version( diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py index ae66c0dec34433..18771f50c5c188 100644 --- a/var/spack/repos/builtin/packages/meep/package.py +++ b/var/spack/repos/builtin/packages/meep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,11 @@ class Meep(AutotoolsPackage): git = "https://github.com/NanoComp/meep.git" url = "https://github.com/NanoComp/meep/archive/refs/tags/v1.21.0.tar.gz" + license("GPL-2.0-or-later") + version("master", branch="master") + version("1.28.0", sha256="fe79ec9b0d0cf87c3855a1661a38f23a3100120174f7e2df8add96cafe201544") version("1.25.0", sha256="3e5d6c6ef69a8cc7810bdd6d681ae494bfe7a4e91041abe5494f5c8a82d02e6f") version("1.21.0", sha256="71911cd2f38b15bdafe9a27ad111f706f24717894d5f9b6f9f19c6c10a0d5896") version( diff --git a/var/spack/repos/builtin/packages/mefit/package.py b/var/spack/repos/builtin/packages/mefit/package.py index d49a04f5de12a7..52fc02a1810b97 100644 --- a/var/spack/repos/builtin/packages/mefit/package.py +++ b/var/spack/repos/builtin/packages/mefit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/megadock/package.py b/var/spack/repos/builtin/packages/megadock/package.py index 449079d0d1d265..c0aceac0b5d5c4 100644 --- a/var/spack/repos/builtin/packages/megadock/package.py +++ b/var/spack/repos/builtin/packages/megadock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Megadock(MakefilePackage, CudaPackage): homepage = "https://www.bi.cs.titech.ac.jp/megadock/" url = "https://www.bi.cs.titech.ac.jp/megadock/archives/megadock-4.0.3.tgz" + license("GPL-3.0-or-later") + version("4.1.1", sha256="5e08416ea86169be9f0a998f081f53c04aa8696ef83b9fcc5bf685fe45d52087") version("4.0.3", sha256="c1409a411555f4f7b4eeeda81caf622d8a28259a599ea1d2181069c55f257664") diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py index cb96687d78e2b1..44e9a6cc55c41b 100644 --- a/var/spack/repos/builtin/packages/megahit/package.py +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Megahit(MakefilePackage): homepage = "https://github.com/voutcn/megahit" url = "https://github.com/voutcn/megahit/archive/v1.1.3.tar.gz" + license("GPL-3.0-only") + version("1.1.4", sha256="ecd64c8bfa516ef6b19f9b2961ede281ec814db836f1a91953c213c944e1575f") version("1.1.3", sha256="b6eefdee075aaf7a8f9090e2e8b08b770caff90aa43a255e0e220d82ce71c492") diff --git a/var/spack/repos/builtin/packages/melissa-api/package.py b/var/spack/repos/builtin/packages/melissa-api/package.py index ade8c016f8522e..931460e22a899a 100644 --- a/var/spack/repos/builtin/packages/melissa-api/package.py +++ b/var/spack/repos/builtin/packages/melissa-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class MelissaApi(CMakePackage): git = "https://gitlab.inria.fr/melissa/melissa.git" maintainers("robcaulk", "mschouler", "raffino") + license("BSD-3-Clause") + version("develop", branch="develop") depends_on("cmake@3.7.2:", type="build") diff --git a/var/spack/repos/builtin/packages/melissa/package.py b/var/spack/repos/builtin/packages/melissa/package.py index 144f0b71ba0103..58855d6f2caa0a 100644 --- a/var/spack/repos/builtin/packages/melissa/package.py +++ b/var/spack/repos/builtin/packages/melissa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/memaxes/package.py b/var/spack/repos/builtin/packages/memaxes/package.py index e7daf38e484e42..b6a2f1651160b4 100644 --- a/var/spack/repos/builtin/packages/memaxes/package.py +++ b/var/spack/repos/builtin/packages/memaxes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Memaxes(Package): homepage = "https://github.com/llnl/MemAxes" + license("LGPL-2.1-or-later") + version( "0.5", sha256="9858f0f675b50e347d0b88545558e5d6b4333347c762b15d399b8d8004d7b68b", diff --git a/var/spack/repos/builtin/packages/memcached/package.py b/var/spack/repos/builtin/packages/memcached/package.py index 3edfd860e0d474..a4a7260ac1a8a5 100644 --- a/var/spack/repos/builtin/packages/memcached/package.py +++ b/var/spack/repos/builtin/packages/memcached/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Memcached(AutotoolsPackage): homepage = "https://github.com/memcached/memcached" url = "https://github.com/memcached/memcached/archive/1.5.20.tar.gz" + license("BSD-3-Clause") + version("1.5.20", sha256="ee93aff47123e0b464e9f007b651b14c89c19e0c20352d8d1c399febbb038cb6") version("1.5.19", sha256="7af7a2e9b1f468d7f6056f23ce21c04936ce6891f8cb8cd54e133f489a8226e8") version("1.5.18", sha256="0bf8154f53d2781164421acd195a1665ac2f77316263c3526206c38e402c4b0d") diff --git a/var/spack/repos/builtin/packages/meme/package.py b/var/spack/repos/builtin/packages/meme/package.py index 3ebe9739b07864..4aaf317f57080d 100644 --- a/var/spack/repos/builtin/packages/meme/package.py +++ b/var/spack/repos/builtin/packages/meme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/memkind/package.py b/var/spack/repos/builtin/packages/memkind/package.py index f51740f48e9e4f..21c2287eaa8175 100644 --- a/var/spack/repos/builtin/packages/memkind/package.py +++ b/var/spack/repos/builtin/packages/memkind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Memkind(AutotoolsPackage): homepage = "https://github.com/memkind/memkind" url = "https://github.com/memkind/memkind/archive/v1.7.0.tar.gz" + license("BSD-3-Clause") + version("1.13.0", sha256="3f0d919b61fdd4d2ebce14e0b7dbb856e2144138778940107c13549523f3bdc0") version("1.12.0", sha256="b0781d493dec0da0089884fd54bcfdde03311019c56f90505ed0b884100bfbad") version("1.10.1", sha256="c203615d964a0bb151756ad8a5c9565391ee77d79c1f8b59d2ea8ff87989b294") diff --git a/var/spack/repos/builtin/packages/memsurfer/package.py b/var/spack/repos/builtin/packages/memsurfer/package.py index c9408c1acdb03f..b10bbf4e04b6de 100644 --- a/var/spack/repos/builtin/packages/memsurfer/package.py +++ b/var/spack/repos/builtin/packages/memsurfer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/memtester/package.py b/var/spack/repos/builtin/packages/memtester/package.py index 590147d895f9bc..52e77927bfeb65 100644 --- a/var/spack/repos/builtin/packages/memtester/package.py +++ b/var/spack/repos/builtin/packages/memtester/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Memtester(MakefilePackage): homepage = "http://pyropus.ca/software/memtester/" url = "http://pyropus.ca/software/memtester/old-versions/memtester-4.3.0.tar.gz" + license("GPL-2.0-or-later") + version("4.3.0", sha256="f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88") version("4.2.2", sha256="a494569d58d642c796332a1b7f3b4b86845b52da66c15c96fbeecd74e48dae8e") version("4.2.1", sha256="3433e1c757e56457610f5a97bf1a2d612c609290eba5183dd273e070134a21d2") diff --git a/var/spack/repos/builtin/packages/meraculous/package.py b/var/spack/repos/builtin/packages/meraculous/package.py index da797d890eeaab..1e17f87a8e32f1 100644 --- a/var/spack/repos/builtin/packages/meraculous/package.py +++ b/var/spack/repos/builtin/packages/meraculous/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Meraculous(CMakePackage, SourceforgePackage): sourceforge_mirror_path = "meraculous20/Meraculous-v2.2.4.tar.gz" git = "https://bitbucket.org/berkeleylab/genomics-meraculous2.git" + license("BSD-3-Clause-LBNL") + version("2.2.5.1", branch="release-2.2.5.1") version("2.2.4", sha256="3b4b8848232be902af9ebc77b38b83bcc531f12120115be089bdd6371ad2bf5b") diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 0c5c39969d0503..dcecc12893d199 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mercurial(PythonPackage): homepage = "https://www.mercurial-scm.org" url = "https://www.mercurial-scm.org/release/mercurial-5.3.tar.gz" + license("GPL-2.0-or-later") + version("6.4.5", sha256="b0b4b00b8b2639c8be387394796f0425beb339314df7e72937f8ddd2a41b1b8a") version("6.3.3", sha256="13c97ff589c7605e80a488f336852ce1d538c5d4143cfb33be69bdaddd9157bd") version("6.2.3", sha256="98d1ae002f68adf53d65c5947fe8b7a379f98cf05d9b8ea1f4077d2ca5dce9db") diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py index a2cdad6f1b6874..4371ffdd1469e4 100644 --- a/var/spack/repos/builtin/packages/mercury/package.py +++ b/var/spack/repos/builtin/packages/mercury/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mercury(CMakePackage): tags = ["e4s"] + license("GPL-2.0-only") + version("master", branch="master", submodules=True) version("2.3.1", sha256="36182d49f2db7e2b075240cab4aaa1d4ec87a7756450c87643ededd1e6f16104") version("2.3.0", sha256="e9e62ce1bb2fd482f0e85ad75fa255d9750c6fed50ba441a03de93b3b8eae742") diff --git a/var/spack/repos/builtin/packages/mesa-demos/package.py b/var/spack/repos/builtin/packages/mesa-demos/package.py index 6471be9c463be5..c85b2eb2e3ddab 100644 --- a/var/spack/repos/builtin/packages/mesa-demos/package.py +++ b/var/spack/repos/builtin/packages/mesa-demos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class MesaDemos(AutotoolsPackage): homepage = "https://www.mesa3d.org" url = "https://gitlab.freedesktop.org/mesa/demos/-/archive/mesa-demos-8.4.0/demos-mesa-demos-8.4.0.tar.gz" + license("custom") + version("8.4.0", sha256="e9d235e6dad69d6b00877bf07e6d1859e368c0873e5401ec68a6ddb43375e900") version("8.3.0", sha256="9bc1b37f4fc7bfc3f818f2d3851ffde28e8167ef11dca87f4781e9ef6206901f") version("8.2.0", sha256="5a9f71b815d968d0c3b77edfcc3782d0211f8520b00da9e554ccfed80c8889f6") diff --git a/var/spack/repos/builtin/packages/mesa-glu/package.py b/var/spack/repos/builtin/packages/mesa-glu/package.py index b0c0ca2ca04548..071703aa5f3208 100644 --- a/var/spack/repos/builtin/packages/mesa-glu/package.py +++ b/var/spack/repos/builtin/packages/mesa-glu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index e1e666a6bcd212..f3e93c30e6e198 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,13 +18,16 @@ class Mesa(MesonPackage): git = "https://gitlab.freedesktop.org/mesa/mesa.git" url = "https://archive.mesa3d.org/mesa-20.2.1.tar.xz" - version("main", branch="main") + license("MIT AND SGI-B-2.0 AND BSL-1.0") + version("main", branch="main") version( - "23.0.3", - sha256="386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5", + "23.2.1", + sha256="64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc", preferred=True, ) + version("23.1.9", sha256="295ba27c28146ed09214e8ce79afa1659edf9d142decc3c91f804552d64f7510") + version("23.0.3", sha256="386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5") version("23.0.2", sha256="1b7d3399fc6f16f030361f925d33ebc7600cbf98094582f54775b6a1180529e7") version("22.3.2", sha256="c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b") version("22.2.5", sha256="850f063146f8ebb262aec04f666c2c1e5623f2a1987dda24e4361b17b912c73b") @@ -297,6 +300,7 @@ def meson_args(self): # Add the remaining list args args.append("-Dplatforms=" + ",".join(args_platforms)) args.append("-Dgallium-drivers=" + ",".join(args_gallium_drivers)) - args.append("-Ddri-drivers=" + ",".join(args_dri_drivers)) + if args_dri_drivers: + args.append("-Ddri-drivers=" + ",".join(args_dri_drivers)) return args diff --git a/var/spack/repos/builtin/packages/mesa18/package.py b/var/spack/repos/builtin/packages/mesa18/package.py index f7ba4e156baddb..17f6903c8d1b40 100644 --- a/var/spack/repos/builtin/packages/mesa18/package.py +++ b/var/spack/repos/builtin/packages/mesa18/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/meshkit/package.py b/var/spack/repos/builtin/packages/meshkit/package.py index 4c8d30aac62a4e..20262d8d0808e7 100644 --- a/var/spack/repos/builtin/packages/meshkit/package.py +++ b/var/spack/repos/builtin/packages/meshkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index df74760ce9e978..bde4e0c9908fd2 100644 --- a/var/spack/repos/builtin/packages/meshtool/package.py +++ b/var/spack/repos/builtin/packages/meshtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index cabafbe0011b7b..15f7be44d76172 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Meson(PythonPackage): maintainers("eli-schwartz", "michaelkuhn") + license("Apache-2.0") + version("1.2.2", sha256="1caa0ef6082e311bdca9836e7907f548b8c3f041a42ed41f0ff916b83ac7dddd") version("1.2.1", sha256="e1f3b32b636cc86496261bd89e63f00f206754697c7069788b62beed5e042713") version("1.2.0", sha256="603489f0aaa6305f806c6cc4a4455a965f22290fc74f65871f589b002110c790") diff --git a/var/spack/repos/builtin/packages/mesquite/package.py b/var/spack/repos/builtin/packages/mesquite/package.py index 91dfa60aa72a3b..f4381025c90d5e 100644 --- a/var/spack/repos/builtin/packages/mesquite/package.py +++ b/var/spack/repos/builtin/packages/mesquite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Mesquite(AutotoolsPackage): homepage = "https://software.sandia.gov/mesquite" url = "https://software.sandia.gov/mesquite/mesquite-2.3.0.tar.gz" + license("LGPL-2.1-or-later") + version("2.99", sha256="7d834dbcc3132d903dbecb59337dc5b47505b7fb579b68f1ce66e5df87106954") version("2.3.0", sha256="4ab4ceadfa596e16c00dbb0e8b830a9112fa1b73291ca07633ec379a39b8bb28") version("2.2.0", sha256="3d48322c3e148431ee1af155d6bb94dfeef15795da1f46996c112df27778a4a2") diff --git a/var/spack/repos/builtin/packages/met/package.py b/var/spack/repos/builtin/packages/met/package.py index 750422dc763509..2cdb36194a04e9 100644 --- a/var/spack/repos/builtin/packages/met/package.py +++ b/var/spack/repos/builtin/packages/met/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -61,8 +61,6 @@ class Met(AutotoolsPackage): patch("openmp_shape_patch.patch", when="@10.1.0") # https://github.com/JCSDA/spack-stack/issues/615 - # TODO(srherbener) Apple clang 14.x is getting pickier! When these updates are - # merged into the MET code base, the following two patches can be removed. patch("apple-clang-string-cast-operator.patch", when="@10.1.1:11.0 %apple-clang@14:") patch("apple-clang-no-register.patch", when="@10.1.1:11.0 %apple-clang@14:") @@ -131,11 +129,8 @@ def setup_build_environment(self, env): if "+python" in spec: python = spec["python"] - # Syntax changed from 11.0.x to 11.1.y - with when("@:11.0"): - env.set("MET_PYTHON", python.command.path) - with when("@11.1:"): - env.set("MET_PYTHON_BIN_EXE", python.command.path) + env.set("MET_PYTHON", python.command.path) + env.set("MET_PYTHON_BIN_EXE", python.command.path) env.set("MET_PYTHON_CC", "-I" + python.headers.directories[0]) py_ld = [python.libs.ld_flags] if spec["python"].satisfies("~shared"): @@ -151,6 +146,11 @@ def setup_build_environment(self, env): env.set("MET_HDF5", hdf.prefix) env.set("MET_HDFEOS", hdfeos.prefix) + if "+szip" in hdf: + libs.append(" ".join(hdf["szip"].libs)) + if "+external-xdr" in hdf: + libs.append(" ".join(hdf["rpc"].libs)) + if "+graphics" in spec: cairo = spec["cairo"] freetype = spec["freetype"] diff --git a/var/spack/repos/builtin/packages/metabat/package.py b/var/spack/repos/builtin/packages/metabat/package.py index c623bd87bf97cb..b2a6526c84f59f 100644 --- a/var/spack/repos/builtin/packages/metabat/package.py +++ b/var/spack/repos/builtin/packages/metabat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Metabat(CMakePackage): homepage = "https://bitbucket.org/berkeleylab/metabat" url = "https://bitbucket.org/berkeleylab/metabat/get/v2.12.1.tar.gz" + license("BSD-3-Clause-LBNL") + version("2.15", sha256="550487b66ec9b3bc53edf513d00c9deda594a584f53802165f037bde29b4d34e") version("2.14", sha256="d43d5e91afa8f2d211a913739127884669516bfbed870760597fcee2b513abe2") version("2.13", sha256="aa75a2b62ec9588add4c288993821bab5312a83b1259ff0d508c215133492d74") diff --git a/var/spack/repos/builtin/packages/metaeuk/package.py b/var/spack/repos/builtin/packages/metaeuk/package.py index ccaa8c81a30f3e..cabccc9db21e2f 100644 --- a/var/spack/repos/builtin/packages/metaeuk/package.py +++ b/var/spack/repos/builtin/packages/metaeuk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Metaeuk(CMakePackage): url = "https://github.com/soedinglab/metaeuk/archive/refs/tags/6-a5d39d9.tar.gz" maintainers("snehring") + license("GPL-3.0-or-later") + version("6-a5d39d9", sha256="be19c26f5bdb7dcdd7bc48172105afecf19e5a2e5555edb3ba0c4aa0e4aac126") depends_on("cmake@2.8.12:", type="build") diff --git a/var/spack/repos/builtin/packages/metal/package.py b/var/spack/repos/builtin/packages/metal/package.py index 24325c744b753e..bdb821b2e0ec77 100644 --- a/var/spack/repos/builtin/packages/metal/package.py +++ b/var/spack/repos/builtin/packages/metal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Metal(CMakePackage): homepage = "https://genome.sph.umich.edu/wiki/METAL" url = "https://github.com/statgen/METAL/archive/refs/tags/2020-05-05.tar.gz" + license("BSD-3-Clause") + version( "2020-05-05", sha256="0ffa2419ca2ab43766e7e6e8c97822c8ce1f5b6233fb5f992d1b1be1955fede7" ) diff --git a/var/spack/repos/builtin/packages/metall/package.py b/var/spack/repos/builtin/packages/metall/package.py index fc5db02b0c736d..454e7eee2fbef5 100644 --- a/var/spack/repos/builtin/packages/metall/package.py +++ b/var/spack/repos/builtin/packages/metall/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Metall(CMakePackage): tags = ["e4s"] + license("MIT") + version("master", branch="master") version("develop", branch="develop") diff --git a/var/spack/repos/builtin/packages/metaphysicl/package.py b/var/spack/repos/builtin/packages/metaphysicl/package.py index 3efe0f106f7784..d1c85e22a9d74c 100644 --- a/var/spack/repos/builtin/packages/metaphysicl/package.py +++ b/var/spack/repos/builtin/packages/metaphysicl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Metaphysicl(AutotoolsPackage): homepage = "https://github.com/roystgnr/MetaPhysicL" url = "https://github.com/roystgnr/MetaPhysicL/archive/v0.2.0.tar.gz" + license("LGPL-2.1-or-later") + version("0.5.0", sha256="dbba0590970a128ae2ae7064b621f78f95ca2303b70a12b079a51702573840a6") version("0.3.3", sha256="6581ec6512d3509bfca6f93052f7d47dd2d9e4b9f2b3580d778495ae381a0b0d") version("0.2.0", sha256="ff4f9fad870dcdc85d56fb1f8d94123fecbef9189f967d254ba9607624b5f32e") diff --git a/var/spack/repos/builtin/packages/methyldackel/package.py b/var/spack/repos/builtin/packages/methyldackel/package.py index 41a30d5eddbc56..35e03b872d04a7 100644 --- a/var/spack/repos/builtin/packages/methyldackel/package.py +++ b/var/spack/repos/builtin/packages/methyldackel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Methyldackel(MakefilePackage): url = "https://github.com/dpryan79/MethylDackel/archive/refs/tags/0.6.1.tar.gz" maintainers("snehring") + license("MIT") + version("0.6.1", sha256="eeb1da4c830bcd9f3e6663a764947d957c41337643069524a4b545812fcf4819") depends_on("htslib@1.11:") diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index ab0f137aeca4e9..c77ef4b34594f7 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class Metis(CMakePackage, MakefilePackage): # not a metis developer, just package reviewer! maintainers("mthcrts") + license("Apache-2.0") + version("5.1.0", sha256="76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2") version("4.0.3", sha256="5efa35de80703c1b2c4d0de080fafbcf4e0d363a21149a1ad2f96e0144841a55") diff --git a/var/spack/repos/builtin/packages/metkit/package.py b/var/spack/repos/builtin/packages/metkit/package.py index 784e028068daff..2c859da0aa205d 100644 --- a/var/spack/repos/builtin/packages/metkit/package.py +++ b/var/spack/repos/builtin/packages/metkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,12 @@ class Metkit(CMakePackage): homepage = "https://github.com/ecmwf/metkit" url = "https://github.com/ecmwf/metkit/archive/refs/tags/1.7.0.tar.gz" - maintainers("skosukhin") + maintainers("skosukhin", "victoria-cherkas", "dominichofer") + license("Apache-2.0") + + version("1.10.17", sha256="1c525891d77ed28cd4c87b065ba4d1aea24d0905452c18d885ccbd567bbfc9b1") + version("1.10.2", sha256="a038050962aecffda27b755c40b0a6ed0db04a2c22cad3d8c93e6109c8ab4b34") version("1.9.2", sha256="35d5f67196197cc06e5c2afc6d1354981e7c85a441df79a2fbd774e0c343b0b4") version("1.7.0", sha256="8c34f6d8ea5381bd1bcfb22462349d03e1592e67d8137e76b3cecf134a9d338c") @@ -26,8 +30,10 @@ class Metkit(CMakePackage): depends_on("ecbuild@3.4:", type="build") depends_on("eckit@1.16:") + depends_on("eckit@1.21:", when="@1.10:") depends_on("eccodes@2.5:", when="+grib") + depends_on("eccodes@2.27:", when="@1.10.2: +grib") depends_on("odc", when="+odb") diff --git a/var/spack/repos/builtin/packages/metplus/package.py b/var/spack/repos/builtin/packages/metplus/package.py index facae3f5928fa8..a12776b9e4f953 100644 --- a/var/spack/repos/builtin/packages/metplus/package.py +++ b/var/spack/repos/builtin/packages/metplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mfem/mfem-hip.patch b/var/spack/repos/builtin/packages/mfem/mfem-hip.patch new file mode 100644 index 00000000000000..565bae348c0009 --- /dev/null +++ b/var/spack/repos/builtin/packages/mfem/mfem-hip.patch @@ -0,0 +1,24 @@ +From 93ab69cac72cc2d13cfd4b7efcc235bdbca2b9f5 Mon Sep 17 00:00:00 2001 +From: Afzal Patel +Date: Wed, 17 Jan 2024 11:44:18 -0800 +Subject: [PATCH] Add hip library path to ghv flags so libamdhip64 can be found + +--- + config/makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/makefile b/config/makefile +index 627d117..a453865 100644 +--- a/config/makefile ++++ b/config/makefile +@@ -38,7 +38,7 @@ all: header config-mk + MPI = $(MFEM_USE_MPI:NO=) + GHV_CXX ?= $(MFEM_CXX) + GHV = get_hypre_version +-GHV_FLAGS = $(subst @MFEM_DIR@,$(if $(MFEM_DIR),$(MFEM_DIR),..),$(HYPRE_OPT)) ++GHV_FLAGS = $(subst @MFEM_DIR@,$(if $(MFEM_DIR),$(MFEM_DIR),..),$(HYPRE_OPT)) $(HIP_LIB) + SMX = $(if $(MFEM_USE_PUMI:NO=),MFEM_USE_SIMMETRIX) + SMX_PATH = $(PUMI_DIR)/include/gmi_sim.h + SMX_FILE = $(subst @MFEM_DIR@,$(if $(MFEM_DIR),$(MFEM_DIR),..),$(SMX_PATH)) +-- +2.25.1 \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index f4821e63c2ba0f..ddd7be363d2d42 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -45,6 +45,8 @@ class Mfem(Package, CudaPackage, ROCmPackage): # If this quick verification procedure fails, additional discussion # will be required to verify the new version. + license("BSD-3-Clause") + # 'develop' is a special version that is always larger (or newer) than any # other version. version("develop", branch="master") @@ -473,6 +475,12 @@ class Mfem(Package, CudaPackage, ROCmPackage): patch("mfem-4.0.0-makefile-syntax-fix.patch", when="@4.0.0") patch("mfem-4.5.patch", when="@4.5.0") patch("mfem-4.6.patch", when="@4.6.0") + patch( + "https://github.com/mfem/mfem/pull/4005.patch?full_index=1", + when="@4.6.0 +gslib+shared+miniapps", + sha256="2a31682d876626529e2778a216d403648b83b90997873659a505d982d0e65beb", + ) + patch("mfem-hip.patch", when="+rocm ^hip@6.0:") phases = ["configure", "build", "install"] @@ -751,12 +759,14 @@ def find_optional_library(name, prefix): ) gfortran_lib = LibraryList(libfile) sp_lib += [ld_flags_from_library_list(gfortran_lib)] - if ("^mpich" in strumpack) or ("^mvapich2" in strumpack): - sp_lib += ["-lmpifort"] - elif "^openmpi" in strumpack: - sp_lib += ["-lmpi_mpifh"] - elif "^spectrum-mpi" in strumpack: - sp_lib += ["-lmpi_ibm_mpifh"] + if "+mpi" in strumpack: + mpi = strumpack["mpi"] + if ("^mpich" in strumpack) or ("^mvapich2" in strumpack): + sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpifort"])] + elif "^openmpi" in strumpack: + sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpi_mpifh"])] + elif "^spectrum-mpi" in strumpack: + sp_lib += [ld_flags_from_dirs([mpi.prefix.lib], ["mpi_ibm_mpifh"])] if "+openmp" in strumpack: # The '+openmp' in the spec means strumpack will TRY to find # OpenMP; if not found, we should not add any flags -- how do @@ -945,6 +955,7 @@ def find_optional_library(name, prefix): options += ["HIP_CXX=%s" % spec["hip"].hipcc, "HIP_ARCH=%s" % amdgpu_target] hip_headers = HeaderList([]) hip_libs = LibraryList([]) + hip_libs += find_libraries("libamdhip64", spec["hip"].prefix.lib) # To use a C++ compiler that supports -xhip flag one can use # something like this: # options += [ @@ -967,6 +978,9 @@ def find_optional_library(name, prefix): if "^rocthrust" in spec and not spec["hip"].external: # petsc+rocm needs the rocthrust header path hip_headers += spec["rocthrust"].headers + if "^hipblas" in spec and not spec["hip"].external: + # superlu-dist+rocm needs the hipblas header path + hip_headers += spec["hipblas"].headers if "%cce" in spec: # We assume the proper Cray CCE module (cce) is loaded: craylibs_path = env["CRAYLIBS_" + machine().upper()] diff --git a/var/spack/repos/builtin/packages/mg/package.py b/var/spack/repos/builtin/packages/mg/package.py index f652e6bd687b0b..81097f0a16f6e0 100644 --- a/var/spack/repos/builtin/packages/mg/package.py +++ b/var/spack/repos/builtin/packages/mg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mgard/package.py b/var/spack/repos/builtin/packages/mgard/package.py index 411dd0c9b9c6e2..d0f9bd7a7a4aa7 100644 --- a/var/spack/repos/builtin/packages/mgard/package.py +++ b/var/spack/repos/builtin/packages/mgard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Mgard(CMakePackage, CudaPackage): tags = ["e4s"] + license("Apache-2.0") + version("2023-03-31", commit="a8a04a86ff30f91d0b430a7c52960a12fa119589", preferred=True) version("2023-01-10", commit="3808bd8889a0f8e6647fc0251a3189bc4dfc920f") version("2022-11-18", commit="72dd230ed1af88f62ed3c0f662e2387a6e587748") diff --git a/var/spack/repos/builtin/packages/mgardx/package.py b/var/spack/repos/builtin/packages/mgardx/package.py index d5865b474e8075..ecbe45b209b4e4 100644 --- a/var/spack/repos/builtin/packages/mgardx/package.py +++ b/var/spack/repos/builtin/packages/mgardx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mgcfd-op2/package.py b/var/spack/repos/builtin/packages/mgcfd-op2/package.py index 3ed7525980d5f9..8ad20e6dd2fa24 100644 --- a/var/spack/repos/builtin/packages/mgcfd-op2/package.py +++ b/var/spack/repos/builtin/packages/mgcfd-op2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mgis/package.py b/var/spack/repos/builtin/packages/mgis/package.py index 7910537426ce23..a4dcb003bb5090 100644 --- a/var/spack/repos/builtin/packages/mgis/package.py +++ b/var/spack/repos/builtin/packages/mgis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,8 +22,12 @@ class Mgis(CMakePackage): git = "https://github.com/thelfer/MFrontGenericInterfaceSupport.git" maintainers("thelfer") + license("LGPL-3.0-only") + # development branches version("master", branch="master") + version("rliv-2.2", branch="rliv-2.2") + version("rliv-2.1", branch="rliv-2.1") version("rliv-2.0", branch="rliv-2.0") version("rliv-1.2", branch="rliv-1.2") version("rliv-1.1", branch="rliv-1.1") @@ -31,10 +35,12 @@ class Mgis(CMakePackage): # released version version( - "2.0", - sha256="cb427d77f2c79423e969815b948a8b44da33a4370d1760e8c1e22a569f3585e2", + "2.2", + sha256="b3776d7b3a534ca626525a42b97665f7660ae2b28ea57b3f53fd7e8538da1ceb", preferred=True, ) + version("2.1", sha256="f5b556aab130da0c423f395fe4c35d6bf509dd8fc958242f2e37ea788464aea9") + version("2.0", sha256="cb427d77f2c79423e969815b948a8b44da33a4370d1760e8c1e22a569f3585e2") version("1.2.2", sha256="dc24e85cc90ec656ed707eef3d511317ad800915014d9e4e9cf8818b406586d5") version("1.2.1", sha256="a2d7cae3a24546adcf1d1bf7f13f012170d359370f5b6b2c1730b19eb507601d") version("1.2", sha256="ed82ab91cbe17c00ef36578dbfcb4d1817d4c956619b7cccbea3e3f1a3b31940") @@ -47,14 +53,10 @@ class Mgis(CMakePackage): variant("fortran", default=True, description="Enables fortran bindings") variant("python", default=True, description="Enables python bindings") variant("static", default=False, description="Enables static libraries") - variant( - "build_type", - default="Release", - description="The build type to build", - values=("Debug", "Release"), - ) # dependencies + depends_on("tfel@4.2.0", when="@2.2") + depends_on("tfel@4.1.0", when="@2.1") depends_on("tfel@4.0.0", when="@2.0") depends_on("tfel@3.4.3", when="@1.2.2") depends_on("tfel@3.4.1", when="@1.2.1") @@ -62,6 +64,9 @@ class Mgis(CMakePackage): depends_on("tfel@3.3.0", when="@1.1") depends_on("tfel@3.2.1", when="@1.0.1") depends_on("tfel@3.2.0", when="@1.0") + depends_on("tfel@rliv-4.2", when="@rliv-2.2") + depends_on("tfel@rliv-4.1", when="@rliv-2.1") + depends_on("tfel@rliv-4.0", when="@rliv-2.0") depends_on("tfel@rliv-3.4", when="@rliv-1.2") depends_on("tfel@rliv-3.3", when="@rliv-1.1") depends_on("tfel@rliv-3.2", when="@rliv-1.0") diff --git a/var/spack/repos/builtin/packages/microbiomeutil/package.py b/var/spack/repos/builtin/packages/microbiomeutil/package.py index 90bbc080e4aa87..5bc771a1fbee2f 100644 --- a/var/spack/repos/builtin/packages/microbiomeutil/package.py +++ b/var/spack/repos/builtin/packages/microbiomeutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/micromamba/package.py b/var/spack/repos/builtin/packages/micromamba/package.py index 7b8f2a0645cfc8..0effbe21e579d6 100644 --- a/var/spack/repos/builtin/packages/micromamba/package.py +++ b/var/spack/repos/builtin/packages/micromamba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Micromamba(CMakePackage): maintainers("charmoniumQ") + license("BSD-3-Clause") + version("1.4.2", sha256="dce034908d02d991c5e9aadeb9d01f139d027ba199aaeb1d47d543e3f24895d1") version("1.1.0", sha256="e2392cd90221234ae8ea92b37f40829fbe36d80278056269aa1994a5efe7f530") diff --git a/var/spack/repos/builtin/packages/microsocks/package.py b/var/spack/repos/builtin/packages/microsocks/package.py index ff086e0c7ff679..cad5b337d0e39a 100644 --- a/var/spack/repos/builtin/packages/microsocks/package.py +++ b/var/spack/repos/builtin/packages/microsocks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Microsocks(MakefilePackage): maintainers("jcpunk") + license("MIT") + version("develop", branch="master") version("1.0.2", sha256="5ece77c283e71f73b9530da46302fdb4f72a0ae139aa734c07fe532407a6211a") diff --git a/var/spack/repos/builtin/packages/migraphx/0006-add-option-to-turn-off-ck.patch b/var/spack/repos/builtin/packages/migraphx/0006-add-option-to-turn-off-ck.patch new file mode 100644 index 00000000000000..b4082565afbf69 --- /dev/null +++ b/var/spack/repos/builtin/packages/migraphx/0006-add-option-to-turn-off-ck.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c0a83ca..00c5dd0 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,13 @@ set(MIGRAPHX_ENABLE_CPU Off CACHE BOOL "") + # Disable fpga backend by default + set(MIGRAPHX_ENABLE_FPGA Off CACHE BOOL "") + ++if(WIN32) # CK is not yet ported to Windows ++option(MIGRAPHX_USE_COMPOSABLEKERNEL "Enable MIGraphX to use composable kernel JIT library" OFF) ++else() ++option(MIGRAPHX_USE_COMPOSABLEKERNEL "Enable MIGraphX to use composable kernel JIT library" ON) ++endif() ++ ++ + set(CMAKE_CXX_STANDARD_DEFAULT "") + add_compile_options($<$:-std=c++17>) + +diff --git a/src/targets/gpu/CMakeLists.txt b/src/targets/gpu/CMakeLists.txt +index ddb3c1b..e36117a 100644 +--- a/src/targets/gpu/CMakeLists.txt ++++ b/src/targets/gpu/CMakeLists.txt +@@ -42,8 +42,7 @@ if(NOT TARGET MIOpen) + message(SEND_ERROR "Cant find miopen") + endif() + +-if(NOT WIN32) +- # TODO: re-enable when CK is ported to Windows ++if(MIGRAPHX_USE_COMPOSABLEKERNEL) + find_package(composable_kernel 1.0.0 REQUIRED COMPONENTS jit_library) + endif() + +@@ -98,8 +97,7 @@ rocm_clang_tidy_check(kernel_file_check) + + file(GLOB JIT_GPU_SRCS CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jit/*.cpp) + +-if(WIN32) +- # TODO: re-enable when CK is ported to Windows ++if(NOT MIGRAPHX_USE_COMPOSABLEKERNEL) + list(REMOVE_ITEM JIT_GPU_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/jit/ck_gemm.cpp) + endif() + +@@ -275,8 +273,7 @@ endif() + + target_link_libraries(migraphx_gpu PUBLIC migraphx MIOpen roc::rocblas) + target_link_libraries(migraphx_gpu PRIVATE migraphx_device migraphx_kernels) +-if(NOT WIN32) +- # TODO: re-enable when CK is ported to Windows ++if(MIGRAPHX_USE_COMPOSABLEKERNEL) + target_link_libraries(migraphx_gpu PRIVATE composable_kernel::jit_library) + endif() + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 71fe513..441d3bf 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -222,7 +222,10 @@ endfunction() + + function(test_headers PREFIX) + file(GLOB HEADERS CONFIGURE_DEPENDS ${ARGN}) +- ++ if(NOT MIGRAPHX_USE_COMPOSABLEKERNEL) ++ list(REMOVE_ITEM HEADERS ++ ${CMAKE_SOURCE_DIR}/src/targets/gpu/include/migraphx/gpu/ck.hpp) ++ endif() + foreach(HEADER ${HEADERS}) + file(RELATIVE_PATH HEADER_REL ${CMAKE_SOURCE_DIR} ${HEADER}) + string(MAKE_C_IDENTIFIER ${HEADER_REL} TEST_NAME) \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index 81bf1bff2b3818..efc4280521d1e9 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,14 +11,19 @@ class Migraphx(CMakePackage): """AMD's graph optimization engine.""" - homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX" - git = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX.git" - url = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/AMDMIGraphX" + git = "https://github.com/ROCm/AMDMIGraphX.git" + url = "https://github.com/ROCm/AMDMIGraphX/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["libmigraphx"] + license("MIT") + + version("6.0.0", sha256="7bb3f5011da9b1f3b79707b06118c523c1259215f650c2ffa5622a7e1d88868f") + version("5.7.1", sha256="3e58c043a5a7d1357ee05725fd6cd41e190b070f1ba57f61300128429902089c") + version("5.7.0", sha256="14f13554367d2d6490d66f8b5b739203225e7acce25085559e7c4acf29e2a4d5") version("5.6.1", sha256="b108c33f07572ffd880b20f6de06f1934ab2a1b41ae69095612322ac412fa91c") version("5.6.0", sha256="eaec90535d62002fd5bb264677ad4a7e30c55f18d2a287680d0495c7e60432b2") version("5.5.1", sha256="e71c4744f8ef6a1a99c179bbad94b8fe9bd7686eaa9397f376b70988c3341f0c") @@ -104,7 +109,7 @@ class Migraphx(CMakePackage): ) def url_for_version(self, version): - url = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/archive/" + url = "https://github.com/ROCm/AMDMIGraphX/archive/" if version <= Version("3.5.0"): url += "{0}.tar.gz".format(version) else: @@ -119,6 +124,7 @@ def url_for_version(self, version): patch("0003-restrict-python-2.7-usage.patch", when="@5.2.0:5.4") patch("0004-restrict-python2.7-usage-for-5.5.0.patch", when="@5.5.0") patch("0005-Adding-half-include-directory-path-migraphx.patch", when="@5.6.0:") + patch("0006-add-option-to-turn-off-ck.patch", when="@5.7") depends_on("cmake@3.5:", type="build") depends_on("protobuf", type="link") @@ -131,6 +137,7 @@ def url_for_version(self, version): depends_on("py-pybind11", type="build", when="@:4.0.0") depends_on("py-pybind11@2.6:", type="build", when="@4.1.0:") depends_on("pkgconfig", type="build", when="@5.3.0:") + depends_on("abseil-cpp") for ver in [ "3.5.0", @@ -160,6 +167,9 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -167,6 +177,9 @@ def url_for_version(self, version): depends_on("rocblas@" + ver, when="@" + ver) depends_on("miopen-hip@" + ver, when="@" + ver) + for ver in ["5.7.0", "5.7.1", "6.0.0"]: + depends_on("composable-kernel@" + ver, when="@" + ver) + @property def cmake_python_hints(self): """Include the python include path to the @@ -198,6 +211,9 @@ def cmake_args(self): args += self.cmake_python_hints if "@5.5.0:" in self.spec: args.append(self.define("CMAKE_CXX_FLAGS", "-I{0}".format(abspath))) + args.append(self.define("MIGRAPHX_ENABLE_PYTHON", "OFF")) + if "@5.7" in self.spec: + args.append(self.define("MIGRAPHX_USE_COMPOSABLEKERNEL", "OFF")) return args def test(self): diff --git a/var/spack/repos/builtin/packages/migrate/package.py b/var/spack/repos/builtin/packages/migrate/package.py index d4aa59698e34f2..33b408fb49aee5 100644 --- a/var/spack/repos/builtin/packages/migrate/package.py +++ b/var/spack/repos/builtin/packages/migrate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Migrate(AutotoolsPackage): homepage = "https://popgen.sc.fsu.edu/" url = "https://popgen.sc.fsu.edu/currentversions/migrate-3.6.11.src.tar.gz" + license("Unlicense") + version("3.6.11", sha256="a9ba06a4e995a45b8d04037f5f2da23e1fe64a2f3565189bdd50c62c6fe01fb8") variant("mpi", default=False, description="Build MPI binaries") diff --git a/var/spack/repos/builtin/packages/mii/package.py b/var/spack/repos/builtin/packages/mii/package.py index 2b8be93914518f..c0f24d8bb27dc6 100644 --- a/var/spack/repos/builtin/packages/mii/package.py +++ b/var/spack/repos/builtin/packages/mii/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Mii(MakefilePackage): homepage = "https://github.com/codeandkey/mii" url = "https://github.com/codeandkey/mii/archive/v1.0.4.tar.gz" + license("MIT") + version("1.1.2", sha256="bdf2cfe93b2b0989cd47f1447e8787d8339440295299c0a70d2646e2c02e29b8") version("1.0.4", sha256="3c4e7e6e8c21969da8dade05fecab35be61f2bb82d75eeaf19db8cc97f8058b5") diff --git a/var/spack/repos/builtin/packages/millepede/package.py b/var/spack/repos/builtin/packages/millepede/package.py index 6cc9b5a9ada53d..65edd50b89cebe 100644 --- a/var/spack/repos/builtin/packages/millepede/package.py +++ b/var/spack/repos/builtin/packages/millepede/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,10 +14,10 @@ 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 + license("LGPL-2.0-only") + version("04-13-03", sha256="669a6e46a6f02ba3c78b2760e2ffb2c90d25b582ccd1a5c0770eef81c7bcbbe9") version("04-11-01", sha256="9869eb84d8d07cecfab15c396f3faa36aef10906e39f8641c48b58e0325b3205") diff --git a/var/spack/repos/builtin/packages/mimalloc/package.py b/var/spack/repos/builtin/packages/mimalloc/package.py index fed6e5bf783543..53eefe6b4de68a 100644 --- a/var/spack/repos/builtin/packages/mimalloc/package.py +++ b/var/spack/repos/builtin/packages/mimalloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mimalloc(CMakePackage): git = "https://github.com/microsoft/mimalloc.git" maintainers("msimberg") + license("MIT") + version("dev-slice", branch="dev-slice") version("dev", branch="dev") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/minc-toolkit/package.py b/var/spack/repos/builtin/packages/minc-toolkit/package.py index 40e793d24da885..9739b7f4c317c7 100644 --- a/var/spack/repos/builtin/packages/minc-toolkit/package.py +++ b/var/spack/repos/builtin/packages/minc-toolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class MincToolkit(CMakePackage): homepage = "https://github.com/BIC-MNI/minc-toolkit-v2" git = "https://github.com/BIC-MNI/minc-toolkit-v2.git" + license("GPL-3.0-only") + version("1.9.18.2", commit="b98e4972bdac2b78e3c1e412d75c97e2e7c5f6b9", submodules=True) version("1.9.18.1", commit="38597c464b6e93eda680ab4a9e903366d53d7737", submodules=True) diff --git a/var/spack/repos/builtin/packages/minced/package.py b/var/spack/repos/builtin/packages/minced/package.py index 99fc4f8c5fb72a..90899cd5348f27 100644 --- a/var/spack/repos/builtin/packages/minced/package.py +++ b/var/spack/repos/builtin/packages/minced/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Minced(Package): homepage = "https://github.com/ctSkennerton/minced" url = "https://github.com/ctSkennerton/minced/archive/0.2.0.tar.gz" + license("GPL-3.0-only") + version("0.4.2", sha256="35b6ee22fe6bdc26a31d0203a7dcc6bd1a19fd6733c60d80ceb44431884af165") version("0.3.2", sha256="334aee43292d0b657c4849f818ddfb3ac7811eb505502bf24a01d66719084b44") version("0.2.0", sha256="e1ca61e0307e6a2a2480bc0a1291a2c677110f34c3247d4773fdba7e95a6b573") diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py index 73d6d307e7cb21..af37a739045a59 100644 --- a/var/spack/repos/builtin/packages/mindthegap/package.py +++ b/var/spack/repos/builtin/packages/mindthegap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mindthegap(CMakePackage): maintainers("snehring") + license("AGPL-3.0-only") + version( "2.3.0", tag="v2.3.0", commit="fe85c308434a4ad1ae7977dad67e966abc2bf93e", submodules=True ) diff --git a/var/spack/repos/builtin/packages/miniaero/package.py b/var/spack/repos/builtin/packages/miniaero/package.py index de0314603738b7..138d0a1b077a70 100644 --- a/var/spack/repos/builtin/packages/miniaero/package.py +++ b/var/spack/repos/builtin/packages/miniaero/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index 1d6fec97fdc1b5..166ba379c09b7a 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Miniamr(MakefilePackage): tags = ["proxy-app", "ecp-proxy-app"] + license("LGPL-3.0-only") + version("master", branch="master") version("1.6.6", sha256="a7f79fae49e433ef8350cbd34cbf57c486089cf7ac0d1f1f3b23c820d3e5bb9f") version("1.6.5", sha256="c70f0f648c73ea4497817ceee158334eeb901fc5c32cf804deef3226cd9cf26a") diff --git a/var/spack/repos/builtin/packages/miniapp-ascent/package.py b/var/spack/repos/builtin/packages/miniapp-ascent/package.py index 22ac0d9d206acc..558352418b9771 100644 --- a/var/spack/repos/builtin/packages/miniapp-ascent/package.py +++ b/var/spack/repos/builtin/packages/miniapp-ascent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class MiniappAscent(Package): git = "https://github.com/cinemascienceworkflows/2021-04_Miniapp-Ascent.git" url = "https://github.com/cinemascienceworkflows/2021-04_Miniapp-Ascent/archive/refs/heads/master.zip" + license("BSD-3-Clause") + version("master", branch="master") depends_on("ascent", type=("run")) diff --git a/var/spack/repos/builtin/packages/miniasm/package.py b/var/spack/repos/builtin/packages/miniasm/package.py index 4cddf247e15c02..2a908fc0b237cc 100644 --- a/var/spack/repos/builtin/packages/miniasm/package.py +++ b/var/spack/repos/builtin/packages/miniasm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Miniasm(MakefilePackage): homepage = "http://www.example.co://github.com/lh3/miniasm" git = "https://github.com/lh3/miniasm.git" + license("MIT") + version("2018-3-30", commit="55cf0189e2f7d5bda5868396cebe066eec0a9547") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/miniconda2/package.py b/var/spack/repos/builtin/packages/miniconda2/package.py index 5e48b2d050b447..6566a1162e3b81 100644 --- a/var/spack/repos/builtin/packages/miniconda2/package.py +++ b/var/spack/repos/builtin/packages/miniconda2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/miniconda3/package.py b/var/spack/repos/builtin/packages/miniconda3/package.py index f66d91e2382595..7d5596e4d10c85 100644 --- a/var/spack/repos/builtin/packages/miniconda3/package.py +++ b/var/spack/repos/builtin/packages/miniconda3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minife/package.py b/var/spack/repos/builtin/packages/minife/package.py index 2497e441ad8d3d..beb587c7c7973a 100644 --- a/var/spack/repos/builtin/packages/minife/package.py +++ b/var/spack/repos/builtin/packages/minife/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Minife(MakefilePackage): tags = ["proxy-app", "ecp-proxy-app"] + license("LGPL-3.0-or-later") + version("2.1.0", sha256="59f4c56d73d2a758cba86939db2d36e12705282cb4174ce78223d984527f5d15") variant( diff --git a/var/spack/repos/builtin/packages/miniforge3/package.py b/var/spack/repos/builtin/packages/miniforge3/package.py index 1eb9593c41d8f5..d1b22e4f9ee4ba 100644 --- a/var/spack/repos/builtin/packages/miniforge3/package.py +++ b/var/spack/repos/builtin/packages/miniforge3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minigan/package.py b/var/spack/repos/builtin/packages/minigan/package.py index 90edb37e04307e..4401993e38e99e 100644 --- a/var/spack/repos/builtin/packages/minigan/package.py +++ b/var/spack/repos/builtin/packages/minigan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Minigan(Package): homepage = "https://github.com/SandiaMLMiniApps/miniGAN" url = "https://github.com/SandiaMLMiniApps/miniGAN/archive/1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.0.0", sha256="ef6d5def9c7040af520acc64b7a8b6c8ec4b7901721b11b0cb25a583ea0c8ae3") depends_on("python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/minighost/package.py b/var/spack/repos/builtin/packages/minighost/package.py index 857de2903aba71..d894a8a554b751 100644 --- a/var/spack/repos/builtin/packages/minighost/package.py +++ b/var/spack/repos/builtin/packages/minighost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Minighost(MakefilePackage): tags = ["proxy-app"] + license("LGPL-3.0-only") + version("1.0.1", sha256="713f305559d892923cde0ad3cbc53c7cefc52a684f65275ccc9fb0b1d049cccc") variant("mpi", default=True, description="Enable MPI Support") diff --git a/var/spack/repos/builtin/packages/minigmg/package.py b/var/spack/repos/builtin/packages/minigmg/package.py index 3e3cfbfddd81bf..4a5e4605f7a3bd 100644 --- a/var/spack/repos/builtin/packages/minigmg/package.py +++ b/var/spack/repos/builtin/packages/minigmg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Minigmg(Package): ) url = "https://crd.lbl.gov/assets/Uploads/FTG/Projects/miniGMG/miniGMG.tar.gz" + license("BSD-3-Clause-LBNL") + version("master", sha256="1c2d27496a881f655f5e849d6a7a132625e535739f82575991c511cc2cf899ac") variant( diff --git a/var/spack/repos/builtin/packages/minimap2/package.py b/var/spack/repos/builtin/packages/minimap2/package.py index e84bb540449e06..04de083fe3a362 100644 --- a/var/spack/repos/builtin/packages/minimap2/package.py +++ b/var/spack/repos/builtin/packages/minimap2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,13 @@ class Minimap2(PythonPackage): homepage = "https://github.com/lh3/minimap2" url = "https://github.com/lh3/minimap2/releases/download/v2.2/minimap2-2.2.tar.bz2" + git = "https://github.com/lh3/minimap2.git" + + license("MIT") version("2.26", sha256="6a588efbd273bff4f4808d5190957c50272833d2daeb4407ccf4c1b78143624c") + version("2.24", sha256="9dd4c31ff082182948944bcdad6d328f64f09295d10547d72eba24189880a615") + version("2.17", sha256="b68ac8882d33cc63e9e3246775062aeb159b6990ff7f38099172c3fe6f8a2742") version("2.14", sha256="9088b785bb0c33488ca3a27c8994648ce21a8be54cb117f5ecee26343facd03b") version("2.10", sha256="52b36f726ec00bfca4a2ffc23036d1a2b5f96f0aae5a92fd826be6680c481c20") version("2.2", sha256="7e8683aa74c4454a8cfe3821f405c4439082e24c152b4b834fdb56a117ecaed9") @@ -24,6 +29,9 @@ class Minimap2(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-cython", type="build") + variant("jstools", default=False, description="Include Javascript tools (paftools)") + depends_on("k8", type="run", when="+jstools") + @run_after("install") def install_minimap2(self): make_arg = [] @@ -32,3 +40,4 @@ def install_minimap2(self): make(*make_arg) mkdirp(prefix.bin) install("minimap2", prefix.bin) + install("misc/*.js", prefix.bin) diff --git a/var/spack/repos/builtin/packages/minimd/package.py b/var/spack/repos/builtin/packages/minimd/package.py index 44c2b9421135f5..f3072af0cb0131 100644 --- a/var/spack/repos/builtin/packages/minimd/package.py +++ b/var/spack/repos/builtin/packages/minimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minio/package.py b/var/spack/repos/builtin/packages/minio/package.py index 7a21d5db336628..ec216a538f91c1 100644 --- a/var/spack/repos/builtin/packages/minio/package.py +++ b/var/spack/repos/builtin/packages/minio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Minio(MakefilePackage): homepage = "https://min.io/" url = "https://github.com/minio/minio/archive/RELEASE.2020-07-13T18-09-56Z.tar.gz" + license("AGPL-3.0-or-later") + version( "2020-07-13T18-09-56Z", sha256="147fca3930389162cc7306a0fa5cf478ee2deba4b31a9317f3d35e82aa58d41e", diff --git a/var/spack/repos/builtin/packages/miniocli/package.py b/var/spack/repos/builtin/packages/miniocli/package.py index 5857f4d4872e63..4d0c82925bf98f 100644 --- a/var/spack/repos/builtin/packages/miniocli/package.py +++ b/var/spack/repos/builtin/packages/miniocli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Miniocli(MakefilePackage): homepage = "https://docs.min.io/docs/minio-client-complete-guide.html" url = "https://github.com/minio/mc/archive/refs/tags/RELEASE.2022-02-02T02-03-24Z.tar.gz" + license("AGPL-3.0-only") + version( "2023-06-28", sha256="033a80439474595665bdbc3ec72b059dc9e69e99db85fe6820877ad8973a080b", diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py index bc43f47f62f36d..7c827dc9d8fba0 100644 --- a/var/spack/repos/builtin/packages/miniqmc/package.py +++ b/var/spack/repos/builtin/packages/miniqmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minisign/package.py b/var/spack/repos/builtin/packages/minisign/package.py index d3fd011a7021cc..666c31ec293a92 100644 --- a/var/spack/repos/builtin/packages/minisign/package.py +++ b/var/spack/repos/builtin/packages/minisign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Minisign(CMakePackage): maintainers("alalazo") + license("ISC") + version("0.11", sha256="74c2c78a1cd51a43a6c98f46a4eabefbc8668074ca9aa14115544276b663fc55") version("0.9", sha256="caa4b3dd314e065c6f387b2713f7603673e39a8a0b1a76f96ef6c9a5b845da0f") version("0.8", sha256="130eb5246076bc7ec42f13495a601382e566bb6733430d40a68de5e43a7f1082") diff --git a/var/spack/repos/builtin/packages/minismac2d/package.py b/var/spack/repos/builtin/packages/minismac2d/package.py index a32fba7ab4a57a..f5161f669b76ac 100644 --- a/var/spack/repos/builtin/packages/minismac2d/package.py +++ b/var/spack/repos/builtin/packages/minismac2d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minitri/package.py b/var/spack/repos/builtin/packages/minitri/package.py index 9e7b24ba98d01a..0cf2ecc393b572 100644 --- a/var/spack/repos/builtin/packages/minitri/package.py +++ b/var/spack/repos/builtin/packages/minitri/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minivite/package.py b/var/spack/repos/builtin/packages/minivite/package.py index 702f701dd4c6e1..44c77e051dc9e8 100644 --- a/var/spack/repos/builtin/packages/minivite/package.py +++ b/var/spack/repos/builtin/packages/minivite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Minivite(MakefilePackage): homepage = "https://hpc.pnl.gov/people/hala/grappolo.html" git = "https://github.com/Exa-Graph/miniVite.git" + license("BSD-3-Clause") + version("develop", branch="master") version("1.0", tag="v1.0", commit="65ccaa8a4ec0b4bea516e2abdafbeb2f8a5f0c94") version("1.1", tag="v1.1", commit="23476d9d41eb8a17bf4108ac56852dacda89b253") diff --git a/var/spack/repos/builtin/packages/minixyce/package.py b/var/spack/repos/builtin/packages/minixyce/package.py index dd1af63a08a72e..71cb49a9795352 100644 --- a/var/spack/repos/builtin/packages/minixyce/package.py +++ b/var/spack/repos/builtin/packages/minixyce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/minizip/package.py b/var/spack/repos/builtin/packages/minizip/package.py index 25242a60d9b586..d88a5e046b51d3 100644 --- a/var/spack/repos/builtin/packages/minizip/package.py +++ b/var/spack/repos/builtin/packages/minizip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Minizip(AutotoolsPackage): homepage = "https://www.winimage.com/zLibDll/minizip.html" url = "https://zlib.net/fossils/zlib-1.2.11.tar.gz" + license("Zlib") + version("1.2.11", sha256="c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1") configure_directory = "contrib/minizip" diff --git a/var/spack/repos/builtin/packages/minuit/package.py b/var/spack/repos/builtin/packages/minuit/package.py index fcfddf77dd60ac..2e7df71649ea53 100644 --- a/var/spack/repos/builtin/packages/minuit/package.py +++ b/var/spack/repos/builtin/packages/minuit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 6ab2967ac24b23..8bafc287010b4e 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,19 @@ class MiopenHip(CMakePackage): """AMD's library for high performance machine learning primitives.""" - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen" - git = "https://github.com/ROCmSoftwarePlatform/MIOpen.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/MIOpen" + git = "https://github.com/ROCm/MIOpen.git" + url = "https://github.com/ROCm/MIOpen/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["libMIOpen"] + + license("MIT") + + version("6.0.0", sha256="a0718a48353be30ff98118ade511f0c1b454e394d8f934aefe7dd6946562b2e9") + version("5.7.1", sha256="912a658fe21ce6f1982b0f2ff251c3f7bb618f2e7e9876d983bcb54e3cd7129e") + version("5.7.0", sha256="5cd0b62254469e1c246d5890d2b78f8aedcf42cf8a327eabc1a391b83bcd14e1") version("5.6.1", sha256="ff627d68ed9e52433a3c808b5d3ff179a398b77ce81b00cfea7b2c4da5162c6c") version("5.6.0", sha256="d620ddab5b488bdf81242654fefa337c6b71dc410c2ff26d30a4ee86a8d22d11") version("5.5.1", sha256="2cd75071b8ee876c69a94f028b6c8a9346d6d2fde7d4b64e6d635f3b6c994262") @@ -118,6 +124,11 @@ class MiopenHip(CMakePackage): patch("0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch", when="@3.9.0:5.0.2") patch("miopen-hip-include-nlohmann-include-directory.patch", when="@5.4.0:") + patch( + "https://github.com/ROCm/MIOpen/pull/2276/commits/f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch?full_index=1", + sha256="c777d9f4cd2bbfec632b38620c0f70bb0cce8da1", + when="@5.7:", + ) for ver in [ "3.5.0", @@ -147,6 +158,9 @@ class MiopenHip(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -156,7 +170,7 @@ class MiopenHip(CMakePackage): for ver in ["5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3", "5.3.0", "5.3.3"]: depends_on("mlirmiopen@" + ver, when="@" + ver) - for ver in ["5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("nlohmann-json", type="link") depends_on("composable-kernel@" + ver, when="@" + ver) for ver in ["5.4.0", "5.4.3", "5.5.0"]: @@ -218,6 +232,8 @@ def cmake_args(self): args.append(self.define("MIOPEN_USE_COMPOSABLEKERNEL", "ON")) args.append(self.define("MIOPEN_ENABLE_AI_KERNEL_TUNING", "OFF")) args.append(self.define("MIOPEN_USE_MLIR", "OFF")) + if self.spec.satisfies("@5.7.0:"): + args.append(self.define("MIOPEN_ENABLE_AI_IMMED_MODE_FALLBACK", "OFF")) args.append( "-DNLOHMANN_JSON_INCLUDE={0}".format(self.spec["nlohmann-json"].prefix.include) ) diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index 73808b43e47de2..5ec89b243de5ac 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,14 +12,16 @@ class MiopenOpencl(CMakePackage): """AMD's library for high performance machine learning primitives.""" - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen" - git = "https://github.com/ROCmSoftwarePlatform/MIOpen.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/MIOpen" + git = "https://github.com/ROCm/MIOpen.git" + url = "https://github.com/ROCm/MIOpen/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["libMIOpen"] + license("MIT") + version("5.5.1", sha256="2cd75071b8ee876c69a94f028b6c8a9346d6d2fde7d4b64e6d635f3b6c994262") version("5.5.0", sha256="791087242551669e546225e36123c21663f0dad14dbcfd6d0ce0e7bad0ab0de1") version("5.4.3", sha256="37ffe2ed3d7942da8ea2f6bdb85c7a2f58e3ccd31767db158a322769d3604efd") diff --git a/var/spack/repos/builtin/packages/miopen-tensile/package.py b/var/spack/repos/builtin/packages/miopen-tensile/package.py index eb559972107038..1d64b792d4840c 100644 --- a/var/spack/repos/builtin/packages/miopen-tensile/package.py +++ b/var/spack/repos/builtin/packages/miopen-tensile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,9 @@ class MiopenTensile(CMakePackage): """MIOpenTensile provides host-callable interfaces to Tensile library. MIOpenTensile supports one programming model: HIP""" - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenTensile" - git = "https://github.com/ROCmSoftwarePlatform/MIOpenTensile.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpentensile/archive/rocm-5.0.0.tar.gz" + homepage = "https://github.com/ROCm/MIOpenTensile" + git = "https://github.com/ROCm/MIOpenTensile.git" + url = "https://github.com/ROCm/MIOpentensile/archive/rocm-5.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam") @@ -72,7 +72,7 @@ class MiopenTensile(CMakePackage): resource( name="Tensile", - git="https://github.com/ROCmSoftwarePlatform/Tensile.git", + git="https://github.com/ROCm/Tensile.git", commit="9cbabb07f81e932b9c98bf5ae48fbd7fcef615cf", when="@4.5.0:", ) diff --git a/var/spack/repos/builtin/packages/miopengemm/package.py b/var/spack/repos/builtin/packages/miopengemm/package.py index 808c63f14c3138..e67185563e706a 100644 --- a/var/spack/repos/builtin/packages/miopengemm/package.py +++ b/var/spack/repos/builtin/packages/miopengemm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,9 @@ class Miopengemm(CMakePackage): """An OpenCL general matrix multiplication (GEMM) API and kernel generator""" - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM" - git = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/MIOpenGEMM" + git = "https://github.com/ROCm/MIOpenGEMM.git" + url = "https://github.com/ROCm/MIOpenGEMM/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") @@ -22,10 +22,12 @@ class Miopengemm(CMakePackage): def url_for_version(self, version): if version == Version("1.1.6"): - return "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/1.1.6.tar.gz" - url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-{0}.tar.gz" + return "https://github.com/ROCm/MIOpenGEMM/archive/1.1.6.tar.gz" + url = "https://github.com/ROCm/MIOpenGEMM/archive/rocm-{0}.tar.gz" return url.format(version) + license("MIT") + version("5.5.1", sha256="a997b560521641e7173613cf547ecde5d15ac6fac1786d392b0f133c91f99a40") version("5.5.0", sha256="ffd9775129564662b338952588057a088f7e9723b4a9a766b2dd96fdc0992c26") version("5.4.3", sha256="5051051cab60ca0f6347a981da6c9dbeddf8b0de698d4e5409a0db0c622acafc") diff --git a/var/spack/repos/builtin/packages/mira/package.py b/var/spack/repos/builtin/packages/mira/package.py index 2683f3e93b7692..7c0cd23874bcc0 100644 --- a/var/spack/repos/builtin/packages/mira/package.py +++ b/var/spack/repos/builtin/packages/mira/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mira(AutotoolsPackage): homepage = "https://sourceforge.net/projects/mira-assembler/" url = "https://downloads.sourceforge.net/project/mira-assembler/MIRA/stable/mira-4.0.2.tar.bz2" + license("GPL-2.0-or-later") + version("4.0.2", sha256="a32cb2b21e0968a5536446287c895fe9e03d11d78957554e355c1080b7b92a80") depends_on("boost@1.46:") diff --git a/var/spack/repos/builtin/packages/miranda/package.py b/var/spack/repos/builtin/packages/miranda/package.py index 37f023dc867c77..323eaf2b84e979 100644 --- a/var/spack/repos/builtin/packages/miranda/package.py +++ b/var/spack/repos/builtin/packages/miranda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Miranda(AutotoolsPackage): homepage = "http://www.microrna.org/microrna/getDownloads.do" url = "https://cbio.mskcc.org/microrna_data/miRanda-aug2010.tar.gz" + license("GPL-2.0-only") + version( "3.3a", sha256="a671da562cf4636ef5085b27349df2df2f335774663fd423deb08f31212ec778", diff --git a/var/spack/repos/builtin/packages/mirdeep2/package.py b/var/spack/repos/builtin/packages/mirdeep2/package.py index cad9a2b15f19e4..174a5364306210 100644 --- a/var/spack/repos/builtin/packages/mirdeep2/package.py +++ b/var/spack/repos/builtin/packages/mirdeep2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mitofates/package.py b/var/spack/repos/builtin/packages/mitofates/package.py index c94a40bb175497..8cdd675086d449 100644 --- a/var/spack/repos/builtin/packages/mitofates/package.py +++ b/var/spack/repos/builtin/packages/mitofates/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py index 33f7e92fcf7e7a..b9c12d9e5ff14d 100644 --- a/var/spack/repos/builtin/packages/mitos/package.py +++ b/var/spack/repos/builtin/packages/mitos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mitos(CMakePackage): url = "https://github.com/LLNL/Mitos/archive/v0.9.1.tar.gz" git = "https://github.com/llnl/Mitos.git" + license("LGPL-2.1-or-later") + version("0.9.2", commit="8cb143a2e8c00353ff531a781a9ca0992b0aaa3d") version("0.9.1", sha256="67abe227d2f9b4d2f235031b526d3ceb2c4792ad98772b1b1d5af0d227a795fc") diff --git a/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path-5.6.patch b/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path-5.6.patch new file mode 100644 index 00000000000000..364a4a403651c4 --- /dev/null +++ b/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path-5.6.patch @@ -0,0 +1,13 @@ +diff --git a/rocAL/rocAL/CMakeLists.txt b/rocAL/rocAL/CMakeLists.txt +index 7ae8cb8..195f387 100644 +--- a/rocAL/rocAL/CMakeLists.txt ++++ b/rocAL/rocAL/CMakeLists.txt +@@ -122,6 +122,8 @@ if(NOT Threads_FOUND) + endif() + + if(${BUILD_ROCAL}) ++ find_path(HALF_INCLUDE_DIR half.hpp) ++ include_directories(${HALF_INCLUDE_DIR}) + # AMD OpenVX & VX_RPP + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} openvx vx_rpp) + # AMD RPP diff --git a/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path.patch b/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path.patch new file mode 100644 index 00000000000000..2e935e9cee2417 --- /dev/null +++ b/var/spack/repos/builtin/packages/mivisionx/0001-add-half-include-path.patch @@ -0,0 +1,21 @@ +diff --git a/rocAL/rocAL/CMakeLists.txt b/rocAL/rocAL/CMakeLists.txt +index bb28810..3c97eab 100644 +--- a/rocAL/rocAL/CMakeLists.txt ++++ b/rocAL/rocAL/CMakeLists.txt +@@ -39,6 +39,8 @@ find_package(Boost COMPONENTS ${BOOST_COMPONENTS} QUIET) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads QUIET) + ++find_path(HALF_INCLUDE_DIR half.hpp) ++ + if( GPU_SUPPORT AND "${BACKEND}" STREQUAL "HIP") + if(NOT DEFINED HIP_PATH) + if(NOT DEFINED ENV{HIP_PATH}) +@@ -120,6 +122,7 @@ if(NOT Threads_FOUND) + endif() + + if(${BUILD_ROCAL}) ++ include_directories(${HALF_INCLUDE_DIR}) + # AMD OpenVX & RPP + include_directories(${AMDRPP_INCLUDE_DIRS}) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} openvx vx_rpp) diff --git a/var/spack/repos/builtin/packages/mivisionx/0002-add-half-include-path-for-tests.patch b/var/spack/repos/builtin/packages/mivisionx/0002-add-half-include-path-for-tests.patch new file mode 100644 index 00000000000000..c3aec5597982bc --- /dev/null +++ b/var/spack/repos/builtin/packages/mivisionx/0002-add-half-include-path-for-tests.patch @@ -0,0 +1,62 @@ +diff --git a/model_compiler/python/nnir_to_clib.py b/model_compiler/python/nnir_to_clib.py +index b688094..26fcfe3 100644 +--- a/model_compiler/python/nnir_to_clib.py ++++ b/model_compiler/python/nnir_to_clib.py +@@ -151,6 +151,10 @@ if (OPENVX_BACKEND_OPENCL_FOUND) + include_directories (${OpenCL_INCLUDE_DIRS} ${OpenCL_INCLUDE_DIRS}/Headers ) + endif() + ++find_path(HALF_INCLUDE_DIR half.hpp) ++message(STATUS "HALF_INCLUDE_DIR: ${HALF_INCLUDE_DIR}") ++include_directories(${HALF_INCLUDE_DIR}) ++ + find_package(OpenCV QUIET) + include_directories (/opt/rocm/include/mivisionx) + include_directories (${PROJECT_SOURCE_DIR}/lib) +diff --git a/samples/inference/mv_objdetect/CMakeLists.txt b/samples/inference/mv_objdetect/CMakeLists.txt +index 9b92b84..d82b71e 100644 +--- a/samples/inference/mv_objdetect/CMakeLists.txt ++++ b/samples/inference/mv_objdetect/CMakeLists.txt +@@ -50,7 +50,10 @@ if (OPENVX_BACKEND_OPENCL_FOUND) + include_directories (${OpenCL_INCLUDE_DIRS} ${OpenCL_INCLUDE_DIRS}/Headers ) + endif() + +-include_directories (${ROCM_PATH}/include/mivisionx ${PROJECT_SOURCE_DIR} ) ++find_path(HALF_INCLUDE_DIR half.hpp) ++message(STATUS "HALF_INCLUDE_DIR: ${HALF_INCLUDE_DIR}") ++ ++include_directories (${ROCM_PATH}/include/mivisionx ${PROJECT_SOURCE_DIR} ${HALF_INCLUDE_DIR} ) + link_directories (${ROCM_PATH}/lib ${PROJECT_SOURCE_DIR}/lib) + option (USE_POSTPROC "Use postprocessing module implementation" ON) + set(SOURCES mvobjdetect.cpp mvdeploy_api.cpp visualize.cpp) +diff --git a/utilities/rocAL/rocAL_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_unittests/CMakeLists.txt +index 6500003..20de035 100644 +--- a/utilities/rocAL/rocAL_unittests/CMakeLists.txt ++++ b/utilities/rocAL/rocAL_unittests/CMakeLists.txt +@@ -43,9 +43,10 @@ include(GNUInstallDirs) + + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake) + ++find_path(HALF_INCLUDE_DIR half.hpp) + find_package(OpenCV QUIET) + find_package(AMDRPP QUIET) +-include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal) ++include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal ${HALF_INCLUDE_DIR}) + link_directories(${ROCM_PATH}/lib/) + file(GLOB My_Source_Files ./*.cpp) + add_executable(${PROJECT_NAME} ${My_Source_Files}) +diff --git a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt +index bd64a5b..3aa6172 100644 +--- a/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt ++++ b/utilities/rocAL/rocAL_video_unittests/CMakeLists.txt +@@ -46,8 +46,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake) + + find_package(OpenCV QUIET) + find_package(AMDRPP QUIET) +- +-include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal) ++find_path(HALF_INCLUDE_DIR half.hpp) ++include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal ${HALF_INCLUDE_DIR}) + link_directories(${ROCM_PATH}/lib/) + file(GLOB My_Source_Files ./*.cpp) + add_executable(${PROJECT_NAME} ${My_Source_Files}) diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index b298160520f53f..5e2549631f92d9 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,7 @@ class Mivisionx(CMakePackage): homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX" git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git" - url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-5.5.0.tar.gz" + url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-6.0.0.tar.gz" maintainers("srekolam", "renjithravindrankannath") tags = ["rocm"] @@ -25,6 +25,11 @@ def url_for_version(self, version): url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz" return url.format(version) + license("MIT") + + version("6.0.0", sha256="01324a12f21ea0e29a4d7d7c60498ba9231723569fedcdd90f28ddffb5e0570e") + version("5.7.1", sha256="bfc074bc32ebe84c72149ee6abb30b5b6499023d5b98269232de82e35d0505a8") + version("5.7.0", sha256="07e4ec8a8c06a9a8bb6394a043c9c3e7176acd3b462a16de91ef9518a64df9ba") version("5.6.1", sha256="b2ff95c1488e244f379482631dae4f9ab92d94a513d180e03607aa1e184b5b0a") version("5.6.0", sha256="34c184e202b1a6da2398b66e33c384d5bafd8f8291089c18539715c5cb73eb1f") version("5.5.1", sha256="e8209f87a57c4222003a936240e7152bbfa496862113358f29d4c3e80d4cdf56") @@ -116,8 +121,19 @@ def url_for_version(self, version): variant("opencl", default=False, description="Use OPENCL as the backend") variant("hip", default=True, description="Use HIP as backend") + variant("add_tests", default=False, description="add tests and samples folder") + patch("0001-add-half-include-path.patch", when="@5.5") + patch("0001-add-half-include-path-5.6.patch", when="@5.6:") + patch("0002-add-half-include-path-for-tests.patch", when="@5.5: +add_tests") + + patch( + "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/commit/da24882438b91a0ae1feee23206b75c1a1256887.patch?full_index=1", + sha256="41caff199224f904ef5dc2cd9c5602d6cfa41eba6af0fcc782942a09dd202ab4", + when="@5.6", + ) conflicts("+opencl", when="@5.6.0:") + conflicts("+add_tests", when="@:5.4") def patch(self): if self.spec.satisfies("@4.2.0"): @@ -179,6 +195,86 @@ def patch(self): "amd_openvx_extensions/amd_nn/nn_hip/CMakeLists.txt", string=True, ) + if self.spec.satisfies("@5.5.0: + hip"): + filter_file( + "${ROCM_PATH}/llvm/bin/clang++", + "{0}/bin/clang++".format(self.spec["llvm-amdgpu"].prefix), + "rocAL/rocAL/rocAL_hip/CMakeLists.txt", + string=True, + ) + if self.spec.satisfies("+add_tests"): + filter_file( + "${ROCM_PATH}/include/mivisionx", + "{0}/include/mivisionx".format(self.spec.prefix), + "tests/amd_migraphx_tests/mnist/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + "{0}/lib".format(self.spec.prefix), + "tests/amd_migraphx_tests/mnist/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/include/mivisionx", + "{0}/include/mivisionx".format(self.spec.prefix), + "tests/amd_migraphx_tests/resnet50/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + "{0}/lib".format(self.spec.prefix), + "tests/amd_migraphx_tests/resnet50/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/include/mivisionx", + "{0}/include/mivisionx".format(self.spec.prefix), + "samples/inference/mv_objdetect/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + "{0}/lib".format(self.spec.prefix), + "samples/inference/mv_objdetect/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/include/mivisionx", + "{0}/include/mivisionx".format(self.spec.prefix), + "model_compiler/python/nnir_to_clib.py", + string=True, + ) + filter_file( + "/opt/rocm", + "{0}".format(self.spec.prefix), + "model_compiler/python/nnir_to_clib.py", + string=True, + ) + filter_file( + "${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal", + "{0}/include/mivisionx/rocal".format(self.spec.prefix), + "utilities/rocAL/rocAL_unittests/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + "{0}/lib".format(self.spec.prefix), + "utilities/rocAL/rocAL_unittests/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal", + "{0}/include/mivisionx/rocal".format(self.spec.prefix), + "utilities/rocAL/rocAL_video_unittests/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + "{0}/lib".format(self.spec.prefix), + "utilities/rocAL/rocAL_video_unittests/CMakeLists.txt", + string=True, + ) depends_on("cmake@3.5:", type="build") depends_on("ffmpeg@:4", type="build", when="@:5.3") @@ -194,7 +290,7 @@ def patch(self): depends_on( "opencv@4.5:" "+calib3d+features2d+highgui+imgcodecs+imgproc" - "+video+videoio+flann+photo+objdetect", + "+video+videoio+flann+photo+objdetect+png+jpeg", type="build", when="@5.3:", ) @@ -203,7 +299,18 @@ def patch(self): depends_on("miopen-opencl@3.5.0", when="@1.7+opencl") depends_on("miopengemm@1.1.6", when="@1.7+opencl") depends_on("openssl", when="@4.0.0:") - depends_on("libjpeg-turbo", type="build") + depends_on("libjpeg-turbo@2.0.6+partial_decoder", type="build") + depends_on("rpp", when="@5.5:") + depends_on("lmdb", when="@5.5:") + depends_on("py-setuptools", when="@5.6:") + depends_on("py-wheel", when="@5.6:") + depends_on("py-pybind11", when="@5.6:") + depends_on("py-google-api-python-client", when="+add_tests") + depends_on("py-protobuf@3.20.3", type=("build", "run"), when="+add_tests") + depends_on("py-future", when="+add_tests") + depends_on("py-numpy", when="+add_tests") + depends_on("py-pytz", when="+add_tests") + depends_on("rapidjson", when="@5.7:") conflicts("^cmake@3.22:", when="@:5.0.0") # need to choose atleast one backend and both cannot be set @@ -261,15 +368,33 @@ def patch(self): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("miopen-hip@" + ver, when="@" + ver) - for ver in ["5.3.3", "5.4.0", "5.4.3", "5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in [ + "5.3.3", + "5.4.0", + "5.4.3", + "5.5.0", + "5.5.1", + "5.6.0", + "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", + ]: depends_on("migraphx@" + ver, when="@" + ver) + depends_on("hip@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) depends_on("python@3.5:", type="build") + def setup_run_environment(self, env): + env.set("MIVISIONX_MODEL_COMPILER_PATH", self.spec.prefix.libexec.mivisionx.model_compiler) + def flag_handler(self, name, flags): spec = self.spec protobuf = spec["protobuf"].prefix.include @@ -290,4 +415,24 @@ def cmake_args(self): args.append(self.define("HIP_PATH", spec["hip"].prefix)) if self.spec.satisfies("~hip~opencl"): args.append(self.define("BACKEND", "CPU")) + if self.spec.satisfies("@5.5:"): + args.append( + self.define("AMDRPP_LIBRARIES", "{0}/lib/librpp.so".format(spec["rpp"].prefix)) + ) + args.append( + self.define("AMDRPP_INCLUDE_DIRS", "{0}/include/rpp".format(spec["rpp"].prefix)) + ) + args.append( + self.define( + "TurboJpeg_LIBRARIES_DIRS", "{0}/lib64".format(spec["libjpeg-turbo"].prefix) + ) + ) + args.append(self.define("CMAKE_INSTALL_PREFIX_PYTHON", spec.prefix)) return args + + @run_after("install") + def add_tests(self): + if self.spec.satisfies("+add_tests"): + install_tree("tests", self.spec.prefix.tests) + install_tree("samples", self.spec.prefix.samples) + install_tree("utilities", self.spec.prefix.utilities) diff --git a/var/spack/repos/builtin/packages/mixcr/package.py b/var/spack/repos/builtin/packages/mixcr/package.py index 69dac6ffed0529..7cd5658c98e197 100644 --- a/var/spack/repos/builtin/packages/mixcr/package.py +++ b/var/spack/repos/builtin/packages/mixcr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py index b760c83848bc5c..8cdc4dabe39ca5 100644 --- a/var/spack/repos/builtin/packages/mkfontdir/package.py +++ b/var/spack/repos/builtin/packages/mkfontdir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py index 5012dd767a18ff..56a2fa2c99755d 100644 --- a/var/spack/repos/builtin/packages/mkfontscale/package.py +++ b/var/spack/repos/builtin/packages/mkfontscale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mkfontscale(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/mkfontscale" xorg_mirror_path = "app/mkfontscale-1.1.2.tar.gz" + license("MIT") + version("1.2.2", sha256="4a5af55e670713024639a7f7d10826d905d86faf574cd77e0f5aef2d00e70168") version("1.1.2", sha256="8bba59e60fbc4cb082092cf6b67e810b47b4fe64fbc77dbea1d7e7d55312b2e4") diff --git a/var/spack/repos/builtin/packages/mlhka/package.py b/var/spack/repos/builtin/packages/mlhka/package.py index 0b414f70908db0..807e7c3bb2b7b9 100644 --- a/var/spack/repos/builtin/packages/mlhka/package.py +++ b/var/spack/repos/builtin/packages/mlhka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mlhka(Package): homepage = "https://wright.eeb.utoronto.ca" git = "https://github.com/rossibarra/MLHKA.git" + license("GPL-3.0-only") + version("2.1", commit="e735ddd39073af58da21b00b27dea203736e5467") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py index 4515385b4af5b4..7cfe466a83e268 100644 --- a/var/spack/repos/builtin/packages/mlirmiopen/package.py +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,9 +10,9 @@ class Mlirmiopen(CMakePackage): """Multi-Level Intermediate Representation for rocm miopen project.""" - homepage = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir" - url = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir/archive/refs/tags/rocm-5.4.0.tar.gz" - git = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir.git" + homepage = "https://github.com/ROCm/llvm-project-mlir" + url = "https://github.com/ROCm/llvm-project-mlir/archive/refs/tags/rocm-5.4.0.tar.gz" + git = "https://github.com/ROCm/llvm-project-mlir.git" tags = ["rocm"] maintainers("srekolam") diff --git a/var/spack/repos/builtin/packages/mlocate/package.py b/var/spack/repos/builtin/packages/mlocate/package.py index 8e86c6ff57fcbd..b520e3b87e97a1 100644 --- a/var/spack/repos/builtin/packages/mlocate/package.py +++ b/var/spack/repos/builtin/packages/mlocate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mlocate(AutotoolsPackage): homepage = "https://pagure.io/mlocate" url = "https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz" + license("GPL-2.0-only") + version("0.26", sha256="3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e") version("0.25", sha256="ab95c111f9dba35b5690896180dd0a7639dbf07d70b862fcb0731264d9273951") version("0.24", sha256="5787bee846735e21ff57df9e345d5db73d684d2cea9efc0f387462ccfbc6796f") diff --git a/var/spack/repos/builtin/packages/mlpack/package.py b/var/spack/repos/builtin/packages/mlpack/package.py index 5088e187062107..d84fdc3bc1899f 100644 --- a/var/spack/repos/builtin/packages/mlpack/package.py +++ b/var/spack/repos/builtin/packages/mlpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Mlpack(CMakePackage): maintainers("wdconinc") + license("BSD-3-Clause") + version("4.2.0", sha256="f780df984a71029e62eeecdd145fb95deb71b133cefc7840de0ec706d116dd60") version("4.1.0", sha256="e0c760baf15fd0af5601010b7cbc536e469115e9dd45f96712caa3b651b1852a") version("4.0.1", sha256="4c746936ed9da9f16744240ed7b9f2815d3abb90c904071a1d1a628a9bbfb3a5") diff --git a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py index 43a386b35afbf9..01ce1dbec6bd35 100644 --- a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py +++ b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mlst/package.py b/var/spack/repos/builtin/packages/mlst/package.py index f14139ac8e4015..407ae592e702a2 100644 --- a/var/spack/repos/builtin/packages/mlst/package.py +++ b/var/spack/repos/builtin/packages/mlst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mlst(Package): homepage = "https://github.com/tseemann/mlst" url = "https://github.com/tseemann/mlst/archive/refs/tags/v2.22.1.tar.gz" + license("GPL-2.0-only") + version("2.23.0", sha256="35bdbde309ba25293c3cce417d82e79594b9f78365133062923dc3d629bd8846") version("2.22.1", sha256="a8f64d7cb961a8e422e96a19309ad8707f8792d9f755a9e5a1f5742986d19bca") diff --git a/var/spack/repos/builtin/packages/mmg/package.py b/var/spack/repos/builtin/packages/mmg/package.py index 65f57b6a6849da..10a8118106a8b6 100644 --- a/var/spack/repos/builtin/packages/mmg/package.py +++ b/var/spack/repos/builtin/packages/mmg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class Mmg(CMakePackage): homepage = "https://www.mmgtools.org/" url = "https://github.com/MmgTools/mmg/archive/v5.3.13.tar.gz" + license("LGPL-3.0-or-later") + version("5.7.1", sha256="27c09477ebc080f54919f76f8533a343936677c81809fe37ce4e2d62fa97237b") version("5.6.0", sha256="bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437") version("5.5.2", sha256="58e3b866101e6f0686758e16bcf9fb5fb06c85184533fc5054ef1c8adfd4be73") diff --git a/var/spack/repos/builtin/packages/mmseqs2/package.py b/var/spack/repos/builtin/packages/mmseqs2/package.py index a081a416e53c11..86d18d45c6dcbc 100644 --- a/var/spack/repos/builtin/packages/mmseqs2/package.py +++ b/var/spack/repos/builtin/packages/mmseqs2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mmseqs2(CMakePackage): homepage = "https://github.com/soedinglab/MMseqs2" url = "https://github.com/soedinglab/MMseqs2/archive/refs/tags/14-7e284.tar.gz" + license("GPL-3.0-only") + version("14-7e284", sha256="a15fd59b121073fdcc8b259fc703e5ce4c671d2c56eb5c027749f4bd4c28dfe1") version("13-45111", sha256="6444bb682ebf5ced54b2eda7a301fa3e933c2a28b7661f96ef5bdab1d53695a2") diff --git a/var/spack/repos/builtin/packages/mmv/package.py b/var/spack/repos/builtin/packages/mmv/package.py index 857e1f03ff6569..dc7a2550178eb0 100644 --- a/var/spack/repos/builtin/packages/mmv/package.py +++ b/var/spack/repos/builtin/packages/mmv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index 2c7262c16660f9..a0ed8f8b1d365b 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,14 +16,17 @@ class Moab(AutotoolsPackage): mesh in chunks rather than through individual entities, while also versatile enough to support individual entity access.""" - homepage = "https://bitbucket.org/fathomteam/moab" + homepage = "https://sigma.mcs.anl.gov/moab-library" git = "https://bitbucket.org/fathomteam/moab.git" - url = "https://ftp.mcs.anl.gov/pub/fathom/moab-5.5.0.tar.gz" + url = "https://web.cels.anl.gov/projects/sigma/downloads/moab/moab-5.5.1.tar.gz" maintainers("vijaysm", "iulian787") + license("LGPL-3.0-only") + version("develop", branch="develop") version("master", branch="master") + version("5.5.1", sha256="67b6ed3a13c235cec16f60f8f46f9bf0371fd321cf36dea113d0e09f09d0d438") version("5.5.0", sha256="58969f8a1b209ec9036c08c53a6b7078b368eb3bf99d0368a4de5a2f2a8db678") version("5.4.1", sha256="3625e25321bf37f88d98438f5d56c280b2774172602d8b6eb6c34eedf37686fc") version("5.4.0", sha256="a30d2a1911fbf214ae0175b0856e0475c0077dc51ea5914c850d631155a72952") @@ -32,8 +35,6 @@ class Moab(AutotoolsPackage): version("5.2.1", sha256="60d31762be3f0e5c89416c764e844ec88dac294169b59a5ead3c316b50f85c29") version("5.2.0", sha256="805ed3546deff39e076be4d1f68aba1cf0dda8c34ce43e1fc179d1aff57c5d5d") version("5.1.0", sha256="0371fc25d2594589e95700739f01614f097b6157fb6023ed8995e582726ca658") - version("5.0.2", commit="01d05b1805236ef44da36f67eb2701095f2e33c7") - version("5.0.1", commit="6cc12bd4ae3fa7c9ad81c595e4d38fa84f0884be") version("5.0.0", sha256="df5d5eb8c0d0dbb046de2e60aa611f276cbf007c9226c44a24ed19c570244e64") version("4.9.2", sha256="26611b8cc24f6b7df52eb4ecbd31523d61523da0524b5a2d066a7656e2e82ac5") version("4.9.1", sha256="b26cee46c096157323cafe047ad58616e16ebdb1e06caf6878673817cb4410cf") @@ -51,7 +52,7 @@ class Moab(AutotoolsPackage): variant("parmetis", default=False, description="Enable Parmetis partitioner") variant("irel", default=False, description="Enable iRel interface") variant("fbigeom", default=False, description="Enable FBiGeom interface") - variant("coupler", default=True, description="Enable mbcoupler tool") + variant("coupler", default=False, description="Enable mbcoupler tool") variant("dagmc", default=False, description="Enable DagMC tool") variant("debug", default=False, description="Enable debug symbols in libraries") @@ -126,9 +127,6 @@ def configure_args(self): options.append("--with-parmetis=%s" % spec["parmetis"].prefix) else: options.append("--without-parmetis") - # FIXME: --without-mpi does not configure right - # else: - # options.append('--without-mpi') options.append("--with-blas=%s" % spec["blas"].libs.ld_flags) options.append("--with-lapack=%s" % spec["lapack"].libs.ld_flags) @@ -207,7 +205,6 @@ def configure_args(self): return options - # FIXME Run the install phase with -j 1. There seems to be a problem with - # parallel installations of examples + # Run the install phase in parallel def install(self, spec, prefix): - make("install", parallel=False) + make("install", parallel=True) diff --git a/var/spack/repos/builtin/packages/mochi-margo/package.py b/var/spack/repos/builtin/packages/mochi-margo/package.py index 5caff944789edf..fa0943655866dd 100644 --- a/var/spack/repos/builtin/packages/mochi-margo/package.py +++ b/var/spack/repos/builtin/packages/mochi-margo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,7 @@ class MochiMargo(AutotoolsPackage): maintainers("carns", "mdorier", "fbudin69500") version("main", branch="main") + version("0.15.0", sha256="f962f02ddaae125eaf15bf89126ee47b4f852d366b14248d2d67a0be8f661224") version("0.14.1", sha256="69229a9126b76aff7fd47e25c4a8f72804f101c5c603c4e4ef93f4fb7a1b6662") version("0.14.0", sha256="ff0e3fa786630b63280606243c35f1ea3a25fa2ba6f08bf9065cab9fcc7fa1c7") version("0.13.1", sha256="cff1decb94089cd0f9c0930b02092838679827b09ce4a2f3a359d59caee28782") diff --git a/var/spack/repos/builtin/packages/mochi-thallium/package.py b/var/spack/repos/builtin/packages/mochi-thallium/package.py index 2ea29030fa5937..905292e1500728 100644 --- a/var/spack/repos/builtin/packages/mochi-thallium/package.py +++ b/var/spack/repos/builtin/packages/mochi-thallium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,10 @@ class MochiThallium(CMakePackage): maintainers("mdorier") version("main", branch="main") + version("0.11.3", sha256="d1ffd7ee1ccbcfb00f246cb29c5bc2560e59f8808609cbc19b7098aa8fc903c4") + version("0.11.2", sha256="4f1e57ca843b7592525c179dec73bfb603a27fbda4feaf028d636e05c1b38e36") + version("0.11.1", sha256="be99bec2309ce1945a777fba720175f409972cbf27b73388728a740d6406a040") + version("0.11.0", sha256="c216310fdef9281e1c7e3264c148c560d7f5edd15816d35866efcc543185b7ee") version("0.10.1", sha256="5a8dc1f1622f4186b02fbabd47a8a33ca6be3d07757010f3d63d30e9f74fec8c") version("0.10.0", sha256="5319e25a42deab7c639e980885fe3be717cda2c2c693a1906f5a6c79b31edef8") version("0.9.1", sha256="dee884d0e054c838807f9c17781acfa99b26e3be1cc527bf09ceaa997336b3e4") @@ -51,6 +55,7 @@ class MochiThallium(CMakePackage): ) depends_on("pkgconfig", type=("build")) + depends_on("mochi-margo@0.12.0:", when="@0.11.2:") depends_on("mochi-margo@0.9.8:", when="@0.10.0:") depends_on("mochi-margo@0.7:", when="@0.7:") depends_on("mochi-margo@0.6:", when="@0.5:") diff --git a/var/spack/repos/builtin/packages/model-traits/package.py b/var/spack/repos/builtin/packages/model-traits/package.py index 4c1e54beca65ca..c49ab28bff5744 100644 --- a/var/spack/repos/builtin/packages/model-traits/package.py +++ b/var/spack/repos/builtin/packages/model-traits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ModelTraits(CMakePackage): maintainers("jacobmerson") + license("BSD-3-Clause") + version("0.2.1", sha256="241ce5738ea72182a570ae474aedff58751e6ea448bd174005c5520c8b5a95d1") version("0.2.0", sha256="f367cf96a4c1c19f6e2dcf92af6bf69b39217a01fe6f1942d4825258eca8d4bc") version("0.1.1", sha256="75af53b4f576071570fdcfa7a4ce150b935cf21368da41d16d8377c5b3b93713") diff --git a/var/spack/repos/builtin/packages/modeltest-ng/package.py b/var/spack/repos/builtin/packages/modeltest-ng/package.py index 7a2b4dcc2c2d0e..3dd44a14968cc7 100644 --- a/var/spack/repos/builtin/packages/modeltest-ng/package.py +++ b/var/spack/repos/builtin/packages/modeltest-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ModeltestNg(CMakePackage): maintainers("snehring") + license("GPL-3.0-only") + version("20220721", commit="1066356b984100897b8bd38ac771c5c950984c01", submodules=True) version("0.1.7", commit="cc028888f1d4222aaa53b99c6b02cd934a279001", submodules=True) diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py index a941eb26d15b4d..692b1e49ee8423 100644 --- a/var/spack/repos/builtin/packages/modern-wheel/package.py +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class ModernWheel(CMakePackage): url = "https://github.com/alalazo/modern_wheel/archive/1.2.tar.gz" maintainers("alalazo") + license("MIT") + version("1.2", sha256="48612f698d7159f0eb10d93ddc3e2682b06a54d3a836ff227636be3261aed15e") version("1.1", sha256="d8ba4891257b96108e9b9406a556f8ced3b71ce85c3fcdca6bfd9cc37bf010a3") version("1.0", sha256="b90a1e29af0b67dfa4c07f9c19b2d04fa78cd878b29a9c42bc766dabd6cb1b90") diff --git a/var/spack/repos/builtin/packages/modylas/package.py b/var/spack/repos/builtin/packages/modylas/package.py index dcc142ce955ec0..8efa710173967e 100644 --- a/var/spack/repos/builtin/packages/modylas/package.py +++ b/var/spack/repos/builtin/packages/modylas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mokutil/package.py b/var/spack/repos/builtin/packages/mokutil/package.py index 4c75cacca3c4dc..8ca6f5cede2224 100644 --- a/var/spack/repos/builtin/packages/mokutil/package.py +++ b/var/spack/repos/builtin/packages/mokutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Mokutil(AutotoolsPackage): homepage = "https://github.com/lcp/mokutil" url = "https://github.com/lcp/mokutil/archive/0.4.0.tar.gz" + license("GPL-3.0-or-later") + version("0.4.0", sha256="2e9c574e4a4fa63b2f23116cdcb389f448a28945548e232076f77947e35b7361") version("0.3.0", sha256="70ccbffbbba0427dfd6b57902d667bf73d6223296c897ce3441fc2221352a773") version("0.2.0", sha256="a51ef146b8f2169c4e4a0d2f86cae5f4d66cc520989fc2f70a7a620f9587a20b") diff --git a/var/spack/repos/builtin/packages/molcas/package.py b/var/spack/repos/builtin/packages/molcas/package.py index 175fccf5bf6f4d..423cc090e390e8 100644 --- a/var/spack/repos/builtin/packages/molcas/package.py +++ b/var/spack/repos/builtin/packages/molcas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mold/package.py b/var/spack/repos/builtin/packages/mold/package.py index 61b4de3f6dd0b7..82e22a8a44a230 100644 --- a/var/spack/repos/builtin/packages/mold/package.py +++ b/var/spack/repos/builtin/packages/mold/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mold(CMakePackage): maintainers("jabcross") + license("MIT") + version("2.1.0", sha256="a32bec1282671b18ea4691855aed925ea2f348dfef89cb7689cd81273ea0c5df") version("2.0.0", sha256="2ae8a22db09cbff626df74c945079fa29c1e5f60bbe02502dcf69191cf43527b") version("1.11.0", sha256="99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f") diff --git a/var/spack/repos/builtin/packages/molden/package.py b/var/spack/repos/builtin/packages/molden/package.py index f8da51369fe08e..98c8152334694b 100644 --- a/var/spack/repos/builtin/packages/molden/package.py +++ b/var/spack/repos/builtin/packages/molden/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/molgw/package.py b/var/spack/repos/builtin/packages/molgw/package.py index 91026c7abe0b00..37262f9fc4b6e1 100644 --- a/var/spack/repos/builtin/packages/molgw/package.py +++ b/var/spack/repos/builtin/packages/molgw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Molgw(MakefilePackage): maintainers("bruneval") + license("GPL-3.0-only") + version("3.2", sha256="a3f9a99db52d95ce03bc3636b5999e6d92b503ec2f4afca33d030480c3e10242") variant("openmp", default=False, description="Build with OpenMP support") diff --git a/var/spack/repos/builtin/packages/mongo-c-driver/package.py b/var/spack/repos/builtin/packages/mongo-c-driver/package.py index 94c92d9c023a99..f53ee03166ec85 100644 --- a/var/spack/repos/builtin/packages/mongo-c-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-c-driver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class MongoCDriver(Package): maintainers("michaelkuhn") + license("Apache-2.0") + version("1.24.4", sha256="2f4a3e8943bfe3b8672c2053f88cf74acc8494dc98a45445f727901eee141544") version("1.23.3", sha256="c8f951d4f965d455f37ae2e10b72914736fc0f25c4ffc14afc3cbadd1a574ef6") version("1.21.0", sha256="840ff79480070f98870743fbb332e2c10dd021b6b9c952d08010efdda4d70ee4") diff --git a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py index 0ea758dd5e3a44..b42b1827d76d56 100644 --- a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class MongoCxxDriver(CMakePackage): url = "https://github.com/mongodb/mongo-cxx-driver/releases/download/r3.7.0/mongo-cxx-driver-r3.7.0.tar.gz" git = "https://github.com/mongodb/mongo-cxx-driver" + license("Apache-2.0") + version("3.7.0", sha256="fb2da11178db728f63147fe4b0c7509eb49b1b02c5cb55f9bee5f927e451a0c7") version("3.6.7", sha256="2c58005d4fe46f1973352fba821f7bb37e818cefc922377ce979a9fd1bff38ac") version("3.6.6", sha256="d5906b9e308a8a353a2ef92b699c9b27ae28ec6b34fdda94e15d2981b27e64ca") diff --git a/var/spack/repos/builtin/packages/mongodb-async-driver/package.py b/var/spack/repos/builtin/packages/mongodb-async-driver/package.py index a38b04fc30658b..6615e9e0c930a8 100644 --- a/var/spack/repos/builtin/packages/mongodb-async-driver/package.py +++ b/var/spack/repos/builtin/packages/mongodb-async-driver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class MongodbAsyncDriver(MavenPackage): homepage = "http://www.allanbank.com/mongodb-async-driver/" url = "https://github.com/allanbank/mongodb-async-driver/archive/rel_2.0.1.tar.gz" + license("Apache-2.0") + version("2.0.1", sha256="87f22c16f3744a847eeb8276ed132bf235f025db0b7dee0d0f239d5cdcab720c") version("2.0.0", sha256="8cffe4c960d42550be30c27d66f5de6df4edb5ee7a094c50519986dc5cbcf9b8") diff --git a/var/spack/repos/builtin/packages/mongodb/package.py b/var/spack/repos/builtin/packages/mongodb/package.py index d1f25e29e2a980..3c65647e84bedd 100644 --- a/var/spack/repos/builtin/packages/mongodb/package.py +++ b/var/spack/repos/builtin/packages/mongodb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mongodb(SConsPackage): maintainers("DaxLynch") + license("SSPL-1.0") + version("6.2", git="https://github.com/mongodb/mongo.git", branch="v6.2") requires( diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index 7525b563a05007..509790d8984022 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class Mono(AutotoolsPackage): depends_on("perl", type=("build")) depends_on("python", type=("build")) + license("MIT") + version( "6.12.0.122", sha256="29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23", diff --git a/var/spack/repos/builtin/packages/montage/package.py b/var/spack/repos/builtin/packages/montage/package.py index 6a055d99fd5690..c50de9265a1100 100644 --- a/var/spack/repos/builtin/packages/montage/package.py +++ b/var/spack/repos/builtin/packages/montage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Montage(MakefilePackage): url = "http://montage.ipac.caltech.edu/download/Montage_v6.0.tar.gz" maintainers("snehring") + license("BSD-3-Clause") + version("6.0", sha256="1f540a7389d30fcf9f8cd9897617cc68b19350fbcde97c4d1cdc5634de1992c6") depends_on("freetype") diff --git a/var/spack/repos/builtin/packages/moosefs/package.py b/var/spack/repos/builtin/packages/moosefs/package.py index 9afcd9bb940488..60a98252984605 100644 --- a/var/spack/repos/builtin/packages/moosefs/package.py +++ b/var/spack/repos/builtin/packages/moosefs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Moosefs(AutotoolsPackage): homepage = "https://github.com/moosefs/moosefs" url = "https://github.com/moosefs/moosefs/archive/v3.0.109.tar.gz" + license("GPL-2.0-only") + version("3.0.109", sha256="413349d254f75ea9b9c974a12f67225c7cbec389f8a39a68db569c0d0f6f4ef3") version("3.0.108", sha256="344c4b7875603fc0b091e5c80f4a5b2eda780a3d050de2ef38232e55e56b054a") version("3.0.107", sha256="192dca0c04f61334846e00c1193952bb0f69f3960f223a8d55016b74d72cfdb6") diff --git a/var/spack/repos/builtin/packages/moreutils/package.py b/var/spack/repos/builtin/packages/moreutils/package.py index 3bd40a191c4678..2495dc740507df 100644 --- a/var/spack/repos/builtin/packages/moreutils/package.py +++ b/var/spack/repos/builtin/packages/moreutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Moreutils(MakefilePackage): maintainers("matthiasdiener") + license("GPL-2.0-or-later") + version("0.65", sha256="ba0cfaa1ff6ead2b15c62a67292de66a366f9b815a09697b54677f7e15f5a2b2") version("0.63", sha256="01f0b331e07e62c70d58c2dabbb68f5c4ddae4ee6f2d8f070fd1e316108af72c") diff --git a/var/spack/repos/builtin/packages/mosesdecoder/package.py b/var/spack/repos/builtin/packages/mosesdecoder/package.py index 60112a6327f8b9..a797598658767b 100644 --- a/var/spack/repos/builtin/packages/mosesdecoder/package.py +++ b/var/spack/repos/builtin/packages/mosesdecoder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mosesdecoder(Package): homepage = "http://www2.statmt.org/moses/" url = "https://github.com/moses-smt/mosesdecoder/archive/refs/tags/RELEASE-4.0.tar.gz" + license("LGPL-2.1-or-later") + version("4.0", sha256="357376cdbb225a17cdf17195625d0fa7e10d722807e9e0b8a633ffbd7eec9b8f") depends_on("git") diff --git a/var/spack/repos/builtin/packages/mosh/package.py b/var/spack/repos/builtin/packages/mosh/package.py index bea6f2a08f333b..d8516cbe66bd25 100644 --- a/var/spack/repos/builtin/packages/mosh/package.py +++ b/var/spack/repos/builtin/packages/mosh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mosh(AutotoolsPackage): homepage = "https://mosh.org/" url = "https://mosh.org/mosh-1.2.6.tar.gz" + license("GPL-3.0-or-later") + version("1.4.0", sha256="872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd") version("1.3.2", sha256="da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216") version("1.3.0", sha256="320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376") diff --git a/var/spack/repos/builtin/packages/mosquitto/package.py b/var/spack/repos/builtin/packages/mosquitto/package.py index 3b98a7c4122b95..46399d397f28ac 100644 --- a/var/spack/repos/builtin/packages/mosquitto/package.py +++ b/var/spack/repos/builtin/packages/mosquitto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mosquitto(CMakePackage): git = "https://github.com/eclipse/mosquitto" url = "https://mosquitto.org/files/source/mosquitto-2.0.14.tar.gz" + license("EPL-1.0 OR EPL-2.0") + version("2.0.14", sha256="d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925") version("1.6.15", sha256="5ff2271512f745bf1a451072cd3768a5daed71e90c5179fae12b049d6c02aa0f") version("1.5.11", sha256="4a3b8a8f5505d27a7a966dd68bfd76f1e69feb51796d1b46b7271d1bb5a1a299") diff --git a/var/spack/repos/builtin/packages/mothur/package.py b/var/spack/repos/builtin/packages/mothur/package.py index fe36e1cbd13080..8fc043cf49964e 100644 --- a/var/spack/repos/builtin/packages/mothur/package.py +++ b/var/spack/repos/builtin/packages/mothur/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mothur(MakefilePackage): homepage = "https://github.com/mothur/mothur" url = "https://github.com/mothur/mothur/archive/v1.39.5.tar.gz" + license("GPL-3.0-or-later") + version("1.48.0", sha256="9494406abd8d14b821782ab9db811f045ded9424f28f01234ee6764d4e78941d") version("1.46.1", sha256="29b500b3c92d726cde34922f697f2e47f0b7127d76d9a6fb167cc2b8ba3d00fd") version("1.43.0", sha256="12ccd95a85bec3bb1564b8feabd244ea85413973740754803d01fc71ecb0a2c1") diff --git a/var/spack/repos/builtin/packages/motif/add_wmluiltok_option_main.patch b/var/spack/repos/builtin/packages/motif/add_wmluiltok_option_main.patch new file mode 100644 index 00000000000000..7aa2d8e122e92a --- /dev/null +++ b/var/spack/repos/builtin/packages/motif/add_wmluiltok_option_main.patch @@ -0,0 +1,8 @@ +diff -Naur motif-2.3.8/tools/wml/wmluiltok.l motif-2.3.8_patched/tools/wml/wmluiltok.l +--- motif-2.3.8/tools/wml/wmluiltok.l 2024-01-18 17:19:43.997764906 -0600 ++++ motif-2.3.8_patched/tools/wml/wmluiltok.l 2024-01-18 17:19:13.998702374 -0600 +@@ -1,3 +1,4 @@ ++%option main + %{ + /* + * Motif diff --git a/var/spack/repos/builtin/packages/motif/package.py b/var/spack/repos/builtin/packages/motif/package.py index 066d9563a82eaf..4fa53c7e930dfd 100644 --- a/var/spack/repos/builtin/packages/motif/package.py +++ b/var/spack/repos/builtin/packages/motif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Motif(AutotoolsPackage): homepage = "https://motif.ics.com/" url = "https://cfhcable.dl.sourceforge.net/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz" + license("LGPL-2.1-or-later") + version("2.3.8", sha256="859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7") depends_on("flex") @@ -37,6 +39,8 @@ class Motif(AutotoolsPackage): depends_on("pkgconfig", type="build") patch("add_xbitmaps_dependency.patch") + # ensure tools/wml/wmluiltok.c has a main function + patch("add_wmluiltok_option_main.patch") def patch(self): # fix linking the simple_app demo program diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index 03d987be433a02..5c95cb087210df 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mount-point-attributes/package.py b/var/spack/repos/builtin/packages/mount-point-attributes/package.py index 1616d72cd17eab..0c50cd9b72d3fa 100644 --- a/var/spack/repos/builtin/packages/mount-point-attributes/package.py +++ b/var/spack/repos/builtin/packages/mount-point-attributes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mozjpeg/package.py b/var/spack/repos/builtin/packages/mozjpeg/package.py index bc3e64d85b73d6..8a7e46f759f457 100644 --- a/var/spack/repos/builtin/packages/mozjpeg/package.py +++ b/var/spack/repos/builtin/packages/mozjpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mozjpeg(CMakePackage): maintainers("RemiLacroix-IDRIS") + license("Zlib") + version("4.1.1", sha256="66b1b8d6b55d263f35f27f55acaaa3234df2a401232de99b6d099e2bb0a9d196") provides("jpeg") diff --git a/var/spack/repos/builtin/packages/mpark-variant/package.py b/var/spack/repos/builtin/packages/mpark-variant/package.py index 330086de8e153a..f1e2148fef9dd7 100644 --- a/var/spack/repos/builtin/packages/mpark-variant/package.py +++ b/var/spack/repos/builtin/packages/mpark-variant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class MparkVariant(CMakePackage): tags = ["e4s"] + license("BSL-1.0") + version("1.4.0", sha256="8f6b28ab3640b5d76d5b6664dda7257a4405ce59179220431b8fd196c79b2ecb") version("1.3.0", sha256="d0f7e41f818fcc839797a8017e76b8b66b323651c304cff641a83a56ae9943c6") diff --git a/var/spack/repos/builtin/packages/mpas-model/package.py b/var/spack/repos/builtin/packages/mpas-model/package.py index da0f43774a3ae8..2e4a0e6a26c1fd 100644 --- a/var/spack/repos/builtin/packages/mpas-model/package.py +++ b/var/spack/repos/builtin/packages/mpas-model/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpb/package.py b/var/spack/repos/builtin/packages/mpb/package.py index 47652c41497c0f..c117130c3a4a0d 100644 --- a/var/spack/repos/builtin/packages/mpb/package.py +++ b/var/spack/repos/builtin/packages/mpb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mpb(AutotoolsPackage): homepage = "https://github.com/NanoComp/mpb" url = "https://github.com/NanoComp/mpb/archive/refs/tags/v1.11.1.tar.gz" + license("GPL-2.0-only") + version("1.11.1", sha256="7311fc525214c1184cad3e0626b8540c0b53b3c31c28e61ce6ec2860088eca46") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/mpc/package.py b/var/spack/repos/builtin/packages/mpc/package.py index e39db780f30196..d5c795a05876fa 100644 --- a/var/spack/repos/builtin/packages/mpc/package.py +++ b/var/spack/repos/builtin/packages/mpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mpc(AutotoolsPackage, GNUMirrorPackage): gnu_mirror_path = "mpc/mpc-1.1.0.tar.gz" list_url = "http://www.multiprecision.org/mpc/download.html" + license("GPL-2.0-or-later") + version("1.3.1", sha256="ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8") version("1.2.1", sha256="17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459") version("1.1.0", sha256="6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e") diff --git a/var/spack/repos/builtin/packages/mpdecimal/package.py b/var/spack/repos/builtin/packages/mpdecimal/package.py index 1faae5eeba2548..08a8bf372a815f 100644 --- a/var/spack/repos/builtin/packages/mpdecimal/package.py +++ b/var/spack/repos/builtin/packages/mpdecimal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mpdecimal(AutotoolsPackage): url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.4.2.tar.gz" list_url = "https://www.bytereef.org/mpdecimal/download.html" + license("BSD-2-Clause") + version("2.5.1", sha256="9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f") version("2.4.2", sha256="83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7") diff --git a/var/spack/repos/builtin/packages/mpe2/package.py b/var/spack/repos/builtin/packages/mpe2/package.py index 4b665b318d01da..85e001daa92338 100644 --- a/var/spack/repos/builtin/packages/mpe2/package.py +++ b/var/spack/repos/builtin/packages/mpe2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpest/package.py b/var/spack/repos/builtin/packages/mpest/package.py index 2b3efd0c4359cb..1633d9955e5601 100644 --- a/var/spack/repos/builtin/packages/mpest/package.py +++ b/var/spack/repos/builtin/packages/mpest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpfi/package.py b/var/spack/repos/builtin/packages/mpfi/package.py index e44925cce9a1e9..b17a15c5e17f33 100644 --- a/var/spack/repos/builtin/packages/mpfi/package.py +++ b/var/spack/repos/builtin/packages/mpfi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Mpfi(AutotoolsPackage): # Notice: no simple way to deduct URL from version homepage = "https://perso.ens-lyon.fr/nathalie.revol/software.html" + license("LGPL-3.0-only") + version( "1.5.4", url="https://gforge.inria.fr/frs/download.php/file/38111/mpfi-1.5.4.tgz", diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index cdebca7218e21d..c44eb091ee10b2 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mpfr(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.mpfr.org/" gnu_mirror_path = "mpfr/mpfr-4.0.2.tar.bz2" + license("LGPL-3.0-or-later") + version("4.2.0", sha256="691db39178e36fc460c046591e4b0f2a52c8f2b3ee6d750cc2eab25f1eaa999d") version("4.1.1", sha256="85fdf11614cc08e3545386d6b9c8c9035e3db1e506211a45f4e108117fe3c951") version("4.1.0", sha256="feced2d430dd5a97805fa289fed3fc8ff2b094c02d05287fd6133e7f1f0ec926") diff --git a/var/spack/repos/builtin/packages/mpi-bash/package.py b/var/spack/repos/builtin/packages/mpi-bash/package.py index d4d127bff10de6..f20c051a072a89 100644 --- a/var/spack/repos/builtin/packages/mpi-bash/package.py +++ b/var/spack/repos/builtin/packages/mpi-bash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpi-serial/install.patch b/var/spack/repos/builtin/packages/mpi-serial/install.patch deleted file mode 100644 index a1b3080a12b36b..00000000000000 --- a/var/spack/repos/builtin/packages/mpi-serial/install.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- old/Makefile -+++ new/Makefile -@@ -76,6 +76,9 @@ - - .PHONY: clean tests install - -+includedir = $(PREFIX)/include -+libdir = $(PREFIX)/lib -+ - clean: - /bin/rm -f *.o ctest ftest $(LIB) mpi.mod config.log config.status - cd tests ; $(MAKE) clean -@@ -83,7 +86,7 @@ - tests: - cd tests; make - --install: lib -+install: $(LIB) - $(MKINSTALLDIRS) $(libdir) $(includedir) - $(INSTALL) lib$(MODULE).a -m 644 $(libdir) - $(INSTALL) mpi.h -m 644 $(includedir) ---- old/Makefile.conf.in -+++ new/Makefile.conf.in -@@ -10,7 +10,8 @@ - LIBS = @LIBS@ - CRULE = .c.o - F90RULE = .F90.o -- -+MKINSTALLDIRS = mkdir - SHELL = /bin/sh -- -+INSTALL = install - MODULE = mpi-serial -+PREFIX = @prefix@ diff --git a/var/spack/repos/builtin/packages/mpi-serial/package.py b/var/spack/repos/builtin/packages/mpi-serial/package.py index 6b5b0f20d81850..2d23ad8caa85b6 100644 --- a/var/spack/repos/builtin/packages/mpi-serial/package.py +++ b/var/spack/repos/builtin/packages/mpi-serial/package.py @@ -1,20 +1,23 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os + from spack.package import * class MpiSerial(AutotoolsPackage): """A single processor implementation of the mpi library.""" - homepage = "https://github.com/MCSclimate/mpi-serial" - url = "https://github.com/MCSclimate/mpi-serial/archive/refs/tags/MPIserial_2.3.0.tar.gz" + homepage = "https://github.com/ESMCI/mpi-serial" + url = "https://github.com/ESMCI/mpi-serial/archive/refs/tags/MPIserial_2.3.0.tar.gz" # notify when the package is updated. maintainers("jedwards4b") + version("2.5.0", sha256="2faf459ea1f37020662067e7ab6c76b926501c4b94e8fdf77591c0040ba1f006") version("2.3.0", sha256="cc55e6bf0ae5e1d93aafa31ba91bfc13e896642a511c3101695ea05eccf97988") variant( @@ -31,18 +34,19 @@ class MpiSerial(AutotoolsPackage): description="Specify the size of Fortran double precision variables", ) - patch("install.patch") - provides("mpi") + depends_on("autoconf", type="build", when="@2.5.0") + depends_on("automake", type="build", when="@2.5.0") + depends_on("libtool", type="build", when="@2.5.0") + def flag_handler(self, name, flags): spec = self.spec config_flags = [] if name == "cflags": config_flags.append(self.compiler.cc_pic_flag) - - if spec.compiler.name in ["oneapi"]: + if spec.satisfies("%oneapi"): # OneAPI fails due to these standards checks config_flags.append("-Wno-error=implicit-int") config_flags.append("-Wno-error=implicit-function-declaration") @@ -62,3 +66,14 @@ def configure_args(self): args.extend(["--enable-fort-double={0}".format(doublesize)]) return args + + def install(self, spec, prefix): + mkdir(prefix.lib) + mkdir(prefix.include) + install("libmpi-serial.a", prefix.lib) + install("mpi.h", prefix.include) + install("mpif.h", prefix.include) + if os.path.isfile("mpi.mod"): + install("mpi.mod", prefix.include) + if os.path.isfile("MPI.mod"): + install("MPI.mod", prefix.include) diff --git a/var/spack/repos/builtin/packages/mpi-test-suite/package.py b/var/spack/repos/builtin/packages/mpi-test-suite/package.py index 239650655af900..9c0e858778df4a 100644 --- a/var/spack/repos/builtin/packages/mpi-test-suite/package.py +++ b/var/spack/repos/builtin/packages/mpi-test-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class MpiTestSuite(AutotoolsPackage): maintainers("jcortial-safran") + license("BSD-3-Clause-Open-MPI") + version("1.1.1", sha256="4cb7bdbdafa0855dab96d996f863b5d364c935e678c057ada3c8869c3666e926") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/mpi/package.py b/var/spack/repos/builtin/packages/mpi/package.py index 409331e6a375dd..14e335e8e44716 100644 --- a/var/spack/repos/builtin/packages/mpi/package.py +++ b/var/spack/repos/builtin/packages/mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpibind/package.py b/var/spack/repos/builtin/packages/mpibind/package.py index a9a34476aa55c0..34910ae2010a75 100644 --- a/var/spack/repos/builtin/packages/mpibind/package.py +++ b/var/spack/repos/builtin/packages/mpibind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mpibind(AutotoolsPackage): maintainers("eleon") + license("MIT") + # This package uses 'git describe --tags' to get the # package version in Autotools' AC_INIT, thus # 'get_full_repo' is needed. diff --git a/var/spack/repos/builtin/packages/mpich/mpich33_slurm_hostlist.patch b/var/spack/repos/builtin/packages/mpich/mpich33_slurm_hostlist.patch new file mode 100644 index 00000000000000..8a799637218ccf --- /dev/null +++ b/var/spack/repos/builtin/packages/mpich/mpich33_slurm_hostlist.patch @@ -0,0 +1,22 @@ +From 28f617c8565ea862e140b9fa20ad309b3300f4f5 Mon Sep 17 00:00:00 2001 +From: Richard Berger +Date: Mon, 22 Jan 2024 16:11:20 -0700 +Subject: [PATCH] hydra: slurm hostlist_t should be used as pointer + +--- + src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c +index f6639806c..cadbf4a87 100644 +--- a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c ++++ b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c +@@ -26,7 +26,7 @@ static struct HYD_node *global_node_list = NULL; + #if defined(HAVE_LIBSLURM) + static HYD_status list_to_nodes(char *str) + { +- hostlist_t hostlist; ++ hostlist_t *hostlist; + char *host; + int k = 0; + HYD_status status = HYD_SUCCESS; diff --git a/var/spack/repos/builtin/packages/mpich/mpich40_slurm_hostlist.patch b/var/spack/repos/builtin/packages/mpich/mpich40_slurm_hostlist.patch new file mode 100644 index 00000000000000..2de4935c6f0c34 --- /dev/null +++ b/var/spack/repos/builtin/packages/mpich/mpich40_slurm_hostlist.patch @@ -0,0 +1,22 @@ +From 15c0b2449136ffbdbdc6049a4a9553cf8c045e2c Mon Sep 17 00:00:00 2001 +From: Richard Berger +Date: Mon, 22 Jan 2024 16:07:16 -0700 +Subject: [PATCH] hydra: slurm hostlist_t should be used as pointer + +--- + src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c +index 869d38b7a..953e8aa2d 100644 +--- a/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c ++++ b/src/pm/hydra/tools/bootstrap/external/slurm_query_node_list.c +@@ -25,7 +25,7 @@ static struct HYD_node *global_node_list = NULL; + #if defined(HAVE_SLURM) + static HYD_status list_to_nodes(char *str) + { +- hostlist_t hostlist; ++ hostlist_t *hostlist; + char *host; + int k = 0; + HYD_status status = HYD_SUCCESS; diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index 80bb05b28e8a77..8ab9eba76a3cc6 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -34,6 +34,8 @@ def url_for_version(self, version): keep_werror = "specific" + license("Unlicense") + version("develop", submodules=True) version("4.1.2", sha256="3492e98adab62b597ef0d292fb2459b6123bc80070a8aa0a30be6962075a12f0") version("4.1.1", sha256="ee30471b35ef87f4c88f871a5e2ad3811cd9c4df32fd4f138443072ff4284ca2") @@ -62,7 +64,7 @@ def url_for_version(self, version): variant("hydra", default=True, description="Build the hydra process manager") variant("romio", default=True, description="Enable ROMIO MPI I/O implementation") variant("verbs", default=False, description="Build support for OpenFabrics verbs.") - variant("slurm", default=False, description="Enable SLURM support") + variant("slurm", default=False, description="Enable Slurm support") variant("wrapperrpath", default=True, description="Enable wrapper rpath") variant( "pmi", @@ -77,16 +79,14 @@ def url_for_version(self, version): 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, ) @@ -128,6 +128,7 @@ def url_for_version(self, version): 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", @@ -142,8 +143,10 @@ def url_for_version(self, version): # 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") @@ -189,6 +192,26 @@ def url_for_version(self, version): when="@=3.3", ) + # Fix SLURM hostlist_t usage + # See https://github.com/pmodels/mpich/issues/6806 + # and https://github.com/pmodels/mpich/pull/6820 + patch( + "https://github.com/pmodels/mpich/commit/7a28682a805acfe84a4ea7b41cea079696407398.patch?full_index=1", + sha256="8cc80a8ffc3f1c907b1d8176129a0c1d01794a95adbed5b5357f50c13f6560e4", + when="@4.1:4.1.2 +slurm ^slurm@23-11-1-1:", + ) + # backports of fix down to v3.3 + patch( + "mpich40_slurm_hostlist.patch", + sha256="39aa1353305b7b03bc5c645c87d5299bd5d2ff676750898ba925f6cb9b716bdb", + when="@4.0 +slurm ^slurm@23-11-1-1:", + ) + patch( + "mpich33_slurm_hostlist.patch", + sha256="d6ec26adcf2d08d0739be44ab65b928a7a88e9ff1375138a0593678eedd420ab", + when="@3.3:3.4 +slurm ^slurm@23-11-1-1:", + ) + # Fix reduce operations for unsigned integers # See https://github.com/pmodels/mpich/issues/6083 patch( @@ -278,6 +301,7 @@ def url_for_version(self, version): 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") @@ -567,7 +591,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" diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 094c7b73e606dc..5b23f1dd1c3bad 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Mpifileutils(Package): tags = ["e4s"] + license("BSD-3-Clause") + version("develop", branch="main") version("0.11.1", sha256="e2cba53309b5b3ee581b6ff82e4e66f54628370cce694c34224ed947fece32d4") version("0.11", sha256="f5dc1b39077b3c04f79b2c335c4fd80306f8c57ecfbcacbb82cf532caf02b5fd") @@ -50,6 +52,8 @@ class Mpifileutils(Package): depends_on("attr", when="@0.11.1:+xattr") + depends_on("daos", when="+daos") + depends_on("bzip2") depends_on("libcap") @@ -68,6 +72,8 @@ class Mpifileutils(Package): variant("experimental", default=False, description="Install experimental tools") conflicts("+experimental", when="@:0.6") + variant("daos", default=False, description="Enable DAOS support", when="@0.11:") + def flag_handler(self, name, flags): spec = self.spec iflags = [] @@ -82,26 +88,32 @@ def cmake_args(self): args.append("-DWITH_DTCMP_PREFIX=%s" % self.spec["dtcmp"].prefix) args.append("-DWITH_LibCircle_PREFIX=%s" % self.spec["libcircle"].prefix) - if "+xattr" in self.spec: + if self.spec.satisfies("+xattr"): args.append("-DENABLE_XATTRS=ON") else: args.append("-DENABLE_XATTRS=OFF") - if "+lustre" in self.spec: + if self.spec.satisfies("+lustre"): args.append("-DENABLE_LUSTRE=ON") else: args.append("-DENABLE_LUSTRE=OFF") - if "+gpfs" in self.spec: + if self.spec.satisfies("+gpfs"): args.append("-DENABLE_GPFS=ON") else: args.append("-DENABLE_GPFS=OFF") - if "+experimental" in self.spec: + if self.spec.satisfies("+experimental"): args.append("-DENABLE_EXPERIMENTAL=ON") else: args.append("-DENABLE_EXPERIMENTAL=OFF") + if self.spec.satisfies("+daos"): + args.append("-DENABLE_DAOS=ON") + args.append("-DWITH_DAOS_PREFIX=%s" % self.spec["daos"].prefix) + else: + args.append("-DENABLE_DAOS=OFF") + return args @when("@0.9:") @@ -135,16 +147,16 @@ def configure_args(self): ) args.append("--with-dtcmp=%s" % self.spec["dtcmp"].prefix) - if "+xattr" in self.spec: + if self.spec.satisfies("+xattr"): args.append("CFLAGS=-DDCOPY_USE_XATTRS") - if "+lustre" in self.spec: + if self.spec.satisfies("+lustre"): args.append("--enable-lustre") else: args.append("--disable-lustre") if self.spec.satisfies("@0.7:"): - if "+experimental" in self.spec: + if self.spec.satisfies("+experimental"): args.append("--enable-experimental") else: args.append("--disable-experimental") diff --git a/var/spack/repos/builtin/packages/mpilander/package.py b/var/spack/repos/builtin/packages/mpilander/package.py index 190f4b2c604471..587b5e65d04860 100644 --- a/var/spack/repos/builtin/packages/mpilander/package.py +++ b/var/spack/repos/builtin/packages/mpilander/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mpilander(CMakePackage): maintainers("ax3l") + license("MIT") + version("develop", branch="master") # variant('cuda', default=False, description='Enable CUDA support') diff --git a/var/spack/repos/builtin/packages/mpileaks/package.py b/var/spack/repos/builtin/packages/mpileaks/package.py index 356f5256472cec..8c07e68ae645f4 100644 --- a/var/spack/repos/builtin/packages/mpileaks/package.py +++ b/var/spack/repos/builtin/packages/mpileaks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index 648e2654d29e4a..1655c4836080bf 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mpip(AutotoolsPackage): git = "https://github.com/llnl/mpip.git" maintainers("cchambreau") + license("Unlicense") + version("master", branch="master") version("3.5", sha256="e366843d53fa016fb03903e51c8aac901aa5155edabe64698a8d6fa618a03bbd") diff --git a/var/spack/repos/builtin/packages/mpir/package.py b/var/spack/repos/builtin/packages/mpir/package.py index 760a0f095b451b..ac0d0d41ab5d2c 100644 --- a/var/spack/repos/builtin/packages/mpir/package.py +++ b/var/spack/repos/builtin/packages/mpir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mpir(Package): url = "https://github.com/wbhart/mpir/archive/mpir-2.7.0.tar.gz" git = "https://github.com/wbhart/mpir.git" + license("LGPL-3.0-or-later") + version("develop", branch="master") version("2.7.0", sha256="2d0174aaccff918766215df00420f12929a6c376ab4e558af31f57c55193bcb7") version("2.6.0", sha256="dedb336098d41d4e298909586cf351003bcd7aad9317e801f3e4c4838f6d7691") diff --git a/var/spack/repos/builtin/packages/mpitrampoline/package.py b/var/spack/repos/builtin/packages/mpitrampoline/package.py index 2b3889a288fd32..f3092c93883e02 100644 --- a/var/spack/repos/builtin/packages/mpitrampoline/package.py +++ b/var/spack/repos/builtin/packages/mpitrampoline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mpitrampoline(CMakePackage): maintainers("eschnett") + license("MIT") + version("develop", branch="main") version("5.3.1", sha256="8671370750587f212f059138abc6dcaa5a1079d3dbd9189dc21bf353611159eb") version("5.3.0", sha256="c20a04fe72965d46f747d5e2c4e7854cfe0cc1b2db47c2484b06a7f24f86728f") diff --git a/var/spack/repos/builtin/packages/mpiwrapper/package.py b/var/spack/repos/builtin/packages/mpiwrapper/package.py index 39a4c802975e16..50d18fc57f77be 100644 --- a/var/spack/repos/builtin/packages/mpiwrapper/package.py +++ b/var/spack/repos/builtin/packages/mpiwrapper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mpiwrapper(CMakePackage): maintainers("eschnett") + license("MIT") + version("develop", branch="main") version("2.10.4", sha256="af644bf4ba69964a4f7b35fbe6b8bbc67afe7bef75ba69895a227f4f465b3eaa") version("2.10.3", sha256="63f34df837cb9d7cae0b5ab8c0f09e8c5a60a8c0e85f248bf34fedda6488a870") diff --git a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py index e5be3f1a6050ad..d8b9b59f61a672 100644 --- a/var/spack/repos/builtin/packages/mpix-launch-swift/package.py +++ b/var/spack/repos/builtin/packages/mpix-launch-swift/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mpl/package.py b/var/spack/repos/builtin/packages/mpl/package.py index 74f03225566ffe..f39c81c76d7580 100644 --- a/var/spack/repos/builtin/packages/mpl/package.py +++ b/var/spack/repos/builtin/packages/mpl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Mpl(CMakePackage): url = "https://github.com/rabauke/mpl/archive/refs/tags/v0.3.0.tar.gz" maintainers("rabauke") + license("BSD-3-Clause") + version("develop", branch="master") version("0.3.0", tag="v0.3.0", commit="e6bd4926914127f3609a14474aa4a9c4fabbff0b") version("0.2.1", tag="v0.2.1", commit="5bee297b453d7b66a803453bfc6884611a36c4d0") diff --git a/var/spack/repos/builtin/packages/mpt/package.py b/var/spack/repos/builtin/packages/mpt/package.py index 12eaf4a8b9552d..237b35db32e960 100644 --- a/var/spack/repos/builtin/packages/mpt/package.py +++ b/var/spack/repos/builtin/packages/mpt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mptensor/package.py b/var/spack/repos/builtin/packages/mptensor/package.py index b9cc250a56b15c..3fcae8fc5be9a9 100644 --- a/var/spack/repos/builtin/packages/mptensor/package.py +++ b/var/spack/repos/builtin/packages/mptensor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mptensor(CMakePackage): homepage = "https://github.com/smorita/mptensor" url = "https://github.com/smorita/mptensor/archive/v0.3.0.tar.gz" + license("LGPL-3.0-or-later") + version("0.3.0", sha256="819395a91551bddb77958615042fcb935a4b67ee37f912b9a2ca5b49c71befae") variant("mpi", default=False, description="Build with MPI library") diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index c73cc66c8c3f0e..ee3c846408c931 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mrbayes(AutotoolsPackage): homepage = "http://mrbayes.sourceforge.net" url = "https://github.com/NBISweden/MrBayes/releases/download/v3.2.7a/mrbayes-3.2.7a.tar.gz" + license("GPL-3.0-or-later") + version("3.2.7a", sha256="1a4670be84e6b968d59382328294db4c8ceb73e0c19c702265deec6f2177815c") version("3.2.7", sha256="39d9eb269969b501268d5c27f77687c6eaa2c71ccf15c724e6f330fc405f24b9") diff --git a/var/spack/repos/builtin/packages/mrbench/package.py b/var/spack/repos/builtin/packages/mrbench/package.py index ac3e86d8a791ca..fb562d5d5c17aa 100644 --- a/var/spack/repos/builtin/packages/mrbench/package.py +++ b/var/spack/repos/builtin/packages/mrbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mrchem/package.py b/var/spack/repos/builtin/packages/mrchem/package.py index 1eb328518ba7d6..c73484c0f6f111 100644 --- a/var/spack/repos/builtin/packages/mrchem/package.py +++ b/var/spack/repos/builtin/packages/mrchem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mrchem(CMakePackage): maintainers("robertodr", "stigrj", "ilfreddy") + license("LGPL-3.0-only") + version("1.1.2", sha256="b4e74ad5ee89fc5e8a7329474cf0fa93155423f93a1f95c8c2888f7c53e353ea") version("1.0.0", sha256="9cdda4d30b2baabb26400742f78ef8f3fc50a54f5218c8b6071b0cbfbed746c3") version("0.2.2", sha256="7519cc104c7df51eea8902c225aac6ecce2ac4ff30765145e502342d5bf3d96b") diff --git a/var/spack/repos/builtin/packages/mrcpp/package.py b/var/spack/repos/builtin/packages/mrcpp/package.py index eb0a810a904aca..46dfbe6eef04b7 100644 --- a/var/spack/repos/builtin/packages/mrcpp/package.py +++ b/var/spack/repos/builtin/packages/mrcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Mrcpp(CMakePackage): maintainers("robertodr", "stigrj", "ilfreddy") + license("LGPL-3.0-only") + version("1.4.2", sha256="cc7a4200eb0383967d984e770a95e621e76c88b79c5e7443433f5e642aee035b") version("1.3.6", sha256="2502e71f086a8bb5ea635d0c6b86e7ff60220a45583e96a08b3cfe7c9db4cecf") version("1.3.5", sha256="3072cf60db6fa1e621bc6e6dfb6d35f9367a44d9d312a4b8c455894769140aed") diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py index a36ddd4d95344f..16be03143c6de0 100644 --- a/var/spack/repos/builtin/packages/mrnet/package.py +++ b/var/spack/repos/builtin/packages/mrnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mrnet(AutotoolsPackage): git = "https://github.com/dyninst/mrnet.git" list_url = "http://ftp.cs.wisc.edu/paradyn/mrnet" + license("LGPL-2.1-or-later") + version("master", branch="master") version("5.0.1-4", commit="2c5632aa27188de6866abc49bf1de70fb6b27af9") version("5.0.1-3", commit="7375ba5bb0df87c68e58ad15e9e5e351ae020c08") diff --git a/var/spack/repos/builtin/packages/mrtrix3/fix_includes.patch b/var/spack/repos/builtin/packages/mrtrix3/fix_includes.patch new file mode 100644 index 00000000000000..667e412acc1cee --- /dev/null +++ b/var/spack/repos/builtin/packages/mrtrix3/fix_includes.patch @@ -0,0 +1,26 @@ +--- ./configure.orig 2023-11-12 14:48:25.802025918 -0800 ++++ ./configure 2023-11-12 14:48:56.177057419 -0800 +@@ -571,10 +571,7 @@ + try: + flags = [] + for flag in shlex.split (execute ([ 'pkg-config' ] + pkg_config_flags.split(), RunError)[1]): +- if flag.startswith ('-I'): +- flags += [ '-idirafter', flag[2:] ] +- else: +- flags += [ flag ] ++ flags += [ flag ] + return flags + except Exception: + log('error running "pkg-config ' + pkg_config_flags + '"\n\n') +@@ -1323,10 +1320,7 @@ + for entry in qt: + if entry[0] != '$' and not entry == '-I.': + entry = entry.replace('\"','').replace("'",'') +- if entry.startswith('-I'): +- qt_cflags += [ '-idirafter', entry[2:] ] +- else: +- qt_cflags += [ entry ] ++ qt_cflags += [ entry ] + + qt = qt_ldflags + qt_libs + qt_ldflags = [] diff --git a/var/spack/repos/builtin/packages/mrtrix3/package.py b/var/spack/repos/builtin/packages/mrtrix3/package.py index 2a59d7ec22a8e9..a5a2b1183188c7 100644 --- a/var/spack/repos/builtin/packages/mrtrix3/package.py +++ b/var/spack/repos/builtin/packages/mrtrix3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,22 +16,29 @@ class Mrtrix3(Package): url = "https://github.com/MRtrix3/mrtrix3/archive/refs/tags/3.0.3.tar.gz" git = "https://github.com/MRtrix3/mrtrix3.git" + license("MPL-2.0") + version( - "3.0.3", - sha256="6ec7d5a567d8d7338e85575a74565189a26ec8971cbe8fb24a49befbc446542e", + "3.0.4", + sha256="f1d1aa289cfc3e46e3a8eca93594b23d061c6d50a0cd03727433a7e2cd14f71a", preferred=True, ) + version("3.0.3", sha256="6ec7d5a567d8d7338e85575a74565189a26ec8971cbe8fb24a49befbc446542e") version("2017-09-25", commit="72aca89e3d38c9d9e0c47104d0fb5bd2cbdb536d") depends_on("python@2.7:", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("glu") depends_on("qt+opengl@4.7:") - depends_on("eigen") + # MRTrix <= 3.0.3 can't build with eigen >= 3.4 due to conflicting declarations + depends_on("eigen@3.3", when="@3.0.3") + depends_on("eigen@3.4:", when="@3.0.4:") depends_on("zlib-api") depends_on("libtiff") depends_on("fftw") + patch("fix_includes.patch", when="@3.0.3:3.0.4") + conflicts("%gcc@7:", when="@2017-09-25") # MRtrix3/mrtrix3#1041 def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/mruby/package.py b/var/spack/repos/builtin/packages/mruby/package.py index f6285d1b793ac9..230a0b82e9228e 100644 --- a/var/spack/repos/builtin/packages/mruby/package.py +++ b/var/spack/repos/builtin/packages/mruby/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mruby(Package): maintainers = ["mdorier"] + license("MIT") + version("master", branch="master") version("3.2.0", sha256="3c198e4a31d31fe8524013066fac84a67fe6cd6067d92c25a1c79089744cb608") version("3.1.0", sha256="64ce0a967028a1a913d3dfc8d3f33b295332ab73be6f68e96d0f675f18c79ca8") diff --git a/var/spack/repos/builtin/packages/mscgen/package.py b/var/spack/repos/builtin/packages/mscgen/package.py index bc524c22aada41..aae65bc5e9ebf4 100644 --- a/var/spack/repos/builtin/packages/mscgen/package.py +++ b/var/spack/repos/builtin/packages/mscgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index 905dd5a4a713f3..f8a041fbc72a9b 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class MsgpackC(CMakePackage): homepage = "http://www.msgpack.org" url = "https://github.com/msgpack/msgpack-c/archive/cpp-3.0.1.tar.gz" + license("BSL-1.0") + version("3.1.1", sha256="bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e") version("3.0.1", sha256="1b834ab0b5b41da1dbfb96dd4a673f6de7e79dbd7f212f45a553ff9cc54abf3b") version("1.4.1", sha256="74324d696f9abb75d8a7cd5e77add5062592b7eac386c8102de78a6cc5309886") diff --git a/var/spack/repos/builtin/packages/mshadow/package.py b/var/spack/repos/builtin/packages/mshadow/package.py index 684b825fe16aee..652c454f5d7d6a 100644 --- a/var/spack/repos/builtin/packages/mshadow/package.py +++ b/var/spack/repos/builtin/packages/mshadow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Mshadow(Package): homepage = "https://github.com/dmlc/mshadow" git = "https://github.com/dmlc/mshadow.git" + license("Apache-2.0") + version("master", branch="master") version("20170721", commit="20b54f068c1035f0319fa5e5bbfb129c450a5256") diff --git a/var/spack/repos/builtin/packages/msmc/package.py b/var/spack/repos/builtin/packages/msmc/package.py index a4462a9d656b54..b76dd29f94d480 100644 --- a/var/spack/repos/builtin/packages/msmc/package.py +++ b/var/spack/repos/builtin/packages/msmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Msmc(MakefilePackage): homepage = "https://github.com/stschiff/msmc" url = "https://github.com/stschiff/msmc/archive/v1.1.0.tar.gz" + license("GPL-3.0-or-later") + version("1.1.0", sha256="989064400fe392ca3d2ac1a253ce7edf1801b6a7eeb77bbf2ff7bf67910216c4") depends_on("gsl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/msmc2/package.py b/var/spack/repos/builtin/packages/msmc2/package.py index aefc3f1a96a636..2330494f2573b3 100644 --- a/var/spack/repos/builtin/packages/msmc2/package.py +++ b/var/spack/repos/builtin/packages/msmc2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Msmc2(MakefilePackage): maintainers("robqiao") + license("GPL-3.0-or-later") + version("2.1.4", sha256="e513723b9e956f01de8de89ff6d32c071f509512425185d12faa5bb76cf440d0") version("2.1.2", sha256="c8c2b6ed6ef1b5d6e6e15ec0d968288e5bdae2bea1f3b4ec790f599e96bb26cd") version("2.1.1", sha256="151dd75a8b0371ff94eed9504a7a73a2924e10466de30c230c1bb3c35a1a0913") diff --git a/var/spack/repos/builtin/packages/msmpi/package.py b/var/spack/repos/builtin/packages/msmpi/package.py index 50306c164f5cb7..5d05dd2c25d66e 100644 --- a/var/spack/repos/builtin/packages/msmpi/package.py +++ b/var/spack/repos/builtin/packages/msmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mstk/package.py b/var/spack/repos/builtin/packages/mstk/package.py index cf621433137ee3..5cc0be5f178b97 100644 --- a/var/spack/repos/builtin/packages/mstk/package.py +++ b/var/spack/repos/builtin/packages/mstk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Mstk(CMakePackage): maintainers("raovgarimella", "julienloiseau") + license("BSD-3-Clause") + version("master", branch="master") version("3.3.6", sha256="30041ee6f32d754e5d9b46db8f62609bb66d2686f8e6e16ad254f552849cb0f1") version("3.3.5", sha256="64c976e12d1393aafd086ef941b176add6cfb963f463c33259596e7ef641cdd8") diff --git a/var/spack/repos/builtin/packages/mt-metis/package.py b/var/spack/repos/builtin/packages/mt-metis/package.py index 5f77782a013d4b..609c9634cc5cc5 100644 --- a/var/spack/repos/builtin/packages/mt-metis/package.py +++ b/var/spack/repos/builtin/packages/mt-metis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class MtMetis(CMakePackage): homepage = "http://glaros.dtc.umn.edu/gkhome/views/metis" url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/mt-metis-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="cb8fb836b630a899edbeca4e1da19ec9eb47e89903bda83e7ec62cb0ffdcc284") # avoid asm('pause') for no x86_64 familly. diff --git a/var/spack/repos/builtin/packages/mtn/package.py b/var/spack/repos/builtin/packages/mtn/package.py index 6e2111251fa499..d92122211b6f96 100644 --- a/var/spack/repos/builtin/packages/mtn/package.py +++ b/var/spack/repos/builtin/packages/mtn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mtn(MakefilePackage): maintainers("ledif") + license("GPL-2.0-or-later") + version("3.4.2", sha256="19b2076c00f5b0ad70c2467189b17f335c6e7ece5d1a01ed8910779f6a5ca52a") depends_on("ffmpeg") diff --git a/var/spack/repos/builtin/packages/mujoco/package.py b/var/spack/repos/builtin/packages/mujoco/package.py index 26ed5d4ae57d3b..44724042fff140 100644 --- a/var/spack/repos/builtin/packages/mujoco/package.py +++ b/var/spack/repos/builtin/packages/mujoco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/multitail/package.py b/var/spack/repos/builtin/packages/multitail/package.py index b62ea0166a4e99..304f33c0b02a88 100644 --- a/var/spack/repos/builtin/packages/multitail/package.py +++ b/var/spack/repos/builtin/packages/multitail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Multitail(MakefilePackage): homepage = "https://www.vanheusden.com/multitail/index.php" url = "https://www.vanheusden.com/multitail/multitail-6.4.2.tgz" + license("Apache-2.0") + version("6.4.2", sha256="af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/multitime/package.py b/var/spack/repos/builtin/packages/multitime/package.py index 007aa28fcbbdfd..38ce762525b305 100644 --- a/var/spack/repos/builtin/packages/multitime/package.py +++ b/var/spack/repos/builtin/packages/multitime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class Multitime(AutotoolsPackage): homepage = "https://tratt.net/laurie/src/multitime/" url = "https://tratt.net/laurie/src/multitime/releases/multitime-1.4.tar.gz" + license("MIT") + version("1.4", sha256="dd85c431c022d0b992f3a8816a1a3dfb414454a229c0ec22514761bf72d3ce47") diff --git a/var/spack/repos/builtin/packages/multiverso/package.py b/var/spack/repos/builtin/packages/multiverso/package.py index 225b0321cc9501..22b835323719c8 100644 --- a/var/spack/repos/builtin/packages/multiverso/package.py +++ b/var/spack/repos/builtin/packages/multiverso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Multiverso(CMakePackage): url = "https://github.com/Microsoft/Multiverso/archive/v0.2.tar.gz" git = "https://github.com/Microsoft/Multiverso.git" + license("MIT") + version("master", branch="master") version("143187", commit="143187575d1cfa410100037b8aea2e767e0af637") version("0.2", sha256="40e86543968faa2fe203cf0b004a4c7905303db0c860efe4ce4e1f27e46394fc") diff --git a/var/spack/repos/builtin/packages/mumax/package.py b/var/spack/repos/builtin/packages/mumax/package.py index 68948fc43a8951..00d9bed849bf54 100644 --- a/var/spack/repos/builtin/packages/mumax/package.py +++ b/var/spack/repos/builtin/packages/mumax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mumax(MakefilePackage, CudaPackage): homepage = "https://mumax.github.io" url = "https://github.com/mumax/3/archive/v3.10.tar.gz" + license("CC-BY-3.0") + version( "3.10", sha256="42c858661cec3896685ff4babea11e711f71fd6ea37d20c2bed7e4a918702caa", diff --git a/var/spack/repos/builtin/packages/mummer/package.py b/var/spack/repos/builtin/packages/mummer/package.py index 5d52ba33ab6e78..a1e8f1b538cded 100644 --- a/var/spack/repos/builtin/packages/mummer/package.py +++ b/var/spack/repos/builtin/packages/mummer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Mummer(Package): homepage = "http://mummer.sourceforge.net/" url = "https://sourceforge.net/projects/mummer/files/mummer/3.23/MUMmer3.23.tar.gz/download" + license("Artistic-1.0") + version("3.23", sha256="1efad4f7d8cee0d8eaebb320a2d63745bb3a160bb513a15ef7af46f330af662f") depends_on("gnuplot") diff --git a/var/spack/repos/builtin/packages/mummer4/package.py b/var/spack/repos/builtin/packages/mummer4/package.py index 0622452e601988..122f4229dc42ac 100644 --- a/var/spack/repos/builtin/packages/mummer4/package.py +++ b/var/spack/repos/builtin/packages/mummer4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py index f9a210407dc8dc..df81143a25fe00 100644 --- a/var/spack/repos/builtin/packages/mumps/package.py +++ b/var/spack/repos/builtin/packages/mumps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,11 @@ class Mumps(Package): homepage = "https://graal.ens-lyon.fr/MUMPS/index.php" url = "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.5.1.tar.gz" + maintainers("jcortial-safran") + + version("5.6.2", sha256="13a2c1aff2bd1aa92fe84b7b35d88f43434019963ca09ef7e8c90821a8f1d59a") + version("5.6.1", sha256="1920426d543e34d377604070fde93b8d102aa38ebdf53300cbce9e15f92e2896") + version("5.6.0", sha256="3e08c1bdea7aaaba303d3cf03059f3b4336fa49bef93f4260f478f067f518289") version("5.5.1", sha256="1abff294fa47ee4cfd50dfd5c595942b72ebfcedce08142a75a99ab35014fa15") version("5.5.0", sha256="e54d17c5e42a36c40607a03279e0704d239d71d38503aab68ef3bfe0a9a79c13") version("5.4.1", sha256="93034a1a9fe0876307136dcde7e98e9086e199de76f1c47da822e7d4de987fa8") @@ -223,7 +228,7 @@ def write_makefile_inc(self): # As of version 5.2.0, MUMPS is able to take advantage # of the GEMMT BLAS extension. MKL and amdblis are the only # known BLAS implementation supported. - if self.spec["blas"].name in INTEL_MATH_LIBRARIES and self.spec.satifies("@5.2.0:"): + if self.spec["blas"].name in INTEL_MATH_LIBRARIES and self.spec.satisfies("@5.2.0:"): optf.append("-DGEMMT_AVAILABLE") if "@5.2.0: ^amdblis@3.0:" in self.spec: diff --git a/var/spack/repos/builtin/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py index 0d9850b986a883..a2dd177475f7ee 100644 --- a/var/spack/repos/builtin/packages/munge/package.py +++ b/var/spack/repos/builtin/packages/munge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Munge(AutotoolsPackage): url = "https://github.com/dun/munge/releases/download/munge-0.5.14/munge-0.5.14.tar.xz" maintainers("ChristianTackeGSI") + license("LGPL-3.0-only") + version("0.5.15", sha256="3f979df117a34c74db8fe2835521044bdeb08e3b7d0f168ca97c3547f51da9ba") version("0.5.14", sha256="6606a218f18090fa1f702e3f6fb608073eb6aafed534cf7dd81b67b2e0d30640") version("0.5.13", sha256="99753dfd06a4f063c36f3fb0eb1964f394feb649937d94c4734d85b7964144da") diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py index 7c362e6d59c52f..3364f50a33da4f 100644 --- a/var/spack/repos/builtin/packages/muparser/package.py +++ b/var/spack/repos/builtin/packages/muparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Muparser(Package): homepage = "https://beltoforion.de/en/muparser/" url = "https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz" + license("BSD-2-Clause") + version("2.3.4", sha256="0c3fa54a3ebf36dda0ed3e7cd5451c964afbb15102bdbcba08aafb359a290121") version("2.2.6.1", sha256="d2562853d972b6ddb07af47ce8a1cdeeb8bb3fa9e8da308746de391db67897b3") version("2.2.5", sha256="0666ef55da72c3e356ca85b6a0084d56b05dd740c3c21d26d372085aa2c6e708") diff --git a/var/spack/repos/builtin/packages/muparserx/package.py b/var/spack/repos/builtin/packages/muparserx/package.py index 8cbe2557ee8d13..64b2d2491e62f6 100644 --- a/var/spack/repos/builtin/packages/muparserx/package.py +++ b/var/spack/repos/builtin/packages/muparserx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Muparserx(CMakePackage): homepage = "https://beltoforion.de/en/muparserx/" url = "https://github.com/beltoforion/muparserx/archive/refs/tags/v4.0.8.tar.gz" + license("BSD-2-Clause") + version("4.0.8", sha256="5913e0a4ca29a097baad1b78a4674963bc7a06e39ff63df3c73fbad6fadb34e1") diff --git a/var/spack/repos/builtin/packages/muscle/package.py b/var/spack/repos/builtin/packages/muscle/package.py index c2ca19749aae78..40460650b3f52c 100644 --- a/var/spack/repos/builtin/packages/muscle/package.py +++ b/var/spack/repos/builtin/packages/muscle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/muscle5/package.py b/var/spack/repos/builtin/packages/muscle5/package.py index 543c1958f933cf..799bf1067468e7 100644 --- a/var/spack/repos/builtin/packages/muscle5/package.py +++ b/var/spack/repos/builtin/packages/muscle5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Muscle5(MakefilePackage): maintainers("snehring") + license("GPL-3.0-or-later") + version("5.1.0", sha256="2bba8b06e3ccabf6465fa26f459763b2029d7e7b9596881063e3aaba60d9e87d") depends_on("sed", type="build") diff --git a/var/spack/repos/builtin/packages/muse/package.py b/var/spack/repos/builtin/packages/muse/package.py index 685e020a65747f..e5f7928c988391 100644 --- a/var/spack/repos/builtin/packages/muse/package.py +++ b/var/spack/repos/builtin/packages/muse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Muse(MakefilePackage): homepage = "https://bioinformatics.mdanderson.org/main/MuSE" url = "https://github.com/danielfan/MuSE/archive/v1.0-rc.tar.gz" + license("GPL-2.0-or-later") + version("1.0-rc", sha256="b48b8be0044a2249bdc0b625fe0192c65089c598bbd1b1142902dfa81e804023") depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/music/package.py b/var/spack/repos/builtin/packages/music/package.py index 47b7120ae76442..8c7ce2e50efdec 100644 --- a/var/spack/repos/builtin/packages/music/package.py +++ b/var/spack/repos/builtin/packages/music/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/musl/package.py b/var/spack/repos/builtin/packages/musl/package.py index ddaba97eb8e381..13ce939b41f403 100644 --- a/var/spack/repos/builtin/packages/musl/package.py +++ b/var/spack/repos/builtin/packages/musl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class Musl(MakefilePackage): homepage = "https://www.musl-libc.org" url = "https://www.musl-libc.org/releases/musl-1.1.23.tar.gz" + license("MIT") + version("1.2.4", sha256="7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039") version("1.2.3", sha256="7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4") version("1.2.2", sha256="9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd") diff --git a/var/spack/repos/builtin/packages/must/package.py b/var/spack/repos/builtin/packages/must/package.py index 5d6c36bb044e84..5597157134e4c6 100644 --- a/var/spack/repos/builtin/packages/must/package.py +++ b/var/spack/repos/builtin/packages/must/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/muster/package.py b/var/spack/repos/builtin/packages/muster/package.py index a39cf1370ae1a3..13ebbd04f35bda 100644 --- a/var/spack/repos/builtin/packages/muster/package.py +++ b/var/spack/repos/builtin/packages/muster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mutationpp/package.py b/var/spack/repos/builtin/packages/mutationpp/package.py index 9936246fdd79d0..0a7a01262edcd0 100644 --- a/var/spack/repos/builtin/packages/mutationpp/package.py +++ b/var/spack/repos/builtin/packages/mutationpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Mutationpp(CMakePackage): homepage = "https://github.com/mutationpp/Mutationpp" url = "https://github.com/mutationpp/Mutationpp/archive/v0.3.1.tar.gz" + license("LGPL-3.0-only") + version("1.0.5", sha256="319eca4e82a2469946344195373eabf28caaf6a39ddf3142b2337f47aa0835a8") version("1.0.0", sha256="928df99accd1a02706a57246edeef8ebbf3bd91bb40492258ee18b810a7e0194") version("0.3.1", sha256="a6da2816e145ac9fcfbd8920595b7f65ce7bc8df0bec572b32647720758cbe69") diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py index 68df26215aeb61..46a43d5ec2df87 100644 --- a/var/spack/repos/builtin/packages/mvapich/package.py +++ b/var/spack/repos/builtin/packages/mvapich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Mvapich(AutotoolsPackage): executables = ["^mpiname$", "^mpichversion$"] + license("Unlicense") + # Prefer the latest stable release version("3.0b", sha256="52d8a742e16eef69e944754fea7ebf8ba4ac572dac67dbda528443d9f32547cc") diff --git a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py index 01de9a01f62c20..a284f6ffa02ef9 100755 --- a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py +++ b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index c1f67620f38fd7..7e9204ffbde19f 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -83,6 +83,15 @@ class Mvapich2(AutotoolsPackage): .with_non_feature_values("auto"), ) + variant( + "pmi_version", + description=("The pmi version to be used with slurm"), + when="process_managers=slurm", + default="pmi2", + values=("pmi1", "pmi2", "pmix"), + multi=False, + ) + variant( "fabrics", description="Select the fabric to be enabled for this build." @@ -133,6 +142,7 @@ class Mvapich2(AutotoolsPackage): depends_on("rdma-core", when="fabrics=nemesisibtcp") depends_on("libfabric", when="fabrics=nemesisofi") depends_on("slurm", when="process_managers=slurm") + depends_on("pmix", when="pmi_version=pmix") # Fix segmentation fault in `MPIR_Attr_delete_list`: # . @@ -277,11 +287,14 @@ def process_manager_options(self): # See: http://slurm.schedmd.com/mpi_guide.html#mvapich2 if "process_managers=slurm" in spec: - opts = [ - "--with-pmi=pmi2", - "--with-pm=slurm", - "--with-slurm={0}".format(spec["slurm"].prefix), - ] + opts = ["--with-pm=slurm", "--with-slurm={0}".format(spec["slurm"].prefix)] + if "pmi_version=pmi1" in spec: + opts.append("--with-pmi=pmi1") + elif "pmi_version=pmi2" in spec: + opts.append("--with-pmi=pmi2") + elif "pmi_version=pmix" in spec: + opts.append("--with-pmi=pmix") + opts.append("--with-pmix={0}".format(spec["pmix"].prefix)) return opts @@ -347,7 +360,12 @@ def setup_build_environment(self, env): def setup_run_environment(self, env): if "process_managers=slurm" in self.spec: - env.set("SLURM_MPI_TYPE", "pmi2") + if "pmi_version=pmi1" in self.spec: + env.set("SLURM_MPI_TYPE", "pmi1") + elif "pmi_version=pmi2" in self.spec: + env.set("SLURM_MPI_TYPE", "pmi2") + elif "pmi_version=pmix" in self.spec: + env.set("SLURM_MPI_TYPE", "pmix") env.set("MPI_ROOT", self.prefix) diff --git a/var/spack/repos/builtin/packages/mvapich2x/package.py b/var/spack/repos/builtin/packages/mvapich2x/package.py index 376daedb789db7..b817f3cd34331e 100644 --- a/var/spack/repos/builtin/packages/mvapich2x/package.py +++ b/var/spack/repos/builtin/packages/mvapich2x/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mxm/package.py b/var/spack/repos/builtin/packages/mxm/package.py index 49181ca3d1c20f..2eb1aad39a735b 100644 --- a/var/spack/repos/builtin/packages/mxm/package.py +++ b/var/spack/repos/builtin/packages/mxm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py index 980547016eaf7b..7ae66fbd23c749 100644 --- a/var/spack/repos/builtin/packages/mxml/package.py +++ b/var/spack/repos/builtin/packages/mxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Mxml(AutotoolsPackage): homepage = "https://michaelrsweet.github.io/mxml/" url = "https://github.com/michaelrsweet/mxml/releases/download/release-2.10/mxml-2.10.tar.gz" + license("Apache-2.0") + version("2.10", sha256="267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891") version("2.9", sha256="cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92") version("2.8", sha256="0c9369f91a718d82e32cb007c0bd41b6642822c9a0ffe1d10eccbdea9a3011d5") diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index d8639dca2a36b1..9558cc6b80bb5b 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Mxnet(CMakePackage, CudaPackage, PythonExtension): maintainers("adamjstewart") + license("Apache-2.0") + version("master", branch="master", submodules=True) version("1.9.1", sha256="11ea61328174d8c29b96f341977e03deb0bf4b0c37ace658f93e38d9eb8c9322") version("1.9.0", sha256="a2a99cf604d57094269cacdfc4066492b2dc886593ee02b862e034f6180f712d") @@ -57,9 +59,7 @@ class Mxnet(CMakePackage, CudaPackage, PythonExtension): depends_on("py-cython", when="+python", type="build") depends_on("py-numpy@1.17:", when="@2.0.0:+python", type=("build", "run")) depends_on("py-numpy@1.16.1:1", when="@1.6:1.8.0+python", type=("build", "run")) - depends_on("py-numpy@1.8.2:1.15.0", when="@1.3.0+python", type=("build", "run")) depends_on("py-requests@2.20.0:2", when="@1.6:+python", type=("build", "run")) - depends_on("py-requests@2.18.4:2.18", when="@1.3.0+python", type=("build", "run")) depends_on("py-graphviz@0.8.1:0.8", when="+python", type=("build", "run")) conflicts("+cudnn", when="~cuda") diff --git a/var/spack/repos/builtin/packages/mypaint-brushes/package.py b/var/spack/repos/builtin/packages/mypaint-brushes/package.py index 27e837e3b7153b..b0feaa0a194771 100644 --- a/var/spack/repos/builtin/packages/mypaint-brushes/package.py +++ b/var/spack/repos/builtin/packages/mypaint-brushes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class MypaintBrushes(AutotoolsPackage): maintainers("benkirk") + license("CC0-1.0") + version("2.0.2", sha256="7984a74edef94571d872d0629b224abaa956a36f632f5c5516b33d22e49eb566") version("1.3.1", sha256="fef66ffc241b7c5cd29e9c518e933c739618cb51c4ed4d745bf648a1afc3fe70") diff --git a/var/spack/repos/builtin/packages/mysql-connector-c/package.py b/var/spack/repos/builtin/packages/mysql-connector-c/package.py index 8b24b649d03e7f..d0e4d1f218b5c1 100644 --- a/var/spack/repos/builtin/packages/mysql-connector-c/package.py +++ b/var/spack/repos/builtin/packages/mysql-connector-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,4 +20,6 @@ class MysqlConnectorC(CMakePackage): patch("fix-cmake.patch", when="@6.1.11") + license("GPL-2.0-or-later") + version("6.1.11", sha256="c8664851487200162b38b6f3c8db69850bd4f0e4c5ff5a6d161dbfb5cb76b6c4") diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index a06b616eca739e..53fbab912f16a6 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,7 @@ class Mysql(CMakePackage): homepage = "https://www.mysql.com/" url = "https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-8.0.15.tar.gz" - version("8.2.0", sha256="8ad3e3f1c5ae2154be638acf556e8981f702d052acc5957e776df1722c211979") + version("8.0.35", sha256="917c5ed38704e99211185ce4be24e33a8c19c91241ed73af4181a6f38d1574c2") version("8.0.29", sha256="512170fa6f78a694d6f18d197e999d2716ee68dc541d7644dd922a3663407266") version("8.0.19", sha256="a62786d67b5e267eef928003967b4ccfe362d604b80f4523578e0688f5b9f834") version("8.0.18", sha256="4cb39a315298eb243c25c53c184b3682b49c2a907a1d8432ba0620534806ade8") @@ -53,12 +53,11 @@ class Mysql(CMakePackage): variant("client_only", default=False, description="Build and install client only.") variant( "cxxstd", - default="14", + default="17", values=("98", "11", "14", "17"), multi=False, description="Use the specified C++ standard when building.", ) - variant("download_boost", default=False, description="Download own boost libs", when="@5.7:") # 5.7.X cannot be compiled client-only. conflicts("+client_only", when="@5.7.0:5.7") @@ -66,11 +65,10 @@ class Mysql(CMakePackage): # std::byte. conflicts("cxxstd=17", when="@8.0.0:~client_only") - requires("cxxstd=17", when="@8.2:") - provides("mysql-client") # https://dev.mysql.com/doc/refman/8.0/en/source-installation.html + # https://dev.mysql.com/doc/refman/8.0/en/source-configuration-options.html # See CMAKE_MINIMUM_REQUIRED in CMakeLists.txt depends_on("cmake@3.1.0:", type="build", when="@5.7.0:5.7 platform=win32") @@ -85,54 +83,66 @@ class Mysql(CMakePackage): depends_on("pkgconfig", type="build", when="@5.7.0:") depends_on("doxygen", type="build", when="@8.0.0:") - with when("~download_boost"): - # Each version of MySQL requires a specific version of boost - # See BOOST_PACKAGE_NAME in cmake/boost.cmake - # 8.0.29 - depends_on("boost@1.77.0 cxxstd=98", type="build", when="@8.0.29: cxxstd=98") - depends_on("boost@1.77.0 cxxstd=11", type="build", when="@8.0.29: cxxstd=11") - depends_on("boost@1.77.0 cxxstd=14", type="build", when="@8.0.29: cxxstd=14") - depends_on("boost@1.77.0 cxxstd=17", type="build", when="@8.0.29: cxxstd=17") - # 8.0.19 - depends_on("boost@1.70.0 cxxstd=98", type="build", when="@8.0.19 cxxstd=98") - depends_on("boost@1.70.0 cxxstd=11", type="build", when="@8.0.19 cxxstd=11") - depends_on("boost@1.70.0 cxxstd=14", type="build", when="@8.0.19 cxxstd=14") - depends_on("boost@1.70.0 cxxstd=17", type="build", when="@8.0.19 cxxstd=17") - # 8.0.16--8.0.18 - depends_on("boost@1.69.0 cxxstd=98", type="build", when="@8.0.16:8.0.18 cxxstd=98") - depends_on("boost@1.69.0 cxxstd=11", type="build", when="@8.0.16:8.0.18 cxxstd=11") - depends_on("boost@1.69.0 cxxstd=14", type="build", when="@8.0.16:8.0.18 cxxstd=14") - depends_on("boost@1.69.0 cxxstd=17", type="build", when="@8.0.16:8.0.18 cxxstd=17") - # 8.0.14--8.0.15 - depends_on("boost@1.68.0 cxxstd=98", type="build", when="@8.0.14:8.0.15 cxxstd=98") - depends_on("boost@1.68.0 cxxstd=11", type="build", when="@8.0.14:8.0.15 cxxstd=11") - depends_on("boost@1.68.0 cxxstd=14", type="build", when="@8.0.14:8.0.15 cxxstd=14") - depends_on("boost@1.68.0 cxxstd=17", type="build", when="@8.0.14:8.0.15 cxxstd=17") - # 8.0.12--8.0.13 - depends_on("boost@1.67.0 cxxstd=98", type="build", when="@8.0.12:8.0.13 cxxstd=98") - depends_on("boost@1.67.0 cxxstd=11", type="build", when="@8.0.12:8.0.13 cxxstd=11") - depends_on("boost@1.67.0 cxxstd=14", type="build", when="@8.0.12:8.0.13 cxxstd=14") - depends_on("boost@1.67.0 cxxstd=17", type="build", when="@8.0.12:8.0.13 cxxstd=17") - # 8.0.11 - depends_on("boost@1.66.0 cxxstd=98", type="build", when="@8.0.11 cxxstd=98") - depends_on("boost@1.66.0 cxxstd=11", type="build", when="@8.0.11 cxxstd=11") - depends_on("boost@1.66.0 cxxstd=14", type="build", when="@8.0.11 cxxstd=14") - depends_on("boost@1.66.0 cxxstd=17", type="build", when="@8.0.11 cxxstd=17") - # 5.7.X - depends_on("boost@1.59.0 cxxstd=98", when="@5.7.0:5.7 cxxstd=98") - depends_on("boost@1.59.0 cxxstd=11", when="@5.7.0:5.7 cxxstd=11") - depends_on("boost@1.59.0 cxxstd=14", when="@5.7.0:5.7 cxxstd=14") - depends_on("boost@1.59.0 cxxstd=17", when="@5.7.0:5.7 cxxstd=17") - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants, when="@5.7:") + # Each version of MySQL requires a specific version of boost + # See BOOST_PACKAGE_NAME in cmake/boost.cmake + # 8.0.35 + depends_on("boost@1.77.0 cxxstd=17", type="build", when="@8.0.35 cxxstd=17") + # 8.0.29 + depends_on("boost@1.77.0 cxxstd=98", type="build", when="@8.0.29 cxxstd=98") + depends_on("boost@1.77.0 cxxstd=11", type="build", when="@8.0.29 cxxstd=11") + depends_on("boost@1.77.0 cxxstd=14", type="build", when="@8.0.29 cxxstd=14") + depends_on("boost@1.77.0 cxxstd=17", type="build", when="@8.0.29 cxxstd=17") + # 8.0.19 + depends_on("boost@1.70.0 cxxstd=98", type="build", when="@8.0.19 cxxstd=98") + depends_on("boost@1.70.0 cxxstd=11", type="build", when="@8.0.19 cxxstd=11") + depends_on("boost@1.70.0 cxxstd=14", type="build", when="@8.0.19 cxxstd=14") + depends_on("boost@1.70.0 cxxstd=17", type="build", when="@8.0.19 cxxstd=17") + # 8.0.16--8.0.18 + depends_on("boost@1.69.0 cxxstd=98", type="build", when="@8.0.16:8.0.18 cxxstd=98") + depends_on("boost@1.69.0 cxxstd=11", type="build", when="@8.0.16:8.0.18 cxxstd=11") + depends_on("boost@1.69.0 cxxstd=14", type="build", when="@8.0.16:8.0.18 cxxstd=14") + depends_on("boost@1.69.0 cxxstd=17", type="build", when="@8.0.16:8.0.18 cxxstd=17") + # 8.0.14--8.0.15 + depends_on("boost@1.68.0 cxxstd=98", type="build", when="@8.0.14:8.0.15 cxxstd=98") + depends_on("boost@1.68.0 cxxstd=11", type="build", when="@8.0.14:8.0.15 cxxstd=11") + depends_on("boost@1.68.0 cxxstd=14", type="build", when="@8.0.14:8.0.15 cxxstd=14") + depends_on("boost@1.68.0 cxxstd=17", type="build", when="@8.0.14:8.0.15 cxxstd=17") + # 8.0.12--8.0.13 + depends_on("boost@1.67.0 cxxstd=98", type="build", when="@8.0.12:8.0.13 cxxstd=98") + depends_on("boost@1.67.0 cxxstd=11", type="build", when="@8.0.12:8.0.13 cxxstd=11") + depends_on("boost@1.67.0 cxxstd=14", type="build", when="@8.0.12:8.0.13 cxxstd=14") + depends_on("boost@1.67.0 cxxstd=17", type="build", when="@8.0.12:8.0.13 cxxstd=17") + # 8.0.11 + depends_on("boost@1.66.0 cxxstd=98", type="build", when="@8.0.11 cxxstd=98") + depends_on("boost@1.66.0 cxxstd=11", type="build", when="@8.0.11 cxxstd=11") + depends_on("boost@1.66.0 cxxstd=14", type="build", when="@8.0.11 cxxstd=14") + depends_on("boost@1.66.0 cxxstd=17", type="build", when="@8.0.11 cxxstd=17") + # 5.7.X + depends_on("boost@1.59.0 cxxstd=98", when="@5.7.0:5.7 cxxstd=98") + depends_on("boost@1.59.0 cxxstd=11", when="@5.7.0:5.7 cxxstd=11") + depends_on("boost@1.59.0 cxxstd=14", when="@5.7.0:5.7 cxxstd=14") + depends_on("boost@1.59.0 cxxstd=17", when="@5.7.0:5.7 cxxstd=17") + + # TODO: replace this with an explicit list of components of Boost, + # for instance depends_on('boost +filesystem') + # See https://github.com/spack/spack/pull/22303 for reference + depends_on(Boost.with_default_variants, when="@5.7:") + + with when("@8.0.35:"): + depends_on("openssl@3:") + requires("cxxstd=17") + + depends_on("zstd", when="@8.0.18:") + + depends_on("patchelf", type="build") + depends_on("curl") + depends_on("zlib-api") + depends_on("libevent") + depends_on("lz4") depends_on("rpcsvc-proto") depends_on("ncurses") - depends_on("openssl") - depends_on("openssl@1", when="@:8.0.29") + depends_on("openssl@:2", when="@:8.0.29") depends_on("libtirpc", when="@5.7.0: platform=linux") depends_on("libedit", type=["build", "run"]) depends_on("perl", type=["build", "test"], when="@:7") @@ -163,21 +173,28 @@ def url_for_version(self, version): def cmake_args(self): spec = self.spec - options = [] - if "boost" in spec: - options.append("-DBOOST_ROOT={0}".format(spec["boost"].prefix)) - options.append("-DWITH_BOOST={0}".format(spec["boost"].prefix)) - if spec.satisfies("+download_boost"): - options.append( - "-DWITH_BOOST={0}".format(os.path.join(self.build_directory, "boostdir")) + options = [ + self.define("REPRODUCIBLE_BUILD", True), + self.define("WITH_CURL", spec["curl"].prefix), + self.define("WITH_EDITLINE", "system"), + self.define("WITH_LIBEVENT", "system"), + self.define("WITH_LZ4", "system"), + self.define("WITH_SSL", spec["openssl"].prefix), + self.define("WITH_ZLIB", "system"), + self.define_from_variant("WITHOUT_SERVER", "client_only"), + ] + + if spec.satisfies("@5.7:"): + options.extend( + [ + self.define("WITH_BOOST", spec["boost"].prefix), + self.define("LOCAL_BOOST_DIR", spec["boost"].prefix), + ] ) - options.append("-DDOWNLOAD_BOOST=1") - if "+client_only" in self.spec: - options.append("-DWITHOUT_SERVER:BOOL=ON") - options.append("-DWITH_EDITLINE=system") - options.append("-Dlibedit_INCLUDE_DIR={0}".format(spec["libedit"].prefix.include)) - options.append("-Dlibedit_LIBRARY={0}".format(spec["libedit"].libs.directories[0])) - options.append("-DFORCE_UNSUPPORTED_COMPILER=ON") + + if spec.satisfies("@8.0.18:"): + options.extend([self.define("WITH_ZSTD", "system")]) + return options def _fix_dtrace_shebang(self, env): @@ -211,5 +228,5 @@ def setup_build_environment(self, env): if int(cxxstd) > 14: env.append_flags("CXXFLAGS", "-Wno-error=register") - if "python" in self.spec.flat_dependencies() and self.spec.satisfies("@:7"): + if "python" in self.spec and self.spec.satisfies("@:7"): self._fix_dtrace_shebang(env) diff --git a/var/spack/repos/builtin/packages/mysqlpp/package.py b/var/spack/repos/builtin/packages/mysqlpp/package.py index e5c980b0db5731..cec4a6d4dc6076 100644 --- a/var/spack/repos/builtin/packages/mysqlpp/package.py +++ b/var/spack/repos/builtin/packages/mysqlpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/n2p2/package.py b/var/spack/repos/builtin/packages/n2p2/package.py index 3ef2c32ebfee0b..1c30e9841cf66b 100644 --- a/var/spack/repos/builtin/packages/n2p2/package.py +++ b/var/spack/repos/builtin/packages/n2p2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class N2p2(MakefilePackage): homepage = "https://github.com/CompPhysVienna/n2p2" url = "https://github.com/CompPhysVienna/n2p2/archive/v2.1.0.tar.gz" + license("GPL-3.0-only") + version("2.2.0", sha256="4acaa255632a7b9811d7530fd52ac7dd0bb3a8e3a3cf8512beadd29b62c1bfef") version("2.1.4", sha256="f1672c09af4ed16a7f396606977e4675a0fee98f04bfd9574907fba4b83a14ef") version("2.1.1", sha256="90fbc0756132984d0d7e6d92d2f53358c120e75f148910d90c027158163251b9") diff --git a/var/spack/repos/builtin/packages/nacos/package.py b/var/spack/repos/builtin/packages/nacos/package.py index f3fd35bd1f0171..a7bfe85221d98d 100644 --- a/var/spack/repos/builtin/packages/nacos/package.py +++ b/var/spack/repos/builtin/packages/nacos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Nacos(MavenPackage): homepage = "https://nacos.io/" url = "https://github.com/alibaba/nacos/archive/1.3.2.tar.gz" + license("Apache-2.0") + version("1.3.2", sha256="3d3fdbe4033a9861a26c807d319db7c93f15de6491ddda512f9e5e421c563734") diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index 1bc2c618e65cf7..eb437567ef34d5 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py index 9e1944f3627839..f60fd8ddbfe75a 100644 --- a/var/spack/repos/builtin/packages/nalu-wind/package.py +++ b/var/spack/repos/builtin/packages/nalu-wind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py index ee5a1348163dc3..0d3f3c9280db9d 100644 --- a/var/spack/repos/builtin/packages/nalu/package.py +++ b/var/spack/repos/builtin/packages/nalu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index c273da3dbe5d95..edcc002659de05 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py index 2a065478b8534f..3fd46110cb0f8c 100644 --- a/var/spack/repos/builtin/packages/nano/package.py +++ b/var/spack/repos/builtin/packages/nano/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nano(AutotoolsPackage): list_url = "https://www.nano-editor.org/dist/" list_depth = 1 + license("GPL-3.0-or-later") + # 7.x version("7.2", sha256="86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526") # 6.x diff --git a/var/spack/repos/builtin/packages/nanoflann/package.py b/var/spack/repos/builtin/packages/nanoflann/package.py index fa51558ec84d52..10e1d7aa164e47 100644 --- a/var/spack/repos/builtin/packages/nanoflann/package.py +++ b/var/spack/repos/builtin/packages/nanoflann/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Nanoflann(CMakePackage): homepage = "https://github.com/jlblancoc/nanoflann" url = "https://github.com/jlblancoc/nanoflann/archive/v1.2.3.tar.gz" + license("BSD-2-Clause") + version("1.4.3", sha256="cbcecf22bec528a8673a113ee9b0e134f91f1f96be57e913fa1f74e98e4449fa") version("1.2.3", sha256="5ef4dfb23872379fe9eb306aabd19c9df4cae852b72a923af01aea5e8d7a59c3") diff --git a/var/spack/repos/builtin/packages/nanomsg/package.py b/var/spack/repos/builtin/packages/nanomsg/package.py index eb3d8349550dfc..c28a6f69f84fb6 100644 --- a/var/spack/repos/builtin/packages/nanomsg/package.py +++ b/var/spack/repos/builtin/packages/nanomsg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nanomsg(CMakePackage): homepage = "https://nanomsg.org/" url = "https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz" + license("MIT") + version("1.2", sha256="6ef7282e833df6a364f3617692ef21e59d5c4878acea4f2d7d36e21c8858de67") version("1.1.5", sha256="218b31ae1534ab897cb5c419973603de9ca1a5f54df2e724ab4a188eb416df5a") version("1.0.0", sha256="24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7") diff --git a/var/spack/repos/builtin/packages/nanopb/package.py b/var/spack/repos/builtin/packages/nanopb/package.py index d50d877178194e..83c6daa425a125 100644 --- a/var/spack/repos/builtin/packages/nanopb/package.py +++ b/var/spack/repos/builtin/packages/nanopb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nanopb(CMakePackage): homepage = "https://jpa.kapsi.fi/nanopb/" url = "https://github.com/nanopb/nanopb/archive/0.3.9.1.tar.gz" + license("Zlib") + version("0.3.9.1", sha256="b22d1f86d4adb2aa0436a277c4a59a5adfc467cafeb9bf405c27ef136599bbb3") depends_on("protobuf", type=("build")) diff --git a/var/spack/repos/builtin/packages/nasm/package.py b/var/spack/repos/builtin/packages/nasm/package.py index 9fbd81c27f1a12..d3f2fad668d026 100644 --- a/var/spack/repos/builtin/packages/nasm/package.py +++ b/var/spack/repos/builtin/packages/nasm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Nasm(AutotoolsPackage, Package): build_system("autotools", conditional("generic", when="platform=windows"), default="autotools") + license("BSD-2-Clause") + version("2.15.05", sha256="9182a118244b058651c576baa9d0366ee05983c4d4ae1d9ddd3236a9f2304997") version("2.14.02", sha256="b34bae344a3f2ed93b2ca7bf25f1ed3fb12da89eeda6096e3551fd66adeae9fc") version("2.13.03", sha256="23e1b679d64024863e2991e5c166e19309f0fe58a9765622b35bd31be5b2cc99") diff --git a/var/spack/repos/builtin/packages/nauty/package.py b/var/spack/repos/builtin/packages/nauty/package.py index 6c6e54efe3a9b0..056eff96a1fb30 100644 --- a/var/spack/repos/builtin/packages/nauty/package.py +++ b/var/spack/repos/builtin/packages/nauty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nauty(AutotoolsPackage): homepage = "https://pallini.di.uniroma1.it/index.html" url = "https://pallini.di.uniroma1.it//nauty26r7.tar.gz" + license("Apache-2.0") + version("2.6r7", sha256="97b5648de17645895cbd56a9a0b3e23cf01f5332c476d013ea459f1a0363cdc6") # Debian/ Fedora patches for @2.6r7: diff --git a/var/spack/repos/builtin/packages/navi/package.py b/var/spack/repos/builtin/packages/navi/package.py index f5d257e1861813..6e39305abf5a47 100644 --- a/var/spack/repos/builtin/packages/navi/package.py +++ b/var/spack/repos/builtin/packages/navi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Navi(Package): maintainers("delucca") + license("Apache-2.0") + version("2.20.1", sha256="92644677dc46e13aa71b049c5946dede06a22064b3b1834f52944d50e3fdb950") depends_on("rust") diff --git a/var/spack/repos/builtin/packages/nbdkit/package.py b/var/spack/repos/builtin/packages/nbdkit/package.py index f9ec3ebb909894..0f748b9c9e6f70 100644 --- a/var/spack/repos/builtin/packages/nbdkit/package.py +++ b/var/spack/repos/builtin/packages/nbdkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nbdkit(AutotoolsPackage): homepage = "https://github.com/libguestfs/nbdkit" url = "https://github.com/libguestfs/nbdkit/archive/v1.23.7.tar.gz" + license("Ruby") + version("1.23.7", sha256="70909721f60f06abadfac8646b37f942ceeaf73ce88909ab48402175ae1b6391") version("1.23.6", sha256="5a62cbcc41143a90c204d4a48ebe13225f21776fbc4e8fe8ca59531bb1c751fc") version("1.23.5", sha256="d07aa309b7d6f088a491fbbe645f23d56cd6e68995c4b73fb5bb609fc6b0de53") diff --git a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py index 1140f2f796710c..1fb7379af0a128 100644 --- a/var/spack/repos/builtin/packages/ncbi-magicblast/package.py +++ b/var/spack/repos/builtin/packages/ncbi-magicblast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py index 880eda6f9639a7..228c5fc6f60eb7 100644 --- a/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py +++ b/var/spack/repos/builtin/packages/ncbi-rmblastn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py index cadaf37711edc8..2576cc2cafbf3e 100644 --- a/var/spack/repos/builtin/packages/ncbi-toolkit/package.py +++ b/var/spack/repos/builtin/packages/ncbi-toolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ncbi-vdb/package.py b/var/spack/repos/builtin/packages/ncbi-vdb/package.py index 1e5ac39ff0d1ae..88b213c72a474d 100644 --- a/var/spack/repos/builtin/packages/ncbi-vdb/package.py +++ b/var/spack/repos/builtin/packages/ncbi-vdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nccl-fastsocket/package.py b/var/spack/repos/builtin/packages/nccl-fastsocket/package.py index f25862b2ebd3f2..ab69fb4b4ba783 100644 --- a/var/spack/repos/builtin/packages/nccl-fastsocket/package.py +++ b/var/spack/repos/builtin/packages/nccl-fastsocket/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nccl-tests/package.py b/var/spack/repos/builtin/packages/nccl-tests/package.py index 3db8ef6822027c..4ec1d9ffdc3184 100644 --- a/var/spack/repos/builtin/packages/nccl-tests/package.py +++ b/var/spack/repos/builtin/packages/nccl-tests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index 51f10ca7eec3a7..1ddf803f881a57 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nccmp/package.py b/var/spack/repos/builtin/packages/nccmp/package.py index 8d5799c3baeae7..7204eaff96eb82 100644 --- a/var/spack/repos/builtin/packages/nccmp/package.py +++ b/var/spack/repos/builtin/packages/nccmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nccmp(CMakePackage): maintainers("ulmononian", "climbfuji") + license("GPL-2.0-only") + version("1.9.1.0", sha256="5aa8d6cbc54d26f77e3d0511690cfafa57514a4145f75e8cabce782126509c91") version("1.9.0.1", sha256="81e9753cf451afe8248d44c841e102349e07cde942b11d1f91b5f85feb622b99") version("1.8.9.0", sha256="da5d2b4dcd52aec96e7d96ba4d0e97efebbd40fe9e640535e5ee3d5cd082ae50") diff --git a/var/spack/repos/builtin/packages/ncdu/package.py b/var/spack/repos/builtin/packages/ncdu/package.py index 0ff3f8514b202e..392aaba487335b 100644 --- a/var/spack/repos/builtin/packages/ncdu/package.py +++ b/var/spack/repos/builtin/packages/ncdu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Ncdu(Package): homepage = "https://dev.yorhel.nl/ncdu" url = "https://dev.yorhel.nl/download/ncdu-1.11.tar.gz" + license("MIT") + version("1.18.1", sha256="7c0fa1eb29d85aaed4ba174164bdbb8f011b5c390d017c57d668fc7231332405") version("1.17", sha256="810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1") version("1.16", sha256="2b915752a183fae014b5e5b1f0a135b4b408de7488c716e325217c2513980fd4") diff --git a/var/spack/repos/builtin/packages/ncftp/package.py b/var/spack/repos/builtin/packages/ncftp/package.py index f3c5822f3d0ee9..5bf212a4e3cc38 100644 --- a/var/spack/repos/builtin/packages/ncftp/package.py +++ b/var/spack/repos/builtin/packages/ncftp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ncftp(AutotoolsPackage): homepage = "https://www.ncftp.com/" url = "ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.gz" + license("ClArtistic") + version("3.2.6", sha256="129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/ncio/package.py b/var/spack/repos/builtin/packages/ncio/package.py index 4615c5b21cf70c..9e5fa9fc869e55 100644 --- a/var/spack/repos/builtin/packages/ncio/package.py +++ b/var/spack/repos/builtin/packages/ncio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index f858ca68a6a714..143cd32359c77c 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Ncl(Package): maintainers("vanderwb") + license("Apache-2.0") + version("6.6.2", sha256="cad4ee47fbb744269146e64298f9efa206bc03e7b86671e9729d8986bb4bc30e") version("6.5.0", sha256="133446f3302eddf237db56bf349e1ebf228240a7320699acc339a3d7ee414591") version("6.4.0", sha256="0962ae1a1d716b182b3b27069b4afe66bf436c64c312ddfcf5f34d4ec60153c8") diff --git a/var/spack/repos/builtin/packages/nco/nco-5_1_6-intel-omp.patch b/var/spack/repos/builtin/packages/nco/nco-5_1_6-intel-omp.patch new file mode 100644 index 00000000000000..11457c54929958 --- /dev/null +++ b/var/spack/repos/builtin/packages/nco/nco-5_1_6-intel-omp.patch @@ -0,0 +1,11 @@ +--- a/src/nco/nco_rgr.c 2024-01-30 20:04:17.000000000 -0700 ++++ b/src/nco/nco_rgr.c 2024-01-30 20:11:10.000000000 -0700 +@@ -3319,7 +3319,7 @@ + # endif /* 900 */ + #endif /* !__GNUC__ */ + #if defined( __INTEL_COMPILER) +-# pragma omp parallel for default(none) firstprivate(has_ilev,has_lev,has_tm,var_val_dbl_in,var_val_dbl_out) private(dmn_cnt_in,dmn_cnt_out,dmn_id_in,dmn_id_out,dmn_idx,dmn_nbr_in,dmn_nbr_out,dmn_nbr_max,dmn_nm,dmn_srt,grd_idx,has_mss_val,idx_fst_in,idx_fst_out,idx_in,idx_out,idx_tbl,in_id,lrv_idx,lrv_nbr,lvl_idx_in,lvl_idx_out,lvl_nbr_in,lvl_nbr_out,mrv_nbr_in,mrv_nbr_out,mss_val_cmp_dbl,mss_val_dbl,ncr_idx_in,ncr_idx_out,prs_ntp_in,prs_ntp_out,rcd,thr_idx,trv,var_id_in,var_id_out,var_nm,var_sz_in,var_sz_out,var_typ_out,var_typ_rgr) shared(dmn_id_ilev_in,dmn_id_ilev_out,dmn_id_lev_in,dmn_id_lev_out,dmn_id_tm_in,flg_hrz_mrv,flg_ntp_log,flg_vrt_tm,fnc_nm,grd_nbr,idx_dbg,ilev_nbr_in,ilev_nbr_out,lev_nbr_in,lev_nbr_out,out_id,mlc_in,mlc_out,prs_mdp_in,prs_mdp_out,prs_ntf_in,prs_ntf_out,tm_idx,xtr_mth) ++# pragma omp parallel for default(none) firstprivate(has_ilev,has_lev,has_tm,var_val_dbl_in,var_val_dbl_out) private(dmn_cnt_in,dmn_cnt_out,dmn_id_in,dmn_id_out,dmn_idx,dmn_nbr_in,dmn_nbr_out,dmn_nbr_max,dmn_nm,dmn_srt,grd_idx,has_mss_val,idx_fst_in,idx_fst_out,idx_in,idx_out,idx_tbl,in_id,lrv_idx,lrv_nbr,lvl_idx_in,lvl_idx_out,lvl_nbr_in,lvl_nbr_out,mrv_nbr_in,mrv_nbr_out,mss_val_cmp_dbl,mss_val_dbl,ncr_idx_in,ncr_idx_out,prs_ntp_in,prs_ntp_out,rcd,thr_idx,trv,var_id_in,var_id_out,var_nm,var_sz_in,var_sz_out,var_typ_out,var_typ_rgr) shared(dmn_id_ilev_in,dmn_id_ilev_out,dmn_id_lev_in,dmn_id_lev_out,dmn_id_tm_in,flg_hrz_mrv,flg_ntp_log,flg_vrt_tm,fnc_nm,grd_nbr,idx_dbg,ilev_nbr_in,ilev_nbr_out,lev_nbr_in,lev_nbr_out,out_id,mlc_in,mlc_out,prs_mdp_in,prs_mdp_out,prs_ntf_in,prs_ntf_out,tm_idx,xtr_mth,grd_sz_in) + #else /* !__INTEL_COMPILER */ + # ifdef GXX_OLD_OPENMP_SHARED_TREATMENT + # pragma omp parallel for default(none) firstprivate(has_ilev,has_lev,has_tm,var_val_dbl_in,var_val_dbl_out) private(dmn_cnt_in,dmn_cnt_out,dmn_id_in,dmn_id_out,dmn_idx,dmn_nbr_in,dmn_nbr_out,dmn_nbr_max,dmn_nm,dmn_srt,grd_idx,has_mss_val,idx_fst_in,idx_fst_out,idx_in,idx_out,idx_tbl,in_id,lrv_idx,lrv_nbr,lvl_idx_in,lvl_idx_out,lvl_nbr_in,lvl_nbr_out,mrv_nbr_in,mrv_nbr_out,mss_val_cmp_dbl,mss_val_dbl,ncr_idx_in,ncr_idx_out,prs_ntp_in,prs_ntp_out,rcd,thr_idx,trv,var_id_in,var_id_out,var_nm,var_sz_in,var_sz_out,var_typ_out,var_typ_rgr) shared(dmn_id_ilev_in,dmn_id_ilev_out,dmn_id_lev_in,dmn_id_lev_out,dmn_id_tm_in,flg_hrz_mrv,flg_ntp_log,flg_vrt_tm,fnc_nm,grd_nbr,idx_dbg,ilev_nbr_in,ilev_nbr_out,lev_nbr_in,lev_nbr_out,out_id,mlc_in,mlc_out,prs_mdp_in,prs_mdp_out,prs_ntf_in,prs_ntf_out,tm_idx,xtr_mth) diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index d20a4255f6b137..e67c2bfb9d5ce4 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nco(AutotoolsPackage): homepage = "http://nco.sourceforge.net/" url = "https://github.com/nco/nco/archive/5.0.1.tar.gz" + license("BSD-3-Clause") + version("5.1.6", sha256="6b217156cb14f670c80d5de5c5b88905cdb281f6e239e83397f14eaf3d0b390b") version("5.1.5", sha256="6a35c2d45744b427a424896d32066e483c0a49a46dba83ba90f2cc5ed3dca869") version("5.1.4", sha256="4b1ec67b795b985990620be7b7422ecae6da77f5ec93e4407b799f0220dffc88") @@ -41,6 +43,9 @@ class Nco(AutotoolsPackage): # https://github.com/nco/nco/issues/244 patch("nco-5_0_1-intel-omp.patch", when="@5.0.1 %intel") + # Similar but not the same as above + patch("nco-5_1_6-intel-omp.patch", when="@5.1.6 %intel") + variant("doc", default=False, description="Build/install NCO TexInfo-based documentation") # See "Compilation Requirements" at: @@ -56,6 +61,9 @@ class Nco(AutotoolsPackage): conflicts("%gcc@9:", when="@:4.7.8") + # Only patched 5.0.1 and 5.1.6 for Intel + conflicts("%intel", when="@5.0.2:5.1.5") + def configure_args(self): config_args = [] config_args.extend(self.enable_or_disable("doc")) diff --git a/var/spack/repos/builtin/packages/ncompress/package.py b/var/spack/repos/builtin/packages/ncompress/package.py index 0d162a433c5572..3d5bc1a3473df1 100644 --- a/var/spack/repos/builtin/packages/ncompress/package.py +++ b/var/spack/repos/builtin/packages/ncompress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ncompress(MakefilePackage): homepage = "https://vapier.github.io/ncompress/" url = "https://github.com/vapier/ncompress/archive/v4.2.4.6.tar.gz" + license("Unlicense") + version("4.2.4.6", sha256="112acfc76382e7b631d6cfc8e6ff9c8fd5b3677e5d49d3d9f1657bc15ad13d13") version("4.2.4.5", sha256="2b532f02569e5557e1ed9cbe95c8db0e347a029517d3a50b906119808a996433") diff --git a/var/spack/repos/builtin/packages/ncurses/package.py b/var/spack/repos/builtin/packages/ncurses/package.py index b6d6ed85f63cb2..b7d3ff3d449be9 100644 --- a/var/spack/repos/builtin/packages/ncurses/package.py +++ b/var/spack/repos/builtin/packages/ncurses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Ncurses(AutotoolsPackage, GNUMirrorPackage): executables = [r"^ncursesw?(?:\d+(?:\.\d+)*)?-config$"] + license("X11") + version("6.4", sha256="6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159") version("6.3", sha256="97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059") version("6.2", sha256="30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d") diff --git a/var/spack/repos/builtin/packages/ncview/package.py b/var/spack/repos/builtin/packages/ncview/package.py index 4af51198c6fe37..07576d45522ec8 100644 --- a/var/spack/repos/builtin/packages/ncview/package.py +++ b/var/spack/repos/builtin/packages/ncview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ncview(AutotoolsPackage): homepage = "https://cirrus.ucsd.edu/ncview/" + license("GPL-3.0-only") + version("2.1.9", sha256="e2317ac094af62f0adcf68421d70658209436aae344640959ec8975a645891af") version("2.1.8", sha256="e8badc507b9b774801288d1c2d59eb79ab31b004df4858d0674ed0d87dfc91be") version("2.1.7", sha256="a14c2dddac0fc78dad9e4e7e35e2119562589738f4ded55ff6e0eca04d682c82") @@ -45,9 +47,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): diff --git a/var/spack/repos/builtin/packages/ndiff/package.py b/var/spack/repos/builtin/packages/ndiff/package.py index 6ae3ab960e4748..41b7dbd4a565e8 100644 --- a/var/spack/repos/builtin/packages/ndiff/package.py +++ b/var/spack/repos/builtin/packages/ndiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Ndiff(Package): homepage = "https://ftp.math.utah.edu/pub/ndiff/" url = "https://ftp.math.utah.edu/pub/ndiff/ndiff-2.00.tar.gz" + license("GPL-2.0-only") + version("2.00", sha256="f2bbd9a2c8ada7f4161b5e76ac5ebf9a2862cab099933167fe604b88f000ec2c") version("1.00", sha256="d4be3ab38e4b87da8d689fe47413e01a7bfdf8c8627bfb673aac37953a463a92") diff --git a/var/spack/repos/builtin/packages/ndzip/package.py b/var/spack/repos/builtin/packages/ndzip/package.py index 4715493c04199f..867cb373dcfd04 100644 --- a/var/spack/repos/builtin/packages/ndzip/package.py +++ b/var/spack/repos/builtin/packages/ndzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Ndzip(CMakePackage, CudaPackage): maintainers("robertu94") + license("MIT") + version("master", branch="master") version("2021-11-30", commit="5b3c34991005c0924a339f2ec06750729ebbf015") diff --git a/var/spack/repos/builtin/packages/neartree/package.py b/var/spack/repos/builtin/packages/neartree/package.py index e2ea68177f5a59..a898593b6a1a42 100644 --- a/var/spack/repos/builtin/packages/neartree/package.py +++ b/var/spack/repos/builtin/packages/neartree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Neartree(MakefilePackage): homepage = "http://neartree.sourceforge.net/" url = "https://downloads.sourceforge.net/project/neartree/neartree/NearTree-3.1/NearTree-3.1.tar.gz" + license("LGPL-2.1-or-later") + version("3.1", sha256="07b668516f15a7c13c219fd005b14e73bced5dc6b23857edcc24d3e5cf0d3be3") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py index 7d5284a5162ba0..2936177d7246e4 100644 --- a/var/spack/repos/builtin/packages/nek5000/package.py +++ b/var/spack/repos/builtin/packages/nek5000/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py index c0e09cbd4c94ae..23a494119d2c62 100644 --- a/var/spack/repos/builtin/packages/nekbone/package.py +++ b/var/spack/repos/builtin/packages/nekbone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Nekbone(Package): tags = ["proxy-app", "ecp-proxy-app"] + license("mpich2") + version("develop", branch="master") version( "17.0", diff --git a/var/spack/repos/builtin/packages/nekcem/package.py b/var/spack/repos/builtin/packages/nekcem/package.py index d34172592291fd..76fae8fd6cd5ad 100644 --- a/var/spack/repos/builtin/packages/nekcem/package.py +++ b/var/spack/repos/builtin/packages/nekcem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/neko/package.py b/var/spack/repos/builtin/packages/neko/package.py index 5023660db3bf9f..3eab17ecabc564 100644 --- a/var/spack/repos/builtin/packages/neko/package.py +++ b/var/spack/repos/builtin/packages/neko/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class Neko(AutotoolsPackage, CudaPackage, ROCmPackage): url = "https://github.com/ExtremeFLOW/neko/releases/download/v0.3.2/neko-0.3.2.tar.gz" maintainers("njansson") + version("0.7.2", sha256="5dd17fbae83d0b26dc46fafce4e5444be679cdce9493cef4ff7d504e2f854254") + version("0.7.1", sha256="c935c3d93b0975db46448045f97aced6ac2cab31a2b8803047f8086f98dcb981") + version("0.7.0", sha256="fe871e0a79f388073e0b3dc191d1c0d5da3a53883f5b1951d88b9423fc79a53c") version("0.6.1", sha256="6282baaf9c8a201669e274cba23c37922f7ad701ba20ef086442e48f00dabf29") version("0.6.0", sha256="ce37c7cea1a7bf1bf554c5717aa7fed35bbd079ff68c2fc9d3529facc717e31a") version("0.5.2", sha256="8873f5ada106f92f21c9bb13ea8164550bccde9301589b9e7f1c1a82a2efe2b8") @@ -30,6 +33,14 @@ class Neko(AutotoolsPackage, CudaPackage, ROCmPackage): variant("xsmm", default=False, description="Build with support for libxsmm") variant("gslib", default=False, when="@develop", description="Build with support for gslib") + # Requires cuda or rocm enabled MPI + variant( + "device-mpi", + default=False, + when="@0.4.0:", + description="Build with support for device-aware MPI", + ) + depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") @@ -41,6 +52,7 @@ class Neko(AutotoolsPackage, CudaPackage, ROCmPackage): depends_on("blas") depends_on("lapack") depends_on("json-fortran", when="@develop") + depends_on("json-fortran", when="@0.7.0:") depends_on("gslib", when="+gslib") def configure_args(self): @@ -54,5 +66,17 @@ def configure_args(self): args += self.with_or_without("cuda", activation_value="prefix") rocm_fn = lambda x: self.spec["hip"].prefix args += self.with_or_without("hip", variant="rocm", activation_value=rocm_fn) + args += self.enable_or_disable("device-mpi", variant="device-mpi") + + if self.spec.satisfies("+cuda"): + cuda_arch_list = self.spec.variants["cuda_arch"].value + cuda_arch = cuda_arch_list[0] + if cuda_arch != "none": + args.append(f"CUDA_ARCH=-arch=sm_{cuda_arch}") + if self.spec.satisfies("+rocm"): + rocm_arch_list = self.spec.variants["amdgpu_target"].value + rocm_arch = rocm_arch_list[0] + if rocm_arch != "none": + args.append(f"HIP_HIPCC_FLAGS=-O3 --offload-arch={rocm_arch}") return args diff --git a/var/spack/repos/builtin/packages/nekrs/package.py b/var/spack/repos/builtin/packages/nekrs/package.py index 5e109b3880323a..d3c9c41b74650f 100644 --- a/var/spack/repos/builtin/packages/nekrs/package.py +++ b/var/spack/repos/builtin/packages/nekrs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class Nekrs(Package, CudaPackage, ROCmPackage): maintainers("thilinarmtb", "stgeke") + license("BSD-3-Clause") + version("21.0", tag="v21.0", commit="bcd890bf3f9fb4d91224c83aeda75c33570f1eaa") variant("opencl", default=False, description="Activates support for OpenCL") diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py index a85ba39aae9dba..a236bd5c4e9391 100644 --- a/var/spack/repos/builtin/packages/nektar/package.py +++ b/var/spack/repos/builtin/packages/nektar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nektools/package.py b/var/spack/repos/builtin/packages/nektools/package.py index a1ecb8d6bec50f..125b3838f35a3e 100644 --- a/var/spack/repos/builtin/packages/nektools/package.py +++ b/var/spack/repos/builtin/packages/nektools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nemsio/package.py b/var/spack/repos/builtin/packages/nemsio/package.py index 713ddba6e5f5d4..dbd52cab92caac 100644 --- a/var/spack/repos/builtin/packages/nemsio/package.py +++ b/var/spack/repos/builtin/packages/nemsio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nemsiogfs/package.py b/var/spack/repos/builtin/packages/nemsiogfs/package.py index e01e7e808f8d26..4d2e538ba430bc 100644 --- a/var/spack/repos/builtin/packages/nemsiogfs/package.py +++ b/var/spack/repos/builtin/packages/nemsiogfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/neo4j/package.py b/var/spack/repos/builtin/packages/neo4j/package.py index ce209e4cedbe6a..68852cbeb6022f 100644 --- a/var/spack/repos/builtin/packages/neo4j/package.py +++ b/var/spack/repos/builtin/packages/neo4j/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Neo4j(MavenPackage): homepage = "https://neo4j.com/" url = "https://github.com/neo4j/neo4j/archive/4.0.3.tar.gz" + license("GPL-3.0-or-later") + version("4.0.3", sha256="19d79052657665dd661bbe906b3552b88108bf379d39fa007b883fff718cabee") version("4.0.1", sha256="3f91f566e49000119c6a71d6127e73cfccdee37b68133a067b2ee05932c26dba") version("4.0.0", sha256="7173b97baf53be82b46f95fa52f99af591606a318e03915917ddd7141936fec5") diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index ff59c4f539f0f2..3f9bbfc00daa63 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Neovim(CMakePackage): maintainers("albestro", "trws") + license("Apache-2.0 AND Vim") + version("master", branch="master") version("stable", tag="stable", commit="d772f697a281ce9c58bf933997b87c7f27428a60") version("0.9.4", sha256="148356027ee8d586adebb6513a94d76accc79da9597109ace5c445b09d383093") diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py index 11c85bde724ed2..a664749bc67fa6 100644 --- a/var/spack/repos/builtin/packages/nest/package.py +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nest(CMakePackage): url = "https://github.com/nest/nest-simulator/archive/refs/tags/v3.0.tar.gz" git = "https://github.com/nest/nest-simulator.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("3.0", sha256="d481ea67f3251fe3aadf5252ab0a999172f0cd5536c5985366d271d772e686e6") version("2.20.1", sha256="df3d32b5899d5d444f708037b290f889ac6ff8eae6b7be9e9faee2c0d660d8e5") diff --git a/var/spack/repos/builtin/packages/net-snmp/package.py b/var/spack/repos/builtin/packages/net-snmp/package.py index 11a710b22fceb6..d3573406542d33 100644 --- a/var/spack/repos/builtin/packages/net-snmp/package.py +++ b/var/spack/repos/builtin/packages/net-snmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class NetSnmp(AutotoolsPackage): homepage = "http://www.net-snmp.org/" url = "https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.1/net-snmp-5.9.1.tar.gz/download" + license("Net-SNMP") + version("5.9.1", sha256="eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f") version("5.9", sha256="04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071") diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index f111264e811725..fcde80a296bcca 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class NetcdfC(CMakePackage, AutotoolsPackage): maintainers("skosukhin", "WardF") + license("BSD-3-Clause") + version("main", branch="main") version("4.9.2", sha256="bc104d101278c68b303359b3dc4192f81592ae8640f1aee486921138f7f88cb7") version("4.9.0", sha256="9f4cb864f3ab54adb75409984c6202323d2fc66c003e5308f3cdf224ed41c0a6") @@ -441,7 +443,7 @@ def configure_args(self): if "~shared" in hdf5: if "+szip" in hdf5: extra_libs.append(hdf5["szip"].libs) - extra_libs.append(hdf5["zlib"].libs) + extra_libs.append(hdf5["zlib-api"].libs) if self.spec.satisfies("@4.9.0:+shared"): lib_search_dirs.extend(self.spec["zlib-api"].libs.directories) diff --git a/var/spack/repos/builtin/packages/netcdf-cxx/package.py b/var/spack/repos/builtin/packages/netcdf-cxx/package.py index 0ae2f69cb40468..876e85b30be43e 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class NetcdfCxx(AutotoolsPackage): homepage = "https://www.unidata.ucar.edu/software/netcdf" url = "https://downloads.unidata.ucar.edu/netcdf-cxx/4.2/netcdf-cxx-4.2.tar.gz" + license("NetCDF") + version("4.2", sha256="95ed6ab49a0ee001255eac4e44aacb5ca4ea96ba850c08337a3e4c9a0872ccd1") depends_on("netcdf-c") diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py index e84d581ba83b0b..a24a031732d1bc 100644 --- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py +++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class NetcdfCxx4(AutotoolsPackage): maintainers("WardF") + license("Apache-2.0") + version("4.3.1", sha256="6a1189a181eed043b5859e15d5c080c30d0e107406fbb212c8fb9814e90f3445") version("4.3.0", sha256="e34fbc6aba243ec82c23e9ee99db2430555ada849c54c1f3ab081b0ddd0f5f30") diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py index 4ea183ee8071bb..e124c4fe64e309 100644 --- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py +++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class NetcdfFortran(AutotoolsPackage): maintainers("skosukhin", "WardF") + license("Apache-2.0") + version("4.6.1", sha256="b50b0c72b8b16b140201a020936aa8aeda5c79cf265c55160986cd637807a37a") version("4.6.0", sha256="198bff6534cc85a121adc9e12f1c4bc53406c403bda331775a1291509e7b2f23") version("4.5.4", sha256="0a19b26a2b6e29fab5d29d7d7e08c24e87712d09a5cafeea90e16e0a2ab86b81") diff --git a/var/spack/repos/builtin/packages/netcdf95/package.py b/var/spack/repos/builtin/packages/netcdf95/package.py index 2a5b43c71ed5fa..52a03c2b63a6aa 100644 --- a/var/spack/repos/builtin/packages/netcdf95/package.py +++ b/var/spack/repos/builtin/packages/netcdf95/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Netcdf95(CMakePackage): maintainers("RemiLacroix-IDRIS") + license("GPL-3.0-only") + version("0.3", tag="v0.3", commit="5b8db6bb66a22b6a080589ee1c11521ee3cae550", submodules=True) depends_on("netcdf-fortran") diff --git a/var/spack/repos/builtin/packages/netdata/package.py b/var/spack/repos/builtin/packages/netdata/package.py index 8395b518dd30c2..db657b7b64a0ef 100644 --- a/var/spack/repos/builtin/packages/netdata/package.py +++ b/var/spack/repos/builtin/packages/netdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Netdata(AutotoolsPackage): homepage = "https://www.netdata.cloud/" url = "https://github.com/netdata/netdata/releases/download/v1.30.1/netdata-v1.30.1.tar.gz" + license("GPL-3.0-or-later") + version("1.38.1", sha256="e32a5427f0c00550210dbbf0046c2621313955256edf836db686e2bc270b8d10") version("1.31.0", sha256="ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f") version("1.30.1", sha256="3df188ac04f17094cb929e2990841ba77f68aa6af484e0509b99db298fa206c9") diff --git a/var/spack/repos/builtin/packages/netgauge/package.py b/var/spack/repos/builtin/packages/netgauge/package.py index cf1979113dcbf3..692ce5af1b5ceb 100644 --- a/var/spack/repos/builtin/packages/netgauge/package.py +++ b/var/spack/repos/builtin/packages/netgauge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Netgauge(AutotoolsPackage): homepage = "http://unixer.de/research/netgauge/" url = "http://unixer.de/research/netgauge/netgauge-2.4.6.tar.gz" + license("BSD-3-Clause-Open-MPI") + version("2.4.6", sha256="dc9398e4e042efec70881f2c7074ff18cc5b74bc5ffc4b8a4aaf813b39f83444") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/netgen/package.py b/var/spack/repos/builtin/packages/netgen/package.py index 1c890ef079067f..4430a2530906ed 100644 --- a/var/spack/repos/builtin/packages/netgen/package.py +++ b/var/spack/repos/builtin/packages/netgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/netkit-ftp/package.py b/var/spack/repos/builtin/packages/netkit-ftp/package.py index 71b38145bda667..beb565e4f123e2 100644 --- a/var/spack/repos/builtin/packages/netkit-ftp/package.py +++ b/var/spack/repos/builtin/packages/netkit-ftp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class NetkitFtp(AutotoolsPackage): homepage = "http://ftp.uk.linux.org/pub/linux/Networking/netkit" git = "https://github.com/mmaraya/netkit-ftp.git" + license("BSD-4-Clause-UC") + version("master", branch="master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 18d6b735aa2d78..2b6eb12fa19a61 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class NetlibLapack(CMakePackage): url = "https://www.netlib.org/lapack/lapack-3.5.0.tgz" tags = ["windows"] + license("BSD-3-Clause-Open-MPI") + version( "3.11.0", sha256="4b9ba79bfd4921ca820e83979db76ab3363155709444a787979e81c22285ffa9", diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index eeb1ea0a97f6c2..df3792b93bd70f 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -108,12 +108,16 @@ class NetlibScalapack(ScalapackBase): homepage = "https://www.netlib.org/scalapack/" url = "https://www.netlib.org/scalapack/scalapack-2.0.2.tgz" + git = "https://github.com/Reference-ScaLAPACK/scalapack" tags = ["e4s"] + license("BSD-3-Clause-Open-MPI") + version("2.2.0", sha256="40b9406c20735a9a3009d863318cb8d3e496fb073d201c5463df810e01ab2a57") version("2.1.0", sha256="61d9216cf81d246944720cfce96255878a3f85dec13b9351f1fa0fd6768220a6") version("2.0.2", sha256="0c74aeae690fe5ee4db7926f49c5d0bb69ce09eea75beb915e00bba07530395c") version("2.0.1", sha256="a9b34278d4e10b40cbe084c6d87d09af8845e874250719bfbbc497b2a88bfde1") version("2.0.0", sha256="e51fbd9c3ef3a0dbd81385b868e2355900148eea689bf915c5383d72daf73114") + version("master", branch="master") # versions before 2.0.0 are not using cmake and requires blacs as # a separated package diff --git a/var/spack/repos/builtin/packages/netlib-xblas/package.py b/var/spack/repos/builtin/packages/netlib-xblas/package.py index 224c3dd84e56cb..787fe900241ca6 100644 --- a/var/spack/repos/builtin/packages/netlib-xblas/package.py +++ b/var/spack/repos/builtin/packages/netlib-xblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class NetlibXblas(AutotoolsPackage): homepage = "https://www.netlib.org/xblas" url = "https://www.netlib.org/xblas/xblas.tar.gz" + license("BSD-3-Clause") + version("1.0.248", sha256="b5fe7c71c2da1ed9bcdc5784a12c5fa9fb417577513fe8a38de5de0007f7aaa1") variant("fortran", default=True, description="Build Fortran interfaces") diff --git a/var/spack/repos/builtin/packages/netpbm/package.py b/var/spack/repos/builtin/packages/netpbm/package.py index 18b77e64d963e6..320a414e2dc72a 100644 --- a/var/spack/repos/builtin/packages/netpbm/package.py +++ b/var/spack/repos/builtin/packages/netpbm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Netpbm(MakefilePackage): maintainers("cessenat") + license("IJG AND BSD-3-Clause AND GPL-2.0-only") + version("10.73.43", sha256="f9fd9a7f932258224d1925bfce61396a15e0fad93e3853d6324ac308d1adebf8") version("10.73.40", sha256="8542ae62aa744dfd52c8e425208f895f082955a0629ac1749f80278d6afc0344") version("10.73.35", sha256="628dbe8490bc43557813d1fedb2720dfdca0b80dd3f2364cb2a45c6ff04b0f18") diff --git a/var/spack/repos/builtin/packages/netperf/package.py b/var/spack/repos/builtin/packages/netperf/package.py index 21d418bd1a5950..ce320812fccaab 100644 --- a/var/spack/repos/builtin/packages/netperf/package.py +++ b/var/spack/repos/builtin/packages/netperf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index b00ad8938127e3..1ebcd3fc0d8d14 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nettle(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.lysator.liu.se/~nisse/nettle/" gnu_mirror_path = "nettle/nettle-3.3.tar.gz" + license("GPL-2.0-or-later OR LGPL-3.0-or-later") + version("3.9.1", sha256="ccfeff981b0ca71bbd6fbcb054f407c60ffb644389a5be80d6716d5b550c6ce3") version("3.8.1", sha256="364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe") version("3.4.1", sha256="f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad") @@ -24,6 +26,7 @@ class Nettle(AutotoolsPackage, GNUMirrorPackage): depends_on("gmp") depends_on("m4", type="build") + depends_on("openssl") def configure_args(self): return ["CFLAGS={0}".format(self.compiler.c99_flag)] diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index 2f388329b7a4fd..edad5ec9943fa3 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Neuron(CMakePackage): git = "https://github.com/neuronsimulator/nrn" maintainers("pramodk", "nrnhines", "iomaganaris", "alexsavulescu") + license("BSD-3-Clause") + version("develop", branch="master", submodules="True") version( "8.0.0", tag="8.0.0", commit="429d11ef34b1d860b3ddbfffc9f7960acb399b0c", submodules="True" @@ -84,9 +86,6 @@ def cmake_options(spec_options): if "~mpi" in spec and "+coreneuron" in spec: args.append("-DCORENRN_ENABLE_MPI=OFF") - if "+python" in spec: - args.append("-DPYTHON_EXECUTABLE:FILEPATH=" + spec["python"].command.path) - if spec.variants["build_type"].value == "Debug": args.append("-DCMAKE_C_FLAGS=-g -O0") args.append("-DCMAKE_CXX_FLAGS=-g -O0") diff --git a/var/spack/repos/builtin/packages/neve/package.py b/var/spack/repos/builtin/packages/neve/package.py index b061e08771170a..916ad5091d4ba2 100644 --- a/var/spack/repos/builtin/packages/neve/package.py +++ b/var/spack/repos/builtin/packages/neve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Neve(MakefilePackage): homepage = "https://github.com/ECP-ExaGraph" git = "https://github.com/ECP-ExaGraph/neve.git" + license("BSD-3-Clause") + version("master", branch="master") variant("openmp", default=True, description="Build with OpenMP support") diff --git a/var/spack/repos/builtin/packages/newt/package.py b/var/spack/repos/builtin/packages/newt/package.py index 5a73eba52b742e..b92803eba28996 100644 --- a/var/spack/repos/builtin/packages/newt/package.py +++ b/var/spack/repos/builtin/packages/newt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Newt(AutotoolsPackage): homepage = "https://pagure.io/newt" url = "https://pagure.io/releases/newt/newt-0.52.21.tar.gz" + license("LGPL-2.0-only") + version("0.52.21", sha256="265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31") version("0.52.20", sha256="8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc") version("0.52.19", sha256="08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80") diff --git a/var/spack/repos/builtin/packages/nextdenovo/package.py b/var/spack/repos/builtin/packages/nextdenovo/package.py index 51748f0e3a489d..fca9afd2ee70d5 100644 --- a/var/spack/repos/builtin/packages/nextdenovo/package.py +++ b/var/spack/repos/builtin/packages/nextdenovo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Nextdenovo(MakefilePackage): homepage = "https://nextdenovo.readthedocs.io/en/latest/index.html" url = "https://github.com/Nextomics/NextDenovo/archive/refs/tags/2.5.2.tar.gz" + license("GPL-3.0-only") + version("2.5.2", sha256="f1d07c9c362d850fd737c41e5b5be9d137b1ef3f1aec369dc73c637790611190") depends_on("python", type="run") diff --git a/var/spack/repos/builtin/packages/nextflow/package.py b/var/spack/repos/builtin/packages/nextflow/package.py index 379a3c9ba3307a..833f84aea580b6 100644 --- a/var/spack/repos/builtin/packages/nextflow/package.py +++ b/var/spack/repos/builtin/packages/nextflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nf-core-tools/package.py b/var/spack/repos/builtin/packages/nf-core-tools/package.py index e2667cb65bb7a6..1c5dd7efd5e371 100644 --- a/var/spack/repos/builtin/packages/nf-core-tools/package.py +++ b/var/spack/repos/builtin/packages/nf-core-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class NfCoreTools(PythonPackage): pypi = "nf-core/nf-core-2.7.1.tar.gz" maintainers("marcodelapierre") + license("MIT") + version("2.7.2", sha256="585be3908b9b93ee9263b99dd779818d48d51f6e7f44a42aa79e626617e7af48") version("2.7.1", sha256="90de62390314ef3141cee700667f017aa65c0346e40704a0f70d0662abcfb0db") version("2.6", sha256="47d4df906a60006249284bbf0bb84cdec48303a699c7c0d0a26f404a50e0811a") diff --git a/var/spack/repos/builtin/packages/nf-tower-agent/package.py b/var/spack/repos/builtin/packages/nf-tower-agent/package.py index b4343e1a1c3896..c3fa395cd3f9b3 100644 --- a/var/spack/repos/builtin/packages/nf-tower-agent/package.py +++ b/var/spack/repos/builtin/packages/nf-tower-agent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nf-tower-cli/package.py b/var/spack/repos/builtin/packages/nf-tower-cli/package.py index 6bf2bc4b719675..83b757e114145a 100644 --- a/var/spack/repos/builtin/packages/nf-tower-cli/package.py +++ b/var/spack/repos/builtin/packages/nf-tower-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nfft/package.py b/var/spack/repos/builtin/packages/nfft/package.py index 7d22701cf06c57..2e06a50a4538d6 100644 --- a/var/spack/repos/builtin/packages/nfft/package.py +++ b/var/spack/repos/builtin/packages/nfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nfft(AutotoolsPackage): homepage = "https://www-user.tu-chemnitz.de/~potts/nfft" url = "https://github.com/NFFT/nfft/releases/download/3.4.1/nfft-3.4.1.tar.gz" + license("GPL-2.0-or-later") + version("3.4.1", sha256="1cf6060eec0afabbbba323929d8222397a77fa8661ca74927932499db26b4aaf") version("3.3.2", sha256="9dcebd905a82c4f0a339d0d5e666b68c507169d9173b66d5ac588aae5d50b57c") version( diff --git a/var/spack/repos/builtin/packages/nfs-ganesha/package.py b/var/spack/repos/builtin/packages/nfs-ganesha/package.py index 872501a7586d9f..f5e0da3e6a401a 100644 --- a/var/spack/repos/builtin/packages/nfs-ganesha/package.py +++ b/var/spack/repos/builtin/packages/nfs-ganesha/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nfs-utils/package.py b/var/spack/repos/builtin/packages/nfs-utils/package.py index 7a1744f1475b2b..48c7d8c33d4fda 100644 --- a/var/spack/repos/builtin/packages/nfs-utils/package.py +++ b/var/spack/repos/builtin/packages/nfs-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class NfsUtils(AutotoolsPackage): homepage = "http://linux-nfs.org/" url = "https://sourceforge.net/projects/nfs/files/nfs-utils/2.4.2/nfs-utils-2.4.2.tar.gz/download" + license("GPL-2.0-only") + version("2.4.2", sha256="bb08106cd7bd397c6cc34e2461bc7818a664450d2805da08b07e1ced88e5155f") version("2.4.1", sha256="c0dda96318af554881f4eb1590bfe91f1aba2fba59ed2ac3ba099f80fdf838e9") version("2.3.4", sha256="36e70b0a583751ead0034ebe5d8826caf2dcc7ee7c0beefe94d6ee5a3b0b2484") diff --git a/var/spack/repos/builtin/packages/nghttp2/package.py b/var/spack/repos/builtin/packages/nghttp2/package.py index 2de551d8b5fa49..d973a232e639f2 100644 --- a/var/spack/repos/builtin/packages/nghttp2/package.py +++ b/var/spack/repos/builtin/packages/nghttp2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nghttp2(AutotoolsPackage): homepage = "https://nghttp2.org/" url = "https://github.com/nghttp2/nghttp2/releases/download/v1.26.0/nghttp2-1.26.0.tar.gz" + license("MIT") + version("1.57.0", sha256="1e3258453784d3b7e6cc48d0be087b168f8360b5d588c66bfeda05d07ad39ffd") version("1.52.0", sha256="9877caa62bd72dde1331da38ce039dadb049817a01c3bdee809da15b754771b8") version("1.51.0", sha256="2a0bef286f65b35c24250432e7ec042441a8157a5b93519412d9055169d9ce54") diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index efc1cf01084a12..2f41d3e1996983 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nginx(AutotoolsPackage): homepage = "https://nginx.org/en/" url = "https://nginx.org/download/nginx-1.12.0.tar.gz" + license("BSD-2-Clause") + version("1.24.0", sha256="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d") version("1.23.4", sha256="d43300e36bb249a7e6edc60bca1b0fc372a0bafce2f346d76acfb677a8790fc0") version("1.23.3", sha256="75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54") diff --git a/var/spack/repos/builtin/packages/ngmerge/package.py b/var/spack/repos/builtin/packages/ngmerge/package.py index 7a3cc8f403f61c..4114d071b977e9 100644 --- a/var/spack/repos/builtin/packages/ngmerge/package.py +++ b/var/spack/repos/builtin/packages/ngmerge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ngmerge(MakefilePackage): homepage = "https://github.com/jsh58/NGmerge" url = "https://github.com/jsh58/NGmerge/archive/v0.3.tar.gz" + license("MIT") + version("0.3", sha256="5928f727feebd0d1bcdbee0e631ba06fbe9ce88328bd58b6c8bf4e54cc742ac3") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/ngmlr/package.py b/var/spack/repos/builtin/packages/ngmlr/package.py index 278b7a0443e491..51e5197f6a721e 100644 --- a/var/spack/repos/builtin/packages/ngmlr/package.py +++ b/var/spack/repos/builtin/packages/ngmlr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ngmlr(CMakePackage): homepage = "https://github.com/philres/ngmlr" url = "https://github.com/philres/ngmlr/archive/v0.2.5.tar.gz" + license("MIT") + version("0.2.7", sha256="5126a6b3e726cac0da0713883daac688f38587f118428247a9a3ace5a55b29aa") version("0.2.5", sha256="719944a35cc7ff9c321eedbf3385a7375ce2301f609b3fd7be0a850cabbb028b") diff --git a/var/spack/repos/builtin/packages/ngspice/package.py b/var/spack/repos/builtin/packages/ngspice/package.py index 08bbbd712f49e5..91ef268bd34d90 100644 --- a/var/spack/repos/builtin/packages/ngspice/package.py +++ b/var/spack/repos/builtin/packages/ngspice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Ngspice(AutotoolsPackage): maintainers("aweits", "cessenat") + license("BSD-3-Clause") + # Master version by default adds the experimental adms feature version("master", branch="master") version("41", sha256="1ce219395d2f50c33eb223a1403f8318b168f1e6d1015a7db9dbf439408de8c4") @@ -55,8 +57,34 @@ class Ngspice(AutotoolsPackage): variant("fft", default=True, description="Use external fftw lib") variant("osdi", default=False, description="Use osdi/OpenVAF") - depends_on("fftw-api@3:~mpi~openmp", when="+fft~openmp") - depends_on("fftw-api@3:~mpi+openmp", when="+fft+openmp") + depends_on("fftw-api@3", when="+fft") + with when("+fft+openmp"): + depends_on("acfl threads=openmp", when="^[virtuals=fftw-api] acfl") + depends_on("amdfftw+openmp", when="^[virtuals=fftw-api] amdfftw") + depends_on("armpl-gcc threads=openmp", when="^[virtuals=fftw-api] armpl-gcc") + depends_on("cray-fftw+openmp", when="^[virtuals=fftw-api] cray-fftw") + depends_on("fftw+openmp", when="^[virtuals=fftw-api] fftw") + depends_on("fujitsu-fftw+openmp", when="^[virtuals=fftw-api] fujitsu-fftw") + depends_on("intel-mkl threads=openmp", when="^[virtuals=fftw-api] intel-mkl") + depends_on("intel-oneapi-mkl threads=openmp", when="^[virtuals=fftw-api] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio threads=openmp", + when="^[virtuals=fftw-api] intel-parallel-studio", + ) + + with when("+fft~openmp"): + depends_on("acfl threads=none", when="^[virtuals=fftw-api] acfl") + depends_on("amdfftw~openmp", when="^[virtuals=fftw-api] amdfftw") + depends_on("armpl-gcc threads=none", when="^[virtuals=fftw-api] armpl-gcc") + depends_on("cray-fftw~openmp", when="^[virtuals=fftw-api] cray-fftw") + depends_on("fftw~openmp", when="^[virtuals=fftw-api] fftw") + depends_on("fujitsu-fftw~openmp", when="^[virtuals=fftw-api] fujitsu-fftw") + depends_on("intel-mkl threads=none", when="^[virtuals=fftw-api] intel-mkl") + depends_on("intel-oneapi-mkl threads=none", when="^[virtuals=fftw-api] intel-oneapi-mkl") + depends_on( + "intel-parallel-studio threads=none", when="^[virtuals=fftw-api] intel-parallel-studio" + ) + depends_on("readline", when="+readline build=bin") # Needed for autoreconf: diff --git a/var/spack/repos/builtin/packages/nicstat/package.py b/var/spack/repos/builtin/packages/nicstat/package.py index b67d36d387d5e1..ef25505ae4ca7b 100644 --- a/var/spack/repos/builtin/packages/nicstat/package.py +++ b/var/spack/repos/builtin/packages/nicstat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nicstat(MakefilePackage, SourceforgePackage): homepage = "https://github.com/scotte/nicstat" sourceforge_mirror_path = "nicstat/nicstat-1.95.tar.gz" + license("Artistic-2.0") + version("1.95", sha256="c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/nim/package.py b/var/spack/repos/builtin/packages/nim/package.py index 589877be213eba..a00495a2eed458 100644 --- a/var/spack/repos/builtin/packages/nim/package.py +++ b/var/spack/repos/builtin/packages/nim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nim(Package): homepage = "https://nim-lang.org/" url = "https://nim-lang.org/download/nim-1.4.4.tar.xz" + license("MIT") + version("1.9.3", sha256="d8de7515db767f853d9b44730f88ee113bfe9c38dcccd5afabc773e2e13bf87c") version("1.4.4", sha256="6d73729def143f72fc2491ca937a9cab86d2a8243bd845a5d1403169ad20660e") version("1.4.2", sha256="03a47583777dd81380a3407aa6a788c9aa8a67df4821025770c9ac4186291161") diff --git a/var/spack/repos/builtin/packages/nimrod-aai/package.py b/var/spack/repos/builtin/packages/nimrod-aai/package.py index 1ad7101e1a918c..280173bfca82c0 100644 --- a/var/spack/repos/builtin/packages/nimrod-aai/package.py +++ b/var/spack/repos/builtin/packages/nimrod-aai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index ae58406c3f85e5..9cc2cbeb4164ff 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class NinjaFortran(Package): homepage = "https://github.com/Kitware/ninja" url = "https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz" + license("Apache-2.0") + # Each version is a fork off of a specific commit of ninja # Hashes don't sort properly, so added "artificial" tweak-level version # number prior to the hashes for sorting puposes diff --git a/var/spack/repos/builtin/packages/ninja-phylogeny/package.py b/var/spack/repos/builtin/packages/ninja-phylogeny/package.py index bfbe660a553822..f6251cf54e82a3 100644 --- a/var/spack/repos/builtin/packages/ninja-phylogeny/package.py +++ b/var/spack/repos/builtin/packages/ninja-phylogeny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class NinjaPhylogeny(MakefilePackage): maintainers("snehring") + license("MIT") + version("0.98", sha256="55675e1a9d51eddb3decc9a7570b6bcddb12e8a922cf1ca0a1ea43995793c9db") build_directory = "NINJA" diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index bb30e4fbbd8752..5d9e7af81d34ba 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Ninja(Package): executables = ["^ninja$"] + license("Apache-2.0") + version("kitware", branch="features-for-fortran", git="https://github.com/Kitware/ninja.git") version("master", branch="master") version("1.11.1", sha256="31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea") diff --git a/var/spack/repos/builtin/packages/nix/package.py b/var/spack/repos/builtin/packages/nix/package.py index e54f13ed85a29e..22cf6727d4db57 100644 --- a/var/spack/repos/builtin/packages/nix/package.py +++ b/var/spack/repos/builtin/packages/nix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Nix(AutotoolsPackage): url = "https://github.com/NixOS/nix/archive/2.3.15.zip" maintainers("charmoniumq") + license("LGPL-2.1-or-later") + version("2.3.15", sha256="7bf04e47960e7895655ad40461f2cf8038b97e98165672db7a7ac1990fc77a22") version("2.2.1", sha256="b591664dd1b04a8f197407d445799ece41140a3117bcbdf8e3c5e94cd3f59854") version("2.1.3", sha256="80d0834f3e34b3e91bd20969733d8010b3e253517ea64bf12258c5f450f86425") diff --git a/var/spack/repos/builtin/packages/njet/package.py b/var/spack/repos/builtin/packages/njet/package.py index a9c0c936f5c9fa..d9f48c7dc04a3c 100644 --- a/var/spack/repos/builtin/packages/njet/package.py +++ b/var/spack/repos/builtin/packages/njet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Njet(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("2.1.1", sha256="3858ad37e84f3652711aa033819a6566352ecff04a1cb0189d6590af75b7bb56") version("2.0.0", sha256="a1f5c171b8aff3553d9dde24d3ced5479bdaeec67f4c90c70a846ee3449b40ea") diff --git a/var/spack/repos/builtin/packages/nlcglib/package.py b/var/spack/repos/builtin/packages/nlcglib/package.py index 5d899b17ed10a6..33836215182fd2 100644 --- a/var/spack/repos/builtin/packages/nlcglib/package.py +++ b/var/spack/repos/builtin/packages/nlcglib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Nlcglib(CMakePackage, CudaPackage, ROCmPackage): maintainers = ["simonpintarelli"] + license("BSD-3-Clause") + version("develop", branch="develop") version("master", branch="master") @@ -49,9 +51,12 @@ class Nlcglib(CMakePackage, CudaPackage, ROCmPackage): depends_on("rocblas") depends_on("rocsolver") - with when("+cuda"): - depends_on("kokkos+cuda+cuda_lambda+wrapper", when="%gcc") - depends_on("kokkos+cuda") + for arch in CudaPackage.cuda_arch_values: + depends_on( + f"kokkos+cuda+cuda_lambda+wrapper cuda_arch={arch}", + when=f"%gcc +cuda cuda_arch={arch}", + ) + depends_on(f"kokkos+cuda cuda_arch={arch}", when=f"+cuda cuda_arch={arch}") def cmake_args(self): options = [ diff --git a/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py b/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py index fe588c086b6998..9215ef37677703 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json-schema-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class NlohmannJsonSchemaValidator(CMakePackage): url = "https://github.com/pboettch/json-schema-validator/archive/2.1.0.tar.gz" git = "https://github.com/pboettch/json-schema-validator.git" + license("MIT") + version("master", branch="master") version("2.1.0", sha256="83f61d8112f485e0d3f1e72d51610ba3924b179926a8376aef3c038770faf202") version("2.0.0", sha256="ca8e4ca5a88c49ea52b5f5c2a08a293dbf02b2fc66cb8c09d4cce5810ee98b57") diff --git a/var/spack/repos/builtin/packages/nlohmann-json/package.py b/var/spack/repos/builtin/packages/nlohmann-json/package.py index 6d6d9f70e1eb77..219e73c87a80ac 100644 --- a/var/spack/repos/builtin/packages/nlohmann-json/package.py +++ b/var/spack/repos/builtin/packages/nlohmann-json/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class NlohmannJson(CMakePackage): url = "https://github.com/nlohmann/json/archive/v3.1.2.tar.gz" maintainers("ax3l") + license("MIT") + version("3.11.2", sha256="d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273") # v3.11.0 & v3.11.1 omitted; released with significant regressions version("3.10.5", sha256="5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4") diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py index 1a23dea3613747..cf49d5e26e61fb 100644 --- a/var/spack/repos/builtin/packages/nlopt/package.py +++ b/var/spack/repos/builtin/packages/nlopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nlopt(CMakePackage): url = "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" git = "https://github.com/stevengj/nlopt.git" + license("LGPL-2.1-or-later") + version("master", branch="master") version("2.7.0", sha256="b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f") @@ -51,16 +53,12 @@ def cmake_args(self): # Specify on command line to alter defaults: # eg: spack install nlopt@master +guile -octave +cxx - # Spack should locate python by default - but to point to a build - if "+python" in spec: - args.append("-DPYTHON_EXECUTABLE=%s" % spec["python"].command.path) - # On is default - if "-shared" in spec: + if "~shared" in spec: args.append("-DBUILD_SHARED_LIBS:Bool=OFF") # On is default - if "-octave" in spec: + if "~octave" in spec: args.append("-DNLOPT_OCTAVE:Bool=OFF") if "+cxx" in spec: diff --git a/var/spack/repos/builtin/packages/nmap/package.py b/var/spack/repos/builtin/packages/nmap/package.py index 3eacd0343cfefd..47ef9de535c939 100644 --- a/var/spack/repos/builtin/packages/nmap/package.py +++ b/var/spack/repos/builtin/packages/nmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Nmap(AutotoolsPackage): url = "https://nmap.org/dist/nmap-7.70.tar.bz2" list_url = "https://nmap.org/dist-old/" + license("custom") + version("7.93", sha256="55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651") version("7.92", sha256="a5479f2f8a6b0b2516767d2f7189c386c1dc858d997167d7ec5cfc798c7571a1") version("7.91", sha256="18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300") diff --git a/var/spack/repos/builtin/packages/nn-c/package.py b/var/spack/repos/builtin/packages/nn-c/package.py index 7392fddf3d0241..d66c061de2b60f 100644 --- a/var/spack/repos/builtin/packages/nn-c/package.py +++ b/var/spack/repos/builtin/packages/nn-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nnpack/package.py b/var/spack/repos/builtin/packages/nnpack/package.py index 0a63404f7f1c66..36110c6f4ffe42 100644 --- a/var/spack/repos/builtin/packages/nnpack/package.py +++ b/var/spack/repos/builtin/packages/nnpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index 20e8d902d61133..ca57d8aa199a00 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Nnvm(CMakePackage): homepage = "https://github.com/dmlc/nnvm" git = "https://github.com/dmlc/nnvm.git" + license("Apache-2.0") + version("master", branch="master") version("20170418", commit="b279286304ac954098d94a2695bca599e832effb") diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 160913b33a36d8..744304f4660afd 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class NodeJs(Package): maintainers("cosmicexplorer") + license("Unicode-TOU") + # Current (latest features) - odd major number version("19.2.0", sha256="aac9d1a366fb57d68f4639f9204d1de5d6387656959a97ed929a5ba9e62c033a") version("15.3.0", sha256="cadfa384a5f14591b84ce07a1afe529f28deb0d43366fb0ae4e78afba96bfaf2") @@ -37,10 +39,6 @@ class NodeJs(Package): version("14.15.1", sha256="a1120472bf55aea745287693a6651e16973e1008c9d6107df350126adf9716fe") version("14.13.0", sha256="8538b2e76aa06ee0e6eb1c118426c3c5ca53b2e49d66591738eacf76e89edd61") version("14.10.0", sha256="7e0d7a1aa23697415e3588a1ca4f1c47496e6c88b9cf37c66be90353d3e4ac3e") - version("12.18.4", sha256="a802d87e579e46fc52771ed6f2667048320caca867be3276f4c4f1bbb41389c3") - version("12.18.3", sha256="6ea85f80e01b007cc9b566b8836513bc5102667d833bad4c1092be60fa60c2d4") - version("12.16.0", sha256="ae2dfe74485d821d4fef7cf1802acd2322cd994c853a2327c4306952f4453441") - version("12.14.0", sha256="5c1939867228f3845c808ef84a89c8ee93cc35f857bf7587ecee1b5a6d9da67b") variant("debug", default=False, description="Include debugger support") variant("doc", default=False, description="Compile with documentation") @@ -66,7 +64,6 @@ class NodeJs(Package): depends_on("python@2.7,3.5:3.8", when="@15", type="build") depends_on("python@2.7,3.6:3.10", when="@14.18.2:14", type="build") depends_on("python@2.7,3.5:3.8", when="@13.1:14.18.1", type="build") - depends_on("python@2.7,3.5:3.7", when="@12:13.0", type="build") depends_on("libtool", type="build", when=sys.platform != "darwin") depends_on("pkgconfig", type="build") # depends_on('bash-completion', when="+bash-completion") diff --git a/var/spack/repos/builtin/packages/notmuch/package.py b/var/spack/repos/builtin/packages/notmuch/package.py index 506aaf8243d131..744dbd029b2592 100644 --- a/var/spack/repos/builtin/packages/notmuch/package.py +++ b/var/spack/repos/builtin/packages/notmuch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Notmuch(AutotoolsPackage): homepage = "https://notmuchmail.org/" url = "https://notmuchmail.org/releases/notmuch-0.23.7.tar.gz" + license("GPL-3.0-or-later") + version("0.23.7", sha256="f11bb10d71945f6c3f16d23117afc70810aa485878e66bb4bf43cc3f08038913") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/npb/package.py b/var/spack/repos/builtin/packages/npb/package.py index ba9e157ac19a67..63275fd3c9004b 100644 --- a/var/spack/repos/builtin/packages/npb/package.py +++ b/var/spack/repos/builtin/packages/npb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/npm/package.py b/var/spack/repos/builtin/packages/npm/package.py index 0d6480f210428b..decade229c4984 100644 --- a/var/spack/repos/builtin/packages/npm/package.py +++ b/var/spack/repos/builtin/packages/npm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,49 +13,18 @@ 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" + + license("Artistic-2.0") 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 diff --git a/var/spack/repos/builtin/packages/npth/package.py b/var/spack/repos/builtin/packages/npth/package.py index 077abb54989799..24bb3e68291806 100644 --- a/var/spack/repos/builtin/packages/npth/package.py +++ b/var/spack/repos/builtin/packages/npth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Npth(AutotoolsPackage): homepage = "https://gnupg.org/software/npth/index.html" url = "https://gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2" + license("LGPL-2.0-or-later") + version("1.6", sha256="1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1") version("1.5", sha256="294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2") version("1.4", sha256="8915141836a3169a502d65c1ebd785fcc6d406cae5ee84474272ebf2fa96f1f2") diff --git a/var/spack/repos/builtin/packages/nrm/package.py b/var/spack/repos/builtin/packages/nrm/package.py index 83123967256068..610de0145d6bb7 100644 --- a/var/spack/repos/builtin/packages/nrm/package.py +++ b/var/spack/repos/builtin/packages/nrm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ns-3-dev/package.py b/var/spack/repos/builtin/packages/ns-3-dev/package.py index 722864b4178ef7..fe6f9ceac178c6 100644 --- a/var/spack/repos/builtin/packages/ns-3-dev/package.py +++ b/var/spack/repos/builtin/packages/ns-3-dev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Ns3Dev(WafPackage): maintainers("yee29") + license("GPL-2.0-or-later") + version("3.34", sha256="a565d46a73ff7de68808535d93884f59a6ed7c9faa94de1248ed4f59fb6d5d3d") version("3.33", sha256="0deb7da501fc19ba4818997c5aefd942be5ab1bbd3cfaa6ba28c07b387900275") version("3.32", sha256="a0e425c16748f909e10dce63275898508cb4f521739ec00a038316c148b8c3ee") diff --git a/var/spack/repos/builtin/packages/nseg/package.py b/var/spack/repos/builtin/packages/nseg/package.py index dc77f66b1b61ed..2788d2ceed13c7 100644 --- a/var/spack/repos/builtin/packages/nseg/package.py +++ b/var/spack/repos/builtin/packages/nseg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nsimd/package.py b/var/spack/repos/builtin/packages/nsimd/package.py index d048ac24181ea7..d7981d1ff46783 100644 --- a/var/spack/repos/builtin/packages/nsimd/package.py +++ b/var/spack/repos/builtin/packages/nsimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nsimd(CMakePackage): maintainers("eschnett") + license("MIT") + version("3.0.1", sha256="6a90d7ce5f9da5cfac872463951f3374bb0e0824d92f714db0fd4901b32497fd") version("3.0", sha256="5cab09020ce3a6819ddb3b3b8cafa6bc1377821b596c0f2954f52c852d092d5c") version("2.2", sha256="7916bec6c8ea9ddc690a5bfc80fb1b9402f9e1b2a4b4bb6b6bb8eb5a07eb018e") diff --git a/var/spack/repos/builtin/packages/nspr/package.py b/var/spack/repos/builtin/packages/nspr/package.py index de7b37aabcaf69..f18f4c778d7d56 100644 --- a/var/spack/repos/builtin/packages/nspr/package.py +++ b/var/spack/repos/builtin/packages/nspr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Nspr(AutotoolsPackage): ) url = "https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz" + license("MPL-2.0") + version("4.35", sha256="7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f") version("4.32", sha256="bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c") version("4.31", sha256="5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8") diff --git a/var/spack/repos/builtin/packages/nss/package.py b/var/spack/repos/builtin/packages/nss/package.py index 43e156deb8507a..3f10701b42e19f 100644 --- a/var/spack/repos/builtin/packages/nss/package.py +++ b/var/spack/repos/builtin/packages/nss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nss(MakefilePackage): homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" url = "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_67_RTM/src/nss-3.67.tar.gz" + license("MPL-2.0") + version("3.87", sha256="68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d") version("3.75", sha256="fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582") version("3.73", sha256="566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5") diff --git a/var/spack/repos/builtin/packages/ntirpc/package.py b/var/spack/repos/builtin/packages/ntirpc/package.py index 2f1cc9579bb101..b35f256d49a009 100644 --- a/var/spack/repos/builtin/packages/ntirpc/package.py +++ b/var/spack/repos/builtin/packages/ntirpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ntl/package.py b/var/spack/repos/builtin/packages/ntl/package.py index 52182f9bd6090e..2096c3334b42be 100644 --- a/var/spack/repos/builtin/packages/ntl/package.py +++ b/var/spack/repos/builtin/packages/ntl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ntpoly/package.py b/var/spack/repos/builtin/packages/ntpoly/package.py index fbcc3f6529a624..eb9f0a2be3ee41 100644 --- a/var/spack/repos/builtin/packages/ntpoly/package.py +++ b/var/spack/repos/builtin/packages/ntpoly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Ntpoly(CMakePackage): homepage = "https://william-dawson.github.io/NTPoly/" url = "https://github.com/william-dawson/NTPoly/archive/ntpoly-v2.3.1.tar.gz" + license("MIT") + version("2.3.1", sha256="af8c7690321607fbdee9671b9cb3acbed945148014e0541435858cf82bfd887e") depends_on("cmake", type="build") diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index 5afa3512a92ad0..1d50ca656e9191 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Numactl(AutotoolsPackage): force_autoreconf = True + license("LGPL-2.1-only") + version("2.0.14", sha256="1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035") version("2.0.12", sha256="7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf") version("2.0.11", sha256="3e099a59b2c527bcdbddd34e1952ca87462d2cef4c93da9b0bc03f02903f7089") diff --git a/var/spack/repos/builtin/packages/numamma/package.py b/var/spack/repos/builtin/packages/numamma/package.py index 59cbec7cc265cf..01bfa7fe4869d1 100644 --- a/var/spack/repos/builtin/packages/numamma/package.py +++ b/var/spack/repos/builtin/packages/numamma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Numamma(CMakePackage): url = "https://github.com/numamma/numamma/archive/numamma-1.1.1.tar.gz" maintainers("trahay") + license("MIT") + version("1.1.1", sha256="f79ca22a95df33a1af529ddd653d043f7f0d32a6d196e559aee8bef8fc74771f") depends_on("numap") diff --git a/var/spack/repos/builtin/packages/numap/package.py b/var/spack/repos/builtin/packages/numap/package.py index 0814370aa7b745..85ebf348ca324f 100644 --- a/var/spack/repos/builtin/packages/numap/package.py +++ b/var/spack/repos/builtin/packages/numap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/numaprof/package.py b/var/spack/repos/builtin/packages/numaprof/package.py index 9b734a4115cc1c..bd7a2cd9e1a8ad 100644 --- a/var/spack/repos/builtin/packages/numaprof/package.py +++ b/var/spack/repos/builtin/packages/numaprof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Numaprof(CMakePackage): url = "https://github.com/memtt/numaprof/releases/download/v1.1.4/numaprof-1.1.4.tar.bz2" maintainers("svalat") + license("CECILL-C") + # Versions version("1.1.5", sha256="7c479cc6d39f2fe685532b9aaeb9efce8153350177fdcc24133e447dd0776323") version("1.1.4", sha256="96cc5e153895f43d8be58e052433c9e7c9842071cc6bf915b3b1b346908cbbff") diff --git a/var/spack/repos/builtin/packages/numdiff/package.py b/var/spack/repos/builtin/packages/numdiff/package.py index 10333dcf119f3c..2fee673edbd14f 100644 --- a/var/spack/repos/builtin/packages/numdiff/package.py +++ b/var/spack/repos/builtin/packages/numdiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Numdiff(AutotoolsPackage): homepage = "https://www.nongnu.org/numdiff" url = "https://nongnu.askapache.com/numdiff/numdiff-5.8.1.tar.gz" + license("GPL-3.0-only") + version("5.9.0", sha256="87284a117944723eebbf077f857a0a114d818f8b5b54d289d59e73581194f5ef") version("5.8.1", sha256="99aebaadf63325f5658411c09c6dde60d2990c5f9a24a51a6851cb574a4af503") diff --git a/var/spack/repos/builtin/packages/nut/package.py b/var/spack/repos/builtin/packages/nut/package.py index 251f8b67259e8c..42764b62bcb53c 100644 --- a/var/spack/repos/builtin/packages/nut/package.py +++ b/var/spack/repos/builtin/packages/nut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Nut(CMakePackage): tags = ["proxy-app"] + license("GPL-2.0-or-later") + version("master", branch="master") version("0.1.1", sha256="9f1dca4a9d7003b170fd57d6720228ff25471616cf884e033652e90c49c089bb") diff --git a/var/spack/repos/builtin/packages/nvbandwidth/package.py b/var/spack/repos/builtin/packages/nvbandwidth/package.py new file mode 100644 index 00000000000000..64f4fa5eee7291 --- /dev/null +++ b/var/spack/repos/builtin/packages/nvbandwidth/package.py @@ -0,0 +1,50 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Nvbandwidth(CMakePackage, CudaPackage): + """ + nvbandwidth: A tool for bandwidth measurements on NVIDIA GPUs. + """ + + git = "https://github.com/NVIDIA/nvbandwidth" + + license("Apache-2.0") + + version("main", branch="main") + + version( + "v0.4", + url="https://github.com/NVIDIA/nvbandwidth/archive/refs/tags/v0.4.tar.gz", + sha256="c87eda04d5909d26c0d8756dd1a66ab048cf015dbb0d2719971dee182aa69212", + preferred=True, + ) + + version( + "v0.3", + url="https://github.com/NVIDIA/nvbandwidth/archive/refs/tags/v0.3.tar.gz", + sha256="744bcf9fbd007f4f71f7b5c2295aa223fe39eb5f048e6b1b6a3d0f942a19b3cc", + ) + + version( + "v0.2", + url="https://github.com/NVIDIA/nvbandwidth/archive/refs/tags/v0.2.tar.gz", + sha256="d41a45dc03dd2baf37b6c4ecdbca442c5e9f6f989fd3ffa90852e50ba9ded26c", + ) + + version( + "v0.1", + url="https://github.com/NVIDIA/nvbandwidth/archive/refs/tags/v0.1.tar.gz", + sha256="ce164f91e35d1b28ebb1f83b22f38199e430d18ebfb8e21fa8c5e53c38d82daf", + ) + + depends_on("boost@1.66.0 +program_options") + + def install(self, spec, prefix): + # We have no `make install` target, so move the files over explicitly + mkdirp(prefix.bin) + install(join_path(self.build_directory, "nvbandwidth"), join_path(prefix.bin)) diff --git a/var/spack/repos/builtin/packages/nvcomp/package.py b/var/spack/repos/builtin/packages/nvcomp/package.py index e3012162d7b1cc..6dccb895bb1a06 100644 --- a/var/spack/repos/builtin/packages/nvcomp/package.py +++ b/var/spack/repos/builtin/packages/nvcomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Nvcomp(CMakePackage, CudaPackage): maintainers("robertu94") + license("BSD-3-Clause") + version("2.2.0", commit="3737f6e5028ed1887b0023ad0fc033e139d57574") version("2.0.2", commit="5d5c194f3449486d989057f632d10954b8d11d75") diff --git a/var/spack/repos/builtin/packages/nvdimmsim/package.py b/var/spack/repos/builtin/packages/nvdimmsim/package.py index 351a2683662c31..90cf100ab34a39 100644 --- a/var/spack/repos/builtin/packages/nvdimmsim/package.py +++ b/var/spack/repos/builtin/packages/nvdimmsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nvhpc/package.py b/var/spack/repos/builtin/packages/nvhpc/package.py index 578813f80668cb..11da016ca082a6 100644 --- a/var/spack/repos/builtin/packages/nvhpc/package.py +++ b/var/spack/repos/builtin/packages/nvhpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,20 @@ # - package key must be in the form '{os}-{arch}' where 'os' is in the # format returned by platform.system() and 'arch' by platform.machine() _versions = { + "23.11": { + "Linux-aarch64": ( + "cf744498d1d74ba0af4294388706644ad3669eb0cacea3b69e23739afa2806a0", + "https://developer.download.nvidia.com/hpc-sdk/23.11/nvhpc_2023_2311_Linux_aarch64_cuda_multi.tar.gz", + ), + "Linux-ppc64le": ( + "b08591438bd0802d4c7c78e7c5bc36383a59591b8c2fa8aed5c4b87b24f7bfbb", + "https://developer.download.nvidia.com/hpc-sdk/23.11/nvhpc_2023_2311_Linux_ppc64le_cuda_multi.tar.gz", + ), + "Linux-x86_64": ( + "33483a069a911f9309cd53859ab90d2778fb176df906e9e8d2bd55f45eeec400", + "https://developer.download.nvidia.com/hpc-sdk/23.11/nvhpc_2023_2311_Linux_x86_64_cuda_multi.tar.gz", + ), + }, "23.9": { "Linux-aarch64": ( "dd32ae4233438adb71b2b4f8891f04802fdf90f67036ecf18bfde1b6043a03c3", diff --git a/var/spack/repos/builtin/packages/nvptx-tools/package.py b/var/spack/repos/builtin/packages/nvptx-tools/package.py index 417636c2c354c8..c7afc8cdfd367f 100644 --- a/var/spack/repos/builtin/packages/nvptx-tools/package.py +++ b/var/spack/repos/builtin/packages/nvptx-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/nvshmem/package.py b/var/spack/repos/builtin/packages/nvshmem/package.py index 4cd088be4fdf91..7bb13dd912a3ff 100644 --- a/var/spack/repos/builtin/packages/nvshmem/package.py +++ b/var/spack/repos/builtin/packages/nvshmem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Nvshmem(MakefilePackage, CudaPackage): maintainers("bvanessen") + license("BSD-3-Clause-Open-MPI") + version("2.7.0-6", sha256="23ed9b0187104dc87d5d2bc1394b6f5ff29e8c19138dc019d940b109ede699df") version("2.6.0-1", sha256="fc0e8de61b034f3a079dc231b1d0955e665a9f57b5013ee98b6743647bd60417") version("2.5.0-19", sha256="dd800b40f1d296e1d3ed2a9885adcfe745c3e57582bc809860e87bd32abcdc60") diff --git a/var/spack/repos/builtin/packages/nvtop/package.py b/var/spack/repos/builtin/packages/nvtop/package.py index 679475cded32a4..89c889bbad256d 100644 --- a/var/spack/repos/builtin/packages/nvtop/package.py +++ b/var/spack/repos/builtin/packages/nvtop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Nvtop(CMakePackage, CudaPackage): maintainers("marcost2") + license("GPL-3.0-or-later") + version("3.0.1", sha256="3cb6df2390e29792ed90de54c9332ec25e9d960abddcbb92d8544d658da2b5b3") version("3.0.0", sha256="711f1a1ef51ed3f7b1d61c858c4ac1fabb244595cf7b2403f80efcabe81d889e") version("2.0.4", sha256="5dc96057597343c66ebe46ae1a5415749ffbfafde99358eea6b533d6fee232e8") diff --git a/var/spack/repos/builtin/packages/nvtx/package.py b/var/spack/repos/builtin/packages/nvtx/package.py index b7ca514cf17bce..eff8c65b36cb4f 100644 --- a/var/spack/repos/builtin/packages/nvtx/package.py +++ b/var/spack/repos/builtin/packages/nvtx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Nvtx(Package, PythonExtension): maintainers("thomas-bouvier") + license("Apache-2.0") + version("develop", branch="dev") version("3.1.0", sha256="dc4e4a227d04d3da46ad920dfee5f7599ac8d6b2ee1809c9067110fb1cc71ced") diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index ba93ca219cdbef..4795a8e800d8af 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,11 @@ class Nwchem(Package): tags = ["ecp", "ecp-apps"] + version( + "7.2.2", + sha256="6b68e9c12eec38c09d92472bdd1ff130b93c1b5e1f65e4702aa7ee36c80e4af7", + url="https://github.com/nwchemgit/nwchem/releases/download/v7.2.2-release/nwchem-7.2.2-release.revision-74936fb9-srconly.2023-11-03.tar.bz2", + ) version( "7.2.0", sha256="28ea70947e77886337c84e6fae3bdf88f25f0acfdeaf95e722615779c19f7a7e", @@ -31,6 +36,10 @@ class Nwchem(Package): variant("openmp", default=False, description="Enables OpenMP support") variant("mpipr", default=False, description="Enables ARMCI with progress rank") variant("fftw3", default=False, description="Link against the FFTW library") + variant("libxc", default=False, description="Support additional functionals via libxc") + variant( + "elpa", default=False, description="Enable optimised diagonalisation routines from ELPA" + ) # This patch is for the modification of the build system (e.g. compiler flags) and # Fortran syntax to enable the compilation with Fujitsu compilers. The modification @@ -46,13 +55,15 @@ class Nwchem(Package): # https://github.com/nwchemgit/nwchem/commit/376f86f96eb982e83f10514e9dcd994564f973b4 # https://github.com/nwchemgit/nwchem/commit/c89fc9d1eca6689bce12564a63fdea95d962a123 # Prior versions of NWChem, including 7.0.2, were not able to link with FFTW - patch("fftw_splans.patch", when="@7.2.0") + patch("fftw_splans.patch", when="@7.2.0 +fftw3") depends_on("blas") depends_on("lapack") depends_on("mpi") depends_on("scalapack") - depends_on("fftw-api") + depends_on("fftw-api@3", when="+fftw3") + depends_on("libxc", when="+libxc") + depends_on("elpa", when="+elpa") depends_on("python@3:3.9", type=("build", "link", "run"), when="@:7.0.2") depends_on("python@3", type=("build", "link", "run"), when="@7.2.0:") @@ -60,25 +71,27 @@ def install(self, spec, prefix): scalapack = spec["scalapack"].libs lapack = spec["lapack"].libs blas = spec["blas"].libs - fftw = spec["fftw-api:double,float"].libs + fftw = spec["fftw-api:double,float"].libs if self.spec.satisfies("+fftw3") else "" # see https://nwchemgit.github.io/Compiling-NWChem.html args = [] args.extend( [ - "NWCHEM_TOP=%s" % self.stage.source_path, + f"NWCHEM_TOP={self.stage.source_path}", # NWCHEM is picky about FC and CC. They should NOT be full path. # see https://nwchemgit.github.io/Special_AWCforum/sp/id7524 - "CC=%s" % os.path.basename(spack_cc), - "FC=%s" % os.path.basename(spack_fc), + f"CC={os.path.basename(spack_cc)}", + f"FC={os.path.basename(spack_fc)}", "USE_MPI=y", - "PYTHONVERSION=%s" % spec["python"].version.up_to(2), - "BLASOPT=%s" % ((lapack + blas).ld_flags), - "LAPACK_LIB=%s" % lapack.ld_flags, - "SCALAPACK_LIB=%s" % scalapack.ld_flags, + "USE_MPIF=y", + "PYTHONVERSION={}".format(spec["python"].version.up_to(2)), + f"BLASOPT={(lapack + blas).ld_flags}", + f"LAPACK_LIB={lapack.ld_flags}", + f"SCALAPACK_LIB={scalapack.ld_flags}", "USE_NOIO=Y", # skip I/O algorithms "MRCC_METHODS=y", # TCE extra module "IPCCSD=y", # TCE extra module "EACCSD=y", # TCE extra module + "CCSDTQ=y", # TCE extra module "V=1", # verbose build ] ) @@ -93,10 +106,10 @@ def install(self, spec, prefix): # TODO: query if blas/lapack/scalapack uses 64bit Ints # A flag to distinguish between 32bit and 64bit integers in linear # algebra (Blas, Lapack, Scalapack) - use_32_bit_lin_alg = True + use_32_bit_lin_alg = True if "~ilp64" in self.spec["blas"] else False if use_32_bit_lin_alg: - args.extend(["USE_64TO32=y", "BLAS_SIZE=4", "SCALAPACK_SIZE=4"]) + args.extend(["USE_64TO32=y", "BLAS_SIZE=4", "SCALAPACK_SIZE=4", "USE_MPIF4=y"]) else: args.extend(["BLAS_SIZE=8", "SCALAPACK_SIZE=8"]) @@ -106,19 +119,31 @@ def install(self, spec, prefix): else: target = "LINUX64" - args.extend(["NWCHEM_TARGET=%s" % target]) + args.extend([f"NWCHEM_TARGET={target}"]) - if "+openmp" in spec: + if spec.satisfies("+openmp"): args.extend(["USE_OPENMP=y"]) - if "+mpipr" in spec: + if spec.satisfies("+mpipr"): args.extend(["ARMCI_NETWORK=MPI-PR"]) - if "+fftw3" in spec: + if spec.satisfies("+fftw3"): args.extend(["USE_FFTW3=y"]) - args.extend(["LIBFFTW3=%s" % fftw.ld_flags]) + args.extend([f"LIBFFTW3={fftw.ld_flags}"]) args.extend(["FFTW3_INCLUDE={0}".format(spec["fftw-api"].prefix.include)]) + if spec.satisfies("+libxc"): + args.extend([f"LIBXC_LIB={0}".format(spec["libxc"].libs.ld_flags)]) + args.extend([f"LIBXC_INCLUDE={0}".format(spec["libxc"].prefix.include)]) + + if spec.satisfies("+elpa"): + elpa = spec["elpa"] + args.extend([f"ELPA={elpa.libs.ld_flags} -I{elpa.prefix.include}"]) + if use_32_bit_lin_alg: + args.extend(["ELPA_SIZE=4"]) + else: + args.extend(["ELPA_SIZE=8"]) + with working_dir("src"): make("nwchem_config", *args) if use_32_bit_lin_alg: diff --git a/var/spack/repos/builtin/packages/nyancat/package.py b/var/spack/repos/builtin/packages/nyancat/package.py index 5fdfb7778029af..6aae2643442520 100644 --- a/var/spack/repos/builtin/packages/nyancat/package.py +++ b/var/spack/repos/builtin/packages/nyancat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Nyancat(MakefilePackage): homepage = "https://nyancat.dakko.us/" url = "https://github.com/klange/nyancat/archive/1.5.1.tar.gz" + license("NCSA") + version("1.5.2", sha256="88cdcaa9c7134503dd0364a97fa860da3381a09cb555c3aae9918360827c2032") version("1.5.1", sha256="c948c769d230b4e41385173540ae8ab1f36176de689b6e2d6ed3500e9179b50a") version("1.5.0", sha256="9ae4f740060b77bba815d8d4e97712d822bd0812a118b88b7fd6b4136a971bce") diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py index f056e6910bd60b..175a5833cf2ca0 100644 --- a/var/spack/repos/builtin/packages/ocaml/package.py +++ b/var/spack/repos/builtin/packages/ocaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ocamlbuild/package.py b/var/spack/repos/builtin/packages/ocamlbuild/package.py index a421b22c8da3c2..ea85db5fb520b2 100644 --- a/var/spack/repos/builtin/packages/ocamlbuild/package.py +++ b/var/spack/repos/builtin/packages/ocamlbuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/occa/package.py b/var/spack/repos/builtin/packages/occa/package.py index bb8554e4712dd6..bd56b8e3fac13b 100644 --- a/var/spack/repos/builtin/packages/occa/package.py +++ b/var/spack/repos/builtin/packages/occa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Occa(Package): maintainers("v-dobrev", "dmed256") + license("MIT") + version("develop") version("1.2.0", tag="v1.2.0", commit="18379073b6497f677a20bfeced95b511f82c3355") version("1.1.0", tag="v1.1.0", commit="c8a587666a23e045f25dc871c3257364a5f6a7d5") diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py index d0f35684b25ed7..c945bae6f31c54 100644 --- a/var/spack/repos/builtin/packages/oce/package.py +++ b/var/spack/repos/builtin/packages/oce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/oci-systemd-hook/package.py b/var/spack/repos/builtin/packages/oci-systemd-hook/package.py index 72d08ad7e3aad7..5d0c5c62bdae1d 100644 --- a/var/spack/repos/builtin/packages/oci-systemd-hook/package.py +++ b/var/spack/repos/builtin/packages/oci-systemd-hook/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OciSystemdHook(AutotoolsPackage): homepage = "https://github.com/projectatomic/oci-systemd-hook/" url = "https://github.com/projectatomic/oci-systemd-hook/archive/v0.2.0.tar.gz" + license("GPL-3.0-or-later") + version("0.2.0", sha256="da1ce3a1fd68752fc27b8f2062daa0d273c211474841ecf14737b10031bedcf5") version("0.1.18", sha256="c17291bf5151e972c502ec3cc9b445967823444b1f3917481eb419c9e476649e") version("0.1.5", sha256="53f773b055928d0f3d25ccc966d0d0b3ccb4dd00e8ff71a067b105142da22763") diff --git a/var/spack/repos/builtin/packages/ocl-icd/package.py b/var/spack/repos/builtin/packages/ocl-icd/package.py index b74b05e85bd6a4..80f500c61bd4c3 100644 --- a/var/spack/repos/builtin/packages/ocl-icd/package.py +++ b/var/spack/repos/builtin/packages/ocl-icd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class OclIcd(AutotoolsPackage): url = "https://github.com/OCL-dev/ocl-icd/archive/v2.2.12.tar.gz" maintainers("lorddavidiii") + license("BSD-2-Clause") + version("2.3.1", sha256="a32b67c2d52ffbaf490be9fc18b46428ab807ab11eff7664d7ff75e06cfafd6d") version("2.3.0", sha256="469f592ccd9b0547fb7212b17e1553b203d178634c20d3416640c0209e3ddd50") version("2.2.14", sha256="46df23608605ad548e80b11f4ba0e590cef6397a079d2f19adf707a7c2fbfe1b") diff --git a/var/spack/repos/builtin/packages/oclgrind/package.py b/var/spack/repos/builtin/packages/oclgrind/package.py index 3d275a4cd9d211..76dd8fd47a0fdd 100644 --- a/var/spack/repos/builtin/packages/oclgrind/package.py +++ b/var/spack/repos/builtin/packages/oclgrind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Oclgrind(CMakePackage): maintainers("matthiasdiener") + license("BSD-3-Clause") + version("master", branch="master") version("19.10", sha256="f9a8f22cb9f6d88670f2578c46ba0d728ba8eaee5c481c2811129dc157c43dc0") diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index ba257adb06612e..c278ea5751d219 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py index c1ab382aa6a500..c8816c74075acd 100644 --- a/var/spack/repos/builtin/packages/oclock/package.py +++ b/var/spack/repos/builtin/packages/oclock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/octa/package.py b/var/spack/repos/builtin/packages/octa/package.py index 0f46bb1027c9c4..4ae34b8f9abdfd 100644 --- a/var/spack/repos/builtin/packages/octa/package.py +++ b/var/spack/repos/builtin/packages/octa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/octave-arduino/package.py b/var/spack/repos/builtin/packages/octave-arduino/package.py index 5d1e3700f679ba..52857e761c91e5 100644 --- a/var/spack/repos/builtin/packages/octave-arduino/package.py +++ b/var/spack/repos/builtin/packages/octave-arduino/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OctaveArduino(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/arduino/" sourceforge_mirror_path = "octave/arduino-0.2.0.tar.gz" + license("GPL-3.0-or-later") + version("0.2.0", sha256="0562ff48ea4b2cef28e2e03ccc4678dafa16f91d1580245bb7f9f488c4f56238") depends_on("octave-instrctl") diff --git a/var/spack/repos/builtin/packages/octave-control/package.py b/var/spack/repos/builtin/packages/octave-control/package.py index bb38b5e55735ae..629d2a1baf2f0e 100644 --- a/var/spack/repos/builtin/packages/octave-control/package.py +++ b/var/spack/repos/builtin/packages/octave-control/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OctaveControl(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/control/" sourceforge_mirror_path = "octave/control-3.2.0.tar.gz" + license("GPL-3.0-or-later") + version("3.2.0", sha256="faf1d510d16ab46e4fa91a1288f4a7839ee05469c33e4698b7a007a0bb965e3e") extends("octave@4.0.0:") diff --git a/var/spack/repos/builtin/packages/octave-gsl/package.py b/var/spack/repos/builtin/packages/octave-gsl/package.py index 2394fca54d123c..ca82c960561b80 100644 --- a/var/spack/repos/builtin/packages/octave-gsl/package.py +++ b/var/spack/repos/builtin/packages/octave-gsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class OctaveGsl(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/gsl/" sourceforge_mirror_path = "octave/gsl-2.1.1.tar.gz" + license("GPL-2.0-or-later") + version("2.1.1", sha256="d028c52579e251c3f21ebfdf065dffab3ad7893434efda33b501225ef1ea6ed3") depends_on("gsl@2.4:") diff --git a/var/spack/repos/builtin/packages/octave-instrctl/package.py b/var/spack/repos/builtin/packages/octave-instrctl/package.py index 53e9d66c545088..3ee5ff878e26e1 100644 --- a/var/spack/repos/builtin/packages/octave-instrctl/package.py +++ b/var/spack/repos/builtin/packages/octave-instrctl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/octave-io/package.py b/var/spack/repos/builtin/packages/octave-io/package.py index c0011bf0864281..b634cec04137e9 100644 --- a/var/spack/repos/builtin/packages/octave-io/package.py +++ b/var/spack/repos/builtin/packages/octave-io/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OctaveIo(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/io/" sourceforge_mirror_path = "octave/io-2.6.3.tar.gz" + license("GPL-3.0-only") + version("2.6.3", sha256="6bc63c6498d79cada01a6c4446f793536e0bb416ddec2a5201dd8d741d459e10") version("2.6.2", sha256="01dbf8885a8011e76c919e271727c1d44f625bf6b217948b79438039ba368ceb") version("2.6.1", sha256="83253561f883c96ca3021a771223d23795122dc4cb800766e9cb893c6f8262dd") diff --git a/var/spack/repos/builtin/packages/octave-optim/package.py b/var/spack/repos/builtin/packages/octave-optim/package.py index 53c5f1e0af5ad6..f4abf1a8a135a1 100644 --- a/var/spack/repos/builtin/packages/octave-optim/package.py +++ b/var/spack/repos/builtin/packages/octave-optim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/octave-quaternion/package.py b/var/spack/repos/builtin/packages/octave-quaternion/package.py index 6e17326ebcb206..ee3463f109bd92 100644 --- a/var/spack/repos/builtin/packages/octave-quaternion/package.py +++ b/var/spack/repos/builtin/packages/octave-quaternion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OctaveQuaternion(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/quaternion/" sourceforge_mirror_path = "octave/quaternion-2.4.0.tar.gz" + license("GPL-3.0-or-later") + version("2.4.0", sha256="4c2d4dd8f1d213f080519c6f9dfbbdca068087ee0411122b16e377e0f4641610") version("2.2.2", sha256="261d51657bc729c8f9fe915532d91e75e48dce2af2b298781e78cc93a5067cbd") diff --git a/var/spack/repos/builtin/packages/octave-signal/package.py b/var/spack/repos/builtin/packages/octave-signal/package.py index 40a055945c65ce..08d15396634049 100644 --- a/var/spack/repos/builtin/packages/octave-signal/package.py +++ b/var/spack/repos/builtin/packages/octave-signal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class OctaveSignal(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/optim/" sourceforge_mirror_path = "octave/signal-1.4.1.tar.gz" + license("GPL-3.0-only") + version("1.4.1", sha256="d978600f8b8f61339b986136c9862cad3e8f7015f84132f214bf63e9e281aeaa") depends_on("octave-control@2.4:") diff --git a/var/spack/repos/builtin/packages/octave-splines/package.py b/var/spack/repos/builtin/packages/octave-splines/package.py index 80e725fa4d9382..d6c515475ba3b2 100644 --- a/var/spack/repos/builtin/packages/octave-splines/package.py +++ b/var/spack/repos/builtin/packages/octave-splines/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class OctaveSplines(OctavePackage, SourceforgePackage): homepage = "http://octave.sourceforge.net/splines/index.html" sourceforge_mirror_path = "octave/splines-1.3.1.tar.gz" + license("GPL-3.0-or-later") + version("1.3.3", sha256="0a4bf9544b1fedb4aed4222eff1333928b0e3c903f140822eb857585e0d5919b") version("1.3.1", sha256="f9665d780c37aa6a6e17d1f424c49bdeedb89d1192319a4e39c08784122d18f9") extends("octave@3.6.0:") diff --git a/var/spack/repos/builtin/packages/octave-statistics/package.py b/var/spack/repos/builtin/packages/octave-statistics/package.py index 7a8cd480ab82a5..9c8f34f1ccc89f 100644 --- a/var/spack/repos/builtin/packages/octave-statistics/package.py +++ b/var/spack/repos/builtin/packages/octave-statistics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/octave-struct/package.py b/var/spack/repos/builtin/packages/octave-struct/package.py index 91f5f3e6640e64..5a04e337a75194 100644 --- a/var/spack/repos/builtin/packages/octave-struct/package.py +++ b/var/spack/repos/builtin/packages/octave-struct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class OctaveStruct(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/struct/" sourceforge_mirror_path = "octave/struct-1.0.14.tar.gz" + license("GPL-3.0-only") + version("1.0.17", sha256="0137bbb5df650f29104f6243502f3a2302aaaa5e42ea9f02d8a3943aaf668433") version("1.0.14", sha256="ad4e17687bc24650f032757271b20b70fe32c35513d4dd9ab1e549919df36b47") extends("octave@2.9.7:") diff --git a/var/spack/repos/builtin/packages/octave-symbolic/package.py b/var/spack/repos/builtin/packages/octave-symbolic/package.py index 0cbd49b5355cb8..688dcbefff16dc 100644 --- a/var/spack/repos/builtin/packages/octave-symbolic/package.py +++ b/var/spack/repos/builtin/packages/octave-symbolic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class OctaveSymbolic(OctavePackage, SourceforgePackage): homepage = "https://octave.sourceforge.io/symbolic/" sourceforge_mirror_path = "octave/symbolic-2.9.0.tar.gz" + license("GPL-3.0-only") + version("2.9.0", sha256="089ec44a0a49417a8b78797e87f338da6a6e227509f3080724996483d39b23cb") extends("octave@4.2.0:") diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 90dbdb44786ee2..ef2e5e02e3023b 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): extendable = True + license("GPL-3.0-or-later") + version("8.2.0", sha256="57d17f918a940d38ca3348211e110b34d735a322a87db71c177c4692a49a9c84") version("8.1.0", sha256="8052074d17b0ef643d037de8ab389672c752bb201ee9cea4dfa69858fb6a213f") version("7.3.0", sha256="6e14a4649d70af45ab660f8cbbf645aaf1ec33f25f88bfda4697cb17e440c4f5") diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index 3ccd8719a1758b..7098b163faac2a 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Octopus(AutotoolsPackage, CudaPackage): maintainers("fangohr", "RemiLacroix-IDRIS") + license("Apache-2.0") + version("13.0", sha256="b4d0fd496c31a9c4aa4677360e631765049373131e61f396b00048235057aeb1") version("12.2", sha256="e919e07703696eadb4ba59352d7a2678a9191b4586cb9da538661615e765a5a2") version("12.1", sha256="e2214e958f1e9631dbe6bf020c39f1fe4d71ab0b6118ea9bd8dc38f6d7a7959a") @@ -96,7 +98,8 @@ class Octopus(AutotoolsPackage, CudaPackage): depends_on("netcdf-fortran", when="+netcdf") # NetCDF fortran lib without mpi variant with when("+mpi"): # list all the parallel dependencies depends_on("fftw@3:+mpi+openmp", when="@8:9") # FFT library - depends_on("fftw-api@3:+mpi+openmp", when="@10:") + depends_on("fftw-api@3:", when="@10:") + depends_on("fftw+mpi+openmp", when="^[virtuals=fftw-api] fftw") depends_on("libvdwxc+mpi", when="+libvdwxc") depends_on("arpack-ng+mpi", when="+arpack") depends_on("elpa+mpi", when="+elpa") @@ -105,7 +108,8 @@ class Octopus(AutotoolsPackage, CudaPackage): with when("~mpi"): # list all the serial dependencies depends_on("fftw@3:+openmp~mpi", when="@8:9") # FFT library - depends_on("fftw-api@3:+openmp~mpi", when="@10:") + depends_on("fftw-api@3:", when="@10:") + depends_on("fftw~mpi+openmp", when="^[virtuals=fftw-api] fftw") depends_on("libvdwxc~mpi", when="+libvdwxc") depends_on("arpack-ng~mpi", when="+arpack") depends_on("elpa~mpi", when="+elpa") diff --git a/var/spack/repos/builtin/packages/odc/package.py b/var/spack/repos/builtin/packages/odc/package.py index 976a1a4176fd3b..24f0956f6fbeb8 100644 --- a/var/spack/repos/builtin/packages/odc/package.py +++ b/var/spack/repos/builtin/packages/odc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Odc(CMakePackage): maintainers("skosukhin", "climbfuji") + license("Apache-2.0") + version("1.4.6", sha256="ff99d46175e6032ddd0bdaa3f6a5e2c4729d24b698ba0191a2a4aa418f48867c") version("1.4.5", sha256="8532d0453531d62e1f15791d1c5c96540b842913bd211a8ef090211eaf4cccae") version("1.4.4", sha256="65cb7b491566d3de14b66741544360f20eaaf1a6d5a24af7d8b939dd50e26431") diff --git a/var/spack/repos/builtin/packages/odgi/package.py b/var/spack/repos/builtin/packages/odgi/package.py index 459ab59bac3b24..0c4b9ea2ff3b07 100644 --- a/var/spack/repos/builtin/packages/odgi/package.py +++ b/var/spack/repos/builtin/packages/odgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -41,8 +41,4 @@ class Odgi(CMakePackage): # >>> Dependencies list ends here def cmake_args(self): - args = [ - "-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON", - "-DPYTHON_EXECUTABLE:FILEPATH={0}".format(self.spec["python"].command), - ] - return args + return ["-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON"] diff --git a/var/spack/repos/builtin/packages/of-catalyst/package.py b/var/spack/repos/builtin/packages/of-catalyst/package.py index 3bfca4e7d38a3b..d7a3821736a2da 100644 --- a/var/spack/repos/builtin/packages/of-catalyst/package.py +++ b/var/spack/repos/builtin/packages/of-catalyst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,7 +32,6 @@ class OfCatalyst(CMakePackage): depends_on("openfoam@1806", when="@1806", type=("build", "link", "run")) depends_on("openfoam@develop", when="@develop", type=("build", "link", "run")) - depends_on("catalyst@5.5:", when="~full") depends_on("paraview@5.5:+osmesa~qt", when="+full") root_cmakelists_dir = "src/catalyst" diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index fe19b41e974c33..99947c8f7732f3 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class OfPrecice(Package): homepage = "https://precice.org/" git = "https://github.com/precice/openfoam-adapter.git" + license("GPL-3.0-only") + # Currently develop only version("develop", branch="master") diff --git a/var/spack/repos/builtin/packages/ome-common-cpp/package.py b/var/spack/repos/builtin/packages/ome-common-cpp/package.py index 06bb4c002a1c3e..7e4939d028adb8 100644 --- a/var/spack/repos/builtin/packages/ome-common-cpp/package.py +++ b/var/spack/repos/builtin/packages/ome-common-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class OmeCommonCpp(CMakePackage): maintainers("omsai") + license("BSD-2-Clause") + version("master", branch="master") version("6.0.0", sha256="26f3ce6e0b9a022590eed2ade5519eca12a2507bb207cdfe9f29d360984a7e0d") diff --git a/var/spack/repos/builtin/packages/ome-files-cpp/package.py b/var/spack/repos/builtin/packages/ome-files-cpp/package.py index 1cc12897d13443..96af69f7df1258 100644 --- a/var/spack/repos/builtin/packages/ome-files-cpp/package.py +++ b/var/spack/repos/builtin/packages/ome-files-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class OmeFilesCpp(CMakePackage): maintainers("omsai") + license("BSD-2-Clause") + version("master", branch="master") version("0.6.0", sha256="e0baf3eeb2ea639f426292a36b58adcaa42ce61a4a0f15f34690602f3f5d47c1") diff --git a/var/spack/repos/builtin/packages/ome-model/package.py b/var/spack/repos/builtin/packages/ome-model/package.py index e160cda4759580..aa94521f266a66 100644 --- a/var/spack/repos/builtin/packages/ome-model/package.py +++ b/var/spack/repos/builtin/packages/ome-model/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class OmeModel(CMakePackage): maintainers("omsai") + license("BSD-2-Clause") + version("master", branch="master") version("6.0.0", sha256="d6644ff722411d3a8ac9f26a49c1afda30e4d4102e37b31593d2a9fdc8f96700") diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 3d8c952afd4007..25887e04910d5e 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/omnitrace/package.py b/var/spack/repos/builtin/packages/omnitrace/package.py index a7bd90f82b2af8..bc3ed3175886a1 100644 --- a/var/spack/repos/builtin/packages/omnitrace/package.py +++ b/var/spack/repos/builtin/packages/omnitrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Omnitrace(CMakePackage): git = "https://github.com/AMDResearch/omnitrace.git" maintainers("jrmadsen") + license("MIT") + version("main", branch="main", submodules=True) version("1.7.4", commit="12001d9633328f9f56210c7ebffce065bff06310", submodules=True) version("1.7.3", commit="2ebfe3fc30f977559142509edc4ea190c975992a", submodules=True) @@ -124,11 +126,6 @@ def cmake_args(self): tau_root = spec["tau"].prefix args.append(self.define("TAU_ROOT_DIR", tau_root)) - if "+python" in spec: - pyexe = spec["python"].command.path - args.append(self.define("PYTHON_EXECUTABLE", pyexe)) - args.append(self.define("Python3_EXECUTABLE", pyexe)) - if "+mpi" in spec: args.append(self.define("MPI_C_COMPILER", spec["mpi"].mpicc)) args.append(self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx)) diff --git a/var/spack/repos/builtin/packages/ompss-2/package.py b/var/spack/repos/builtin/packages/ompss-2/package.py index 55efe7633a438d..48ea331f9d4b2b 100644 --- a/var/spack/repos/builtin/packages/ompss-2/package.py +++ b/var/spack/repos/builtin/packages/ompss-2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ompss/package.py b/var/spack/repos/builtin/packages/ompss/package.py index f9eb4cd84c069d..67986430bb087e 100644 --- a/var/spack/repos/builtin/packages/ompss/package.py +++ b/var/spack/repos/builtin/packages/ompss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ompt-openmp/package.py b/var/spack/repos/builtin/packages/ompt-openmp/package.py index 011116a37501ea..5f67b63c6d73d5 100644 --- a/var/spack/repos/builtin/packages/ompt-openmp/package.py +++ b/var/spack/repos/builtin/packages/ompt-openmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class OmptOpenmp(CMakePackage): homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" url = "http://github.com/khuck/LLVM-openmp/archive/v0.1.tar.gz" + license("MIT") + version("0.1", sha256="a35dd2a83777fce54386d54cea8d2df9b5f34309d66fbc1d1757d55f6048c7a7") depends_on("cmake@2.8:", type="build") diff --git a/var/spack/repos/builtin/packages/oneapi-igc/package.py b/var/spack/repos/builtin/packages/oneapi-igc/package.py index 7523a499f68a78..d9217c63890fbb 100644 --- a/var/spack/repos/builtin/packages/oneapi-igc/package.py +++ b/var/spack/repos/builtin/packages/oneapi-igc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py index 738c9ce0626ec8..120509dab362b8 100644 --- a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py +++ b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class OneapiLevelZero(CMakePackage): maintainers("rscohn2") + license("MIT") + version("1.9.9", sha256="3d1784e790bbaae5f160b920c07e7dc2941640d9c631aaa668ccfd57aafc7b56") version("1.9.4", sha256="7f91ed993be1e643c752cf95a319a0fc64113d91ec481fbb8a2f478f433d3380") version("1.8.12", sha256="9c5d3dd912882abe8e2e3ba72f8c27e2a2d86759ac48f6318a0df091204985eb") diff --git a/var/spack/repos/builtin/packages/onednn/package.py b/var/spack/repos/builtin/packages/onednn/package.py index d7f34390c91ecc..40708d41e0270e 100644 --- a/var/spack/repos/builtin/packages/onednn/package.py +++ b/var/spack/repos/builtin/packages/onednn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Onednn(CMakePackage): maintainers("adamjstewart") + license("Apache-2.0") + version("master", branch="master") version("3.0", sha256="b93ac6d12651c060e65086396d85191dabecfbc01f30eb1f139c6dd56bf6e34c") version("2.7.3", sha256="a50993aa6265b799b040fe745e0010502f9f7103cc53a9525d59646aef006633") diff --git a/var/spack/repos/builtin/packages/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index e70d02c3c55eaa..de5be77f75f342 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Oniguruma(AutotoolsPackage): homepage = "https://github.com/kkos/oniguruma" url = "https://github.com/kkos/oniguruma/releases/download/v6.9.4/onig-6.9.4.tar.gz" + license("BSD-2-Clause") + version("6.9.8", sha256="28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e") version("6.9.4", sha256="4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53") version("6.1.3", sha256="480c850cd7c7f2fcaad0942b4a488e2af01fbb8e65375d34908f558b432725cf") diff --git a/var/spack/repos/builtin/packages/onnx/package.py b/var/spack/repos/builtin/packages/onnx/package.py index 8e01b481bb7861..5417e01127220a 100644 --- a/var/spack/repos/builtin/packages/onnx/package.py +++ b/var/spack/repos/builtin/packages/onnx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Onnx(CMakePackage): url = "https://github.com/onnx/onnx/archive/refs/tags/v1.9.0.tar.gz" git = "https://github.com/onnx/onnx.git" + license("Apache-2.0") + version("master", branch="master") version( "1.13.1", sha256="090d3e10ec662a98a2a72f1bf053f793efc645824f0d4b779e0ce47468a0890e" diff --git a/var/spack/repos/builtin/packages/ont-guppy/package.py b/var/spack/repos/builtin/packages/ont-guppy/package.py index a0b4c6d77d76cc..0cc6f52997804f 100644 --- a/var/spack/repos/builtin/packages/ont-guppy/package.py +++ b/var/spack/repos/builtin/packages/ont-guppy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/oommf/package.py b/var/spack/repos/builtin/packages/oommf/package.py index a3a4a6aeac00ed..fb181cba5ec88e 100644 --- a/var/spack/repos/builtin/packages/oommf/package.py +++ b/var/spack/repos/builtin/packages/oommf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -41,6 +41,8 @@ class Oommf(Package): maintainers("fangohr") + license("TCL") + version( "20b0_20220930", sha256="764f1983d858fbad4bae34c720b217940ce56f745647ba94ec74de4b185f1328", diff --git a/var/spack/repos/builtin/packages/op2-dsl/package.py b/var/spack/repos/builtin/packages/op2-dsl/package.py index 64f2d57bed31a9..18df2a38ebc75d 100644 --- a/var/spack/repos/builtin/packages/op2-dsl/package.py +++ b/var/spack/repos/builtin/packages/op2-dsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opa-psm2/package.py b/var/spack/repos/builtin/packages/opa-psm2/package.py index 38d1ab5e972c64..795eeb7e69feb4 100644 --- a/var/spack/repos/builtin/packages/opa-psm2/package.py +++ b/var/spack/repos/builtin/packages/opa-psm2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class OpaPsm2(MakefilePackage, CudaPackage): maintainers("jack-morrison") + license("BSD-3-Clause") + version("11.2.230", sha256="e56262ed9ced4a8b53540cc6370d7ec9733bd5c791a9c05251010c1bbb60c75c") version("11.2.228", sha256="e302afc8cd054409616d59b69e4d7f140278dc3815ae07f0fc14080fd860bd5c") version("11.2.206", sha256="08aa41f41bdb485ee037d3f7e32dd45e79858ce38e744d33b9db2af60e3c627a") diff --git a/var/spack/repos/builtin/packages/opam/package.py b/var/spack/repos/builtin/packages/opam/package.py index 7237c8023b66f1..d1b6bff3facc64 100644 --- a/var/spack/repos/builtin/packages/opam/package.py +++ b/var/spack/repos/builtin/packages/opam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py index 7fa19c2423e74c..ca08fa3ad856bc 100644 --- a/var/spack/repos/builtin/packages/opari2/package.py +++ b/var/spack/repos/builtin/packages/opari2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,13 +18,11 @@ class Opari2(AutotoolsPackage): """ homepage = "https://www.vi-hps.org/projects/score-p" - url = "https://www.vi-hps.org/cms/upload/packages/opari2/opari2-2.0.4.tar.gz" + url = "https://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-2.0.8/opari2-2.0.8.tar.gz" - version( - "2.0.6", - sha256="55972289ce66080bb48622110c3189a36e88a12917635f049b37685b9d3bbcb0", - url="https://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-2.0.6/opari2-2.0.6.tar.gz", - ) + version("2.0.8", sha256="196e59a2a625e6c795a6124c61e784bad142f9f38df0b4fa4d435ba9b9c19721") + version("2.0.7", sha256="e302a4cc265eb2a4aa27c16a90eabd9e1e58cb02a191dd1c4d86f9a0df128715") + version("2.0.6", sha256="55972289ce66080bb48622110c3189a36e88a12917635f049b37685b9d3bbcb0") version("2.0.5", sha256="9034dd7596ac2176401090fd5ced45d0ab9a9404444ff767f093ccce68114ef5") version("2.0.4", sha256="f69e324792f66780b473daf2b3c81f58ee8188adc72b6fe0dacf43d4c1a0a131") version("2.0.3", sha256="7e2efcfbc99152ee6e31454ef4fb747f77165691539d5d2c1df2abc4612de86c") @@ -33,5 +31,13 @@ class Opari2(AutotoolsPackage): version("1.1.4", sha256="b80c04fe876faaa4ee9a0654486ecbeba516b27fc14a90d20c6384e81060cffe") version("1.1.2", sha256="8405c2903730d94c828724b3a5f8889653553fb8567045a6c54ac0816237835d") + def url_for_version(self, version): + if version >= Version("2.0.6"): + url = "https://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-{0}/opari2-{0}.tar.gz" + else: + url = "https://www.vi-hps.org/cms/upload/packages/opari2/opari2-{0}.tar.gz" + + return url.format(version) + def configure_args(self): return ["--enable-shared"] diff --git a/var/spack/repos/builtin/packages/open-iscsi/package.py b/var/spack/repos/builtin/packages/open-iscsi/package.py index 623ff495e391ab..fe0f354ab9ef64 100644 --- a/var/spack/repos/builtin/packages/open-iscsi/package.py +++ b/var/spack/repos/builtin/packages/open-iscsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OpenIscsi(MakefilePackage): homepage = "https://github.com/open-iscsi/" url = "https://github.com/open-iscsi/open-iscsi/archive/2.1.1.tar.gz" + license("GPL-2.0-only") + version("2.1.1", sha256="dfc1ea37f230f9d116f5b39c795b35be43002d65c81330ccd3878786532b811b") version("2.1.0", sha256="5b381b6a74bef3ca57cd8d5fa7a3ff07d45c8009b0e4aac5ba3a811ff0c48ee4") version("2.0.878", sha256="5aeef0069c4a9d7f288269bcf56588d09a3c529a35f865f16dd8119ab8672208") diff --git a/var/spack/repos/builtin/packages/open-isns/package.py b/var/spack/repos/builtin/packages/open-isns/package.py index 9ec6a06af58e32..38a97504193283 100644 --- a/var/spack/repos/builtin/packages/open-isns/package.py +++ b/var/spack/repos/builtin/packages/open-isns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class OpenIsns(AutotoolsPackage): homepage = "https://github.com/open-iscsi/open-isns" url = "https://github.com/open-iscsi/open-isns/archive/v0.100.tar.gz" + license("LGPL-2.1-or-later") + version("0.100", sha256="b011edbb0f31690aaca902a8ecf4e1f17b01d6c9e9afc51909d26b0993b4328f") version("0.99", sha256="a8febecf888d5a38abfa2fcb290194d993b1a7f5bea0cb61f5cf2e9f9e5273c2") version("0.98", sha256="c5cbd161e51fb993728c04e56d3da693b73eb3f4e81d17f66eb5b7653c29e8eb") diff --git a/var/spack/repos/builtin/packages/open3d/package.py b/var/spack/repos/builtin/packages/open3d/package.py index 887ae7a27ed926..2a63de25caed6d 100644 --- a/var/spack/repos/builtin/packages/open3d/package.py +++ b/var/spack/repos/builtin/packages/open3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Open3d(CMakePackage, CudaPackage): url = "https://github.com/isl-org/Open3D/archive/refs/tags/v0.13.0.tar.gz" git = "https://github.com/isl-org/Open3D.git" + license("MIT") + version( "0.13.0", tag="v0.13.0", commit="c3f9de224e13838a72da0e5565a7ba51038b0f11", submodules=True ) @@ -68,7 +70,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("BUILD_UNIT_TESTS", self.run_tests), self.define_from_variant("BUILD_PYTHON_MODULE", "python"), self.define_from_variant("BUILD_CUDA_MODULE", "cuda"), @@ -93,11 +95,6 @@ def cmake_args(self): # self.define('USE_SYSTEM_TINYOBJLOADER', True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - - return args - def check(self): with working_dir(self.build_directory): tests = Executable(os.path.join("bin", "tests")) diff --git a/var/spack/repos/builtin/packages/openal-soft/package.py b/var/spack/repos/builtin/packages/openal-soft/package.py index 01098972ba4f61..51d62c2c6ea0fe 100644 --- a/var/spack/repos/builtin/packages/openal-soft/package.py +++ b/var/spack/repos/builtin/packages/openal-soft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class OpenalSoft(CMakePackage): homepage = "https://openal-soft.org" url = "https://openal-soft.org/openal-releases/openal-soft-1.21.1.tar.bz2" + license("LGPL-2.0-or-later") + version("1.23.1", sha256="796f4b89134c4e57270b7f0d755f0fa3435b90da437b745160a49bd41c845b21") version("1.23.0", sha256="057dcf96c3cdfcf40159800a93f57740fe79c2956f76247bee10e436b6657183") version("1.21.1", sha256="c8ad767e9a3230df66756a21cc8ebf218a9d47288f2514014832204e666af5d8") diff --git a/var/spack/repos/builtin/packages/openbabel/package.py b/var/spack/repos/builtin/packages/openbabel/package.py index 4991e347cfce9e..65cff9e35c485d 100644 --- a/var/spack/repos/builtin/packages/openbabel/package.py +++ b/var/spack/repos/builtin/packages/openbabel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -63,13 +63,7 @@ def cmake_args(self): args = [] if "+python" in spec: - args.extend( - [ - "-DPYTHON_BINDINGS=ON", - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path), - "-DRUN_SWIG=ON", - ] - ) + args.extend(["-DPYTHON_BINDINGS=ON", "-DRUN_SWIG=ON"]) else: args.append("-DPYTHON_BINDINGS=OFF") diff --git a/var/spack/repos/builtin/packages/openblas/openblas_append_lflags.patch b/var/spack/repos/builtin/packages/openblas/openblas_append_lflags.patch new file mode 100644 index 00000000000000..4ae1427c33c5e8 --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas_append_lflags.patch @@ -0,0 +1,26 @@ +diff --git a/ctest/Makefile b/ctest/Makefile +index 0fb2450d28..9e85d23b96 100644 +--- a/ctest/Makefile ++++ b/ctest/Makefile +@@ -208,7 +208,7 @@ FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS) + ifeq ($(USE_OPENMP), 1) + ifeq ($(F_COMPILER), GFORTRAN) + ifeq ($(C_COMPILER), CLANG) +-CEXTRALIB = -lomp ++CEXTRALIB += -lomp + endif + endif + ifeq ($(F_COMPILER), NAG) +diff --git a/test/Makefile b/test/Makefile +index 923f1537c2..46a7b11583 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -265,7 +265,7 @@ FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS) + ifeq ($(USE_OPENMP), 1) + ifeq ($(F_COMPILER), GFORTRAN) + ifeq ($(C_COMPILER), CLANG) +-CEXTRALIB = -lomp ++CEXTRALIB += -lomp + endif + endif + ifeq ($(F_COMPILER), NAG) \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/openblas/openblas_libomp_fork.patch b/var/spack/repos/builtin/packages/openblas/openblas_libomp_fork.patch new file mode 100644 index 00000000000000..b1f94da72cfe77 --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/openblas_libomp_fork.patch @@ -0,0 +1,13 @@ +diff --git a/utest/Makefile b/utest/Makefile +index f99035440c..eab9046574 100644 +--- a/utest/Makefile ++++ b/utest/Makefile +@@ -29,8 +29,11 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Linux CYGWIN_NT)) + ifneq ($(USE_OPENMP), 1) + OBJS += test_fork.o + endif ++# LLVM's libomp throws an assertion when running the post fork test ++ifneq ($(C_COMPILER), CLANG) + OBJS += test_post_fork.o + endif ++endif diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index cd3bb0cdd4b348..c78cc698002d26 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,7 +23,11 @@ class Openblas(CMakePackage, MakefilePackage): libraries = ["libopenblas", "openblas"] + license("BSD-3-Clause") + version("develop", branch="develop") + version("0.3.26", sha256="4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68") + version("0.3.25", sha256="4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543") version("0.3.24", sha256="ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132") version("0.3.23", sha256="5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114") version("0.3.22", sha256="7fa9685926ba4f27cfe513adbf9af64d6b6b63f9dcabb37baefad6a65ff347a7") @@ -98,6 +102,9 @@ class Openblas(CMakePackage, MakefilePackage): provides("lapack@3.9.1:", when="@0.3.15:") provides("lapack@3.7.0", when="@0.2.20") + # https://github.com/OpenMathLib/OpenBLAS/pull/4328 + patch("xcode15-fortran.patch", when="@0.3.25 %apple-clang@15:") + # https://github.com/xianyi/OpenBLAS/pull/2519/files patch("ifort-msvc.patch", when="%msvc") @@ -197,6 +204,24 @@ class Openblas(CMakePackage, MakefilePackage): when="@0.3.21 %gcc@:9", ) + # Some installations of clang and libomp have non-standard locations for + # libomp. OpenBLAS adds the correct linker flags but overwrites the + # variables in a couple places, causing link-time failures. + patch("openblas_append_lflags.patch", when="@:0.3.23 threads=openmp") + + # Some builds of libomp on certain systems cause test failures related to + # forking, so disable the specific test that's failing. This is currently + # an open issue upstream: + # https://github.com/llvm/llvm-project/issues/63908 + patch("openblas_libomp_fork.patch", when="%clang@15:") + + # 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) @@ -375,6 +400,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()) diff --git a/var/spack/repos/builtin/packages/openblas/xcode15-fortran.patch b/var/spack/repos/builtin/packages/openblas/xcode15-fortran.patch new file mode 100644 index 00000000000000..7f56a3b5d0521e --- /dev/null +++ b/var/spack/repos/builtin/packages/openblas/xcode15-fortran.patch @@ -0,0 +1,22 @@ +From 47b03fd4b4ce7bc51d5b56397e52e6da3c5f3f36 Mon Sep 17 00:00:00 2001 +From: Martin Kroeker +Date: Sat, 18 Nov 2023 23:45:02 +0100 +Subject: [PATCH] Copy XCode15-specific workaround to Fortran flags to fix + build of tests + +--- + Makefile.system | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.system b/Makefile.system +index 1b84195e45..ff06e503cb 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -407,6 +407,7 @@ XCVER = $(shell pkgutil --pkg-info=com.apple.pkg.CLTools_Executables |awk '/vers + endif + ifeq (x$(XCVER), x 15) + CCOMMON_OPT += -Wl,-ld_classic ++FCOMMON_OPT += -Wl,-ld_classic + endif + endif + diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index 1c9683bd5d1b08..c6926bf064a19f 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opencascade/package.py b/var/spack/repos/builtin/packages/opencascade/package.py index 6179a6af917819..4c07bb5a7d1e84 100644 --- a/var/spack/repos/builtin/packages/opencascade/package.py +++ b/var/spack/repos/builtin/packages/opencascade/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,18 @@ class Opencascade(CMakePackage): maintainers("wdconinc") + license("LGPL-2.1-only") + + version( + "7.8.0", + extension="tar.gz", + sha256="b9c8f0a9d523ac1a606697f95fc39d8acf1140d3728561b8010a604431b4e9cf", + ) + version( + "7.7.2", + extension="tar.gz", + sha256="2fb23c8d67a7b72061b4f7a6875861e17d412d524527b2a96151ead1d9cfa2c1", + ) version( "7.7.1", extension="tar.gz", @@ -41,6 +53,11 @@ class Opencascade(CMakePackage): extension="tar.gz", sha256="e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd", ) + version( + "7.5.3p5", + extension="tar.gz", + sha256="29a4b4293f725bea2f32de5641b127452fc836a30e207d0daa5a0d1b746226b8", + ) version( "7.5.3p4", extension="tar.gz", diff --git a/var/spack/repos/builtin/packages/opencl-c-headers/package.py b/var/spack/repos/builtin/packages/opencl-c-headers/package.py index 77188800f25c65..37623e65c0bb1b 100644 --- a/var/spack/repos/builtin/packages/opencl-c-headers/package.py +++ b/var/spack/repos/builtin/packages/opencl-c-headers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class OpenclCHeaders(Package): url = "https://github.com/KhronosGroup/OpenCL-Headers/archive/v2020.06.16.tar.gz" maintainers("lorddavidiii") + license("Apache-2.0") + version( "2022.01.04", sha256="6e716e2b13fc8d363b40a165ca75021b102f9328e2b38f8054d7db5884de29c9" ) diff --git a/var/spack/repos/builtin/packages/opencl-clhpp/package.py b/var/spack/repos/builtin/packages/opencl-clhpp/package.py index ef55631705a180..84e3b8dad4968f 100644 --- a/var/spack/repos/builtin/packages/opencl-clhpp/package.py +++ b/var/spack/repos/builtin/packages/opencl-clhpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class OpenclClhpp(CMakePackage): url = "https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.12.tar.gz" maintainers("lorddavidiii") + license("Apache-2.0") + version("2.0.16", sha256="869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4") version("2.0.15", sha256="0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246") version("2.0.14", sha256="c8821a7638e57a2c4052631c941af720b581edda634db6ab0b59924c958d69b6") diff --git a/var/spack/repos/builtin/packages/opencl-headers/package.py b/var/spack/repos/builtin/packages/opencl-headers/package.py index 398fef559bb7bf..4db8654e17601c 100644 --- a/var/spack/repos/builtin/packages/opencl-headers/package.py +++ b/var/spack/repos/builtin/packages/opencl-headers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opencoarrays/package.py b/var/spack/repos/builtin/packages/opencoarrays/package.py index 3a0d595300eeae..22ff0f640052f8 100644 --- a/var/spack/repos/builtin/packages/opencoarrays/package.py +++ b/var/spack/repos/builtin/packages/opencoarrays/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Opencoarrays(CMakePackage): homepage = "http://www.opencoarrays.org/" url = "https://github.com/sourceryinstitute/OpenCoarrays/releases/download/2.2.0/OpenCoarrays-2.2.0.tar.gz" + license("BSD-3-Clause") + version("2.10.1", sha256="b04b8fa724e7e4e5addbab68d81d701414e713ab915bafdf1597ec5dd9590cd4") version("2.9.3", sha256="eeee0b3be665022ab6838c523ddab4af9c948d4147afd6cd7bc01f028583cfe1") version("2.9.2", sha256="6c200ca49808c75b0a2dfa984304643613b6bc77cc0044bee093f9afe03698f7") diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index d8db8f53626117..8e3f3236bb7b66 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,9 +15,12 @@ class Opencv(CMakePackage, CudaPackage): homepage = "https://opencv.org/" url = "https://github.com/opencv/opencv/archive/4.5.0.tar.gz" git = "https://github.com/opencv/opencv.git" + find_python_hints = False # opencv uses custom OpenCVDetectPython.cmake maintainers("bvanessen", "adamjstewart") + license("BSD-3-Clause") + version("master", branch="master") version("4.8.0", sha256="cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd") version("4.7.0", sha256="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973") diff --git a/var/spack/repos/builtin/packages/opendatadetector/package.py b/var/spack/repos/builtin/packages/opendatadetector/package.py index d54d3013a905f2..345c0c90e0dd41 100644 --- a/var/spack/repos/builtin/packages/opendatadetector/package.py +++ b/var/spack/repos/builtin/packages/opendatadetector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Opendatadetector(CMakePackage): tags = ["hep"] + license("MPL-2.0-no-copyleft-exception") + version("main", branch="main") version("v3.0.0", tag="v3.0.0", commit="e3b1eceae96fd5dddf10223753964c570ee868c9") version("v2", tag="v2", commit="7041ae086dff4ee4a8d5b65f5d9559acc6dbec47") diff --git a/var/spack/repos/builtin/packages/opendx/package.py b/var/spack/repos/builtin/packages/opendx/package.py index 88d690c020c240..27a7052f30ae2e 100644 --- a/var/spack/repos/builtin/packages/opendx/package.py +++ b/var/spack/repos/builtin/packages/opendx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py index af9f4b02b6383b..90e291c912fa0a 100644 --- a/var/spack/repos/builtin/packages/openexr/package.py +++ b/var/spack/repos/builtin/packages/openexr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Openexr(CMakePackage, AutotoolsPackage): homepage = "https://www.openexr.com/" url = "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.5.tar.gz" + license("BSD-3-Clause") + # New versions should come from github now version("3.2.0", sha256="b1b200606640547fceff0d3ebe01ac05c4a7ae2a131be7e9b3e5b9f491ef35b3") version("3.1.11", sha256="06b4a20d0791b5ec0f804c855d320a0615ce8445124f293616a086e093f1f1e1") diff --git a/var/spack/repos/builtin/packages/openfast/package.py b/var/spack/repos/builtin/packages/openfast/package.py index 77c46d891c33c1..d00f560c604105 100644 --- a/var/spack/repos/builtin/packages/openfast/package.py +++ b/var/spack/repos/builtin/packages/openfast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Openfast(CMakePackage): maintainers("jrood-nrel") + license("Apache-2.0") + version("develop", branch="dev") version("master", branch="main") version("3.4.1", tag="v3.4.1", commit="18704086dad861ab13daf804825da7c4b8d59428") diff --git a/var/spack/repos/builtin/packages/openfdtd/package.py b/var/spack/repos/builtin/packages/openfdtd/package.py index d65e1a48a0ebbd..ce32929ccd211d 100644 --- a/var/spack/repos/builtin/packages/openfdtd/package.py +++ b/var/spack/repos/builtin/packages/openfdtd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 01d57489ac534d..44408134bf727e 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -67,6 +67,8 @@ class OpenfoamOrg(Package): url = "https://github.com/OpenFOAM/OpenFOAM-6/archive/version-6.tar.gz" git = "https://github.com/OpenFOAM/OpenFOAM-dev.git" + license("GPL-3.0-or-later") + version("develop", branch="master") version("10", sha256="59d712ba798ca44b989b6ac50bcb7c534eeccb82bcf961e10ec19fc8d84000cf") version("9", sha256="0c48fb56e2fbb4dd534112811364d3b2dc12106e670a6486b361e4f864b435ee") @@ -120,7 +122,7 @@ class OpenfoamOrg(Package): sha256="05d17e17f94e6fe8188a9c0b91ed34c9b62259414589d908c152a4c40fe6b7e2", when="@7", ) - patch("50-etc.patch", when="@5.0:5.9") + patch("50-etc.patch", when="@5.0") patch("41-etc.patch", when="@4.1") patch("41-site.patch", when="@4.1:") patch("240-etc.patch", when="@:2.4.0") @@ -236,8 +238,24 @@ def rename_source(self): # to build correctly! parent = os.path.dirname(self.stage.source_path) original = os.path.basename(self.stage.source_path) - target = "OpenFOAM-{0}".format(self.version) - # Could also grep through etc/bashrc for WM_PROJECT_VERSION + + # Grep for WM_PROJECT_VERSION in etc/bashrc + # e.g. "export WM_PROJECT_VERSION=5.x" + # + # note: WM_PROJECT is assumed to be OpenFOAM and the project folder is assumed to + # be "OpenFOAM-${WM_PROJECT_VERSION}" + target = None + with open(join_path(self.stage.source_path, "etc/bashrc"), "r") as bashrc_file: + import re + + for line in bashrc_file.readlines(): + m = re.match("export WM_PROJECT_VERSION=(.*)", line) + if m: + target = f"OpenFOAM-{m.group(1)}" + break + if target is None: + raise InstallError("Failed to infer projet directory name from build script.") + with working_dir(parent): if original != target and not os.path.lexists(target): os.rename(original, target) diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 997aeee3f2a4c7..227fd34f03fbda 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -265,8 +265,11 @@ class Openfoam(Package): list_url = "https://sourceforge.net/projects/openfoam/files/" list_depth = 2 + license("GPL-3.0-or-later") + version("develop", branch="develop", submodules="True") version("master", branch="master", submodules="True") + version("2312", sha256="f113183a4d027c93939212af8967053c5f8fe76fb62e5848cb11bbcf8e829552") version("2306", sha256="d7fba773658c0f06ad17f90199565f32e9bf502b7bb03077503642064e1f5344") version( "2212_230612", sha256="604cd731173ec2a3645c838cf2468fae050a35c6340e2ca7c157699899d904c0" diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index be93be93cb0821..ec4271a0cfce0d 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Openfst(AutotoolsPackage): url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-1.6.1.tar.gz" list_url = "http://www.openfst.org/twiki/bin/view/FST/FstDownload" + license("Apache-2.0") + version("1.8.2", sha256="de987bf3624721c5d5ba321af95751898e4f4bb41c8a36e2d64f0627656d8b42") version("1.8.1", sha256="24fb53b72bb687e3fa8ee96c72a31ff2920d99b980a0a8f61dda426fca6713f0") version("1.7.9", sha256="9319aeb31d1e2950ae25449884e255cc2bc9dfaf987f601590763e61a10fbdde") diff --git a/var/spack/repos/builtin/packages/opengl/package.py b/var/spack/repos/builtin/packages/opengl/package.py index 21cc3b8cd7bf8e..280b8efc63b472 100644 --- a/var/spack/repos/builtin/packages/opengl/package.py +++ b/var/spack/repos/builtin/packages/opengl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,8 @@ class Opengl(BundlePackage): """Placeholder for external OpenGL libraries from hardware vendors""" homepage = "https://www.opengl.org/" - version("4.5") + maintainers("biddisco") # This should really be when='platform=linux' but can't because of a # current bug in when and how ArchSpecs are constructed @@ -82,16 +82,21 @@ def fetcher(self): def fetcher(self): _ = self.fetcher + @property + def headers(self): + return self.gl_headers + @property def libs(self): return self.gl_libs @property def gl_headers(self): - if "platform=darwin": - header_name = "OpenGL/gl.h" + spec = self.spec + if "platform=darwin" in spec: + header_name = "OpenGL/gl" else: - header_name = "GL/gl.h" + header_name = "GL/gl" return find_headers(header_name, root=self.prefix, recursive=True) @property diff --git a/var/spack/repos/builtin/packages/openglu/package.py b/var/spack/repos/builtin/packages/openglu/package.py index 5459c7148b7358..32fba46bd0b622 100644 --- a/var/spack/repos/builtin/packages/openglu/package.py +++ b/var/spack/repos/builtin/packages/openglu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openimagedenoise/package.py b/var/spack/repos/builtin/packages/openimagedenoise/package.py index 9ccce30a86c266..17354667cf4ff2 100644 --- a/var/spack/repos/builtin/packages/openimagedenoise/package.py +++ b/var/spack/repos/builtin/packages/openimagedenoise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,9 @@ class Openimagedenoise(CMakePackage): # maintainers("github_user1", "github_user2") + license("Apache-2.0") + + version("2.1.0", sha256="ce144ba582ff36563d9442ee07fa2a4d249bc85aa93e5b25fc527ff4ee755ed6") version("2.0.1", sha256="328eeb9809d18e835dca7203224af3748578794784c026940c02eea09c695b90") version("1.4.3", sha256="3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a") version("1.4.2", sha256="e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea") diff --git a/var/spack/repos/builtin/packages/openimageio/package.py b/var/spack/repos/builtin/packages/openimageio/package.py index baabda63ac73a5..f2f2169e5b89fc 100644 --- a/var/spack/repos/builtin/packages/openimageio/package.py +++ b/var/spack/repos/builtin/packages/openimageio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Openimageio(CMakePackage): homepage = "https://www.openimageio.org" url = "https://github.com/OpenImageIO/oiio/archive/Release-1.8.15.tar.gz" + license("Apache-2.0") + version("2.2.7.0", sha256="857ac83798d6d2bda5d4d11a90618ff19486da2e5a4c4ff022c5976b5746fe8c") version("1.8.15", sha256="4d5b4ed3f2daaed69989f53c0f9364dd87c82dc0a09807b5b6e9008e2426e86f") diff --git a/var/spack/repos/builtin/packages/openipmi/package.py b/var/spack/repos/builtin/packages/openipmi/package.py index 726093bcd3e7f5..7f4aea4d7e705a 100644 --- a/var/spack/repos/builtin/packages/openipmi/package.py +++ b/var/spack/repos/builtin/packages/openipmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openjdk/package.py b/var/spack/repos/builtin/packages/openjdk/package.py index bf614b6465f393..532e56ee1afe2b 100644 --- a/var/spack/repos/builtin/packages/openjdk/package.py +++ b/var/spack/repos/builtin/packages/openjdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py index d420cc274cbd49..4a00fcc42b584e 100644 --- a/var/spack/repos/builtin/packages/openjpeg/package.py +++ b/var/spack/repos/builtin/packages/openjpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Openjpeg(CMakePackage): homepage = "https://github.com/uclouvain/openjpeg" url = "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz" + license("BSD-2-Clause-NetBSD") + version("2.5.0", sha256="0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a") version("2.4.0", sha256="8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d") version("2.3.1", sha256="63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9") diff --git a/var/spack/repos/builtin/packages/openkim-models/package.py b/var/spack/repos/builtin/packages/openkim-models/package.py index 9c629e018f58bb..dd2156ba3247c7 100644 --- a/var/spack/repos/builtin/packages/openkim-models/package.py +++ b/var/spack/repos/builtin/packages/openkim-models/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,8 @@ class OpenkimModels(CMakePackage): depends_on("kim-api@2.1.0:", when="@2019-07-25:") depends_on("kim-api@:2.0.2", when="@:2019-03-29") + license("CDDL-1.0") + version( "2021-01-28", sha256="8824adee02ae4583bd378cc81140fbb49515c5965708ee98d856d122d48dd95f" ) diff --git a/var/spack/repos/builtin/packages/openldap/package.py b/var/spack/repos/builtin/packages/openldap/package.py index 78a3f2e836b9e8..b754e941f8a255 100644 --- a/var/spack/repos/builtin/packages/openldap/package.py +++ b/var/spack/repos/builtin/packages/openldap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Openldap(AutotoolsPackage): homepage = "https://www.openldap.org/" url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.0.tgz" + license("OLDAP-2.8") + version("2.6.4", sha256="d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991") version("2.6.0", sha256="b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f") version("2.4.49", sha256="e3b117944b4180f23befe87d0dcf47f29de775befbc469dcf4ac3dab3311e56e") diff --git a/var/spack/repos/builtin/packages/openlibm/package.py b/var/spack/repos/builtin/packages/openlibm/package.py index 41726415770f23..2645969ad9cbd3 100644 --- a/var/spack/repos/builtin/packages/openlibm/package.py +++ b/var/spack/repos/builtin/packages/openlibm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Openlibm(MakefilePackage): maintainers("haampie") + license("MIT AND BSD-2-Clause AND ISC AND LGPL-2.1-or-later") + version("0.8.1", sha256="ba8a282ecd92d0033f5656bb20dfc6ea3fb83f90ba69291ac8f7beba42dcffcf") version("0.8.0", sha256="03620768df4ca526a63dd675c6de95a5c9d167ff59555ce57a61c6bf49e400ee") version("0.7.5", sha256="be983b9e1e40e696e8bbb7eb8f6376d3ca0ae675ae6d82936540385b0eeec15b") diff --git a/var/spack/repos/builtin/packages/openloops/package.py b/var/spack/repos/builtin/packages/openloops/package.py index 23d6d7c1c941bd..3c82765fd429e6 100644 --- a/var/spack/repos/builtin/packages/openloops/package.py +++ b/var/spack/repos/builtin/packages/openloops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Openloops(Package): tags = ["hep"] + license("GPL-3.0-only") + version("2.1.2", sha256="f52575cae3d70b6b51a5d423e9cd0e076ed5961afcc015eec00987e64529a6ae") version("2.1.1", sha256="f1c47ece812227eab584e2c695fef74423d2f212873f762b8658f728685bcb91") diff --git a/var/spack/repos/builtin/packages/openmc/package.py b/var/spack/repos/builtin/packages/openmc/package.py index 6f790f8c369387..67ad7d6337f72f 100644 --- a/var/spack/repos/builtin/packages/openmc/package.py +++ b/var/spack/repos/builtin/packages/openmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openmm/package.py b/var/spack/repos/builtin/packages/openmm/package.py index 6bdac8640351d2..9c8273cc6b60a2 100644 --- a/var/spack/repos/builtin/packages/openmm/package.py +++ b/var/spack/repos/builtin/packages/openmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openmolcas/package.py b/var/spack/repos/builtin/packages/openmolcas/package.py index 0db8aaeae5636c..c3a59df79de2d6 100644 --- a/var/spack/repos/builtin/packages/openmolcas/package.py +++ b/var/spack/repos/builtin/packages/openmolcas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Openmolcas(CMakePackage): homepage = "https://gitlab.com/Molcas/OpenMolcas" url = "https://github.com/Molcas/OpenMolcas/archive/v19.11.tar.gz" + license("LGPL-2.1-or-later") + version("23.06", sha256="31727161c15ea588217c6511a3007792c74c35391849fa0296c2288d836cf951") version("21.02", sha256="d0b9731a011562ff4740c0e67e48d9af74bf2a266601a38b37640f72190519ca") version("19.11", sha256="8ebd1dcce98fc3f554f96e54e34f1e8ad566c601196ee68153763b6c0a04c7b9") @@ -42,11 +44,7 @@ def setup_run_environment(self, env): env.append_path("PATH", self.prefix) def cmake_args(self): - args = [ - "-DLINALG=OpenBLAS", - "-DOPENBLASROOT=%s" % self.spec["openblas"].prefix, - "-DPYTHON_EXECUTABLE=%s" % self.spec["python"].command.path, - ] + args = ["-DLINALG=OpenBLAS", "-DOPENBLASROOT=%s" % self.spec["openblas"].prefix] if "+mpi" in self.spec: mpi_args = [ "-DMPI=ON", diff --git a/var/spack/repos/builtin/packages/openmpi/accelerator-build-components-as-dso-s-by-default.patch b/var/spack/repos/builtin/packages/openmpi/accelerator-build-components-as-dso-s-by-default.patch new file mode 100644 index 00000000000000..a4b5bf73420916 --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/accelerator-build-components-as-dso-s-by-default.patch @@ -0,0 +1,81 @@ +From 7e2e390e468db44c8540d2510841a22d146fa6ed Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Tue, 7 Nov 2023 10:06:47 -0500 +Subject: [PATCH] accelerator: build components as dso's by default + +also need to switch rcache/gpsum and rcache/rgpusum + +to DSO by default. + +Fix a problem in opal_mca.m4 where the enable-mca-dso list wasn't being +processed correctly starting with 5.0.0. + +related to #12036 + +Signed-off-by: Howard Pritchard + +diff --git a/config/opal_mca.m4 b/config/opal_mca.m4 +index 935b8c65..b425fe63 100644 +--- a/config/opal_mca.m4 ++++ b/config/opal_mca.m4 +@@ -13,7 +13,7 @@ dnl All rights reserved. + dnl Copyright (c) 2010-2021 Cisco Systems, Inc. All rights reserved + dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + dnl Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. +-dnl Copyright (c) 2021 Triad National Security, LLC. All rights ++dnl Copyright (c) 2021-2023 Triad National Security, LLC. All rights + dnl reserved. + dnl $COPYRIGHT$ + dnl +@@ -167,6 +167,9 @@ of type-component pairs. For example, --enable-mca-no-build=pml-ob1]) + # Second, set the DSO_all and STATIC_all variables. conflict + # resolution (prefer static) is done in the big loop below + # ++ # Exception here is the components of the accelerator framework, ++ # which by default are built to be dynamic, except for null. ++ # + AC_MSG_CHECKING([which components should be run-time loadable]) + if test "$enable_static" != "no"; then + DSO_all=0 +@@ -174,9 +177,6 @@ of type-component pairs. For example, --enable-mca-no-build=pml-ob1]) + elif test "$OPAL_ENABLE_DLOPEN_SUPPORT" = 0; then + DSO_all=0 + msg="none (dlopen disabled)" +- elif test -z "$enable_mca_dso"; then +- DSO_all=0 +- msg=default + elif test "$enable_mca_dso" = "no"; then + DSO_all=0 + msg=none +@@ -184,15 +184,19 @@ of type-component pairs. For example, --enable-mca-no-build=pml-ob1]) + DSO_all=1 + msg=all + else +- DSO_all=0 +- ifs_save="$IFS" +- IFS="${IFS}$PATH_SEPARATOR," +- msg= +- for item in $enable_mca_dso; do +- AS_VAR_SET([AS_TR_SH([DSO_$item])], [1]) +- msg="$item $msg" +- done +- IFS="$ifs_save" ++ msg= ++ if test -z "$enable_mca_dso"; then ++ enable_mca_dso="accelerator-cuda,accelerator-rocm,accelerator-ze,btl-smcuda,rcache-gpusm,rcache-rgpusm" ++ msg="(default)" ++ fi ++ DSO_all=0 ++ ifs_save="$IFS" ++ IFS="${IFS}$PATH_SEPARATOR," ++ for item in $enable_mca_dso; do ++ AS_VAR_SET([AS_TR_SH([DSO_$item])], [1]) ++ msg="$item $msg" ++ done ++ IFS="$ifs_save" + fi + AC_MSG_RESULT([$msg]) + unset msg +-- +2.35.3 + diff --git a/var/spack/repos/builtin/packages/openmpi/accelerator-cuda-fix-bug-in-makefile.patch b/var/spack/repos/builtin/packages/openmpi/accelerator-cuda-fix-bug-in-makefile.patch new file mode 100644 index 00000000000000..f0681b6ad5d41c --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/accelerator-cuda-fix-bug-in-makefile.patch @@ -0,0 +1,33 @@ +From be28fa6421094fcd0c544a6d457c6d748670959a Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Mon, 13 Nov 2023 08:12:28 -0700 +Subject: [PATCH] accelerator/cuda: fix bug in makefile.am + +that prevents correct linkage of libcuda.so if it is in +a non standard location. + +Related to https://github.com/spack/spack/pull/40913 + +Signed-off-by: Howard Pritchard + +diff --git a/opal/mca/accelerator/cuda/Makefile.am b/opal/mca/accelerator/cuda/Makefile.am +index 5646890b..2c533ece 100644 +--- a/opal/mca/accelerator/cuda/Makefile.am ++++ b/opal/mca/accelerator/cuda/Makefile.am +@@ -34,11 +34,11 @@ mcacomponentdir = $(opallibdir) + mcacomponent_LTLIBRARIES = $(component_install) + + mca_accelerator_cuda_la_SOURCES = $(sources) +-mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version ++mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS) + mca_accelerator_cuda_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ + $(accelerator_cuda_LIBS) + + noinst_LTLIBRARIES = $(component_noinst) + libmca_accelerator_cuda_la_SOURCES =$(sources) +-libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version ++libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS) + libmca_accelerator_cuda_la_LIBADD = $(accelerator_cuda_LIBS) +-- +2.35.3 + diff --git a/var/spack/repos/builtin/packages/openmpi/btlsmcuda-fix-problem-with-makefile.patch b/var/spack/repos/builtin/packages/openmpi/btlsmcuda-fix-problem-with-makefile.patch new file mode 100644 index 00000000000000..44b4d2766d583e --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/btlsmcuda-fix-problem-with-makefile.patch @@ -0,0 +1,73 @@ +From 27672784304d4c944e2e3c7d526dfd77f021a113 Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Thu, 16 Nov 2023 07:05:01 -0700 +Subject: [PATCH] btlsmcuda: fix problem with makefile + +when libcuda.so is in a non-standard location. + +also fix rcache/gpusm and rcache/rgpsum + +Similar fix to that in #12065 + +Signed-off-by: Howard Pritchard + +diff --git a/opal/mca/btl/smcuda/Makefile.am b/opal/mca/btl/smcuda/Makefile.am +index f1a89df8..8ee37add 100644 +--- a/opal/mca/btl/smcuda/Makefile.am ++++ b/opal/mca/btl/smcuda/Makefile.am +@@ -51,7 +51,7 @@ endif + mcacomponentdir = $(opallibdir) + mcacomponent_LTLIBRARIES = $(component_install) + mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources) +-mca_btl_smcuda_la_LDFLAGS = -module -avoid-version ++mca_btl_smcuda_la_LDFLAGS = -module -avoid-version $(btl_smcuda_LDFLAGS) + mca_btl_smcuda_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ + $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_NAME@mca_common_sm.la \ + $(btl_smcuda_LIBS) +@@ -59,6 +59,6 @@ mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS) + + noinst_LTLIBRARIES = $(component_noinst) + libmca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources) +-libmca_btl_smcuda_la_LDFLAGS = -module -avoid-version ++libmca_btl_smcuda_la_LDFLAGS = -module -avoid-version $(btl_smcuda_LDFLAGS) + libmca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS) + libmca_btl_smcuda_la_LIBADD = $(btl_smcuda_LIBS) +diff --git a/opal/mca/rcache/gpusm/Makefile.am b/opal/mca/rcache/gpusm/Makefile.am +index 5645e5ea..1ff63b35 100644 +--- a/opal/mca/rcache/gpusm/Makefile.am ++++ b/opal/mca/rcache/gpusm/Makefile.am +@@ -48,11 +48,11 @@ endif + mcacomponentdir = $(opallibdir) + mcacomponent_LTLIBRARIES = $(component_install) + mca_rcache_gpusm_la_SOURCES = $(sources) +-mca_rcache_gpusm_la_LDFLAGS = -module -avoid-version ++mca_rcache_gpusm_la_LDFLAGS = -module -avoid-version $(rcache_gpusm_LDFLAGS) + mca_rcache_gpusm_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ + $(rcache_gpusm_LIBS) + + noinst_LTLIBRARIES = $(component_noinst) + libmca_rcache_gpusm_la_SOURCES = $(sources) +-libmca_rcache_gpusm_la_LDFLAGS = -module -avoid-version ++libmca_rcache_gpusm_la_LDFLAGS = -module -avoid-version $(rcache_gpusm_LDFLAGS) + libmca_rcache_gpusm_la_LIBADD = $(rcache_gpusm_LIBS) +diff --git a/opal/mca/rcache/rgpusm/Makefile.am b/opal/mca/rcache/rgpusm/Makefile.am +index 6d2fdbc3..dde81411 100644 +--- a/opal/mca/rcache/rgpusm/Makefile.am ++++ b/opal/mca/rcache/rgpusm/Makefile.am +@@ -46,11 +46,11 @@ endif + mcacomponentdir = $(opallibdir) + mcacomponent_LTLIBRARIES = $(component_install) + mca_rcache_rgpusm_la_SOURCES = $(sources) +-mca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version ++mca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version $(rcache_rgpusm_LDFLAGS) + mca_rcache_rgpusm_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ + $(rcache_rgpusm_LIBS) + + noinst_LTLIBRARIES = $(component_noinst) + libmca_rcache_rgpusm_la_SOURCES = $(sources) +-libmca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version ++libmca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version $(rcache_rgpusm_LDFLAGS) + libmca_rcache_rgpusm_la_LIBADD = $(rcache_rgpusm_LIBS) +-- +2.35.3 + diff --git a/var/spack/repos/builtin/packages/openmpi/fix-for-dlopen-missing-symbol-problem.patch b/var/spack/repos/builtin/packages/openmpi/fix-for-dlopen-missing-symbol-problem.patch new file mode 100644 index 00000000000000..0a846b03264a5b --- /dev/null +++ b/var/spack/repos/builtin/packages/openmpi/fix-for-dlopen-missing-symbol-problem.patch @@ -0,0 +1,32 @@ +From 50731f03c1ae9d375bfc2771fc402d54fd22e276 Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Sat, 4 Nov 2023 13:24:15 -0600 +Subject: [PATCH] spack:fix for dlopen missing symbol problem + +related to https://github.com/spack/spack/pull/40725 + +Signed-off-by: Howard Pritchard + +diff --git a/opal/mca/dl/dlopen/configure.m4 b/opal/mca/dl/dlopen/configure.m4 +index 07fda82001..4ae625b1fb 100644 +--- a/opal/mca/dl/dlopen/configure.m4 ++++ b/opal/mca/dl/dlopen/configure.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([MCA_opal_dl_dlopen_CONFIG],[ + AC_CONFIG_FILES([opal/mca/dl/dlopen/Makefile]) + + OAC_CHECK_PACKAGE([dlopen], +- [dl_dlopen], ++ [opal_dl_dlopen], + [dlfcn.h], + [dl], + [dlopen], +@@ -38,5 +38,5 @@ AC_DEFUN([MCA_opal_dl_dlopen_CONFIG],[ + [$1], + [$2]) + +- AC_SUBST(dl_dlopen_LIBS) ++ AC_SUBST(opal_dl_dlopen_LIBS) + ]) +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 3fcd24584782d0..ea6b8967530a6d 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -38,14 +38,22 @@ class Openmpi(AutotoolsPackage, CudaPackage): tags = ["e4s"] + license("custom") + version("main", branch="main", submodules=True) # Current version( - "4.1.6", sha256="f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415" - ) # libmpi.so.40.30.6 + "5.0.1", sha256="e357043e65fd1b956a47d0dae6156a90cf0e378df759364936c1781f1a25ef80" + ) # libmpi.so.40.40.1 # Still supported + version( + "5.0.0", sha256="9d845ca94bc1aeb445f83d98d238cd08f6ec7ad0f73b0f79ec1668dbfdacd613" + ) # libmpi.so.40.40.0 + version( + "4.1.6", sha256="f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415" + ) # libmpi.so.40.30.6 version( "4.1.5", sha256="a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3" ) # libmpi.so.40.30.5 @@ -403,10 +411,20 @@ class Openmpi(AutotoolsPackage, CudaPackage): # To fix performance regressions introduced while fixing a bug in older # gcc versions on x86_64, Refs. open-mpi/ompi#8603 patch("opal_assembly_arch.patch", when="@4.0.0:4.0.5,4.1.0") + # To fix an error in Open MPI configury related to findng dl lib. + # This is specific to the 5.0.0 release. + patch("fix-for-dlopen-missing-symbol-problem.patch", when="@5.0.0") + # Patches to accelerator CUDA component to link in libcuda + # when in non-standard location + patch("accelerator-cuda-fix-bug-in-makefile.patch", when="@5.0.0") + patch("btlsmcuda-fix-problem-with-makefile.patch", when="@5.0.0") + patch("accelerator-build-components-as-dso-s-by-default.patch", when="@5.0.0:5.0.1") # Patch to allow two-level namespace on a MacOS platform when building # openmpi. Unfortuntately, the openmpi configure command has flat namespace - # hardwired in. + # hardwired in. In spack, this only works for openmpi up to versions 4, + # because for versions 5+ autoreconf is triggered (see below) and this + # patch needs to be applied (again) AFTER autoreconf ran. def patch(self): spec = self.spec if "+two_level_namespace" in spec and spec.satisfies("platform=darwin"): @@ -446,7 +464,7 @@ def patch(self): # Additional support options variant("atomics", default=False, description="Enable built-in atomics") variant("java", default=False, when="@1.7.4:", description="Build Java support") - variant("static", default=True, description="Build static libraries") + variant("static", default=False, description="Build static libraries") variant("sqlite3", default=False, when="@1.7.3:1", description="Build SQLite3 support") variant("vt", default=True, description="Build VampirTrace support") variant( @@ -479,7 +497,8 @@ def patch(self): description="Build deprecated support for the Singularity container", ) variant("lustre", default=False, description="Lustre filesystem library support") - variant("romio", default=True, description="Enable ROMIO support") + variant("romio", default=True, when="@:5", description="Enable ROMIO support") + variant("romio", default=False, when="@5:", description="Enable ROMIO support") variant("rsh", default=True, description="Enable rsh (openssh) process lifecycle management") variant( "orterunprefix", @@ -507,6 +526,7 @@ def patch(self): # Variants to use internal packages variant("internal-hwloc", default=False, description="Use internal hwloc") variant("internal-pmix", default=False, description="Use internal pmix") + variant("internal-libevent", default=False, description="Use internal libevent") variant("openshmem", default=False, description="Enable building OpenSHMEM") variant( @@ -526,10 +546,9 @@ def patch(self): if sys.platform != "darwin": depends_on("numactl") - depends_on("autoconf @2.69:", type="build", when="@main") - depends_on("automake @1.13.4:", type="build", when="@main") - depends_on("libtool @2.4.2:", type="build", when="@main") - depends_on("m4", type="build", when="@main") + depends_on("autoconf @2.69:", type="build", when="@5.0.0:,main") + depends_on("automake @1.13.4:", type="build", when="@5.0.0:,main") + depends_on("libtool @2.4.2:", type="build", when="@5.0.0:,main") depends_on("perl", type="build") depends_on("pkgconfig", type="build") @@ -583,10 +602,12 @@ def patch(self): depends_on("pmix@:4.2.2", when="@:4.1.5") # Libevent is required when *vendored* PMIx is used - depends_on("libevent@2:", when="@main") + depends_on("libevent@2:", when="~internal-libevent") depends_on("openssh", type="run", when="+rsh") + depends_on("cuda", type=("build", "link", "run"), when="@5: +cuda") + conflicts("+cxx_exceptions", when="%nvhpc", msg="nvc does not ignore -fexceptions, but errors") # CUDA support was added in 1.7, and since the variant is part of the @@ -613,7 +634,7 @@ def patch(self): conflicts( "schedulers=slurm ~pmi", when="@1.5.4", - msg="+pmi is required for openmpi to work with SLURM.", + msg="+pmi is required for openmpi to work with Slurm.", ) conflicts( "schedulers=loadleveler", @@ -929,6 +950,14 @@ def autoreconf(self, spec, prefix): perl = which("perl") perl("autogen.pl") + @when("@5.0.0:5.0.1") + def autoreconf(self, spec, prefix): + perl = which("perl") + perl("autogen.pl", "--force") + if "+two_level_namespace" in spec and spec.satisfies("platform=darwin"): + print("Re-applying configure patch for two_level_namespace on MacOS after autoreconf") + filter_file(r"-flat_namespace", "-commons,use_dylibs", "configure") + def configure_args(self): spec = self.spec config_args = ["--enable-shared", "--disable-silent-rules", "--disable-sphinx"] @@ -1111,6 +1140,23 @@ def configure_args(self): if wrapper_ldflags: config_args.append("--with-wrapper-ldflags={0}".format(" ".join(wrapper_ldflags))) + # + # the Spack path padding feature causes issues with Open MPI's lex based parsing system + # used by the compiler wrappers. Crank up lex buffer to 1MB to handle this. + # see https://spack.readthedocs.io/en/latest/binary_caches.html#relocation + # + + if spec.satisfies("@5.0.0:"): + config_args.append("CFLAGS=-DYY_BUF_SIZE=1048576") + + # + # disable romio for 5.0.0 or newer if using Intel OneAPI owing to a problem + # building ZE related components of the romio packaged with this release + # + + # if spec.satisfies("@5.0.0:") and spec.satisfies("%oneapi"): + # config_args.append("--disable-io-romio") + return config_args @run_after("install", when="+wrapper-rpath") diff --git a/var/spack/repos/builtin/packages/openmx/package.py b/var/spack/repos/builtin/packages/openmx/package.py index 21977168fa34d9..96626672ec18ea 100644 --- a/var/spack/repos/builtin/packages/openmx/package.py +++ b/var/spack/repos/builtin/packages/openmx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opennurbs/package.py b/var/spack/repos/builtin/packages/opennurbs/package.py index 0a32a12140f0b6..cd583f0f888ca5 100644 --- a/var/spack/repos/builtin/packages/opennurbs/package.py +++ b/var/spack/repos/builtin/packages/opennurbs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Opennurbs(Package): maintainers("jrood-nrel") + license("Zlib") + version("develop", branch="develop") version( diff --git a/var/spack/repos/builtin/packages/openpa/package.py b/var/spack/repos/builtin/packages/openpa/package.py index a506b2f9475d79..63f73bbb7492cd 100644 --- a/var/spack/repos/builtin/packages/openpa/package.py +++ b/var/spack/repos/builtin/packages/openpa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Openpa(AutotoolsPackage): homepage = "https://github.com/pmodels/openpa" url = "https://github.com/pmodels/openpa/releases/download/v1.0.4/openpa-1.0.4.tar.gz" + license("mpich2") + version("1.0.4", sha256="9e5904b3bbdcb24e8429c12d613422e716a3479f3e0aeefbd9ce546852899e3a") version("1.0.3", sha256="b73943f341b0d4475109f8f341a5229258e43510b62cb5d488cf7f0e84fa5557") version("1.0.2", sha256="13b5ef8ea3502822ab03861bf9d047c3bda722b22605edf3f508fb355746db4f") diff --git a/var/spack/repos/builtin/packages/openpbs/package.py b/var/spack/repos/builtin/packages/openpbs/package.py index 7bc9e45ad07779..1a588e95b1436e 100644 --- a/var/spack/repos/builtin/packages/openpbs/package.py +++ b/var/spack/repos/builtin/packages/openpbs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Openpbs(AutotoolsPackage): homepage = "https://www.openpbs.org" url = "https://github.com/openpbs/openpbs/archive/v19.1.3.tar.gz" + license("AGPL-3.0-only") + version("20.0.1", sha256="685a4abcea92bf518df02b544d25e237ae8cef76f86525f7bf3554812e9f50fa") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index bb9bdccc469c97..b114ed8efebf92 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class OpenpmdApi(CMakePackage): tags = ["e4s"] + license("LGPL-3.0-only") + # C++17 up until here version("develop", branch="dev") version("0.15.2", sha256="fbe3b356fe6f4589c659027c8056844692c62382e3ec53b953bed1c87e58ba13") @@ -121,13 +123,7 @@ def cmake_args(self): # switch internally shipped third-party libraries for spack if spec.satisfies("+python"): - py_exe_define = ( - "Python_EXECUTABLE" if spec.version >= Version("0.13.0") else "PYTHON_EXECUTABLE" - ) - args += [ - self.define(py_exe_define, self.spec["python"].command.path), - self.define("openPMD_USE_INTERNAL_PYBIND11", False), - ] + args.append(self.define("openPMD_USE_INTERNAL_PYBIND11", False)) args.append(self.define("openPMD_USE_INTERNAL_JSON", False)) if spec.satisfies("@:0.14"): # pre C++17 releases diff --git a/var/spack/repos/builtin/packages/openradioss-engine/package.py b/var/spack/repos/builtin/packages/openradioss-engine/package.py index 49089ee413e577..9dcd3591558fab 100644 --- a/var/spack/repos/builtin/packages/openradioss-engine/package.py +++ b/var/spack/repos/builtin/packages/openradioss-engine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class OpenradiossEngine(CMakePackage): homepage = "https://www.openradioss.org/" git = "https://github.com/OpenRadioss/OpenRadioss.git" + license("AGPL-3.0-or-later") + maintainers("kjrstory") version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/openradioss-starter/package.py b/var/spack/repos/builtin/packages/openradioss-starter/package.py index 36d6b8fc7cd357..edede265c9b211 100644 --- a/var/spack/repos/builtin/packages/openradioss-starter/package.py +++ b/var/spack/repos/builtin/packages/openradioss-starter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class OpenradiossStarter(CMakePackage): homepage = "https://www.openradioss.org/" git = "https://github.com/OpenRadioss/OpenRadioss.git" + license("AGPL-3.0-only") + maintainers("kjrstory") version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/openrasmol/package.py b/var/spack/repos/builtin/packages/openrasmol/package.py index ef90a5c7ffb976..b7064e810bd336 100644 --- a/var/spack/repos/builtin/packages/openrasmol/package.py +++ b/var/spack/repos/builtin/packages/openrasmol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Openrasmol(MakefilePackage): homepage = "http://www.openrasmol.org/" url = "https://sourceforge.net/projects/openrasmol/files/RasMol/RasMol_2.7.5/RasMol-2.7.5.2.tar.gz" + license("GPL-2.0-only") + version("2.7.5.2", sha256="b975e6e69d5c6b161a81f04840945d2f220ac626245c61bcc6c56181b73a5718") depends_on("imake", type="build") diff --git a/var/spack/repos/builtin/packages/openresty/package.py b/var/spack/repos/builtin/packages/openresty/package.py index 33daed33f1d841..5c4ca053eea269 100644 --- a/var/spack/repos/builtin/packages/openresty/package.py +++ b/var/spack/repos/builtin/packages/openresty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Openresty(AutotoolsPackage): homepage = "https://github.com/openresty" url = "https://github.com/openresty/openresty/releases/download/v1.15.8.2/openresty-1.15.8.2.tar.gz" + license("BSD-2-Clause") + version("1.15.8.2", sha256="bf92af41d3ad22880047a8b283fc213d59c7c1b83f8dae82e50d14b64d73ac38") version("1.15.8.1", sha256="89a1238ca177692d6903c0adbea5bdf2a0b82c383662a73c03ebf5ef9f570842") version("1.13.6.2", sha256="946e1958273032db43833982e2cec0766154a9b5cb8e67868944113208ff2942") diff --git a/var/spack/repos/builtin/packages/openscenegraph/package.py b/var/spack/repos/builtin/packages/openscenegraph/package.py index bce48ff1c13868..68067f696019cf 100644 --- a/var/spack/repos/builtin/packages/openscenegraph/package.py +++ b/var/spack/repos/builtin/packages/openscenegraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Openscenegraph(CMakePackage): maintainers("aumuell") + license("LGPL-2.1-or-later") + version("master", branch="master") version("stable", branch="OpenSceneGraph-3.6") version("3.6.5", sha256="aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12") diff --git a/var/spack/repos/builtin/packages/openslide/package.py b/var/spack/repos/builtin/packages/openslide/package.py index 74d85d61088f2f..e9992484be3996 100644 --- a/var/spack/repos/builtin/packages/openslide/package.py +++ b/var/spack/repos/builtin/packages/openslide/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Openslide(AutotoolsPackage): homepage = "https://openslide.org/" url = "https://github.com/openslide/openslide/releases/download/v3.4.1/openslide-3.4.1.tar.xz" + license("LGPL-2.1-only") + version("3.4.1", sha256="9938034dba7f48fadc90a2cdf8cfe94c5613b04098d1348a5ff19da95b990564") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/openslp/package.py b/var/spack/repos/builtin/packages/openslp/package.py index 1887fe419c6819..6e77b75dbfa3fa 100644 --- a/var/spack/repos/builtin/packages/openslp/package.py +++ b/var/spack/repos/builtin/packages/openslp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index 2ea669fdab648e..7fa3e646e3f908 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -236,26 +236,19 @@ def set_defaultbase_cmake_options(self, spec, cmake_options): # Appends to cmake_options the options that will enable # the appropriate base level options to the openspeedshop # cmake build. - python_exe = spec["python"].command.path - python_library = spec["python"].libs[0] - python_include = spec["python"].headers.directories[0] - - base_options = [] - - base_options.append("-DBINUTILS_DIR=%s" % spec["binutils"].prefix) - base_options.append("-DLIBELF_DIR=%s" % spec["elfutils"].prefix) - base_options.append("-DLIBDWARF_DIR=%s" % spec["libdwarf"].prefix) - base_options.append("-DPYTHON_EXECUTABLE=%s" % python_exe) - base_options.append("-DPYTHON_INCLUDE_DIR=%s" % python_include) - base_options.append("-DPYTHON_LIBRARY=%s" % python_library) - base_options.append("-DBoost_NO_SYSTEM_PATHS=TRUE") - base_options.append("-DBoost_NO_BOOST_CMAKE=TRUE") - base_options.append("-DBOOST_ROOT=%s" % spec["boost"].prefix) - base_options.append("-DBoost_DIR=%s" % spec["boost"].prefix) - base_options.append("-DBOOST_LIBRARYDIR=%s" % spec["boost"].prefix.lib) - base_options.append("-DDYNINST_DIR=%s" % spec["dyninst"].prefix) - - cmake_options.extend(base_options) + cmake_options.extend( + [ + self.define("BINUTILS_DIR", spec["binutils"].prefix), + self.define("LIBELF_DIR", spec["elfutils"].prefix), + self.define("LIBDWARF_DIR", spec["libdwarf"].prefix), + self.define("Boost_NO_SYSTEM_PATHS", True), + self.define("Boost_NO_BOOST_CMAKE", True), + self.define("BOOST_ROOT", spec["boost"].prefix), + self.define("Boost_DIR", spec["boost"].prefix), + self.define("BOOST_LIBRARYDIR", spec["boost"].prefix.lib), + self.define("DYNINST_DIR", spec["dyninst"].prefix), + ] + ) def set_mpi_cmake_options(self, spec, cmake_options): # Appends to cmake_options the options that will enable diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 0c8ef30946cf52..5ef937a0f8e92e 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Openspeedshop(CMakePackage): maintainers("jgalarowicz") + license("GPL-2.0-only") + version("develop", branch="master") version("2.4.2.1", branch="2.4.2.1") version("2.4.2", branch="2.4.2") @@ -252,27 +254,19 @@ def set_defaultbase_cmake_options(self, spec, cmake_options): # Appends to cmake_options the options that will enable # the appropriate base level options to the openspeedshop # cmake build. - python_exe = spec["python"].command.path - python_library = spec["python"].libs[0] - python_include = spec["python"].headers.directories[0] - true_value = "TRUE" - - base_options = [] - - base_options.append("-DBINUTILS_DIR=%s" % spec["binutils"].prefix) - base_options.append("-DLIBELF_DIR=%s" % spec["elfutils"].prefix) - base_options.append("-DLIBDWARF_DIR=%s" % spec["libdwarf"].prefix) - base_options.append("-DPYTHON_EXECUTABLE=%s" % python_exe) - base_options.append("-DPYTHON_INCLUDE_DIR=%s" % python_include) - base_options.append("-DPYTHON_LIBRARY=%s" % python_library) - base_options.append("-DBoost_NO_SYSTEM_PATHS=%s" % true_value) - base_options.append("-DBoost_NO_BOOST_CMAKE=%s" % true_value) - base_options.append("-DBOOST_ROOT=%s" % spec["boost"].prefix) - base_options.append("-DBoost_DIR=%s" % spec["boost"].prefix) - base_options.append("-DBOOST_LIBRARYDIR=%s" % spec["boost"].prefix.lib) - base_options.append("-DDYNINST_DIR=%s" % spec["dyninst"].prefix) - - cmake_options.extend(base_options) + cmake_options.extend( + [ + self.define("BINUTILS_DIR", spec["binutils"].prefix), + self.define("LIBELF_DIR", spec["elfutils"].prefix), + self.define("LIBDWARF_DIR", spec["libdwarf"].prefix), + self.define("Boost_NO_SYSTEM_PATHS", True), + self.define("Boost_NO_BOOST_CMAKE", True), + self.define("BOOST_ROOT", spec["boost"].prefix), + self.define("Boost_DIR", spec["boost"].prefix), + self.define("BOOST_LIBRARYDIR", spec["boost"].prefix.lib), + self.define("DYNINST_DIR", spec["dyninst"].prefix), + ] + ) def set_mpi_cmake_options(self, spec, cmake_options): # Appends to cmake_options the options that will enable diff --git a/var/spack/repos/builtin/packages/openssh/package.py b/var/spack/repos/builtin/packages/openssh/package.py index f7b010c8d1f077..5ac27cdd993eb4 100755 --- a/var/spack/repos/builtin/packages/openssh/package.py +++ b/var/spack/repos/builtin/packages/openssh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Openssh(AutotoolsPackage): tags = ["core-packages"] + license("SSH-OpenSSH") + version("9.5p1", sha256="f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b") version("9.4p1", sha256="3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85") version("9.3p1", sha256="e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8") diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 358a008088883a..d98b4ac25e0fdf 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package executables = ["openssl"] + license("Apache-2.0") + version("3.1.3", sha256="f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6") version("3.0.11", sha256="b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55") @@ -381,6 +383,10 @@ class Openssl(Package): # Uses Fake Autotools, should subclass Package depends_on("ca-certificates-mozilla", type="build", when="certs=mozilla") depends_on("nasm", when="platform=windows") + depends_on("gmake", type="build", when="platform=linux") + depends_on("gmake", type="build", when="platform=cray") + depends_on("gmake", type="build", when="platform=darwin") + patch( "https://github.com/openssl/openssl/commit/f9e578e720bb35228948564192adbe3bc503d5fb.patch?full_index=1", sha256="3fdcf2d1e47c34f3a012f23306322c5a35cad55b180c9b6fb34537b55884645c", diff --git a/var/spack/repos/builtin/packages/opensta/package.py b/var/spack/repos/builtin/packages/opensta/package.py new file mode 100644 index 00000000000000..7b6db1c532adf3 --- /dev/null +++ b/var/spack/repos/builtin/packages/opensta/package.py @@ -0,0 +1,49 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Opensta(CMakePackage): + """ + OpenSTA is a gate level static timing verifier. As a stand-alone executable + it can be used to verify the timing of a design using standard file formats. + + * Verilog netlist + * Liberty library + * SDC timing constraints + * SDF delay annotation + * SPEF parasitics + + """ + + homepage = "https://github.com/parallaxsw/OpenSTA" + git = "https://github.com/parallaxsw/OpenSTA.git" + + maintainers("davekeeshan") + + license("GPL-3.0-only") + + version("master", branch="master") + + variant("zlib", default=True, description="build with zlib support") + variant("cudd", default=True, description="build with cudd support") + + depends_on("tcl@8.6.11", type="build") + depends_on("flex", type="build") + depends_on("swig", type="build") + depends_on("llvm") + depends_on("zlib", type="build", when="+zlib") + depends_on("cudd", type="build", when="+cudd") + + def cmake_args(self): + args = [] + if self.spec.satisfies("+zlib"): + args.append(f"-DZLIB_ROOT={self.spec['zlib'].prefix}") + if self.spec.satisfies("+cudd"): + args.append("-DUSE_CUDD=ON ") + args.append(f"-DCUDD_DIR={self.spec['cudd'].prefix}") + + return args diff --git a/var/spack/repos/builtin/packages/openstf/package.py b/var/spack/repos/builtin/packages/openstf/package.py index 864ffd5c445f49..0f0aa003e0bd54 100644 --- a/var/spack/repos/builtin/packages/openstf/package.py +++ b/var/spack/repos/builtin/packages/openstf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opensubdiv/package.py b/var/spack/repos/builtin/packages/opensubdiv/package.py index a1b0e834dfe248..9fcec75e07ccb8 100644 --- a/var/spack/repos/builtin/packages/opensubdiv/package.py +++ b/var/spack/repos/builtin/packages/opensubdiv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Opensubdiv(CMakePackage, CudaPackage): url = "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_0.tar.gz" git = "https://github.com/PixarAnimationStudios/OpenSubdiv" + license("Apache-2.0") + version("develop", branch="dev") version("3.4.3", sha256="7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745") version("3.4.0", sha256="d932b292f83371c7518960b2135c7a5b931efb43cdd8720e0b27268a698973e4") diff --git a/var/spack/repos/builtin/packages/opentsdb/package.py b/var/spack/repos/builtin/packages/opentsdb/package.py index effb5897b97fcf..d8fac16616017a 100644 --- a/var/spack/repos/builtin/packages/opentsdb/package.py +++ b/var/spack/repos/builtin/packages/opentsdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Opentsdb(AutotoolsPackage): homepage = "https://github.com/OpenTSDB" url = "https://github.com/OpenTSDB/opentsdb/archive/v2.4.0.tar.gz" + license("LGPL-2.1-or-later") + version("2.4.0", sha256="eb6bf323d058bd456a3b92132f872ca0e4f4a0b0d5e3ed325ebc03dcd64abfd0") version("2.3.2", sha256="5de8a3ff21bfa431d53859e278e23100fddde239aa2f25e8dee7810098cfd131") version("2.3.1", sha256="cc3c13aa18a733e1d353558623b5d3620d5322f3894a84d84cb24c024a70a8d7") diff --git a/var/spack/repos/builtin/packages/openturns/package.py b/var/spack/repos/builtin/packages/openturns/package.py index f0450bbc157f1d..d5e0d5d1a2921e 100644 --- a/var/spack/repos/builtin/packages/openturns/package.py +++ b/var/spack/repos/builtin/packages/openturns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Openturns(CMakePackage): git = "https://github.com/openturns/openturns.git" maintainers("liuyangzhuan") + license("LGPL-3.0-or-later") + version("master", branch="master") version("1.20", sha256="2be5247f0266d153619b35dfb1eeeb46736c502dad993b40aff8857d6314f293") version("1.19", sha256="1d61cb6ce8ec1121db9f1e9fb490aaa056d2ff250db26df05d2e3e30ceb32344") @@ -57,10 +59,8 @@ def cmake_args(self): if "+python" in spec: args.extend( [ - # By default picks up the system python not the Spack build - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path), # By default installs to the python prefix - "-DPYTHON_SITE_PACKAGES={0}".format(python_platlib), + "-DPYTHON_SITE_PACKAGES={0}".format(python_platlib) ] ) diff --git a/var/spack/repos/builtin/packages/openvdb/package.py b/var/spack/repos/builtin/packages/openvdb/package.py index c382eebcfe5125..2b8f952ffb3e73 100644 --- a/var/spack/repos/builtin/packages/openvdb/package.py +++ b/var/spack/repos/builtin/packages/openvdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Openvdb(CMakePackage): # Github account name for drew@lagrangian.xyz maintainers("eloop") + license("MPL-2.0") + version("develop", branch="develop") version("10.0.0", sha256="6d4f6b5ccd0f9d35a4886d9a51a98c97fa314f75bf9737c5121e91b706e2db70") version("9.1.0", sha256="914ee417b4607c75c95b53bc73a0599de4157c7d6a32e849e80f24e40fb64181") diff --git a/var/spack/repos/builtin/packages/openvkl/package.py b/var/spack/repos/builtin/packages/openvkl/package.py index 32bbdcafe26c3b..8fee89b37b805d 100644 --- a/var/spack/repos/builtin/packages/openvkl/package.py +++ b/var/spack/repos/builtin/packages/openvkl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class Openvkl(CMakePackage): # maintainers("github_user1", "github_user2") + license("Apache-2.0") + + version("2.0.0", sha256="469c3fba254c4fcdd84f8a9763d2e1aaa496dc123b5a9d467cc0a561e284c4e6") version("1.3.2", sha256="7704736566bf17497a3e51c067bd575316895fda96eccc682dae4aac7fb07b28") version("1.3.1", sha256="c9cefb6c313f2b4c0331e9629931759a6bc204ec00deed6ec0becad1670a1933") version("1.3.0", sha256="c6d4d40e6d232839c278b53dee1e7bd3bd239c3ccac33f49b465fc65a0692be9") @@ -36,6 +39,7 @@ class Openvkl(CMakePackage): depends_on("rkcommon@1.8.0:", when="@1.1:") depends_on("rkcommon@:1.10.0", when="@:1.3.1") depends_on("rkcommon@1.11.0:", when="@1.3.2:") + depends_on("rkcommon@:1.11.0", when="@:1.3.2") depends_on("tbb") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/openwsman/package.py b/var/spack/repos/builtin/packages/openwsman/package.py index f23b64e723c7c0..4be921bad99c57 100644 --- a/var/spack/repos/builtin/packages/openwsman/package.py +++ b/var/spack/repos/builtin/packages/openwsman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -55,7 +55,6 @@ def cmake_args(self): arg.extend([define("BUILD_PYTHON", False), define("BUILD_PYTHON3", True)]) else: arg.extend([define("BUILD_PYTHON", True), define("BUILD_PYTHON3", False)]) - arg.append(define("PYTHON_EXECUTABLE", spec["python"].command.path)) else: arg.extend([define("BUILD_PYTHON", False), define("BUILD_PYTHON3", False)]) return arg diff --git a/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py b/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py index 11ece06b8131e9..443ecb3df542a5 100644 --- a/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py +++ b/var/spack/repos/builtin/packages/ophidia-analytics-framework/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ophidia-io-server/package.py b/var/spack/repos/builtin/packages/ophidia-io-server/package.py index db1229678c39a3..c9215b0f6df0fd 100644 --- a/var/spack/repos/builtin/packages/ophidia-io-server/package.py +++ b/var/spack/repos/builtin/packages/ophidia-io-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ophidia-primitives/package.py b/var/spack/repos/builtin/packages/ophidia-primitives/package.py index fc9486e72144c5..5e010251f46a52 100644 --- a/var/spack/repos/builtin/packages/ophidia-primitives/package.py +++ b/var/spack/repos/builtin/packages/ophidia-primitives/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ophidia-server/package.py b/var/spack/repos/builtin/packages/ophidia-server/package.py index 51007d2c9a4948..174e68dafb4d2b 100644 --- a/var/spack/repos/builtin/packages/ophidia-server/package.py +++ b/var/spack/repos/builtin/packages/ophidia-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/opium/package.py b/var/spack/repos/builtin/packages/opium/package.py index 5121881d386e3f..277acc74de431c 100644 --- a/var/spack/repos/builtin/packages/opium/package.py +++ b/var/spack/repos/builtin/packages/opium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Opium(AutotoolsPackage): homepage = "http://opium.sourceforge.net" url = "https://downloads.sourceforge.net/project/opium/opium/opium-v3.8/opium-v3.8-src.tgz" + license("GPL-2.0-or-later") + version("4.1", sha256="e5a102b52601ad037d8a7b3e2dbd295baad23b8c1e4908b9014df2e432c23c60") version("3.8", sha256="edee6606519330aecaee436ee8cfb0a33788b5677861d59e38aba936e87d5ad3") diff --git a/var/spack/repos/builtin/packages/optional-lite/package.py b/var/spack/repos/builtin/packages/optional-lite/package.py index 58e8062b218757..33b6c1cd70021f 100644 --- a/var/spack/repos/builtin/packages/optional-lite/package.py +++ b/var/spack/repos/builtin/packages/optional-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class OptionalLite(CMakePackage): homepage = "https://github.com/martinmoene/optional-lite" url = "https://github.com/martinmoene/optional-lite/archive/v3.0.0.tar.gz" + license("BSL-1.0") + version("3.5.0", sha256="6077cee87e2812afd05a273645051e0b55397a25c220295ddc1d6f49d0cf5cc8") version("3.2.0", sha256="069c92f6404878588be761d609b917a111b0231633a91f7f908288fc77eb24c8") version("3.1.1", sha256="b61fe644b9f77d7cc1c555b3e40e973b135bf2c0350e5fa67bc6f379d9fc3158") diff --git a/var/spack/repos/builtin/packages/optipng/package.py b/var/spack/repos/builtin/packages/optipng/package.py index c06d4c0e8bb350..ebef46e2ae958d 100644 --- a/var/spack/repos/builtin/packages/optipng/package.py +++ b/var/spack/repos/builtin/packages/optipng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Optipng(AutotoolsPackage, SourceforgePackage): homepage = "http://optipng.sourceforge.net/" sourceforge_mirror_path = "optipng/optipng-0.7.7.tar.gz" + license("Zlib") + version("0.7.7", sha256="4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452") # See https://github.com/imagemin/optipng-bin/issues/97 patch("for_aarch64.patch", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/opus/package.py b/var/spack/repos/builtin/packages/opus/package.py index d99f10fa8445e8..211fd6b7cf576a 100644 --- a/var/spack/repos/builtin/packages/opus/package.py +++ b/var/spack/repos/builtin/packages/opus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Opus(AutotoolsPackage): homepage = "https://opus-codec.org/" url = "http://downloads.xiph.org/releases/opus/opus-1.1.4.tar.gz" + license("BSD-3-Clause") + version("1.3.1", sha256="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d") version("1.1.4", sha256="9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692") version("1.1.3", sha256="58b6fe802e7e30182e95d0cde890c0ace40b6f125cffc50635f0ad2eef69b633") diff --git a/var/spack/repos/builtin/packages/or-tools/package.py b/var/spack/repos/builtin/packages/or-tools/package.py index f77e1312072434..922b849d443588 100644 --- a/var/spack/repos/builtin/packages/or-tools/package.py +++ b/var/spack/repos/builtin/packages/or-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class OrTools(CMakePackage): url = "https://github.com/google/or-tools/archive/v7.8.tar.gz" maintainers("hyoklee") + license("Apache-2.0") + version("7.8", sha256="d93a9502b18af51902abd130ff5f23768fcf47e266e6d1f34b3586387aa2de68") variant("coin", default=False, description="Enable COIN-OR solvers.") depends_on("cmake@3.14:", type="build") diff --git a/var/spack/repos/builtin/packages/oracle-instant-client/package.py b/var/spack/repos/builtin/packages/oracle-instant-client/package.py index 4be0380a7a959c..d331447c744631 100644 --- a/var/spack/repos/builtin/packages/oracle-instant-client/package.py +++ b/var/spack/repos/builtin/packages/oracle-instant-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/oras/package.py b/var/spack/repos/builtin/packages/oras/package.py index 2c79393573cb5a..805ee8bbe830a1 100644 --- a/var/spack/repos/builtin/packages/oras/package.py +++ b/var/spack/repos/builtin/packages/oras/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Oras(Package): maintainers("vsoch") + license("MIT") + version("main", branch="main") version("0.12.0", sha256="5e19d61683a57b414efd75bd1b0290c941b8faace5fcc9d488f5e4aa674bf03e") diff --git a/var/spack/repos/builtin/packages/orbit2/package.py b/var/spack/repos/builtin/packages/orbit2/package.py index ad12226e80614e..597e229a0844a5 100644 --- a/var/spack/repos/builtin/packages/orbit2/package.py +++ b/var/spack/repos/builtin/packages/orbit2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Orbit2(AutotoolsPackage): homepage = "https://developer.gnome.org" url = "https://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2" + license("LGPL-2.0-only") + version("2.14.19", sha256="55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/orc/package.py b/var/spack/repos/builtin/packages/orc/package.py index e07111440b8684..4229796dfc3593 100644 --- a/var/spack/repos/builtin/packages/orc/package.py +++ b/var/spack/repos/builtin/packages/orc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Orc(CMakePackage): homepage = "https://orc.apache.org/" url = "https://github.com/apache/orc/archive/rel/release-1.6.5.tar.gz" + license("BSD-2-Clause") + version("1.6.5", sha256="df5885db8fa2e4435db8d486c6c7fc4e2c565d6197eee27729cf9cbdf36353c0") depends_on("maven") diff --git a/var/spack/repos/builtin/packages/orca/package.py b/var/spack/repos/builtin/packages/orca/package.py index 9195c58da063bb..27d31a1bbbb57e 100644 --- a/var/spack/repos/builtin/packages/orca/package.py +++ b/var/spack/repos/builtin/packages/orca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Orca(Package): maintainers("snehring") manual_download = True + license("LGPL-2.1-or-later") + version( "5.0.3-f.1", sha256="dea377459d61ef7d7e822e366420197ee2a4864991dfcdc4ea1a683f9be26c7f", diff --git a/var/spack/repos/builtin/packages/orfm/package.py b/var/spack/repos/builtin/packages/orfm/package.py index b2175c6ffeb36b..3b87e6084278ba 100644 --- a/var/spack/repos/builtin/packages/orfm/package.py +++ b/var/spack/repos/builtin/packages/orfm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/orientdb/package.py b/var/spack/repos/builtin/packages/orientdb/package.py index e4a3318163914c..c5408ba6d87317 100644 --- a/var/spack/repos/builtin/packages/orientdb/package.py +++ b/var/spack/repos/builtin/packages/orientdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Orientdb(MavenPackage): homepage = "https://orientdb.org" url = "https://github.com/orientechnologies/orientdb/archive/3.1.2.tar.gz" + license("Apache-2.0") + version("3.1.2", sha256="3c8e1f55de9e1a6c3cd714832deb7369f50096e85f1e048f0c0328e611970850") version("3.1.1", sha256="d5cc6b6048b71696a4a592705c2a3aec65757eca3cfadb03905306ceb4348d37") version("3.1.0", sha256="84f7ced66847fc5a7b987c701d60302e2aff63cdac2869941eee158251515b99") diff --git a/var/spack/repos/builtin/packages/orthofiller/package.py b/var/spack/repos/builtin/packages/orthofiller/package.py index 4904c04aaf7a13..d6a05b022ed748 100644 --- a/var/spack/repos/builtin/packages/orthofiller/package.py +++ b/var/spack/repos/builtin/packages/orthofiller/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Orthofiller(Package): homepage = "https://github.com/mpdunne/orthofiller/" url = "https://github.com/mpdunne/orthofiller/archive/1.1.4.tar.gz" + license("GPL-3.0-only") + version("1.1.4", sha256="a693a3372a3f05041ce30cbf84da1be88e85eae4effe32dbd7809ccef119a295") depends_on("augustus", type="run") diff --git a/var/spack/repos/builtin/packages/orthofinder/package.py b/var/spack/repos/builtin/packages/orthofinder/package.py index 2bd27011fa0eb8..c0e1b45cb1b893 100644 --- a/var/spack/repos/builtin/packages/orthofinder/package.py +++ b/var/spack/repos/builtin/packages/orthofinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Orthofinder(Package): homepage = "https://github.com/davidemms/OrthoFinder" url = "https://github.com/davidemms/OrthoFinder/releases/download/2.5.2/OrthoFinder_source.tar.gz" + license("GPL-3.0-or-later") + version("2.5.5", sha256="43d034a66a13adba8872a0d4a76e32c25305a7fae638754adb61c37a3f957bd9") version("2.5.4", sha256="a735c81999e8e3026ad62536b14e5b0391c9fc632f872f99857936ac60003ba5") version("2.5.2", sha256="e0752b66866e23a11f0592e880fac5f67258f9cf926f926dec8849564c41b8f7") diff --git a/var/spack/repos/builtin/packages/orthomcl/package.py b/var/spack/repos/builtin/packages/orthomcl/package.py index 195e9c02e0f28f..136cfa37c7118e 100644 --- a/var/spack/repos/builtin/packages/orthomcl/package.py +++ b/var/spack/repos/builtin/packages/orthomcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/osg-ca-certs/package.py b/var/spack/repos/builtin/packages/osg-ca-certs/package.py index 331f5c5bd16c04..fa87cb10ccd5a8 100644 --- a/var/spack/repos/builtin/packages/osg-ca-certs/package.py +++ b/var/spack/repos/builtin/packages/osg-ca-certs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/osi/package.py b/var/spack/repos/builtin/packages/osi/package.py index 894d6b740af4ae..83e12ebe3a7c8e 100644 --- a/var/spack/repos/builtin/packages/osi/package.py +++ b/var/spack/repos/builtin/packages/osi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Osi(AutotoolsPackage): depends_on("coinutils") depends_on("pkgconfig", type="build") + license("EPL-2.0") + version("0.108.8", sha256="8b01a49190cb260d4ce95aa7e3948a56c0917b106f138ec0a8544fadca71cf6a") version("0.108.7", sha256="f1bc53a498585f508d3f8d74792440a30a83c8bc934d0c8ecf8cd8bc0e486228") version("0.108.6", sha256="984a5886825e2da9bf44d8a665f4b92812f0700e451c12baf9883eaa2315fad5") diff --git a/var/spack/repos/builtin/packages/osmctools/package.py b/var/spack/repos/builtin/packages/osmctools/package.py index 0a350a8f57374a..a322d470db6d3a 100644 --- a/var/spack/repos/builtin/packages/osmctools/package.py +++ b/var/spack/repos/builtin/packages/osmctools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Osmctools(AutotoolsPackage): homepage = "https://gitlab.com/osm-c-tools/osmctools" url = "https://gitlab.com/osm-c-tools/osmctools/-/archive/0.9/osmctools-0.9.tar.gz" + license("AGPL-3.0-only") + version("0.9", sha256="2f5298be5b4ba840a04f360c163849b34a31386ccd287657885e21268665f413") version("0.8", sha256="54ae48717afd05707c9b1fd750dd56c33c3bae0755424ce8ca3795ee28e0ece8") diff --git a/var/spack/repos/builtin/packages/osmesa/package.py b/var/spack/repos/builtin/packages/osmesa/package.py index 90c6d31428affa..b42564cc9c0126 100644 --- a/var/spack/repos/builtin/packages/osmesa/package.py +++ b/var/spack/repos/builtin/packages/osmesa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ospray/package.py b/var/spack/repos/builtin/packages/ospray/package.py index 85a79894bbf246..e49bbf83ec0f9d 100644 --- a/var/spack/repos/builtin/packages/ospray/package.py +++ b/var/spack/repos/builtin/packages/ospray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,7 @@ class Ospray(CMakePackage): # maintainers("aumuell") + version("3.0.0", sha256="d8d8e632d77171c810c0f38f8d5c8387470ca19b75f5b80ad4d3d12007280288") version("2.12.0", sha256="268b16952b2dd44da2a1e40d2065c960bc2442dd09b63ace8b65d3408f596301") version("2.11.0", sha256="55974e650d9b78989ee55adb81cffd8c6e39ce5d3cf0a3b3198c522bf36f6e81") version("2.10.0", sha256="bd478284f48d2cb775fc41a2855a9d9f5ea16c861abda0f8dc94e02ea7189cb8") @@ -38,26 +39,31 @@ class Ospray(CMakePackage): depends_on("rkcommon@1.9", when="@2.9.0") depends_on("rkcommon@1.10:", when="@2.10.0:") depends_on("rkcommon@1.11:", when="@2.11:") + depends_on("rkcommon@1.12:", when="@3:") depends_on("embree@3.12: +ispc") depends_on("embree@3.13.1:", when="@2.7.0:") depends_on("embree@:3", when="@:2.10") depends_on("embree@4:", when="@2.11:") + depends_on("embree@4.3:", when="@3:") with when("+volumes"): - depends_on("openvkl@0.13.0:") + depends_on("openvkl@0.13.0:1", when="@2") depends_on("openvkl@1.0.1:", when="@2.7.0:") depends_on("openvkl@1.2.0:", when="@2.9.0:") depends_on("openvkl@1.3.0:", when="@2.10.0:") - depends_on("openvkl@1.3.2:", when="@2.11:") + depends_on("openvkl@1.3.2:", when="@2.11:2") + depends_on("openvkl@2:", when="@3:") with when("+denoiser"): depends_on("openimagedenoise@1.2.3:") depends_on("openimagedenoise@1.3:", when="@2.5:") depends_on("openimagedenoise@:1", when="@:2.11") depends_on("openimagedenoise@2:", when="@2.12:") + depends_on("openimagedenoise@2.1:", when="@3:") depends_on("ispc@1.14.1:", type=("build")) depends_on("ispc@1.16.0:", when="@2.7.0:", type=("build")) depends_on("ispc@1.18.0:", when="@2.10.0:", type=("build")) depends_on("ispc@1.19.0:", when="@2.11.0:", type=("build")) depends_on("ispc@1.20.0:", when="@2.12.0:", type=("build")) + depends_on("ispc@1.21.1:", when="@3:", type=("build")) depends_on("tbb") depends_on("mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/osqp/package.py b/var/spack/repos/builtin/packages/osqp/package.py index 2ceaf9ef593d58..9fb9614d374898 100644 --- a/var/spack/repos/builtin/packages/osqp/package.py +++ b/var/spack/repos/builtin/packages/osqp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Osqp(CMakePackage): homepage = "https://osqp.org" git = "https://github.com/oxfordcontrol/osqp.git" + license("Apache-2.0") + version("master", branch="master", submodules=True) version("0.6.0", commit="0baddd36bd57ec1cace0a52c6dd9663e8f16df0a", submodules=True) version("0.5.0", commit="97050184aa2cbebe446ae02d1f8b811243e180d6", submodules=True) diff --git a/var/spack/repos/builtin/packages/ossp-uuid/package.py b/var/spack/repos/builtin/packages/ossp-uuid/package.py index 12a0c5947d8e2c..24dd3c08092cb7 100644 --- a/var/spack/repos/builtin/packages/ossp-uuid/package.py +++ b/var/spack/repos/builtin/packages/ossp-uuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class OsspUuid(AutotoolsPackage): homepage = "http://www.ossp.org/pkg/lib/uuid" url = "https://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz" + license("MIT") + version("1.6.2", sha256="11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0") provides("uuid") diff --git a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py index 6a755fcbf11f89..0eaad99082c533 100644 --- a/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py +++ b/var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py index 01ccec79ee6a7a..757d34d08af3d6 100644 --- a/var/spack/repos/builtin/packages/otf/package.py +++ b/var/spack/repos/builtin/packages/otf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Otf(AutotoolsPackage): maintainers("michaelkuhn") + license("BSD-3-Clause") + version( "1.12.5salmon", sha256="0a8427360dedb38e8ddca30f14d95f826420c550337c5a79dbb754904e194088" ) diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index 74dd87d715c034..60d55d097cb170 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,7 @@ class Otf2(AutotoolsPackage): homepage = "https://www.vi-hps.org/projects/score-p" url = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-3.0/otf2-3.0.tar.gz" + version("3.0.3", sha256="18a3905f7917340387e3edc8e5766f31ab1af41f4ecc5665da6c769ca21c4ee8") version("3.0", sha256="6fff0728761556e805b140fd464402ced394a3c622ededdb618025e6cdaa6d8c") version("2.3", sha256="36957428d37c40d35b6b45208f050fb5cfe23c54e874189778a24b0e9219c7e3") version( diff --git a/var/spack/repos/builtin/packages/ovito/package.py b/var/spack/repos/builtin/packages/ovito/package.py index 9f8f24ca876ea1..63f4186c42c58a 100755 --- a/var/spack/repos/builtin/packages/ovito/package.py +++ b/var/spack/repos/builtin/packages/ovito/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Ovito(Package): homepage = "https://www.ovito.org" url = "https://www.ovito.org/download/master/ovito-basic-3.6.0-x86_64.tar.xz" + license("MIT") + version("3.6.0", sha256="6ac43a3a39b1ec3cccab577602756a8b7010cc1f1f046c4f6a939590d12f0339") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/p11-kit/package.py b/var/spack/repos/builtin/packages/p11-kit/package.py index 71e4b0a6ec2949..685d6aede57652 100644 --- a/var/spack/repos/builtin/packages/p11-kit/package.py +++ b/var/spack/repos/builtin/packages/p11-kit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class P11Kit(AutotoolsPackage): homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html" url = "https://github.com/p11-glue/p11-kit/archive/0.23.21.tar.gz" + license("BSD-3-Clause") + version("0.24.1", sha256="27f3c23531b24a2672ab198a3118f4f399d3a1faa8697924cc8a1065a17ead25") version("0.23.21", sha256="0361bcc55858618625a8e99e7fe9069f81514849b7b51ade51f8117d3ad31d88") version("0.23.20", sha256="8f6116f34735f6902e9db461c5dbe3e7e25b5cb8c38f42ea2a5aede1cf693749") diff --git a/var/spack/repos/builtin/packages/p3dfft3/package.py b/var/spack/repos/builtin/packages/p3dfft3/package.py index a1922641ec1058..dc82a5ad273290 100644 --- a/var/spack/repos/builtin/packages/p3dfft3/package.py +++ b/var/spack/repos/builtin/packages/p3dfft3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index 1068da372a4b6d..de98e31e1e04e2 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class P4est(AutotoolsPackage): maintainers("davydden") + license("GPL-2.0-only") + version("2.8", sha256="6a0586e3abac06c20e31b1018f3a82a564a6a0d9ff6b7f6c772a9e6b0f0cc5e4") version("2.3.2", sha256="076df9e5578e0e7fcfbe12e1a0b080104001f8c986ab1d5a69ec2220050df8e6") version("2.3.1", sha256="be66893b039fb3f27aca3d5d00acff42c67bfad5aa09cea9253cdd628b2bdc9a") diff --git a/var/spack/repos/builtin/packages/p7zip/package.py b/var/spack/repos/builtin/packages/p7zip/package.py index d1da0ebeab6ee8..bb6266286d93d9 100644 --- a/var/spack/repos/builtin/packages/p7zip/package.py +++ b/var/spack/repos/builtin/packages/p7zip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class P7zip(MakefilePackage): maintainers("vmiheer") homepage = "http://p7zip.sourceforge.net" + license("DOC") + version("17.05", sha256="d2788f892571058c08d27095c22154579dfefb807ebe357d145ab2ddddefb1a6") version("17.04", sha256="ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef") version("16.02", sha256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f") diff --git a/var/spack/repos/builtin/packages/pacbio-daligner/package.py b/var/spack/repos/builtin/packages/pacbio-daligner/package.py index b3d7e1f6fc53a2..28ede3ec5062a2 100644 --- a/var/spack/repos/builtin/packages/pacbio-daligner/package.py +++ b/var/spack/repos/builtin/packages/pacbio-daligner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pacbio-damasker/package.py b/var/spack/repos/builtin/packages/pacbio-damasker/package.py index 13628c77f3d5d2..fbcff6696ed564 100644 --- a/var/spack/repos/builtin/packages/pacbio-damasker/package.py +++ b/var/spack/repos/builtin/packages/pacbio-damasker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py index 63d163cbf6a88b..27a01e5ea06235 100644 --- a/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dazz-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py index 129965024f299c..4b6f0eef1c6452 100644 --- a/var/spack/repos/builtin/packages/pacbio-dextractor/package.py +++ b/var/spack/repos/builtin/packages/pacbio-dextractor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pacifica-cli/package.py b/var/spack/repos/builtin/packages/pacifica-cli/package.py index d506e75575dacb..7fb6d4cb83edfe 100644 --- a/var/spack/repos/builtin/packages/pacifica-cli/package.py +++ b/var/spack/repos/builtin/packages/pacifica-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PacificaCli(PythonPackage): homepage = "https://github.com/pacifica/pacifica-cli/" pypi = "pacifica-cli/pacifica-cli-0.5.2.tar.gz" + license("LGPL-3.0-only") + version("0.5.2", sha256="fee5fa8ac38ffec2e9199bff23afbbae697c4f7554f13e340104f8b20a62843f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/packmol/package.py b/var/spack/repos/builtin/packages/packmol/package.py index 048be87bddcf64..2821ae6eec5050 100644 --- a/var/spack/repos/builtin/packages/packmol/package.py +++ b/var/spack/repos/builtin/packages/packmol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class Packmol(CMakePackage): homepage = "https://m3g.iqm.unicamp.br/packmol/home.shtml" url = "https://github.com/mcubeg/packmol/archive/18.169.tar.gz" + license("MIT") + version("20.0.0", sha256="4faa1c8d5e5db2e935fbc23e7167df7e0b85aa0993c57b74cb897d13e5cf2202") version("18.169", sha256="8acf2cbc742a609e763eb00cae55aecd09af2edb4cc4e931706e2f06ac380de9") diff --git a/var/spack/repos/builtin/packages/pacparser/package.py b/var/spack/repos/builtin/packages/pacparser/package.py index d42d927e370356..f10dbee84b12dd 100644 --- a/var/spack/repos/builtin/packages/pacparser/package.py +++ b/var/spack/repos/builtin/packages/pacparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,12 +9,12 @@ 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" + license("LGPL-3.0-or-later") + version("1.4.0", sha256="2e66c5fe635cd5dcb9bccca4aced925eca712632b81bada3b63682159c0f910e") version("1.3.9", commit="4bbfb15c96ea0b2aede2f7371e59f66e15722d41") version("1.3.8", sha256="4e2872de565b2b64ffc81ba503e0eba35b3f7ef4a023ddd4a328c7b9d2cac266") diff --git a/var/spack/repos/builtin/packages/pacvim/package.py b/var/spack/repos/builtin/packages/pacvim/package.py index b221899e5620b9..ac72eed956aa35 100644 --- a/var/spack/repos/builtin/packages/pacvim/package.py +++ b/var/spack/repos/builtin/packages/pacvim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pagit/package.py b/var/spack/repos/builtin/packages/pagit/package.py index 74c15d26841554..7cec37c0eef77a 100644 --- a/var/spack/repos/builtin/packages/pagit/package.py +++ b/var/spack/repos/builtin/packages/pagit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pagmo/package.py b/var/spack/repos/builtin/packages/pagmo/package.py index ed7616394a222b..0a7538d2e342dd 100644 --- a/var/spack/repos/builtin/packages/pagmo/package.py +++ b/var/spack/repos/builtin/packages/pagmo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Pagmo(CMakePackage): homepage = "https://esa.github.io/pagmo/" url = "https://github.com/esa/pagmo/archive/1.1.7.tar.gz" + license("GPL-3.0-or-later") + version("1.1.7", sha256="6d8fab89ef9d5d5f30f148225bf9b84b2e5a38997f3d68b85547840e9fd95172") variant("examples", default=False, description="Build examples") @@ -97,10 +99,8 @@ def cmake_args(self): if "+python" in spec: args.extend( [ - # By default picks up the system python not the Spack build - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path), # By default installs to the python prefix not the pagmo prefix - "-DPYTHON_MODULES_DIR={0}".format(python_platlib), + "-DPYTHON_MODULES_DIR={0}".format(python_platlib) ] ) diff --git a/var/spack/repos/builtin/packages/pagmo2/package.py b/var/spack/repos/builtin/packages/pagmo2/package.py index 6bdd27aa51e15f..a72cb796767526 100644 --- a/var/spack/repos/builtin/packages/pagmo2/package.py +++ b/var/spack/repos/builtin/packages/pagmo2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pagmo2(CMakePackage): git = "https://github.com/esa/pagmo2.git" maintainers("liuyangzhuan") + license("LGPL-3.0-or-later") + version("master", branch="master") version("2.18.0", sha256="5ad40bf3aa91857a808d6b632d9e1020341a33f1a4115d7a2b78b78fd063ae31") diff --git a/var/spack/repos/builtin/packages/paintor/package.py b/var/spack/repos/builtin/packages/paintor/package.py index 421a92cb1160c6..43ff1ae55927d4 100644 --- a/var/spack/repos/builtin/packages/paintor/package.py +++ b/var/spack/repos/builtin/packages/paintor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pajeng/package.py b/var/spack/repos/builtin/packages/pajeng/package.py index 06e40aefa69059..b607a24209be22 100644 --- a/var/spack/repos/builtin/packages/pajeng/package.py +++ b/var/spack/repos/builtin/packages/pajeng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Pajeng(CMakePackage): maintainers("viniciusvgp", "schnorr") + license("GPL-3.0-only") + version("develop", git="https://github.com/schnorr/pajeng.git") version("1.3.6", sha256="1a2722bfaeb0c6437fb9e8efc2592edbf14ba01172f97e01c7839ffea8b9d0b3") version("1.3.5", sha256="ea8ca02484de4091dcf57289724876ec17dd98e3a032dc609b7ea020ca2629eb") diff --git a/var/spack/repos/builtin/packages/pal/package.py b/var/spack/repos/builtin/packages/pal/package.py index 0b18d1b8019648..9edf9290ee6c4c 100644 --- a/var/spack/repos/builtin/packages/pal/package.py +++ b/var/spack/repos/builtin/packages/pal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pal(AutotoolsPackage): homepage = "https://github.com/Starlink/pal" url = "https://github.com/Starlink/pal/releases/download/v0.9.8/pal-0.9.8.tar.gz" + license("LGPL-3.0-only") + version("0.9.8", sha256="191fde8c4f45d6807d4b011511344014966bb46e44029a4481d070cd5e7cc697") depends_on("sofa-c") diff --git a/var/spack/repos/builtin/packages/palace/package.py b/var/spack/repos/builtin/packages/palace/package.py index 9da8c209674149..f0625ead18d68b 100644 --- a/var/spack/repos/builtin/packages/palace/package.py +++ b/var/spack/repos/builtin/packages/palace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -81,7 +81,8 @@ class Palace(CMakePackage): depends_on("mumps~openmp", when="~openmp") with when("+slepc"): - depends_on("slepc ^petsc+mpi+double+complex") + depends_on("slepc") + depends_on("petsc+mpi+double+complex") depends_on("petsc+shared", when="+shared") depends_on("petsc~shared", when="~shared") depends_on("petsc+int64", when="+int64") diff --git a/var/spack/repos/builtin/packages/palisade-development/package.py b/var/spack/repos/builtin/packages/palisade-development/package.py index 4bd7f66c70f8a6..05e523a13cdc05 100644 --- a/var/spack/repos/builtin/packages/palisade-development/package.py +++ b/var/spack/repos/builtin/packages/palisade-development/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class PalisadeDevelopment(CMakePackage): git = "https://gitlab.com/palisade/palisade-development.git" maintainers("wohlbier") + license("BSD-2-Clause") + version("feature-fixed-point-encoding", branch="feature-fixed-point-encoding", submodules=True) version( "fppe-logreg-v1.0", diff --git a/var/spack/repos/builtin/packages/paml/package.py b/var/spack/repos/builtin/packages/paml/package.py index 3a5f6976aa0072..63d35ec21adeaf 100644 --- a/var/spack/repos/builtin/packages/paml/package.py +++ b/var/spack/repos/builtin/packages/paml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,16 +11,23 @@ class Paml(MakefilePackage): protein sewuences using maximum likelihood.""" homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html" - url = "https://github.com/abacus-gene/paml/archive/refs/tags/v4.10.0.tar.gz" + url = "https://github.com/abacus-gene/paml/archive/refs/tags/4.10.7.tar.gz" git = "https://github.com/abacus-gene/paml.git" maintainers("snehring") + license("GPL-3.0-or-later") + + version("4.10.7", sha256="0f29e768b3797b69eadc6332c3d046d8727702052d56c3b729883626c0a5a4e3") version( "4.10.3", sha256="9b2a6e187e3f9f3bc55cd82db15eb701d43f031167d283a7c1b11c882b5d8a42", url="https://github.com/abacus-gene/paml/archive/refs/tags/untagged-a5659203e8ec0ddb58b8.tar.gz", ) - version("4.10.0", sha256="6ef6a116f254185eb1cf7a2b975946fc9179a4b7dcb60a82f8fa8bbe6931897c") + version( + "4.10.0", + sha256="6ef6a116f254185eb1cf7a2b975946fc9179a4b7dcb60a82f8fa8bbe6931897c", + url="https://github.com/abacus-gene/paml/archive/refs/tags/v4.10.0.tar.gz", + ) version( "4.9h", sha256="623bf6cf4a018a4e7b4dbba189c41d6c0c25fdca3a0ae24703b82965c772edb3", diff --git a/var/spack/repos/builtin/packages/panda/package.py b/var/spack/repos/builtin/packages/panda/package.py index ba3a87f184fc00..c97a5a21adb353 100644 --- a/var/spack/repos/builtin/packages/panda/package.py +++ b/var/spack/repos/builtin/packages/panda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Panda(CMakePackage): homepage = "http://comopt.ifi.uni-heidelberg.de/software/PANDA/index.html" url = "http://comopt.ifi.uni-heidelberg.de/software/PANDA/downloads/panda-2016-03-07.tar" + license("CC-BY-4.0") + version( "2016-03-07", sha256="9fae1544626db417ade7318d26bc43c8af04151b9f7679b6d742dba598762037" ) diff --git a/var/spack/repos/builtin/packages/pandaseq/package.py b/var/spack/repos/builtin/packages/pandaseq/package.py index edcdfaabc1aedf..15f6c64af03868 100644 --- a/var/spack/repos/builtin/packages/pandaseq/package.py +++ b/var/spack/repos/builtin/packages/pandaseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pandaseq(AutotoolsPackage): homepage = "https://github.com/neufeld/pandaseq" url = "https://github.com/neufeld/pandaseq/archive/v2.11.tar.gz" + license("GPL-3.0-only") + version("2.11", sha256="6e3e35d88c95f57d612d559e093656404c1d48c341a8baa6bef7bb0f09fc8f82") version("2.10", sha256="93cd34fc26a7357e14e386b9c9ba9b28361cf4da7cf62562dc8501e220f9a561") diff --git a/var/spack/repos/builtin/packages/pandoc/package.py b/var/spack/repos/builtin/packages/pandoc/package.py index cc4ddfbb7e1730..870490a587d1d0 100644 --- a/var/spack/repos/builtin/packages/pandoc/package.py +++ b/var/spack/repos/builtin/packages/pandoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 06c68357b4149e..4a44c07094955b 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pango(MesonPackage): list_url = "http://ftp.gnome.org/pub/gnome/sources/pango/" list_depth = 1 + license("LGPL-2.1-or-later") + version("1.50.13", sha256="5cdcf6d761d26a3eb9412b6cb069b32bd1d9b07abf116321167d94c2189299fd") version("1.50.7", sha256="0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33") version("1.49.4", sha256="1fda6c03161bd1eacfdc349244d26828c586d25bfc600b9cfe2494902fdf56cf") diff --git a/var/spack/repos/builtin/packages/pangolin/package.py b/var/spack/repos/builtin/packages/pangolin/package.py index 0f3baa9b73fea5..1cde66335f0d0b 100644 --- a/var/spack/repos/builtin/packages/pangolin/package.py +++ b/var/spack/repos/builtin/packages/pangolin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pangolin(CMakePackage): homepage = "https://github.com/stevenlovegrove/Pangolin" git = "https://github.com/stevenlovegrove/Pangolin.git" + license("MIT") + version("master", branch="master") # Required dependencies diff --git a/var/spack/repos/builtin/packages/pangomm/package.py b/var/spack/repos/builtin/packages/pangomm/package.py index a9c5a630745e85..d09c682720d82b 100644 --- a/var/spack/repos/builtin/packages/pangomm/package.py +++ b/var/spack/repos/builtin/packages/pangomm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pangomm(AutotoolsPackage): homepage = "https://www.pango.org/" url = "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.14/pangomm-2.14.1.tar.gz" + license("LGPL-2.1-or-later AND GPL-2.0-or-later") + version("2.43.1", sha256="00483967b4ed0869da09dc0617de45625b9ab846c7b07aa25dfc940a4fc540a4") version("2.42.0", sha256="ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56") version("2.41.5", sha256="5131830d5b37b181ca4fa8f641ad86faa985c0bb7dcc833c98672d294367b304") diff --git a/var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch b/var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch new file mode 100644 index 00000000000000..518c2e3d3c68ff --- /dev/null +++ b/var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch @@ -0,0 +1,43 @@ +diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/components/sde/tests/Makefile +--- papi-7.0.1-orig/src/components/sde/tests/Makefile 2023-06-19 14:27:44.224943877 -0400 ++++ papi-7.0.1/src/components/sde/tests/Makefile 2023-06-19 16:25:16.749303194 -0400 +@@ -1,12 +1,17 @@ + NAME=sde + include ../../Makefile_comp_tests.target + INCLUDE += -I$(datadir)/sde_lib -I.. ++ ++intel_compilers := ifort ifx ++cray_compilers := ftn crayftn + ifeq ($(notdir $(F77)),gfortran) + FFLAGS +=-ffree-form -ffree-line-length-none + else ifeq ($(notdir $(F77)),flang) + FFLAGS +=-ffree-form +-else ++else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) + FFLAGS +=-free ++else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),) ++ FFLAGS +=-ffree + endif + FFLAGS +=-g + CFLAGS +=-g +diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/src/components/sysdetect/tests/Makefile +--- papi-7.0.1-orig/src/components/sysdetect/tests/Makefile 2023-06-19 14:27:44.220943888 -0400 ++++ papi-7.0.1/src/components/sysdetect/tests/Makefile 2023-06-19 16:25:43.213238526 -0400 +@@ -19,12 +19,16 @@ + FTESTS = + endif + ++intel_compilers := ifort ifx ++cray_compilers := ftn crayftn + ifeq ($(notdir $(F77)),gfortran) + FFLAGS +=-ffree-form -ffree-line-length-none + else ifeq ($(notdir $(F77)),flang) + FFLAGS +=-ffree-form +-else ++else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) + FFLAGS +=-free ++else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),) ++ FFLAGS +=-ffree + endif + + TESTS = query_device_simple \ diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index feacc7e91657da..441b33238dac07 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,7 +30,12 @@ class Papi(AutotoolsPackage, ROCmPackage): url = "https://icl.utk.edu/projects/papi/downloads/papi-5.4.1.tar.gz" git = "https://github.com/icl-utk-edu/papi" + license("BSD-3-Clause") + version("master", branch="master") + version("7.1.0", sha256="950d0e997e9e908f58c103efd54983e905b6cffa75ef52ed8fdd1ab441977bb6") + version("7.0.1", sha256="c105da5d8fea7b113b0741a943d467a06c98db959ce71bdd9a50b9f03eecc43e") + # Note: version 7.0.0 is omitted due to build issues, see PR 33940 for more information version("6.0.0.1", sha256="3cd7ed50c65b0d21d66e46d0ba34cd171178af4bbf9d94e693915c1aca1e287f") version("6.0.0", sha256="3442709dae3405c2845b304c06a8b15395ecf4f3899a89ceb4d715103cb4055f") version("5.7.0", sha256="d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589") @@ -63,11 +68,13 @@ class Papi(AutotoolsPackage, ROCmPackage): depends_on("cuda", when="+nvml") depends_on("hsa-rocr-dev", when="+rocm") depends_on("rocprofiler-dev", when="+rocm") + depends_on("llvm-amdgpu +openmp", when="+rocm") depends_on("rocm-smi-lib", when="+rocm_smi") conflicts("%gcc@8:", when="@5.3.0", msg="Requires GCC version less than 8.0") conflicts("+sde", when="@:5", msg="Software defined events (SDE) added in 6.0.0") conflicts("^cuda", when="@:5", msg="CUDA support for versions < 6.0.0 not implemented") + conflicts("%cce", when="@7.1:", msg="-ffree-form flag not recognized") conflicts("@=6.0.0", when="+static_tools", msg="Static tools cannot build on version 6.0.0") @@ -78,8 +85,12 @@ class Papi(AutotoolsPackage, ROCmPackage): sha256="64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8", when="@5.4.0:5.6%gcc@8:", ) + # 7.1.0 erroneously adds -ffree-form for all fortran compilers + patch("sysdetect-free-form-fix.patch", when="@7.1.0") patch("crayftn-fixes.patch", when="@6.0.0:%cce@9:") patch("intel-oneapi-compiler-fixes.patch", when="@6.0.0:%oneapi") + patch("intel-cray-freeform.patch", when="@7.0.1") + patch("spack-hip-path.patch", when="@7.0.1") configure_directory = "src" @@ -87,12 +98,13 @@ def setup_build_environment(self, env): spec = self.spec if "+lmsensors" in spec and self.version >= Version("6"): env.set("PAPI_LMSENSORS_ROOT", spec["lm-sensors"].prefix) - if "^cuda" in spec: + if "+cuda" in spec: env.set("PAPI_CUDA_ROOT", spec["cuda"].prefix) if "+rocm" in spec: env.set("PAPI_ROCM_ROOT", spec["hsa-rocr-dev"].prefix) env.set("HSA_TOOLS_LIB", "%s/librocprofiler64.so" % spec["rocprofiler-dev"].prefix.lib) env.append_flags("CFLAGS", "-I%s/rocprofiler/include" % spec["rocprofiler-dev"].prefix) + env.append_flags("LDFLAGS", "-L%s/lib" % spec["llvm-amdgpu"].prefix) env.set( "ROCP_METRICS", "%s/rocprofiler/lib/metrics.xml" % spec["rocprofiler-dev"].prefix ) diff --git a/var/spack/repos/builtin/packages/papi/spack-hip-path.patch b/var/spack/repos/builtin/packages/papi/spack-hip-path.patch new file mode 100644 index 00000000000000..827d99dd194510 --- /dev/null +++ b/var/spack/repos/builtin/packages/papi/spack-hip-path.patch @@ -0,0 +1,30 @@ +diff -Naur papi-7.0.1-orig/src/components/rocm/tests/Makefile papi-7.0.1/src/components/rocm/tests/Makefile +--- papi-7.0.1-orig/src/components/rocm/tests/Makefile 2023-06-19 14:27:44.220943888 -0400 ++++ papi-7.0.1/src/components/rocm/tests/Makefile 2023-06-20 19:09:56.564352488 -0400 +@@ -1,9 +1,9 @@ + NAME = rocm + include ../../Makefile_comp_tests.target + PAPI_ROCM_ROOT ?= /opt/rocm +- +-CC = $(PAPI_ROCM_ROOT)/hip/bin/hipcc +-CXX = $(PAPI_ROCM_ROOT)/hip/bin/hipcc ++HIP_PATH ?= $(PAPI_ROCM_ROOT)/hip ++CC = $(HIP_PATH)/bin/hipcc ++CXX = $(HIP_PATH)/bin/hipcc + CPPFLAGS+= -I$(PAPI_ROCM_ROOT)/include \ + -I$(PAPI_ROCM_ROOT)/include/hip \ + -I$(PAPI_ROCM_ROOT)/include/hsa \ +diff -Naur papi-7.0.1-orig/src/components/rocm_smi/tests/Makefile papi-7.0.1/src/components/rocm_smi/tests/Makefile +--- papi-7.0.1-orig/src/components/rocm_smi/tests/Makefile 2023-06-19 14:27:44.220943888 -0400 ++++ papi-7.0.1/src/components/rocm_smi/tests/Makefile 2023-06-20 19:10:49.383840816 -0400 +@@ -4,8 +4,8 @@ + NAME=rocm_smi + include ../../Makefile_comp_tests.target + PAPI_ROCM_ROOT ?= /opt/rocm +-HIP_PATH= ${PAPI_ROCM_ROOT}/hip +-HIPCC=$(HIP_PATH)/bin/hipcc ++HIP_PATH ?= $(PAPI_ROCM_ROOT)/hip ++HIPCC = $(HIP_PATH)/bin/hipcc + + INCLUDE += -I$(PAPI_ROCM_ROOT)/include + INCLUDE += -I$(PAPI_ROCM_ROOT)/include/rocm_smi diff --git a/var/spack/repos/builtin/packages/papi/sysdetect-free-form-fix.patch b/var/spack/repos/builtin/packages/papi/sysdetect-free-form-fix.patch new file mode 100644 index 00000000000000..d38cf1c3c3cce0 --- /dev/null +++ b/var/spack/repos/builtin/packages/papi/sysdetect-free-form-fix.patch @@ -0,0 +1,17 @@ +diff --git a/src/components/sysdetect/tests/Makefile b/src/components/sysdetect/tests/Makefile +index 63ac01358..79ce57e4b 100644 +--- a/src/components/sysdetect/tests/Makefile ++++ b/src/components/sysdetect/tests/Makefile +@@ -21,11 +21,9 @@ endif + intel_compilers := ifort ifx + cray_compilers := ftn crayftn + +-FFLAGS += -ffree-form +- + ifeq ($(notdir $(F77)),gfortran) + FFLAGS +=-ffree-form -ffree-line-length-none +-else ifeq ($(notdir $(F77)),flang) ++else ifeq ($(patsubst %flang,,$(notdir $(F77))),) # compiler name ends with flang + FFLAGS +=-ffree-form + else ifneq ($(findstring $(notdir $(F77)), $(intel_compilers)),) + FFLAGS +=-free diff --git a/var/spack/repos/builtin/packages/papyrus/package.py b/var/spack/repos/builtin/packages/papyrus/package.py index f4bab127651751..76703751c487b0 100644 --- a/var/spack/repos/builtin/packages/papyrus/package.py +++ b/var/spack/repos/builtin/packages/papyrus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Papyrus(CMakePackage): tags = ["e4s"] + license("BSD-3-Clause") + version("master", branch="master") version("1.0.2", sha256="b6cfcff99f73ded8e4ca4b165bc182cd5cac60f0c0cf4f93649b77d074445645") version("1.0.1", sha256="3772fd6f2c301faf78f18c5e4dc3dbac57eb361861b091579609b3fff9e0bb17") diff --git a/var/spack/repos/builtin/packages/paradiseo/package.py b/var/spack/repos/builtin/packages/paradiseo/package.py index e5ca4fe4976d9e..7b5cc982603f5d 100644 --- a/var/spack/repos/builtin/packages/paradiseo/package.py +++ b/var/spack/repos/builtin/packages/paradiseo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parallel-hashmap/package.py b/var/spack/repos/builtin/packages/parallel-hashmap/package.py index 349fafe52ce0e4..327c9ce3944a3f 100644 --- a/var/spack/repos/builtin/packages/parallel-hashmap/package.py +++ b/var/spack/repos/builtin/packages/parallel-hashmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class ParallelHashmap(CMakePackage): homepage = "https://github.com/greg7mdp/parallel-hashmap" url = "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/v1.3.11.tar.gz" + license("Apache-2.0") + version("1.3.11", sha256="0515a681bfb24207013786a7737e9d8561302e656689d8a65ea480bbabab460f") depends_on("cmake@3.8:", type="build") diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index a753da24bd9e0f..9acb90d815a602 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py index 929aca733ccac9..51b6b9ca89e6f8 100644 --- a/var/spack/repos/builtin/packages/parallel/package.py +++ b/var/spack/repos/builtin/packages/parallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Parallel(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/parallel/" gnu_mirror_path = "parallel/parallel-20220522.tar.bz2" + license("GPL-3.0-or-later") + version("20220522", sha256="bb6395f8d964e68f3bdb26a764d3c48b69bc5b759a92ac3ab2bd1895c7fa8c1f") version("20220422", sha256="96e4b73fff1302fc141a889ae43ab2e93f6c9e86ac60ef62ced02dbe70b73ca7") version("20220322", sha256="df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8") diff --git a/var/spack/repos/builtin/packages/parallelio/package.py b/var/spack/repos/builtin/packages/parallelio/package.py index 8930de7164dbc3..ba3a3ee1a42b17 100644 --- a/var/spack/repos/builtin/packages/parallelio/package.py +++ b/var/spack/repos/builtin/packages/parallelio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Parallelio(CMakePackage): maintainers("jedwards4b") + license("Apache-2.0") + version("2.6.2", sha256="c318894f0230197458917e932ec66301b4407a744df481e9c6a6d9d85f7e5ab1") version("2.6.1", sha256="83d3108d2b9db8219aa6b6ee333cfc12b2a588bcfc781587df5f8b24a716a6eb") version("2.6.0", sha256="e56a980c71c7f57f396a88beae08f1670d4adf59be6411cd573fe85868ef98c0") diff --git a/var/spack/repos/builtin/packages/parallelmergetree/package.py b/var/spack/repos/builtin/packages/parallelmergetree/package.py index d9934e0542a8bf..639d7689148e81 100644 --- a/var/spack/repos/builtin/packages/parallelmergetree/package.py +++ b/var/spack/repos/builtin/packages/parallelmergetree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py index 7764dcfc7033c2..530bb340177ada 100644 --- a/var/spack/repos/builtin/packages/paraver/package.py +++ b/var/spack/repos/builtin/packages/paraver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 5ca64f29c08610..5d87021f04be6a 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,7 +27,12 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): maintainers("danlipsa", "vicentebolea", "kwryankrattiger") tags = ["e4s"] + license("Apache-2.0") + version("master", branch="master", submodules=True) + version( + "5.12.0-RC2", sha256="5f43b1affee928a807b373024aefc8947f444247f9f4c3965bd52a836b95566b" + ) version( "5.11.2", sha256="5c5d2f922f30d91feefc43b4a729015dbb1459f54c938896c123d2ac289c7a1e", @@ -64,6 +69,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): variant("fortran", default=False, description="Enable Fortran support") variant("mpi", default=True, description="Enable MPI support") variant("osmesa", default=False, description="Enable OSMesa support") + variant("egl", default=False, description="Enable EGL in the OpenGL library being used") variant("qt", default=False, description="Enable Qt (gui) support") variant("opengl2", default=True, description="Enable OpenGL2 backend") variant("examples", default=False, description="Build examples") @@ -183,14 +189,18 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("gl@3.2:", when="+opengl2") depends_on("gl@1.2:", when="~opengl2") - depends_on("glew") + depends_on("glew", when="~egl") + depends_on("glew gl=egl", when="+egl") + depends_on("osmesa", when="+osmesa") for p in ["linux", "cray"]: - depends_on("glx", when="~osmesa platform={}".format(p)) - depends_on("libxt", when="~osmesa platform={}".format(p)) + depends_on("glx", when="~egl ~osmesa platform={}".format(p)) + depends_on("libxt", when="~egl ~osmesa platform={}".format(p)) conflicts("+qt", when="+osmesa") + conflicts("+qt", when="+egl") + conflicts("+egl", when="+osmesa") - depends_on("ospray@2.1:", when="+raytracing") + depends_on("ospray@2.1:2", when="+raytracing") depends_on("openimagedenoise", when="+raytracing") depends_on("ospray +mpi", when="+raytracing +mpi") @@ -283,8 +293,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): # Fix IOADIOS2 module to work with kits # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 patch("vtk-adios2-module-no-kit.patch", when="@5.8:5.11") - # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 - patch("vtk-adios2-module-no-kit-5.12.patch", when="@5.12:") # Patch for paraview 5.9.0%xl_r # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7591 @@ -303,7 +311,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): # Fix VTK to remove deprecated ADIOS2 functions # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10113 - patch("adios2-remove-deprecated-functions.patch", when="@5.10: ^adios2@2.9:") + patch("adios2-remove-deprecated-functions.patch", when="@5.10:5.11 ^adios2@2.9:") patch("exodusII-netcdf4.9.0.patch", when="@:5.10.2") @@ -416,13 +424,20 @@ def nvariant_bool(feature): """Negated ternary for spec variant to OFF/ON string""" return variant_bool(feature, on="OFF", off="ON") + def use_x11(): + """Return false if osmesa or egl are requested""" + if "+osmesa" in spec or "+egl" in spec: + return "OFF" + if spec.satisfies("platform=windows"): + return "OFF" + return "ON" + rendering = variant_bool("+opengl2", "OpenGL2", "OpenGL") includes = variant_bool("+development_files") - use_x11 = nvariant_bool("+osmesa") if not spec.satisfies("platform=windows") else "OFF" cmake_args = [ "-DVTK_OPENGL_HAS_OSMESA:BOOL=%s" % variant_bool("+osmesa"), - "-DVTK_USE_X:BOOL=%s" % use_x11, + "-DVTK_USE_X:BOOL=%s" % use_x11(), "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=%s" % includes, "-DBUILD_TESTING:BOOL=OFF", "-DOpenGL_GL_PREFERENCE:STRING=LEGACY", @@ -430,6 +445,9 @@ def nvariant_bool(feature): self.define_from_variant("VISIT_BUILD_READER_Silo", "visitbridge"), ] + if "+egl" in spec: + cmake_args.append("-DVTK_OPENGL_HAS_EGL:BOOL=ON") + if spec.satisfies("@5.12:"): cmake_args.append("-DVTK_MODULE_USE_EXTERNAL_VTK_fast_float:BOOL=OFF") cmake_args.append("-DVTK_MODULE_USE_EXTERNAL_VTK_token:BOOL=OFF") @@ -519,7 +537,6 @@ def nvariant_bool(feature): cmake_args.extend( [ "-DPARAVIEW_%s_PYTHON:BOOL=ON" % py_use_opt, - "-DPYTHON_EXECUTABLE:FILEPATH=%s" % spec["python"].command.path, "-D%s_PYTHON_VERSION:STRING=%d" % (py_ver_opt, py_ver_val), ] ) diff --git a/var/spack/repos/builtin/packages/paraview/vtk-adios2-module-no-kit-5.12.patch b/var/spack/repos/builtin/packages/paraview/vtk-adios2-module-no-kit-5.12.patch deleted file mode 100644 index 34a98eac474716..00000000000000 --- a/var/spack/repos/builtin/packages/paraview/vtk-adios2-module-no-kit-5.12.patch +++ /dev/null @@ -1,230 +0,0 @@ -diff --git a/VTK/IO/ADIOS2/CMakeLists.txt b/VTK/IO/ADIOS2/CMakeLists.txt -index 86c6d49cc4f..07b1d4fe0ef 100644 ---- a/VTK/IO/ADIOS2/CMakeLists.txt -+++ b/VTK/IO/ADIOS2/CMakeLists.txt -@@ -1,9 +1,9 @@ - vtk_module_find_package(PRIVATE_IF_SHARED - PACKAGE ADIOS2 - VERSION 2.4) --if (VTK_USE_MPI AND NOT ADIOS2_HAVE_MPI) -+if (TARGET VTK::ParallelMPI AND NOT ADIOS2_HAVE_MPI) - message(FATAL_ERROR "VTK built with MPI requires ADIOS2 built with MPI") --elseif(NOT VTK_USE_MPI AND ADIOS2_HAVE_MPI) -+elseif(NOT TARGET VTK::ParallelMPI AND ADIOS2_HAVE_MPI) - message(FATAL_ERROR "VTK built without MPI requires ADIOS2 built without MPI") - endif() - -@@ -18,38 +18,30 @@ set(classes_core vtkADIOS2CoreImageReader) - set(private_classes_core Core/vtkADIOS2CoreArraySelection) - set(private_headers_core Core/vtkADIOS2CoreTypeTraits.h) - set(private_templates_core) --set(vtk_io_adios2_core_enabled TRUE CACHE INTERNAL "" FORCE) - --if (vtk_io_adios2_core_enabled) -- list(APPEND classes ${classes_core}) -- list(APPEND private_classes ${private_classes_core}) -- list(APPEND private_headers ${private_headers_core}) -- list(APPEND private_templates ${private_templates_core}) --endif() -+list(APPEND classes ${classes_core}) -+list(APPEND private_classes ${private_classes_core}) -+list(APPEND private_headers ${private_headers_core}) -+list(APPEND private_templates ${private_templates_core}) -+ -+# Build VTX Schema for Parallel -+if (TARGET VTK::ParallelMPI) -+ set(classes_vtx vtkADIOS2VTXReader) -+ set(private_classes_vtx -+ VTX/VTXSchemaManager -+ VTX/common/VTXDataArray -+ VTX/common/VTXHelper -+ VTX/schema/VTXSchema -+ VTX/schema/vtk/VTXvtkBase -+ VTX/schema/vtk/VTXvtkVTI -+ VTX/schema/vtk/VTXvtkVTU) -+ set(private_headers_vtx VTX/common/VTXTypes.h) -+ set(private_templates_vtx -+ VTX/common/VTXHelper.txx -+ VTX/schema/VTXSchema.txx -+ VTX/schema/vtk/VTXvtkVTI.txx -+ VTX/schema/vtk/VTXvtkVTU.txx) - --set(classes_vtx vtkADIOS2VTXReader) --set(private_classes_vtx -- VTX/VTXSchemaManager -- VTX/common/VTXDataArray -- VTX/common/VTXHelper -- VTX/schema/VTXSchema -- VTX/schema/vtk/VTXvtkBase -- VTX/schema/vtk/VTXvtkVTI -- VTX/schema/vtk/VTXvtkVTU) --set(private_headers_vtx VTX/common/VTXTypes.h) --set(private_templates_vtx -- VTX/common/VTXHelper.txx -- VTX/schema/VTXSchema.txx -- VTX/schema/vtk/VTXvtkVTI.txx -- VTX/schema/vtk/VTXvtkVTU.txx) -- --if (VTK_USE_MPI) -- set(vtk_io_adios2_vtx_enabled TRUE CACHE INTERNAL "" FORCE) --else () -- set(vtk_io_adios2_vtx_enabled FALSE CACHE INTERNAL "" FORCE) --endif() -- --if (vtk_io_adios2_vtx_enabled) - list(APPEND classes ${classes_vtx}) - list(APPEND private_classes ${private_classes_vtx}) - list(APPEND private_headers ${private_headers_vtx}) -@@ -63,10 +55,6 @@ vtk_module_add_module(VTK::IOADIOS2 - PRIVATE_TEMPLATES ${private_templates}) - vtk_module_link(VTK::IOADIOS2 PRIVATE adios2::adios2) - --if (ADIOS2_HAVE_MPI) -- vtk_module_definitions(VTK::IOADIOS2 PRIVATE IOADIOS2_HAVE_MPI) --endif () -- - if (ADIOS2_VERSION VERSION_GREATER_EQUAL "2.8.0") - vtk_module_definitions(VTK::IOADIOS2 PRIVATE IOADIOS2_BP5_RANDOM_ACCESS) - endif () -diff --git a/VTK/IO/ADIOS2/Testing/Cxx/CMakeLists.txt b/VTK/IO/ADIOS2/Testing/Cxx/CMakeLists.txt -index 1534a1e7271..29c51970daf 100644 ---- a/VTK/IO/ADIOS2/Testing/Cxx/CMakeLists.txt -+++ b/VTK/IO/ADIOS2/Testing/Cxx/CMakeLists.txt -@@ -2,40 +2,34 @@ find_package(ADIOS2 2.4 REQUIRED - COMPONENTS CXX - OPTIONAL_COMPONENTS MPI) - --if (ADIOS2_HAVE_MPI) -- if (vtk_io_adios2_core_enabled) -- set(TestADIOS2BPReaderSingleTimeStep_NUMPROCS 2) -+if (TARGET VTK::ParallelMPI) -+ set(TestADIOS2BPReaderSingleTimeStep_NUMPROCS 2) - # For now vtkMultiBlockVolumeMapper does not support rendering in parallel -- set(TestADIOS2BPReaderMultiTimeSteps_NUMPROCS 2) -- set(TestADIOS2BPReaderMultiTimeSteps2D_NUMPROCS 2) -- vtk_add_test_mpi(vtkIOADIOS2CxxTests-MPI mpiTests TESTING_DATA -- TestADIOS2BPReaderMPISingleTimeStep.cxx -- TestADIOS2BPReaderMPIMultiTimeSteps3D.cxx,NO_VALID -- TestADIOS2BPReaderMPIMultiTimeSteps2D.cxx) -- vtk_test_cxx_executable(vtkIOADIOS2CxxTests-MPI mpiTests) -- endif() -+ set(TestADIOS2BPReaderMultiTimeSteps_NUMPROCS 2) -+ set(TestADIOS2BPReaderMultiTimeSteps2D_NUMPROCS 2) -+ vtk_add_test_mpi(vtkIOADIOS2CxxTests-MPI mpiTests TESTING_DATA -+ TestADIOS2BPReaderMPISingleTimeStep.cxx -+ TestADIOS2BPReaderMPIMultiTimeSteps3D.cxx,NO_VALID -+ TestADIOS2BPReaderMPIMultiTimeSteps2D.cxx) -+ vtk_test_cxx_executable(vtkIOADIOS2CxxTests-MPI mpiTests) - - # VTX tests -- if (vtk_io_adios2_vtx_enabled) -- vtk_add_test_cxx(vtkIOADIOS2VTXCxxTests tests TESTING_DATA NO_OUTPUT -- UnitTestIOADIOS2VTX.cxx,NO_VALID -- #TestIOADIOS2VTX_VTI3D.cxx, -- TestIOADIOS2VTX_VTI3DRendering.cxx,NO_VALID -- #TestIOADIOS2VTX_VTU3D.cxx,NO_VALID -- TestIOADIOS2VTX_VTU3DRendering.cxx,NO_VALID -- TestIOADIOS2VTX_VTU2DRendering.cxx,NO_VALID -- TestIOADIOS2VTX_VTU1DRendering.cxx,NO_VALID) -+ vtk_add_test_cxx(vtkIOADIOS2VTXCxxTests tests TESTING_DATA NO_OUTPUT -+ UnitTestIOADIOS2VTX.cxx,NO_VALID -+ #TestIOADIOS2VTX_VTI3D.cxx, -+ TestIOADIOS2VTX_VTI3DRendering.cxx,NO_VALID -+ #TestIOADIOS2VTX_VTU3D.cxx,NO_VALID -+ TestIOADIOS2VTX_VTU3DRendering.cxx,NO_VALID -+ TestIOADIOS2VTX_VTU2DRendering.cxx,NO_VALID -+ TestIOADIOS2VTX_VTU1DRendering.cxx,NO_VALID) - -- vtk_test_cxx_executable(vtkIOADIOS2VTXCxxTests tests) -- target_link_libraries(vtkIOADIOS2VTXCxxTests PUBLIC adios2::adios2) -- endif () -+ vtk_test_cxx_executable(vtkIOADIOS2VTXCxxTests tests) -+ target_link_libraries(vtkIOADIOS2VTXCxxTests PUBLIC adios2::adios2) - else () -- if (vtk_io_adios2_core_enabled) -- vtk_add_test_cxx(vtkIOADIOS2CxxTests tests TESTING_DATA -- TestADIOS2BPReaderSingleTimeStep.cxx -- TestADIOS2BPReaderMultiTimeSteps3D.cxx -- TestADIOS2BPReaderMultiTimeSteps2D.cxx) -+ vtk_add_test_cxx(vtkIOADIOS2CxxTests tests TESTING_DATA -+ TestADIOS2BPReaderSingleTimeStep.cxx -+ TestADIOS2BPReaderMultiTimeSteps3D.cxx -+ TestADIOS2BPReaderMultiTimeSteps2D.cxx) - -- vtk_test_cxx_executable(vtkIOADIOS2CxxTests tests) -- endif () -+ vtk_test_cxx_executable(vtkIOADIOS2CxxTests tests) - endif () -diff --git a/VTK/IO/ADIOS2/vtk.module b/VTK/IO/ADIOS2/vtk.module -index 5069bd828b0..fe37260eb6d 100644 ---- a/VTK/IO/ADIOS2/vtk.module -+++ b/VTK/IO/ADIOS2/vtk.module -@@ -2,8 +2,6 @@ NAME - VTK::IOADIOS2 - LIBRARY_NAME - vtkIOADIOS2 --KIT -- VTK::IO - SPDX_LICENSE_IDENTIFIER - LicenseRef-BSD-3-Clause-Sandia-USGov - SPDX_COPYRIGHT_TEXT -diff --git a/VTK/IO/ADIOS2/vtkADIOS2CoreImageReader.cxx b/VTK/IO/ADIOS2/vtkADIOS2CoreImageReader.cxx -index 6ba4d25230d..c209fd905d5 100644 ---- a/VTK/IO/ADIOS2/vtkADIOS2CoreImageReader.cxx -+++ b/VTK/IO/ADIOS2/vtkADIOS2CoreImageReader.cxx -@@ -28,7 +28,7 @@ - #include "vtkLongLongArray.h" - #include "vtkMultiBlockDataSet.h" - #include "vtkMultiPieceDataSet.h" --#include "vtkMultiProcessController.h" -+#include "vtkMultiProcessController.h" // For the MPI controller member - #include "vtkNew.h" - #include "vtkObjectFactory.h" - #include "vtkPointData.h" -@@ -46,7 +46,7 @@ - #include "vtkUnstructuredGrid.h" - #include "vtksys/SystemTools.hxx" - --#ifdef IOADIOS2_HAVE_MPI -+#if VTK_MODULE_ENABLE_VTK_ParallelMPI - #include "vtkMPI.h" - #include "vtkMPIController.h" - #endif -@@ -126,7 +126,7 @@ vtkNew vtkADIOS2CoreImageReader::vtkADIOS2CoreImageReaderI - int myLen = static_cast(ibds->GetNumberOfBlocks()); - int* allLens{ nullptr }; - int procId{ 0 }, numProcess{ 0 }; --#ifdef IOADIOS2_HAVE_MPI -+#if VTK_MODULE_ENABLE_VTK_ParallelMPI - auto ctrl = vtkMultiProcessController::GetGlobalController(); - if (ctrl) - { -@@ -286,7 +286,7 @@ const vtkADIOS2CoreImageReader::StringToParams& vtkADIOS2CoreImageReader::GetAva - //------------------------------------------------------------------------------ - void vtkADIOS2CoreImageReader::SetController(vtkMultiProcessController* controller) - { --#ifdef IOADIOS2_HAVE_MPI -+#if VTK_MODULE_ENABLE_VTK_ParallelMPI - vtkMPIController* mpiController = vtkMPIController::SafeDownCast(controller); - if (controller && !mpiController) - { -@@ -337,7 +337,7 @@ bool vtkADIOS2CoreImageReader::OpenAndReadMetaData() - // Initialize the ADIOS2 data structures - if (!this->Impl->Adios) - { --#ifdef IOADIOS2_HAVE_MPI -+#if VTK_MODULE_ENABLE_VTK_ParallelMPI - // Make sure the ADIOS subsystem is initialized before processing any - // sort of request. - if (!this->Controller) -@@ -910,7 +910,7 @@ void vtkADIOS2CoreImageReader::CalculateWorkDistribution(const std::string& varN - auto var = this->Impl->AdiosIO.InquireVariable(varName); - size_t blockNum = this->Impl->BpReader.BlocksInfo(var, this->Impl->RequestStep).size(); - --#ifdef IOADIOS2_HAVE_MPI -+#if VTK_MODULE_ENABLE_VTK_ParallelMPI - size_t rank = static_cast(this->Controller->GetLocalProcessId()); - size_t procs = static_cast(this->Controller->GetNumberOfProcesses()); - #else --- -GitLab diff --git a/var/spack/repos/builtin/packages/parflow/package.py b/var/spack/repos/builtin/packages/parflow/package.py index 3e909b328f36be..3906e6f8f46d44 100644 --- a/var/spack/repos/builtin/packages/parflow/package.py +++ b/var/spack/repos/builtin/packages/parflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py index e8b76819888c65..9d18cd69511773 100644 --- a/var/spack/repos/builtin/packages/parmetis/package.py +++ b/var/spack/repos/builtin/packages/parmetis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parmgridgen/package.py b/var/spack/repos/builtin/packages/parmgridgen/package.py index 8f689979e4a9ed..ee83f9622fe35b 100644 --- a/var/spack/repos/builtin/packages/parmgridgen/package.py +++ b/var/spack/repos/builtin/packages/parmgridgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parmmg/package.py b/var/spack/repos/builtin/packages/parmmg/package.py index 17e18e7668ae6c..5766f9b79b6f00 100644 --- a/var/spack/repos/builtin/packages/parmmg/package.py +++ b/var/spack/repos/builtin/packages/parmmg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Parmmg(CMakePackage): maintainers("corentin-dev") + license("LGPL-3.0-or-later") + version("1.3.0", sha256="d43b73a73b62545b5a31bbe25562f69c9e63ad8a6d416bd459781203e37427cf") version("1.2.0", sha256="99729cc292dcb59c87e3f25d4cabf5a64841e83b624d383e1fd3fb7f960df672") version("1.1.0", sha256="a5904f1f56b7809ab9ec2f6118b03a082ec2b5564355a73c74fc55426cc69600") diff --git a/var/spack/repos/builtin/packages/parquet-cpp/package.py b/var/spack/repos/builtin/packages/parquet-cpp/package.py index d3a2785f660a6a..1525bd45f95109 100644 --- a/var/spack/repos/builtin/packages/parquet-cpp/package.py +++ b/var/spack/repos/builtin/packages/parquet-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class ParquetCpp(CMakePackage): homepage = "https://github.com/apache/parquet-cpp" url = "https://github.com/apache/parquet-cpp/archive/apache-parquet-cpp-1.4.0.tar.gz" + license("Apache-2.0") + version("1.4.0", sha256="52899be6c9dc49a14976d4ad84597243696c3fa2882e5c802b56e912bfbcc7ce") depends_on("arrow") diff --git a/var/spack/repos/builtin/packages/parquet-format/package.py b/var/spack/repos/builtin/packages/parquet-format/package.py index 38e728791943c4..da9585cdd87591 100644 --- a/var/spack/repos/builtin/packages/parquet-format/package.py +++ b/var/spack/repos/builtin/packages/parquet-format/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class ParquetFormat(MavenPackage): homepage = "https://github.com/apache/parquet-format/" url = "https://github.com/apache/parquet-format/archive/apache-parquet-format-2.8.0.tar.gz" + license("Apache-2.0") + version("2.8.0", sha256="345c044cea73997162e0c38ae830509ee424faf49c90974e4f244079a3df01b0") version("2.7.0", sha256="e821ffc67f61b49afce017ce2d1d402b4df352ca49dbeae167b06c4d3264b6ba") diff --git a/var/spack/repos/builtin/packages/parsec/package.py b/var/spack/repos/builtin/packages/parsec/package.py index d438f81bbe788f..c98ba1336f42ca 100644 --- a/var/spack/repos/builtin/packages/parsec/package.py +++ b/var/spack/repos/builtin/packages/parsec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Parsec(CMakePackage, CudaPackage): test_requires_compiler = True + license("BSD-3-Clause-Open-MPI") + version("master", branch="master") version( "3.0.2209", diff --git a/var/spack/repos/builtin/packages/parsimonator/package.py b/var/spack/repos/builtin/packages/parsimonator/package.py index 2b9cff629ecc78..472cbcb34c7105 100644 --- a/var/spack/repos/builtin/packages/parsimonator/package.py +++ b/var/spack/repos/builtin/packages/parsimonator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/parsplice/package.py b/var/spack/repos/builtin/packages/parsplice/package.py index d25d64d4cbf6f2..cc04c1ad98d845 100644 --- a/var/spack/repos/builtin/packages/parsplice/package.py +++ b/var/spack/repos/builtin/packages/parsplice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Parsplice(CMakePackage): tags = ["ecp", "ecp-apps"] + license("Unlicense") + version("develop", branch="master") version("multisplice", branch="multisplice") version("1.1", sha256="a011c4d14f66e7cdbc151cc74b5d40dfeae19ceea033ef48185d8f3b1bc2f86b") diff --git a/var/spack/repos/builtin/packages/pasta/package.py b/var/spack/repos/builtin/packages/pasta/package.py index 390f41e86cfd99..291c8d16f2aff3 100644 --- a/var/spack/repos/builtin/packages/pasta/package.py +++ b/var/spack/repos/builtin/packages/pasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pasta(PythonPackage): git = "https://github.com/smirarab/pasta" maintainers("snehring") + license("GPL-3.0-or-later") + version("1.9.0", commit="370ae2d21ef461bcb2cef7c20cb5a4a1db7ff99d") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/pastix/package.py b/var/spack/repos/builtin/packages/pastix/package.py index ecd303784fdc0f..06ec49caec17bc 100644 --- a/var/spack/repos/builtin/packages/pastix/package.py +++ b/var/spack/repos/builtin/packages/pastix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,11 +12,13 @@ class Pastix(CMakePackage, CudaPackage): based on direct methods""" homepage = "https://gitlab.inria.fr/solverstack/pastix/blob/master/README.md" - url = "https://files.inria.fr/pastix/releases/v6/pastix-6.2.2.tar.gz" + url = "https://files.inria.fr/pastix/releases/v6/pastix-6.3.2.tar.gz" git = "https://gitlab.inria.fr/solverstack/pastix.git" maintainers("fpruvost", "mfaverge", "ramet") version("master", branch="master", submodules=True) + version("6.3.2", sha256="c4da8802d1933eecf8c09d7e63c014c81ccf353fe623142e9f5c5fc65ed82ee0") + version("6.3.1", sha256="290464d73b7d43356e4735a29932bf6f23a88e94ec7139ba7744c21e42c52681") version("6.3.0", sha256="a6bfec32a3279d7b24c5fc05885c6632d177e467f1584707c6fd7c42a8703c3e") version("6.2.2", sha256="cce9a1fe4678b5733c9f1a5a52f77b040eadc3e254418c6fb03d8ab37dede508") version("6.2.1", sha256="b680cbfc265df8cba18d3a7093fcc02e260198c4a2d6a86d1e684bb291e309dd") diff --git a/var/spack/repos/builtin/packages/patch/package.py b/var/spack/repos/builtin/packages/patch/package.py index 7dea78e6a6750a..f974ab01c25606 100644 --- a/var/spack/repos/builtin/packages/patch/package.py +++ b/var/spack/repos/builtin/packages/patch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Patch(AutotoolsPackage, GNUMirrorPackage): tags = ["core-packages"] + license("GPL-3.0-or-later") + version("2.7.6", sha256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd") version("2.7.5", sha256="fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299") diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py index 2630085d4eeaf7..3aa78aa604c3ea 100644 --- a/var/spack/repos/builtin/packages/patchelf/package.py +++ b/var/spack/repos/builtin/packages/patchelf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,8 +18,17 @@ class Patchelf(AutotoolsPackage): maintainers("haampie") + license("GPL-3.0-or-later") + version("0.18.0", sha256="64de10e4c6b8b8379db7e87f58030f336ea747c0515f381132e810dbf84a86e7") - version("0.17.2", sha256="20427b718dd130e4b66d95072c2a2bd5e17232e20dad58c1bea9da81fae330e0") + # patchelf 0.18 breaks libraries: + # https://github.com/spack/spack/issues/39252 + # https://github.com/spack/spack/pull/40938 + version( + "0.17.2", + sha256="20427b718dd130e4b66d95072c2a2bd5e17232e20dad58c1bea9da81fae330e0", + preferred=True, + ) version("0.16.1", sha256="1a562ed28b16f8a00456b5f9ee573bb1af7c39c1beea01d94fc0c7b3256b0406") version("0.15.0", sha256="53a8d58ed4e060412b8fdcb6489562b3c62be6f65cee5af30eba60f4423bfa0f") version("0.14.5", sha256="113ada3f1ace08f0a7224aa8500f1fa6b08320d8f7df05ff58585286ec5faa6f") diff --git a/var/spack/repos/builtin/packages/patchutils/package.py b/var/spack/repos/builtin/packages/patchutils/package.py index c49cd54b47fe94..407c7021aeb57a 100644 --- a/var/spack/repos/builtin/packages/patchutils/package.py +++ b/var/spack/repos/builtin/packages/patchutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Patchutils(AutotoolsPackage): homepage = "http://cyberelk.net/tim/software/patchutils/" url = "http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.4.2.tar.xz" + license("GPL-2.0-or-later") + version("0.4.2", sha256="8875b0965fe33de62b890f6cd793be7fafe41a4e552edbf641f1fed5ebbf45ed") version("0.4.0", sha256="da6df1fa662b635c2969e7d017e6f32f5b39f1b802673a0af635e4936d4bc2f4") version("0.3.4", sha256="cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876") diff --git a/var/spack/repos/builtin/packages/pathfinder/package.py b/var/spack/repos/builtin/packages/pathfinder/package.py index a701c357ca08ca..c6940f01920bc6 100644 --- a/var/spack/repos/builtin/packages/pathfinder/package.py +++ b/var/spack/repos/builtin/packages/pathfinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pathfinder(MakefilePackage): tags = ["proxy-app"] + license("LGPL-3.0-only") + version("1.0.0", sha256="e002ff7df1ee9a6ee8a892fc208e047e2daf4215ff0d77e7ddc6b09d0506be16") build_targets = ["--directory=PathFinder_ref", "CC=cc"] diff --git a/var/spack/repos/builtin/packages/pax-utils/package.py b/var/spack/repos/builtin/packages/pax-utils/package.py index 6f72e2710838e6..bf14c3c2792de0 100644 --- a/var/spack/repos/builtin/packages/pax-utils/package.py +++ b/var/spack/repos/builtin/packages/pax-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class PaxUtils(AutotoolsPackage): homepage = "https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" url = "https://dev.gentoo.org/~vapier/dist/pax-utils-1.2.2.tar.xz" + license("GPL-2.0-only") + version("1.3.3", sha256="eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14") version("1.2.2", sha256="7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9") diff --git a/var/spack/repos/builtin/packages/pbbam/package.py b/var/spack/repos/builtin/packages/pbbam/package.py index 83361112f78cf0..65d1f6467f3c50 100644 --- a/var/spack/repos/builtin/packages/pbbam/package.py +++ b/var/spack/repos/builtin/packages/pbbam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pbmpi/package.py b/var/spack/repos/builtin/packages/pbmpi/package.py index 1fbb07177a0398..f063f0cd843a4c 100644 --- a/var/spack/repos/builtin/packages/pbmpi/package.py +++ b/var/spack/repos/builtin/packages/pbmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pbmpi(MakefilePackage): maintainers("snehring") + license("GPL-2.0-only") + version("1.9", sha256="567d8db995f23b2b0109c1e6088a7e5621e38fec91d6b2f27abd886b90ea31ce") version("1.8c", sha256="2a80ec4a98d92ace61c67ff9ba78249d45d03094b364959d490b1ad05797a279") version("partition", branch="partition") diff --git a/var/spack/repos/builtin/packages/pciutils/package.py b/var/spack/repos/builtin/packages/pciutils/package.py index 6113d782cd9e3c..a2b8d2fdb3f07d 100644 --- a/var/spack/repos/builtin/packages/pciutils/package.py +++ b/var/spack/repos/builtin/packages/pciutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pciutils(MakefilePackage): homepage = "https://mj.ucw.cz/sw/pciutils/" url = "https://github.com/pciutils/pciutils/archive/v3.7.0.tar.gz" + license("GPL-2.0-only") + version("3.7.0", sha256="ea768aa0187ba349391c6c157445ecc2b42e7d671fc1ce8c53ff5ef513f1e2ab") version("3.6.4", sha256="551d0ac33f030868b7e95c29e58dc2b1882455dbc9c15c15adf7086e664131f1") version("3.6.3", sha256="7ab0fbb35cffa326eb852539260562bac14f3d27cda8c70bc2cf3211ed97c014") diff --git a/var/spack/repos/builtin/packages/pcl/package.py b/var/spack/repos/builtin/packages/pcl/package.py index e0dd4967aa44cc..f0df251e5f0aae 100644 --- a/var/spack/repos/builtin/packages/pcl/package.py +++ b/var/spack/repos/builtin/packages/pcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pcl(CMakePackage): homepage = "https://pointclouds.org/" url = "https://github.com/PointCloudLibrary/pcl/releases/download/pcl-1.11.1/source.tar.gz" + license("BSD-3-Clause") + version("1.13.1", sha256="be4d499c066203a3c296e2f7e823d6209be5983415f2279310ed1c9abb361d30") version("1.13.0", sha256="bd110789f6a7416ed1c58da302afbdb80f8d297a9e23cc02fd78ab78b4762698") version("1.12.1", sha256="a9573efad5e024c02f2cc9180bb8f82605c3772c62463efbe25c5d6e634b91dc") diff --git a/var/spack/repos/builtin/packages/pcma/package.py b/var/spack/repos/builtin/packages/pcma/package.py index 0a5cae7fb27aae..ce9a459056b6b1 100644 --- a/var/spack/repos/builtin/packages/pcma/package.py +++ b/var/spack/repos/builtin/packages/pcma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py index 4719f5ea379e0f..02d4ea0cd07878 100644 --- a/var/spack/repos/builtin/packages/pcre/package.py +++ b/var/spack/repos/builtin/packages/pcre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Pcre(AutotoolsPackage, CMakePackage): homepage = "https://www.pcre.org" url = "https://sourceforge.net/projects/pcre/files/pcre/8.42/pcre-8.42.tar.bz2" + license("BSD-3-Clause") + version("8.45", sha256="4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8") version("8.44", sha256="19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d") version("8.43", sha256="91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b") @@ -40,21 +42,34 @@ class Pcre(AutotoolsPackage, CMakePackage): description="Enable support for UTF-8/16/32, " "incompatible with EBCDIC.", ) + variant("shared", default=True, description="Build shared libraries") + variant("static", default=True, description="Build static libraries") + conflicts("-shared -static", msg="Must build one of shared and static") + conflicts( + "+shared +static", + when="build_system=cmake", + msg="CMake can only build either shared or static", + ) + + variant("pic", default=True, description="Enable position-independent code (PIC)") + requires("+pic", when="+shared build_system=autotools") + class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder): def configure_args(self): args = [] - if "+jit" in self.spec: - args.append("--enable-jit") + args.extend(self.enable_or_disable("shared")) + args.extend(self.enable_or_disable("static")) + args.extend(self.with_or_without("pic")) + + args.extend(self.enable_or_disable("jit")) - if "+multibyte" in self.spec: - args.append("--enable-pcre16") - args.append("--enable-pcre32") + args.extend(self.enable_or_disable("pcre16", variant="multibyte")) + args.extend(self.enable_or_disable("pcre32", variant="multibyte")) - if "+utf" in self.spec: - args.append("--enable-utf") - args.append("--enable-unicode-properties") + args.extend(self.enable_or_disable("utf")) + args.extend(self.enable_or_disable("unicode-properties", variant="utf")) return args @@ -63,15 +78,16 @@ class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder): def cmake_args(self): args = [] - if "+jit" in self.spec: - args.append("-DPCRE_SUPPORT_JIT:BOOL=ON") + args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared")) + args.append(self.define_from_variant("BUILD_STATIC_LIBS", "static")) + args.append(self.define_from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic")) + + args.append(self.define_from_variant("PCRE_SUPPORT_JIT", "jit")) - if "+multibyte" in self.spec: - args.append("-DPCRE_BUILD_PCRE16:BOOL=ON") - args.append("-DPCRE_BUILD_PCRE32:BOOL=ON") + args.append(self.define_from_variant("PCRE_BUILD_PCRE16", "multibyte")) + args.append(self.define_from_variant("PCRE_BUILD_PCRE32", "multibyte")) - if "+utf" in self.spec: - args.append("-DPCRE_SUPPORT_UTF:BOOL=ON") - args.append("-DPCRE_SUPPORT_UNICODE_PROPERTIES:BOOL=ON") + args.append(self.define_from_variant("PCRE_SUPPORT_UTF", "utf")) + args.append(self.define_from_variant("PCRE_SUPPORT_UNICODE_PROPERTIES", "utf")) return args diff --git a/var/spack/repos/builtin/packages/pcre2/package.py b/var/spack/repos/builtin/packages/pcre2/package.py index 885167f05e19a1..d2bf686f89d83e 100644 --- a/var/spack/repos/builtin/packages/pcre2/package.py +++ b/var/spack/repos/builtin/packages/pcre2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pcre2(AutotoolsPackage): homepage = "https://www.pcre.org" url = "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2" + license("BSD-3-Clause") + version("10.42", sha256="8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840") version("10.41", sha256="0f78cebd3e28e346475fb92e95fe9999945b4cbaad5f3b42aca47b887fb53308") version("10.40", sha256="14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68") diff --git a/var/spack/repos/builtin/packages/pcsclite/package.py b/var/spack/repos/builtin/packages/pcsclite/package.py index ddcde02b75962d..a531d14defd463 100644 --- a/var/spack/repos/builtin/packages/pcsclite/package.py +++ b/var/spack/repos/builtin/packages/pcsclite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pcsclite(AutotoolsPackage): maintainers("cessenat") + license("GPL-3.0-or-later") + version("master", branch="master") version("1.9.8", sha256="502d80c557ecbee285eb99fe8703eeb667bcfe067577467b50efe3420d1b2289") diff --git a/var/spack/repos/builtin/packages/pdc/package.py b/var/spack/repos/builtin/packages/pdc/package.py index de3f00e873f01e..9b84135d5a2fa3 100644 --- a/var/spack/repos/builtin/packages/pdc/package.py +++ b/var/spack/repos/builtin/packages/pdc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Pdc(CMakePackage): maintainers("houjun", "sbyna") + license("BSD-3-Clause-LBNL") + version("0.3", sha256="14a3abd5e1e604f9527105709fca545bcdebe51abd2b89884db74d48a38b5443") version("0.2", sha256="2829e74da227913a1a8e3e4f64e8f422ab9c0a049f8d73ff7b6ca12463959f8b") version("0.1", sha256="01b4207ecf71594a7f339c315f2869b3fa8fbd34b085963dc4c1bdc5b66bb93e") diff --git a/var/spack/repos/builtin/packages/pdf2svg/package.py b/var/spack/repos/builtin/packages/pdf2svg/package.py index 7f6602ad47713f..b7a74e0e96eedf 100644 --- a/var/spack/repos/builtin/packages/pdf2svg/package.py +++ b/var/spack/repos/builtin/packages/pdf2svg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pdf2svg(AutotoolsPackage): homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg" url = "https://github.com/dawbarton/pdf2svg/archive/v0.2.3.tar.gz" + license("GPL-2.0-only") + version("0.2.3", sha256="4fb186070b3e7d33a51821e3307dce57300a062570d028feccd4e628d50dea8a") version("0.2.2", sha256="e5f1d9b78821e44cd85379fb07f38a42f00bb2bde3743b95301ff8c0a5ae229a") diff --git a/var/spack/repos/builtin/packages/pdftk/package.py b/var/spack/repos/builtin/packages/pdftk/package.py index 85e93902cf61be..6b6484df539be8 100644 --- a/var/spack/repos/builtin/packages/pdftk/package.py +++ b/var/spack/repos/builtin/packages/pdftk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pdsh/package.py b/var/spack/repos/builtin/packages/pdsh/package.py index 329f57bb2049ee..58872d3a3a8344 100644 --- a/var/spack/repos/builtin/packages/pdsh/package.py +++ b/var/spack/repos/builtin/packages/pdsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pdsh(AutotoolsPackage): homepage = "https://github.com/grondo/pdsh" url = "https://github.com/grondo/pdsh/archive/pdsh-2.31.tar.gz" + license("GPL-2.0") + version("2.31", sha256="0ee066ce395703285cf4f6cf00b54b7097d12457a4b1c146bc6f33d8ba73caa7") variant("ssh", default=True, description="Build with ssh module") diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index c8665aaac27758..cccd240d1153ef 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Pdt(AutotoolsPackage): tags = ["e4s"] + license("GPL-2.0-only") + version("3.25.1", sha256="0b6f8a6b8769c181b2ae6cae7298f04b8e3e3d68066f598ed24574e19500bc97") version("3.25", sha256="1037628d854edfeded3d847150d3e8fbd3774e8146407ce32f5021c80f6299be") version("3.24", sha256="4a2bb31f3f7f2e52ed49d9b7189ade05170a4386ef76771280a06e8b3ca97ab2") diff --git a/var/spack/repos/builtin/packages/pegtl/package.py b/var/spack/repos/builtin/packages/pegtl/package.py index 72a4bd67ada63f..af038366f46bd2 100644 --- a/var/spack/repos/builtin/packages/pegtl/package.py +++ b/var/spack/repos/builtin/packages/pegtl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Pegtl(CMakePackage): url = "https://github.com/taocpp/PEGTL/tarball/2.1.4" git = "https://github.com/taocpp/PEGTL.git" + license("MIT") + version("master", branch="master") version("3.2.7", sha256="444c3c33686c6b2d8d45ad03af5041b7bc910ef44ac10216237d8e3e8d6e7025") version("3.2.0", sha256="91aa6529ef9e6b57368e7b5b1f04a3bd26a39419d30e35a3c5c66ef073926b56") diff --git a/var/spack/repos/builtin/packages/pennant/package.py b/var/spack/repos/builtin/packages/pennant/package.py index 7b0fdda651ff3d..bfce36fc5968b8 100644 --- a/var/spack/repos/builtin/packages/pennant/package.py +++ b/var/spack/repos/builtin/packages/pennant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py index 348c14ec4c8114..2680fe33bda575 100644 --- a/var/spack/repos/builtin/packages/percept/package.py +++ b/var/spack/repos/builtin/packages/percept/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/percona-server/package.py b/var/spack/repos/builtin/packages/percona-server/package.py index c501579e43fc43..6a7203cd5efce7 100644 --- a/var/spack/repos/builtin/packages/percona-server/package.py +++ b/var/spack/repos/builtin/packages/percona-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerconaServer(CMakePackage): homepage = "https://www.percona.com" url = "https://github.com/percona/percona-server/archive/Percona-Server-5.7.31-34.tar.gz" + license("Unicode-TOU") + version("8.0.20-11", sha256="454ba8b64d447f477a70888903949ce6f64c57d3e15e9054d17d156c88693670") version("8.0.19-10", sha256="f2f979bd7dfb4d62aef79b7c488070d5d599341a6acbb295400f1d68257cbd80") version("8.0.18-9", sha256="e79a8c1ae5f2271c0b344494a299a9bbbada88d3bce87449b7de274d17d1ccd0") diff --git a/var/spack/repos/builtin/packages/perfstubs/package.py b/var/spack/repos/builtin/packages/perfstubs/package.py index a3de35923219b2..699521a631bbde 100644 --- a/var/spack/repos/builtin/packages/perfstubs/package.py +++ b/var/spack/repos/builtin/packages/perfstubs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Perfstubs(CMakePackage): homepage = "https://github.com/khuck/perfstubs" git = "https://github.com/khuck/perfstubs.git" + license("BSD-3-Clause") + version("master", branch="master") variant("static", default=False, description="Build static executable support") diff --git a/var/spack/repos/builtin/packages/perl-acme-damn/package.py b/var/spack/repos/builtin/packages/perl-acme-damn/package.py index 1135cc1512115c..4ec5d5b1068271 100644 --- a/var/spack/repos/builtin/packages/perl-acme-damn/package.py +++ b/var/spack/repos/builtin/packages/perl-acme-damn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py index a08a72309b37c2..db32957f1efb78 100644 --- a/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-algorithm-diff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlAlgorithmDiff(PerlPackage): homepage = "https://metacpan.org/pod/Algorithm::Diff" url = "http://search.cpan.org/CPAN/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.1903", sha256="30e84ac4b31d40b66293f7b1221331c5a50561a39d580d85004d9c1fff991751") diff --git a/var/spack/repos/builtin/packages/perl-alien-build-plugin-download-gitlab/package.py b/var/spack/repos/builtin/packages/perl-alien-build-plugin-download-gitlab/package.py new file mode 100644 index 00000000000000..dc33076ab81703 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-alien-build-plugin-download-gitlab/package.py @@ -0,0 +1,31 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlAlienBuildPluginDownloadGitlab(PerlPackage): + """Alien::Build plugin to download from GitLab""" + + homepage = "https://metacpan.org/pod/Alien::Build::Plugin::Download::GitLab" + url = "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-Plugin-Download-GitLab-0.01.tar.gz" + + maintainers("EbiArnie") + + version("0.01", sha256="c1f089c8ea152a789909d48a83dbfcf2626f773daf30431c8622582b26aba902") + + depends_on("perl@5.8.4:", type=("build", "link", "run", "test")) + depends_on("perl-alien-build", type=("build", "run", "test")) + depends_on("perl-path-tiny", type=("build", "run", "test")) + depends_on("perl-test2-suite", type=("build", "test")) + depends_on("perl-uri", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Alien::Build::Plugin::Download::GitLab; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-alien-build/package.py b/var/spack/repos/builtin/packages/perl-alien-build/package.py index 3c2fae488e6a40..74799af883a283 100644 --- a/var/spack/repos/builtin/packages/perl-alien-build/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlAlienBuild(PerlPackage): homepage = "https://metacpan.org/pod/Alien::Build" url = "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-1.86.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.78", sha256="9140671790a0696920b0a97acd812ab4d0b93ac69306d20679f027dd0c7caa27") version("1.86", sha256="f856a46aea72fe77daea5b1788b4ea0dc215f5704f5a35fa063171be8523e4e9") diff --git a/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py b/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py index 0232d226dcb451..a48a7f88e9ecce 100644 --- a/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-libxml2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlAlienLibxml2(PerlPackage): homepage = "https://metacpan.org/pod/Alien::Libxml2" url = "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.10_01.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.10_01", sha256="2f45b308b33503292f48bf46a75fe1e653d6b209ba5caf0628d8cc103f8d61ac") depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/perl-alien-svn/package.py b/var/spack/repos/builtin/packages/perl-alien-svn/package.py index 579dca61ad98b6..94b06b1bde9aa3 100644 --- a/var/spack/repos/builtin/packages/perl-alien-svn/package.py +++ b/var/spack/repos/builtin/packages/perl-alien-svn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-any-uri-escape/package.py b/var/spack/repos/builtin/packages/perl-any-uri-escape/package.py new file mode 100644 index 00000000000000..2ddeca34d428bd --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-any-uri-escape/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlAnyUriEscape(PerlPackage): + """Load URI::Escape::XS preferentially over URI::Escape""" + + homepage = "https://metacpan.org/pod/Any::URI::Escape" + url = "https://cpan.metacpan.org/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz" + + maintainers("EbiArnie") + + version("0.01", sha256="e3813cec9f108fa5c0be66e08c1986bfba4d242151b0f9f4ec5e0c5e17108c4c") + + depends_on("perl-uri", type=("run")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Any::URI::Escape; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-app-cmd/package.py b/var/spack/repos/builtin/packages/perl-app-cmd/package.py index 14d6af8f20cd5d..b8399f66f07bbe 100644 --- a/var/spack/repos/builtin/packages/perl-app-cmd/package.py +++ b/var/spack/repos/builtin/packages/perl-app-cmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlAppCmd(PerlPackage): homepage = "https://metacpan.org/pod/App::Cmd" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz" + license("Artistic-1.0") + version("0.335", sha256="f95517fc4df348d9e7ea01467aabd9725f0715662ee483b54b81d3f0b38c9874") version("0.331", sha256="4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680") diff --git a/var/spack/repos/builtin/packages/perl-appconfig/package.py b/var/spack/repos/builtin/packages/perl-appconfig/package.py index 7f2cf6735e9222..fc3772456b9b8e 100644 --- a/var/spack/repos/builtin/packages/perl-appconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-appconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlAppconfig(PerlPackage): homepage = "https://metacpan.org/pod/AppConfig" url = "https://cpan.metacpan.org/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.71", sha256="1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f") diff --git a/var/spack/repos/builtin/packages/perl-archive-zip/package.py b/var/spack/repos/builtin/packages/perl-archive-zip/package.py index 44bb1eb0a155c2..d78f00180dabc0 100644 --- a/var/spack/repos/builtin/packages/perl-archive-zip/package.py +++ b/var/spack/repos/builtin/packages/perl-archive-zip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlArchiveZip(PerlPackage): homepage = "https://metacpan.org/pod/Archive::Zip" url = "https://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-1.68.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.68", sha256="984e185d785baf6129c6e75f8eb44411745ac00bf6122fb1c8e822a3861ec650") diff --git a/var/spack/repos/builtin/packages/perl-array-utils/package.py b/var/spack/repos/builtin/packages/perl-array-utils/package.py index 209fd8fdf5739c..464c413b9b897d 100644 --- a/var/spack/repos/builtin/packages/perl-array-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-array-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-b-cow/package.py b/var/spack/repos/builtin/packages/perl-b-cow/package.py new file mode 100644 index 00000000000000..97b1d8ddf22a3f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-b-cow/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlBCow(PerlPackage): + """B::COW additional B helpers to check COW status""" + + homepage = "https://metacpan.org/pod/B::COW" + url = "https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/B-COW-0.007.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.007", sha256="1290daf227e8b09889a31cf182e29106f1cf9f1a4e9bf7752f9de92ed1158b44") + + depends_on("perl@5.8.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use B::COW; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py index 16f7cd8589080b..901ef364e4f5ad 100644 --- a/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py +++ b/var/spack/repos/builtin/packages/perl-b-hooks-endofscope/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,21 @@ class PerlBHooksEndofscope(PerlPackage): homepage = "https://metacpan.org/pod/B::Hooks::EndOfScope" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.21.tar.gz" + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.26", sha256="39df2f8c007a754672075f95b90797baebe97ada6d944b197a6352709cb30671") version("0.21", sha256="90f3580880f1d68b843c142cc86f58bead1f3e03634c63868ac9eba5eedae02c") - depends_on("perl-sub-exporter-progressive", type=("build", "run")) + depends_on("perl@5.6.1:", type=("build", "link", "run", "test")) + depends_on("perl-module-implementation@0.05:", type=("build", "run", "test")) + depends_on("perl-sub-exporter-progressive@0.001006:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use B::Hooks::EndOfScope; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-bignum/package.py b/var/spack/repos/builtin/packages/perl-bignum/package.py index 711d3ee73abb54..828fc8578bafb5 100644 --- a/var/spack/repos/builtin/packages/perl-bignum/package.py +++ b/var/spack/repos/builtin/packages/perl-bignum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-bio-db-hts/package.py b/var/spack/repos/builtin/packages/perl-bio-db-hts/package.py new file mode 100644 index 00000000000000..4f941ad998d596 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-bio-db-hts/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlBioDbHts(PerlPackage): + """Bio::DB::HTS - This is a Perl interface to the HTS Library.""" + + homepage = "https://metacpan.org/dist/Bio-DB-HTS" + url = "https://cpan.metacpan.org/authors/id/A/AV/AVULLO/Bio-DB-HTS-3.01.tar.gz" + + version("3.01", sha256="12a6bc1f579513cac8b9167cce4e363655cc8eba26b7d9fe1170dfe95e044f42") + + depends_on("perl-module-build", type="build") + depends_on("perl-bioperl") + depends_on("htslib") diff --git a/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py b/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py index ca667ee8c6380f..a43abbd2831b6c 100644 --- a/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py +++ b/var/spack/repos/builtin/packages/perl-bio-searchio-hmmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlBioSearchioHmmer(PerlPackage): homepage = "https://github.com/bioperl/bio-searchio-hmmer" url = "https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS/Bio-SearchIO-hmmer-1.7.3.tar.gz" + license("Artistic-1.0") + version("1.7.3", sha256="686152f8ce7c611d27ee35ac002ecc309f6270e289a482993796a23bb5388246") depends_on("perl-bioperl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-bioperl/package.py b/var/spack/repos/builtin/packages/perl-bioperl/package.py index 5116803935f87c..abe4ab450ae442 100644 --- a/var/spack/repos/builtin/packages/perl-bioperl/package.py +++ b/var/spack/repos/builtin/packages/perl-bioperl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -36,6 +36,8 @@ class PerlBioperl(PerlPackage): homepage = "https://metacpan.org/pod/BioPerl" url = "https://cpan.metacpan.org/authors/id/C/CD/CDRAUG/BioPerl-1.7.6.tar.gz" + license("Artistic-1.0") + version( "1.7.6", sha256="df2a3efc991b9b5d7cc9d038a1452c6dac910c9ad2a0e47e408dd692c111688d", diff --git a/var/spack/repos/builtin/packages/perl-bit-vector/package.py b/var/spack/repos/builtin/packages/perl-bit-vector/package.py index 62821437df89ad..f48e8c993adaa7 100644 --- a/var/spack/repos/builtin/packages/perl-bit-vector/package.py +++ b/var/spack/repos/builtin/packages/perl-bit-vector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlBitVector(PerlPackage): homepage = "https://metacpan.org/dist/Bit-Vector/view/Vector.pod" url = "http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("7.4", sha256="3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926") depends_on("perl-carp-clan", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-cairo/package.py b/var/spack/repos/builtin/packages/perl-cairo/package.py index c2b0e4ee1142df..828cbc64aefda9 100644 --- a/var/spack/repos/builtin/packages/perl-cairo/package.py +++ b/var/spack/repos/builtin/packages/perl-cairo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlCairo(PerlPackage): homepage = "https://metacpan.org/pod/Cairo" url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/Cairo-1.106.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.106", sha256="e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4") depends_on("cairo") diff --git a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py index 2afc0e2caab20f..026553dc4f40f7 100644 --- a/var/spack/repos/builtin/packages/perl-capture-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-capture-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlCaptureTiny(PerlPackage): homepage = "https://metacpan.org/pod/Capture::Tiny" url = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.46.tar.gz" + license("Apache-2.0") + version("0.48", sha256="6c23113e87bad393308c90a207013e505f659274736638d8c79bac9c67cc3e19") version("0.46", sha256="5d7a6a830cf7f2b2960bf8b8afaac16a537ede64f3023827acea5bd24ca77015") diff --git a/var/spack/repos/builtin/packages/perl-carp-assert/package.py b/var/spack/repos/builtin/packages/perl-carp-assert/package.py new file mode 100644 index 00000000000000..e5f0e0daa6224b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-carp-assert/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlCarpAssert(PerlPackage): + """Carp::Assert - executable comments.""" + + homepage = "https://metacpan.org/pod/Carp::Assert" + url = "https://cpan.metacpan.org/authors/id/Y/YV/YVES/Carp-Assert-0.22.tar.gz" + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.22", sha256="807ea97c6bed76ac2e4969efba7dae48fefeb9f28797f112671b3ac8a49355f7") + + depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-carp-clan/package.py b/var/spack/repos/builtin/packages/perl-carp-clan/package.py index f1a84633ad4020..08f43e817e761b 100644 --- a/var/spack/repos/builtin/packages/perl-carp-clan/package.py +++ b/var/spack/repos/builtin/packages/perl-carp-clan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlCarpClan(PerlPackage): homepage = "https://metacpan.org/pod/Carp::Clan" url = "http://search.cpan.org/CPAN/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.06", sha256="ea4ac8f611354756d43cb369880032901e9cc4cc7e0bebb7b647186dac00c9d4") depends_on("perl-test-exception", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-carp/package.py b/var/spack/repos/builtin/packages/perl-carp/package.py index af6e337b9baaf1..577d2cae28aaba 100644 --- a/var/spack/repos/builtin/packages/perl-carp/package.py +++ b/var/spack/repos/builtin/packages/perl-carp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlCarp(PerlPackage): homepage = "https://metacpan.org/pod/Carp" url = "https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/Carp-1.50.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.50", sha256="f5273b4e1a6d51b22996c48cb3a3cbc72fd456c4038f5c20b127e2d4bcbcebd9") depends_on("perl-extutils-makemaker", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-cgi/package.py b/var/spack/repos/builtin/packages/perl-cgi/package.py index 2dcc72e4f54d5c..c8cfde9fb8cb08 100644 --- a/var/spack/repos/builtin/packages/perl-cgi/package.py +++ b/var/spack/repos/builtin/packages/perl-cgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PerlCgi(PerlPackage): maintainers("cessenat") + license("Artistic-2.0") + version("4.56", sha256="2d36d930b89ecdfbcc7d6d4740821bd466a0218abf1bd413568640b2f43799b7") version("4.54", sha256="9608a044ae2e87cefae8e69b113e3828552ddaba0d596a02f9954c6ac17fa294") version("4.53", sha256="c67e732f3c96bcb505405fd944f131fe5c57b46e5d02885c00714c452bf14e60") diff --git a/var/spack/repos/builtin/packages/perl-class-accessor-lvalue/package.py b/var/spack/repos/builtin/packages/perl-class-accessor-lvalue/package.py new file mode 100644 index 00000000000000..ce13db422ec7df --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-class-accessor-lvalue/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlClassAccessorLvalue(PerlPackage): + """Create Lvalue accessors""" + + homepage = "https://metacpan.org/pod/Class::Accessor::Lvalue" + url = "https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Class-Accessor-Lvalue-0.11.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.11", sha256="ea5b1bcfbc1c3c63004eb280a5415f7dad2a82257675ab033382814fe168913c") + + depends_on("perl-class-accessor", type=("build", "run", "test")) + depends_on("perl-want", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Class::Accessor::Lvalue; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-class-accessor/package.py b/var/spack/repos/builtin/packages/perl-class-accessor/package.py new file mode 100644 index 00000000000000..3b97b137c75f09 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-class-accessor/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlClassAccessor(PerlPackage): + """Automated accessor generation""" + + homepage = "https://metacpan.org/pod/Class::Accessor" + url = "https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz" + + maintainers("EbiArnie") + + version("0.51", sha256="bf12a3e5de5a2c6e8a447b364f4f5a050bf74624c56e315022ae7992ff2f411c") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Class::Accessor; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py index 4c816a3a6e323c..f80a9e744b8aa5 100644 --- a/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py +++ b/var/spack/repos/builtin/packages/perl-class-data-inheritable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlClassDataInheritable(PerlPackage): homepage = "https://metacpan.org/pod/Class::Data::Inheritable" url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.08", sha256="9967feceea15227e442ec818723163eb6d73b8947e31f16ab806f6e2391af14a") diff --git a/var/spack/repos/builtin/packages/perl-class-inspector/package.py b/var/spack/repos/builtin/packages/perl-class-inspector/package.py index 900919e3647c9e..240025474e1e84 100644 --- a/var/spack/repos/builtin/packages/perl-class-inspector/package.py +++ b/var/spack/repos/builtin/packages/perl-class-inspector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlClassInspector(PerlPackage): homepage = "https://metacpan.org/pod/Class::Inspector" url = "http://search.cpan.org/CPAN/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.36", sha256="cc295d23a472687c24489d58226ead23b9fdc2588e522f0b5f0747741700694e") version("1.32", sha256="cefadc8b5338e43e570bc43f583e7c98d535c17b196bcf9084bb41d561cc0535") diff --git a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py index 79d69d0dd74372..d5f73aa9e43c54 100644 --- a/var/spack/repos/builtin/packages/perl-class-load-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load-xs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlClassLoadXs(PerlPackage): homepage = "https://metacpan.org/pod/Class::Load::XS" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz" + license("Artistic-2.0") + version("0.10", sha256="5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1") depends_on("perl-class-load", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-class-load/package.py b/var/spack/repos/builtin/packages/perl-class-load/package.py index 1ddfb3b51a06a7..f2b8e216f72bb4 100644 --- a/var/spack/repos/builtin/packages/perl-class-load/package.py +++ b/var/spack/repos/builtin/packages/perl-class-load/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlClassLoad(PerlPackage): homepage = "https://metacpan.org/pod/Class::Load" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Class-Load-0.24.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.25", sha256="2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f") version("0.24", sha256="0bb983da46c146534fc77a556d6e40d925142f2eb43103534025ee545265ca36") diff --git a/var/spack/repos/builtin/packages/perl-class-method-modifiers/package.py b/var/spack/repos/builtin/packages/perl-class-method-modifiers/package.py index a02a63e12573c5..a6aaa9bd250554 100644 --- a/var/spack/repos/builtin/packages/perl-class-method-modifiers/package.py +++ b/var/spack/repos/builtin/packages/perl-class-method-modifiers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlClassMethodModifiers(PerlPackage): homepage = "https://metacpan.org/pod/Class::Method::Modifiers" url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.15", sha256="65cd85bfe475d066e9186f7a8cc636070985b30b0ebb1cde8681cf062c2e15fc") version("2.13", sha256="ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63") diff --git a/var/spack/repos/builtin/packages/perl-class-singleton/package.py b/var/spack/repos/builtin/packages/perl-class-singleton/package.py new file mode 100644 index 00000000000000..3e97feec1ac690 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-class-singleton/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlClassSingleton(PerlPackage): + """Class::Singleton - Implementation of a "Singleton" class""" + + homepage = "https://metacpan.org/pod/Class::Singleton" + url = "https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-1.6.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.6", sha256="27ba13f0d9512929166bbd8c9ef95d90d630fc80f0c9a1b7458891055e9282a4") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Class::Singleton; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-class-tiny/package.py b/var/spack/repos/builtin/packages/perl-class-tiny/package.py new file mode 100644 index 00000000000000..47b69c0a38e5a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-class-tiny/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlClassTiny(PerlPackage): + """Minimalist class construction""" + + homepage = "https://metacpan.org/pod/Class::Tiny" + url = "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.008.tar.gz" + + maintainers("EbiArnie") + + license("Apache-2.0") + + version("1.008", sha256="ee058a63912fa1fcb9a72498f56ca421a2056dc7f9f4b67837446d6421815615") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) diff --git a/var/spack/repos/builtin/packages/perl-clone-choose/package.py b/var/spack/repos/builtin/packages/perl-clone-choose/package.py index 32dcc81c53cea0..5a1441cd9bf54c 100644 --- a/var/spack/repos/builtin/packages/perl-clone-choose/package.py +++ b/var/spack/repos/builtin/packages/perl-clone-choose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlCloneChoose(PerlPackage): homepage = "https://metacpan.org/pod/Clone::Choose" url = "https://cpan.metacpan.org/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.010", sha256="5623481f58cee8edb96cd202aad0df5622d427e5f748b253851dfd62e5123632") diff --git a/var/spack/repos/builtin/packages/perl-clone-pp/package.py b/var/spack/repos/builtin/packages/perl-clone-pp/package.py new file mode 100644 index 00000000000000..b6ea95ea9ec200 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-clone-pp/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlClonePp(PerlPackage): + """Recursively copy Perl datatypes""" + + homepage = "https://metacpan.org/pod/Clone::PP" + url = "https://cpan.metacpan.org/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.08", sha256="57203094a5d8574b6a00951e8f2399b666f4e74f9511d9c9fb5b453d5d11f578") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Clone::PP; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-clone/package.py b/var/spack/repos/builtin/packages/perl-clone/package.py index 6296d3ebdaabfb..6d1c52ea92dfd9 100644 --- a/var/spack/repos/builtin/packages/perl-clone/package.py +++ b/var/spack/repos/builtin/packages/perl-clone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlClone(PerlPackage): homepage = "https://metacpan.org/pod/Clone" url = "https://cpan.metacpan.org/authors/id/G/GA/GARU/Clone-0.41.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.46", sha256="aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b") version("0.41", sha256="e8c056dcf4bc8889079a09412af70194a54a269689ba72edcd91291a46a51518") diff --git a/var/spack/repos/builtin/packages/perl-common-sense/package.py b/var/spack/repos/builtin/packages/perl-common-sense/package.py new file mode 100644 index 00000000000000..fe1b4421ba00a1 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-common-sense/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlCommonSense(PerlPackage): + """Save a tree AND a kitten, use common::sense!""" + + homepage = "https://metacpan.org/pod/common::sense" + url = "https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/common-sense-3.75.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("3.75", sha256="a86a1c4ca4f3006d7479064425a09fa5b6689e57261fcb994fe67d061cba0e7e") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use common::sense; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-compress-lzo/package.py b/var/spack/repos/builtin/packages/perl-compress-lzo/package.py new file mode 100644 index 00000000000000..53d8971eb42fcf --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-compress-lzo/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlCompressLzo(PerlPackage): + """Interface to the LZO compression library""" + + homepage = "https://metacpan.org/pod/Compress::LZO" + url = "https://cpan.metacpan.org/authors/id/P/PE/PEPL/Compress-LZO-1.09.tar.gz" + + maintainers("EbiArnie") + + version("1.09", sha256="15dbcb5ae4be2da09545b891c66077da5b45e4842f2b99919d29973ff6be4f47") + + depends_on("perl@5.4.0:", type=("build", "link", "run", "test")) + depends_on("perl-devel-checklib@0.9:", type=("build")) + depends_on("lzo", type=("build", "link", "run")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Compress::LZO; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py index adb8d647ac925a..e3d5727399c5ea 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-bzip2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlCompressRawBzip2(PerlPackage): homepage = "https://metacpan.org/pod/Compress::Raw::Bzip2" url = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.081.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.204", sha256="ee7b490e67e7e2a7a0e8c1e1aa29a9610066149f46b836921149ad1813f70c69") version("2.081", sha256="8692b5c9db91954408e24e805fbfda222879da80d89d9410791421e3e5bc3520") diff --git a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py index 365a6b7d9a82c7..318c47cd6363f0 100644 --- a/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py +++ b/var/spack/repos/builtin/packages/perl-compress-raw-zlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class PerlCompressRawZlib(PerlPackage): homepage = "https://metacpan.org/pod/Compress::Raw::Zlib" url = "https://cpan.metacpan.org/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.081.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("2.206", sha256="46785a6a383a1c843895b7f9f25d5d759e7c305159f9d1e04a3604eb74c77374") version("2.204", sha256="f161f4297efadbed79c8b096a75951784fc5ccd3170bd32866a19e5c6876d13f") version("2.081", sha256="e156de345bd224bbdabfcab0eeb3f678a3099a4e86c9d1b6771d880b55aa3a1b") diff --git a/var/spack/repos/builtin/packages/perl-config-general/package.py b/var/spack/repos/builtin/packages/perl-config-general/package.py index 389a28aa53524a..3397394fb0817d 100644 --- a/var/spack/repos/builtin/packages/perl-config-general/package.py +++ b/var/spack/repos/builtin/packages/perl-config-general/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlConfigGeneral(PerlPackage): homepage = "https://metacpan.org/pod/Config::General" url = "https://cpan.metacpan.org/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz" + license("Artistic-2.0") + version("2.65", sha256="4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f") version("2.63", sha256="0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad") diff --git a/var/spack/repos/builtin/packages/perl-config-simple/package.py b/var/spack/repos/builtin/packages/perl-config-simple/package.py index 756e6153df960f..de13a1da36da9c 100644 --- a/var/spack/repos/builtin/packages/perl-config-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-config-simple/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlConfigSimple(PerlPackage): homepage = "https://metacpan.org/pod/Config::Simple" url = "https://cpan.metacpan.org/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("4.58", sha256="dd9995706f0f9384a15ccffe116c3b6e22f42ba2e58d8f24ed03c4a0e386edb4") diff --git a/var/spack/repos/builtin/packages/perl-config-tiny/package.py b/var/spack/repos/builtin/packages/perl-config-tiny/package.py new file mode 100644 index 00000000000000..3db76176c13119 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-config-tiny/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlConfigTiny(PerlPackage): + """Read/Write .ini style files with as little code as possible""" + + homepage = "https://metacpan.org/pod/Config::Tiny" + url = "https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Config-Tiny-2.30.tgz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("2.30", sha256="b2f7345619b3b8e636dd39ea010731c9dc2bfb8f022bcbd86ae6ad17866e110d") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Config::Tiny; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-contextual-return/package.py b/var/spack/repos/builtin/packages/perl-contextual-return/package.py index 29451a3e3ccf0a..84a86508479c9e 100644 --- a/var/spack/repos/builtin/packages/perl-contextual-return/package.py +++ b/var/spack/repos/builtin/packages/perl-contextual-return/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlContextualReturn(PerlPackage): homepage = "https://metacpan.org/pod/Contextual::Return" url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Contextual-Return-0.004014.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.004014", sha256="09fe1415e16e49a69e13c0ef6e6a4a3fd8b856f389d3f3e624d7ab3b71719f78") depends_on("perl-want") diff --git a/var/spack/repos/builtin/packages/perl-convert-nls-date-format/package.py b/var/spack/repos/builtin/packages/perl-convert-nls-date-format/package.py new file mode 100644 index 00000000000000..7b9f39f2340d25 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-convert-nls-date-format/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlConvertNlsDateFormat(PerlPackage): + """Convert Oracle NLS_DATE_FORMAT <-> strftime Format Strings""" + + homepage = "https://metacpan.org/pod/Convert::NLS_DATE_FORMAT" + url = "https://cpan.metacpan.org/authors/id/K/KO/KOLIBRIE/Convert-NLS_DATE_FORMAT-0.06.tar.gz" + + maintainers("EbiArnie") + + version("0.06", sha256="20ab8070c56377bd302c9ec5a16873714026d03e56a31cf70ab65632c1ed5bc7") + + depends_on("perl@5.6.1:", type=("build", "link", "run", "test")) + depends_on("perl-module-build-tiny@0.035:", type=("build")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Convert::NLS_DATE_FORMAT; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py index da0e614b651d2a..f9fe89ff84d220 100644 --- a/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py +++ b/var/spack/repos/builtin/packages/perl-cpan-meta-check/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlCpanMetaCheck(PerlPackage): homepage = "https://metacpan.org/pod/CPAN::Meta::Check" url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.017", sha256="0454ab93f12780b1d579df15b5f939e09702e954be82028fadd40e8bc9b0f091") version("0.014", sha256="28a0572bfc1c0678d9ce7da48cf521097ada230f96eb3d063fcbae1cfe6a351f") diff --git a/var/spack/repos/builtin/packages/perl-cpanel-json-xs/package.py b/var/spack/repos/builtin/packages/perl-cpanel-json-xs/package.py new file mode 100644 index 00000000000000..0cf27cd8de15ee --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-cpanel-json-xs/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlCpanelJsonXs(PerlPackage): + """CPanel fork of JSON::XS, fast and correct serializing""" + + homepage = "https://metacpan.org/pod/Cpanel::JSON::XS" + url = "https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.37.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("4.37", sha256="c241615a0e17ff745aaa86bbf466a6e29cd240515e65f06a7a05017b619e6d4b") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Cpanel::JSON::XS; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-data-dumper/package.py b/var/spack/repos/builtin/packages/perl-data-dumper/package.py index d073f78b753cc5..389a4bc650932c 100644 --- a/var/spack/repos/builtin/packages/perl-data-dumper/package.py +++ b/var/spack/repos/builtin/packages/perl-data-dumper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-data-optlist/package.py b/var/spack/repos/builtin/packages/perl-data-optlist/package.py index dd0a27610a75da..6d5ecb4d5a0624 100644 --- a/var/spack/repos/builtin/packages/perl-data-optlist/package.py +++ b/var/spack/repos/builtin/packages/perl-data-optlist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlDataOptlist(PerlPackage): homepage = "https://metacpan.org/pod/Data::OptList" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.113", sha256="36aebc5817b7d4686b649434c2ee41f45c8bf97d4ca5a99f607cc40f695a4285") version("0.110", sha256="366117cb2966473f2559f2f4575ff6ae69e84c69a0f30a0773e1b51a457ef5c3") diff --git a/var/spack/repos/builtin/packages/perl-data-stag/package.py b/var/spack/repos/builtin/packages/perl-data-stag/package.py index 2536180a913fb1..94d8e5e7f8ce14 100644 --- a/var/spack/repos/builtin/packages/perl-data-stag/package.py +++ b/var/spack/repos/builtin/packages/perl-data-stag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-date-exception/package.py b/var/spack/repos/builtin/packages/perl-date-exception/package.py new file mode 100644 index 00000000000000..bcf20645deb3ea --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-date-exception/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDateException(PerlPackage): + """Base exception package as Moo Role for Date::* packages.""" + + homepage = "https://metacpan.org/pod/Date::Exception" + url = "https://cpan.metacpan.org/authors/id/M/MA/MANWAR/Date-Exception-0.08.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.08", sha256="329327e1071123b9b50f31e54202c1f48b866a538cb93aeab193e92eb0c847f8") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-moo@2.000000:", type=("build", "run", "test")) + depends_on("perl-namespace-autoclean@0.28:", type=("build", "run", "test")) + depends_on("perl-throwable@0.200011:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Date::Exception; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-date-manip/package.py b/var/spack/repos/builtin/packages/perl-date-manip/package.py index 852c2c1cdf20ea..cbeab9384bfc37 100644 --- a/var/spack/repos/builtin/packages/perl-date-manip/package.py +++ b/var/spack/repos/builtin/packages/perl-date-manip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,5 +19,7 @@ class PerlDateManip(PerlPackage): homepage = "https://metacpan.org/release/Date-Manip" url = "https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.82.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.91", sha256="6bd9cb47e82ba91fdba4022ef358149d81e8453f52ca54f49faac2696210c479") version("6.82", sha256="fa96bcf94c6b4b7d3333f073f5d0faad59f546e5aec13ac01718f2e6ef14672a") diff --git a/var/spack/repos/builtin/packages/perl-date-utils/package.py b/var/spack/repos/builtin/packages/perl-date-utils/package.py new file mode 100644 index 00000000000000..776ff3cf513c81 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-date-utils/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDateUtils(PerlPackage): + """Common date functions as Moo Role.""" + + homepage = "https://metacpan.org/pod/Date::Utils" + url = "https://cpan.metacpan.org/authors/id/M/MA/MANWAR/Date-Utils-0.28.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.28", sha256="1ed50713512498e88a54bc7dcf70372763b63196ecf7d9a54668e535d22f03ad") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-date-exception@0.08:", type=("build", "run", "test")) + depends_on("perl-moo", type=("build", "run", "test")) + depends_on("perl-namespace-autoclean@0.28:", type=("build", "run", "test")) + depends_on("perl-term-ansicolor-markup@0.06:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Date::Utils; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-format-builder/package.py b/var/spack/repos/builtin/packages/perl-datetime-format-builder/package.py new file mode 100644 index 00000000000000..cd23d333f8e334 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-format-builder/package.py @@ -0,0 +1,31 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeFormatBuilder(PerlPackage): + """Create DateTime parser classes and objects.""" + + homepage = "https://metacpan.org/pod/DateTime::Format::Builder" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.83.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.83", sha256="61ffb23d85b3ca1786b2da3289e99b57e0625fe0e49db02a6dc0cb62c689e2f2") + + depends_on("perl-datetime@1.00:", type=("build", "run", "test")) + depends_on("perl-datetime-format-strptime@1.04:", type=("build", "run", "test")) + depends_on("perl-params-validate@0.72:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Format::Builder; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-format-mysql/package.py b/var/spack/repos/builtin/packages/perl-datetime-format-mysql/package.py new file mode 100644 index 00000000000000..ad3537988688e2 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-format-mysql/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeFormatMysql(PerlPackage): + """Parse and format MySQL dates and times""" + + homepage = "https://metacpan.org/pod/DateTime::Format::MySQL" + url = "https://cpan.metacpan.org/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.08.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.08", sha256="19cb70e98584655e354d2d6a8e71cc5ca902dddc3ac44416712f9163d122b9e8") + + depends_on("perl-datetime", type=("build", "run", "test")) + depends_on("perl-datetime-format-builder@0.6:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Format::MySQL; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-format-oracle/package.py b/var/spack/repos/builtin/packages/perl-datetime-format-oracle/package.py new file mode 100644 index 00000000000000..89e0adf99becbc --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-format-oracle/package.py @@ -0,0 +1,31 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeFormatOracle(PerlPackage): + """Parse and format Oracle dates and timestamps""" + + homepage = "https://metacpan.org/pod/DateTime::Format::Oracle" + url = "https://cpan.metacpan.org/authors/id/K/KO/KOLIBRIE/DateTime-Format-Oracle-0.06.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.06", sha256="9f18d1eb3dff38e046ba063d6b54cc7d68464640ce69d7d1578a2ccd285ca8d4") + + depends_on("perl-convert-nls-date-format@0.03:", type=("build", "run", "test")) + depends_on("perl-datetime", type=("build", "run", "test")) + depends_on("perl-datetime-format-builder", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Format::Oracle; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-format-pg/package.py b/var/spack/repos/builtin/packages/perl-datetime-format-pg/package.py new file mode 100644 index 00000000000000..533656297c1ca5 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-format-pg/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeFormatPg(PerlPackage): + """Parse and format PostgreSQL dates and times""" + + homepage = "https://metacpan.org/pod/DateTime::Format::Pg" + url = "https://cpan.metacpan.org/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16014.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.16014", sha256="38bb9666524dc384c3366f6342cb9656c50bac0f9716a3d44f1cf552ccbe0eb9") + + depends_on("perl-datetime@0.10:", type=("build", "run", "test")) + depends_on("perl-datetime-format-builder@0.72:", type=("build", "run", "test")) + depends_on("perl-datetime-timezone@0.05:", type=("build", "run", "test")) + depends_on("perl-module-build-tiny@0.035:", type=("build")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Format::Pg; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-format-strptime/package.py b/var/spack/repos/builtin/packages/perl-datetime-format-strptime/package.py new file mode 100644 index 00000000000000..91a285fa35f1f7 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-format-strptime/package.py @@ -0,0 +1,36 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeFormatStrptime(PerlPackage): + """Parse and format strp and strf time patterns""" + + homepage = "https://metacpan.org/pod/DateTime::Format::Strptime" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.79.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("1.79", sha256="701e46802c86ed4d88695c1a6dacbbe90b3390beeb794f387e7c792300037579") + + depends_on("perl-datetime@1.00:", type=("build", "run", "test")) + depends_on("perl-datetime-locale@1.30:", type=("build", "run", "test")) + depends_on("perl-datetime-timezone@2.09:", type=("build", "run", "test")) + depends_on("perl-params-validationcompiler", type=("build", "run", "test")) + depends_on("perl-specio@0.33:", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + depends_on("perl-test-warnings", type=("build", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Format::Strptime; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-locale/package.py b/var/spack/repos/builtin/packages/perl-datetime-locale/package.py new file mode 100644 index 00000000000000..92f6480d0fba6c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-locale/package.py @@ -0,0 +1,41 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeLocale(PerlPackage): + """DateTime::Locale - Localization support for DateTime.pm""" + + homepage = "https://metacpan.org/pod/DateTime::Locale" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-1.40.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.40", sha256="7490b4194b5d23a4e144976dedb3bdbcc6d3364b5d139cc922a86d41fdb87afb") + + depends_on("perl@5.8.4:", type=("build", "link", "run", "test")) + depends_on("perl-cpan-meta-check@0.011:", type=("build", "test")) + depends_on("perl-dist-checkconflicts@0.02:", type=("build", "run", "test")) + depends_on("perl-file-sharedir", type=("build", "run", "test")) + depends_on("perl-file-sharedir-install@0.06:", type=("build")) + depends_on("perl-ipc-system-simple", type=("build", "test")) + depends_on("perl-namespace-autoclean@0.19:", type=("build", "run", "test")) + depends_on("perl-params-validationcompiler@0.13:", type=("build", "run", "test")) + depends_on("perl-path-tiny", type=("build", "test")) + depends_on("perl-specio", type=("build", "run", "test")) + depends_on("perl-test-file-sharedir", type=("build", "test")) + depends_on("perl-test2-plugin-nowarnings", type=("build", "test")) + depends_on("perl-test2-suite", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::Locale; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime-timezone/package.py b/var/spack/repos/builtin/packages/perl-datetime-timezone/package.py new file mode 100644 index 00000000000000..6ff3a78233dec6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime-timezone/package.py @@ -0,0 +1,37 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetimeTimezone(PerlPackage): + """DateTime::TimeZone - Time zone object base class and factory""" + + homepage = "https://metacpan.org/pod/DateTime::TimeZone" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.60.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("2.60", sha256="f0460d379323905b579bed44e141237a337dc25dd26b6ab0c60ac2b80629323d") + + depends_on("perl@5.8.4:", type=("build", "link", "run", "test")) + depends_on("perl-class-singleton@1.03:", type=("build", "run", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + depends_on("perl-namespace-autoclean", type=("build", "run", "test")) + depends_on("perl-params-validationcompiler@0.13:", type=("build", "run", "test")) + depends_on("perl-specio", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + depends_on("perl-test-requires", type=("build", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime::TimeZone; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-datetime/package.py b/var/spack/repos/builtin/packages/perl-datetime/package.py new file mode 100644 index 00000000000000..80179454845d11 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-datetime/package.py @@ -0,0 +1,45 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDatetime(PerlPackage): + """DateTime - A date and time object for Perl""" + + homepage = "https://metacpan.org/pod/DateTime" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-1.65.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("1.65", sha256="0bfda7ff0253fb3d88cf4bdb5a14afb8cea24d147975d5bdf3c88b40e7ab140e") + version( + "1.63", + sha256="1b11e49ec6e184ae2a10eccd05eda9534f32458fc644c12ab710c29a3a816f6f", + deprecated=True, + ) + + depends_on("perl@5.8.4:", type=("build", "link", "run", "test")) + depends_on("perl-cpan-meta-check@0.011:", type=("build", "test")) + depends_on("perl-datetime-locale@1.06:", type=("build", "run", "test")) + depends_on("perl-datetime-timezone@2.44:", type=("build", "run", "test")) + depends_on("perl-dist-checkconflicts@0.02:", type=("build", "run", "test")) + depends_on("perl-namespace-autoclean@0.19:", type=("build", "run", "test")) + depends_on("perl-params-validationcompiler@0.26:", type=("build", "run", "test")) + depends_on("perl-specio@0.18:", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + depends_on("perl-test-warnings@0.005:", type=("build", "test")) + depends_on("perl-test-without-module", type=("build", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DateTime; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-db-file/package.py b/var/spack/repos/builtin/packages/perl-db-file/package.py index ea26f2f21c341e..c28ff8ad0077fd 100644 --- a/var/spack/repos/builtin/packages/perl-db-file/package.py +++ b/var/spack/repos/builtin/packages/perl-db-file/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py index 03b2f67747630f..0cdf051ce06c56 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-mysql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlDbdMysql(PerlPackage): homepage = "https://metacpan.org/pod/DBD::mysql" url = "https://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-4.043.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version( "4.050", sha256="4f48541ff15a0a7405f76adc10f81627c33996fbf56c95c26c094444c0928d78", diff --git a/var/spack/repos/builtin/packages/perl-dbd-oracle/package.py b/var/spack/repos/builtin/packages/perl-dbd-oracle/package.py new file mode 100644 index 00000000000000..fb03ceea4fca31 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-dbd-oracle/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDbdOracle(PerlPackage): + """Oracle database driver for the DBI module""" + + homepage = "https://metacpan.org/pod/DBD::Oracle" + url = "https://cpan.metacpan.org/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.83.tar.gz" + + maintainers("EbiArnie") + + version("1.83", sha256="51fe9c158955fda0ca917a806863f0bc51068b533fbbc7423b3cc4ad595ed153") + + depends_on("perl@5.8.0:", type=("build", "link", "run", "test")) + depends_on("perl-dbi@1.623:", type=("build", "run", "test")) + depends_on("perl-test-nowarnings", type=("build", "link")) + depends_on("oracle-instant-client", type=("build", "link", "run", "test")) + + def setup_build_environment(self, env): + env.set("ORACLE_HOME", self.spec["oracle-instant-client"].prefix) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use DBD::Oracle; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py index 503628c9fa2629..7b6e708bc1b32d 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlDbdPg(PerlPackage): homepage = "https://metacpan.org/pod/DBD::Pg" url = "https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.0.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.16.1", sha256="8e917a746dacb1edce5832d8911e5938cc4863aeac4a52820382e7d174e9c3b9") version("3.10.0", sha256="e103268a63e2828e3d43659bdba5f743446cbbe047a766f843112eedae105f80") diff --git a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py index 35576ecc063e99..36f8bfce69ad14 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlDbdSqlite(PerlPackage): homepage = "https://metacpan.org/pod/DBD::SQLite" url = "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.72", sha256="5ca41e61eb52b52bd862a3088b912a75fe70910ac789b9a9983e0a449e94f551") version("1.59_01", sha256="b6f331e4054688572c2010e72c355f7ba3f30d86051e50d9925d34d9df1001e2") version("1.58", sha256="7120dd99d0338dea2802fda8bfe3fbf10077d5af559f6c67ae35e9270d1a1d3b") diff --git a/var/spack/repos/builtin/packages/perl-dbi/package.py b/var/spack/repos/builtin/packages/perl-dbi/package.py index adddf386f57461..319cc53bbbf4ae 100644 --- a/var/spack/repos/builtin/packages/perl-dbi/package.py +++ b/var/spack/repos/builtin/packages/perl-dbi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class PerlDbi(PerlPackage): homepage = "https://dbi.perl.org/" url = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.636.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.643", sha256="8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa") version("1.636", sha256="8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c") diff --git a/var/spack/repos/builtin/packages/perl-devel-checklib/package.py b/var/spack/repos/builtin/packages/perl-devel-checklib/package.py index 7bf5077554f05e..a05246a4c89e59 100644 --- a/var/spack/repos/builtin/packages/perl-devel-checklib/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-checklib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlDevelChecklib(PerlPackage): url = "https://cpan.metacpan.org/authors/id/M/MA/MATTN/Devel-CheckLib-1.16.tar.gz" maintainers("snehring") + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.16", sha256="869d38c258e646dcef676609f0dd7ca90f085f56cf6fd7001b019a5d5b831fca") diff --git a/var/spack/repos/builtin/packages/perl-devel-cover/package.py b/var/spack/repos/builtin/packages/perl-devel-cover/package.py new file mode 100644 index 00000000000000..0734d38345c322 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-devel-cover/package.py @@ -0,0 +1,17 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlDevelCover(PerlPackage): + """Devel::Cover - Perl extension for code coverage metrics""" + + homepage = "https://metacpan.org/pod/Devel::Cover" + url = "https://cpan.metacpan.org/authors/id/P/PJ/PJCJ/Devel-Cover-1.40.tar.gz" + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.40", sha256="26e2f431fbcf7bff3851f352f83b84067c09ff206f40ab975cad8d2bafe711a8") diff --git a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py index 53b162a0efef08..209ddc4050aa12 100644 --- a/var/spack/repos/builtin/packages/perl-devel-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-cycle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlDevelCycle(PerlPackage): homepage = "https://metacpan.org/pod/Devel::Cycle" url = "http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.12", sha256="fd3365c4d898b2b2bddbb78a46d507a18cca8490a290199547dab7f1e7390bc2") diff --git a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py index c4a44378bc7a17..c1176f26815535 100644 --- a/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-globaldestruction/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlDevelGlobaldestruction(PerlPackage): homepage = "https://metacpan.org/pod/Devel::GlobalDestruction" url = "http://search.cpan.org/CPAN/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.14", sha256="34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab") diff --git a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py index 8a44349cb3abe7..81c6ef53db340c 100644 --- a/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-overloadinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlDevelOverloadinfo(PerlPackage): homepage = "https://metacpan.org/pod/Devel::OverloadInfo" url = "http://search.cpan.org/CPAN/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.004.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.007", sha256="21a184163b90f91f06ffc7f5de0b968356546ae9b400a9d75c573c958c246222") version("0.005", sha256="8bfde2ffa47c9946f8adc8cfc445c2f97b8d1cdd678111bee9f444e82f7aa6e7") version("0.004", sha256="83e88450064b0b0bbfd520cc9d7997fc7bed14ae257894eeadda28dc3e94937d") diff --git a/var/spack/repos/builtin/packages/perl-devel-size/package.py b/var/spack/repos/builtin/packages/perl-devel-size/package.py index b207ccbd054d93..bb7b347423f776 100644 --- a/var/spack/repos/builtin/packages/perl-devel-size/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-size/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py index 93ca2bc487aa0d..4b7c3184bcbfd6 100644 --- a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlDevelStacktrace(PerlPackage): homepage = "https://metacpan.org/pod/Devel::StackTrace" url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.02.tar.gz" + license("Artistic-2.0") + version("2.04", sha256="cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855") version("2.02", sha256="cbbd96db0ecf194ed140198090eaea0e327d9a378a4aa15f9a34b3138a91931f") diff --git a/var/spack/repos/builtin/packages/perl-devel-symdump/package.py b/var/spack/repos/builtin/packages/perl-devel-symdump/package.py index a665738f0e452e..ee5539e3b5d03a 100644 --- a/var/spack/repos/builtin/packages/perl-devel-symdump/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-symdump/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlDevelSymdump(PerlPackage): homepage = "https://metacpan.org/pod/Devel::Symdump" url = "https://cpan.metacpan.org/authors/id/A/AN/ANDK/Devel-Symdump-2.0604.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.0604", sha256="1f9eaa557733f775ccaa852e846566274c017e6fee380aeb8d08e425cfa86d3e") diff --git a/var/spack/repos/builtin/packages/perl-digest-md5-file/package.py b/var/spack/repos/builtin/packages/perl-digest-md5-file/package.py index da57fbb4e34df2..fb79d488f73168 100644 --- a/var/spack/repos/builtin/packages/perl-digest-md5-file/package.py +++ b/var/spack/repos/builtin/packages/perl-digest-md5-file/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-digest-md5/package.py b/var/spack/repos/builtin/packages/perl-digest-md5/package.py index f40d6781ef91fc..b71ff469c2a59d 100644 --- a/var/spack/repos/builtin/packages/perl-digest-md5/package.py +++ b/var/spack/repos/builtin/packages/perl-digest-md5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlDigestMd5(PerlPackage): homepage = "https://metacpan.org/pod/Digest::MD5" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.55", sha256="03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c") diff --git a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py index 9b24a2e34ee7d1..cb02f4c0c2e7df 100644 --- a/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-dist-checkconflicts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlDistCheckconflicts(PerlPackage): homepage = "https://metacpan.org/pod/Dist::CheckConflicts" url = "http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.11", sha256="ea844b9686c94d666d9d444321d764490b2cde2f985c4165b4c2c77665caedc4") diff --git a/var/spack/repos/builtin/packages/perl-email-abstract/package.py b/var/spack/repos/builtin/packages/perl-email-abstract/package.py new file mode 100644 index 00000000000000..4c17d886bfddd6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-abstract/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailAbstract(PerlPackage): + """Unified interface to mail representations""" + + homepage = "https://metacpan.org/pod/Email::Abstract" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Abstract-3.010.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("3.010", sha256="8c12f68b5974cafc99d74942abefc8597193035aafd2763128e6aaafca4b7ed6") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-email-simple@1.998:", type=("build", "run", "test")) + depends_on("perl-module-pluggable@1.5:", type=("build", "run", "test")) + depends_on("perl-mro-compat", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Abstract; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-address-xs/package.py b/var/spack/repos/builtin/packages/perl-email-address-xs/package.py new file mode 100644 index 00000000000000..fbb1353dcd5dd7 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-address-xs/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailAddressXs(PerlPackage): + """Parse and format RFC 5322 email addresses and groups""" + + homepage = "https://metacpan.org/pod/Email::Address::XS" + url = "https://cpan.metacpan.org/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz" + + maintainers("EbiArnie") + + version("1.05", sha256="1510b7f10d67201037cd50d22c9d6b26eeca55ededa4cdb46bbca27e59a4ea16") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Address::XS; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-date-format/package.py b/var/spack/repos/builtin/packages/perl-email-date-format/package.py new file mode 100644 index 00000000000000..95d2fdd422b6eb --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-date-format/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailDateFormat(PerlPackage): + """Produce RFC 2822 date strings""" + + homepage = "https://metacpan.org/pod/Email::Date::Format" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Date-Format-1.008.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.008", sha256="432b7c83ff88749af128003f5257c573aec1a463418db90ed22843cbbc258b4f") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Date::Format; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-messageid/package.py b/var/spack/repos/builtin/packages/perl-email-messageid/package.py new file mode 100644 index 00000000000000..662adfa07e48cb --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-messageid/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailMessageid(PerlPackage): + """Generate world unique message-ids.""" + + homepage = "https://metacpan.org/pod/Email::MessageID" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-MessageID-1.408.tar.gz" + + maintainers("EbiArnie") + + version("1.408", sha256="1f3d5b4ff0b1c7b39e9ac7c318fb37adcd0bac9556036546494d14f06dc5643c") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::MessageID; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-mime-contenttype/package.py b/var/spack/repos/builtin/packages/perl-email-mime-contenttype/package.py new file mode 100644 index 00000000000000..1786704bd02a6d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-mime-contenttype/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailMimeContenttype(PerlPackage): + """Parse and build a MIME Content-Type or Content-Disposition Header""" + + homepage = "https://metacpan.org/pod/Email::MIME::ContentType" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.028.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("1.028", sha256="e7950246433f7ed6c3e4fd4df2227e0f2341137c3cab1989018fc370f58145c4") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + depends_on("perl-text-unidecode", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::MIME::ContentType; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-mime-encodings/package.py b/var/spack/repos/builtin/packages/perl-email-mime-encodings/package.py new file mode 100644 index 00000000000000..7be7b58329ac4a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-mime-encodings/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailMimeEncodings(PerlPackage): + """A unified interface to MIME encoding and decoding""" + + homepage = "https://metacpan.org/pod/Email::MIME::Encodings" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.317.tar.gz" + + maintainers("EbiArnie") + + version("1.317", sha256="4a9a41671a9d1504c4da241be419a9503fa3486262526edb81eca9e2ebea0baf") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::MIME::Encodings; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-mime/package.py b/var/spack/repos/builtin/packages/perl-email-mime/package.py new file mode 100644 index 00000000000000..07485df458becf --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-mime/package.py @@ -0,0 +1,36 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailMime(PerlPackage): + """Easy MIME message handling""" + + homepage = "https://metacpan.org/pod/Email::MIME" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-MIME-1.953.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("1.953", sha256="98fb067850699a224babc348f1cefe30d744c60da8902e7a5ce9d8b7e73df735") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + depends_on("perl-email-address-xs", type=("build", "run", "test")) + depends_on("perl-email-messageid", type=("build", "run", "test")) + depends_on("perl-email-mime-contenttype@1.023:", type=("build", "run", "test")) + depends_on("perl-email-mime-encodings@1.314:", type=("build", "run", "test")) + depends_on("perl-email-simple@2.212:", type=("build", "run", "test")) + depends_on("perl-mime-types@1.13:", type=("build", "run", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::MIME; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-sender/package.py b/var/spack/repos/builtin/packages/perl-email-sender/package.py new file mode 100644 index 00000000000000..3f0272e55eae04 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-sender/package.py @@ -0,0 +1,39 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailSender(PerlPackage): + """A library for sending email""" + + homepage = "https://metacpan.org/pod/Email::Sender" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Sender-2.600.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("2.600", sha256="ecc675d030d79d9a4fb064567ea885c66b17c3862379ad30f8205a281cd8ee29") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + depends_on("perl-capture-tiny@0.08:", type=("build", "test")) + depends_on("perl-email-abstract@3.006:", type=("build", "run", "test")) + depends_on("perl-email-address-xs", type=("build", "run", "test")) + depends_on("perl-email-simple@1.998:", type=("build", "run", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + depends_on("perl-moo@2.000000:", type=("build", "run", "test")) + depends_on("perl-moox-types-mooselike@0.15:", type=("build", "run", "test")) + depends_on("perl-sub-exporter", type=("build", "run", "test")) + depends_on("perl-throwable", type=("build", "run", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Sender; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-simple/package.py b/var/spack/repos/builtin/packages/perl-email-simple/package.py new file mode 100644 index 00000000000000..97a11fa9beb216 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-simple/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailSimple(PerlPackage): + """Simple parsing of RFC2822 message format and headers""" + + homepage = "https://metacpan.org/pod/Email::Simple" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Simple-2.218.tar.gz" + + maintainers("EbiArnie") + + version("2.218", sha256="2dce1d68fde99d53db9ca43e211b69b169ba2efaecf87a55cb33a9336047c96d") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + depends_on("perl-email-date-format", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Simple; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-email-stuffer/package.py b/var/spack/repos/builtin/packages/perl-email-stuffer/package.py new file mode 100644 index 00000000000000..1b317f1aeecee0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-email-stuffer/package.py @@ -0,0 +1,35 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlEmailStuffer(PerlPackage): + """A more casual approach to creating and sending Email:: emails""" + + homepage = "https://metacpan.org/pod/Email::Stuffer" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Stuffer-0.020.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.020", sha256="0a1efb7f2dedd39052b126f718ca2d3b5845a4123a39392fd9dfa0c76e6057c7") + + depends_on("perl@5.12.0:", type=("build", "link", "run", "test")) + depends_on("perl-email-mime@1.943:", type=("build", "run", "test")) + depends_on("perl-email-sender", type=("build", "run", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + depends_on("perl-moo", type=("build", "test")) + depends_on("perl-params-util@1.05:", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Email::Stuffer; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-encode-locale/package.py b/var/spack/repos/builtin/packages/perl-encode-locale/package.py index e1a09317082553..6dea0cc565793a 100644 --- a/var/spack/repos/builtin/packages/perl-encode-locale/package.py +++ b/var/spack/repos/builtin/packages/perl-encode-locale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlEncodeLocale(PerlPackage): homepage = "https://metacpan.org/pod/Encode::Locale" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.05", sha256="176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1") diff --git a/var/spack/repos/builtin/packages/perl-error/package.py b/var/spack/repos/builtin/packages/perl-error/package.py index 6563e4d7265910..d4086bcf09629a 100644 --- a/var/spack/repos/builtin/packages/perl-error/package.py +++ b/var/spack/repos/builtin/packages/perl-error/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PerlError(PerlPackage): homepage = "https://metacpan.org/pod/Error" url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-0.17028.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.17029", sha256="1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc") version("0.17028", sha256="3ad85c5e58b31c8903006298424a51bba39f1840e324f5ae612eabc8b935e960") diff --git a/var/spack/repos/builtin/packages/perl-eval-closure/package.py b/var/spack/repos/builtin/packages/perl-eval-closure/package.py index a029a13c2c47fa..e264c58302f8cc 100644 --- a/var/spack/repos/builtin/packages/perl-eval-closure/package.py +++ b/var/spack/repos/builtin/packages/perl-eval-closure/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlEvalClosure(PerlPackage): homepage = "https://metacpan.org/pod/Eval::Closure" url = "http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.14", sha256="ea0944f2f5ec98d895bef6d503e6e4a376fea6383a6bc64c7670d46ff2218cad") diff --git a/var/spack/repos/builtin/packages/perl-exception-class/package.py b/var/spack/repos/builtin/packages/perl-exception-class/package.py index 3a9433c0179b08..5dada9e56ad605 100644 --- a/var/spack/repos/builtin/packages/perl-exception-class/package.py +++ b/var/spack/repos/builtin/packages/perl-exception-class/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlExceptionClass(PerlPackage): homepage = "https://metacpan.org/pod/Exception::Class" url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Exception-Class-1.43.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.45", sha256="5482a77ef027ca1f9f39e1f48c558356e954936fc8fbbdee6c811c512701b249") version("1.43", sha256="ff3b4b3f706e84aaa87ab0dee5cec6bd7a8fc9f72cf76d115212541fa0a13760") diff --git a/var/spack/repos/builtin/packages/perl-exporter-lite/package.py b/var/spack/repos/builtin/packages/perl-exporter-lite/package.py index 620d422b75c6ef..1d2aa91aabe902 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class PerlExporterLite(PerlPackage): homepage = "https://metacpan.org/pod/Exporter::Lite" url = "https://cpan.metacpan.org/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.09", sha256="79d8b14fd5013922c63e850f15bf51059f2502404535eb6690ef23612c2a198d") version("0.08", sha256="c05b3909af4cb86f36495e94a599d23ebab42be7a18efd0d141fc1586309dac2") diff --git a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py index 5f3e47552316b7..913b715a936c94 100644 --- a/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-exporter-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlExporterTiny(PerlPackage): homepage = "https://metacpan.org/pod/Exporter::Tiny" url = "http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.006002", sha256="6f295e2cbffb1dbc15bdb9dadc341671c1e0cd2bdf2d312b17526273c322638d") version("1.006001", sha256="8df2a7ee5a11bacb8166edd9ee8fc93172278a74d5abe2021a5f4a7d57915c50") version("1.006000", sha256="d95479ff085699d6422f7fc8306db085e34b626438deb82ec82d41df2295f400") diff --git a/var/spack/repos/builtin/packages/perl-extutils-config/package.py b/var/spack/repos/builtin/packages/perl-extutils-config/package.py index 673bab3b097a60..6f8ec7c689a90c 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-config/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlExtutilsConfig(PerlPackage): homepage = "https://metacpan.org/pod/ExtUtils::Config" url = "https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.008", sha256="ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c") diff --git a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py index b531006a7116ef..79beb3ea7f0a33 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-depends/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-depends/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlExtutilsDepends(PerlPackage): homepage = "https://metacpan.org/pod/ExtUtils::Depends" url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/ExtUtils-Depends-0.405.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.8001", sha256="673c4387e7896c1a216099c1fbb3faaa7763d7f5f95a1a56a60a2a2906c131c5") version("0.405", sha256="8ad6401ad7559b03ceda1fe4b191c95f417bdec7c542a984761a4656715a8a2c") diff --git a/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py b/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py index 23ee10b4742e1c..f84cbaf25d3b6c 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-helpers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlExtutilsHelpers(PerlPackage): homepage = "https://metacpan.org/pod/ExtUtils::Helpers" url = "https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.026", sha256="de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416") diff --git a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py index 1dfa894d9b77d7..cb583055eefcb0 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlExtutilsInstallpaths(PerlPackage): homepage = "https://metacpan.org/pod/ExtUtils::InstallPaths" url = "https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.012", sha256="84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed") depends_on("perl-extutils-config", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py index c4e60524762c63..40e88f52f919c2 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-makemaker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PerlExtutilsMakemaker(PerlPackage): homepage = "https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker" url = "http://search.cpan.org/CPAN/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.24.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("7.70", sha256="f108bd46420d2f00d242825f865b0f68851084924924f92261d684c49e3e7a74") version("7.68", sha256="270238d253343b833daa005fb57a3a5d8916b59da197698a632b141e7acad779") version("7.24", sha256="416abc97c3bb2cc72bef28852522f2859de53e37bf3d0ae8b292067d78755e69") diff --git a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py index 38617320799c8a..220e3224cd479a 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-pkgconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlExtutilsPkgconfig(PerlPackage): homepage = "https://metacpan.org/pod/ExtUtils::PkgConfig" url = "http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.16", sha256="bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e") depends_on("pkgconfig", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py b/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py index 7739b05a2661d6..65f12a94bba6ed 100644 --- a/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py +++ b/var/spack/repos/builtin/packages/perl-ffi-checklib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class PerlFfiChecklib(PerlPackage): homepage = "https://metacpan.org/pod/FFI::CheckLib" url = "https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.25.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.31", sha256="04d885fc377d44896e5ea1c4ec310f979bb04f2f18658a7e7a4d509f7e80bb80") version("0.25", sha256="eb36b9a7cff1764a65b1b77e01e92c26207c558a3f986d0d17d2b110fa366ba4") diff --git a/var/spack/repos/builtin/packages/perl-file-chdir/package.py b/var/spack/repos/builtin/packages/perl-file-chdir/package.py index c790186810709d..20c33f34b7a032 100644 --- a/var/spack/repos/builtin/packages/perl-file-chdir/package.py +++ b/var/spack/repos/builtin/packages/perl-file-chdir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,4 +20,6 @@ class PerlFileChdir(PerlPackage): homepage = "https://metacpan.org/pod/File::chdir" url = "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.1011", sha256="31ebf912df48d5d681def74b9880d78b1f3aca4351a0ed1fe3570b8e03af6c79") diff --git a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py index a71c03c84bf233..5baee6e0e8947f 100644 --- a/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py +++ b/var/spack/repos/builtin/packages/perl-file-copy-recursive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlFileCopyRecursive(PerlPackage): homepage = "https://metacpan.org/pod/File::Copy::Recursive" url = "http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.38.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.45", sha256="d3971cf78a8345e38042b208bb7b39cb695080386af629f4a04ffd6549df1157") version("0.40", sha256="e8b8923b930ef7bcb59d4a97456d0e149b8487597cd1550f836451d936ce55a1") version("0.38", sha256="84ccbddf3894a88a2c2b6be68ff6ef8960037803bb36aa228b31944cfdf6deeb") diff --git a/var/spack/repos/builtin/packages/perl-file-find-rule/package.py b/var/spack/repos/builtin/packages/perl-file-find-rule/package.py index aefeb7913f5810..5d27c74c180cf7 100644 --- a/var/spack/repos/builtin/packages/perl-file-find-rule/package.py +++ b/var/spack/repos/builtin/packages/perl-file-find-rule/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlFileFindRule(PerlPackage): homepage = "https://metacpan.org/pod/File::Find::Rule" url = "https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.34", sha256="7e6f16cc33eb1f29ff25bee51d513f4b8a84947bbfa18edb2d3cc40a2d64cafe") depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-file-grep/package.py b/var/spack/repos/builtin/packages/perl-file-grep/package.py index 86c1c9a91a6b23..4837a8cd6cb51e 100644 --- a/var/spack/repos/builtin/packages/perl-file-grep/package.py +++ b/var/spack/repos/builtin/packages/perl-file-grep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-file-homedir/package.py b/var/spack/repos/builtin/packages/perl-file-homedir/package.py index de7624b6c8eafe..cbc0b0d03cd3b2 100644 --- a/var/spack/repos/builtin/packages/perl-file-homedir/package.py +++ b/var/spack/repos/builtin/packages/perl-file-homedir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlFileHomedir(PerlPackage): homepage = "https://metacpan.org/pod/File::HomeDir" url = "https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.006", sha256="593737c62df0f6dab5d4122e0b4476417945bb6262c33eedc009665ef1548852") version("1.004", sha256="45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad") diff --git a/var/spack/repos/builtin/packages/perl-file-listing/package.py b/var/spack/repos/builtin/packages/perl-file-listing/package.py index ceba0adc650147..ff5f316dba88ff 100644 --- a/var/spack/repos/builtin/packages/perl-file-listing/package.py +++ b/var/spack/repos/builtin/packages/perl-file-listing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlFileListing(PerlPackage): homepage = "https://metacpan.org/pod/File::Listing" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.04", sha256="1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5") depends_on("perl-http-date", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-file-pushd/package.py b/var/spack/repos/builtin/packages/perl-file-pushd/package.py index 21e9745b070cde..88adb3c835721f 100644 --- a/var/spack/repos/builtin/packages/perl-file-pushd/package.py +++ b/var/spack/repos/builtin/packages/perl-file-pushd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlFilePushd(PerlPackage): homepage = "https://metacpan.org/pod/File::pushd" url = "http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/File-pushd-1.014.tar.gz" + license("Apache-2.0") + version("1.016", sha256="d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc") version("1.014", sha256="b5ab37ffe3acbec53efb7c77b4423a2c79afa30a48298e751b9ebee3fdc6340b") diff --git a/var/spack/repos/builtin/packages/perl-file-remove/package.py b/var/spack/repos/builtin/packages/perl-file-remove/package.py index 8fbb26c83b9fd7..e6257d9b384c20 100644 --- a/var/spack/repos/builtin/packages/perl-file-remove/package.py +++ b/var/spack/repos/builtin/packages/perl-file-remove/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlFileRemove(PerlPackage): homepage = "https://metacpan.org/pod/File::Remove" url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Remove-1.61.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.61", sha256="fd857f585908fc503461b9e48b3c8594e6535766bc14beb17c90ba58d5dc4975") depends_on("perl-module-build", type="build") diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py index cab7994da5ae39..ce75ec61c8bbac 100644 --- a/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py +++ b/var/spack/repos/builtin/packages/perl-file-sharedir-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlFileSharedirInstall(PerlPackage): homepage = "https://metacpan.org/pod/File::ShareDir::Install" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/File-ShareDir-Install-0.11.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.14", sha256="8f9533b198f2d4a9a5288cbc7d224f7679ad05a7a8573745599789428bc5aea0") version("0.11", sha256="32bf8772e9fea60866074b27ff31ab5bc3f88972d61915e84cbbb98455e00cc8") diff --git a/var/spack/repos/builtin/packages/perl-file-sharedir/package.py b/var/spack/repos/builtin/packages/perl-file-sharedir/package.py new file mode 100644 index 00000000000000..27199ac509b151 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-sharedir/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlFileSharedir(PerlPackage): + """File::ShareDir - Locate per-dist and per-module shared files""" + + homepage = "https://metacpan.org/pod/File::ShareDir" + url = "https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-1.118.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.118", sha256="3bb2a20ba35df958dc0a4f2306fc05d903d8b8c4de3c8beefce17739d281c958") + + depends_on("perl-class-inspector@1.12:", type=("build", "run", "test")) + depends_on("perl-file-sharedir-install@0.13:", type=("build", "link")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use File::ShareDir; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py index 2d02900933290e..56cf2ab8649620 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlFileSlurpTiny(PerlPackage): homepage = "https://metacpan.org/pod/File::Slurp::Tiny" url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.004", sha256="452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e") diff --git a/var/spack/repos/builtin/packages/perl-file-slurp/package.py b/var/spack/repos/builtin/packages/perl-file-slurp/package.py index 2ad51b1bc35850..3ba069a171be66 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlFileSlurp(PerlPackage): homepage = "https://metacpan.org/pod/File::Slurp" url = "https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.32.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("9999.32", sha256="4c3c21992a9d42be3a79dd74a3c83d27d38057269d65509a2f555ea0fb2bc5b0") diff --git a/var/spack/repos/builtin/packages/perl-file-slurper/package.py b/var/spack/repos/builtin/packages/perl-file-slurper/package.py index 8c7d0c42da77d3..fef0579c7f16a8 100644 --- a/var/spack/repos/builtin/packages/perl-file-slurper/package.py +++ b/var/spack/repos/builtin/packages/perl-file-slurper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlFileSlurper(PerlPackage): homepage = "https://metacpan.org/pod/File::Slurper" url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/File-Slurper-0.011.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.014", sha256="d5a36487339888c3cd758e648160ee1d70eb4153cacbaff57846dbcefb344b0c") version("0.011", sha256="f6494844b9759b3d1dd8fc4ffa790f8e6e493c4eb58e88831a51e085f2e76010") diff --git a/var/spack/repos/builtin/packages/perl-file-spec/package.py b/var/spack/repos/builtin/packages/perl-file-spec/package.py new file mode 100644 index 00000000000000..65c179233da5bd --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-file-spec/package.py @@ -0,0 +1,15 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlFileSpec(PerlPackage): + """File::Spec - Perl extension for portably performing operations on file names""" + + homepage = "https://metacpan.org/pod/File::Spec" + url = "https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/File-Spec-0.90.tar.gz" + + version("0.90", sha256="695a34604e1b6a98327fe2b374504329735b07c2c45db9f55df1636e4c29bf79") diff --git a/var/spack/repos/builtin/packages/perl-file-temp/package.py b/var/spack/repos/builtin/packages/perl-file-temp/package.py index 2e9f729df1f944..6a01d8baa4db5c 100644 --- a/var/spack/repos/builtin/packages/perl-file-temp/package.py +++ b/var/spack/repos/builtin/packages/perl-file-temp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlFileTemp(PerlPackage): homepage = "https://metacpan.org/pod/File::Temp" url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-Temp-0.2311.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.2311", sha256="2290d61bf5c39882fc3311da9ce1c7f42dbdf825ae169e552c59fe4598b36f4a") diff --git a/var/spack/repos/builtin/packages/perl-file-which/package.py b/var/spack/repos/builtin/packages/perl-file-which/package.py index 9ad4ef91ccbdf0..6977481df28fdf 100644 --- a/var/spack/repos/builtin/packages/perl-file-which/package.py +++ b/var/spack/repos/builtin/packages/perl-file-which/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlFileWhich(PerlPackage): homepage = "http://cpansearch.perl.org/src/PLICEASE/File-Which-1.22/lib/File/Which.pm" url = "http://search.cpan.org/CPAN/authors/id/P/PL/PLICEASE/File-Which-1.22.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.27", sha256="3201f1a60e3f16484082e6045c896842261fc345de9fb2e620fd2a2c7af3a93a") version("1.22", sha256="e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4") diff --git a/var/spack/repos/builtin/packages/perl-font-ttf/package.py b/var/spack/repos/builtin/packages/perl-font-ttf/package.py index c5edc6edaf0f17..34b34f75149f2f 100644 --- a/var/spack/repos/builtin/packages/perl-font-ttf/package.py +++ b/var/spack/repos/builtin/packages/perl-font-ttf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-forks/package.py b/var/spack/repos/builtin/packages/perl-forks/package.py index 41c67a5540c60b..fad5ff25a7642e 100644 --- a/var/spack/repos/builtin/packages/perl-forks/package.py +++ b/var/spack/repos/builtin/packages/perl-forks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-fth/package.py b/var/spack/repos/builtin/packages/perl-fth/package.py index d2a68a4d8092c0..865e5693b5371d 100644 --- a/var/spack/repos/builtin/packages/perl-fth/package.py +++ b/var/spack/repos/builtin/packages/perl-fth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-gd/package.py b/var/spack/repos/builtin/packages/perl-gd/package.py index 9cfcd9679aeab7..be7651d7ae343d 100644 --- a/var/spack/repos/builtin/packages/perl-gd/package.py +++ b/var/spack/repos/builtin/packages/perl-gd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlGd(PerlPackage): homepage = "https://metacpan.org/pod/GD" url = "https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.77.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.77", sha256="b56c88b8ef3be016ce29bb62dd1f1b6f6b5fbcaa57fea59e9468af6901016fb5") version("2.53", sha256="d05d01fe95e581adb3468cf05ab5d405db7497c0fb3ec7ecf23d023705fab7aa") diff --git a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py index 6b416de9439057..fdf448c0778794 100644 --- a/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py +++ b/var/spack/repos/builtin/packages/perl-gdgraph-histogram/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlGdgraphHistogram(PerlPackage): homepage = "https://metacpan.org/pod/GD::Graph::histogram" url = "https://cpan.metacpan.org/authors/id/W/WH/WHIZDOG/GDGraph-histogram-1.1.tar.gz" + license("Artistic-1.0-cl8") + version("1.1", sha256="20f752d0e6deb59b29aa2ec3496b5883476d00280b6e83f5b47c33fac4097f8a") diff --git a/var/spack/repos/builtin/packages/perl-gdgraph/package.py b/var/spack/repos/builtin/packages/perl-gdgraph/package.py index 9a7852e615742c..033c9f583e81f8 100644 --- a/var/spack/repos/builtin/packages/perl-gdgraph/package.py +++ b/var/spack/repos/builtin/packages/perl-gdgraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlGdgraph(PerlPackage): homepage = "https://metacpan.org/pod/GD::Graph" url = "http://search.cpan.org/CPAN/authors/id/B/BW/BWARFIELD/GDGraph-1.4308.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.4308", sha256="75b3c7e280431404ed096c6e120d552cc39052a8610787149515e94b9ba237cb") depends_on("perl-capture-tiny", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-gdtextutil/package.py b/var/spack/repos/builtin/packages/perl-gdtextutil/package.py index 414d11f981f519..6e298c14ac1332 100644 --- a/var/spack/repos/builtin/packages/perl-gdtextutil/package.py +++ b/var/spack/repos/builtin/packages/perl-gdtextutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlGdtextutil(PerlPackage): homepage = "https://metacpan.org/pod/GD::Text" url = "http://search.cpan.org/CPAN/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.86", sha256="886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc") depends_on("perl-gd", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-getopt-argvfile/package.py b/var/spack/repos/builtin/packages/perl-getopt-argvfile/package.py new file mode 100644 index 00000000000000..058a4b1ddef0ff --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-getopt-argvfile/package.py @@ -0,0 +1,17 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlGetoptArgvfile(PerlPackage): + """Getopt::ArgvFile - interpolates script options from files into @ARGV or another array.""" + + homepage = "https://metacpan.org/pod/Getopt::ArgvFile" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz" + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.11", sha256="3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22") diff --git a/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py b/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py index 968f165ef8e92d..401eae92b14492 100644 --- a/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py +++ b/var/spack/repos/builtin/packages/perl-getopt-tabular/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlGetoptTabular(PerlPackage): homepage = "https://metacpan.org/pod/Getopt::Tabular" url = "https://cpan.metacpan.org/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.3", sha256="9bdf067633b5913127820f4e8035edc53d08372faace56ba6bfa00c968a25377") diff --git a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py index eae5958f85588a..910d2a04cc3694 100644 --- a/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py +++ b/var/spack/repos/builtin/packages/perl-graph-readwrite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlGraphReadwrite(PerlPackage): homepage = "https://metacpan.org/pod/Graph::ReadWrite" url = "http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/Graph-ReadWrite-2.09.tar.gz" + license("Artistic-1.0") + version("2.10", sha256="516c1ea9facb995dbc38d1735d58974b2399862567e731b729c8d0bc2ee5a14b") version("2.09", sha256="b01ef06ce922eea12d5ce614d63ddc5f3ee7ad0d05f9577051d3f87a89799a4a") diff --git a/var/spack/repos/builtin/packages/perl-graph/package.py b/var/spack/repos/builtin/packages/perl-graph/package.py index 73463ef38f36aa..63d7568ae8e382 100644 --- a/var/spack/repos/builtin/packages/perl-graph/package.py +++ b/var/spack/repos/builtin/packages/perl-graph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,13 @@ class PerlGraph(PerlPackage): homepage = "https://metacpan.org/pod/Graph" url = "http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Graph-0.9704.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version( + "0.9704", + sha256="325e8eb07be2d09a909e450c13d3a42dcb2a2e96cc3ac780fe4572a0d80b2a25", + preferred=True, + ) version("0.20105", sha256="d72d6512e5a637a64b879a7b74cf3822278b4917e1a0317d340523a6a3936b67") - version("0.9704", sha256="325e8eb07be2d09a909e450c13d3a42dcb2a2e96cc3ac780fe4572a0d80b2a25") depends_on("perl@5.6.0:") diff --git a/var/spack/repos/builtin/packages/perl-hash-merge/package.py b/var/spack/repos/builtin/packages/perl-hash-merge/package.py index 35e92f6e37ab69..6d6a2b5d360607 100644 --- a/var/spack/repos/builtin/packages/perl-hash-merge/package.py +++ b/var/spack/repos/builtin/packages/perl-hash-merge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-heap/package.py b/var/spack/repos/builtin/packages/perl-heap/package.py new file mode 100644 index 00000000000000..c7faf761752c9b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-heap/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlHeap(PerlPackage): + """Perl extensions for keeping data partially sorted""" + + homepage = "https://metacpan.org/pod/Heap" + url = "https://cpan.metacpan.org/authors/id/J/JM/JMM/Heap-0.80.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.80", sha256="ccda29f3c93176ad0fdfff4dd6f5e4ac90b370cba4b028386b7343bf64139bde") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Heap; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-html-parser/package.py b/var/spack/repos/builtin/packages/perl-html-parser/package.py index f0b56906adf036..6f1cbfc160d6d6 100644 --- a/var/spack/repos/builtin/packages/perl-html-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-html-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlHtmlParser(PerlPackage): homepage = "https://metacpan.org/pod/HTML::Parser" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.72", sha256="ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b") depends_on("perl-html-tagset", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py index 82c263de6a9418..c9061bc57ea190 100644 --- a/var/spack/repos/builtin/packages/perl-html-tagset/package.py +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlHtmlTagset(PerlPackage): homepage = "https://metacpan.org/pod/HTML::Tagset" url = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.20", sha256="adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2") diff --git a/var/spack/repos/builtin/packages/perl-http-cookiejar/package.py b/var/spack/repos/builtin/packages/perl-http-cookiejar/package.py new file mode 100644 index 00000000000000..9e1598b2bcdca5 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-http-cookiejar/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlHttpCookiejar(PerlPackage): + """A minimalist HTTP user agent cookie jar""" + + homepage = "https://metacpan.org/pod/HTTP::CookieJar" + url = "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.014.tar.gz" + + maintainers("EbiArnie") + + license("Apache-2.0") + + version("0.014", sha256="7094ea5c91f536d263b85e83ab4e9a963e11c4408ce08ecae553fa9c0cc47e73") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-http-date", type=("run")) + depends_on("perl-test-deep", type=("test")) + depends_on("perl-test-requires", type=("test")) + depends_on("perl-uri", type=("test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use HTTP::CookieJar; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-http-cookies/package.py b/var/spack/repos/builtin/packages/perl-http-cookies/package.py index 0bebdba332f6ed..86e2eedf5014a5 100644 --- a/var/spack/repos/builtin/packages/perl-http-cookies/package.py +++ b/var/spack/repos/builtin/packages/perl-http-cookies/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlHttpCookies(PerlPackage): homepage = "https://metacpan.org/pod/HTTP::Cookies" url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/HTTP-Cookies-6.04.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.10", sha256="e36f36633c5ce6b5e4b876ffcf74787cc5efe0736dd7f487bdd73c14f0bd7007") version("6.04", sha256="0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4") diff --git a/var/spack/repos/builtin/packages/perl-http-daemon/package.py b/var/spack/repos/builtin/packages/perl-http-daemon/package.py index 67aaa9dd42ffea..4f078746af7ab9 100644 --- a/var/spack/repos/builtin/packages/perl-http-daemon/package.py +++ b/var/spack/repos/builtin/packages/perl-http-daemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlHttpDaemon(PerlPackage): homepage = "https://metacpan.org/pod/HTTP::Daemon" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.01", sha256="43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2") depends_on("perl-lwp-mediatypes", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-http-date/package.py b/var/spack/repos/builtin/packages/perl-http-date/package.py index 5d553dbc9b82ca..b524951a51592e 100644 --- a/var/spack/repos/builtin/packages/perl-http-date/package.py +++ b/var/spack/repos/builtin/packages/perl-http-date/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlHttpDate(PerlPackage): homepage = "https://metacpan.org/pod/HTTP::Date" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.02", sha256="e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333") diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py index a0bcd57cd8765d..202080cd034405 100644 --- a/var/spack/repos/builtin/packages/perl-http-message/package.py +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlHttpMessage(PerlPackage): homepage = "https://metacpan.org/pod/HTTP::Message" url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/HTTP-Message-6.13.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.44", sha256="398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1") version("6.13", sha256="f25f38428de851e5661e72f124476494852eb30812358b07f1c3a289f6f5eded") diff --git a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py index 35a203b6e8733c..a98a5acdc49891 100644 --- a/var/spack/repos/builtin/packages/perl-http-negotiate/package.py +++ b/var/spack/repos/builtin/packages/perl-http-negotiate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-inline-c/package.py b/var/spack/repos/builtin/packages/perl-inline-c/package.py index c3179654d005e0..38f4e4b10e5037 100644 --- a/var/spack/repos/builtin/packages/perl-inline-c/package.py +++ b/var/spack/repos/builtin/packages/perl-inline-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlInlineC(PerlPackage): homepage = "https://metacpan.org/pod/Inline::C" url = "http://search.cpan.org/CPAN/authors/id/T/TI/TINITA/Inline-C-0.78.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.81", sha256="f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac") version("0.78", sha256="9a7804d85c01a386073d2176582b0262b6374c5c0341049da3ef84c6f53efbc7") diff --git a/var/spack/repos/builtin/packages/perl-inline/package.py b/var/spack/repos/builtin/packages/perl-inline/package.py index d002dc5e41085e..7428bb28a71286 100644 --- a/var/spack/repos/builtin/packages/perl-inline/package.py +++ b/var/spack/repos/builtin/packages/perl-inline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlInline(PerlPackage): homepage = "https://metacpan.org/pod/Inline" url = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Inline-0.80.tar.gz" + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + version("0.86", sha256="510a7de2d011b0db80b0874e8c0f7390010991000ae135cff7474df1e6d51e3a") version("0.80", sha256="7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6") diff --git a/var/spack/repos/builtin/packages/perl-io-all/package.py b/var/spack/repos/builtin/packages/perl-io-all/package.py index c688c9713998f5..1ebc9217c2adca 100644 --- a/var/spack/repos/builtin/packages/perl-io-all/package.py +++ b/var/spack/repos/builtin/packages/perl-io-all/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,4 +27,6 @@ class PerlIoAll(PerlPackage): homepage = "https://metacpan.org/pod/distribution/IO-All/lib/IO/All.pod" url = "https://cpan.metacpan.org/authors/id/F/FR/FREW/IO-All-0.87.tar.gz" + license("Artistic-1.0") + version("0.87", sha256="54e21d250c0229127e30b77a3461e10077854ec244f26fb670f1b445ed4c4d5b") diff --git a/var/spack/repos/builtin/packages/perl-io-compress/package.py b/var/spack/repos/builtin/packages/perl-io-compress/package.py index 94de769b56a195..71596c12a922e8 100644 --- a/var/spack/repos/builtin/packages/perl-io-compress/package.py +++ b/var/spack/repos/builtin/packages/perl-io-compress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-io-html/package.py b/var/spack/repos/builtin/packages/perl-io-html/package.py index 031149b7ff7b77..e02de157e93fc1 100644 --- a/var/spack/repos/builtin/packages/perl-io-html/package.py +++ b/var/spack/repos/builtin/packages/perl-io-html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlIoHtml(PerlPackage): homepage = "https://metacpan.org/pod/IO::HTML" url = "http://search.cpan.org/CPAN/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.004", sha256="c87b2df59463bbf2c39596773dfb5c03bde0f7e1051af339f963f58c1cbd8bf5") version("1.001", sha256="ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0") diff --git a/var/spack/repos/builtin/packages/perl-io-prompt/package.py b/var/spack/repos/builtin/packages/perl-io-prompt/package.py index 22417380451752..abcb2be619ed8e 100644 --- a/var/spack/repos/builtin/packages/perl-io-prompt/package.py +++ b/var/spack/repos/builtin/packages/perl-io-prompt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py index ca2109e63e3e98..9a1cef43199169 100644 --- a/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py +++ b/var/spack/repos/builtin/packages/perl-io-sessiondata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlIoSessiondata(PerlPackage): homepage = "https://metacpan.org/release/PHRED/IO-SessionData-1.03/source/lib/IO/SessionData.pm#PIO::SessionData" url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.03", sha256="64a4712a3edbb3fd10230db296c29c8c66f066adfbc0c3df6a48258fef392ddd") diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py index 99af5628835f19..7463880ad49f34 100644 --- a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlIoSocketSsl(PerlPackage): homepage = "https://metacpan.org/dist/IO-Socket-SSL/view/lib/IO/Socket/SSL.pod" url = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-2.052.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.052", sha256="e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673") depends_on("perl-net-ssleay", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-io-string/package.py b/var/spack/repos/builtin/packages/perl-io-string/package.py index fbf3a9cdd6b2d0..1b94e595c9c15e 100644 --- a/var/spack/repos/builtin/packages/perl-io-string/package.py +++ b/var/spack/repos/builtin/packages/perl-io-string/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlIoString(PerlPackage): homepage = "https://metacpan.org/pod/IO::String" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.08", sha256="2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0") diff --git a/var/spack/repos/builtin/packages/perl-io-stringy/package.py b/var/spack/repos/builtin/packages/perl-io-stringy/package.py index dc2f0ca2810c28..4db1550b32b1e2 100644 --- a/var/spack/repos/builtin/packages/perl-io-stringy/package.py +++ b/var/spack/repos/builtin/packages/perl-io-stringy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-io-tty/package.py b/var/spack/repos/builtin/packages/perl-io-tty/package.py index 115aa7ff7e067f..4be01b572c074b 100644 --- a/var/spack/repos/builtin/packages/perl-io-tty/package.py +++ b/var/spack/repos/builtin/packages/perl-io-tty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class PerlIoTty(PerlPackage): homepage = "https://metacpan.org/pod/IO::Tty" url = "https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.13_01.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.17", sha256="a5f1a83020bc5b5dd6c1b570f48c7546e0a8f7fac10a068740b03925ad9e14e8") version("1.13_01", sha256="89798eba7c31d9c169ef2f38ff49490aa769b1d9a68033de365595cfaf9cc258") diff --git a/var/spack/repos/builtin/packages/perl-ipc-run/package.py b/var/spack/repos/builtin/packages/perl-ipc-run/package.py index c9a2f62d40c879..c951d3b315e9f2 100644 --- a/var/spack/repos/builtin/packages/perl-ipc-run/package.py +++ b/var/spack/repos/builtin/packages/perl-ipc-run/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PerlIpcRun(PerlPackage): homepage = "https://metacpan.org/pod/IPC::Run" url = "https://cpan.metacpan.org/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version( "20220807.0", sha256="277d781dbbc98af18e979c7ef36f222513d7361742c52507c3348b265f6f5e69" ) diff --git a/var/spack/repos/builtin/packages/perl-ipc-run3/package.py b/var/spack/repos/builtin/packages/perl-ipc-run3/package.py new file mode 100644 index 00000000000000..c9d8d622f2b835 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-ipc-run3/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlIpcRun3(PerlPackage): + """Run a subprocess with input/ouput redirection""" + + homepage = "https://metacpan.org/pod/IPC::Run3" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz" + + maintainers("EbiArnie") + + version("0.048", sha256="3d81c3cc1b5cff69cca9361e2c6e38df0352251ae7b41e2ff3febc850e463565") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use IPC::Run3; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-ipc-system-simple/package.py b/var/spack/repos/builtin/packages/perl-ipc-system-simple/package.py new file mode 100644 index 00000000000000..482d29df873d23 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-ipc-system-simple/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlIpcSystemSimple(PerlPackage): + """Run commands simply, with detailed diagnostics""" + + homepage = "https://metacpan.org/pod/IPC::System::Simple" + url = "https://cpan.metacpan.org/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.30.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.30", sha256="22e6f5222b505ee513058fdca35ab7a1eab80539b98e5ca4a923a70a8ae9ba9e") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use IPC::System::Simple; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-json-maybexs/package.py b/var/spack/repos/builtin/packages/perl-json-maybexs/package.py new file mode 100644 index 00000000000000..83449a15bbf121 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-json-maybexs/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlJsonMaybexs(PerlPackage): + """Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP""" + + homepage = "https://metacpan.org/pod/JSON::MaybeXS" + url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004005.tar.gz" + + maintainers("EbiArnie") + + version("1.004005", sha256="f5b6bc19f579e66b7299f8748b8ac3e171936dc4e7fcb72a8a257a9bd482a331") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-cpanel-json-xs@2.3310:", type=("build", "run", "test")) + depends_on("perl-test-needs@0.002006:", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use JSON::MaybeXS; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-json/package.py b/var/spack/repos/builtin/packages/perl-json/package.py index b357e3e269ec76..16387789976d4b 100644 --- a/var/spack/repos/builtin/packages/perl-json/package.py +++ b/var/spack/repos/builtin/packages/perl-json/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlJson(PerlPackage): homepage = "https://metacpan.org/pod/JSON" url = "http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("4.10", sha256="df8b5143d9a7de99c47b55f1a170bd1f69f711935c186a6dc0ab56dd05758e35") version("2.97001", sha256="e277d9385633574923f48c297e1b8acad3170c69fa590e31fa466040fc6f8f5a") diff --git a/var/spack/repos/builtin/packages/perl-kyotocabinet/package.py b/var/spack/repos/builtin/packages/perl-kyotocabinet/package.py new file mode 100644 index 00000000000000..5971035ac0771c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-kyotocabinet/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlKyotocabinet(PerlPackage): + """Kyoto Cabinet is a library of routines for managing a database.""" + + homepage = "https://dbmx.net/kyotocabinet/" + url = "https://dbmx.net/kyotocabinet/perlpkg/kyotocabinet-perl-1.20.tar.gz" + + maintainers("EbiArnie") + + license("GPL-3.0-or-later") + + version("1.20", sha256="19b3654dc6febfd0b91e54f36b2a0ebdaeaefaf7875f5aab337ad846a4095c32") + + depends_on("kyotocabinet", type=("build", "link", "run", "test")) + depends_on("zlib-api", type=("build", "link", "run", "test")) + depends_on("lzo", type=("build", "link", "run", "test")) + depends_on("xz", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use KyotoCabinet; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py index f89c7439045ddc..279677e96c8387 100644 --- a/var/spack/repos/builtin/packages/perl-libwww-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-libwww-perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PerlLibwwwPerl(PerlPackage): homepage = "https://github.com/libwww-perl/libwww-perl" url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/libwww-perl-6.33.tar.gz" + license("Artistic-1.0") + version("6.68", sha256="42784a5869855ee08522dfb1d30fccf98ca4ddefa8c6c1bcb0d68a0adceb7f01") version("6.33", sha256="97417386f11f007ae129fe155b82fd8969473ce396a971a664c8ae6850c69b99") version("6.29", sha256="4c6f2697999d2d0e6436b584116b12b30dc39990ec0622751c1a6cec2c0e6662") diff --git a/var/spack/repos/builtin/packages/perl-libxml-perl/package.py b/var/spack/repos/builtin/packages/perl-libxml-perl/package.py index 0a28125d1a6952..66b00251313f52 100644 --- a/var/spack/repos/builtin/packages/perl-libxml-perl/package.py +++ b/var/spack/repos/builtin/packages/perl-libxml-perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class PerlLibxmlPerl(PerlPackage): homepage = "https://metacpan.org/release/libxml-perl" url = "https://cpan.metacpan.org/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.08", sha256="4571059b7b5d48b7ce52b01389e95d798bf5cf2020523c153ff27b498153c9cb") diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py index fa075179f4fdad..b93ea3e7d9214d 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils-xs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class PerlListMoreutilsXs(PerlPackage): homepage = "https://metacpan.org/pod/List::MoreUtils::XS" url = "https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz" + license("Apache-2.0") + version("0.430", sha256="e8ce46d57c179eecd8758293e9400ff300aaf20fefe0a9d15b9fe2302b9cb242") version("0.428", sha256="9d9fe621429dfe7cf2eb1299c192699ddebf060953e5ebdc1b4e293c6d6dd62d") diff --git a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py index 2df5c068681de0..60afe429487759 100644 --- a/var/spack/repos/builtin/packages/perl-list-moreutils/package.py +++ b/var/spack/repos/builtin/packages/perl-list-moreutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlListMoreutils(PerlPackage): homepage = "https://metacpan.org/pod/List::MoreUtils" url = "http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz" + license("Apache-2.0") + version("0.430", sha256="63b1f7842cd42d9b538d1e34e0330de5ff1559e4c2737342506418276f646527") version("0.428", sha256="713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2") diff --git a/var/spack/repos/builtin/packages/perl-log-any-adapter-callback/package.py b/var/spack/repos/builtin/packages/perl-log-any-adapter-callback/package.py new file mode 100644 index 00000000000000..f08b06b6683492 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-log-any-adapter-callback/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlLogAnyAdapterCallback(PerlPackage): + """Send Log::Any logs to a subroutine""" + + homepage = "https://metacpan.org/pod/Log::Any::Adapter::Callback" + url = ( + "https://cpan.metacpan.org/authors/id/P/PE/PERLANCAR/Log-Any-Adapter-Callback-0.102.tar.gz" + ) + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + # Note: Author marked package as deprecated + version("0.102", sha256="7c01883265bdab65344257c1b1d1e69fbe300e7693dddeebb98f9f67310e07cd") + + depends_on("perl-log-any", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Log::Any::Adapter::Callback; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-log-any/package.py b/var/spack/repos/builtin/packages/perl-log-any/package.py new file mode 100644 index 00000000000000..0dbf0f1e23bc62 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-log-any/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlLogAny(PerlPackage): + """Bringing loggers and listeners together""" + + homepage = "https://metacpan.org/pod/Log::Any" + url = "https://cpan.metacpan.org/authors/id/P/PR/PREACTION/Log-Any-1.717.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.717", sha256="56649da0f3900230c9e3d29252cb0a74806fb2ddebd22805acd7368959a65bca") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Log::Any; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py index d7538a1427b61b..2e67db8100c983 100644 --- a/var/spack/repos/builtin/packages/perl-log-log4perl/package.py +++ b/var/spack/repos/builtin/packages/perl-log-log4perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlLogLog4perl(PerlPackage): homepage = "https://metacpan.org/pod/Log::Log4perl" url = "https://cpan.metacpan.org/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.46.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.49", sha256="b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16") version("1.46", sha256="31011a17c04e78016e73eaa4865d0481d2ffc3dc22813c61065d90ad73c64e6f") diff --git a/var/spack/repos/builtin/packages/perl-logger-simple/package.py b/var/spack/repos/builtin/packages/perl-logger-simple/package.py index 1d00149108f9a1..350ba10cef24dd 100644 --- a/var/spack/repos/builtin/packages/perl-logger-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-logger-simple/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py index 0709a3ccbf510f..1a6d3c9c5b21cb 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-mediatypes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlLwpMediatypes(PerlPackage): homepage = "https://metacpan.org/pod/LWP::MediaTypes" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.02", sha256="18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676") diff --git a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py index b17b710128cd33..71fb1209e6ff51 100644 --- a/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py +++ b/var/spack/repos/builtin/packages/perl-lwp-protocol-https/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlLwpProtocolHttps(PerlPackage): homepage = "https://metacpan.org/pod/LWP::Protocol::https" url = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.04", sha256="1ef67750ee363525cf729b59afde805ac4dc80eaf8d36ca01082a4d78a7af629") depends_on("perl-test-requiresinternet", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-mailtools/package.py b/var/spack/repos/builtin/packages/perl-mailtools/package.py index ff869299be3dc5..a2baf43f62851b 100644 --- a/var/spack/repos/builtin/packages/perl-mailtools/package.py +++ b/var/spack/repos/builtin/packages/perl-mailtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlMailtools(PerlPackage): homepage = "https://metacpan.org/release/MailTools" url = "https://cpan.metacpan.org/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.21", sha256="4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb") depends_on("perl-timedate", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-math-bezier/package.py b/var/spack/repos/builtin/packages/perl-math-bezier/package.py index 2954d4b895f9e4..d0b459e7c8ff5c 100644 --- a/var/spack/repos/builtin/packages/perl-math-bezier/package.py +++ b/var/spack/repos/builtin/packages/perl-math-bezier/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-bigint/package.py b/var/spack/repos/builtin/packages/perl-math-bigint/package.py index dbf93fa8abc8fa..655ea9fe897f9d 100644 --- a/var/spack/repos/builtin/packages/perl-math-bigint/package.py +++ b/var/spack/repos/builtin/packages/perl-math-bigint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-bigrat/package.py b/var/spack/repos/builtin/packages/perl-math-bigrat/package.py index 3d9620af85657a..d05a37496d9b68 100644 --- a/var/spack/repos/builtin/packages/perl-math-bigrat/package.py +++ b/var/spack/repos/builtin/packages/perl-math-bigrat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-cdf/package.py b/var/spack/repos/builtin/packages/perl-math-cdf/package.py index b85975ab7b2a3d..1b29e2f11c044b 100644 --- a/var/spack/repos/builtin/packages/perl-math-cdf/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-cephes/package.py b/var/spack/repos/builtin/packages/perl-math-cephes/package.py index c5ba5fb678f0f1..3bc07147754af4 100644 --- a/var/spack/repos/builtin/packages/perl-math-cephes/package.py +++ b/var/spack/repos/builtin/packages/perl-math-cephes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlMathCephes(PerlPackage): homepage = "https://metacpan.org/pod/Math::Cephes" url = "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/Math-Cephes-0.5305.tar.gz" + license("Artistic-1.0") + version("0.5305", sha256="561a800a4822e748d2befc366baa4b21e879a40cc00c22293c7b8736caeb83a1") diff --git a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py index bc7923af3257c3..243f87ed54e2c7 100644 --- a/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py +++ b/var/spack/repos/builtin/packages/perl-math-matrixreal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-round/package.py b/var/spack/repos/builtin/packages/perl-math-round/package.py index 20ff36a532ea5d..4ec424af7be832 100644 --- a/var/spack/repos/builtin/packages/perl-math-round/package.py +++ b/var/spack/repos/builtin/packages/perl-math-round/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-symbolic/package.py b/var/spack/repos/builtin/packages/perl-math-symbolic/package.py index 1bec72d330b016..886dcce52ad105 100644 --- a/var/spack/repos/builtin/packages/perl-math-symbolic/package.py +++ b/var/spack/repos/builtin/packages/perl-math-symbolic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-math-vecstat/package.py b/var/spack/repos/builtin/packages/perl-math-vecstat/package.py index 7872573d29f9b0..d59cfa48349620 100644 --- a/var/spack/repos/builtin/packages/perl-math-vecstat/package.py +++ b/var/spack/repos/builtin/packages/perl-math-vecstat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-mce/package.py b/var/spack/repos/builtin/packages/perl-mce/package.py index 2cf9b8cf38a88d..7ca21f4107fe5f 100644 --- a/var/spack/repos/builtin/packages/perl-mce/package.py +++ b/var/spack/repos/builtin/packages/perl-mce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,5 +19,7 @@ class PerlMce(PerlPackage): homepage = "https://github.com/marioroy/mce-perl" url = "https://cpan.metacpan.org/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.884", sha256="c830c0e548094f19c620049e744258be2c121d4a86cf7c94a37599ad016daf33") version("1.874", sha256="d809e3018475115ad7eccb8bef49bde3bf3e75abbbcd80564728bbcfab86d3d0") diff --git a/var/spack/repos/builtin/packages/perl-memory-process/package.py b/var/spack/repos/builtin/packages/perl-memory-process/package.py new file mode 100644 index 00000000000000..1ae265ea0490e0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-memory-process/package.py @@ -0,0 +1,17 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlMemoryProcess(PerlPackage): + """Memory::Process - Perl class to determine actual memory usage""" + + homepage = "https://metacpan.org/pod/Memory::Process" + url = "https://cpan.metacpan.org/authors/id/S/SK/SKIM/Memory-Process-0.06.tar.gz" + + license("BSD-2-Clause") + + version("0.06", sha256="35814488ffd29c97621625ea3b3d700afbfa60ed055bd759d4e58d9c8fd44e4e") diff --git a/var/spack/repos/builtin/packages/perl-metacpan-client/package.py b/var/spack/repos/builtin/packages/perl-metacpan-client/package.py new file mode 100644 index 00000000000000..9b7cb2ef3653df --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-metacpan-client/package.py @@ -0,0 +1,40 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlMetacpanClient(PerlPackage): + """A comprehensive, DWIM-featured client to the MetaCPAN API""" + + homepage = "https://metacpan.org/pod/MetaCPAN::Client" + url = "https://cpan.metacpan.org/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.031000.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("2.031000", sha256="c6ceaf886a74120e2bffe2ec1f09d0fdc330acbfdb9ec876ef925ee687ec7cf5") + + depends_on("perl@5.10.0:", type=("build", "link", "run", "test")) + depends_on("perl-io-socket-ssl@1.42:", type=("build", "run", "test")) + depends_on("perl-json-maybexs", type=("build", "run", "test")) + depends_on("perl-lwp-protocol-https", type=("build", "test")) + depends_on("perl-moo", type=("build", "run", "test")) + depends_on("perl-net-ssleay@1.49:", type=("build", "run", "test")) + depends_on("perl-ref-util", type=("build", "run", "test")) + depends_on("perl-safe-isa", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + depends_on("perl-test-needs@0.002005:", type=("build", "test")) + depends_on("perl-type-tiny", type=("build", "run", "test")) + depends_on("perl-uri", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use MetaCPAN::Client; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-mime-types/package.py b/var/spack/repos/builtin/packages/perl-mime-types/package.py new file mode 100644 index 00000000000000..182f839ace2e85 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-mime-types/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlMimeTypes(PerlPackage): + """Definition of MIME types""" + + homepage = "https://metacpan.org/pod/MIME::Types" + url = "https://cpan.metacpan.org/authors/id/M/MA/MARKOV/MIME-Types-2.24.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("2.24", sha256="629e361f22b220be50c2da7354e23c0451757709a03c25a22f3160edb94cb65f") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use MIME::Types; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-mni-perllib/package.py b/var/spack/repos/builtin/packages/perl-mni-perllib/package.py index b4553f9726d8be..80fed99b0d43c0 100644 --- a/var/spack/repos/builtin/packages/perl-mni-perllib/package.py +++ b/var/spack/repos/builtin/packages/perl-mni-perllib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-mock-config/package.py b/var/spack/repos/builtin/packages/perl-mock-config/package.py new file mode 100644 index 00000000000000..fab691f7c07e8d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-mock-config/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlMockConfig(PerlPackage): + """Temporarily set Config or XSConfig values""" + + homepage = "https://metacpan.org/pod/Mock::Config" + url = "https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz" + + maintainers("EbiArnie") + + version("0.03", sha256="a5b8345757ca4f2b9335f5be14e93ebbb502865233a755bf53bc7156deec001b") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Mock::Config; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py index d0ed2cd824b9f2..e7475e213bf3db 100644 --- a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlModuleBuildTiny(PerlPackage): homepage = "https://metacpan.org/pod/Module::Build::Tiny" url = "https://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.044", sha256="cb053a3049cb717dbf4fd7f3c7ab7c0cb1015b22e2d93f38b1ffc47c078322fd") version("0.039", sha256="7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c") diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index 923f7f9b4f3824..62c1822d59229d 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PerlModuleBuild(PerlPackage): homepage = "https://metacpan.org/pod/Module::Build" url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/Module-Build-0.4224.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.4232", sha256="67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b") version("0.4224", sha256="a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782") version("0.4220", sha256="fb1207c7e799366f7a8adda3f135bf8141c4d6068505650d4db2b2d3ce34b5a2") diff --git a/var/spack/repos/builtin/packages/perl-module-corelist/package.py b/var/spack/repos/builtin/packages/perl-module-corelist/package.py index e5c699418d6951..b4b0a27cf1bf57 100644 --- a/var/spack/repos/builtin/packages/perl-module-corelist/package.py +++ b/var/spack/repos/builtin/packages/perl-module-corelist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-module-implementation/package.py b/var/spack/repos/builtin/packages/perl-module-implementation/package.py index 1c3b5eb5e4e964..4d5144cacdcb7d 100644 --- a/var/spack/repos/builtin/packages/perl-module-implementation/package.py +++ b/var/spack/repos/builtin/packages/perl-module-implementation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlModuleImplementation(PerlPackage): homepage = "https://metacpan.org/pod/Module::Implementation" url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz" + license("Artistic-2.0") + version("0.09", sha256="c15f1a12f0c2130c9efff3c2e1afe5887b08ccd033bd132186d1e7d5087fd66d") depends_on("perl-module-runtime", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-module-install/package.py b/var/spack/repos/builtin/packages/perl-module-install/package.py index f7f2b10aeb26a5..e237f8a0aec44c 100644 --- a/var/spack/repos/builtin/packages/perl-module-install/package.py +++ b/var/spack/repos/builtin/packages/perl-module-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlModuleInstall(PerlPackage): homepage = "https://metacpan.org/pod/Module::Install" url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.21", sha256="fbf91007f30565f3920e106055fd0d4287981d5e7dad8b35323ce4b733f15a7b") version("1.19", sha256="1a53a78ddf3ab9e3c03fc5e354b436319a944cba4281baf0b904fa932a13011b") diff --git a/var/spack/repos/builtin/packages/perl-module-pluggable/package.py b/var/spack/repos/builtin/packages/perl-module-pluggable/package.py new file mode 100644 index 00000000000000..857d7ef365ba1f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-module-pluggable/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlModulePluggable(PerlPackage): + """Automatically give your module the ability to have plugins""" + + homepage = "https://metacpan.org/pod/Module::Pluggable" + url = "https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("5.2", sha256="b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df") + + depends_on("perl@5.5.30:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Module::Pluggable; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py index ae07ad3c5da742..b4d3e937b22786 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime-conflicts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlModuleRuntimeConflicts(PerlPackage): homepage = "https://metacpan.org/pod/Module::Runtime::Conflicts" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.003", sha256="707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875") diff --git a/var/spack/repos/builtin/packages/perl-module-runtime/package.py b/var/spack/repos/builtin/packages/perl-module-runtime/package.py index 682e6420df8bb5..58ee85056f97e8 100644 --- a/var/spack/repos/builtin/packages/perl-module-runtime/package.py +++ b/var/spack/repos/builtin/packages/perl-module-runtime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlModuleRuntime(PerlPackage): homepage = "https://metacpan.org/pod/Module::Runtime" url = "http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.016", sha256="68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024") depends_on("perl-module-build", type="build") diff --git a/var/spack/repos/builtin/packages/perl-module-scandeps/package.py b/var/spack/repos/builtin/packages/perl-module-scandeps/package.py index 33e75fadf97c58..b9439ae2e0c198 100644 --- a/var/spack/repos/builtin/packages/perl-module-scandeps/package.py +++ b/var/spack/repos/builtin/packages/perl-module-scandeps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlModuleScandeps(PerlPackage): homepage = "https://metacpan.org/pod/Module::ScanDeps" url = "https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.31.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.31", sha256="fc4d98d2b0015745f3b55b51ddf4445a73b069ad0cb7ec36d8ea781d61074d9d") diff --git a/var/spack/repos/builtin/packages/perl-moo/package.py b/var/spack/repos/builtin/packages/perl-moo/package.py index d60107577d75bb..7782b0913521e5 100644 --- a/var/spack/repos/builtin/packages/perl-moo/package.py +++ b/var/spack/repos/builtin/packages/perl-moo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlMoo(PerlPackage): homepage = "https://metacpan.org/pod/Moo" url = "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-2.005004.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.005005", sha256="fb5a2952649faed07373f220b78004a9c6aba387739133740c1770e9b1f4b108") version("2.005004", sha256="e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928") diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index ebc6bc6266b802..234cc6167c86bc 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlMoose(PerlPackage): homepage = "https://metacpan.org/pod/Moose" url = "https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Moose-2.2006.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.2203", sha256="fa7814acf4073fa434c148d403cbbf8a7b62f73ad396fa8869f3036d6e3241a7") version("2.2010", sha256="af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5") version("2.2009", sha256="63ba8a5e27dbcbdbac2cd8f4162fff50a31e9829d8955a196a5898240c02d194") diff --git a/var/spack/repos/builtin/packages/perl-moox-types-mooselike/package.py b/var/spack/repos/builtin/packages/perl-moox-types-mooselike/package.py new file mode 100644 index 00000000000000..3708dd8d31a6cf --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-moox-types-mooselike/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlMooxTypesMooselike(PerlPackage): + """Some Moosish types and a type builder""" + + homepage = "https://metacpan.org/pod/MooX::Types::MooseLike" + url = "https://cpan.metacpan.org/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz" + + maintainers("EbiArnie") + + version("0.29", sha256="1d3780aa9bea430afbe65aa8c76e718f1045ce788aadda4116f59d3b7a7ad2b4") + + depends_on("perl-module-runtime@0.014:", type=("build", "run", "test")) + depends_on("perl-moo@1.004002:", type=("build", "test")) + depends_on("perl-test-fatal@0.003:", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use MooX::Types::MooseLike; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py index 48da9952877241..43fb543ab8425c 100644 --- a/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py +++ b/var/spack/repos/builtin/packages/perl-mozilla-ca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlMozillaCa(PerlPackage): homepage = "https://metacpan.org/pod/Mozilla::CA" url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABH/Mozilla-CA-20160104.tar.gz" + license("MPL-2.0") + version("20160104", sha256="27a7069a243162b65ada4194ff9d21b6ebc304af723eb5d3972fb74c11b03f2a") diff --git a/var/spack/repos/builtin/packages/perl-mro-compat/package.py b/var/spack/repos/builtin/packages/perl-mro-compat/package.py index 5f0e24bd31b213..1931c15c130806 100644 --- a/var/spack/repos/builtin/packages/perl-mro-compat/package.py +++ b/var/spack/repos/builtin/packages/perl-mro-compat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlMroCompat(PerlPackage): homepage = "https://metacpan.org/pod/MRO::Compat" url = "http://search.cpan.org/CPAN/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.15", sha256="0d4535f88e43babd84ab604866215fc4d04398bd4db7b21852d4a31b1c15ef61") version("0.13", sha256="8a2c3b6ccc19328d5579d02a7d91285e2afd85d801f49d423a8eb16f323da4f8") diff --git a/var/spack/repos/builtin/packages/perl-namespace-autoclean/package.py b/var/spack/repos/builtin/packages/perl-namespace-autoclean/package.py new file mode 100644 index 00000000000000..410c3e821b7b5c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-namespace-autoclean/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlNamespaceAutoclean(PerlPackage): + """Namespace::Autoclean - Keep imports out of your namespace""" + + homepage = "https://metacpan.org/pod/namespace::autoclean" + url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.29", sha256="45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-b-hooks-endofscope@0.12:", type=("build", "run", "test")) + depends_on("perl-namespace-clean@0.20:", type=("build", "run", "test")) + depends_on("perl-sub-identify", type=("build", "run", "test")) + depends_on("perl-test-needs", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use namespace::autoclean; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py index 4cda3dcc531fe6..768d74c42865d4 100644 --- a/var/spack/repos/builtin/packages/perl-namespace-clean/package.py +++ b/var/spack/repos/builtin/packages/perl-namespace-clean/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,20 @@ class PerlNamespaceClean(PerlPackage): homepage = "https://metacpan.org/pod/namespace::clean" url = "http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz" + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.27", sha256="8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d") - depends_on("perl-b-hooks-endofscope", type=("build", "run")) + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-b-hooks-endofscope@0.12:", type=("build", "run", "test")) + depends_on("perl-package-stash@0.23:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use namespace::clean; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-net-http/package.py b/var/spack/repos/builtin/packages/perl-net-http/package.py index 5145c2ee2314a4..27a18f0598352b 100644 --- a/var/spack/repos/builtin/packages/perl-net-http/package.py +++ b/var/spack/repos/builtin/packages/perl-net-http/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlNetHttp(PerlPackage): homepage = "https://metacpan.org/pod/Net::HTTP" url = "http://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-6.17.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.22", sha256="62faf9a5b84235443fe18f780e69cecf057dea3de271d7d8a0ba72724458a1a2") version("6.17", sha256="1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611") diff --git a/var/spack/repos/builtin/packages/perl-net-ip/package.py b/var/spack/repos/builtin/packages/perl-net-ip/package.py new file mode 100644 index 00000000000000..978a068d8d50e9 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-net-ip/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlNetIp(PerlPackage): + """Perl extension for manipulating IPv4/IPv6 addresses""" + + homepage = "https://metacpan.org/pod/Net::IP" + url = "https://cpan.metacpan.org/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz" + + maintainers("EbiArnie") + + version("1.26", sha256="040f16f3066647d761b724a3b70754d28cbd1e6fe5ea01c63ed1cd857117d639") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Net::IP; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py index 8a3113a7b59a63..18d04ecf5a0ba8 100644 --- a/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py +++ b/var/spack/repos/builtin/packages/perl-net-scp-expect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py index 3b982f28f3b45c..cd6a8168b1f2a4 100644 --- a/var/spack/repos/builtin/packages/perl-net-ssleay/package.py +++ b/var/spack/repos/builtin/packages/perl-net-ssleay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlNetSsleay(PerlPackage): homepage = "https://metacpan.org/pod/Net::SSLeay" url = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-1.82.tar.gz" + license("Artistic-2.0") + version("1.85", sha256="9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8") version("1.82", sha256="5895c519c9986a5e5af88e3b8884bbdc70e709ee829dc6abb9f53155c347c7e5") diff --git a/var/spack/repos/builtin/packages/perl-number-compare/package.py b/var/spack/repos/builtin/packages/perl-number-compare/package.py index 8b257a7f40d9e3..7b13cc5295b0d6 100644 --- a/var/spack/repos/builtin/packages/perl-number-compare/package.py +++ b/var/spack/repos/builtin/packages/perl-number-compare/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlNumberCompare(PerlPackage): homepage = "https://metacpan.org/pod/Number::Compare" url = "https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.03", sha256="83293737e803b43112830443fb5208ec5208a2e6ea512ed54ef8e4dd2b880827") depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-number-format/package.py b/var/spack/repos/builtin/packages/perl-number-format/package.py index b2f69196e44da4..bca99159c7fac2 100644 --- a/var/spack/repos/builtin/packages/perl-number-format/package.py +++ b/var/spack/repos/builtin/packages/perl-number-format/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-object-insideout/package.py b/var/spack/repos/builtin/packages/perl-object-insideout/package.py index 8e60495ecbafce..a351446389b1fb 100644 --- a/var/spack/repos/builtin/packages/perl-object-insideout/package.py +++ b/var/spack/repos/builtin/packages/perl-object-insideout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlObjectInsideout(PerlPackage): homepage = "https://metacpan.org/pod/Object::InsideOut" url = "https://cpan.metacpan.org/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz" + license("GPL-2.0-or-later OR Artistic-2.0") + version("4.05", sha256="9dfd6ca2822724347e0eb6759d00709425814703ad5c66bdb6214579868bcac4") depends_on("perl-module-build", type="build") diff --git a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py index 374a51cc5ba313..c1d0db9b619d99 100644 --- a/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-package-deprecationmanager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlPackageDeprecationmanager(PerlPackage): homepage = "https://metacpan.org/pod/Package::DeprecationManager" url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz" + license("Artistic-2.0") + version("0.18", sha256="b68d3f0ced55b7615fddbb6029b89f92a34fe0dd8c6fd6bceffc157d56834fe8") version("0.17", sha256="1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b") diff --git a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py index 0a90ff1439a940..8f22bba758082b 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash-xs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlPackageStashXs(PerlPackage): homepage = "https://metacpan.org/pod/Package::Stash::XS" url = "http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.28", sha256="23d8c5c25768ef1dc0ce53b975796762df0d6e244445d06e48d794886c32d486") diff --git a/var/spack/repos/builtin/packages/perl-package-stash/package.py b/var/spack/repos/builtin/packages/perl-package-stash/package.py index 8dfb6947876185..8678271714eec1 100644 --- a/var/spack/repos/builtin/packages/perl-package-stash/package.py +++ b/var/spack/repos/builtin/packages/perl-package-stash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlPackageStash(PerlPackage): homepage = "https://metacpan.org/pod/Package::Stash" url = "http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.37", sha256="06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c") depends_on("perl-test-requires", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-padwalker/package.py b/var/spack/repos/builtin/packages/perl-padwalker/package.py index 47000fa6257921..9e60e684fce2c1 100644 --- a/var/spack/repos/builtin/packages/perl-padwalker/package.py +++ b/var/spack/repos/builtin/packages/perl-padwalker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlPadwalker(PerlPackage): homepage = "https://metacpan.org/pod/PadWalker" url = "http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/PadWalker-2.2.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.5", sha256="07b26abb841146af32072a8d68cb90176ffb176fd9268e6f2f7d106f817a0cd0") version("2.2", sha256="fc1df2084522e29e892da393f3719d2c1be0da022fdd89cff4b814167aecfea3") diff --git a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py index 0d47df08ce7d16..aa2c3ee74e8ce1 100644 --- a/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py +++ b/var/spack/repos/builtin/packages/perl-parallel-forkmanager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlParallelForkmanager(PerlPackage): homepage = "https://metacpan.org/pod/Parallel::ForkManager" url = "http://search.cpan.org/CPAN/authors/id/Y/YA/YANICK/Parallel-ForkManager-1.19.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.02", sha256="c1b2970a8bb666c3de7caac4a8f4dbcc043ab819bbc337692ec7bf27adae4404") version("1.19", sha256="f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472") diff --git a/var/spack/repos/builtin/packages/perl-params-util/package.py b/var/spack/repos/builtin/packages/perl-params-util/package.py index f6d8bb69b72070..55281d4775fd20 100644 --- a/var/spack/repos/builtin/packages/perl-params-util/package.py +++ b/var/spack/repos/builtin/packages/perl-params-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlParamsUtil(PerlPackage): homepage = "https://metacpan.org/pod/Params::Util" url = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.07", sha256="30f1ec3f2cf9ff66ae96f973333f23c5f558915bb6266881eac7423f52d7c76c") diff --git a/var/spack/repos/builtin/packages/perl-params-validate/package.py b/var/spack/repos/builtin/packages/perl-params-validate/package.py index 7ca79d34202740..fef35b42e99c74 100644 --- a/var/spack/repos/builtin/packages/perl-params-validate/package.py +++ b/var/spack/repos/builtin/packages/perl-params-validate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlParamsValidate(PerlPackage): homepage = "https://metacpan.org/pod/Params::Validate" url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz" + license("Artistic-2.0") + version("1.31", sha256="1bf2518ef2c4869f91590e219f545c8ef12ed53cf313e0eb5704adf7f1b2961e") version("1.29", sha256="49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733") diff --git a/var/spack/repos/builtin/packages/perl-params-validationcompiler/package.py b/var/spack/repos/builtin/packages/perl-params-validationcompiler/package.py new file mode 100644 index 00000000000000..00f562ef2424a0 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-params-validationcompiler/package.py @@ -0,0 +1,35 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlParamsValidationcompiler(PerlPackage): + """Params::ValidationCompiler - Build an optimized subroutine parameter validator once, + use it forever""" + + homepage = "https://metacpan.org/pod/Params::ValidationCompiler" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.31.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.31", sha256="7b6497173f1b6adb29f5d51d8cf9ec36d2f1219412b4b2410e9d77a901e84a6d") + + depends_on("perl-eval-closure", type=("build", "run", "test")) + depends_on("perl-exception-class", type=("build", "run", "test")) + depends_on("perl-specio@0.14:", type=("build", "test")) + depends_on("perl-test-without-module", type=("build", "test")) + depends_on("perl-test2-plugin-nowarnings", type=("build", "test")) + depends_on("perl-test2-suite", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Params::ValidationCompiler; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py index eb52949203229e..491b8f42f6c038 100644 --- a/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py +++ b/var/spack/repos/builtin/packages/perl-parse-recdescent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-parse-yapp/package.py b/var/spack/repos/builtin/packages/perl-parse-yapp/package.py new file mode 100644 index 00000000000000..a63b8ff58a1a39 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-parse-yapp/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlParseYapp(PerlPackage): + """Parse::Yapp - Perl extension for generating and using LALR parsers.""" + + homepage = "https://metacpan.org/pod/Parse::Yapp" + url = "https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz" + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.21", sha256="3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5") + + depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-parselex/package.py b/var/spack/repos/builtin/packages/perl-parselex/package.py new file mode 100644 index 00000000000000..ebb7864a4df03c --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-parselex/package.py @@ -0,0 +1,15 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlParselex(PerlPackage): + """Parse::Lex - Generator of lexical analyzers - moving pointer inside text.""" + + homepage = "https://metacpan.org/pod/Parse::Lex" + url = "https://cpan.metacpan.org/authors/id/P/PS/PSCUST/ParseLex-2.21.tar.gz" + + version("2.21", sha256="f55f0a7d1e2a6b806a47840c81c16d505c5c76765cb156e5f5fd703159a4492d") diff --git a/var/spack/repos/builtin/packages/perl-path-tiny/package.py b/var/spack/repos/builtin/packages/perl-path-tiny/package.py index f2d42ad7a47795..ec90934c53b064 100644 --- a/var/spack/repos/builtin/packages/perl-path-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-path-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,5 +16,7 @@ class PerlPathTiny(PerlPackage): homepage = "https://metacpan.org/pod/Path::Tiny" url = "https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.108.tar.gz" + license("Apache-2.0") + version("0.144", sha256="f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d") version("0.108", sha256="3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5") diff --git a/var/spack/repos/builtin/packages/perl-pathtools/package.py b/var/spack/repos/builtin/packages/perl-pathtools/package.py index d7661e8895bcbf..c736312cc030e4 100644 --- a/var/spack/repos/builtin/packages/perl-pathtools/package.py +++ b/var/spack/repos/builtin/packages/perl-pathtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlPathtools(PerlPackage): homepage = "https://metacpan.org/pod/File::Spec" url = "https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.75", sha256="a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2") diff --git a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py index da35d5a871e5aa..7a326857fb8c87 100644 --- a/var/spack/repos/builtin/packages/perl-pdf-api2/package.py +++ b/var/spack/repos/builtin/packages/perl-pdf-api2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlPdfApi2(PerlPackage): homepage = "https://metacpan.org/pod/PDF::API2" url = "http://search.cpan.org/CPAN/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz" + license("LGPL-2.1-or-later") + version("2.044", sha256="b2d15579e42723d8d7f9b72de86d0d35cde34f1eb7713456ba2ad35fb3cbea7e") version("2.033", sha256="9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0") diff --git a/var/spack/repos/builtin/packages/perl-pegex/package.py b/var/spack/repos/builtin/packages/perl-pegex/package.py index 350ce22eef4a97..68726fbf27ce08 100644 --- a/var/spack/repos/builtin/packages/perl-pegex/package.py +++ b/var/spack/repos/builtin/packages/perl-pegex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlPegex(PerlPackage): homepage = "https://metacpan.org/pod/Pegex" url = "http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Pegex-0.64.tar.gz" + license("Artistic-1.0") + version("0.75", sha256="4dc8d335de80b25247cdb3f946f0d10d9ba0b3c34b0ed7d00316fd068fd05edc") version("0.64", sha256="27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd") diff --git a/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py b/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py index e48ab5b9717b56..8575264447290a 100644 --- a/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py +++ b/var/spack/repos/builtin/packages/perl-perl-unsafe-signals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-perl-version/package.py b/var/spack/repos/builtin/packages/perl-perl-version/package.py index 2d7b3a57dd7978..f81f02b8462c03 100644 --- a/var/spack/repos/builtin/packages/perl-perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-perl-version/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py index 0d9e2f21cb59ad..003b2f2d0259c7 100644 --- a/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py +++ b/var/spack/repos/builtin/packages/perl-perl4-corelibs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py index 0fdd31531ed76f..e502db20e11805 100644 --- a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py index fb6756342f4e7f..c6b3d99238f696 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-gzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py index a4479e523781de..a9e632d59040e6 100644 --- a/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py +++ b/var/spack/repos/builtin/packages/perl-perlio-utf8-strict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlPerlioUtf8Strict(PerlPackage): homepage = "https://metacpan.org/pod/PerlIO::utf8_strict" url = "http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.002.tar.gz" + license("Artistic-1.0") + version("0.010", sha256="bcd2848b72df290b5e984fae8b1a6ca96f6d072003cf222389a8c9e8e1c570cd") version("0.009", sha256="ba82cf144820655d6d4836d12dde65f8895a3d905aeb4aa0b421249f43284c14") version("0.002", sha256="6e3163f8a2f1d276c975f21789d7a07843586d69e3e6156ffb67ef6680ceb75f") diff --git a/var/spack/repos/builtin/packages/perl-proc-daemon/package.py b/var/spack/repos/builtin/packages/perl-proc-daemon/package.py new file mode 100644 index 00000000000000..85561e02719c9b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-proc-daemon/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlProcDaemon(PerlPackage): + """Run Perl program(s) as a daemon process""" + + homepage = "https://metacpan.org/pod/Proc::Daemon" + url = "https://cpan.metacpan.org/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz" + + maintainers("EbiArnie") + + version("0.23", sha256="34c0b85b7948b431cbabc97cee580835e515ccf43badbd8339eb109474089b69") + + depends_on("perl-proc-processtable", type=("build", "link")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Proc::Daemon; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-proc-processtable/package.py b/var/spack/repos/builtin/packages/perl-proc-processtable/package.py new file mode 100644 index 00000000000000..3c432fd9cbe0ff --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-proc-processtable/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlProcProcesstable(PerlPackage): + """Perl extension to access the unix process table""" + + homepage = "https://metacpan.org/pod/Proc::ProcessTable" + url = "https://cpan.metacpan.org/authors/id/J/JW/JWB/Proc-ProcessTable-0.636.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.636", sha256="944224ffb00fc1ef35069633770a0afda8623b5c7532d1e4ab48a9df394890fd") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Proc::ProcessTable; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-readonly/package.py b/var/spack/repos/builtin/packages/perl-readonly/package.py index 9258dba455c7ca..f0788edd65d452 100644 --- a/var/spack/repos/builtin/packages/perl-readonly/package.py +++ b/var/spack/repos/builtin/packages/perl-readonly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-ref-util/package.py b/var/spack/repos/builtin/packages/perl-ref-util/package.py new file mode 100644 index 00000000000000..7a9a9aae5cb0b4 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-ref-util/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlRefUtil(PerlPackage): + """Utility functions for checking references""" + + homepage = "https://metacpan.org/pod/Ref::Util" + url = "https://cpan.metacpan.org/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz" + + maintainers("EbiArnie") + + license("MIT") + + version("0.204", sha256="415fa73dbacf44f3d5d79c14888cc994562720ab468e6f71f91cd1f769f105e1") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Ref::Util; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-regexp-common/package.py b/var/spack/repos/builtin/packages/perl-regexp-common/package.py index 8cbca3161fa517..b1eabfacf2dd67 100644 --- a/var/spack/repos/builtin/packages/perl-regexp-common/package.py +++ b/var/spack/repos/builtin/packages/perl-regexp-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlRegexpCommon(PerlPackage): homepage = "https://metacpan.org/pod/Regexp::Common" url = "https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz" + license("MIT OR Artistic-2.0") + version( "2017060201", sha256="ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b" ) diff --git a/var/spack/repos/builtin/packages/perl-role-tiny/package.py b/var/spack/repos/builtin/packages/perl-role-tiny/package.py index 80374004fda2e7..ddbe30272c66f5 100644 --- a/var/spack/repos/builtin/packages/perl-role-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-role-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlRoleTiny(PerlPackage): homepage = "https://metacpan.org/pod/Role::Tiny" url = "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-2.002004.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.002004", sha256="d7bdee9e138a4f83aa52d0a981625644bda87ff16642dfa845dcb44d9a242b45") depends_on("perl-exporter-tiny", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-rose-datetime/package.py b/var/spack/repos/builtin/packages/perl-rose-datetime/package.py new file mode 100644 index 00000000000000..06aed7f5cde4d6 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-rose-datetime/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlRoseDatetime(PerlPackage): + """DateTime helper functions and objects.""" + + homepage = "https://metacpan.org/pod/Rose::DateTime" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSIRACUSA/Rose-DateTime-0.540.tar.gz" + + maintainers("EbiArnie") + + version("0.540", sha256="1e42802d0944e9669599b7d0dea1e77a0d17a42123f8ca555180db4e7218e34a") + + depends_on("perl-datetime", type=("build", "run", "test")) + depends_on("perl-rose-object@0.82:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Rose::DateTime; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-rose-db-object/package.py b/var/spack/repos/builtin/packages/perl-rose-db-object/package.py new file mode 100644 index 00000000000000..ece7d1107b556f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-rose-db-object/package.py @@ -0,0 +1,38 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlRoseDbObject(PerlPackage): + """Extensible, high performance object-relational mapper (ORM).""" + + homepage = "https://metacpan.org/pod/Rose::DB::Object" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSIRACUSA/Rose-DB-Object-0.820.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.820", sha256="a0077609250966636f1411bcce2493cf1e1166ba935071738eb4b713104da83b") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-bit-vector", type=("build", "run", "test")) + depends_on("perl-clone@0.29:", type=("build", "run", "test")) + depends_on("perl-datetime", type=("build", "run", "test")) + depends_on("perl-dbi@1.40:", type=("build", "run", "test")) + depends_on("perl-list-moreutils", type=("build", "run", "test")) + depends_on("perl-rose-datetime", type=("build", "run", "test")) + depends_on("perl-rose-db@0.782:", type=("build", "run", "test")) + depends_on("perl-rose-object@0.854:", type=("build", "run", "test")) + depends_on("perl-time-clock@1.00:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Rose::DB::Object; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-rose-db/package.py b/var/spack/repos/builtin/packages/perl-rose-db/package.py new file mode 100644 index 00000000000000..249c0836e76e9b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-rose-db/package.py @@ -0,0 +1,40 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlRoseDb(PerlPackage): + """A DBI wrapper and abstraction layer.""" + + homepage = "https://metacpan.org/pod/Rose::DB" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSIRACUSA/Rose-DB-0.785.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("0.785", sha256="7849307d748d9672b42ef3cd78f83d44dec034cdc94f4d4251d2761e27c67a3c") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-bit-vector", type=("build", "run", "test")) + depends_on("perl-clone-pp", type=("build", "run", "test")) + depends_on("perl-datetime", type=("build", "run", "test")) + depends_on("perl-datetime-format-mysql", type=("build", "run", "test")) + depends_on("perl-datetime-format-oracle", type=("build", "run", "test")) + depends_on("perl-datetime-format-pg@0.11:", type=("build", "run", "test")) + depends_on("perl-dbi", type=("build", "run", "test")) + depends_on("perl-rose-datetime", type=("build", "run", "test")) + depends_on("perl-rose-object@0.854:", type=("build", "run", "test")) + depends_on("perl-sql-reservedwords", type=("build", "run", "test")) + depends_on("perl-time-clock", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Rose::DB; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-rose-object/package.py b/var/spack/repos/builtin/packages/perl-rose-object/package.py new file mode 100644 index 00000000000000..66502b14c81a39 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-rose-object/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlRoseObject(PerlPackage): + """A simple object base class.""" + + homepage = "https://metacpan.org/pod/Rose::Object" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSIRACUSA/Rose-Object-0.860.tar.gz" + + maintainers("EbiArnie") + + version("0.860", sha256="f3ff294097b1a4b02a4bae6dc3544ded744a08972e831c1d2741083403197f47") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Rose::Object; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-safe-isa/package.py b/var/spack/repos/builtin/packages/perl-safe-isa/package.py new file mode 100644 index 00000000000000..10856f7ccfe8ba --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-safe-isa/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSafeIsa(PerlPackage): + """Call isa, can, does and DOES safely on things that may not be objects""" + + homepage = "https://metacpan.org/pod/Safe::Isa" + url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.000010", sha256="87f4148aa0ff1d5e652723322eab7dafa3801c967d6f91ac9147a3c467b8a66a") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Safe::Isa; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py b/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py index 2ab4ed0a5134a7..30b306926dc5b8 100644 --- a/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py +++ b/var/spack/repos/builtin/packages/perl-scalar-list-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py index 6e4bd0f87e1434..0fad3bec83c5ab 100644 --- a/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py +++ b/var/spack/repos/builtin/packages/perl-scalar-util-numeric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-scope-guard/package.py b/var/spack/repos/builtin/packages/perl-scope-guard/package.py new file mode 100644 index 00000000000000..fe0d5685a8c735 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-scope-guard/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlScopeGuard(PerlPackage): + """Lexically-scoped resource management""" + + homepage = "https://metacpan.org/pod/Scope::Guard" + url = "https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz" + + maintainers("EbiArnie") + + version("0.21", sha256="8c9b1bea5c56448e2c3fadc65d05be9e4690a3823a80f39d2f10fdd8f777d278") + + depends_on("perl@5.6.1:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Scope::Guard; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-search-elasticsearch/package.py b/var/spack/repos/builtin/packages/perl-search-elasticsearch/package.py new file mode 100644 index 00000000000000..9deffd5670fc28 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-search-elasticsearch/package.py @@ -0,0 +1,48 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSearchElasticsearch(PerlPackage): + """The official client for Elasticsearch""" + + homepage = "https://metacpan.org/pod/Search::Elasticsearch" + url = "https://cpan.metacpan.org/authors/id/E/EZ/EZIMUEL/Search-Elasticsearch-8.00.tar.gz" + + maintainers("EbiArnie") + + license("Apache-2.0") + + version("8.00", sha256="4b95357072b7432e02cc9ef897881976650e03030c15ec752789299284ce30ab") + + depends_on("perl-any-uri-escape", type=("build", "run", "test")) + depends_on("perl-devel-globaldestruction", type=("build", "run", "test")) + depends_on("perl-http-message", type=("build", "run", "test")) + depends_on("perl-io-socket-ssl", type=("build", "test")) + depends_on("perl-json-maybexs@1.002002:", type=("build", "run", "test")) + depends_on("perl-libwww-perl", type=("build", "run", "test")) + depends_on("perl-log-any@1.02:", type=("build", "run", "test")) + depends_on("perl-log-any-adapter-callback@0.09:", type=("build", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + depends_on("perl-moo@2.001000:", type=("build", "run", "test")) + depends_on("perl-namespace-clean", type=("build", "run", "test")) + depends_on("perl-net-ip", type=("build", "run", "test")) + depends_on("perl-package-stash@0.34:", type=("build", "run", "test")) + depends_on("perl-sub-exporter", type=("build", "run", "test")) + depends_on("perl-test-deep", type=("build", "test")) + depends_on("perl-test-exception", type=("build", "test")) + depends_on("perl-test-pod", type=("build", "test")) + depends_on("perl-test-sharedfork", type=("build", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + depends_on("perl-uri", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Search::Elasticsearch; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py b/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py index f2debc0aadcfbd..aa788637b0a93e 100644 --- a/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/perl-set-intervaltree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-set-intspan/package.py b/var/spack/repos/builtin/packages/perl-set-intspan/package.py index b04fbec9c7a126..6782f2c098699d 100644 --- a/var/spack/repos/builtin/packages/perl-set-intspan/package.py +++ b/var/spack/repos/builtin/packages/perl-set-intspan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlSetIntspan(PerlPackage): homepage = "https://metacpan.org/pod/Set::IntSpan" url = "https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.19", sha256="11b7549b13ec5d87cc695dd4c777cd02983dd5fe9866012877fb530f48b3dfd0") diff --git a/var/spack/repos/builtin/packages/perl-set-object/package.py b/var/spack/repos/builtin/packages/perl-set-object/package.py new file mode 100644 index 00000000000000..2235a15489e1a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-set-object/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSetObject(PerlPackage): + """Unordered collections (sets) of Perl Objects""" + + homepage = "https://metacpan.org/pod/Set::Object" + url = "https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Set-Object-1.42.tar.gz" + + maintainers("EbiArnie") + + version("1.42", sha256="d18c5a8a233eabbd0206cf3da5b00fcdd7b37febf12a93dcc3d1c026e6fdec45") + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Set::Object; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-set-scalar/package.py b/var/spack/repos/builtin/packages/perl-set-scalar/package.py index 1babc4bedf6b46..9b14b73850f523 100644 --- a/var/spack/repos/builtin/packages/perl-set-scalar/package.py +++ b/var/spack/repos/builtin/packages/perl-set-scalar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-soap-lite/package.py b/var/spack/repos/builtin/packages/perl-soap-lite/package.py index a2ed3fa7481067..fe7b4d5dd0092b 100644 --- a/var/spack/repos/builtin/packages/perl-soap-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-soap-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlSoapLite(PerlPackage): homepage = "https://metacpan.org/pod/SOAP::Lite" url = "http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/SOAP-Lite-1.22.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.22", sha256="92f492f8722cb3002cd1dce11238cee5599bb5bd451a062966df45223d33693a") depends_on("perl-io-sessiondata", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-specio/package.py b/var/spack/repos/builtin/packages/perl-specio/package.py new file mode 100644 index 00000000000000..3a50251d9973fd --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-specio/package.py @@ -0,0 +1,38 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSpecio(PerlPackage): + """Type constraints and coercions for Perl .""" + + homepage = "https://metacpan.org/dist/Specio" + url = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Specio-0.48.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.48", sha256="0c85793580f1274ef08173079131d101f77b22accea7afa8255202f0811682b2") + + depends_on("perl@5.8.0:", type=("build", "link", "run", "test")) + depends_on("perl-devel-stacktrace", type=("build", "run", "test")) + depends_on("perl-eval-closure", type=("build", "run", "test")) + depends_on("perl-module-runtime", type=("build", "run", "test")) + depends_on("perl-mro-compat", type=("build", "run", "test")) + depends_on("perl-role-tiny@1.003003:", type=("build", "run", "test")) + depends_on("perl-sub-quote", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "run", "test")) + depends_on("perl-test-needs", type=("build", "test")) + depends_on("perl-try-tiny", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Specio; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-spiffy/package.py b/var/spack/repos/builtin/packages/perl-spiffy/package.py new file mode 100644 index 00000000000000..c483769dfd54ba --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-spiffy/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSpiffy(PerlPackage): + """Spiffy Perl Interface Framework For You""" + + homepage = "https://metacpan.org/pod/Spiffy" + url = "https://cpan.metacpan.org/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.46", sha256="8f58620a8420255c49b6c43c5ff5802bd25e4f09240c51e5bf2b022833d41da3") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Spiffy; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-sql-reservedwords/package.py b/var/spack/repos/builtin/packages/perl-sql-reservedwords/package.py new file mode 100644 index 00000000000000..19dc0b884b65ac --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-sql-reservedwords/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlSqlReservedwords(PerlPackage): + """Reserved SQL words by ANSI/ISO""" + + homepage = "https://metacpan.org/pod/SQL::ReservedWords" + url = "https://cpan.metacpan.org/authors/id/C/CH/CHANSEN/SQL-ReservedWords-0.8.tar.gz" + + maintainers("EbiArnie") + + version("0.8", sha256="09f4aecf1bd8efdd3f9b39f16a240c4e9ceb61eb295b88145c96eb9d58504a2a") + + depends_on("perl-sub-exporter", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use SQL::ReservedWords; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-star-fusion/package.py b/var/spack/repos/builtin/packages/perl-star-fusion/package.py index 067e5a558ba10c..e76d0df0413c76 100644 --- a/var/spack/repos/builtin/packages/perl-star-fusion/package.py +++ b/var/spack/repos/builtin/packages/perl-star-fusion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PerlStarFusion(Package): homepage = "https://github.com/STAR-Fusion/STAR-Fusion" git = "https://github.com/STAR-Fusion/STAR-Fusion.git" + license("BSD-3-Clause") + version("master", commit="8c5a541ab701debebb68e5c4ee9d6a03e03d65ca") extends("perl") diff --git a/var/spack/repos/builtin/packages/perl-statistics-basic/package.py b/var/spack/repos/builtin/packages/perl-statistics-basic/package.py index b9fb6b365abfd4..17702f05a8742a 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-basic/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-basic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py index 4357b6091d27bd..c59581667bd1d9 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-descriptive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class PerlStatisticsDescriptive(PerlPackage): "http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0612.tar.gz" ) + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.0800", sha256="b04edeea26bfed435aa6029956798c281f7f52d4545f3f45b2ad44954e96f939") version("3.0612", sha256="772413148e5e00efb32f277c4254aa78b9112490a896208dcd0025813afdbf7a") diff --git a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py index 037d13efc13aa6..b54822c96a32d5 100644 --- a/var/spack/repos/builtin/packages/perl-statistics-pca/package.py +++ b/var/spack/repos/builtin/packages/perl-statistics-pca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py index e1ee64dde952cf..2c066592229c07 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter-progressive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class PerlSubExporterProgressive(PerlPackage): "http://search.cpan.org/CPAN/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz" ) + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.001013", sha256="d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056") diff --git a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py index 8f84608a62ea21..b559099b9980aa 100644 --- a/var/spack/repos/builtin/packages/perl-sub-exporter/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-exporter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlSubExporter(PerlPackage): homepage = "https://metacpan.org/pod/Sub::Exporter" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.989", sha256="334896e0af5e0643fc3799cbbcf01f933d4ca6324cd644c0b6660e71cdbd01c9") version("0.987", sha256="543cb2e803ab913d44272c7da6a70bb62c19e467f3b12aaac4c9523259b083d6") diff --git a/var/spack/repos/builtin/packages/perl-sub-identify/package.py b/var/spack/repos/builtin/packages/perl-sub-identify/package.py index cdb753076c043a..0d8f4d2adc5268 100644 --- a/var/spack/repos/builtin/packages/perl-sub-identify/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-identify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlSubIdentify(PerlPackage): homepage = "https://metacpan.org/pod/Sub::Identify" url = "http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.14", sha256="068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f") diff --git a/var/spack/repos/builtin/packages/perl-sub-install/package.py b/var/spack/repos/builtin/packages/perl-sub-install/package.py index ee8f8a449eca10..ddb4e88b21c89e 100644 --- a/var/spack/repos/builtin/packages/perl-sub-install/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlSubInstall(PerlPackage): homepage = "https://metacpan.org/pod/Sub::Install" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.929", sha256="80b1e281d8cd3b2b31dac711f5c8a1657a87cd80bbe69af3924bcbeb4e5db077") version("0.928", sha256="61e567a7679588887b7b86d427bc476ea6d77fffe7e0d17d640f89007d98ef0f") diff --git a/var/spack/repos/builtin/packages/perl-sub-name/package.py b/var/spack/repos/builtin/packages/perl-sub-name/package.py index d0d4b8f22a8f78..db7125162b0750 100644 --- a/var/spack/repos/builtin/packages/perl-sub-name/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-name/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlSubName(PerlPackage): homepage = "https://metacpan.org/pod/Sub::Name" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.26", sha256="2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105") version("0.21", sha256="bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117") diff --git a/var/spack/repos/builtin/packages/perl-sub-quote/package.py b/var/spack/repos/builtin/packages/perl-sub-quote/package.py index e584d91facf092..a1286028af667b 100644 --- a/var/spack/repos/builtin/packages/perl-sub-quote/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-quote/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlSubQuote(PerlPackage): homepage = "https://metacpan.org/pod/Sub::Quote" url = "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.006008", sha256="94bebd500af55762e83ea2f2bc594d87af828072370c7110c60c238a800d15b2") version("2.006006", sha256="6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d") diff --git a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py index b18720ef5f0fff..f79e4d07d959fb 100644 --- a/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-uplevel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-svg/package.py b/var/spack/repos/builtin/packages/perl-svg/package.py index 9d750399fe5ef1..11ee949e23eb19 100644 --- a/var/spack/repos/builtin/packages/perl-svg/package.py +++ b/var/spack/repos/builtin/packages/perl-svg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-swissknife/package.py b/var/spack/repos/builtin/packages/perl-swissknife/package.py index d6aec211f8d5c0..33ff9f59510715 100644 --- a/var/spack/repos/builtin/packages/perl-swissknife/package.py +++ b/var/spack/repos/builtin/packages/perl-swissknife/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlSwissknife(PerlPackage): homepage = "http://swissknife.sourceforge.net" url = "https://downloads.sourceforge.net/project/swissknife/swissknife/1.75/Swissknife_1.75.tar.gz" + license("GPL-2.0-only") + version("1.75", sha256="3d9af0d71366c90698488f6dae54118e6a4dba087b3c33d1bfa8245663cba53a") depends_on("perl-module-build", type="build") diff --git a/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py b/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py index 4cdcf1b6a83811..06f12e73bfa3e7 100644 --- a/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py +++ b/var/spack/repos/builtin/packages/perl-sys-sigaction/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-task-weaken/package.py b/var/spack/repos/builtin/packages/perl-task-weaken/package.py index 0b6e35d836e990..a3a7a682293083 100644 --- a/var/spack/repos/builtin/packages/perl-task-weaken/package.py +++ b/var/spack/repos/builtin/packages/perl-task-weaken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlTaskWeaken(PerlPackage): homepage = "https://metacpan.org/pod/Task::Weaken" url = "http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.04", sha256="67e271c55900fe7889584f911daa946e177bb60c8af44c32f4584b87766af3c4") diff --git a/var/spack/repos/builtin/packages/perl-template-toolkit/package.py b/var/spack/repos/builtin/packages/perl-template-toolkit/package.py new file mode 100644 index 00000000000000..c7a0583e2f751a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-template-toolkit/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTemplateToolkit(PerlPackage): + """Template - Front-end module to the Template Toolkit.""" + + homepage = "https://metacpan.org/pod/Template" + url = "https://cpan.metacpan.org/authors/id/A/AB/ABW/Template-Toolkit-3.101.tar.gz" + + maintainers("ChristopherChristofi") + + version("3.101", sha256="d2a32dd6c21e4b37c6a93df8087ca9e880cfae613a3e5efaea307b0bdcaedb58") + + depends_on("perl-extutils-makemaker", type=("build")) + depends_on("perl-appconfig@1.56:") + depends_on("perl-pathtools@0.8:") + depends_on("perl-file-temp@0.12:") + depends_on("perl-test-leaktrace", type=("build", "test")) + + def configure_args(self): + args = ["TT_QUIET=y", "TT_ACCEPT=y"] + return args diff --git a/var/spack/repos/builtin/packages/perl-term-ansicolor-markup/package.py b/var/spack/repos/builtin/packages/perl-term-ansicolor-markup/package.py new file mode 100644 index 00000000000000..f7b2819bde025d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-term-ansicolor-markup/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTermAnsicolorMarkup(PerlPackage): + """Colorize tagged strings for screen output""" + + homepage = "https://metacpan.org/pod/Term::ANSIColor::Markup" + url = "https://cpan.metacpan.org/authors/id/K/KE/KENTARO/Term-ANSIColor-Markup-0.06.tar.gz" + + maintainers("EbiArnie") + + license("MIT") + + version("0.06", sha256="66f1c2f2f403fdaae0902b36202d57356b6b5b5a57b3cca8d0248ffbe78c753f") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-class-accessor-lvalue", type=("build", "run", "test")) + depends_on("perl-html-parser", type=("build", "run", "test")) + depends_on("perl-test-exception", type=("build", "link")) + depends_on("perl-module-install", type=("build", "link")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Term::ANSIColor::Markup; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py index fcfdb6408915d7..80ec3394a8c96e 100644 --- a/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py +++ b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PerlTermReadlineGnu(PerlPackage): homepage = "https://metacpan.org/pod/Term::ReadLine::Gnu" url = "https://cpan.metacpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.36", sha256="9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925") depends_on("readline") diff --git a/var/spack/repos/builtin/packages/perl-term-table/package.py b/var/spack/repos/builtin/packages/perl-term-table/package.py new file mode 100644 index 00000000000000..2186dd0a1bd39f --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-term-table/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTermTable(PerlPackage): + """Format a header and rows into a table""" + + homepage = "https://metacpan.org/pod/Term::Table" + url = "https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-0.018.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.018", sha256="9159b9131ee6b3f3956b74f45422985553574babbfaeba60be5c17bc114ac011") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Term::Table; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-termreadkey/package.py b/var/spack/repos/builtin/packages/perl-termreadkey/package.py index 7ce7cc11b9765d..1bac2a205b246e 100644 --- a/var/spack/repos/builtin/packages/perl-termreadkey/package.py +++ b/var/spack/repos/builtin/packages/perl-termreadkey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-test-base/package.py b/var/spack/repos/builtin/packages/perl-test-base/package.py new file mode 100644 index 00000000000000..19ba1be2d08ec8 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-base/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestBase(PerlPackage): + """A Data Driven Testing Framework""" + + homepage = "https://metacpan.org/pod/Test::Base" + url = "https://cpan.metacpan.org/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.89", sha256="2794a1aaaeb1d3a287dd2c7286258663796562f7db9ccc6b424bc4f1de8ad014") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-algorithm-diff@1.15:", type=("build", "test")) + depends_on("perl-spiffy@0.40:", type=("run", "test")) + depends_on("perl-text-diff@0.35:", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test::Base; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py index 1e6e9e535bc0c1..35808410d73547 100644 --- a/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py +++ b/var/spack/repos/builtin/packages/perl-test-cleannamespaces/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlTestCleannamespaces(PerlPackage): homepage = "https://metacpan.org/pod/Test::CleanNamespaces" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.22.tar.gz" + license("Artistic-1.0") + version("0.22", sha256="862a221994dd413b2f350450f22c96f57cac78784b1aca1a8fc763fc5449aaca") depends_on("perl-sub-exporter", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-test-deep/package.py b/var/spack/repos/builtin/packages/perl-test-deep/package.py index 6e09b9d464da0f..23090ee82e6937 100644 --- a/var/spack/repos/builtin/packages/perl-test-deep/package.py +++ b/var/spack/repos/builtin/packages/perl-test-deep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-test-differences/package.py b/var/spack/repos/builtin/packages/perl-test-differences/package.py index b5cd7955386eff..177aece8373c5e 100644 --- a/var/spack/repos/builtin/packages/perl-test-differences/package.py +++ b/var/spack/repos/builtin/packages/perl-test-differences/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestDifferences(PerlPackage): homepage = "https://metacpan.org/pod/Test::Differences" url = "http://search.cpan.org/CPAN/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.69", sha256="18f644fdd4a1fef93ef3f7f67df8e95b593d811899f34bcbbaba4d717222f58f") version("0.64", sha256="9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276") diff --git a/var/spack/repos/builtin/packages/perl-test-exception/package.py b/var/spack/repos/builtin/packages/perl-test-exception/package.py index 1ddc42df5275a7..05d5c667f34bde 100644 --- a/var/spack/repos/builtin/packages/perl-test-exception/package.py +++ b/var/spack/repos/builtin/packages/perl-test-exception/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestException(PerlPackage): homepage = "https://metacpan.org/pod/Test::Exception" url = "http://search.cpan.org/CPAN/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.43", sha256="156b13f07764f766d8b45a43728f2439af81a3512625438deab783b7883eb533") depends_on("perl-sub-uplevel", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-test-fatal/package.py b/var/spack/repos/builtin/packages/perl-test-fatal/package.py index a12553e880aede..b1a0d0c60188ca 100644 --- a/var/spack/repos/builtin/packages/perl-test-fatal/package.py +++ b/var/spack/repos/builtin/packages/perl-test-fatal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestFatal(PerlPackage): homepage = "https://metacpan.org/pod/Test::Fatal" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.017", sha256="37dfffdafb84b762efe96b02fb2aa41f37026c73e6b83590db76229697f3c4a6") version("0.014", sha256="bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0") diff --git a/var/spack/repos/builtin/packages/perl-test-file-sharedir/package.py b/var/spack/repos/builtin/packages/perl-test-file-sharedir/package.py new file mode 100644 index 00000000000000..ad44003ff93cac --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-file-sharedir/package.py @@ -0,0 +1,35 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestFileSharedir(PerlPackage): + """Create a Fake ShareDir for your modules for testing.""" + + homepage = "https://metacpan.org/pod/Test::File::ShareDir" + url = "https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.001002", sha256="b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + depends_on("perl-class-tiny", type=("build", "run", "test")) + depends_on("perl-file-copy-recursive", type=("build", "run", "test")) + depends_on("perl-file-sharedir@1.00:", type=("build", "run", "test")) + depends_on("perl-path-tiny@0.018:", type=("build", "run", "test")) + depends_on("perl-scope-guard", type=("build", "run", "test")) + depends_on("perl-test-fatal", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test::File::ShareDir; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test-file/package.py b/var/spack/repos/builtin/packages/perl-test-file/package.py new file mode 100644 index 00000000000000..516d2826b8977e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-file/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestFile(PerlPackage): + """Test file attributes""" + + homepage = "https://metacpan.org/pod/Test::File" + url = "https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-File-1.993.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("1.993", sha256="ef2ffe1aaec7b42d874ad411ec647547b9b9bc2f5fb93e49e3399488456afc7a") + + depends_on("perl@5.8.0:", type=("build", "link", "run", "test")) diff --git a/var/spack/repos/builtin/packages/perl-test-leaktrace/package.py b/var/spack/repos/builtin/packages/perl-test-leaktrace/package.py index b703ddfc591933..47928445c89908 100644 --- a/var/spack/repos/builtin/packages/perl-test-leaktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-test-leaktrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class PerlTestLeaktrace(PerlPackage): homepage = "https://metacpan.org/pod/Test::LeakTrace" url = "https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.17", sha256="777d64d2938f5ea586300eef97ef03eacb43d4c1853c9c3b1091eb3311467970") diff --git a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py index 83aa5bb86b7f2d..7897eac28bbd93 100644 --- a/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py +++ b/var/spack/repos/builtin/packages/perl-test-memory-cycle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestMemoryCycle(PerlPackage): homepage = "https://metacpan.org/pod/Test::Memory::Cycle" url = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.06", sha256="9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202") depends_on("perl-padwalker", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-test-more/package.py b/var/spack/repos/builtin/packages/perl-test-more/package.py index c4d97049e5fa28..b9b134147f5c64 100644 --- a/var/spack/repos/builtin/packages/perl-test-more/package.py +++ b/var/spack/repos/builtin/packages/perl-test-more/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlTestMore(PerlPackage): homepage = "https://github.com/Test-More/test-more" url = "https://github.com/Test-More/test-more/archive/v1.302183.tar.gz" + license("Artistic-1.0") + version("1.302183", sha256="1356ec24c5ab3f7ad8327091ddc6ace164a27767be10325776bf9743360ab4f7") version("1.302182", sha256="60727db9435cb244f6dcf4ca598c8ef39ac3035a0c36fd5c9c5b89be4f138366") version("1.302181", sha256="acb3c990d646928e7571c140510d7424716d3281c4064b1787294e72b39f61ce") diff --git a/var/spack/repos/builtin/packages/perl-test-most/package.py b/var/spack/repos/builtin/packages/perl-test-most/package.py index e19f6e313b5904..56c95b854eede6 100644 --- a/var/spack/repos/builtin/packages/perl-test-most/package.py +++ b/var/spack/repos/builtin/packages/perl-test-most/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestMost(PerlPackage): homepage = "https://metacpan.org/pod/Test::Most" url = "http://search.cpan.org/CPAN/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.38", sha256="089eb894f7bace4c37c6334e0e290eb20338ee10223af0c82cbe7281c78382df") version("0.35", sha256="9897a6f4d751598d2ed1047e01c1554b01d0f8c96c45e7e845229782bf6f657f") diff --git a/var/spack/repos/builtin/packages/perl-test-needs/package.py b/var/spack/repos/builtin/packages/perl-test-needs/package.py index f28ec119452db4..c93a58184e5667 100644 --- a/var/spack/repos/builtin/packages/perl-test-needs/package.py +++ b/var/spack/repos/builtin/packages/perl-test-needs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTestNeeds(PerlPackage): homepage = "https://metacpan.org/pod/Test::Needs" url = "https://search.cpan.org/CPAN/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.002010", sha256="923ffdc78fcba96609753e4bae26b0ba0186893de4a63cd5236e012c7c90e208") version("0.002005", sha256="5a4f33983586edacdbe00a3b429a9834190140190dab28d0f873c394eb7df399") diff --git a/var/spack/repos/builtin/packages/perl-test-nowarnings/package.py b/var/spack/repos/builtin/packages/perl-test-nowarnings/package.py new file mode 100644 index 00000000000000..5b437e115cda7e --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-nowarnings/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestNowarnings(PerlPackage): + """Make sure you didn't emit any warnings while testing""" + + homepage = "https://metacpan.org/pod/Test::NoWarnings" + url = "https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-NoWarnings-1.06.tar.gz" + + maintainers("EbiArnie") + + license("LGPL-2.1-only") + + version("1.06", sha256="c2dc51143b7eb63231210e27df20d2c8393772e0a333547ec8b7a205ed62f737") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) diff --git a/var/spack/repos/builtin/packages/perl-test-output/package.py b/var/spack/repos/builtin/packages/perl-test-output/package.py index b60153965f1a77..437a6d79659324 100644 --- a/var/spack/repos/builtin/packages/perl-test-output/package.py +++ b/var/spack/repos/builtin/packages/perl-test-output/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTestOutput(PerlPackage): homepage = "https://github.com/briandfoy/test-output" url = "https://github.com/briandfoy/test-output/archive/release-1.033.tar.gz" + license("Artistic-2.0") + version("1.033", sha256="35f0a4ef2449fc78886b4c99e1c1d23f432c2fae98538a4489439eb17223bfc2") version("1.032", sha256="8b87e16b40199c9d62f07a821e1ff17a2701e42adffb281a649ed631823d5771") version("1.031", sha256="1bb5847f26bee90e71b0af2a9d3a5eec4e17a63aacaf18ce5215f350961c5bf7") diff --git a/var/spack/repos/builtin/packages/perl-test-pod/package.py b/var/spack/repos/builtin/packages/perl-test-pod/package.py new file mode 100644 index 00000000000000..67147d7354d3e9 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-pod/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestPod(PerlPackage): + """Check for POD errors in files""" + + homepage = "https://metacpan.org/pod/Test::Pod" + url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.52", sha256="60a8dbcc60168bf1daa5cc2350236df9343e9878f4ab9830970a5dde6fe8e5fc") + + depends_on("perl@5.8.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test::Pod; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test-requires/package.py b/var/spack/repos/builtin/packages/perl-test-requires/package.py index 53fbda59e20476..84219cb9f754a6 100644 --- a/var/spack/repos/builtin/packages/perl-test-requires/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requires/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTestRequires(PerlPackage): homepage = "https://metacpan.org/pod/Test::Requires" url = "http://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.11", sha256="4b88de549597eecddf7c3c38a4d0204a16f59ad804577b671896ac04e24e040f") version("0.10", sha256="2768a391d50ab94b95cefe540b9232d7046c13ee86d01859e04c044903222eb5") diff --git a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py index 71dfb9417ca84e..05e3bde66a22c3 100644 --- a/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py +++ b/var/spack/repos/builtin/packages/perl-test-requiresinternet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlTestRequiresinternet(PerlPackage): homepage = "https://metacpan.org/pod/Test::RequiresInternet" url = "http://search.cpan.org/CPAN/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.05", sha256="bba7b32a1cc0d58ce2ec20b200a7347c69631641e8cae8ff4567ad24ef1e833e") diff --git a/var/spack/repos/builtin/packages/perl-test-sharedfork/package.py b/var/spack/repos/builtin/packages/perl-test-sharedfork/package.py new file mode 100644 index 00000000000000..9a13af50f9ab84 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-sharedfork/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestSharedfork(PerlPackage): + """Fork test""" + + homepage = "https://metacpan.org/pod/Test::SharedFork" + url = "https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.35", sha256="2932e865610e80758f764c586757ef8e11db1284d958e25e4b7a85098414c59f") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-test-requires", type=("test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test::SharedFork; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test-warn/package.py b/var/spack/repos/builtin/packages/perl-test-warn/package.py index f110da7e4dd13b..f87bfdc2b57f2a 100644 --- a/var/spack/repos/builtin/packages/perl-test-warn/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlTestWarn(PerlPackage): homepage = "https://metacpan.org/pod/Test::Warn" url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/Test-Warn-0.30.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.30", sha256="8197555b94189d919349a03f7058f83861f145af9bee59f505bfe47562144e41") diff --git a/var/spack/repos/builtin/packages/perl-test-warnings/package.py b/var/spack/repos/builtin/packages/perl-test-warnings/package.py index ab7b5b1c3fcf1e..27a4f34048f96b 100644 --- a/var/spack/repos/builtin/packages/perl-test-warnings/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warnings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTestWarnings(PerlPackage): homepage = "http://deps.cpantesters.org/?module=Test%3A%3ACleanNamespaces;perl=latest" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Test-Warnings-0.026.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.031", sha256="1e542909fef305e45563e9878ea1c3b0c7cef1b28bb7ae07eba2e1efabec477b") version("0.026", sha256="ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08") diff --git a/var/spack/repos/builtin/packages/perl-test-weaken/package.py b/var/spack/repos/builtin/packages/perl-test-weaken/package.py new file mode 100644 index 00000000000000..4d94495d3588ad --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-weaken/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestWeaken(PerlPackage): + """Test that freed memory objects were, indeed, freed""" + + homepage = "https://metacpan.org/pod/Test::Weaken" + url = "https://cpan.metacpan.org/authors/id/K/KR/KRYDE/Test-Weaken-3.022000.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("3.022000", sha256="2631a87121310262e0e96107a6fa0ed69487b7701520773bee5fa9accc295f5b") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) diff --git a/var/spack/repos/builtin/packages/perl-test-without-module/package.py b/var/spack/repos/builtin/packages/perl-test-without-module/package.py new file mode 100644 index 00000000000000..6ac7f601885454 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-without-module/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestWithoutModule(PerlPackage): + """Test fallback behaviour in absence of modules""" + + homepage = "https://metacpan.org/pod/Test::Without::Module" + url = "https://cpan.metacpan.org/authors/id/C/CO/CORION/Test-Without-Module-0.21.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.21", sha256="3cdeafadac4853ebeafe689346d555da5dfa3cfa9d4c84e3e5e7bfee50beec46") diff --git a/var/spack/repos/builtin/packages/perl-test-yaml/package.py b/var/spack/repos/builtin/packages/perl-test-yaml/package.py new file mode 100644 index 00000000000000..64ad596d1b808b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test-yaml/package.py @@ -0,0 +1,29 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTestYaml(PerlPackage): + """Testing Module for YAML Implementations""" + + homepage = "https://metacpan.org/pod/Test::YAML" + url = "https://cpan.metacpan.org/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + + version("1.07", sha256="1f300d034f46298cb92960912cc04bac33fb27f05b8852d8f051e110b9cd995f") + + depends_on("perl-test-base@0.89:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test::YAML; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test2-plugin-nowarnings/package.py b/var/spack/repos/builtin/packages/perl-test2-plugin-nowarnings/package.py new file mode 100644 index 00000000000000..1aa869f1d69349 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test2-plugin-nowarnings/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTest2PluginNowarnings(PerlPackage): + """Fail if tests warn""" + + homepage = "https://metacpan.org/pod/Test2::Plugin::NoWarnings" + url = "https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.09.tar.gz" + + maintainers("EbiArnie") + + license("Artistic-2.0") + + version("0.09", sha256="be3dd800042eef362bf17d2056cf9e934dee91ccce98e4f178b8fb5772f2fb74") + + depends_on("perl-ipc-run3", type=("build", "test")) + depends_on("perl-test2-suite", type=("build", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test2::Plugin::NoWarnings; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-test2-suite/package.py b/var/spack/repos/builtin/packages/perl-test2-suite/package.py new file mode 100644 index 00000000000000..738a7fe0a1377b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-test2-suite/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTest2Suite(PerlPackage): + """Distribution with a rich set of tools built upon the Test2 framework.""" + + homepage = "https://metacpan.org/pod/Test2::Suite" + url = "https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-0.000159.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("0.000159", sha256="cb7453380d2a70682c450cb6ec44fecd02d1c48674a76d9799903b7f4444cc0e") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-term-table@0.013:", type=("build", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Test2::Suite; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-text-csv/package.py b/var/spack/repos/builtin/packages/perl-text-csv/package.py index a2d387b0b71030..8cc0254d8c10f0 100644 --- a/var/spack/repos/builtin/packages/perl-text-csv/package.py +++ b/var/spack/repos/builtin/packages/perl-text-csv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTextCsv(PerlPackage): homepage = "https://metacpan.org/pod/Text::CSV" url = "http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/Text-CSV-1.95.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.02", sha256="84120de3e10489ea8fbbb96411a340c32cafbe5cdff7dd9576b207081baa9d24") version("1.95", sha256="7e0a11d9c1129a55b68a26aa4b37c894279df255aa63ec8341d514ab848dbf61") diff --git a/var/spack/repos/builtin/packages/perl-text-diff/package.py b/var/spack/repos/builtin/packages/perl-text-diff/package.py index b0f2b5c8a7e6c7..d7e383bcd2882e 100644 --- a/var/spack/repos/builtin/packages/perl-text-diff/package.py +++ b/var/spack/repos/builtin/packages/perl-text-diff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTextDiff(PerlPackage): homepage = "https://metacpan.org/pod/Text::Diff" url = "http://search.cpan.org/CPAN/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.45", sha256="e8baa07b1b3f53e00af3636898bbf73aec9a0ff38f94536ede1dbe96ef086f04") depends_on("perl-algorithm-diff", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-text-format/package.py b/var/spack/repos/builtin/packages/perl-text-format/package.py index fb3273a1dbdb75..a75c973954f937 100644 --- a/var/spack/repos/builtin/packages/perl-text-format/package.py +++ b/var/spack/repos/builtin/packages/perl-text-format/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlTextFormat(PerlPackage): homepage = "https://metacpan.org/pod/Text::Format" url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz" + license("Artistic-1.0") + version("0.62", sha256="7d429057319e123c590ba0765334f0ade4a5eb9ea8db7c0ec4d3902de5f90404") version("0.61", sha256="bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b") diff --git a/var/spack/repos/builtin/packages/perl-text-glob/package.py b/var/spack/repos/builtin/packages/perl-text-glob/package.py index cd7acc86c5599f..d2d5c986f3dcf2 100644 --- a/var/spack/repos/builtin/packages/perl-text-glob/package.py +++ b/var/spack/repos/builtin/packages/perl-text-glob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PerlTextGlob(PerlPackage): homepage = "https://metacpan.org/pod/Text::Glob" url = "https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.11", sha256="069ccd49d3f0a2dedb115f4bdc9fbac07a83592840953d1fcdfc39eb9d305287") depends_on("perl-extutils-makemaker", type="build") diff --git a/var/spack/repos/builtin/packages/perl-text-nsp/package.py b/var/spack/repos/builtin/packages/perl-text-nsp/package.py index 487646b6ab72ce..cfbb431ac779d0 100644 --- a/var/spack/repos/builtin/packages/perl-text-nsp/package.py +++ b/var/spack/repos/builtin/packages/perl-text-nsp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class PerlTextNsp(PerlPackage): maintainers("snehring") + license("GPL-2.0-only") + version("1.31", sha256="a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595") version("1.29", sha256="26610cc17ddc3a9a239ffd100bbcf42618e2577ab4b051de4c262f2082afd27e") diff --git a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py index ce4a39a689040b..b51b3c17f8cf10 100644 --- a/var/spack/repos/builtin/packages/perl-text-simpletable/package.py +++ b/var/spack/repos/builtin/packages/perl-text-simpletable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTextSimpletable(PerlPackage): homepage = "https://metacpan.org/pod/Text::SimpleTable" url = "http://search.cpan.org/CPAN/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.04.tar.gz" + license("Artistic-2.0") + version("2.07", sha256="256d3f38764e96333158b14ab18257b92f3155c60d658cafb80389f72f4619ed") version("2.04", sha256="8d82f3140b1453b962956b7855ba288d435e7f656c3c40ced4e3e8e359ab5293") diff --git a/var/spack/repos/builtin/packages/perl-text-soundex/package.py b/var/spack/repos/builtin/packages/perl-text-soundex/package.py index 27f887d3b181ec..45481d074fc59a 100644 --- a/var/spack/repos/builtin/packages/perl-text-soundex/package.py +++ b/var/spack/repos/builtin/packages/perl-text-soundex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class PerlTextSoundex(PerlPackage): homepage = "https://metacpan.org/pod/Text::Soundex" url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.05", sha256="f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed") diff --git a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py index 902687218ab2ce..878023b105aacb 100644 --- a/var/spack/repos/builtin/packages/perl-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/perl-text-unidecode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlTextUnidecode(PerlPackage): homepage = "https://metacpan.org/pod/Text::Unidecode" url = "http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.30", sha256="6c24f14ddc1d20e26161c207b73ca184eed2ef57f08b5fb2ee196e6e2e88b1c6") diff --git a/var/spack/repos/builtin/packages/perl-thread-queue/package.py b/var/spack/repos/builtin/packages/perl-thread-queue/package.py index 1e2ac39978d6ff..3b4d7141f808f5 100644 --- a/var/spack/repos/builtin/packages/perl-thread-queue/package.py +++ b/var/spack/repos/builtin/packages/perl-thread-queue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-threads/package.py b/var/spack/repos/builtin/packages/perl-threads/package.py index 2d9fa0ee5deb08..42a36926a1adda 100644 --- a/var/spack/repos/builtin/packages/perl-threads/package.py +++ b/var/spack/repos/builtin/packages/perl-threads/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-throwable/package.py b/var/spack/repos/builtin/packages/perl-throwable/package.py new file mode 100644 index 00000000000000..c82b28461d572d --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-throwable/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlThrowable(PerlPackage): + """A role for classes that can be thrown""" + + homepage = "https://metacpan.org/pod/Throwable" + url = "https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Throwable-1.001.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("1.001", sha256="d0cb5e9d7d06d70f2cc56eecf857a83a45eaca43850dcdda91d3feb4ddde4c51") + + depends_on("perl-devel-stacktrace@1.32:", type=("run", "test")) + depends_on("perl-module-runtime@0.002:", type=("run")) + depends_on("perl-moo@1.000001:", type=("run")) + depends_on("perl-sub-quote", type=("run")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Throwable; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-time-clock/package.py b/var/spack/repos/builtin/packages/perl-time-clock/package.py new file mode 100644 index 00000000000000..37886caabb1c4a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-time-clock/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTimeClock(PerlPackage): + """Twenty-four hour clock object with nanosecond precision.""" + + homepage = "https://metacpan.org/pod/Time::Clock" + url = "https://cpan.metacpan.org/authors/id/J/JS/JSIRACUSA/Time-Clock-1.03.tar.gz" + + maintainers("EbiArnie") + + version("1.03", sha256="35e8a8bbfcdb35d86dd4852a9cd32cfb455a9b42e22669186e920c8aca017aef") + + depends_on("perl@5.6.0:", type=("build", "link", "run", "test")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Time::Clock; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-time-hires/package.py b/var/spack/repos/builtin/packages/perl-time-hires/package.py index 6344e4a093be09..dcb94250991270 100644 --- a/var/spack/repos/builtin/packages/perl-time-hires/package.py +++ b/var/spack/repos/builtin/packages/perl-time-hires/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTimeHires(PerlPackage): homepage = "https://metacpan.org/pod/Time::HiRes" url = "http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-1.9746.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.9758", sha256="5bfa145bc11e70a8e337543b1084a293743a690691b568493455dedf58f34b1e") version("1.9746", sha256="89408c81bb827bc908c98eec50071e6e1158f38fa462865ecc3dc03aebf5f596") diff --git a/var/spack/repos/builtin/packages/perl-time-piece/package.py b/var/spack/repos/builtin/packages/perl-time-piece/package.py index 41bf5d3a859e97..61dcd25bea0521 100644 --- a/var/spack/repos/builtin/packages/perl-time-piece/package.py +++ b/var/spack/repos/builtin/packages/perl-time-piece/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-timedate/package.py b/var/spack/repos/builtin/packages/perl-timedate/package.py index 7463bd5e76e763..8049cfe27cad14 100644 --- a/var/spack/repos/builtin/packages/perl-timedate/package.py +++ b/var/spack/repos/builtin/packages/perl-timedate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class PerlTimedate(PerlPackage): homepage = "https://metacpan.org/release/TimeDate" url = "https://cpan.metacpan.org/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.30", sha256="75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86") diff --git a/var/spack/repos/builtin/packages/perl-tk/package.py b/var/spack/repos/builtin/packages/perl-tk/package.py index 874c32a0908dfd..f8410200cd521b 100644 --- a/var/spack/repos/builtin/packages/perl-tk/package.py +++ b/var/spack/repos/builtin/packages/perl-tk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-try-tiny/package.py b/var/spack/repos/builtin/packages/perl-try-tiny/package.py index 2f491fd281dd0a..783717f8cba601 100644 --- a/var/spack/repos/builtin/packages/perl-try-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-try-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlTryTiny(PerlPackage): homepage = "https://metacpan.org/pod/Try::Tiny" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Try-Tiny-0.28.tar.gz" + license("MIT") + version("0.31", sha256="3300d31d8a4075b26d8f46ce864a1d913e0e8467ceeba6655d5d2b2e206c11be") version("0.28", sha256="f1d166be8aa19942c4504c9111dade7aacb981bc5b3a2a5c5f6019646db8c146") diff --git a/var/spack/repos/builtin/packages/perl-type-tiny/package.py b/var/spack/repos/builtin/packages/perl-type-tiny/package.py new file mode 100644 index 00000000000000..5618667ae1f03b --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-type-tiny/package.py @@ -0,0 +1,30 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PerlTypeTiny(PerlPackage): + """Tiny, yet Moo(se)-compatible type constraint""" + + homepage = "https://metacpan.org/pod/Type::Tiny" + url = "https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Type-Tiny-2.004000.tar.gz" + + maintainers("EbiArnie") + + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + + version("2.004000", sha256="697e7f775edfc85f4cf07792d04fd19b09c25285f98f5938e8efc4f74507a128") + + depends_on("perl@5.8.1:", type=("build", "link", "run", "test")) + depends_on("perl-exporter-tiny@1.006000:", type=("run")) + + def test_use(self): + """Test 'use module'""" + options = ["-we", 'use strict; use Type::Tiny; print("OK\n")'] + + perl = self.spec["perl"].command + out = perl(*options, output=str.split, error=str.split) + assert "OK" in out diff --git a/var/spack/repos/builtin/packages/perl-uri-encode/package.py b/var/spack/repos/builtin/packages/perl-uri-encode/package.py index ad0b6d8e1a913d..7b159ed14917c0 100644 --- a/var/spack/repos/builtin/packages/perl-uri-encode/package.py +++ b/var/spack/repos/builtin/packages/perl-uri-encode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlUriEncode(PerlPackage): homepage = "https://github.com/mithun/perl-uri-encode" url = "https://cpan.metacpan.org/authors/id/M/MI/MITHUN/URI-Encode-v1.1.1.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.1.1", sha256="4bb9ce4e7016c0138cf9c2375508595286efa1c8dc15b45baa4c47281c08243b") depends_on("perl-module-build", type="build") diff --git a/var/spack/repos/builtin/packages/perl-uri/package.py b/var/spack/repos/builtin/packages/perl-uri/package.py index 866a08e6d38fcf..5ef474fd7fea49 100644 --- a/var/spack/repos/builtin/packages/perl-uri/package.py +++ b/var/spack/repos/builtin/packages/perl-uri/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlUri(PerlPackage): homepage = "https://metacpan.org/pod/URI" url = "http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/URI-1.72.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("5.08", sha256="7e2c6fe3b1d5947da334fa558a96e748aaa619213b85bcdce5b5347d4d26c46e") version("1.72", sha256="35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32") version("1.71", sha256="9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115") diff --git a/var/spack/repos/builtin/packages/perl-want/package.py b/var/spack/repos/builtin/packages/perl-want/package.py index 92a73ede5dd1bb..86d2e54f324f91 100644 --- a/var/spack/repos/builtin/packages/perl-want/package.py +++ b/var/spack/repos/builtin/packages/perl-want/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class PerlWant(PerlPackage): homepage = "https://metacpan.org/pod/Want" url = "http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-0.29.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.29", sha256="b4e4740b8d4cb783591273c636bd68304892e28d89e88abf9273b1de17f552f7") diff --git a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py index 0944ad9aaeedc3..badebf87a9a906 100644 --- a/var/spack/repos/builtin/packages/perl-www-robotrules/package.py +++ b/var/spack/repos/builtin/packages/perl-www-robotrules/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py b/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py index 87507f012aee62..418cd41c30164b 100644 --- a/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-dom-xpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-dom/package.py b/var/spack/repos/builtin/packages/perl-xml-dom/package.py index 43b975a8519cc7..8e7465bc9f0fec 100644 --- a/var/spack/repos/builtin/packages/perl-xml-dom/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-dom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlXmlDom(PerlPackage): homepage = "https://metacpan.org/pod/XML::DOM" url = "https://cpan.metacpan.org/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.46", sha256="8ba24b0b459b01d6c5e5b0408829c7d5dfe47ff79b3548c813759048099b175e") depends_on("perl-xml-parser", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py b/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py index 7f7c86f07e5269..9377fd120cd65e 100644 --- a/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-filter-buffertext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py index a600864c70f5e3..be125ef471fbf9 100644 --- a/var/spack/repos/builtin/packages/perl-xml-libxml/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-libxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PerlXmlLibxml(PerlPackage): homepage = "https://metacpan.org/pod/XML::LibXML" url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.0201", sha256="e008700732502b3f1f0890696ec6e2dc70abf526cd710efd9ab7675cae199bc2") depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py index f04b6787ab36ad..d096df2d5af09f 100644 --- a/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PerlXmlLibxslt(PerlPackage): homepage = "https://metacpan.org/pod/XML::LibXSLT" url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.96", sha256="2a5e374edaa2e9f9d26b432265bfea9b4bb7a94c9fbfef9047b298fce844d473") depends_on("libxslt") diff --git a/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py b/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py index 698d38ae971c27..f4ba2ddbf176e4 100644 --- a/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-namespacesupport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class PerlXmlNamespacesupport(PerlPackage): homepage = "https://metacpan.org/pod/XML::NamespaceSupport" url = "https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12_9.tar.gz" + license("GPL-1.0-or-later") + version("1.12_9", sha256="2e84a057f0a8c845a612d212742cb94fca4fc8a433150b5721bd448f77d1e4a9") diff --git a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py index 5c14b0b49639ae..fe297450658e34 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-parser/package.py b/var/spack/repos/builtin/packages/perl-xml-parser/package.py index aaa6dbb1bd58ff..86e2027e0fc25e 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlXmlParser(PerlPackage): homepage = "https://metacpan.org/pod/XML::Parser" url = "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.46", sha256="d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d") version("2.44", sha256="1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216") diff --git a/var/spack/repos/builtin/packages/perl-xml-quote/package.py b/var/spack/repos/builtin/packages/perl-xml-quote/package.py index 4e68f5b8516ec5..d8410fecc70b94 100644 --- a/var/spack/repos/builtin/packages/perl-xml-quote/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-quote/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-regexp/package.py b/var/spack/repos/builtin/packages/perl-xml-regexp/package.py index e6b7ccd5bcd20e..9dfc80ae9644da 100644 --- a/var/spack/repos/builtin/packages/perl-xml-regexp/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-regexp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class PerlXmlRegexp(PerlPackage): homepage = "https://metacpan.org/pod/XML::RegExp" url = "https://cpan.metacpan.org/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.04", sha256="df1990096036085c8e2d45904fe180f82bfed40f1a7e05243f334ea10090fc54") diff --git a/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py b/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py index aa0d245983c084..fcafe8eecb7abd 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class so you don't have to, for example, implement the characters() homepage = "https://metacpan.org/pod/XML::SAX::Base" url = "https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.09", sha256="66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0") diff --git a/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py b/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py index c77da83c534498..7ef05906c9a5f4 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax-writer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PerlXmlSaxWriter(PerlPackage): homepage = "https://metacpan.org/pod/XML::SAX::Writer" url = "https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz" + license("Artistic-1.0") + version("0.57", sha256="3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0") depends_on("perl-xml-filter-buffertext", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-xml-sax/package.py b/var/spack/repos/builtin/packages/perl-xml-sax/package.py index 6f0e0e9f87b43a..164c88fb964be9 100644 --- a/var/spack/repos/builtin/packages/perl-xml-sax/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-sax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PerlXmlSax(PerlPackage): homepage = "https://metacpan.org/pod/XML::SAX" url = "https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.02", sha256="4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a") depends_on("perl-xml-namespacesupport", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-xml-simple/package.py b/var/spack/repos/builtin/packages/perl-xml-simple/package.py index 890306b5adf949..e0885208f0f7c9 100644 --- a/var/spack/repos/builtin/packages/perl-xml-simple/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-simple/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PerlXmlSimple(PerlPackage): homepage = "https://metacpan.org/pod/XML::Simple" url = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.24.tar.gz" + license("Artistic-1.0-Perl") + version("2.25", sha256="531fddaebea2416743eb5c4fdfab028f502123d9a220405a4100e68fc480dbf8") version("2.24", sha256="9a14819fd17c75fbb90adcec0446ceab356cab0ccaff870f2e1659205dc2424f") diff --git a/var/spack/repos/builtin/packages/perl-xml-twig/package.py b/var/spack/repos/builtin/packages/perl-xml-twig/package.py index 4791674573b96a..53351ad0d3d9b6 100644 --- a/var/spack/repos/builtin/packages/perl-xml-twig/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-twig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class PerlXmlTwig(PerlPackage): homepage = "https://metacpan.org/pod/XML::Twig" url = "https://cpan.metacpan.org/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.52", sha256="fef75826c24f2b877d0a0d2645212fc4fb9756ed4d2711614ac15c497e8680ad") depends_on("perl-xml-parser", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-xml-writer/package.py b/var/spack/repos/builtin/packages/perl-xml-writer/package.py index 3ccfeb7d1b9668..71aa65a66f99c9 100644 --- a/var/spack/repos/builtin/packages/perl-xml-writer/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-writer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py b/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py index 6def2e6630b054..9f606a490e988b 100644 --- a/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-xpathengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py index 5d871803db633c..9b2276c4cc3d5c 100644 --- a/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml-libyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlYamlLibyaml(PerlPackage): homepage = "https://metacpan.org/pod/YAML::LibYAML" url = "http://search.cpan.org/CPAN/authors/id/T/TI/TINITA/YAML-LibYAML-0.67.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.84", sha256="225bcb39be2d5e3d02df7888d5f99fd8712f048ba539b09232ca1481e70bfd05") version("0.67", sha256="e65a22abc912a46a10abddf3b88d806757f44f164ab3167c8f0ff6aa30648187") diff --git a/var/spack/repos/builtin/packages/perl-yaml-tiny/package.py b/var/spack/repos/builtin/packages/perl-yaml-tiny/package.py index a0df3d8b1b6f42..6bfe11d8063d39 100644 --- a/var/spack/repos/builtin/packages/perl-yaml-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class PerlYamlTiny(PerlPackage): homepage = "https://metacpan.org/pod/YAML::Tiny" url = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.74", sha256="7b38ca9f5d3ce24230a6b8bdc1f47f5b2db348e7f7f9666c26f5955636e33d6c") version("1.73", sha256="bc315fa12e8f1e3ee5e2f430d90b708a5dc7e47c867dba8dce3a6b8fbe257744") diff --git a/var/spack/repos/builtin/packages/perl-yaml/package.py b/var/spack/repos/builtin/packages/perl-yaml/package.py index c3fe3923554116..f82847ed7750ca 100644 --- a/var/spack/repos/builtin/packages/perl-yaml/package.py +++ b/var/spack/repos/builtin/packages/perl-yaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class PerlYaml(PerlPackage): homepage = "https://metacpan.org/pod/YAML" url = "https://cpan.metacpan.org/authors/id/T/TI/TINITA/YAML-1.27.tar.gz" + license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.30", sha256="5030a6d6cbffaf12583050bf552aa800d4646ca9678c187add649227f57479cd") version("1.27", sha256="c992a1e820de0721b62b22521de92cdbf49edc306ab804c485b4b1ec25f682f9") diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 299ae19436eae9..aea185f73df340 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,7 +30,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package homepage = "https://www.perl.org" # URL must remain http:// so Spack can bootstrap curl url = "http://www.cpan.org/src/5.0/perl-5.34.0.tar.gz" - tags = ["windows"] + tags = ["windows", "build-tools"] maintainers("LydDeb") @@ -39,6 +39,8 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # see https://www.cpan.org/src/README.html for # explanation of version numbering scheme + license("Artistic-1.0-Perl OR GPL-1.0-or-later") + # Maintenance releases (even numbers, preferred) version( "5.38.0", @@ -119,6 +121,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package extendable = True if sys.platform != "win32": + depends_on("gmake", type="build") depends_on("gdbm@:1.23") # Bind us below gdbm-1.20 due to API change: https://github.com/Perl/perl5/issues/18915 depends_on("gdbm@:1.19", when="@:5.35") diff --git a/var/spack/repos/builtin/packages/pestpp/package.py b/var/spack/repos/builtin/packages/pestpp/package.py index e1a43e6a0629f9..9f9f4786c7b86c 100644 --- a/var/spack/repos/builtin/packages/pestpp/package.py +++ b/var/spack/repos/builtin/packages/pestpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/petaca/package.py b/var/spack/repos/builtin/packages/petaca/package.py index d137f5791e8434..4c78092b1a8a1e 100644 --- a/var/spack/repos/builtin/packages/petaca/package.py +++ b/var/spack/repos/builtin/packages/petaca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Petaca(CMakePackage): maintainers("pbrady", "zjibben") + license("MIT") + version("develop", branch="master") version("22.03", sha256="e6559e928c7cca6017ef0582c204eee775f6bb3f927f1c224c515c2ad574cc32") version("21.03", commit="f17df95193ca1a3879687a59a91a123be25e3efa") diff --git a/var/spack/repos/builtin/packages/petsc/Handle-hipsparse-api-changes-for-rocm-6.0.patch b/var/spack/repos/builtin/packages/petsc/Handle-hipsparse-api-changes-for-rocm-6.0.patch new file mode 100644 index 00000000000000..674c083f517202 --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/Handle-hipsparse-api-changes-for-rocm-6.0.patch @@ -0,0 +1,70 @@ +From 3c9aaca12a1ae6000ff3cfd0564f7b2ab45396d2 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Thu, 18 Jan 2024 07:38:25 +0000 +Subject: [PATCH] Handle the hipsparse api changes for rocm 6.0 + +--- + .../impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp b/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp +index e6f878f..4bf52cd 100644 +--- a/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp ++++ b/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp +@@ -1258,7 +1258,7 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Vec x) + /* Solve L*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L)); // hipsparseSpSV_solve() secretely uses the external buffer used in hipsparseSpSV_analysis()! + #else +@@ -1267,7 +1267,7 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Vec x) + #endif + /* Solve U*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* U X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_U)); + #else +@@ -1316,7 +1316,7 @@ static PetscErrorCode MatSolveTranspose_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Ve + /* Solve Ut*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* Ut Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Ut)); + #else +@@ -1325,7 +1325,7 @@ static PetscErrorCode MatSolveTranspose_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Ve + #endif + /* Solve Lt*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt)); + #else +@@ -1559,7 +1559,7 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ICC0(Mat fact, Vec b, Vec x) + /* Solve L*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L)); + #else +@@ -1568,7 +1568,7 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ICC0(Mat fact, Vec b, Vec x) + #endif + /* Solve Lt*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); +- #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061) // i.e., 5.6.0 ++ #if (PETSC_PKG_HIP_VERSION_EQ(5, 6, 31061)||PETSC_PKG_HIP_VERSION_EQ(6, 0, 32830)) // i.e., 5.6.0 + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt)); + #else +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/petsc/hip-5.6.0-for-3.18.diff b/var/spack/repos/builtin/packages/petsc/hip-5.6.0-for-3.18.diff new file mode 100644 index 00000000000000..c587e3451df77b --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/hip-5.6.0-for-3.18.diff @@ -0,0 +1,85 @@ +commit 9b52b1224039b470f0f450943ce503af1df37b00 +Author: Satish Balay +Date: Fri Oct 6 15:19:34 2023 -0500 + + hip-6.0 fix + +diff --git a/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp b/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp +index e6be2076975..0c388c90ca3 100644 +--- a/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp ++++ b/src/mat/impls/aij/seq/seqhipsparse/aijhipsparse.hip.cpp +@@ -1259,14 +1259,22 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Vec x) + /* Solve L*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ ++ fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L)); // hipsparseSpSV_solve() secretely uses the external buffer used in hipsparseSpSV_analysis()! ++ #else + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L, fs->spsvBuffer_L)); // hipsparseSpSV_solve() secretely uses the external buffer used in hipsparseSpSV_analysis()! +- ++ #endif + /* Solve U*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* U X = Y */ ++ fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_U)); ++ #else ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* U X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_U, fs->spsvBuffer_U)); +- ++ #endif + PetscCall(VecHIPRestoreArrayRead(b, &barray)); + PetscCall(VecHIPRestoreArrayWrite(x, &xarray)); + +@@ -1309,14 +1317,22 @@ static PetscErrorCode MatSolveTranspose_SeqAIJHIPSPARSE_ILU0(Mat fact, Vec b, Ve + /* Solve Ut*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* Ut Y = X */ ++ fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Ut)); ++ #else + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_U, /* Ut Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Ut, fs->spsvBuffer_Ut)); +- ++ #endif + /* Solve Lt*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ ++ fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt)); ++ #else + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt, fs->spsvBuffer_Lt)); +- ++ #endif + PetscCall(VecHIPRestoreArrayRead(b, &barray)); + PetscCall(VecHIPRestoreArrayWrite(x, &xarray)); + PetscCall(PetscLogGpuTimeEnd()); +@@ -1544,14 +1560,22 @@ static PetscErrorCode MatSolve_SeqAIJHIPSPARSE_ICC0(Mat fact, Vec b, Vec x) + /* Solve L*y = b */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, (void *)barray)); + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_Y, fs->Y)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ ++ fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L)); ++ #else + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_NON_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* L Y = X */ + fs->dnVecDescr_X, fs->dnVecDescr_Y, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_L, fs->spsvBuffer_L)); +- ++ #endif + /* Solve Lt*x = y */ + PetscCallHIPSPARSE(hipsparseDnVecSetValues(fs->dnVecDescr_X, xarray)); ++ #if PETSC_PKG_HIP_VERSION_EQ(5, 6, 0) ++ PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ ++ fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt)); ++ #else + PetscCallHIPSPARSE(hipsparseSpSV_solve(fs->handle, HIPSPARSE_OPERATION_TRANSPOSE, &PETSC_HIPSPARSE_ONE, fs->spMatDescr_L, /* Lt X = Y */ + fs->dnVecDescr_Y, fs->dnVecDescr_X, hipsparse_scalartype, HIPSPARSE_SPSV_ALG_DEFAULT, fs->spsvDescr_Lt, fs->spsvBuffer_Lt)); +- ++ #endif + PetscCall(VecHIPRestoreArrayRead(b, &barray)); + PetscCall(VecHIPRestoreArrayWrite(x, &xarray)); + diff --git a/var/spack/repos/builtin/packages/petsc/hip-5.7-plus-for-3.18.diff b/var/spack/repos/builtin/packages/petsc/hip-5.7-plus-for-3.18.diff new file mode 100644 index 00000000000000..22555963b33b30 --- /dev/null +++ b/var/spack/repos/builtin/packages/petsc/hip-5.7-plus-for-3.18.diff @@ -0,0 +1,20 @@ +diff --git a/src/vec/is/sf/impls/basic/hip/sfhip.hip.cpp b/src/vec/is/sf/impls/basic/hip/sfhip.hip.cpp +index a39933c6893..6ef9f513bd6 100644 +--- a/src/vec/is/sf/impls/basic/hip/sfhip.hip.cpp ++++ b/src/vec/is/sf/impls/basic/hip/sfhip.hip.cpp +@@ -471,6 +471,7 @@ __device__ static float atomicMax(float *address, float val) + #endif + + /* As of ROCm 3.10 llint atomicMin/Max(llint*, llint) is not supported */ ++#if PETSC_PKG_HIP_VERSION_LT(5, 7, 0) + __device__ static llint atomicMin(llint *address, llint val) + { + ullint *address_as_ull = (ullint *)(address); +@@ -492,6 +493,7 @@ __device__ static llint atomicMax(llint *address, llint val) + } while (assumed != old); + return (llint)old; + } ++#endif + + template + struct AtomicMin { diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 5093961f7deffc..67a872ea8bd9e7 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,8 @@ class Petsc(Package, CudaPackage, ROCmPackage): tags = ["e4s"] version("main", branch="main") - + version("3.20.3", sha256="75a94fb44df0512f51ad093fa784e56b61f51b7ead5956fbe49185c203f8c245") + version("3.20.2", sha256="2a2d08b5f0e3d0198dae2c42ce1fd036f25c153ef2bb4a2d320ca141ac7cd30b") version("3.20.1", sha256="3d54f13000c9c8ceb13ca4f24f93d838319019d29e6de5244551a3ec22704f32") version("3.20.0", sha256="c152ccb12cb2353369d27a65470d4044a0c67e0b69814368249976f5bb232bd4") version("3.19.6", sha256="6045e379464e91bb2ef776f22a08a1bc1ff5796ffd6825f15270159cbb2464ae") @@ -100,6 +101,7 @@ class Petsc(Package, CudaPackage, ROCmPackage): variant("mmg", default=False, description="Activates support for MMG") variant("parmmg", default=False, description="Activates support for ParMMG (only parallel)") variant("tetgen", default=False, description="Activates support for Tetgen") + variant("zoltan", default=False, description="Activates support for Zoltan") # Mumps is disabled by default, because it depends on Scalapack # which is not portable to all HPC systems variant("mumps", default=False, description="Activates support for MUMPS (only parallel)") @@ -159,12 +161,20 @@ class Petsc(Package, CudaPackage, ROCmPackage): variant("kokkos", default=False, description="Activates support for kokkos and kokkos-kernels") variant("fortran", default=True, description="Activates fortran support") - # https://github.com/spack/spack/issues/37416 - conflicts("^rocprim@5.3.0:5.3.2", when="+rocm") - # petsc 3.20 has workaround for breaking change in hipsparseSpSV_solve api, - # but it seems to misdetect hipsparse@5.6.1 as 5.6.0, so the workaround - # only makes things worse - conflicts("^hipsparse@5.6", when="+rocm @3.20.0") + with when("+rocm"): + # https://github.com/spack/spack/issues/37416 + conflicts("^rocprim@5.3.0:5.3.2") + # hipsparse@5.6.0 broke hipsparseSpSV_solve() API, reverted in 5.6.1. + patch( + "https://gitlab.com/petsc/petsc/-/commit/ef7140cce45367033b48bbd2624dfd2b6aa4b997.diff", + when="@3.20.0", + sha256="ba327f8b2a0fa45209dfb7a4278f3e9a323965b5a668be204c1c77c17a963a7f", + ) + patch("hip-5.6.0-for-3.18.diff", when="@3.18:3.19 ^hipsparse@5.6.0") + patch("hip-5.7-plus-for-3.18.diff", when="@3.18:3.19 ^hipsparse@5.7:") + patch( + "Handle-hipsparse-api-changes-for-rocm-6.0.patch", when="@3.20.2:3.20.3 ^hipsparse@6.0" + ) # 3.8.0 has a build issue with MKL - so list this conflict explicitly conflicts("^intel-mkl", when="@3.8.0") @@ -223,15 +233,17 @@ def check_fortran_compiler(self): depends_on("mpi", when="+mpi") depends_on("cuda", when="+cuda") depends_on("hip", when="+rocm") - depends_on("hipblas", when="+rocm") - depends_on("hipsparse", when="+rocm") - depends_on("hipsolver", when="+rocm") - depends_on("rocsparse", when="+rocm") - depends_on("rocsolver", when="+rocm") - depends_on("rocblas", when="+rocm") - depends_on("rocrand", when="+rocm") - depends_on("rocthrust", when="+rocm") - depends_on("rocprim", when="+rocm") + + with when("+rocm"): + depends_on("hipblas") + depends_on("hipsparse") + depends_on("hipsolver") + depends_on("rocsparse") + depends_on("rocsolver") + depends_on("rocblas") + depends_on("rocrand") + depends_on("rocthrust") + depends_on("rocprim") # Build dependencies depends_on("python@2.6:2.8,3.4:3.8", when="@:3.13", type="build") @@ -266,6 +278,7 @@ def check_fortran_compiler(self): depends_on("mmg", when="+parmmg") depends_on("parmmg", when="+parmmg") depends_on("tetgen+pic", when="+tetgen") + depends_on("zoltan", when="+zoltan") depends_on("hypre+fortran", when="+hypre+fortran") depends_on("hypre~fortran", when="+hypre~fortran") @@ -518,6 +531,7 @@ def configure_options(self): "mmg", "parmmg", ("tetgen", "tetgen", False, False), + "zoltan", ): # Cannot check `library in spec` because of transitive deps # Cannot check variants because parmetis keys on +metis diff --git a/var/spack/repos/builtin/packages/pexsi/fujitsu-add-link-flags.patch b/var/spack/repos/builtin/packages/pexsi/fujitsu-add-link-flags.patch new file mode 100644 index 00000000000000..2a2f6e77165683 --- /dev/null +++ b/var/spack/repos/builtin/packages/pexsi/fujitsu-add-link-flags.patch @@ -0,0 +1,11 @@ +diff -Nur spack-src.org/fortran/CMakeLists.txt spack-src/fortran/CMakeLists.txt +--- spack-src.org/fortran/CMakeLists.txt 2023-06-06 17:55:44.000000000 +0900 ++++ spack-src/fortran/CMakeLists.txt 2023-06-06 15:50:05.000000000 +0900 +@@ -47,6 +47,7 @@ + + endmacro() + ++set (CMAKE_EXE_LINKER_FLAGS "--linkfortran") + + add_pexsi_f_example_exe( f_driver_ksdft ) + add_pexsi_f_example_exe( f_driver_pselinv_real ) diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index a72fe3044b5fc7..9b7191ef00195d 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,11 +30,16 @@ class Pexsi(MakefilePackage, CMakePackage): build_system( conditional("cmake", when="@1:"), conditional("makefile", when="@0"), default="cmake" ) + + license("BSD-3-Clause-LBNL") + version("2.0.0", sha256="c5c83c2931b2bd0c68a462a49eeec983e78b5aaa1f17dd0454de4e27b91ca11f") version("1.2.0", sha256="8bfad6ec6866c6a29e1cc87fb1c17a39809795e79ede98373c8ba9a3aaf820dd") version("0.10.2", sha256="8714c71b76542e096211b537a9cb1ffb2c28f53eea4f5a92f94cc1ca1e7b499f") version("0.9.0", sha256="e5efe0c129013392cdac3234e37f1f4fea641c139b1fbea47618b4b839d05029") + patch("fujitsu-add-link-flags.patch", when="%fj") + depends_on("parmetis") depends_on("superlu-dist@5.1.2:5.3", when="@0.10.2:0") depends_on("superlu-dist@:6.1.0", when="@1") # Upper limit from CP2K toolchain @@ -120,4 +125,8 @@ def cmake_args(self): self.define_from_variant("PEXSI_ENABLE_FORTRAN", "fortran"), self.define_from_variant("PEXSI_ENABLE_OPENMP ", "openmp"), ] + + if self.spec.satisfies("%fj"): + args.append(self.define("BLAS_LIBRARIES", self.spec["blas"].libs.link_flags)) + return args diff --git a/var/spack/repos/builtin/packages/pfapack/package.py b/var/spack/repos/builtin/packages/pfapack/package.py index f0e4fbc5dee8be..a86549949c2f0f 100644 --- a/var/spack/repos/builtin/packages/pfapack/package.py +++ b/var/spack/repos/builtin/packages/pfapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pfft/package.py b/var/spack/repos/builtin/packages/pfft/package.py index 1aeacfa62c9982..4a9796067f8b94 100644 --- a/var/spack/repos/builtin/packages/pfft/package.py +++ b/var/spack/repos/builtin/packages/pfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pfft(AutotoolsPackage): "https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/pfft-1.0.8-alpha.tar.gz" ) + license("GPL-3.0-or-later") + version( "1.0.8-alpha", sha256="6c43960ad72fcff7e49b87c604c5f471fb5890f1bd11ce750ab52f035e7c5317" ) diff --git a/var/spack/repos/builtin/packages/pflask/package.py b/var/spack/repos/builtin/packages/pflask/package.py index 0c86502774ad16..f7831f61403bd5 100644 --- a/var/spack/repos/builtin/packages/pflask/package.py +++ b/var/spack/repos/builtin/packages/pflask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Pflask(CMakePackage): homepage = "https://ghedo.github.io/pflask/" url = "https://github.com/ghedo/pflask/archive/v0.2.tar.gz" + license("BSD-2-Clause") + version("0.2", sha256="dabbd060d1c50174de5fffae9ec97dc1d41b22de898a8280166cba768c940ebd") version("0.1", sha256="3c41c670fd8c48b7b6a41d697b444df8bf95380937ba4f734b41af135d5c5816") diff --git a/var/spack/repos/builtin/packages/pflogger/package.py b/var/spack/repos/builtin/packages/pflogger/package.py index b9096ad3dad192..f06133605e6c04 100644 --- a/var/spack/repos/builtin/packages/pflogger/package.py +++ b/var/spack/repos/builtin/packages/pflogger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pflogger(CMakePackage): maintainers("mathomp4", "tclune") + license("Apache-2.0") + version("develop", branch="develop") version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index 57a409b150c858..71ff9d1b94c615 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pflotran(AutotoolsPackage): maintainers("ghammond86", "balay") + license("LGPL-3.0-only") + version("develop") version("5.0.0", commit="f0fe931c72c03580e489724afeb8c5451406b942") # tag v5.0.0 version("4.0.1", commit="fd351a49b687e27f46eae92e9259156eea74897d") # tag v4.0.1 @@ -57,3 +59,9 @@ def flag_handler(self, name, flags): if "%gcc@10:" in self.spec and name == "fflags": flags.append("-fallow-argument-mismatch") return flags, None, None + + @when("@5.0.0") + def patch(self): + filter_file( + "use iso_[cC]_binding", "use, intrinsic :: iso_c_binding", "src/pflotran/hdf5_aux.F90" + ) diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index 0fb3af60eb33e6..671ae7ca019a25 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Pfunit(CMakePackage): maintainers("mathomp4", "tclune") + version("4.8.0", sha256="b5c66ab949fd23bee5c3b4d93069254f7ea40decb8d21f622fd6aa45ee68ef10") + version("4.7.4", sha256="ac850e33ea99c283f503f75293bf238b4b601885d7adba333066e6185dad5c04") version("4.7.3", sha256="247239298b55e847417b7830183d7fc62cca93dc92c8ec7c0067784b7ce34544") version("4.7.2", sha256="3142a1e56b7d127fdc9589cf6deff8505174129834a6a268d0ce7e296f51ab02") version("4.7.1", sha256="64de3eb9f364b57ef6df81ba33400dfd4dcebca6eb5d0e9b7955ed8156e29165") @@ -150,7 +152,6 @@ def url_for_version(self, version): def cmake_args(self): spec = self.spec args = [ - self.define("Python_EXECUTABLE", spec["python"].command), self.define("BUILD_SHARED_LIBS", False), self.define("CMAKE_Fortran_MODULE_DIRECTORY", spec.prefix.include), self.define_from_variant("ENABLE_BUILD_DOXYGEN", "docs"), diff --git a/var/spack/repos/builtin/packages/pgdspider/package.py b/var/spack/repos/builtin/packages/pgdspider/package.py index bc937d5747a047..d474afbe86e315 100644 --- a/var/spack/repos/builtin/packages/pgdspider/package.py +++ b/var/spack/repos/builtin/packages/pgdspider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pgdspider(Package): homepage = "http://www.cmpg.unibe.ch/software/PGDSpider" url = "http://www.cmpg.unibe.ch/software/PGDSpider/PGDSpider_2.1.1.2.zip" + license("BSD-3-Clause") + version("2.1.1.5", sha256="8564427caf1f5c6200ba8f22a2bc2ef0fa87ae7c6571e4df3b8438cc00fa121c") version("2.1.1.2", sha256="a630ef9f3ef0c36be0d613867c5293378d77b52396ac701bc7b9ec5d3ba7f2e1") diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index ce6d57092cb08e..995e27ee398712 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pgplot/package.py b/var/spack/repos/builtin/packages/pgplot/package.py index 1ea38aaec196ce..4821370345a7c8 100644 --- a/var/spack/repos/builtin/packages/pgplot/package.py +++ b/var/spack/repos/builtin/packages/pgplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py index 93fd890c8460d6..8cf6e02ed853dd 100644 --- a/var/spack/repos/builtin/packages/phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/phantompeakqualtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pharokka/package.py b/var/spack/repos/builtin/packages/pharokka/package.py index 3ed7b70ed73e28..c4411cdae3cc7e 100644 --- a/var/spack/repos/builtin/packages/pharokka/package.py +++ b/var/spack/repos/builtin/packages/pharokka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pharokka(Package): homepage = "https://github.com/gbouras13/pharokka" url = "https://github.com/gbouras13/pharokka/archive/refs/tags/v1.1.0.tar.gz" + license("MIT") + version("1.3.2", sha256="e12b20beada9c261f51dd37a9aa7afe83291363035dc53478c42fb67882900e1") version("1.1.0", sha256="57d546f501f201117f5d8037ac47c0d83ccd1ec518080145e8f28d3e9843fba6") diff --git a/var/spack/repos/builtin/packages/phast/package.py b/var/spack/repos/builtin/packages/phast/package.py index 6573aff84355e7..5626a79f6924fb 100644 --- a/var/spack/repos/builtin/packages/phast/package.py +++ b/var/spack/repos/builtin/packages/phast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Phast(MakefilePackage): homepage = "http://compgen.cshl.edu/phast/index.php" url = "https://github.com/CshlSiepelLab/phast/archive/v1.4.tar.gz" + license("BSD-3-Clause") + version("1.6", sha256="8100f6582008c5de46d2de05cee038f0f1ca3a50147031da1bc5e8744883cbe4") version("1.4", sha256="287c77599c51256a3adbd62ed217cb6d6a547fcec2c29262e9d61fa32ed92b99") diff --git a/var/spack/repos/builtin/packages/phasta/package.py b/var/spack/repos/builtin/packages/phasta/package.py index f54e9f6f52e4a0..6cf303420c2260 100644 --- a/var/spack/repos/builtin/packages/phasta/package.py +++ b/var/spack/repos/builtin/packages/phasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Phasta(CMakePackage): homepage = "https://www.scorec.rpi.edu/software.php" git = "https://github.com/PHASTA/phasta.git" + license("BSD-3-Clause") + version("develop", branch="master") version("0.0.1", commit="11f431f2d1a53a529dab4b0f079ab8aab7ca1109") diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index a67deddebd3557..d96c72a858eba6 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class Phist(CMakePackage): # to provide 'mpi' like this: spack install phist ^mpich %gcc@7.5.0 # Failure of this command to succeed breaks spack's gitlab CI pipelines! + license("BSD-3-Clause") + version("develop", branch="devel") version("master", branch="master") @@ -235,6 +237,13 @@ def patch(self): test.filter("1 2 3 12", "1 2 3") test.filter("12/", "6/") test.filter("TEST_DRIVERS_NUM_THREADS 6", "TEST_DRIVERS_NUM_THREADS 3") + # Avoid finding external modules like: + # /opt/rocm/llvm/include/iso_fortran_env.mod + filter_file( + "use iso_fortran_env", + "use, intrinsic :: iso_fortran_env", + "drivers/matfuncs/matpde3d.F90", + ) def setup_build_environment(self, env): env.set("SPACK_SBANG", sbang.sbang_install_path()) diff --git a/var/spack/repos/builtin/packages/phoenix/package.py b/var/spack/repos/builtin/packages/phoenix/package.py index 61f1e26e158336..84930c0391b3f7 100644 --- a/var/spack/repos/builtin/packages/phoenix/package.py +++ b/var/spack/repos/builtin/packages/phoenix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Phoenix(MavenPackage): homepage = "https://github.com" git = "https://github.com/apache/phoenix.git" + license("Apache-2.0") + version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/photos-f/package.py b/var/spack/repos/builtin/packages/photos-f/package.py index 5c6cac9bf568d8..ce86f30fe22f65 100644 --- a/var/spack/repos/builtin/packages/photos-f/package.py +++ b/var/spack/repos/builtin/packages/photos-f/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -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) diff --git a/var/spack/repos/builtin/packages/photos/package.py b/var/spack/repos/builtin/packages/photos/package.py index fc630524c98466..ea07db9e107393 100644 --- a/var/spack/repos/builtin/packages/photos/package.py +++ b/var/spack/repos/builtin/packages/photos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Photos(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-only") + version("3.64", sha256="cb4096b4804289fc4d54a992caa566cbbd33f41f65f8906deb01200dc5163027") version("3.61", sha256="acd3bcb769ba2a3e263de399e9b89fd6296405c9cbc5045b83baba3e60db4b26") diff --git a/var/spack/repos/builtin/packages/photospline/package.py b/var/spack/repos/builtin/packages/photospline/package.py new file mode 100644 index 00000000000000..14534795420b4d --- /dev/null +++ b/var/spack/repos/builtin/packages/photospline/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Photospline(CMakePackage): + """Library for interpolating multi-dimensional detector response histograms.""" + + homepage = "https://github.com/icecube/photospline" + url = "https://github.com/icecube/photospline/archive/refs/tags/v2.2.1.tar.gz" + + license("BSD-2-Clause") + + version("2.2.1", sha256="2b455daf8736d24bf57cae9eb67d48463a6c4bd6a66c3ffacf52296454bb82ad") + version("2.2.0", sha256="81f79b42fd63e12c13cc369fb5c6ef356389f7c7aaa10a584aae2e22dba79ccf") + version("2.1.1", sha256="0a0dae8e1b994a35be23896982bd572fa97c617ad55a99b3da34782ad9435de8") + version("2.1.0", sha256="bd6c58df8893917909b79ef2510a2043f909fbb7020bdace328d4d36e0222b60") + version("2.0.7", sha256="59a3607c4aa036c55bcd233e8a0ec11575bd74173f3b4095cc6a77aa50baebcd") + version("2.0.6", sha256="2f87c377e548f5fb44f8090c7559b2895f463a395b40a3276a04db44f39b1a4d") + version("2.0.5", sha256="7e2679fac733fb4d881ff9d16fc99348a62b421811f256641f2449b98a6fb041") + version("2.0.4", sha256="0a675ffe27e1d99fe482cdd7692320d6852c11c9a63de7e710ba075989e0bfb5") + version("2.0.3", sha256="7045a631c41489085037b05fac98fd9cad73dc4262b7eead143d09e5f8265dec") + version("2.0.2", sha256="0a3368205a7971a6919483ad5b5f0fbebb74614ec1891c95bb6a4fc9d3b950d4") + + depends_on("cfitsio") diff --git a/var/spack/repos/builtin/packages/php/package.py b/var/spack/repos/builtin/packages/php/package.py index 9f1d03bda565e8..441fe3af7bb464 100644 --- a/var/spack/repos/builtin/packages/php/package.py +++ b/var/spack/repos/builtin/packages/php/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Php(AutotoolsPackage): homepage = "https://php.net/" url = "https://github.com/php/php-src/archive/php-7.3.13.tar.gz" + license("PHP-3.01") + version("7.4.1", sha256="4d9d7c5681bec3af38a935d033657dce09a9913498f8022d7ca163a7f2f493a7") version("7.4.0", sha256="91d34b48025ab9789216df89e247b6904912eeeaeff38c300ef314bdda8920b0") version("7.3.13", sha256="e68b8d9e659f2993eee912f05860e546fdc18e459f31cd2771f404df21285f0b") diff --git a/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py b/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py index 11a886e7fefb68..dd7fbcac5bae7f 100644 --- a/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py +++ b/var/spack/repos/builtin/packages/phrap-crossmatch-swat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/phred/package.py b/var/spack/repos/builtin/packages/phred/package.py index f1580d19bfabae..5c259c64cd684d 100644 --- a/var/spack/repos/builtin/packages/phred/package.py +++ b/var/spack/repos/builtin/packages/phred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/phylip/package.py b/var/spack/repos/builtin/packages/phylip/package.py index 2e294e17fb349f..b464ba78203cc6 100644 --- a/var/spack/repos/builtin/packages/phylip/package.py +++ b/var/spack/repos/builtin/packages/phylip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/phylobayesmpi/package.py b/var/spack/repos/builtin/packages/phylobayesmpi/package.py index 8f9bcd37b4abcd..dadbb37a42b94a 100644 --- a/var/spack/repos/builtin/packages/phylobayesmpi/package.py +++ b/var/spack/repos/builtin/packages/phylobayesmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Phylobayesmpi(MakefilePackage): url = "https://github.com/bayesiancook/pbmpi/archive/v1.8b.tar.gz" git = "https://github.com/bayesiancook/pbmpi.git" + license("GPL-2.0-only") + version("1.8b", sha256="7ff017bf492c1d8b42bfff3ee8e998ba1c50f4e4b3d9d6125647b91738017324") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/phyluce/package.py b/var/spack/repos/builtin/packages/phyluce/package.py index cbf59d48be6ac3..3f1993726137a4 100644 --- a/var/spack/repos/builtin/packages/phyluce/package.py +++ b/var/spack/repos/builtin/packages/phyluce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Phyluce(PythonPackage): homepage = "https://github.com/faircloth-lab/phyluce" url = "https://github.com/faircloth-lab/phyluce/archive/v1.6.7.tar.gz" + license("BSD-3-Clause") + version("1.6.7", sha256="98c213ab1610506722ad1440ffc93f9cbc78d8b3aaf3d9a47837e1231452cdb6") extends("python") diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py index f9e2acb6fa15e0..8962cafc40c304 100644 --- a/var/spack/repos/builtin/packages/picard/package.py +++ b/var/spack/repos/builtin/packages/picard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Picard(Package): "https://github.com/broadinstitute/picard/releases/download/{0}/picard-tools-{0}.zip" ) + license("GPL-2.0-or-later") + # They started distributing a single jar file at v2.6.0, prior to # that it was a .zip file with multiple .jar and .so files version( diff --git a/var/spack/repos/builtin/packages/picsar/package.py b/var/spack/repos/builtin/packages/picsar/package.py index 8ac2f81e16b666..522551fa1cb345 100644 --- a/var/spack/repos/builtin/packages/picsar/package.py +++ b/var/spack/repos/builtin/packages/picsar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Picsar(MakefilePackage): homepage = "https://picsar.net" git = "https://bitbucket.org/berkeleylab/picsar.git" + license("BSD-3-Clause-LBNL") + version("develop", branch="master") variant("prod", default=True, description="Production mode (without FFTW)") diff --git a/var/spack/repos/builtin/packages/picsarlite/package.py b/var/spack/repos/builtin/packages/picsarlite/package.py index 8c8825093c1218..79e6fd58e2114b 100644 --- a/var/spack/repos/builtin/packages/picsarlite/package.py +++ b/var/spack/repos/builtin/packages/picsarlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Picsarlite(MakefilePackage): homepage = "https://picsar.net" git = "https://bitbucket.org/berkeleylab/picsar.git" + license("BSD-3-Clause-LBNL") + version("develop", branch="PICSARlite") version("0.1", tag="PICSARlite-0.1", commit="3c9cee9bdf32da0998f504bff7af31fcae2f0452") diff --git a/var/spack/repos/builtin/packages/pidx/package.py b/var/spack/repos/builtin/packages/pidx/package.py index 48b7d5380b13c3..b9f0fa4f9ce551 100644 --- a/var/spack/repos/builtin/packages/pidx/package.py +++ b/var/spack/repos/builtin/packages/pidx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Pidx(CMakePackage): homepage = "http://www.cedmav.com/pidx" git = "https://github.com/sci-visus/PIDX.git" + license("CC-BY-NC-ND-4.0") + version("1.0", commit="6afa1cf71d1c41263296dc049c8fabaf73c296da") depends_on("cmake@2.8.4:", type="build") diff --git a/var/spack/repos/builtin/packages/pig/package.py b/var/spack/repos/builtin/packages/pig/package.py index b5735decfabe24..a85d71666750fe 100644 --- a/var/spack/repos/builtin/packages/pig/package.py +++ b/var/spack/repos/builtin/packages/pig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pig(Package): homepage = "https://archive.apache.org" url = "https://archive.apache.org/dist/hadoop/pig/stable/pig-0.7.0.tar.gz" + license("Apache-2.0") + version("0.7.0", sha256="fa7211fb339f547f679a3dd90055f1ddc45d5754d88463e4cc39c380ddf8b02a") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index 2b5dd8a2c41eea..92b1084d53931e 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class Pigz(MakefilePackage): homepage = "https://zlib.net/pigz/" url = "https://github.com/madler/pigz/archive/v2.3.4.tar.gz" + license("Zlib") + + version("2.8", sha256="2f7f6a6986996d21cb8658535fff95f1c7107ddce22b5324f4b41890e2904706") version("2.7", sha256="d2045087dae5e9482158f1f1c0f21c7d3de6f7cdc7cc5848bdabda544e69aa58") version("2.6", sha256="577673676cd5c7219f94b236075451220bae3e1ca451cf849947a2998fbf5820") version("2.4", sha256="e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52") diff --git a/var/spack/repos/builtin/packages/pika-algorithms/package.py b/var/spack/repos/builtin/packages/pika-algorithms/package.py index 3387dfdb2736cb..3442ff8aba46b1 100644 --- a/var/spack/repos/builtin/packages/pika-algorithms/package.py +++ b/var/spack/repos/builtin/packages/pika-algorithms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PikaAlgorithms(CMakePackage): git = "https://github.com/pika-org/pika-algorithms.git" maintainers("msimberg", "albestro", "teonnik", "aurianer") + license("BSL-1.0") + version("0.1.4", sha256="67ea5e8545b234f82dcc75612a774f2e3df8425a283f2034c2d1e2e5ac74f945") version("0.1.3", sha256="53b79fcc0e5decc0a4d70abf0897a4f66141b85eea6d65013f51eec02ad123b7") version("0.1.2", sha256="286cf5c4db06717fa66c681cec8c99207154dd07e72d72f2b5b4a3cb9ff698bf") @@ -44,11 +46,11 @@ class PikaAlgorithms(CMakePackage): # Other dependencies depends_on("boost@1.71:") depends_on("fmt@9:") - depends_on("pika@0.11:") - depends_on("pika@0.11", when="@0.1.0") - depends_on("pika@0.11:0.12", when="@0.1.1") - depends_on("pika@0.11:0.15", when="@0.1.2") - depends_on("pika@0.11:0.16", when="@0.1.3") + depends_on("pika@0.11:0.20") + depends_on("pika@:0.11", when="@0.1.0") + depends_on("pika@:0.12", when="@0.1.1") + depends_on("pika@:0.15", when="@0.1.2") + depends_on("pika@:0.16", when="@0.1.3") for cxxstd in cxxstds: depends_on("boost cxxstd={0}".format(map_cxxstd(cxxstd)), when="cxxstd={0}".format(cxxstd)) diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py index 949475650240dc..8c28b8811e51ea 100644 --- a/var/spack/repos/builtin/packages/pika/package.py +++ b/var/spack/repos/builtin/packages/pika/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,10 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/pika-org/pika.git" maintainers("msimberg", "albestro", "teonnik", "aurianer") + license("BSL-1.0") + + version("0.22.0", sha256="75f8932f3a233958c69802b483335eeeb39032ea66f12442f6f77048e259bdea") + version("0.21.0", sha256="0ab24966e6ae026b355147f02354af4bd2117c342915fe844addf8e493735a33") version("0.20.0", sha256="f338cceea66a0e3954806b2aca08f6560bba524ecea222f04bc18b483851c877") version("0.19.1", sha256="674675abf0dd4c6f5a0b2fa3db944b277ed65c62f654029d938a8cab608a9c1d") version("0.19.0", sha256="f45cc16e4e50cbb183ed743bdc8b775d49776ee33c13ea39a650f4230a5744cb") @@ -91,9 +95,9 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): conflicts("%clang@:8", when="@0.2:") conflicts("+stdexec", when="cxxstd=17") conflicts("cxxstd=23", when="^cmake@:3.20.2") - # CUDA version <= 11 does not support C++20 and newer + # nvcc version <= 11 does not support C++20 and newer for cxxstd in filter(lambda x: x != "17", cxxstds): - conflicts(f"cxxstd={cxxstd}", when="^cuda@:11") + requires("%nvhpc", when=f"cxxstd={cxxstd} ^cuda@:11") # Other dependencies depends_on("boost@1.71:") @@ -123,27 +127,17 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage): with when("+rocm"): for val in ROCmPackage.amdgpu_targets: - depends_on( - "whip@0.1: amdgpu_target={0}".format(val), - when="@0.9: amdgpu_target={0}".format(val), - ) - depends_on( - "rocsolver amdgpu_target={0}".format(val), - when="@0.5: amdgpu_target={0}".format(val), - ) - depends_on( - "rocblas amdgpu_target={0}".format(val), when="amdgpu_target={0}".format(val) - ) + depends_on(f"whip@0.1: amdgpu_target={val}", when=f"@0.9: amdgpu_target={val}") + depends_on(f"rocsolver amdgpu_target={val}", when=f"@0.5: amdgpu_target={val}") + depends_on(f"rocblas amdgpu_target={val}", when=f"amdgpu_target={val}") with when("+cuda"): for val in CudaPackage.cuda_arch_values: - depends_on( - "whip@0.1: cuda_arch={0}".format(val), when="@0.9: cuda_arch={0}".format(val) - ) + depends_on(f"whip@0.1: cuda_arch={val}", when=f"@0.9: cuda_arch={val}") for cxxstd in cxxstds: - depends_on("boost cxxstd={0}".format(cxxstd), when="cxxstd={0}".format(cxxstd)) - depends_on("fmt cxxstd={0}".format(cxxstd), when="@0.11: cxxstd={0}".format(cxxstd)) + depends_on(f"boost cxxstd={cxxstd}", when=f"cxxstd={cxxstd}") + depends_on(f"fmt cxxstd={cxxstd}", when=f"@0.11: cxxstd={cxxstd}") # COROUTINES # ~generic_coroutines conflict is not fully implemented diff --git a/var/spack/repos/builtin/packages/pilercr/package.py b/var/spack/repos/builtin/packages/pilercr/package.py index 684563674ab47a..a25737b242119e 100644 --- a/var/spack/repos/builtin/packages/pilercr/package.py +++ b/var/spack/repos/builtin/packages/pilercr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pilon/package.py b/var/spack/repos/builtin/packages/pilon/package.py index 10f0e41c10445e..f43436c48f2d6e 100644 --- a/var/spack/repos/builtin/packages/pilon/package.py +++ b/var/spack/repos/builtin/packages/pilon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pindel/package.py b/var/spack/repos/builtin/packages/pindel/package.py index 6b88c09ed64f3a..484228f4986711 100644 --- a/var/spack/repos/builtin/packages/pindel/package.py +++ b/var/spack/repos/builtin/packages/pindel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pindel(MakefilePackage): homepage = "https://gmt.genome.wustl.edu/packages/pindel/" url = "https://github.com/genome/pindel/archive/v0.2.5.tar.gz" + license("GPL-3.0-or-later") + version("0.2.5b8", sha256="7f21fda0b751d420831724d96e60873ce332139cfd24396e81c7f1ae2f707a19") version("0.2.5b6", sha256="fe19aabdcf6334b9efe92d4509b80f0f266e621f1cc8db017b301d7e32e2eeac") version("0.2.5b5", sha256="2ebe9d959d8c3862d9103d8a3768265dcc79eab547035857dca8ab8cfe2544e4") diff --git a/var/spack/repos/builtin/packages/pinentry/package.py b/var/spack/repos/builtin/packages/pinentry/package.py index 574efa81b67093..eb52d3385f8b00 100644 --- a/var/spack/repos/builtin/packages/pinentry/package.py +++ b/var/spack/repos/builtin/packages/pinentry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Pinentry(AutotoolsPackage): maintainers("alalazo") + license("GPL-2.0-or-later") + version("1.2.1", sha256="457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067") version("1.2.0", sha256="10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470") version("1.1.1", sha256="cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f") diff --git a/var/spack/repos/builtin/packages/pinfo/package.py b/var/spack/repos/builtin/packages/pinfo/package.py index 8fe333b63f9280..39b66c9ee71f5e 100644 --- a/var/spack/repos/builtin/packages/pinfo/package.py +++ b/var/spack/repos/builtin/packages/pinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pipework/package.py b/var/spack/repos/builtin/packages/pipework/package.py index 9bc2e3a58c01d0..2555a22a82b27e 100644 --- a/var/spack/repos/builtin/packages/pipework/package.py +++ b/var/spack/repos/builtin/packages/pipework/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pipework(Package): homepage = "https://github.com/jpetazzo/pipework" git = "https://github.com/jpetazzo/pipework.git" + license("Apache-2.0") + version("master", branch="master") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/pipx/package.py b/var/spack/repos/builtin/packages/pipx/package.py index c1dab8ed8953e6..776ec0a0bbe5de 100644 --- a/var/spack/repos/builtin/packages/pipx/package.py +++ b/var/spack/repos/builtin/packages/pipx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pipx(PythonPackage): homepage = "https://pypa.github.io/pipx/" pypi = "pipx/pipx-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="d1908041d24d525cafebeb177efb686133d719499cb55c54f596c95add579286") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/piranha/package.py b/var/spack/repos/builtin/packages/piranha/package.py index c346ba1b2759e7..8ae15b3d82d947 100644 --- a/var/spack/repos/builtin/packages/piranha/package.py +++ b/var/spack/repos/builtin/packages/piranha/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Piranha(CMakePackage): url = "https://github.com/bluescarni/piranha/archive/v0.5.tar.gz" git = "https://github.com/bluescarni/piranha.git" + license("LGPL-3.0-or-later") + version("develop", branch="master") version("0.5", sha256="34a89bda8208ff48cfb116efa7d53c09e8a9b3838af4bb96ba2e19e4930b3a58") diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py index 279305dbf9776f..641e985ddb5f6d 100644 --- a/var/spack/repos/builtin/packages/pism/package.py +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pism(CMakePackage): maintainers("citibeth") + license("GPL-3.0-only") + version("develop", branch="dev") version("1.1.4", sha256="8ccb867af3b37e8d103351dadc1d7e77512e64379519fe8a2592668deb27bc44") version("0.7.x", branch="stable0.7") diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index d727972b691726..4314628e085e41 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Pixman(AutotoolsPackage): homepage = "http://www.pixman.org" url = "https://cairographics.org/releases/pixman-0.32.6.tar.gz" + license("MIT") + version("0.42.2", sha256="ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e") version("0.42.0", sha256="07f74c8d95e4a43eb2b08578b37f40b7937e6c5b48597b3a0bb2c13a53f46c13") version("0.40.0", sha256="6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc") diff --git a/var/spack/repos/builtin/packages/pixz/package.py b/var/spack/repos/builtin/packages/pixz/package.py index 6587aa6d48485c..932128da273b4b 100644 --- a/var/spack/repos/builtin/packages/pixz/package.py +++ b/var/spack/repos/builtin/packages/pixz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pixz(AutotoolsPackage): homepage = "https://www.github.com/vasi/pixz" url = "https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz" + license("BSD-2-Clause") + version("1.0.7", sha256="e5e32c6eb0bf112b98e74a5da8fb63b9f2cae71800f599d97ce540e150c8ddc5") version("1.0.6", sha256="02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8") diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 4c94d85bd24d15..b86996f731e56c 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PkgConfig(AutotoolsPackage): # URL must remain http:// so Spack can bootstrap curl url = "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" + license("GPL-2.0-only") + version("0.29.2", sha256="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591") version("0.29.1", sha256="beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001") version("0.28", sha256="6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845") diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index e7c745a0c38764..8e04c0f99cef23 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class Pkgconf(AutotoolsPackage): homepage = "http://pkgconf.org/" # URL must remain http:// so Spack can bootstrap curl url = "https://distfiles.ariadne.space/pkgconf/pkgconf-1.6.3.tar.xz" + tags = ["build-tools"] + + license("ISC") version("1.9.5", sha256="1ac1656debb27497563036f7bffc281490f83f9b8457c0d60bcfb638fb6b6171") version("1.8.0", sha256="ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf") diff --git a/var/spack/repos/builtin/packages/pktools/package.py b/var/spack/repos/builtin/packages/pktools/package.py index 66b26d394e2dad..59c2d1ef234f83 100644 --- a/var/spack/repos/builtin/packages/pktools/package.py +++ b/var/spack/repos/builtin/packages/pktools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Pktools(CMakePackage): homepage = "http://pktools.nongnu.org/html/index.html" url = "http://download.savannah.gnu.org/releases/pktools/pktools-2.6.7.tar.gz" + license("GPL-3.0-or-later") + version("2.6.7.1", sha256="519b6a500ce3c5ef3793c1cda1f5377f13b7d7591b5ccc376b2bd1de4bd4f7e5") version("2.6.7", sha256="f566647e93037cc01cebfe17ea554d798177fe5081887c70223dcca817f4fe7f") diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index 5c66dc6abd4b4f..7315b7f9e25df4 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index 5cccfe3ff4e6b5..1ff83f62011ea6 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Plasma(CMakePackage): tags = ["e4s"] + license("BSD-3-Clause") + version("develop", git=git) version("23.8.2", sha256="2db34de0575f3e3d16531bdcf1caddef146f68e71335977a3e8ec193003ab943") version("22.9.29", sha256="78827898b7e3830eee2e388823b9180858279f77c5eda5aa1be173765c53ade5") diff --git a/var/spack/repos/builtin/packages/plink-ng/package.py b/var/spack/repos/builtin/packages/plink-ng/package.py index a5b9a4c98935c7..8d1fee9761df43 100644 --- a/var/spack/repos/builtin/packages/plink-ng/package.py +++ b/var/spack/repos/builtin/packages/plink-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/plink/package.py b/var/spack/repos/builtin/packages/plink/package.py index 3e44f039bee06b..88ba567625633e 100644 --- a/var/spack/repos/builtin/packages/plink/package.py +++ b/var/spack/repos/builtin/packages/plink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/plink2/package.py b/var/spack/repos/builtin/packages/plink2/package.py index d11c02730b7f3c..569d76ee65e997 100644 --- a/var/spack/repos/builtin/packages/plink2/package.py +++ b/var/spack/repos/builtin/packages/plink2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ploticus/package.py b/var/spack/repos/builtin/packages/ploticus/package.py index cff43fae29ab1e..c473a926dd2e1d 100644 --- a/var/spack/repos/builtin/packages/ploticus/package.py +++ b/var/spack/repos/builtin/packages/ploticus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py index 835dd8a9dba433..1035a45d254590 100644 --- a/var/spack/repos/builtin/packages/plplot/package.py +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Plplot(CMakePackage): homepage = "http://plplot.sourceforge.net/" url = "https://sourceforge.net/projects/plplot/files/plplot/5.13.0%20Source/plplot-5.13.0.tar.gz/download" + license("LGPL-2.0-or-later") + version("5.15.0", sha256="b92de4d8f626a9b20c84fc94f4f6a9976edd76e33fb1eae44f6804bdcc628c7b") version("5.14.0", sha256="331009037c9cad9fcefacd7dbe9c7cfae25e766f5590f9efd739a294c649df97") version("5.13.0", sha256="ec36bbee8b03d9d1c98f8fd88f7dc3415560e559b53eb1aa991c2dcf61b25d2b") diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 6baaa7e9cf3c51..df734349c11549 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Plumed(AutotoolsPackage): git = "https://github.com/plumed/plumed2.git" maintainers("marcodelapierre") + license("LGPL-3.0-or-later") + version("master", branch="master") version("2.9.0", sha256="612d2387416b5f82dd8545709921440370e144fd46cef633654cf0ee43bac5f8") diff --git a/var/spack/repos/builtin/packages/ply/package.py b/var/spack/repos/builtin/packages/ply/package.py index 64c82351068e60..fde3b9787fc1ef 100644 --- a/var/spack/repos/builtin/packages/ply/package.py +++ b/var/spack/repos/builtin/packages/ply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ply(AutotoolsPackage): homepage = "https://github.com/iovisor/ply" git = "https://github.com/iovisor/ply.git" + license("GPL-2.0-only") + version("2.1.1", commit="899afb0c35ba2191dd7aa21f13bc7fde2655c475") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/pmdk/package.py b/var/spack/repos/builtin/packages/pmdk/package.py index f7e37e24e1cdbf..ab6728754fd2dd 100644 --- a/var/spack/repos/builtin/packages/pmdk/package.py +++ b/var/spack/repos/builtin/packages/pmdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pmemkv/package.py b/var/spack/repos/builtin/packages/pmemkv/package.py index 03593c7c229427..73d4cf99ab99b5 100644 --- a/var/spack/repos/builtin/packages/pmemkv/package.py +++ b/var/spack/repos/builtin/packages/pmemkv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pmerge/package.py b/var/spack/repos/builtin/packages/pmerge/package.py index b74aad704a5f8c..5262493d5437e6 100644 --- a/var/spack/repos/builtin/packages/pmerge/package.py +++ b/var/spack/repos/builtin/packages/pmerge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Pmerge(AutotoolsPackage): homepage = "https://github.com/beiko-lab/PMERGE" git = "https://github.com/beiko-lab/PMERGE.git" + license("GPL-3.0-only") + version("master", branch="master") depends_on("automake@1.14.0:1.14", type="build") diff --git a/var/spack/repos/builtin/packages/pmgr-collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py index 491795ffeea0b0..2f8b0f1246f252 100644 --- a/var/spack/repos/builtin/packages/pmgr-collective/package.py +++ b/var/spack/repos/builtin/packages/pmgr-collective/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index 97c389d70dd82f..99850782780912 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class Pmix(AutotoolsPackage): git = "https://github.com/openpmix/openpmix.git" maintainers("rhc54") + license("BSD-3-Clause-Open-MPI") + # Branches 4.2 & 5.0 will also need submodules version("master", branch="master", submodules=True) version("5.0.1", sha256="d4371792d4ba4c791e1010100b4bf9a65500ababaf5ff25d681f938527a67d4a") diff --git a/var/spack/repos/builtin/packages/pmlib/package.py b/var/spack/repos/builtin/packages/pmlib/package.py index 471d7c0a21a12c..2ff509ad0084f8 100644 --- a/var/spack/repos/builtin/packages/pmlib/package.py +++ b/var/spack/repos/builtin/packages/pmlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Pmlib(CMakePackage): homepage = "https://github.com/avr-aics-riken/PMlib" git = "https://github.com/avr-aics-riken/PMlib.git" + license("BSD-2-Clause") + version("master", branch="master") version("6.4.1", commit="0a35f5bec8c12e532e5a1bdac8c32c659fd3ee11") diff --git a/var/spack/repos/builtin/packages/pnfft/package.py b/var/spack/repos/builtin/packages/pnfft/package.py index fd8e0cc77ee787..e3d765f8cb2f4c 100644 --- a/var/spack/repos/builtin/packages/pnfft/package.py +++ b/var/spack/repos/builtin/packages/pnfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pnfft(AutotoolsPackage): "https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/pnfft-1.0.7-alpha.tar.gz" ) + license("GPL-3.0-or-later") + version( "1.0.7-alpha", sha256="fda558ff57ee3119754363bb6e6739338680d2d6860fe7dc42009d85562bd67a" ) diff --git a/var/spack/repos/builtin/packages/pngquant/package.py b/var/spack/repos/builtin/packages/pngquant/package.py index 48a8ede9f0698a..4d58346a98ba9b 100644 --- a/var/spack/repos/builtin/packages/pngquant/package.py +++ b/var/spack/repos/builtin/packages/pngquant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pngquant(AutotoolsPackage): homepage = "https://pngquant.org/" url = "https://pngquant.org/pngquant-2.12.5-src.tar.gz" + license("GPL-3.0-or-later") + version("2.12.5", sha256="3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808") depends_on("libpng") diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py index a7aea9ea9466f9..84bb9b3c38a5a4 100644 --- a/var/spack/repos/builtin/packages/pngwriter/package.py +++ b/var/spack/repos/builtin/packages/pngwriter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pnmpi/package.py b/var/spack/repos/builtin/packages/pnmpi/package.py index 222d6046df0e88..331ca93767aeb5 100644 --- a/var/spack/repos/builtin/packages/pnmpi/package.py +++ b/var/spack/repos/builtin/packages/pnmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Pnmpi(CMakePackage): homepage = "https://github.com/LLNL/PnMPI" url = "https://github.com/LLNL/PnMPI/releases/download/v1.7/PnMPI-v1.7-full.tar.gz" + license("LGPL-2.1-or-later") + version("1.7", sha256="523228bdc220ae417d6812c0766bba698a240d71c69981cb0cb2b09a75ef4a9e") variant("fortran", default=False, description="Configure PnMPI with Fortran support") diff --git a/var/spack/repos/builtin/packages/poamsa/package.py b/var/spack/repos/builtin/packages/poamsa/package.py index bafabd05a393b6..1193865c68e669 100644 --- a/var/spack/repos/builtin/packages/poamsa/package.py +++ b/var/spack/repos/builtin/packages/poamsa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index 50e048d9b3ad11..da8ad4e6a69318 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Pocl(CMakePackage): url = "https://github.com/pocl/pocl/archive/v1.1.tar.gz" git = "https://github.com/pocl/pocl.git" + license("MIT") + version("master", branch="master") version("3.0", sha256="a3fd3889ef7854b90b8e4c7899c5de48b7494bf770e39fba5ad268a5cbcc719d") version("1.8", sha256="0f63377ae1826e16e90038fc8e7f65029be4ff6f9b059f6907174b5c0d1f8ab2") diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 5f0b94ba3770eb..6fc0e46b798f31 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,11 +15,14 @@ class Podio(CMakePackage): url = "https://github.com/AIDASoft/podio/archive/v00-09-02.tar.gz" git = "https://github.com/AIDASoft/podio.git" - maintainers("vvolkl", "drbenmorgan", "jmcarcell") + maintainers("vvolkl", "drbenmorgan", "jmcarcell", "tmadlener") tags = ["hep", "key4hep"] version("master", branch="master") + version("0.17.4", sha256="3ca86323c86e05e901f596a98fe84aeb2476ceed8c0b0e0b37049c23b903a9ad") + version("0.17.3", sha256="079517eba9c43d01255ef8acd88468c3ead7bb9d8fed11792e121bb481d54dee") + version("0.17.2", sha256="5b519335c4e1708f71ed85b3cac8ca81e544cc4572a5c37019ce9fc414c5e74d") version("0.17.1", sha256="97d6c5f81d50ee42bf7c01f041af2fd333c806f1bbf0a4828ca961a24cea6bb2") version("0.17", sha256="0c19f69970a891459cab227ab009514f1c1ce102b70e8c4b7d204eb6a0c643c1") version("0.16.7", sha256="8af7c947e2637f508b7af053412bacd9218d41a455d69addd7492f05b7a4338d") diff --git a/var/spack/repos/builtin/packages/podman/package.py b/var/spack/repos/builtin/packages/podman/package.py index 18f687ede222c0..bbc739a3627657 100644 --- a/var/spack/repos/builtin/packages/podman/package.py +++ b/var/spack/repos/builtin/packages/podman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Podman(Package): url = "https://github.com/containers/podman/archive/refs/tags/v4.3.1.tar.gz" maintainers("alecbcs") + license("Apache-2.0") + version("4.5.1", sha256="ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39") version("4.3.1", sha256="455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813") version("3.4.7", sha256="4af6606dd072fe946960680611ba65201be435b43edbfc5cc635b2a01a899e6e") diff --git a/var/spack/repos/builtin/packages/poke/package.py b/var/spack/repos/builtin/packages/poke/package.py index 68f3e89c4c818c..f9e24428ea2676 100644 --- a/var/spack/repos/builtin/packages/poke/package.py +++ b/var/spack/repos/builtin/packages/poke/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Poke(AutotoolsPackage, GNUMirrorPackage): maintainers("ChristianTackeGSI") + license("GPL-3.0-or-later") + version("3.1", sha256="f405a6ba810916ec717000b6fe98ef10cbe549bf0a366b3f81e1f176ff8ff13f") version("3.0", sha256="79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add") version("1.0", sha256="de930b8700c0772b3c2cd0d0ca35f50fd3d77bdf82c6251eb516b49e8ca25b0a") diff --git a/var/spack/repos/builtin/packages/polymake/package.py b/var/spack/repos/builtin/packages/polymake/package.py index 50914382a784ba..8fe14258749b3f 100644 --- a/var/spack/repos/builtin/packages/polymake/package.py +++ b/var/spack/repos/builtin/packages/polymake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Polymake(Package): homepage = "https://polymake.org/doku.php" url = "https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r1.tar.bz2" + license("GPL-2.0-or-later") + version("3.5", sha256="c649f8536ccef5a5e22b82c514a09278ebcd99d0815aa7170461fe12843109bd") version("3.0r2", sha256="e7c0f8e3a45ea288d2fb4ae781a1dcea913ef9c275fed401632cdb11a672d6dc") version("3.0r1", sha256="cdc223716b1cc3f4f3cc126089a438f9d12390caeed78291a87565717c7b504d") diff --git a/var/spack/repos/builtin/packages/polypolish/package.py b/var/spack/repos/builtin/packages/polypolish/package.py index b85557af0e094a..ea993e5a274c4b 100644 --- a/var/spack/repos/builtin/packages/polypolish/package.py +++ b/var/spack/repos/builtin/packages/polypolish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Polypolish(Package): homepage = "https://github.com/rrwick/Polypolish" url = "https://github.com/rrwick/Polypolish/archive/refs/tags/v0.5.0.tar.gz" + license("GPL-3.0-or-later") + version("0.5.0", sha256="183156093c03094290951f140010b3aef6222a672bf538e9136914178775fb1f") depends_on("rust") diff --git a/var/spack/repos/builtin/packages/poplddecay/package.py b/var/spack/repos/builtin/packages/poplddecay/package.py index 8e8f14b0ed7ec8..006756bccdf882 100644 --- a/var/spack/repos/builtin/packages/poplddecay/package.py +++ b/var/spack/repos/builtin/packages/poplddecay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Poplddecay(MakefilePackage): maintainers("robqiao") + license("MIT") + version("3.41", sha256="b84fe5c9a1e1f6798eebbe4445b0b4bc7d02ac9f03fd01cb9cdcc8ee4db71040") version("3.40", sha256="5070930166fb90f7eaaa4b87c4430caa8a827d79c54683e2f56434a4daf69778") diff --git a/var/spack/repos/builtin/packages/poppler-data/package.py b/var/spack/repos/builtin/packages/poppler-data/package.py index 28b1b2472769b3..240e3cf4027f3c 100644 --- a/var/spack/repos/builtin/packages/poppler-data/package.py +++ b/var/spack/repos/builtin/packages/poppler-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PopplerData(CMakePackage): homepage = "https://poppler.freedesktop.org/" url = "https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz" + license("GPL-2.0-or-later AND BSD-3-Clause AND MIT") + version("0.4.12", sha256="c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74") version("0.4.9", sha256="1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012") diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 7b04a7639d8658..b71c5b30ff54fc 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Poppler(CMakePackage): list_url = "https://poppler.freedesktop.org/releases.html" git = "https://gitlab.freedesktop.org/poppler/poppler.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("23.04.0", sha256="b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1") version("21.09.0", sha256="5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b") diff --git a/var/spack/repos/builtin/packages/popt/package.py b/var/spack/repos/builtin/packages/popt/package.py index 37af3308f6dfb8..75cd3a348d4229 100644 --- a/var/spack/repos/builtin/packages/popt/package.py +++ b/var/spack/repos/builtin/packages/popt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Popt(AutotoolsPackage): homepage = "https://launchpad.net/popt" url = "https://launchpad.net/popt/head/1.16/+download/popt-1.16.tar.gz" + license("MIT") + version("1.16", sha256="e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8") depends_on("iconv") diff --git a/var/spack/repos/builtin/packages/porta/package.py b/var/spack/repos/builtin/packages/porta/package.py index edd7a46a01a493..361e36269543d4 100644 --- a/var/spack/repos/builtin/packages/porta/package.py +++ b/var/spack/repos/builtin/packages/porta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Porta(Package): homepage = "https://porta.zib.de" url = "https://porta.zib.de/porta-1.4.1.zip" + license("GPL-2.0-or-later") + version("1.4.1", sha256="21e3784f46f4f2154100a0c39cbd9211a26e513ffe0c9f70ab75a3bb2810b059") depends_on("libtool", type="build") diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index e7195844e20e82..f4108565580a26 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/portcullis/package.py b/var/spack/repos/builtin/packages/portcullis/package.py index 09e9c6224769dc..7944a6ea355ca2 100644 --- a/var/spack/repos/builtin/packages/portcullis/package.py +++ b/var/spack/repos/builtin/packages/portcullis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Portcullis(AutotoolsPackage): homepage = "https://github.com/EI-CoreBioinformatics/portcullis" url = "https://github.com/EI-CoreBioinformatics/portcullis/archive/refs/tags/Release-1.1.2.tar.gz" + license("GPL-3.0-only") + version("1.2.3", sha256="172452b5cef12a8dcc2c1c68527000743114136ee63a0dbe307ac4e2a816bc99") version("1.1.2", sha256="5c581a7f827ffeecfe68107b7fe27ed60108325fd2f86a79d93f61b328687749") diff --git a/var/spack/repos/builtin/packages/ports-of-call/package.py b/var/spack/repos/builtin/packages/ports-of-call/package.py index 5cdbc95d13f7d5..699f4007ccf2e4 100644 --- a/var/spack/repos/builtin/packages/ports-of-call/package.py +++ b/var/spack/repos/builtin/packages/ports-of-call/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PortsOfCall(CMakePackage): maintainers("rbberger") + license("BSD-3-Clause") + version("main", branch="main") version("1.5.2", sha256="73d16fe9236a9475010dbb01bf751c15bef01eb2e15bf92c8d9be2c0a606329f") version("1.5.1", sha256="b1f0232cd6d2aac65385d77cc061ec5035283ea50d0f167e7003eae034effb78") diff --git a/var/spack/repos/builtin/packages/postgis/package.py b/var/spack/repos/builtin/packages/postgis/package.py index beffe31b1cb809..5fe76b8889d2cc 100644 --- a/var/spack/repos/builtin/packages/postgis/package.py +++ b/var/spack/repos/builtin/packages/postgis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Postgis(AutotoolsPackage): homepage = "https://postgis.net/" url = "https://download.osgeo.org/postgis/source/postgis-2.5.3.tar.gz" + license("GPL-2.0-or-later") + version("3.0.1", sha256="5a5432f95150d9bae9215c6d1c7bb354e060482a7c379daa9b8384e1d03e6353") version("3.0.0", sha256="c06fd2cd5cea0119106ffe17a7235d893c2bbe6f4b63c8617c767630973ba594") version("2.5.3", sha256="72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a") diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index f1e904c560a4e5..fc13e3e1d521f0 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,8 +19,11 @@ class Postgresql(AutotoolsPackage): list_url = "http://ftp.postgresql.org/pub/source" list_depth = 1 + license("PostgreSQL") + version("15.2", sha256="99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7") version("14.0", sha256="ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122") + version("13.1", sha256="12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f") version("12.2", sha256="ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de") version("11.2", sha256="2676b9ce09c21978032070b6794696e0aa5a476e3d21d60afc036dc0a9c09405") version("11.1", sha256="90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08") diff --git a/var/spack/repos/builtin/packages/povray/package.py b/var/spack/repos/builtin/packages/povray/package.py index 6f050f8cb28c8d..d77bafd9d5cf9e 100644 --- a/var/spack/repos/builtin/packages/povray/package.py +++ b/var/spack/repos/builtin/packages/povray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class Povray(AutotoolsPackage): # maintainers('payerle' ) + license("AGPL-3.0-or-later") + version("3.7.0.8", sha256="53d11ebd2972fc452af168a00eb83aefb61387662c10784e81b63e44aa575de4") variant("boost", default=True, description="Build with boost support") diff --git a/var/spack/repos/builtin/packages/powerapi/package.py b/var/spack/repos/builtin/packages/powerapi/package.py index 795aba9ee9925e..9943a94d5a3d39 100644 --- a/var/spack/repos/builtin/packages/powerapi/package.py +++ b/var/spack/repos/builtin/packages/powerapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Powerapi(AutotoolsPackage): homepage = "https://powerapi.sandia.gov/" git = "https://github.com/pwrapi/pwrapi-ref.git" + license("BSD-3-Clause") + version("2020-01-30", commit="21f75b1469261d99e604f7ddc18f30513ebdd048") version("1.1.1", commit="93f66dfa29f014067823f2b790a1862e5841a11c") diff --git a/var/spack/repos/builtin/packages/powertop/package.py b/var/spack/repos/builtin/packages/powertop/package.py index ec477eb120889b..5a7593d69cac5c 100644 --- a/var/spack/repos/builtin/packages/powertop/package.py +++ b/var/spack/repos/builtin/packages/powertop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Powertop(AutotoolsPackage): homepage = "https://01.org/powertop/" url = "https://01.org/sites/default/files/downloads/powertop/powertop-v2.9.tar.gz" + license("GPL-2.0-only") + version("2.9", sha256="aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250") depends_on("libnl") diff --git a/var/spack/repos/builtin/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py index 5fe162f613afa3..c0c918b11c90f6 100644 --- a/var/spack/repos/builtin/packages/ppl/package.py +++ b/var/spack/repos/builtin/packages/ppl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Ppl(Package): homepage = "https://bugseng.com/products/ppl/" url = "http://bugseng.com/products/ppl/download/ftp/releases/1.1/ppl-1.1.tar.gz" + license("GPL-3.0-or-later") + version("1.2", sha256="6bc36dd4a87abc429d8f9c00c53e334e5041a9b0857cfc00dbad6ef14294aac8") version("1.1", sha256="46f073c0626234f0b1a479356c0022fe5dc3c9cf10df1a246c9cde81f7cf284d") diff --git a/var/spack/repos/builtin/packages/pplacer/package.py b/var/spack/repos/builtin/packages/pplacer/package.py index 9eb93711f5175a..723b5b722c9a2a 100644 --- a/var/spack/repos/builtin/packages/pplacer/package.py +++ b/var/spack/repos/builtin/packages/pplacer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py index 24d671828820ae..17000ee5ba5064 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-amr-fdm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py b/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py index 1682a61c5de87a..5fae5b5269dc24 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-bem-at/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py b/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py index a5c32efc442730..20e2d01f6c6dda 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-bem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py b/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py index 0226e343dc5c80..afe2c21e92ff1c 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-dem-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py index b72be1c8673f5b..a61f9c9de897f3 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fdm-at/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py index 4b7d92e634aa24..c9aa471a1d56dc 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fdm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py index 8dd5a4c7b5e333..2286b3f5cc50b7 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py b/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py index cc52ab5fe78778..903254e683d556 100644 --- a/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py +++ b/var/spack/repos/builtin/packages/ppopen-appl-fvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-at/package.py b/var/spack/repos/builtin/packages/ppopen-at/package.py index c8f5464a8e1b79..685d3ba3766630 100644 --- a/var/spack/repos/builtin/packages/ppopen-at/package.py +++ b/var/spack/repos/builtin/packages/ppopen-at/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PpopenAt(MakefilePackage): homepage = "http://ppopenhpc.cc.u-tokyo.ac.jp/ppopenhpc/" git = "https://github.com/Post-Peta-Crest/ppOpenHPC.git" + license("MIT") + version("master", branch="AT") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/ppopen-math-mp/package.py b/var/spack/repos/builtin/packages/ppopen-math-mp/package.py index 82d531f3d88ee1..5f7e964d12e4f4 100644 --- a/var/spack/repos/builtin/packages/ppopen-math-mp/package.py +++ b/var/spack/repos/builtin/packages/ppopen-math-mp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ppopen-math-vis/package.py b/var/spack/repos/builtin/packages/ppopen-math-vis/package.py index d44053e3bec6f4..c9ff21b6660b0e 100644 --- a/var/spack/repos/builtin/packages/ppopen-math-vis/package.py +++ b/var/spack/repos/builtin/packages/ppopen-math-vis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prank/package.py b/var/spack/repos/builtin/packages/prank/package.py index 367b54a5afa7c7..a04576cb487994 100644 --- a/var/spack/repos/builtin/packages/prank/package.py +++ b/var/spack/repos/builtin/packages/prank/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index 2c4eb9665b45af..943a2f088d104c 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Precice(CMakePackage): tags = ["e4s"] + license("LGPL-3.0-or-later") + version("develop", branch="develop") version("2.5.0", sha256="76ec6ee0d1a66f6f3d3d2d11f03cfc5aa7ef4d9e5deb9b7a4b4455ec7f796c00") version("2.4.0", sha256="762e603fbcaa96c4fb0b378b7cb6789d09da0cf6193325603e5eeb13e4c7601c") @@ -170,7 +172,8 @@ def cmake_args(self): cmake_args.extend(["-DPETSC_DIR=%s" % spec["petsc"].prefix, "-DPETSC_ARCH=."]) # Python - if "+python" in spec: + if "@:2.3 +python" in spec: + # 2.4.0 and higher use find_package(Python3). python_library = spec["python"].libs[0] python_include = spec["python"].headers.directories[0] numpy_include = join_path( diff --git a/var/spack/repos/builtin/packages/predixy/package.py b/var/spack/repos/builtin/packages/predixy/package.py index 003e8d2855ff80..4b62b48698dee8 100644 --- a/var/spack/repos/builtin/packages/predixy/package.py +++ b/var/spack/repos/builtin/packages/predixy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Predixy(MakefilePackage): homepage = "https://github.com/joyieldInc/predixy" url = "https://github.com/joyieldInc/predixy/archive/1.0.5.tar.gz" + license("BSD-3-Clause") + version("1.0.5", sha256="0670d0b80f991b415a6dc6df107e5f223e3b41dc5d6b18bf73e26578178dd9e0") version("1.0.4", sha256="30a7dd44ce507a7a2f8a570c59c9133df239a7f8bad14ef1b97df92b2ee96d40") version("1.0.3", sha256="d815d0ffcd33b16bfee76fe5523bdd47cf9acca0419eaa284d5ccda4cf62b828") diff --git a/var/spack/repos/builtin/packages/premake-core/package.py b/var/spack/repos/builtin/packages/premake-core/package.py index 63d943df235b33..6bd9c53ba9b33b 100644 --- a/var/spack/repos/builtin/packages/premake-core/package.py +++ b/var/spack/repos/builtin/packages/premake-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PremakeCore(MakefilePackage): homepage = "https://premake.github.io/" url = "https://github.com/premake/premake-core/archive/v5.0.0-alpha15.tar.gz" + license("BSD-3-Clause") + version( "5.0.0-alpha15", sha256="188c590f23b944f8fb2a3254acbb63c9655617be021ba4a670d81e6d499ff6cf" ) diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py index 09739bed3e34b3..0ed5d8954310dd 100644 --- a/var/spack/repos/builtin/packages/presentproto/package.py +++ b/var/spack/repos/builtin/packages/presentproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/preseq/package.py b/var/spack/repos/builtin/packages/preseq/package.py index 5b7be4c1c77cf5..60a6dd20bd6157 100644 --- a/var/spack/repos/builtin/packages/preseq/package.py +++ b/var/spack/repos/builtin/packages/preseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Preseq(MakefilePackage): homepage = "https://github.com/smithlabcode/preseq" url = "https://github.com/smithlabcode/preseq/releases/download/v2.0.2/preseq_v2.0.2.tar.bz2" + license("GPL-3.0-only") + version("2.0.3", sha256="747ddd4227515a96a45fcff0709f26130386bff3458c829c7bc1f3306b4f3d91") version("2.0.2", sha256="1d7ea249bf4e5826e09697256643e6a2473bc302cd455f31d4eb34c23c10b97c") diff --git a/var/spack/repos/builtin/packages/presto/package.py b/var/spack/repos/builtin/packages/presto/package.py index 757b4270fbc131..fe44cb5795252b 100644 --- a/var/spack/repos/builtin/packages/presto/package.py +++ b/var/spack/repos/builtin/packages/presto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Presto(MavenPackage): homepage = "https://prestodb.io/" url = "https://github.com/prestodb/presto/archive/0.239.tar.gz" + license("Apache-2.0") + version("0.239", sha256="cff738eecf9e4e0bb58a9b0366053a328c4ac4e72d3e8209e8c654f6e1b8985f") version("0.238.2", sha256="cb79311cb27695e00108c84c6e135c0b1f8ffb631013c2b25ed8565f9cf1b71f") version("0.238.1", sha256="4b811af887fc2dd38cfa36355d6a47c234a600f51e908dc9b59e24a5407b3620") diff --git a/var/spack/repos/builtin/packages/price/package.py b/var/spack/repos/builtin/packages/price/package.py index 3c07b1909b22ec..80941a12800fbb 100644 --- a/var/spack/repos/builtin/packages/price/package.py +++ b/var/spack/repos/builtin/packages/price/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prime95/package.py b/var/spack/repos/builtin/packages/prime95/package.py index 5f1e6b7c1c7019..d944fefcf37039 100644 --- a/var/spack/repos/builtin/packages/prime95/package.py +++ b/var/spack/repos/builtin/packages/prime95/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Prime95(Package): url = "https://www.mersenne.org/ftp_root/gimps/p95v308b17.linux64.tar.gz" maintainers("saqibkh") + license("Unlicense") + version("95v308b17", sha256="5180c3843d2b5a7c7de4aa5393c13171b0e0709e377c01ca44154608f498bec7") version("95v308b16", sha256="9fa9b30dd175be287d3a3f4b85139d02d4e64aa2dad88324abd4fdfcbbfe10d4") version("95v309b3", sha256="afa5d1a72e98c94d58e0ac002d3e70ffb3887d975d9b83157d1ea41755efd32b") diff --git a/var/spack/repos/builtin/packages/primer3/package.py b/var/spack/repos/builtin/packages/primer3/package.py index f92cad8dce81eb..8bee8d75294a98 100644 --- a/var/spack/repos/builtin/packages/primer3/package.py +++ b/var/spack/repos/builtin/packages/primer3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Primer3(MakefilePackage): homepage = "https://primer3.org/" url = "https://github.com/primer3-org/primer3/archive/v2.3.7.tar.gz" + license("GPL-2.0-only") + version("2.6.1", sha256="805cef7ef39607cd40f0f5bb8b32e35e20007153a0a55131dd430ce644c8fb9e") version("2.5.0", sha256="7581e2fa3228ef0ee1ffa427b2aa0a18fc635d561208327471daf59d1b804da0") version("2.3.7", sha256="f7ac3e64dc89b7c80882bf0f52c2c0a58572f5fdafd178680d4a7ae91b6c465b") diff --git a/var/spack/repos/builtin/packages/prinseq-lite/package.py b/var/spack/repos/builtin/packages/prinseq-lite/package.py index 7852f08e0c1686..0737bb4a37d33a 100644 --- a/var/spack/repos/builtin/packages/prinseq-lite/package.py +++ b/var/spack/repos/builtin/packages/prinseq-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PrinseqLite(Package): homepage = "http://prinseq.sourceforge.net" url = "https://sourceforge.net/projects/prinseq/files/standalone/prinseq-lite-0.20.4.tar.gz" + license("GPL-3.0-only") + version("0.20.4", sha256="9b5e0dce3b7f02f09e1cc7e8a2dd77c0b133e5e35529d570ee901f53ebfeb56f") variant("nopca", default=True, description="Graphs version without PCA") diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py index 35a24e35e7e83d..36f759950eca8c 100644 --- a/var/spack/repos/builtin/packages/printproto/package.py +++ b/var/spack/repos/builtin/packages/printproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prism/package.py b/var/spack/repos/builtin/packages/prism/package.py index f76f146d680096..080e387c9b26b8 100644 --- a/var/spack/repos/builtin/packages/prism/package.py +++ b/var/spack/repos/builtin/packages/prism/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Prism(MakefilePackage): maintainers("snehring") + license("GPL-2.0-only") + version("4.7", sha256="16186047ba49efc6532de6e9c3993c8c73841a7c76c99758d6ee769e72092d6d") version("4.5", sha256="1cb7a77538b5c997d98a8c209030c46f9e8f021f7a8332e5eb2fd3b4a23936fd") diff --git a/var/spack/repos/builtin/packages/prmon/package.py b/var/spack/repos/builtin/packages/prmon/package.py index 01751265d40ad0..c194c1d975a25e 100644 --- a/var/spack/repos/builtin/packages/prmon/package.py +++ b/var/spack/repos/builtin/packages/prmon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Prmon(CMakePackage): maintainers("graeme-a-stewart", "amete", "vvolkl") + license("Apache-2.0") + version("main", branch="main") version("3.0.2", sha256="ea9ff521689fecb8c395e35e9540be18c7ab37812354c4a5c0ba505e2ab467c1") version("3.0.0", sha256="fd6f4e3a95e055d265fbbaba08d680826cb4770eb8830cc987898d6504ac7474") diff --git a/var/spack/repos/builtin/packages/prng/package.py b/var/spack/repos/builtin/packages/prng/package.py index 6fdb84d534dd3c..b3d039283f69f2 100644 --- a/var/spack/repos/builtin/packages/prng/package.py +++ b/var/spack/repos/builtin/packages/prng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Prng(AutotoolsPackage): homepage = "https://statmath.wu.ac.at/prng/" url = "https://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz" + license("GPL-2.0-only") + version("3.0.2", sha256="8299182b97c24b7891d74590a8a8438641a6c681ce34d6c3f7bc98a0649da48b") depends_on("automake", type="build") diff --git a/var/spack/repos/builtin/packages/probconsrna/package.py b/var/spack/repos/builtin/packages/probconsrna/package.py index acdb346b9d3f55..6353022a160fb0 100644 --- a/var/spack/repos/builtin/packages/probconsrna/package.py +++ b/var/spack/repos/builtin/packages/probconsrna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/procenv/package.py b/var/spack/repos/builtin/packages/procenv/package.py index 9e02d2817a5bbc..b4be9e38627669 100644 --- a/var/spack/repos/builtin/packages/procenv/package.py +++ b/var/spack/repos/builtin/packages/procenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Procenv(AutotoolsPackage): homepage = "https://github.com/jamesodhunt/procenv/" url = "https://github.com/jamesodhunt/procenv/archive/0.51.tar.gz" + license("GPL-3.0-or-later") + version("0.60", sha256="fac0438bf08ed73b10ace78d85acb83cf81ade5ecf866762c2c6e92e41dbde43") version("0.51", sha256="b831c14729e06a285cc13eba095817ce3b6d0ddf484b1264951b03ee4fe25bc9") diff --git a/var/spack/repos/builtin/packages/process-in-process/package.py b/var/spack/repos/builtin/packages/process-in-process/package.py index 8ec4e4a156af77..283fd52064091a 100644 --- a/var/spack/repos/builtin/packages/process-in-process/package.py +++ b/var/spack/repos/builtin/packages/process-in-process/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class ProcessInProcess(Package): conflicts("platform=darwin", msg="Darwin is not supported.") conflicts("platform=windows", msg="Windows is not supported.") + license("BSD-2-Clause-FreeBSD") + # PiP version 1 is obsolete version("1", branch="pip-1", deprecated=True) # PiP version 2 is stable one diff --git a/var/spack/repos/builtin/packages/procps-ng/package.py b/var/spack/repos/builtin/packages/procps-ng/package.py index f41aa67ea7c5a1..e66376242f7a91 100644 --- a/var/spack/repos/builtin/packages/procps-ng/package.py +++ b/var/spack/repos/builtin/packages/procps-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class ProcpsNg(AutotoolsPackage): homepage = "https://sourceforge.net/projects/procps-ng" url = "https://udomain.dl.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.16.tar.xz" + license("GPL-2.0-or-later AND LGPL-2.1-or-later", checked_by="tgamblin") + version("3.3.16", sha256="925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af") def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/procps/package.py b/var/spack/repos/builtin/packages/procps/package.py index 791625102bc809..bfb0432488cdf1 100644 --- a/var/spack/repos/builtin/packages/procps/package.py +++ b/var/spack/repos/builtin/packages/procps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Procps(AutotoolsPackage): git = "https://gitlab.com/procps-ng/procps.git" url = "https://gitlab.com/procps-ng/procps/-/archive/v4.0.3/procps-v4.0.3.tar.gz" + license("GPL-2.0-or-later") + version("master", branch="master") version("4.0.4", sha256="3214fab0f817d169f2c117842ba635bafb1cd6090273e311a8b5c6fc393ddb9d") version("4.0.3", sha256="14cc21219c45d196772274ea3f194f6d668b6cc667fbde9ee6d8039121b73fa6") diff --git a/var/spack/repos/builtin/packages/prod-util/package.py b/var/spack/repos/builtin/packages/prod-util/package.py index 0bb4f9cf304a77..75764879d5fbfb 100644 --- a/var/spack/repos/builtin/packages/prod-util/package.py +++ b/var/spack/repos/builtin/packages/prod-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prodigal/package.py b/var/spack/repos/builtin/packages/prodigal/package.py index d0cd85cfe5d4b1..1c670bd973077f 100644 --- a/var/spack/repos/builtin/packages/prodigal/package.py +++ b/var/spack/repos/builtin/packages/prodigal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Prodigal(MakefilePackage): homepage = "https://github.com/hyattpd/Prodigal" url = "https://github.com/hyattpd/Prodigal/archive/v2.6.3.tar.gz" + license("GPL-3.0-or-later") + version("2.6.3", sha256="89094ad4bff5a8a8732d899f31cec350f5a4c27bcbdd12663f87c9d1f0ec599f") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/professor/package.py b/var/spack/repos/builtin/packages/professor/package.py index 7abdf2d93e4775..b021c7e9571345 100644 --- a/var/spack/repos/builtin/packages/professor/package.py +++ b/var/spack/repos/builtin/packages/professor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/profugusmc/package.py b/var/spack/repos/builtin/packages/profugusmc/package.py index d17070bc07cfa3..18cc276502e44a 100644 --- a/var/spack/repos/builtin/packages/profugusmc/package.py +++ b/var/spack/repos/builtin/packages/profugusmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Profugusmc(CMakePackage, CudaPackage): git = "https://code.ornl.gov/ProfugusMC/ProfugusMC.git" url = "https://code.ornl.gov/ProfugusMC/ProfugusMC/-/archive/master/ProfugusMC-master.tar.gz" + license("BSD-2-Clause") + version("master", branch="master") variant("mpi", default=True, description="Enable MPI") diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 01107a698fbe28..e8b5959bbd5f12 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Proj(CMakePackage, AutotoolsPackage): # Many packages that depend on proj do not yet support the newer API. # See https://github.com/OSGeo/PROJ/wiki/proj.h-adoption-status + license("MIT") + version("9.2.1", sha256="15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1") version("9.2.0", sha256="dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e") version("9.1.1", sha256="003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39") diff --git a/var/spack/repos/builtin/packages/prokka/package.py b/var/spack/repos/builtin/packages/prokka/package.py index 1f69b284fec8a6..6156954469f247 100644 --- a/var/spack/repos/builtin/packages/prokka/package.py +++ b/var/spack/repos/builtin/packages/prokka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prometheus/package.py b/var/spack/repos/builtin/packages/prometheus/package.py index 7c044f078cf252..7b0f0fdb53f970 100644 --- a/var/spack/repos/builtin/packages/prometheus/package.py +++ b/var/spack/repos/builtin/packages/prometheus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Prometheus(MakefilePackage): homepage = "https://prometheus.io/" url = "https://github.com/prometheus/prometheus/archive/v2.19.2.tar.gz" + license("Apache-2.0") + version("2.19.2", sha256="d4e84cae2fed6761bb8a80fcc69b6e0e9f274d19dffc0f38fb5845f11da1bbc3") version("2.19.1", sha256="b72b9b6bdbae246dcc29ef354d429425eb3c0a6e1596fc8b29b502578a4ce045") version("2.18.2", sha256="a26c106c97d81506e3a20699145c11ea2cce936427a0e96eb2fd0dc7cd1945ba") diff --git a/var/spack/repos/builtin/packages/prophecy4f/package.py b/var/spack/repos/builtin/packages/prophecy4f/package.py index dd9e3ded2901fa..4e9ce114ed09ce 100644 --- a/var/spack/repos/builtin/packages/prophecy4f/package.py +++ b/var/spack/repos/builtin/packages/prophecy4f/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/protobuf-c/package.py b/var/spack/repos/builtin/packages/protobuf-c/package.py index 205451405ec2dd..86f590b52589f7 100644 --- a/var/spack/repos/builtin/packages/protobuf-c/package.py +++ b/var/spack/repos/builtin/packages/protobuf-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class ProtobufC(AutotoolsPackage): ) maintainers("hyoklee") + license("BSD-2-Clause") + version("1.4.1", sha256="4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f") version("1.3.2", sha256="53f251f14c597bdb087aecf0b63630f434d73f5a10fc1ac545073597535b9e74") diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 47880d98e86568..a87a0db6165146 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Protobuf(CMakePackage): url = "https://github.com/protocolbuffers/protobuf/archive/v3.18.0.tar.gz" maintainers("hyoklee") + license("BSD-3-Clause") + version("3.24.3", sha256="2c23dee0bdbc36bd43ee457083f8f5560265d0815cc1c56033de3932843262fe") version("3.23.3", sha256="5e4b555f72a7e3f143a7aff7262292500bb02c49b174351684bb70fc7f2a6d33") version("3.22.2", sha256="2118051b4fb3814d59d258533a4e35452934b1ddb41230261c9543384cbb4dfc") diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py index 1a60c1589e3d49..30c8f5e73f1b81 100644 --- a/var/spack/repos/builtin/packages/proxymngr/package.py +++ b/var/spack/repos/builtin/packages/proxymngr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/prrte/package.py b/var/spack/repos/builtin/packages/prrte/package.py index b41c28c663cb46..e233a5102df0b6 100644 --- a/var/spack/repos/builtin/packages/prrte/package.py +++ b/var/spack/repos/builtin/packages/prrte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Prrte(AutotoolsPackage): git = "https://github.com/pmix/prrte.git" maintainers("rhc54") + license("BSD-3-Clause-Open-MPI") + version("develop", branch="master") version("1.0.0", sha256="a9b3715e059c10ed091bd6e3a0d8896f7752e43ee731abcc95fb962e67132a2d") diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py index 9a74da5b3b4eb1..931eac995110be 100644 --- a/var/spack/repos/builtin/packages/pruners-ninja/package.py +++ b/var/spack/repos/builtin/packages/pruners-ninja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PrunersNinja(AutotoolsPackage): url = "https://github.com/PRUNERS/NINJA/releases/download/v1.0.0/NINJA-1.0.0.tar.gz" git = "https://github.com/PRUNERS/NINJA.git" + license("GPL-3.0-or-later") + version("master", branch="master") version("1.0.1", sha256="53df5c019054b60c68e63d3e249127f1d5f267a70539c8809fb42a8ddbfcb29b") version("1.0.0", sha256="f25c189783b57801f298dfff8770f42733a43f926668aceff4abd287b6e3a4d1") diff --git a/var/spack/repos/builtin/packages/ps-lite/package.py b/var/spack/repos/builtin/packages/ps-lite/package.py index 8a2c0c5ce68bad..84360da87822ad 100644 --- a/var/spack/repos/builtin/packages/ps-lite/package.py +++ b/var/spack/repos/builtin/packages/ps-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PsLite(CMakePackage): homepage = "https://github.com/dmlc/ps-lite" git = "https://github.com/dmlc/ps-lite.git" + license("Apache-2.0") + version("master", branch="master") version("20170328", commit="acdb698fa3bb80929ef83bb37c705f025e119b82") diff --git a/var/spack/repos/builtin/packages/psalg/package.py b/var/spack/repos/builtin/packages/psalg/package.py index 7c09dfb0aee819..295f38b21ab277 100644 --- a/var/spack/repos/builtin/packages/psalg/package.py +++ b/var/spack/repos/builtin/packages/psalg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pscmc/package.py b/var/spack/repos/builtin/packages/pscmc/package.py index 98c77fbb3cd5eb..03b08534d770eb 100644 --- a/var/spack/repos/builtin/packages/pscmc/package.py +++ b/var/spack/repos/builtin/packages/pscmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Pscmc(MakefilePackage): homepage = "https://github.com/JianyuanXiao/PSCMC" git = "https://github.com/JianyuanXiao/PSCMC.git" + license("BSD-3-Clause") + version("master", branch="master") def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/psi4/package.py b/var/spack/repos/builtin/packages/psi4/package.py index 43a4f7f16b04fe..497adbf65a20f2 100644 --- a/var/spack/repos/builtin/packages/psi4/package.py +++ b/var/spack/repos/builtin/packages/psi4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Psi4(CMakePackage): homepage = "https://www.psicode.org/" url = "https://github.com/psi4/psi4/archive/v1.3.2.tar.gz" + license("LGPL-3.0-only") + version("1.3.2", sha256="ed76c67803b6420f35f57a6dd31c47108b9145b8c9fced5c94cdc179f6b5fbf3") variant( diff --git a/var/spack/repos/builtin/packages/psimd/package.py b/var/spack/repos/builtin/packages/psimd/package.py index 4f8c8d8bf1cfde..2f5de9d7b9aa3b 100644 --- a/var/spack/repos/builtin/packages/psimd/package.py +++ b/var/spack/repos/builtin/packages/psimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Psimd(CMakePackage): homepage = "https://github.com/Maratyszcza/psimd" git = "https://github.com/Maratyszcza/psimd.git" + license("MIT") + version("master", branch="master") version("2020-05-17", commit="072586a71b55b7f8c584153d223e95687148a900") # py-torch@1.6:1.9 version("2019-12-26", commit="10b4ffc6ea9e2e11668f86969586f88bc82aaefa") # py-torch@1.5 diff --git a/var/spack/repos/builtin/packages/pslib/package.py b/var/spack/repos/builtin/packages/pslib/package.py index 73d2e5415a89fb..99031d78e792e8 100644 --- a/var/spack/repos/builtin/packages/pslib/package.py +++ b/var/spack/repos/builtin/packages/pslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pslib(AutotoolsPackage): homepage = "http://pslib.sourceforge.net/" url = "https://sourceforge.net/projects/pslib/files/pslib/0.4.5/pslib-0.4.5.tar.gz" + license("GPL-2.0-only") + version("0.4.5", sha256="7a33928982b281660206bb3749a4a563e3ac987eea64f41696f212df345212be") depends_on("jpeg") diff --git a/var/spack/repos/builtin/packages/psm/package.py b/var/spack/repos/builtin/packages/psm/package.py index 28beadccb69f34..5946f552d1c85a 100644 --- a/var/spack/repos/builtin/packages/psm/package.py +++ b/var/spack/repos/builtin/packages/psm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Psm(MakefilePackage): url = "https://github.com/intel/psm/archive/v3.3.tar.gz" git = "https://github.com/intel/psm.git" + license("GPL-2.0-only") + version( "3.3", sha256="034b10e24d9f2967ef0f8d0f828572295e89cdfa1ba30c35e288b9b23c3dab8f", diff --git a/var/spack/repos/builtin/packages/psmc/package.py b/var/spack/repos/builtin/packages/psmc/package.py index d027c896274f97..2398433563c52b 100644 --- a/var/spack/repos/builtin/packages/psmc/package.py +++ b/var/spack/repos/builtin/packages/psmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Psmc(MakefilePackage): homepage = "https://github.com/lh3/psmc" git = "https://github.com/lh3/psmc.git" + license("MIT") + version("2016-1-21", commit="e5f7df5d00bb75ec603ae0beff62c0d7e37640b9") depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/psrcat/package.py b/var/spack/repos/builtin/packages/psrcat/package.py index 3a4d0dd05b7985..df8cb88bd4e339 100644 --- a/var/spack/repos/builtin/packages/psrcat/package.py +++ b/var/spack/repos/builtin/packages/psrcat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/psrchive/package.py b/var/spack/repos/builtin/packages/psrchive/package.py index 1841b9441ee94b..f96a70cbd51f41 100644 --- a/var/spack/repos/builtin/packages/psrchive/package.py +++ b/var/spack/repos/builtin/packages/psrchive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Psrchive(AutotoolsPackage): url = "https://sourceforge.net/projects/psrchive/files/psrchive/2022-05-14/psrchive-2022-05-14.tar.gz/download" git = "https://git.code.sf.net/p/psrchive/code.git" + license("AFL-2.1") + version( "2022-05-14", sha256="4d25609837cba1be244fa8adc8f105afe31972f2650bc0b90438862cf35395e1" ) diff --git a/var/spack/repos/builtin/packages/pstreams/package.py b/var/spack/repos/builtin/packages/pstreams/package.py index 071530e5ab5383..2fc2bdaa901188 100644 --- a/var/spack/repos/builtin/packages/pstreams/package.py +++ b/var/spack/repos/builtin/packages/pstreams/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Pstreams(Package): homepage = "http://pstreams.sourceforge.net/" url = "https://sourceforge.net/projects/pstreams/files/pstreams/Release%201.0/pstreams-1.0.1.tar.gz" + license("BSL-1.0") + version("1.0.3", sha256="e9ca807bc6046840deae63207183f9ac516e67187d035429772a5fc7bd3e8fc8") version("1.0.1", sha256="a5f1f2e014392cd0e2cdb508a429e11afe64140db05b7f0a83d7534faa1a9226") diff --git a/var/spack/repos/builtin/packages/pthreadpool/package.py b/var/spack/repos/builtin/packages/pthreadpool/package.py index af19b7ad29d663..7f95850d18e6ba 100644 --- a/var/spack/repos/builtin/packages/pthreadpool/package.py +++ b/var/spack/repos/builtin/packages/pthreadpool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Pthreadpool(CMakePackage): homepage = "https://github.com/Maratyszcza/pthreadpool" git = "https://github.com/Maratyszcza/pthreadpool.git" + license("BSD-2-Clause") + version("master", branch="master") version("2021-04-13", commit="a134dd5d4cee80cce15db81a72e7f929d71dd413") # py-torch@1.9 version("2020-10-05", commit="fa75e65a58a5c70c09c30d17a1fe1c1dff1093ae") # py-torch@1.8 diff --git a/var/spack/repos/builtin/packages/pugixml/package.py b/var/spack/repos/builtin/packages/pugixml/package.py index 05ec0c095bd434..3cb7ae0e64c48f 100644 --- a/var/spack/repos/builtin/packages/pugixml/package.py +++ b/var/spack/repos/builtin/packages/pugixml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Pugixml(CMakePackage): homepage = "https://pugixml.org/" url = "https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz" + license("MIT") + version("1.13", sha256="40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe") version("1.11.4", sha256="8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716") version("1.11", sha256="26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c") diff --git a/var/spack/repos/builtin/packages/pulseaudio/package.py b/var/spack/repos/builtin/packages/pulseaudio/package.py index f96d2af990e6ce..a8056319fcc28e 100644 --- a/var/spack/repos/builtin/packages/pulseaudio/package.py +++ b/var/spack/repos/builtin/packages/pulseaudio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Pulseaudio(AutotoolsPackage): homepage = "https://www.freedesktop.org/wiki/Software/PulseAudio/" url = "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz" + license("LGPL-2.1-or-later") + version("13.0", sha256="961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057") variant("alsa", default=False, description="alsa support") @@ -51,6 +53,7 @@ class Pulseaudio(AutotoolsPackage): depends_on("openssl", when="+openssl") depends_on("perl-xml-parser", type="build") depends_on("speexdsp@1.2:") + depends_on("m4", type="build") def configure_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/pumi/package.py b/var/spack/repos/builtin/packages/pumi/package.py index 5e99fbfac9e9d0..f06b0078336178 100644 --- a/var/spack/repos/builtin/packages/pumi/package.py +++ b/var/spack/repos/builtin/packages/pumi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Pumi(CMakePackage): tags = ["e4s"] + license("BSD-3-Clause") + # We will use the scorec/core master branch as the 'nightly' version # of pumi in spack. The master branch is more stable than the # scorec/core develop branch and we prefer not to expose spack users diff --git a/var/spack/repos/builtin/packages/pv/package.py b/var/spack/repos/builtin/packages/pv/package.py index 81451f4bd1c16b..bfefec34fe192c 100644 --- a/var/spack/repos/builtin/packages/pv/package.py +++ b/var/spack/repos/builtin/packages/pv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class Pv(AutotoolsPackage): homepage = "https://www.ivarch.com/programs/pv.shtml" url = "https://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2" + license("Artistic-2.0") + version("1.6.20", sha256="e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603") version("1.6.6", sha256="608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1") diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index bcefdb1a13fe3e..0000c87e810ff0 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pwgen/package.py b/var/spack/repos/builtin/packages/pwgen/package.py index 87ca5be79eb964..dde641f0693699 100644 --- a/var/spack/repos/builtin/packages/pwgen/package.py +++ b/var/spack/repos/builtin/packages/pwgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pwgen(AutotoolsPackage): maintainers("cessenat") + license("GPL-2.0-only") + version("2.08", sha256="dab03dd30ad5a58e578c5581241a6e87e184a18eb2c3b2e0fffa8a9cf105c97b") depends_on("coreutils", type="build") diff --git a/var/spack/repos/builtin/packages/pxz/package.py b/var/spack/repos/builtin/packages/pxz/package.py index e7aab32335bcdf..8d49db024c85df 100644 --- a/var/spack/repos/builtin/packages/pxz/package.py +++ b/var/spack/repos/builtin/packages/pxz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-3to2/package.py b/var/spack/repos/builtin/packages/py-3to2/package.py index b39eb4398d2e54..2b29cc17835da2 100644 --- a/var/spack/repos/builtin/packages/py-3to2/package.py +++ b/var/spack/repos/builtin/packages/py-3to2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-4suite-xml/package.py b/var/spack/repos/builtin/packages/py-4suite-xml/package.py index 40a33a3ebd3da2..ffb1a78e43ab61 100644 --- a/var/spack/repos/builtin/packages/py-4suite-xml/package.py +++ b/var/spack/repos/builtin/packages/py-4suite-xml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-a2wsgi/package.py b/var/spack/repos/builtin/packages/py-a2wsgi/package.py index 84c0c75b888f29..085c4d35808cba 100644 --- a/var/spack/repos/builtin/packages/py-a2wsgi/package.py +++ b/var/spack/repos/builtin/packages/py-a2wsgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyA2wsgi(PythonPackage): homepage = "https://github.com/abersheeran/a2wsgi" pypi = "a2wsgi/a2wsgi-1.6.0.tar.gz" + license("Apache-2.0") + version("1.7.0", sha256="a906f62c0250eb0201120b93417dd0b12b105b5db35af431bfe86ef0dc5bbab2") version("1.6.0", sha256="67a9902db6da72c268a24d4e5d01348f736980a577279b7df801c8902aba8554") diff --git a/var/spack/repos/builtin/packages/py-abcpy/package.py b/var/spack/repos/builtin/packages/py-abcpy/package.py index 0e0fabd9daf458..cd9b7e51d8e4b2 100644 --- a/var/spack/repos/builtin/packages/py-abcpy/package.py +++ b/var/spack/repos/builtin/packages/py-abcpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyAbcpy(PythonPackage): homepage = "https://github.com/eth-cscs/abcpy" pypi = "abcpy/abcpy-0.6.3.tar.gz" + license("BSD-3-Clause-Clear") + version("0.6.3", sha256="14cd959f3ccff8f5fd1d16239b8706cc8d1c1e2fe25d72855f500f005de41245") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py index dfaed29c7d4f61..fd9f00c88ac399 100644 --- a/var/spack/repos/builtin/packages/py-abipy/package.py +++ b/var/spack/repos/builtin/packages/py-abipy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-about-time/package.py b/var/spack/repos/builtin/packages/py-about-time/package.py index 2d0cacb5d5d579..a3ff378946756f 100644 --- a/var/spack/repos/builtin/packages/py-about-time/package.py +++ b/var/spack/repos/builtin/packages/py-about-time/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAboutTime(PythonPackage): homepage = "https://github.com/rsalmei/about-time" pypi = "about-time/about-time-4.1.0.tar.gz" + license("MIT") + version("4.2.1", sha256="6a538862d33ce67d997429d14998310e1dbfda6cb7d9bbfbf799c4709847fece") version("4.1.0", sha256="963b1f3739b0c9732eb205031762b76f1291d89b5d0c8220a8d5b154e32ce650") version("3.1.1", sha256="586b329450c9387d1ae8c42d2db4f5b4c57a54508d0f1b7bb00322ffd5ce9f9b") diff --git a/var/spack/repos/builtin/packages/py-absl-py/package.py b/var/spack/repos/builtin/packages/py-absl-py/package.py index 87e6ed84422ef9..a14dead4824337 100644 --- a/var/spack/repos/builtin/packages/py-absl-py/package.py +++ b/var/spack/repos/builtin/packages/py-absl-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAbslPy(PythonPackage): pypi = "absl-py/absl-py-0.7.0.tar.gz" + license("Apache-2.0") + version("1.4.0", sha256="d2c244d01048ba476e7c080bd2c6df5e141d211de80223460d5b3b8a2a58433d") version("1.2.0", sha256="f568809938c49abbda89826223c992b630afd23c638160ad7840cfe347710d97") version("1.1.0", sha256="3aa39f898329c2156ff525dfa69ce709e42d77aab18bf4917719d6f260aa6a08") diff --git a/var/spack/repos/builtin/packages/py-accelerate/package.py b/var/spack/repos/builtin/packages/py-accelerate/package.py index 564def61b8754c..34df158f23b104 100644 --- a/var/spack/repos/builtin/packages/py-accelerate/package.py +++ b/var/spack/repos/builtin/packages/py-accelerate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAccelerate(PythonPackage): maintainers("meyersbs") + license("Apache-2.0") + version("0.21.0", sha256="e2959a0bf74d97c0b3c0e036ed96065142a060242281d27970d4c4e34f11ca59") version("0.16.0", sha256="d13e30f3e6debfb46cada7b931af85560619b6a6a839d0cafeeab6ed7c6a498d") diff --git a/var/spack/repos/builtin/packages/py-accessible-pygments/package.py b/var/spack/repos/builtin/packages/py-accessible-pygments/package.py index e2254161c79dda..0e8942d36d2875 100644 --- a/var/spack/repos/builtin/packages/py-accessible-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-accessible-pygments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAccessiblePygments(PythonPackage): homepage = "https://github.com/Quansight-Labs/accessible-pygments" pypi = "accessible-pygments/accessible-pygments-0.0.4.tar.gz" + license("BSD-3-Clause") + version("0.0.4", sha256="e7b57a9b15958e9601c7e9eb07a440c813283545a20973f2574a5f453d0e953e") depends_on("py-pygments@1.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-accimage/package.py b/var/spack/repos/builtin/packages/py-accimage/package.py index 765bf0d35f2625..46f226676a3521 100644 --- a/var/spack/repos/builtin/packages/py-accimage/package.py +++ b/var/spack/repos/builtin/packages/py-accimage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAccimage(PythonPackage): homepage = "https://github.com/pytorch/accimage" url = "https://github.com/pytorch/accimage/archive/v0.1.1.tar.gz" + license("BSD-2-Clause") + version("0.1.1", sha256="573c56866a42683c7cf25185620fe82ec2ce78468e0621c29fac8f4134a785f5") depends_on("python", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-acme-tiny/package.py b/var/spack/repos/builtin/packages/py-acme-tiny/package.py index 4e3ceb6da6b887..a27bb636c1b28a 100644 --- a/var/spack/repos/builtin/packages/py-acme-tiny/package.py +++ b/var/spack/repos/builtin/packages/py-acme-tiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAcmeTiny(PythonPackage): homepage = "https://github.com/diafygi/acme-tiny" git = "https://github.com/diafygi/acme-tiny.git" + license("MIT") + version("master", branch="master") version("4.0.4", commit="5350420d35177eda733d85096433a24e55f8d00e") diff --git a/var/spack/repos/builtin/packages/py-adal/package.py b/var/spack/repos/builtin/packages/py-adal/package.py index 9919f83ae64df9..3c0e0ce27eac46 100644 --- a/var/spack/repos/builtin/packages/py-adal/package.py +++ b/var/spack/repos/builtin/packages/py-adal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyAdal(PythonPackage): homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python" pypi = "adal/adal-1.2.4.tar.gz" + license("MIT") + version("1.2.4", sha256="7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-adb-enhanced/package.py b/var/spack/repos/builtin/packages/py-adb-enhanced/package.py index c237f424a2979d..ed33979f56eb51 100644 --- a/var/spack/repos/builtin/packages/py-adb-enhanced/package.py +++ b/var/spack/repos/builtin/packages/py-adb-enhanced/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAdbEnhanced(PythonPackage): homepage = "https://opencollective.com/ashishb" url = "https://github.com/ashishb/adb-enhanced/archive/2.5.4.tar.gz" + license("Apache-2.0") + version("2.5.10", sha256="9e913d09814ce99974c455a766c5b616a92bca551e657517d6e079882eb19bdb") version("2.5.4", sha256="329ee2e0cfceaa41c591398b365d9acdfd45ffe913c64ac06e1538041986fffb") version("2.5.3", sha256="5a1d5182d1a073b440e862e5481c7a21073eccc3cda7a4774a2aa311fee9bbdc") diff --git a/var/spack/repos/builtin/packages/py-addict/package.py b/var/spack/repos/builtin/packages/py-addict/package.py index 4f687de816ec90..93ae398fa602dc 100644 --- a/var/spack/repos/builtin/packages/py-addict/package.py +++ b/var/spack/repos/builtin/packages/py-addict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAddict(PythonPackage): homepage = "https://github.com/mewwts/addict" url = "https://github.com/mewwts/addict/archive/v2.2.1.tar.gz" + license("MIT") + version("2.2.1", sha256="398bba9e7fa25e2ce144c5c4b8ec6208e89b9445869403dfa88ab66ec110fa12") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index 5cc3eee27e3c1d..be61bec7719cbc 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py b/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py index 54adf953346feb..032fd3ce397235 100644 --- a/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py +++ b/var/spack/repos/builtin/packages/py-advancedhtmlparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAdvancedhtmlparser(PythonPackage): homepage = "https://github.com/kata198/AdvancedHTMLParser" pypi = "advancedhtmlparser/AdvancedHTMLParser-8.1.4.tar.gz" + license("LGPL-3.0-or-later") + version("9.0.1", sha256="1b7f632ca4c61fca50ee896c84112b97915c07d5b25b9527aefe7cbad8458837") version("8.1.4", sha256="21a73137026c8ec3248c654a24cc40064196029256cdf71681149f6835e9ed39") diff --git a/var/spack/repos/builtin/packages/py-aenum/package.py b/var/spack/repos/builtin/packages/py-aenum/package.py index e9934b0d1548bf..c36fe02e0427d5 100644 --- a/var/spack/repos/builtin/packages/py-aenum/package.py +++ b/var/spack/repos/builtin/packages/py-aenum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-affine/package.py b/var/spack/repos/builtin/packages/py-affine/package.py index 30fb9030e3e437..12c75d377ad6bb 100644 --- a/var/spack/repos/builtin/packages/py-affine/package.py +++ b/var/spack/repos/builtin/packages/py-affine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class PyAffine(PythonPackage): depends_on("py-setuptools", type="build") + license("BSD-3-Clause") + version("2.1.0", sha256="b67b7dee9a9865185a931758a3e347ad8583d0ac985895b90985a477ccfa4745") diff --git a/var/spack/repos/builtin/packages/py-agate-dbf/package.py b/var/spack/repos/builtin/packages/py-agate-dbf/package.py index e138add5278a78..eace15bf11d7be 100644 --- a/var/spack/repos/builtin/packages/py-agate-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-agate-dbf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAgateDbf(PythonPackage): homepage = "https://agate-dbf.readthedocs.io/en/latest/" pypi = "agate-dbf/agate-dbf-0.2.1.tar.gz" + license("MIT") + version("0.2.2", sha256="589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b") version("0.2.1", sha256="00c93c498ec9a04cc587bf63dd7340e67e2541f0df4c9a7259d7cb3dd4ce372f") diff --git a/var/spack/repos/builtin/packages/py-agate-excel/package.py b/var/spack/repos/builtin/packages/py-agate-excel/package.py index 55884b05eddcd6..e9bc16d6249793 100644 --- a/var/spack/repos/builtin/packages/py-agate-excel/package.py +++ b/var/spack/repos/builtin/packages/py-agate-excel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAgateExcel(PythonPackage): homepage = "https://agate-excel.readthedocs.io/en/latest/" pypi = "agate-excel/agate-excel-0.2.3.tar.gz" + license("MIT") + version("0.2.3", sha256="8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-agate-sql/package.py b/var/spack/repos/builtin/packages/py-agate-sql/package.py index 55ff7a083c9fdd..71049cd42686b5 100644 --- a/var/spack/repos/builtin/packages/py-agate-sql/package.py +++ b/var/spack/repos/builtin/packages/py-agate-sql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAgateSql(PythonPackage): homepage = "https://agate-sql.readthedocs.io/en/latest/" pypi = "agate-sql/agate-sql-0.5.4.tar.gz" + license("MIT") + version("0.5.4", sha256="9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-agate/package.py b/var/spack/repos/builtin/packages/py-agate/package.py index ea0580fff0df7a..1a6a81d2db4ad8 100644 --- a/var/spack/repos/builtin/packages/py-agate/package.py +++ b/var/spack/repos/builtin/packages/py-agate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAgate(PythonPackage): homepage = "https://agate.readthedocs.io/en/latest/" pypi = "agate/agate-1.6.1.tar.gz" + license("MIT") + version("1.6.1", sha256="c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ahpy/package.py b/var/spack/repos/builtin/packages/py-ahpy/package.py index 699400a2670b5e..ccb885c9048353 100644 --- a/var/spack/repos/builtin/packages/py-ahpy/package.py +++ b/var/spack/repos/builtin/packages/py-ahpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAhpy(PythonPackage): homepage = "https://github.com/PhilipGriffith/AHPy" pypi = "ahpy/ahpy-2.0.tar.gz" + license("MIT") + version("2.0", sha256="f0af7b81b51466a055778d84f64c98f5cc3e1ba34aaeaedc48ba0b91008e40e3") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aiobotocore/package.py b/var/spack/repos/builtin/packages/py-aiobotocore/package.py index c99ba2331560db..6892f98978d441 100644 --- a/var/spack/repos/builtin/packages/py-aiobotocore/package.py +++ b/var/spack/repos/builtin/packages/py-aiobotocore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAiobotocore(PythonPackage): homepage = "https://aiobotocore.readthedocs.io/en/latest/" pypi = "aiobotocore/aiobotocore-1.2.1.tar.gz" + license("Apache-2.0") + version("2.5.0", sha256="6a5b397cddd4f81026aa91a14c7dd2650727425740a5af8ba75127ff663faf67") version("2.4.2", sha256="0603b74a582dffa7511ce7548d07dc9b10ec87bc5fb657eb0b34f9bd490958bf") version("1.2.1", sha256="58cc422e65fc89f7cb78eca740d241ac8e15f39f6b308cc23152711e8a987d45") diff --git a/var/spack/repos/builtin/packages/py-aiocontextvars/package.py b/var/spack/repos/builtin/packages/py-aiocontextvars/package.py index ab668c2b4a653a..6880c27ae428c5 100644 --- a/var/spack/repos/builtin/packages/py-aiocontextvars/package.py +++ b/var/spack/repos/builtin/packages/py-aiocontextvars/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAiocontextvars(PythonPackage): homepage = "https://github.com/fantix/aiocontextvars" pypi = "aiocontextvars/aiocontextvars-0.2.2.tar.gz" + license("BSD-3-Clause") + version("0.2.2", sha256="f027372dc48641f683c559f247bd84962becaacdc9ba711d583c3871fb5652aa") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aiodns/package.py b/var/spack/repos/builtin/packages/py-aiodns/package.py index edcec0c430f01d..5ef1ad8dcf4cc8 100644 --- a/var/spack/repos/builtin/packages/py-aiodns/package.py +++ b/var/spack/repos/builtin/packages/py-aiodns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAiodns(PythonPackage): homepage = "https://pypi.org/project/aiodns/" pypi = "aiodns/aiodns-2.0.0.tar.gz" + license("MIT") + version("2.0.0", sha256="815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d") version("1.2.0", sha256="d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449") version("1.1.1", sha256="d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea") diff --git a/var/spack/repos/builtin/packages/py-aiofiles/package.py b/var/spack/repos/builtin/packages/py-aiofiles/package.py index ed1e2dc3e6fbda..562490687e46bc 100644 --- a/var/spack/repos/builtin/packages/py-aiofiles/package.py +++ b/var/spack/repos/builtin/packages/py-aiofiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAiofiles(PythonPackage): homepage = "https://github.com/Tinche/aiofiles" pypi = "aiofiles/aiofiles-0.5.0.tar.gz" + license("Apache-2.0") + version("0.7.0", sha256="a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4") version("0.5.0", sha256="98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") diff --git a/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py index c586323a8f97d5..5a2231f11a0923 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAiohttpCors(PythonPackage): homepage = "https://github.com/aio-libs/aiohttp-cors" pypi = "aiohttp_cors/aiohttp-cors-0.7.0.tar.gz" + license("Apache-2.0") + version("0.7.0", sha256="4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d") depends_on("python@3.4.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aiohttp/package.py b/var/spack/repos/builtin/packages/py-aiohttp/package.py index 9e61b9e29e961b..28fe3f58a33eb6 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAiohttp(PythonPackage): homepage = "https://github.com/aio-libs/aiohttp" pypi = "aiohttp/aiohttp-3.8.1.tar.gz" + license("Apache-2.0") + version("3.8.4", sha256="bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c") version("3.8.1", sha256="fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578") version("3.8.0", sha256="d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d") diff --git a/var/spack/repos/builtin/packages/py-aioitertools/package.py b/var/spack/repos/builtin/packages/py-aioitertools/package.py index 66abcf9afcb001..72186c20acb38a 100644 --- a/var/spack/repos/builtin/packages/py-aioitertools/package.py +++ b/var/spack/repos/builtin/packages/py-aioitertools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAioitertools(PythonPackage): homepage = "https://aioitertools.omnilib.dev/en/stable/" pypi = "aioitertools/aioitertools-0.7.1.tar.gz" + license("MIT") + version("0.11.0", sha256="42c68b8dd3a69c2bf7f2233bf7df4bb58b557bca5252ac02ed5187bbc67d6831") version("0.7.1", sha256="54a56c7cf3b5290d1cb5e8974353c9f52c677612b5d69a859369a020c53414a3") diff --git a/var/spack/repos/builtin/packages/py-aioredis/package.py b/var/spack/repos/builtin/packages/py-aioredis/package.py index a0dfbfb5f74b32..c5f845b8f7e206 100644 --- a/var/spack/repos/builtin/packages/py-aioredis/package.py +++ b/var/spack/repos/builtin/packages/py-aioredis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAioredis(PythonPackage): homepage = "https://github.com/aio-libs/aioredis" pypi = "aioredis/aioredis-1.3.1.tar.gz" + license("MIT") + version("1.3.1", sha256="15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aiosignal/package.py b/var/spack/repos/builtin/packages/py-aiosignal/package.py index f1799924591ace..d946554ccd7ac5 100644 --- a/var/spack/repos/builtin/packages/py-aiosignal/package.py +++ b/var/spack/repos/builtin/packages/py-aiosignal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAiosignal(PythonPackage): homepage = "https://aiosignal.readthedocs.io/" pypi = "aiosignal/aiosignal-1.2.0.tar.gz" + license("Apache-2.0") + version("1.2.0", sha256="78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aiosqlite/package.py b/var/spack/repos/builtin/packages/py-aiosqlite/package.py index 92d12117af6da8..094df2515f90a6 100644 --- a/var/spack/repos/builtin/packages/py-aiosqlite/package.py +++ b/var/spack/repos/builtin/packages/py-aiosqlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAiosqlite(PythonPackage): homepage = "https://aiosqlite.omnilib.dev" pypi = "aiosqlite/aiosqlite-0.17.0.tar.gz" + license("MIT") + version("0.17.0", sha256="f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-alabaster/package.py b/var/spack/repos/builtin/packages/py-alabaster/package.py index 448033eb36549f..44fc988f00168a 100644 --- a/var/spack/repos/builtin/packages/py-alabaster/package.py +++ b/var/spack/repos/builtin/packages/py-alabaster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-alembic/package.py b/var/spack/repos/builtin/packages/py-alembic/package.py index 322a33c18cc8d9..2677cc1a1903ab 100644 --- a/var/spack/repos/builtin/packages/py-alembic/package.py +++ b/var/spack/repos/builtin/packages/py-alembic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyAlembic(PythonPackage): pypi = "alembic/alembic-1.0.7.tar.gz" + license("MIT") + version("1.5.5", sha256="df0028c19275a2cff137e39617a39cdcdbd1173733b87b6bfa257b7c0860213b") version("1.0.7", sha256="16505782b229007ae905ef9e0ae6e880fddafa406f086ac7d442c1aaf712f8c2") diff --git a/var/spack/repos/builtin/packages/py-alive-progress/package.py b/var/spack/repos/builtin/packages/py-alive-progress/package.py index 00bb4230f765c3..944dce0a95f557 100644 --- a/var/spack/repos/builtin/packages/py-alive-progress/package.py +++ b/var/spack/repos/builtin/packages/py-alive-progress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAliveProgress(PythonPackage): homepage = "https://github.com/rsalmei/alive-progress" pypi = "alive-progress/alive-progress-2.4.1.tar.gz" + license("MIT") + version("2.4.1", sha256="089757c8197f27ad972ba27e1060f6db92368d83c736884e159034fd74865323") version("1.6.2", sha256="642e1ce98becf226c8c36bf24e10221085998c5465a357a66fb83b7dc618b43e") diff --git a/var/spack/repos/builtin/packages/py-alpaca-eval/package.py b/var/spack/repos/builtin/packages/py-alpaca-eval/package.py index 9ef8a2d14c4ea6..2403a2dea33a67 100644 --- a/var/spack/repos/builtin/packages/py-alpaca-eval/package.py +++ b/var/spack/repos/builtin/packages/py-alpaca-eval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAlpacaEval(PythonPackage): maintainers("meyersbs") + license("Apache-2.0") + version("0.2.8", sha256="5b21b74d7362ee229481b6a6d826dd620b2ef6b82e4f5470645e0a4b696a31e6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-alpaca-farm/package.py b/var/spack/repos/builtin/packages/py-alpaca-farm/package.py index 8e278cb00ffd36..78c533e2c53aa5 100644 --- a/var/spack/repos/builtin/packages/py-alpaca-farm/package.py +++ b/var/spack/repos/builtin/packages/py-alpaca-farm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAlpacaFarm(PythonPackage): maintainers("meyersbs") + license("Apache-2.0") + version("0.1.9", sha256="1039d33c814d0bbbcab6a0e77ed8e897992ad7107d5c4999d56bdad7e0b0a59f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-alphafold/package.py b/var/spack/repos/builtin/packages/py-alphafold/package.py index ad95a4201b48ef..37bc178562d718 100644 --- a/var/spack/repos/builtin/packages/py-alphafold/package.py +++ b/var/spack/repos/builtin/packages/py-alphafold/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyAlphafold(PythonPackage, CudaPackage): url = "https://github.com/deepmind/alphafold/archive/refs/tags/v2.1.1.tar.gz" maintainers("aweits") + license("Apache-2.0") + version("2.2.4", sha256="8d756e16f6dc7897331d834aade8493820d0ff6a03bf60ce511bac4756c1b1e8") version("2.1.1", sha256="1adb6e213ba9ac321fc1acb1c563ba9b4fc054c1cebe1191bc0e2aaa671dadf7") diff --git a/var/spack/repos/builtin/packages/py-altair/package.py b/var/spack/repos/builtin/packages/py-altair/package.py index b5ff71e2d5c810..af10abc209a286 100644 --- a/var/spack/repos/builtin/packages/py-altair/package.py +++ b/var/spack/repos/builtin/packages/py-altair/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,15 +9,32 @@ class PyAltair(PythonPackage): """Declarative statistical visualization library for Python""" - pypi = "altair/altair-4.2.0.tar.gz" + pypi = "altair/altair-5.2.0.tar.gz" + license("BSD-3-Clause") + + version("5.2.0", sha256="2ad7f0c8010ebbc46319cc30febfb8e59ccf84969a201541c207bc3a4fa6cf81") + version("5.1.2", sha256="e5f52a71853a607c61ce93ad4a414b3d486cd0d46ac597a24ae8bd1ac99dd460") + version("5.1.1", sha256="ad6cd6983c8db69a34dd68e42653f6172b7fc3775b7190005107f1b4fc60d64d") + version("5.1.0", sha256="46d2b1a9fa29eeed24513262cb1de13a40d55c04580fc21799d5de3991fea8ff") + version("5.0.1", sha256="087d7033cb2d6c228493a053e12613058a5d47faf6a36aea3ff60305fd8b4cb0") + version("5.0.0", sha256="394c3d8be96f9cc90e15a0eee3634cc5b6f19e470fd2045759892623bd9a3fb2") + version("4.2.2", sha256="39399a267c49b30d102c10411e67ab26374156a84b1aeb9fcd15140429ba49c5") + version("4.2.1", sha256="4939fd9119c57476bf305af9ca0bd1aa7779b2450b874d3623660e879d0fcad1") version("4.2.0", sha256="d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026") depends_on("python@3.7:", type=("build", "run")) - depends_on("py-setuptools@40.6:", type="build") - depends_on("py-entrypoints", type=("build", "run")) - depends_on("py-jsonschema@3:", type=("build", "run")) + depends_on("py-setuptools@40.6:", type="build", when="@:4") + depends_on("py-entrypoints", type=("build", "run"), when="@2.0.0:4") + + depends_on("py-hatchling", type=("build"), when="@5.0.0:") + + depends_on("py-importlib-metadata", type=("build", "run"), when="@5.0.0:5.0") + depends_on("py-typing-extensions@4.0.1:", type=("build", "run"), when="@5.0.0: ^python@:3.10") + depends_on("py-jinja2", type=("build", "run")) + depends_on("py-jsonschema@3.0.0:", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-pandas@0.18:", type=("build", "run")) + depends_on("py-pandas@0.25:", type=("build", "run"), when="@5.1.0:") depends_on("py-toolz", type=("build", "run")) - depends_on("py-jinja2", type=("build", "run")) + depends_on("py-packaging", type=("build", "run"), when="@5.1.0:") diff --git a/var/spack/repos/builtin/packages/py-altgraph/package.py b/var/spack/repos/builtin/packages/py-altgraph/package.py index 682a89878cb8e9..c95a321d81af07 100644 --- a/var/spack/repos/builtin/packages/py-altgraph/package.py +++ b/var/spack/repos/builtin/packages/py-altgraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAltgraph(PythonPackage): pypi = "altgraph/altgraph-0.16.1.tar.gz" + license("MIT") + version("0.16.1", sha256="ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-amici/package.py b/var/spack/repos/builtin/packages/py-amici/package.py index ffa03c928f7585..7b6bac8e88daf0 100644 --- a/var/spack/repos/builtin/packages/py-amici/package.py +++ b/var/spack/repos/builtin/packages/py-amici/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-amityping/package.py b/var/spack/repos/builtin/packages/py-amityping/package.py index 3b00d4ba35617c..37216e15412f20 100644 --- a/var/spack/repos/builtin/packages/py-amityping/package.py +++ b/var/spack/repos/builtin/packages/py-amityping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAmityping(PythonPackage): maintainers("valmar") + license("BSD-3-Clause-LBNL") + version("1.1.12", sha256="e00e7102a53fa6ee343f018669f6b811d703a2da4728b497f80579bf89efbd3c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-amplpy/package.py b/var/spack/repos/builtin/packages/py-amplpy/package.py index f5254b57cdbe55..cc9d0c069b6e0f 100644 --- a/var/spack/repos/builtin/packages/py-amplpy/package.py +++ b/var/spack/repos/builtin/packages/py-amplpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyAmplpy(PythonPackage): homepage = "https://ampl.com/" pypi = "amplpy/amplpy-0.8.6.tar.gz" + license("BSD-3-Clause") + version("0.8.6", sha256="ad0945d69f75e7762802bb54849009717fbcf226a6da6f37b539d9534bdcf68d") depends_on("py-future@0.15.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ampltools/package.py b/var/spack/repos/builtin/packages/py-ampltools/package.py index 6174f786052a41..605e65912aeb5e 100644 --- a/var/spack/repos/builtin/packages/py-ampltools/package.py +++ b/var/spack/repos/builtin/packages/py-ampltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAmpltools(PythonPackage): homepage = "https://ampl.com/" pypi = "ampltools/ampltools-0.4.6.tar.gz" + license("BSD-3-Clause") + version("0.4.6", sha256="d54b399c1d78d02e3f4023aa2335b57832deb7d31cdefe4e219e4f2a2bb19a83") depends_on("py-requests", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-amqp/package.py b/var/spack/repos/builtin/packages/py-amqp/package.py index cf635bbd6150df..13b5e912eafbd0 100644 --- a/var/spack/repos/builtin/packages/py-amqp/package.py +++ b/var/spack/repos/builtin/packages/py-amqp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyAmqp(PythonPackage): pypi = "amqp/amqp-2.4.1.tar.gz" + license("BSD-3-Clause") + version("5.0.9", sha256="1e5f707424e544078ca196e72ae6a14887ce74e02bd126be54b7c03c971bef18") version("5.0.1", sha256="9881f8e6fe23e3db9faa6cfd8c05390213e1d1b95c0162bc50552cad75bffa5f") version("2.6.1", sha256="70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21") diff --git a/var/spack/repos/builtin/packages/py-amrex/package.py b/var/spack/repos/builtin/packages/py-amrex/package.py index ee2659f4c34dc3..218a3b4ac82ce2 100644 --- a/var/spack/repos/builtin/packages/py-amrex/package.py +++ b/var/spack/repos/builtin/packages/py-amrex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAmrex(PythonPackage, CudaPackage, ROCmPackage): maintainers("ax3l", "RTSandberg", "sayerhs", "WeiqunZhang") + license("BSD-3-Clause-LBNL") + version("develop", branch="development") variant("dimensions", default="3", description="Dimensionality", values=("1", "2", "3")) diff --git a/var/spack/repos/builtin/packages/py-angel/package.py b/var/spack/repos/builtin/packages/py-angel/package.py index f679c9f4ce91c1..c1e5da3b2a80d3 100644 --- a/var/spack/repos/builtin/packages/py-angel/package.py +++ b/var/spack/repos/builtin/packages/py-angel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAngel(PythonPackage): homepage = "https://github.com/PacificBiosciences/ANGEL" url = "https://github.com/PacificBiosciences/ANGEL/archive/v3.0.tar.gz" + license("MIT") + version("3.0", sha256="a0319553055d3dfc84a4f732ed246c180c23ee9c397810c96acd7940721ae57d") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-aniso8601/package.py b/var/spack/repos/builtin/packages/py-aniso8601/package.py index 17946429114297..c3a1755148894d 100644 --- a/var/spack/repos/builtin/packages/py-aniso8601/package.py +++ b/var/spack/repos/builtin/packages/py-aniso8601/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAniso8601(PythonPackage): homepage = "https://bitbucket.org/nielsenb/aniso8601" pypi = "aniso8601/aniso8601-9.0.1.tar.gz" + license("BSD-3-Clause") + version("9.0.1", sha256="72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973") version("7.0.0", sha256="513d2b6637b7853806ae79ffaca6f3e8754bdd547048f5ccc1420aec4b714f1e") diff --git a/var/spack/repos/builtin/packages/py-anndata/package.py b/var/spack/repos/builtin/packages/py-anndata/package.py index 47829d1dcbccd4..56d812dbf2b581 100644 --- a/var/spack/repos/builtin/packages/py-anndata/package.py +++ b/var/spack/repos/builtin/packages/py-anndata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAnndata(PythonPackage): homepage = "https://github.com/theislab/anndata" pypi = "anndata/anndata-0.8.0.tar.gz" + license("BSD-3-Clause") + version("0.8.0", sha256="94d2cc6f76c0317c0ac28564e3092b313b7ad19c737d66701961f3e620b9066e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-annexremote/package.py b/var/spack/repos/builtin/packages/py-annexremote/package.py index 7942ddd3733660..34b1613c317146 100644 --- a/var/spack/repos/builtin/packages/py-annexremote/package.py +++ b/var/spack/repos/builtin/packages/py-annexremote/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAnnexremote(PythonPackage): homepage = "https://github.com/Lykos153/AnnexRemote" pypi = "annexremote/annexremote-1.5.0.tar.gz" + license("GPL-3.0-only") + version("1.6.0", sha256="779a43e5b1b4afd294761c6587dee8ac68f453a5a8cc40f419e9ca777573ae84") version("1.5.0", sha256="92f32b6f5461cbaeefe0c60b32f9c1e0c1dbe4e57b8ee425affb56f4060f64ef") diff --git a/var/spack/repos/builtin/packages/py-annoy/package.py b/var/spack/repos/builtin/packages/py-annoy/package.py index 3aff3116ca894f..6d65d9ae8cf775 100644 --- a/var/spack/repos/builtin/packages/py-annoy/package.py +++ b/var/spack/repos/builtin/packages/py-annoy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAnnoy(PythonPackage): homepage = "https://github.com/spotify/annoy" pypi = "annoy/annoy-1.17.1.tar.gz" + license("Apache-2.0") + version("1.17.1", sha256="bf177dbeafb81f63b2ac1e1246b1f26a2acc82e73ba46638734d29d8258122da") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ansi2html/package.py b/var/spack/repos/builtin/packages/py-ansi2html/package.py index b5ab52c3442f4c..bbe5d1e276ca1d 100644 --- a/var/spack/repos/builtin/packages/py-ansi2html/package.py +++ b/var/spack/repos/builtin/packages/py-ansi2html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAnsi2html(PythonPackage): maintainers("dorton21") + license("LGPL-3.0-or-later") + version("1.6.0", sha256="0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ansible/package.py b/var/spack/repos/builtin/packages/py-ansible/package.py index b7804697123786..a72ce010062af3 100644 --- a/var/spack/repos/builtin/packages/py-ansible/package.py +++ b/var/spack/repos/builtin/packages/py-ansible/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAnsible(PythonPackage): homepage = "https://github.com/ansible" url = "https://github.com/ansible/ansible/archive/v2.9.1.tar.gz" + license("GPL-3.0-or-later") + version("2.9.2", sha256="27673726435e8773ef031ef6ffb121b8ec75b85b07b7684454b430c3c9a848a9") version("2.9.1", sha256="087a7644890e27c26171b0d24fc5d64024f12201ffb81d222aaa5704987e4c12") version("2.9.0", sha256="a2a9b1a74f3d47b82f9ea9da10ebf3573fa10c1783b7ed9b7eb937c7052fcb13") diff --git a/var/spack/repos/builtin/packages/py-ansimarkup/package.py b/var/spack/repos/builtin/packages/py-ansimarkup/package.py index deedb8e44b6042..5d63ac8e7b97e9 100644 --- a/var/spack/repos/builtin/packages/py-ansimarkup/package.py +++ b/var/spack/repos/builtin/packages/py-ansimarkup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAnsimarkup(PythonPackage): maintainers("LydDeb") + license("BSD-3-Clause") + version("2.1.0", sha256="7b3e3d93fecc5b64d23a6e8eb96dbc8b0b576a211829d948afb397d241a8c51b") version("1.5.0", sha256="96c65d75bbed07d3dcbda8dbede8c2252c984f90d0ca07434b88a6bbf345fad3") diff --git a/var/spack/repos/builtin/packages/py-ansiwrap/package.py b/var/spack/repos/builtin/packages/py-ansiwrap/package.py index 95f92cfb6b95d6..f8dafccc558db6 100644 --- a/var/spack/repos/builtin/packages/py-ansiwrap/package.py +++ b/var/spack/repos/builtin/packages/py-ansiwrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAnsiwrap(PythonPackage): homepage = "https://github.com/jonathaneunice/ansiwrap" pypi = "ansiwrap/ansiwrap-0.8.4.zip" + license("Apache-2.0") + version("0.8.4", sha256="ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py index a6587662a62a18..59d4307ee98cec 100644 --- a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-antspyx/package.py b/var/spack/repos/builtin/packages/py-antspyx/package.py index 54315c5163d215..0770924eb7f884 100644 --- a/var/spack/repos/builtin/packages/py-antspyx/package.py +++ b/var/spack/repos/builtin/packages/py-antspyx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAntspyx(PythonPackage): homepage = "https://pypi.org/project/antspyx/" pypi = "antspyx/antspyx-0.3.7.tar.gz" + license("Apache-2.0") + version("0.3.7", sha256="cd831eb966d4ce82cc0afb65edddd8e2db6b439d418316e6356199f966104c1b") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-anuga/package.py b/var/spack/repos/builtin/packages/py-anuga/package.py index 0b2dc467edf0ec..bae0e394e88927 100644 --- a/var/spack/repos/builtin/packages/py-anuga/package.py +++ b/var/spack/repos/builtin/packages/py-anuga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAnuga(PythonPackage): url = "https://github.com/GeoscienceAustralia/anuga_core/archive/2.1.tar.gz" git = "https://github.com/GeoscienceAustralia/anuga_core.git" + license("Apache-2.0") + # The git main branch of the repo is now python3-only version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/py-anyio/package.py b/var/spack/repos/builtin/packages/py-anyio/package.py index f5b74226a2ecfa..a7f1ece11d6d21 100644 --- a/var/spack/repos/builtin/packages/py-anyio/package.py +++ b/var/spack/repos/builtin/packages/py-anyio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAnyio(PythonPackage): homepage = "https://github.com/agronholm/anyio" pypi = "anyio/anyio-3.2.1.tar.gz" + license("MIT") + version("4.0.0", sha256="f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a") version("3.6.2", sha256="25ea0d673ae30af41a0c442f81cf3b38c7e79fdc7b60335a4c14e05eb0947421") version("3.6.1", sha256="413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b") diff --git a/var/spack/repos/builtin/packages/py-anytree/package.py b/var/spack/repos/builtin/packages/py-anytree/package.py index 589c0369bad51b..78413b8ed1618a 100644 --- a/var/spack/repos/builtin/packages/py-anytree/package.py +++ b/var/spack/repos/builtin/packages/py-anytree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAnytree(PythonPackage): pypi = "anytree/anytree-2.8.0.tar.gz" maintainers("bernhardkaindl") + license("Apache-2.0") + version("2.8.0", sha256="3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-apache-beam/package.py b/var/spack/repos/builtin/packages/py-apache-beam/package.py index e3b96bcea0d4ad..f19e0e9ad5fe32 100644 --- a/var/spack/repos/builtin/packages/py-apache-beam/package.py +++ b/var/spack/repos/builtin/packages/py-apache-beam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py index 662c3b54cc6114..d8173165f920ed 100644 --- a/var/spack/repos/builtin/packages/py-apache-libcloud/package.py +++ b/var/spack/repos/builtin/packages/py-apache-libcloud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyApacheLibcloud(PythonPackage): homepage = "https://libcloud.apache.org" pypi = "apache-libcloud/apache-libcloud-1.2.1.tar.gz" + license("Apache-2.0") + version("1.2.1", sha256="b26b542c6c9785dd4e34892d87421ffa4c043335c1cba301a97a8d9748c423f2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-apex/package.py b/var/spack/repos/builtin/packages/py-apex/package.py index 77cb99664af464..cef0dbcf5ca05a 100644 --- a/var/spack/repos/builtin/packages/py-apex/package.py +++ b/var/spack/repos/builtin/packages/py-apex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyApex(PythonPackage): pypi = "apex/apex-0.9.10dev.tar.gz" + license("MIT") + version("0.9.10dev", sha256="48aa6d9e805e661e609161bd52e0d02d89a9a32f32dc29cde6c950df58129119") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-apeye-core/package.py b/var/spack/repos/builtin/packages/py-apeye-core/package.py index 2939f6bd099e0d..53562a5982d93f 100644 --- a/var/spack/repos/builtin/packages/py-apeye-core/package.py +++ b/var/spack/repos/builtin/packages/py-apeye-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyApeyeCore(PythonPackage): homepage = "https://github.com/domdfcoding/apeye-core" pypi = "apeye_core/apeye_core-1.1.4.tar.gz" + license("BSD-3-Clause") + version("1.1.4", sha256="72bb89fed3baa647cb81aa28e1d851787edcbf9573853b5d2b5f87c02f50eaf5") depends_on("py-hatch-requirements-txt", type="build") diff --git a/var/spack/repos/builtin/packages/py-apeye/package.py b/var/spack/repos/builtin/packages/py-apeye/package.py index fddd51ec1ea1af..3ee8d41fc55e98 100644 --- a/var/spack/repos/builtin/packages/py-apeye/package.py +++ b/var/spack/repos/builtin/packages/py-apeye/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyApeye(PythonPackage): homepage = "https://github.com/domdfcoding/apeye" pypi = "apeye/apeye-1.4.1.tar.gz" + license("LGPL-3.0-or-later") + version("1.4.1", sha256="14ea542fad689e3bfdbda2189a354a4908e90aee4bf84c15ab75d68453d76a36") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-apipkg/package.py b/var/spack/repos/builtin/packages/py-apipkg/package.py index 25cbd9fe710615..f437160a32d3a8 100644 --- a/var/spack/repos/builtin/packages/py-apipkg/package.py +++ b/var/spack/repos/builtin/packages/py-apipkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyApipkg(PythonPackage): pypi = "apipkg/apipkg-1.4.tar.gz" + license("MIT") + version("1.5", sha256="37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6") version("1.4", sha256="2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6") diff --git a/var/spack/repos/builtin/packages/py-apispec/package.py b/var/spack/repos/builtin/packages/py-apispec/package.py index 2ff0a390e76c8b..e9152058e80d0b 100644 --- a/var/spack/repos/builtin/packages/py-apispec/package.py +++ b/var/spack/repos/builtin/packages/py-apispec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,10 @@ class PyApispec(PythonPackage): homepage = "https://github.com/marshmallow-code/apispec" pypi = "apispec/apispec-6.0.2.tar.gz" + license("MIT") + version("6.0.2", sha256="e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887") + version("4.7.1", sha256="79029486d36a0d7f3c659dbf6ae50a91fbed0c22dcd5376f592e076c130bc7f9") depends_on("python@3.7:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-appdirs/package.py b/var/spack/repos/builtin/packages/py-appdirs/package.py index 102cc09f03d30d..1628186300b336 100644 --- a/var/spack/repos/builtin/packages/py-appdirs/package.py +++ b/var/spack/repos/builtin/packages/py-appdirs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAppdirs(PythonPackage): homepage = "https://github.com/ActiveState/appdirs" pypi = "appdirs/appdirs-1.4.3.tar.gz" + license("MIT") + version("1.4.4", sha256="7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41") version("1.4.3", sha256="9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92") version("1.4.0", sha256="8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5") diff --git a/var/spack/repos/builtin/packages/py-applicationinsights/package.py b/var/spack/repos/builtin/packages/py-applicationinsights/package.py index 0b9559b3917d2d..e10dac54a5b770 100644 --- a/var/spack/repos/builtin/packages/py-applicationinsights/package.py +++ b/var/spack/repos/builtin/packages/py-applicationinsights/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class PyApplicationinsights(PythonPackage): "applicationinsights.logging", ] + license("MIT") + version("0.11.9", sha256="30a11aafacea34f8b160fbdc35254c9029c7e325267874e3c68f6bdbcd6ed2c3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-appnope/package.py b/var/spack/repos/builtin/packages/py-appnope/package.py index d5d83383a99fc9..eeefe84217650c 100644 --- a/var/spack/repos/builtin/packages/py-appnope/package.py +++ b/var/spack/repos/builtin/packages/py-appnope/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-apptools/package.py b/var/spack/repos/builtin/packages/py-apptools/package.py index 05c0d71d1af552..46d94e0b1bc235 100644 --- a/var/spack/repos/builtin/packages/py-apptools/package.py +++ b/var/spack/repos/builtin/packages/py-apptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyApptools(PythonPackage): homepage = "https://docs.enthought.com/apptools" pypi = "apptools/apptools-4.5.0.tar.gz" + license("BSD-3-Clause") + version("4.5.0", sha256="260ae0e2a86cb2df2fede631ab6ac8ece694a58a1def78cd015c890c57140582") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-apscheduler/package.py b/var/spack/repos/builtin/packages/py-apscheduler/package.py index 16aa9799348115..388124b17ee271 100644 --- a/var/spack/repos/builtin/packages/py-apscheduler/package.py +++ b/var/spack/repos/builtin/packages/py-apscheduler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyApscheduler(PythonPackage): homepage = "https://github.com/agronholm/apscheduler" pypi = "APScheduler/APScheduler-3.3.1.tar.gz" + license("MIT") + version("3.3.1", sha256="f68874dff1bdffcc6ce3adb7840c1e4d162c609a3e3f831351df30b75732767b") version("2.1.0", sha256="3b4b44387616902ad6d13122961013630eb25519937e5aa7c450de85656c9753") diff --git a/var/spack/repos/builtin/packages/py-arcgis/package.py b/var/spack/repos/builtin/packages/py-arcgis/package.py index 68f0da72aa9183..080356fa3c3003 100644 --- a/var/spack/repos/builtin/packages/py-arcgis/package.py +++ b/var/spack/repos/builtin/packages/py-arcgis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-archspec/package.py b/var/spack/repos/builtin/packages/py-archspec/package.py index 047beda9afabb6..7eadf9534a5cd1 100644 --- a/var/spack/repos/builtin/packages/py-archspec/package.py +++ b/var/spack/repos/builtin/packages/py-archspec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,8 +15,11 @@ class PyArchspec(PythonPackage): maintainers("alalazo") + license("Apache-2.0") + + 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") diff --git a/var/spack/repos/builtin/packages/py-arcp/package.py b/var/spack/repos/builtin/packages/py-arcp/package.py index 9764dbd729103c..062a2f5aa9ef83 100644 --- a/var/spack/repos/builtin/packages/py-arcp/package.py +++ b/var/spack/repos/builtin/packages/py-arcp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyArcp(PythonPackage): homepage = "https://arcp.readthedocs.io" pypi = "arcp/arcp-0.2.1.tar.gz" + license("Apache-2.0") + version("0.2.1", sha256="5c17ac7972c9ef82979cc2caf2b3a87c1aefd3fefe9adb8a5dd728ada57715dd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-argcomplete/package.py b/var/spack/repos/builtin/packages/py-argcomplete/package.py index 146562369311ae..e1b2a57c5ff87e 100644 --- a/var/spack/repos/builtin/packages/py-argcomplete/package.py +++ b/var/spack/repos/builtin/packages/py-argcomplete/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-argh/package.py b/var/spack/repos/builtin/packages/py-argh/package.py index ad5e5e23ca5220..c17bd46953a43a 100644 --- a/var/spack/repos/builtin/packages/py-argh/package.py +++ b/var/spack/repos/builtin/packages/py-argh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py b/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py index b76a46897d7061..fe684841fa0564 100644 --- a/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py +++ b/var/spack/repos/builtin/packages/py-argon2-cffi-bindings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyArgon2CffiBindings(PythonPackage): homepage = "https://github.com/hynek/argon2-cffi-bindings" pypi = "argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.tar.gz" + license("MIT") + version("21.2.0", sha256="bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py index e8cbdbbb84dbf3..a60c25ef45d50a 100644 --- a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyArgon2Cffi(PythonPackage): homepage = "https://argon2-cffi.readthedocs.io/" pypi = "argon2-cffi/argon2-cffi-20.1.0.tar.gz" + license("MIT") + version("21.3.0", sha256="d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b") version("21.1.0", sha256="f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870") version("20.1.0", sha256="d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d") diff --git a/var/spack/repos/builtin/packages/py-argparse-manpage/package.py b/var/spack/repos/builtin/packages/py-argparse-manpage/package.py index 74108bfbdfbaaf..c0c44d4d01f05e 100644 --- a/var/spack/repos/builtin/packages/py-argparse-manpage/package.py +++ b/var/spack/repos/builtin/packages/py-argparse-manpage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyArgparseManpage(PythonPackage): homepage = "https://github.com/praiskup/argparse-manpage" pypi = "argparse-manpage/argparse-manpage-4.5.tar.gz" + license("Apache-2.0") + version("4.5", sha256="213c061878a10bf0e40f6a293382f6e82409e5110d0683b16ebf87f903d604db") variant("setuptools", default=False, description="Enable the setuptools.builds_meta backend") diff --git a/var/spack/repos/builtin/packages/py-args/package.py b/var/spack/repos/builtin/packages/py-args/package.py index e1ee52b944c018..6bdc7c8ed6bb8c 100644 --- a/var/spack/repos/builtin/packages/py-args/package.py +++ b/var/spack/repos/builtin/packages/py-args/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-arm-pyart/package.py b/var/spack/repos/builtin/packages/py-arm-pyart/package.py index 942c3cec988c92..433e7298fe6db7 100644 --- a/var/spack/repos/builtin/packages/py-arm-pyart/package.py +++ b/var/spack/repos/builtin/packages/py-arm-pyart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-arrow/package.py b/var/spack/repos/builtin/packages/py-arrow/package.py index 17d97de6bb4ab0..d37264f82569b0 100644 --- a/var/spack/repos/builtin/packages/py-arrow/package.py +++ b/var/spack/repos/builtin/packages/py-arrow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyArrow(PythonPackage): homepage = "https://arrow.readthedocs.io/en/latest/" pypi = "arrow/arrow-0.16.0.tar.gz" + license("Apache-2.0") + version("1.2.3", sha256="3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1") version("1.2.2", sha256="05caf1fd3d9a11a1135b2b6f09887421153b94558e5ef4d090b567b47173ac2b") version("1.2.1", sha256="c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840") diff --git a/var/spack/repos/builtin/packages/py-arviz/package.py b/var/spack/repos/builtin/packages/py-arviz/package.py index 516f0224db3511..d16dc45ea59aed 100644 --- a/var/spack/repos/builtin/packages/py-arviz/package.py +++ b/var/spack/repos/builtin/packages/py-arviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyArviz(PythonPackage): homepage = "https://github.com/arviz-devs/arviz" pypi = "arviz/arviz-0.6.1.tar.gz" + license("Apache-2.0") + version("0.6.1", sha256="435edf8db49c41a8fa198f959e7581063006c49a4efdef4755bb778db6fd4f72") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-asciitree/package.py b/var/spack/repos/builtin/packages/py-asciitree/package.py index 8a2ba1e3b3efd2..43d03f2343281d 100644 --- a/var/spack/repos/builtin/packages/py-asciitree/package.py +++ b/var/spack/repos/builtin/packages/py-asciitree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAsciitree(PythonPackage): homepage = "https://github.com/mbr/asciitree" pypi = "asciitree/asciitree-0.3.3.tar.gz" + license("MIT") + version("0.3.3", sha256="4aa4b9b649f85e3fcb343363d97564aa1fb62e249677f2e18a96765145cc0f6e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-asdf-standard/package.py b/var/spack/repos/builtin/packages/py-asdf-standard/package.py index 57bdaae3679fe4..e31384bddc81a3 100644 --- a/var/spack/repos/builtin/packages/py-asdf-standard/package.py +++ b/var/spack/repos/builtin/packages/py-asdf-standard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAsdfStandard(PythonPackage): maintainers("lgarrison") + license("BSD-3-Clause") + version("1.0.3", sha256="afd8ff9a70e7b17f6bcc64eb92a544867d5d4fe1f0076719142fdf62b96cfd44") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-asdf-transform-schemas/package.py b/var/spack/repos/builtin/packages/py-asdf-transform-schemas/package.py index 886da4d19e13ec..7593dae246d10c 100644 --- a/var/spack/repos/builtin/packages/py-asdf-transform-schemas/package.py +++ b/var/spack/repos/builtin/packages/py-asdf-transform-schemas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAsdfTransformSchemas(PythonPackage): maintainers("lgarrison") + license("BSD-3-Clause") + version("0.3.0", sha256="0cf2ff7b22ccb408fe58ddd9b2441a59ba73fe323e416d59b9e0a4728a7d2dd6") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-asdf-unit-schemas/package.py b/var/spack/repos/builtin/packages/py-asdf-unit-schemas/package.py index df5076536abcd5..1485d6795cc260 100644 --- a/var/spack/repos/builtin/packages/py-asdf-unit-schemas/package.py +++ b/var/spack/repos/builtin/packages/py-asdf-unit-schemas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAsdfUnitSchemas(PythonPackage): maintainers("lgarrison") + license("BSD-3-Clause") + version("0.1.0", sha256="42b78d67213efe4ffd4529fb0e58d9c7a0dab5cbf8839b230f1bc0a446bff999") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-asdf/package.py b/var/spack/repos/builtin/packages/py-asdf/package.py index 817918afc47316..cd5ddf25638db8 100644 --- a/var/spack/repos/builtin/packages/py-asdf/package.py +++ b/var/spack/repos/builtin/packages/py-asdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAsdf(PythonPackage): maintainers("lgarrison") + license("BSD-3-Clause") + version("2.15.0", sha256="686f1c91ebf987d41f915cfb6aa70940d7ad17f87ede0be70463147ad2314587") version("2.4.2", sha256="6ff3557190c6a33781dae3fd635a8edf0fa0c24c6aca27d8679af36408ea8ff2") diff --git a/var/spack/repos/builtin/packages/py-ase/package.py b/var/spack/repos/builtin/packages/py-ase/package.py index 1878da0b946446..e949990ea44d1c 100644 --- a/var/spack/repos/builtin/packages/py-ase/package.py +++ b/var/spack/repos/builtin/packages/py-ase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAse(PythonPackage): homepage = "https://wiki.fysik.dtu.dk/ase/" pypi = "ase/ase-3.13.0.tar.gz" + license("LGPL-2.1-or-later") + version("3.21.1", sha256="78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b") version("3.21.0", sha256="2c561e9b767cf16fc8ce198ea9326d77c6b67d33a85f44b68455e23466a64608") version("3.20.1", sha256="72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca") diff --git a/var/spack/repos/builtin/packages/py-asgiref/package.py b/var/spack/repos/builtin/packages/py-asgiref/package.py index 3aa9a48055a743..076dadd88a0f46 100644 --- a/var/spack/repos/builtin/packages/py-asgiref/package.py +++ b/var/spack/repos/builtin/packages/py-asgiref/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAsgiref(PythonPackage): homepage = "https://asgi.readthedocs.io/en/latest/" url = "https://github.com/django/asgiref/archive/3.2.7.tar.gz" + license("BSD-3-Clause") + version("3.5.2", sha256="62f04f81110898e471a7d5b37f88c923c2864d43fa6abb66a95980becb1a2ba4") version("3.5.0", sha256="2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0") version("3.2.7", sha256="8a0b556b9e936418475f6670d59e14592c41d15d00b5ea4ad26f2b46f9f4fb9a") diff --git a/var/spack/repos/builtin/packages/py-asn1crypto/package.py b/var/spack/repos/builtin/packages/py-asn1crypto/package.py index 2e512df02cd333..7ea7285fec4dad 100644 --- a/var/spack/repos/builtin/packages/py-asn1crypto/package.py +++ b/var/spack/repos/builtin/packages/py-asn1crypto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAsn1crypto(PythonPackage): homepage = "https://github.com/wbond/asn1crypto" pypi = "asn1crypto/asn1crypto-0.22.0.tar.gz" + license("MIT") + version("1.5.1", sha256="13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c") version("1.4.0", sha256="f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c") version("0.24.0", sha256="9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49") diff --git a/var/spack/repos/builtin/packages/py-aspy-yaml/package.py b/var/spack/repos/builtin/packages/py-aspy-yaml/package.py index 95c2ce3e4e7362..95ab303d0b32c1 100644 --- a/var/spack/repos/builtin/packages/py-aspy-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-aspy-yaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAspyYaml(PythonPackage): homepage = "https://github.com/asottile/aspy.yaml/" pypi = "aspy.yaml/aspy.yaml-1.3.0.tar.gz" + license("MIT") + version("1.3.0", sha256="e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-asserts/package.py b/var/spack/repos/builtin/packages/py-asserts/package.py index a27d441cb44b39..2e189c6214c3f9 100644 --- a/var/spack/repos/builtin/packages/py-asserts/package.py +++ b/var/spack/repos/builtin/packages/py-asserts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAsserts(PythonPackage): homepage = "https://github.com/srittau/python-asserts" url = "https://github.com/srittau/python-asserts/archive/v0.10.0.tar.gz" + license("MIT") + version("0.10.0", sha256="3466cf32c36d97ee2802121438003693546f590be81095317d0d698066bb5df7") version("0.9.1", sha256="a73ea6b2ddc77364a5f0e13197f00662485944a6dd31c1f7555ff2f99c0f7319") version("0.9.0", sha256="e3b8b06309234f9a7c6e4679e0f3cc127cf18da95c30fbb524ff47d439e22b17") diff --git a/var/spack/repos/builtin/packages/py-asteval/package.py b/var/spack/repos/builtin/packages/py-asteval/package.py index 9683069ef478cf..ff3f458827b41a 100644 --- a/var/spack/repos/builtin/packages/py-asteval/package.py +++ b/var/spack/repos/builtin/packages/py-asteval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAsteval(PythonPackage): homepage = "https://github.com/newville/asteval" pypi = "asteval/asteval-0.9.18.tar.gz" + license("MIT") + version("0.9.25", sha256="bea22b7d8fa16bcba95ebc72052ae5d8ca97114c9959bb47f8b8eebf30e4342f") version("0.9.18", sha256="5d64e18b8a72c2c7ae8f9b70d1f80b68bbcaa98c1c0d7047c35489d03209bc86") diff --git a/var/spack/repos/builtin/packages/py-astor/package.py b/var/spack/repos/builtin/packages/py-astor/package.py index bd7c9f5f49dafd..8b7703fc7eb5ad 100644 --- a/var/spack/repos/builtin/packages/py-astor/package.py +++ b/var/spack/repos/builtin/packages/py-astor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAstor(PythonPackage): pypi = "astor/astor-0.8.1.tar.gz" + license("BSD-3-Clause") + version("0.8.1", sha256="6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e") version("0.8.0", sha256="37a6eed8b371f1228db08234ed7f6cfdc7817a3ed3824797e20cbb11dc2a7862") version("0.6", sha256="175ec395cde36aa0178c5a3120d03954c65d1ef4bb19ec4aa30e9d7a7cc426c4") diff --git a/var/spack/repos/builtin/packages/py-astpretty/package.py b/var/spack/repos/builtin/packages/py-astpretty/package.py index b47e9e86d5137d..962b28ea941981 100644 --- a/var/spack/repos/builtin/packages/py-astpretty/package.py +++ b/var/spack/repos/builtin/packages/py-astpretty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAstpretty(PythonPackage): homepage = "https://github.com/asottile/astpretty" pypi = "astpretty/astpretty-2.0.0.tar.gz" + license("MIT") + version("2.0.0", sha256="e4724bfd753636ba4a84384702e9796e5356969f40af2596d846ce64addde086") variant("typed", default=False, description="Add support for typed comments") diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index 160e3aa82586f1..5df3af48f9c090 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAstroid(PythonPackage): homepage = "https://github.com/PyCQA/astroid" pypi = "astroid/astroid-2.8.3.tar.gz" + license("LGPL-2.1-or-later") + version("2.14.2", sha256="a3cf9f02c53dd259144a7e8f3ccd75d67c9a8c716ef183e0c1f291bc5d7bb3cf") version("2.12.10", sha256="81f870105d892e73bf535da77a8261aa5bde838fa4ed12bb2f435291a098c581") version("2.12.7", sha256="cd468be9d9d03d086d4d7e6643a59bfc025762d2c895e1e22cf21feced7bb148") diff --git a/var/spack/repos/builtin/packages/py-astropy-healpix/package.py b/var/spack/repos/builtin/packages/py-astropy-healpix/package.py index f853c1f539e6ad..35a01f483c544e 100644 --- a/var/spack/repos/builtin/packages/py-astropy-healpix/package.py +++ b/var/spack/repos/builtin/packages/py-astropy-healpix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyAstropyHealpix(PythonPackage): homepage = "https://astropy-healpix.readthedocs.io/en/latest/" pypi = "astropy-healpix/astropy-healpix-0.5.tar.gz" + license("BSD-3-Clause") + version("0.5", sha256="5ae15da796a840f221fb83e25de791e827b6921bc21a365d99bc1a59c7c0cdad") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-astropy-helpers/package.py b/var/spack/repos/builtin/packages/py-astropy-helpers/package.py index 04e616d62839a5..bb88d9e98d8ccf 100644 --- a/var/spack/repos/builtin/packages/py-astropy-helpers/package.py +++ b/var/spack/repos/builtin/packages/py-astropy-helpers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAstropyHelpers(PythonPackage): homepage = "https://github.com/astropy/astropy-helpers" url = "https://github.com/astropy/astropy-helpers/archive/v4.0.1.tar.gz" + license("BSD-3-Clause") + version("4.0.1", sha256="88602971c3b63d6aaa6074d013f995d1e234acb3d517d70d7fcebd30cdaf5c89") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py index 8168be68b327ae..7bb70a8fd9ae8a 100644 --- a/var/spack/repos/builtin/packages/py-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-astropy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyAstropy(PythonPackage): pypi = "astropy/astropy-4.0.1.post1.tar.gz" git = "https://github.com/astropy/astropy.git" + license("BSD-3-Clause") + version("5.1", sha256="1db1b2c7eddfc773ca66fa33bd07b25d5b9c3b5eee2b934e0ca277fa5b1b7b7e") version( "4.0.1.post1", sha256="5c304a6c1845ca426e7bc319412b0363fccb4928cb4ba59298acd1918eec44b5" diff --git a/var/spack/repos/builtin/packages/py-asttokens/package.py b/var/spack/repos/builtin/packages/py-asttokens/package.py index 9f42ec37acec6e..71803c72d8dba7 100644 --- a/var/spack/repos/builtin/packages/py-asttokens/package.py +++ b/var/spack/repos/builtin/packages/py-asttokens/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAsttokens(PythonPackage): homepage = "https://github.com/gristlabs/asttokens" pypi = "asttokens/asttokens-2.0.5.tar.gz" + license("Apache-2.0") + version("2.4.0", sha256="2e0171b991b2c959acc6c49318049236844a5da1d65ba2672c4880c1c894834e") version("2.2.1", sha256="4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3") version("2.0.8", sha256="c61e16246ecfb2cde2958406b4c8ebc043c9e6d73aaa83c941673b35e5d3a76b") diff --git a/var/spack/repos/builtin/packages/py-astunparse/package.py b/var/spack/repos/builtin/packages/py-astunparse/package.py index 29307b3847d477..c9e8ac2d7cf033 100644 --- a/var/spack/repos/builtin/packages/py-astunparse/package.py +++ b/var/spack/repos/builtin/packages/py-astunparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAstunparse(PythonPackage): pypi = "astunparse/astunparse-1.6.2.tar.gz" + license("PSF-2.0") + version("1.6.3", sha256="5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872") version("1.6.2", sha256="dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67") diff --git a/var/spack/repos/builtin/packages/py-async-generator/package.py b/var/spack/repos/builtin/packages/py-async-generator/package.py index 6185289479b836..5319071989ebad 100644 --- a/var/spack/repos/builtin/packages/py-async-generator/package.py +++ b/var/spack/repos/builtin/packages/py-async-generator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyAsyncGenerator(PythonPackage): pypi = "async_generator/async_generator-1.10.tar.gz" + license("Apache-2.0") + version("1.10", sha256="6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-async-lru/package.py b/var/spack/repos/builtin/packages/py-async-lru/package.py index 021112b4f9f4b6..0a2739d7b02b63 100644 --- a/var/spack/repos/builtin/packages/py-async-lru/package.py +++ b/var/spack/repos/builtin/packages/py-async-lru/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,7 @@ class PyAsyncLru(PythonPackage): homepage = "https://github.com/wikibusiness/async_lru" pypi = "async-lru/async-lru-1.0.2.tar.gz" - maintainers("iarspider") + license("MIT") version("1.0.3", sha256="c2cb9b2915eb14e6cf3e717154b40f715bf90e596d73623677affd0d1fbcd32a") version("1.0.2", sha256="baa898027619f5cc31b7966f96f00e4fc0df43ba206a8940a5d1af5336a477cb") diff --git a/var/spack/repos/builtin/packages/py-async-timeout/package.py b/var/spack/repos/builtin/packages/py-async-timeout/package.py index 83091bffc6fbeb..f52fa066cc3c83 100644 --- a/var/spack/repos/builtin/packages/py-async-timeout/package.py +++ b/var/spack/repos/builtin/packages/py-async-timeout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAsyncTimeout(PythonPackage): homepage = "https://github.com/aio-libs/async-timeout" pypi = "async-timeout/async-timeout-3.0.1.tar.gz" + license("Apache-2.0") + version("4.0.2", sha256="2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15") version("4.0.1", sha256="b930cb161a39042f9222f6efb7301399c87eeab394727ec5437924a36d6eef51") version("4.0.0", sha256="7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382") diff --git a/var/spack/repos/builtin/packages/py-asyncio/package.py b/var/spack/repos/builtin/packages/py-asyncio/package.py index c5fb0d44731860..6ccaabf25b8c7d 100644 --- a/var/spack/repos/builtin/packages/py-asyncio/package.py +++ b/var/spack/repos/builtin/packages/py-asyncio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAsyncio(PythonPackage): homepage = "https://docs.python.org/3/library/asyncio.html" url = "https://github.com/python/asyncio/archive/3.4.3.tar.gz" + license("Apache-2.0") + version("3.4.3", sha256="b22225680ea04c3528b7fa03e9c6d152470173dd3873996b8cb29fcb37799f1b") version("3.4.2", sha256="ba28d351c579875e2a1cb1989e310285d3eb76c5bb749694b6ddd3901f8d39de") version("3.4.1", sha256="51cdfbd4964ef8286cbef7d88f9b7abcc8b710ecec0a0794aa354f94ef703126") diff --git a/var/spack/repos/builtin/packages/py-asynctest/package.py b/var/spack/repos/builtin/packages/py-asynctest/package.py index 438a34ad0bce49..db09f2a1ed71f7 100644 --- a/var/spack/repos/builtin/packages/py-asynctest/package.py +++ b/var/spack/repos/builtin/packages/py-asynctest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAsynctest(PythonPackage): homepage = "https://asynctest.readthedocs.io" pypi = "asynctest/asynctest-0.13.0.tar.gz" + license("Apache-2.0") + version("0.13.0", sha256="c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-atomicwrites/package.py b/var/spack/repos/builtin/packages/py-atomicwrites/package.py index 481923f59bb5ce..a0d9b6abc0dd73 100644 --- a/var/spack/repos/builtin/packages/py-atomicwrites/package.py +++ b/var/spack/repos/builtin/packages/py-atomicwrites/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAtomicwrites(PythonPackage): homepage = "https://github.com/untitaker/python-atomicwrites" pypi = "atomicwrites/atomicwrites-1.3.0.tar.gz" + license("MIT") + version("1.4.1", sha256="81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11") version("1.4.0", sha256="ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a") version("1.3.0", sha256="75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6") diff --git a/var/spack/repos/builtin/packages/py-atpublic/package.py b/var/spack/repos/builtin/packages/py-atpublic/package.py index 87ed87ff292533..5bc110d2e17664 100644 --- a/var/spack/repos/builtin/packages/py-atpublic/package.py +++ b/var/spack/repos/builtin/packages/py-atpublic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAtpublic(PythonPackage): homepage = "https://public.readthedocs.io" pypi = "atpublic/atpublic-2.1.2.tar.gz" + license("Apache-2.0") + version("2.1.2", sha256="82a2f2c0343ac67913f67cdee8fa4da294a4d6b863111527a459c8e4d1a646c8") version("2.1.1", sha256="fa1d48bcb85bbed90f6ffee6936578f65ff0e93aa607397bd88eaeb408bd96d8") diff --git a/var/spack/repos/builtin/packages/py-atropos/package.py b/var/spack/repos/builtin/packages/py-atropos/package.py index be6cb5507e19a8..ac4c4717b365c3 100644 --- a/var/spack/repos/builtin/packages/py-atropos/package.py +++ b/var/spack/repos/builtin/packages/py-atropos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAtropos(PythonPackage): pypi = "atropos/atropos-1.1.22.tar.gz" git = "https://github.com/jdidion/atropos.git" + license("MIT") + version("1.1.22", sha256="05e40cb9337421479c692e1154b962fbf811d7939b72c197a024929b7ae88b78") depends_on("python@3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ats/package.py b/var/spack/repos/builtin/packages/py-ats/package.py index 7348ced38d81a6..bceb259e2489b1 100644 --- a/var/spack/repos/builtin/packages/py-ats/package.py +++ b/var/spack/repos/builtin/packages/py-ats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAts(PythonPackage): maintainers("white238") + license("MIT") + version("main", branch="main") version("7.0.105", tag="7.0.105", commit="3a3461061d4493a002018f5bb3715db702212f72") version("7.0.100", tag="7.0.100", commit="202c18d11b8f1c14f1a3361a6e45c9e4f83a3fa1") diff --git a/var/spack/repos/builtin/packages/py-attmap/package.py b/var/spack/repos/builtin/packages/py-attmap/package.py index 373332b9bb5265..3d5f05ba1afe67 100644 --- a/var/spack/repos/builtin/packages/py-attmap/package.py +++ b/var/spack/repos/builtin/packages/py-attmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAttmap(PythonPackage): homepage = "https://github.com/pepkit/attmap/" pypi = "attmap/attmap-0.13.2.tar.gz" + license("BSD-2-Clause") + version("0.13.2", sha256="fdffa45f8671c13428eb8c3a1702bfdd1123badb99f7af14d72ad53cc7e770de") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-attrs/package.py b/var/spack/repos/builtin/packages/py-attrs/package.py index 38b8a9c5375ef2..60530d5c58e5e1 100644 --- a/var/spack/repos/builtin/packages/py-attrs/package.py +++ b/var/spack/repos/builtin/packages/py-attrs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAttrs(PythonPackage): pypi = "attrs/attrs-20.3.0.tar.gz" git = "https://github.com/python-attrs/attrs" + license("MIT") + version("23.1.0", sha256="6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015") version("22.2.0", sha256="c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99") version("22.1.0", sha256="29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6") diff --git a/var/spack/repos/builtin/packages/py-audioread/package.py b/var/spack/repos/builtin/packages/py-audioread/package.py index 8c36442f54c664..3ea422108e8cfb 100644 --- a/var/spack/repos/builtin/packages/py-audioread/package.py +++ b/var/spack/repos/builtin/packages/py-audioread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAudioread(PythonPackage): homepage = "https://github.com/beetbox/audioread" pypi = "audioread/audioread-2.1.8.tar.gz" + license("MIT") + version("2.1.8", sha256="073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-auditwheel/package.py b/var/spack/repos/builtin/packages/py-auditwheel/package.py index 6c18be69022fa8..66b216c3c00925 100644 --- a/var/spack/repos/builtin/packages/py-auditwheel/package.py +++ b/var/spack/repos/builtin/packages/py-auditwheel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAuditwheel(PythonPackage): homepage = "https://github.com/pypa/auditwheel" pypi = "auditwheel/auditwheel-5.1.2.tar.gz" + license("MIT") + version("5.1.2", sha256="3ee5830014931ea84af5cd065c637b6614efa03d9b88bd8fbfc924e7ed01d6ba") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-autocfg/package.py b/var/spack/repos/builtin/packages/py-autocfg/package.py index d941c89b9300b5..0f1d7ed8d112d0 100644 --- a/var/spack/repos/builtin/packages/py-autocfg/package.py +++ b/var/spack/repos/builtin/packages/py-autocfg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-autodocsumm/package.py b/var/spack/repos/builtin/packages/py-autodocsumm/package.py new file mode 100644 index 00000000000000..85c15dc97f8fb8 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-autodocsumm/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyAutodocsumm(PythonPackage): + """Extended sphinx autodoc including automatic autosummaries.""" + + homepage = "https://github.com/Chilipp/autodocsumm" + pypi = "autodocsumm/autodocsumm-0.2.11.tar.gz" + + maintainers("LydDeb") + + license("Apache-2.0") + + version("0.2.11", sha256="183212bd9e9f3b58a96bb21b7958ee4e06224107aa45b2fd894b61b83581b9a9") + + 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")) diff --git a/var/spack/repos/builtin/packages/py-autograd-gamma/package.py b/var/spack/repos/builtin/packages/py-autograd-gamma/package.py index 81c63ac49349f6..9590a6b4f79d38 100644 --- a/var/spack/repos/builtin/packages/py-autograd-gamma/package.py +++ b/var/spack/repos/builtin/packages/py-autograd-gamma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAutogradGamma(PythonPackage): homepage = "https://github.com/CamDavidsonPilon/autograd-gamma" pypi = "autograd-gamma/autograd-gamma-0.4.3.tar.gz" + license("MIT") + version("0.4.3", sha256="2cb570cbb8da61ede937ccc004d87d3924108f754b351a86cdd2ad31ace6cdf6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-autograd/package.py b/var/spack/repos/builtin/packages/py-autograd/package.py index 58b5aa04146f56..51512168000fab 100644 --- a/var/spack/repos/builtin/packages/py-autograd/package.py +++ b/var/spack/repos/builtin/packages/py-autograd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class PyAutograd(PythonPackage): homepage = "https://github.com/HIPS/autograd" pypi = "autograd/autograd-1.3.tar.gz" + license("MIT") + version("1.3", sha256="a15d147577e10de037de3740ca93bfa3b5a7cdfbc34cfb9105429c3580a33ec4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-automat/package.py b/var/spack/repos/builtin/packages/py-automat/package.py index 578957143a487c..596c73deebb77e 100644 --- a/var/spack/repos/builtin/packages/py-automat/package.py +++ b/var/spack/repos/builtin/packages/py-automat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAutomat(PythonPackage): homepage = "https://github.com/glyph/Automat" pypi = "Automat/Automat-20.2.0.tar.gz" + license("MIT") + version("20.2.0", sha256="7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index 521d7472faefc3..2c9d36b993729e 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAutopep8(PythonPackage): homepage = "https://github.com/hhatto/autopep8" pypi = "autopep8/autopep8-1.2.4.tar.gz" + license("MIT") + version("1.7.0", sha256="ca9b1a83e53a7fad65d731dc7a2a2d50aa48f43850407c59f6a1a306c4201142") version("1.6.0", sha256="44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979") version("1.5.7", sha256="276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0") diff --git a/var/spack/repos/builtin/packages/py-autoray/package.py b/var/spack/repos/builtin/packages/py-autoray/package.py index 3caf47c33e0ed3..e9043a7e902ba6 100644 --- a/var/spack/repos/builtin/packages/py-autoray/package.py +++ b/var/spack/repos/builtin/packages/py-autoray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAutoray(PythonPackage): homepage = "https://github.com/jcmgray/autoray" pypi = "autoray/autoray-0.5.3.tar.gz" + license("Apache-2.0") + version("0.5.3", sha256="ecbecbc1ab65dd704234b3307fa7c7a511a36f6b9339a0ffcdaa4e5a7aab826b") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-auxlib/package.py b/var/spack/repos/builtin/packages/py-auxlib/package.py index e7d7116315aea0..827f87f995e329 100644 --- a/var/spack/repos/builtin/packages/py-auxlib/package.py +++ b/var/spack/repos/builtin/packages/py-auxlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAuxlib(PythonPackage): homepage = "https://github.com/kalefranz/auxlib" pypi = "auxlib/auxlib-0.0.43.tar.gz" + license("ISC") + version("0.0.43", sha256="0f175637e96a090a785767ce28483cf1aeec316a19afce9b2fbd113e1122786a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py index 7877834ec964b4..eb1432a31e2844 100644 --- a/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py +++ b/var/spack/repos/builtin/packages/py-avro-json-serializer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyAvroJsonSerializer(PythonPackage): homepage = "https://github.com/linkedin/python-avro-json-serializer" pypi = "avro_json_serializer/avro_json_serializer-0.4.tar.gz" + license("Apache-2.0") + version("0.4", sha256="f9dac2dac92036c5dd5aba8c716545fc0a0630cc365a51ab15bc2ac47eac28f1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-avro-python3/package.py b/var/spack/repos/builtin/packages/py-avro-python3/package.py index 199dbeccee3f83..b07479e701c825 100644 --- a/var/spack/repos/builtin/packages/py-avro-python3/package.py +++ b/var/spack/repos/builtin/packages/py-avro-python3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAvroPython3(PythonPackage): homepage = "https://github.com/apache/avro/tree/master/lang/py3" pypi = "avro-python3/avro-python3-1.10.0.tar.gz" + license("Apache-2.0") + version("1.10.0", sha256="a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05") version("1.9.1", sha256="daab2cea71b942a1eb57d700d4a729e9d6cd93284d4dd4d65a378b9f958aa0d2") diff --git a/var/spack/repos/builtin/packages/py-avro/package.py b/var/spack/repos/builtin/packages/py-avro/package.py index 7c653d1814cde1..d082432f55e037 100644 --- a/var/spack/repos/builtin/packages/py-avro/package.py +++ b/var/spack/repos/builtin/packages/py-avro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py index c3bddc684657dd..4b150ebff6a29a 100644 --- a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py +++ b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py index 41d83d86b86516..1f6402633be390 100644 --- a/var/spack/repos/builtin/packages/py-awkward-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-awkward-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyAwkwardCpp(PythonPackage): maintainers("vvolkl", "wdconinc") + license("BSD-3-Clause") + version("12", sha256="429f7fcc37a671afa67fe9680f2edc3a123d1c74d399e5889c654f9529f9f8f2") version("11", sha256="02d719a4da7487564b29b8e8b78925a32ac818b6f5572c2f55912b4e0e59c7a4") version("10", sha256="d1c856cb6ef5cf3d4f67506a7efc59239f595635865cc9f4ab18440b8bfb11c6") diff --git a/var/spack/repos/builtin/packages/py-awkward/package.py b/var/spack/repos/builtin/packages/py-awkward/package.py index 7528254632278d..eac61100ab0afa 100644 --- a/var/spack/repos/builtin/packages/py-awkward/package.py +++ b/var/spack/repos/builtin/packages/py-awkward/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyAwkward(PythonPackage): maintainers("vvolkl") + license("BSD-3-Clause") + version("main", branch="main") version("2.1.1", sha256="fda8e1634161b8b46b151c074ff0fc631fc0feaec2ec277c4b40a2095110b0dd") version("2.1.0", sha256="73f7a76a1fb43e2557befee54b1381f3e6d90636983cdc54da1c2bcb9ad4c1a8") diff --git a/var/spack/repos/builtin/packages/py-awkward0/package.py b/var/spack/repos/builtin/packages/py-awkward0/package.py index 1febff5db32c96..b50dd23e7d61b6 100644 --- a/var/spack/repos/builtin/packages/py-awkward0/package.py +++ b/var/spack/repos/builtin/packages/py-awkward0/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-awscrt/package.py b/var/spack/repos/builtin/packages/py-awscrt/package.py index 81428d4d4f63c0..490c99d4a38783 100644 --- a/var/spack/repos/builtin/packages/py-awscrt/package.py +++ b/var/spack/repos/builtin/packages/py-awscrt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAwscrt(PythonPackage): maintainers("climbfuji") + license("Apache-2.0") + version("0.16.16", sha256="13075df2c1d7942fe22327b6483274517ee0f6ae765c4e6b6ae9ef5b4c43a827") depends_on("cmake@3.1:", type=("build")) diff --git a/var/spack/repos/builtin/packages/py-ax-platform/package.py b/var/spack/repos/builtin/packages/py-ax-platform/package.py index 139468bc132505..735fc866d88e03 100644 --- a/var/spack/repos/builtin/packages/py-ax-platform/package.py +++ b/var/spack/repos/builtin/packages/py-ax-platform/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyAxPlatform(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.3.1", sha256="0bad1d16155560fdd8644308d2771edf7fd977ad41fea15a7ecf3f224bc36517") depends_on("py-setuptools@34.4:", type="build") diff --git a/var/spack/repos/builtin/packages/py-azote/package.py b/var/spack/repos/builtin/packages/py-azote/package.py index d3119cecb29f4b..c911f68f0cdacf 100644 --- a/var/spack/repos/builtin/packages/py-azote/package.py +++ b/var/spack/repos/builtin/packages/py-azote/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAzote(PythonPackage): homepage = "https://github.com/nwg-piotr/azote" url = "https://github.com/nwg-piotr/azote/archive/v1.7.14.tar.gz" + license("GPL-3.0-only") + version("1.7.14", sha256="68f9be55858dc33650a6712f68c9e5d2c96be9d7ca380dbde8ea9b2895f3f22f") version("1.7.12", sha256="71d56784decf19b4e1a30943e054fd95f5044f7d471a65cecfef885ac8ef917e") version("1.7.11", sha256="d8f0a63c3dacf1cb5b7c4b0b23a4f9190fc3c94c499a98f4f0827cace4b855b5") diff --git a/var/spack/repos/builtin/packages/py-azure-batch/package.py b/var/spack/repos/builtin/packages/py-azure-batch/package.py index 96bc776a31e27d..816ca62f6a0a42 100644 --- a/var/spack/repos/builtin/packages/py-azure-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-batch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py index f70aec6a39f746..d52ca8696ac8d6 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-command-modules-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCliCommandModulesNspkg(PythonPackage): homepage = "https://github.com/Azure/azure-cli" pypi = "azure-cli-command-modules-nspkg/azure-cli-command-modules-nspkg-2.0.3.tar.gz" + license("MIT") + version("2.0.3", sha256="4bd62bf5facb92dd4f89080e75eaee2ea1d3dd4e57a3d2a760ce501cf53f4e7d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py index f68691ff9b71cf..73a15932cd0276 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCliCore(PythonPackage): homepage = "https://github.com/Azure/azure-cli" pypi = "azure-cli-core/azure-cli-core-2.9.1.tar.gz" + license("MIT") + version("2.9.1", sha256="8618a30f7ea2188506f29801220c06396d731c26e4de92c327e6b0e8cc790db5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py index 0f24226bbe6b98..f31c558cb4648f 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCliNspkg(PythonPackage): homepage = "https://github.com/Azure/azure-cli" pypi = "azure-cli-nspkg/azure-cli-nspkg-3.0.4.tar.gz" + license("MIT") + version("3.0.4", sha256="1bde56090f548c6435bd3093995cf88e4c445fb040604df8b5b5f70780d79181") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py index f6432f762dc23e..833d68e30ed82c 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCliTelemetry(PythonPackage): homepage = "https://github.com/Azure/azure-cli" pypi = "azure-cli-telemetry/azure-cli-telemetry-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-cli/package.py b/var/spack/repos/builtin/packages/py-azure-cli/package.py index 5af5c3447d3e2a..43f8f546a812b3 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCli(PythonPackage): homepage = "https://github.com/Azure/azure-cli" pypi = "azure-cli/azure-cli-2.9.1.tar.gz" + license("MIT") + version("2.9.1", sha256="749d850f73ea8956ab510288c1061dd7066180a8583081a6d560fdc7ac8314d6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-common/package.py b/var/spack/repos/builtin/packages/py-azure-common/package.py index d8fbecd6ab34b1..fb527b4e1ce5c9 100644 --- a/var/spack/repos/builtin/packages/py-azure-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-core/package.py b/var/spack/repos/builtin/packages/py-azure-core/package.py index 433ee5051b19dc..de1542547b90ec 100644 --- a/var/spack/repos/builtin/packages/py-azure-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCore(PythonPackage): homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-core" pypi = "azure-core/azure-core-1.7.0.zip" + license("MIT") + version("1.26.1", sha256="223b0e90cbdd1f03c41b195b03239899843f20d00964dbb85e64386873414a2d") version("1.21.1", sha256="88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2") version("1.7.0", sha256="a66da240a287f447f9867f54ba09ea235895cec13ea38c5f490ce4eedefdd75c") diff --git a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py index da6a5e4326470e..b182a1742c5adf 100644 --- a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureCosmos(PythonPackage): homepage = "https://github.com/Azure/azure-sdk-for-python" pypi = "azure-cosmos/azure-cosmos-4.0.0.zip" + license("MIT") + version("4.0.0", sha256="c4e40e0d378fd0c96664f46f1ad08e6c8aaaac31c463726a74aae9eae724442d") version( "3.2.0", diff --git a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py index a2bcb99645fc9a..a50603bf87bec5 100644 --- a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py b/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py index 263fc47ae2a093..e49c57c1428fc7 100644 --- a/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py +++ b/var/spack/repos/builtin/packages/py-azure-functions-devops-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAzureFunctionsDevopsBuild(PythonPackage): homepage = "https://github.com/Azure/azure-functions-devops-build" pypi = "azure-functions-devops-build/azure-functions-devops-build-0.0.22.tar.gz" + license("MIT") + version("0.0.22", sha256="c6341abda6098813f8fa625acd1e925410a17a8a1c7aaabdf975bb7cecb14edf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py index fa73a5d256ca27..023786ab48b6cb 100644 --- a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py +++ b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-identity/package.py b/var/spack/repos/builtin/packages/py-azure-identity/package.py index 07ba8cd94d5008..c18df945b51b52 100644 --- a/var/spack/repos/builtin/packages/py-azure-identity/package.py +++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyAzureIdentity(PythonPackage): # 'import_modules' list to ensure that tests still pass for other imports. import_modules = ["azure.identity", "azure.identity._internal", "azure.identity._credentials"] + license("MIT") + version("1.12.0", sha256="7f9b1ae7d97ea7af3f38dd09305e19ab81a1e16ab66ea186b6579d85c1ca2347") version("1.3.1", sha256="5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a") version("1.2.0", sha256="b32acd1cdb6202bfe10d9a0858dc463d8960295da70ae18097eb3b85ab12cb91") diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py index c91a4a4332b227..88fe48720a1131 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py index 29739ca8f50c4e..f47c964168fe6e 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py index 71e39e396a58f0..2ec43c0d29777d 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py index b1d3879f498e14..00d7268c121e92 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py index 057520ead473c4..8b085d6cabb55e 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py index b9eff3529cf3b5..10652d06dce5fc 100644 --- a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py index 80a2e8a6355aa0..b550700996add0 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py index 4dea6b27cfc91c..77c2b4967af46b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py index f88f9afab1a544..5be65eeae2afe9 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py index efda40b2c321ad..f71632ee2c2489 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py index 367991330274b9..b7f957fb1e757e 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py index d763cd4fe61cc9..3168d664e42b54 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py index 8a8174062d9245..73b9d8c8c028aa 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py index e9b58807ffb91f..9e6addbc4ac2c8 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py index 4de04b397b0908..229160ccc712e9 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py index 0d8e73cbd4d43f..e3b9d0743bbc97 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py index a1d123970a1e3d..28fad81f964114 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py index e57ff6ec3a6987..cfe43622c9e098 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py index 7613d2da2943a4..6c4132663ff21c 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py index 9f03cc51099c5a..3359a3a2d42708 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py index 82134cc3fe5048..e005f11cd13ff1 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py index a027049c41031d..664c67223cf925 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py index 849bc2a2f04f64..f1ad352cf8b891 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureMgmtCore(PythonPackage): homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/core/azure-mgmt-core" pypi = "azure-mgmt-core/azure-mgmt-core-1.2.0.zip" + license("MIT") + version("1.2.0", sha256="8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998") version("1.0.0", sha256="510faf49a10daec8346cc086143d8e667ef3b4f8c8022a8e710091027631a55e") diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py index e303ae39c8aeb3..80a7e19ca510ef 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py index 6161762f71e537..bae63a26f81eb5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py index ef2a0d2c254a0e..7652fe0215126e 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py index 0a981b2c45dc35..ca016d198211df 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py index d4c33019b07497..4dd87d0668418f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py index 4a9e235df32cd3..84d5b7ba3165e4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py index 74b1319393fd48..90030d13ac1230 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py index 4e794efebde78b..dab746f0d84f79 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py index c8c3dab19e1c24..d34302fa5a80bd 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py index eaa84fe79a89c4..54d8c6cd7548ec 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py index 08d89bfb17b719..9d28a4f73dfba5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py index 8cc672e58800ef..73b7410e722b9d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py index 28bed7926dde96..eb1c29893486ed 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py index 1efc87713cb15b..6786239ac0c075 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py index 1ee7fb0a51ea1e..b49ae02369e0f3 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py index e48cad08f83fb3..c1fe75abbe4f27 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py index 5a9b12f8b9dc2b..a1ead077a1ce54 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py index e92e95721b686e..2262a6f7769fc4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py index a8b07aff3192b7..c2fce732b421b7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py index ca94d453bd475c..7e8d70584f4aa4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py index 5f686b5e555222..e2a2a1c01f071a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py index 4ef7242f28c689..07896e79b2739d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py index ddb8a98f572e8f..9959b8717350c0 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py index 84aae333a428da..e66d4ced9b2568 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py index 05a3d10dc45efa..01fa754f5ba783 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py index 85ba77aa912f76..cba366475561c5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py index c430a249b97e22..c6b88642a8803f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py index 7efaf7e3e9d03f..720f356e2e9f61 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py index 6ac1dd604f7a4b..68a0da34daf396 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py index 19d9d6c6acaef7..81e14d10cf72dd 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py index 646ffba14fc805..da558f9cbaf3bd 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py index 1ce72c877e9743..9a02d2fa8b3472 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py index 8a07a5908c0f92..e706351d72de67 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py index 9eb39f9f69ea43..d6e97ff97598ea 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py index c7570dee942ba6..7287dec76cbfee 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py index 709094a8e290aa..e38d8656027c28 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py index 2808107838d82b..1d1957c670a940 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py index 4630842c346093..5a58d3806cd68b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py index fc72f606af1843..a031118df4f274 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py index 160bcad5ba4c1d..68e8b144d32a37 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py index ea9c35e12c3ffb..436e3ac0fb22cf 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py index 9a20d45425afb3..fb1616d0d4ab0b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py index 191a448977fc83..3759215d5872c5 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py index 6313b4d4d2baa5..7cd0a2e6515abe 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py index bd716443e17dbe..5e16d385184efb 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py index 74836ae12aa8dc..53e1dd69c4819a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py index ccd359b64555b6..acf6af7e900bab 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py index 2bd2846096245c..5f525826619e1d 100644 --- a/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyAzureMultiapiStorage(PythonPackage): homepage = "https://github.com/Azure/azure-multiapi-storage-python" pypi = "azure-multiapi-storage/azure-multiapi-storage-0.3.5.tar.gz" + license("MIT") + version("0.3.5", sha256="71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-nspkg/package.py index 4e2e2db1d24827..7153b8b926373e 100644 --- a/var/spack/repos/builtin/packages/py-azure-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py index 83950df9b71792..b8d5ab38abe2db 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureStorageBlob(PythonPackage): pypi = "azure-storage-blob/azure-storage-blob-12.9.0.zip" maintainers("marcusboden") + license("MIT") + version("12.9.0", sha256="cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py index 3ec35f1683f944..865ec96a799035 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyAzureStorageCommon(PythonPackage): homepage = "https://github.com/Azure/azure-storage-python" pypi = "azure-storage-common/azure-storage-common-2.1.0.tar.gz" + license("MIT") + version("2.1.0", sha256="ccedef5c67227bc4d6670ffd37cec18fb529a1b7c3a5e53e4096eb0cf23dc73f") version("1.4.2", sha256="4ec87c7537d457ec95252e0e46477e2c1ccf33774ffefd05d8544682cb0ae401") diff --git a/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py b/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py index 23d2e2d7325280..072b1cb0d2723e 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-nspkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py index dbe58f4d970d22..1f1730659c55cc 100644 --- a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,24 +19,8 @@ class PyAzuremlAutomlCore(PythonPackage): sha256="1fa4a900856b15e1ec9a6bb949946ed0c873a5a54da3db592f03dbb46a117ceb", expand=False, ) - version( - "1.11.0", - sha256="da1b9cef9aabbfaee69a19d5e15f5a911eefbd126546738343a78c032860b5a5", - expand=False, - ) - version( - "1.8.0", - sha256="58ce54b01570996cda860c0c80693b8db19324785a356573f105afeaa31cae6c", - expand=False, - ) depends_on("python@3.5:3", type=("build", "run")) depends_on("py-azureml-dataset-runtime@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-telemetry@1.23.0:1.23", when="@1.23.0", type=("build", "run")) - - depends_on("py-azureml-dataset-runtime@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-telemetry@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - - depends_on("py-azureml-dataprep@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-telemetry@1.8.0:1.8", when="@1.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-core/package.py b/var/spack/repos/builtin/packages/py-azureml-core/package.py index ba80d928468e51..f5c55597801993 100644 --- a/var/spack/repos/builtin/packages/py-azureml-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py index 7cdf40b438b826..214d8c7751949b 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,19 +27,6 @@ class PyAzuremlDataprepNative(PythonPackage): preferred=True, url="https://pypi.io/packages/cp38/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp38-cp38-macosx_10_9_x86_64.whl", ) - version( - "30.0.0-py3.7", - sha256="1fb47c48edf795aaa1b3e589a4d580fc61d639c0bb26519271736c72155d008e", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", - ) - - version( - "14.2.1-py3.7", - sha256="0711ea6465a555d4ed052b7ecf3ed580d711ca7499a12be4c9736d5555ab2786", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-14.2.1-cp37-cp37m-macosx_10_9_x86_64.whl", - ) elif sys.platform.startswith("linux"): version( "30.0.0-py3.9", @@ -54,21 +41,6 @@ class PyAzuremlDataprepNative(PythonPackage): preferred=True, url="https://pypi.io/packages/cp38/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp38-cp38-manylinux1_x86_64.whl", ) - version( - "30.0.0-py3.7", - sha256="897063c21d7b1b8cb070f8992e78291c402559434e9d4a5bb85b595a5c676fe6", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-manylinux1_x86_64.whl", - ) - - version( - "14.2.1-py3.7", - sha256="0817ec5c378a9bcd1af8edda511ca9d02bdc7087e6f8802c459c9b8f3fde4ade", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-14.2.1-cp37-cp37m-manylinux1_x86_64.whl", - ) depends_on("python@3.9.0:3.9", when="@30.0.0-py3.9", type=("build", "run")) depends_on("python@3.8.0:3.8", when="@30.0.0-py3.8", type=("build", "run")) - depends_on("python@3.7.0:3.7", when="@30.0.0-py3.7", type=("build", "run")) - depends_on("python@3.7.0:3.7", when="@14.2.1-py3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py index 2b4c29c3f7ffe5..f45d451a0b91e9 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,12 +30,6 @@ class PyAzuremlDataprepRslex(PythonPackage): preferred=True, url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp38-cp38-macosx_10_9_x86_64.whl", ) - version( - "1.9.0-py3.7", - sha256="9993b369fb9d94d885611859ee957582304c1d8953fc8b48567b786bbfd8062b", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", - ) version( "1.8.0-py3.9", @@ -49,12 +43,6 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp38-cp38-macosx_10_9_x86_64.whl", ) - version( - "1.8.0-py3.7", - sha256="8e9feb3187f11fb86f525bc88bf6a6171d7e7d6e2860411a5b82d1f3ecaa8ae8", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", - ) elif sys.platform.startswith("linux"): version( "1.9.0-py3.9", @@ -69,12 +57,6 @@ class PyAzuremlDataprepRslex(PythonPackage): preferred=True, url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp38-cp38-manylinux1_x86_64.whl", ) - version( - "1.9.0-py3.7", - sha256="d7b6e15401b88cec2915b0bd6298ae7f54584d01ee14e4a24ffb950b7578bceb", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-manylinux1_x86_64.whl", - ) version( "1.8.0-py3.9", @@ -88,16 +70,9 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp38/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp38-cp38-manylinux1_x86_64.whl", ) - version( - "1.8.0-py3.7", - sha256="0588c6e503635aa6d4c64f7bbb3a3be52679f24ac89e2c8d4e96fd991d7006a2", - expand=False, - url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-manylinux1_x86_64.whl", - ) depends_on("python@3.9.0:3.9", when="@1.9.0-py3.9,1.8.0-py3.9", type=("build", "run")) depends_on("python@3.8.0:3.8", when="@1.9.0-py3.8,1.8.0-py3.8", type=("build", "run")) - depends_on("python@3.7.0:3.7", when="@1.9.0-py3.7,1.8.0-py3.7", type=("build", "run")) for t in set( [str(x.family) for x in archspec.cpu.TARGETS.values() if str(x.family) != "x86_64"] diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py index 0a675f8cd0d13b..bbeeb76cccf80d 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,26 +23,14 @@ class PyAzuremlDataprep(PythonPackage): sha256="a36f807112ff1e64d21265b8e7f40154c93e3bead539e2a74c9d74200fd77c86", expand=False, ) - version( - "2.0.2", - sha256="9b9e97d9ed29c0641d3ceb37745ff078143bd235c53df528f847ec0684c52f79", - expand=False, - ) - version( - "1.8.2", - sha256="e53f3206f0bd4af8d5e7de3a94c2c6e662902b86e94a7b9d930e36329fe5820f", - expand=False, - ) variant("fuse", default=False, description="Build with FUSE support") depends_on("python@3:", type=("build", "run")) depends_on("py-dotnetcore2@2.1.14:2", type=("build", "run")) depends_on("py-azureml-dataprep-native@30.0.0:30", when="@2.10.0:", type=("build", "run")) - depends_on("py-azureml-dataprep-native@14.2.1:14", when="@:2.0.2", type=("build", "run")) depends_on("py-azureml-dataprep-rslex@1.9.0:1.9", when="@2.11.0:", type=("build", "run")) depends_on("py-azureml-dataprep-rslex@1.8.0:1.8", when="@2.10.1", type=("build", "run")) depends_on("py-cloudpickle@1.1.0:1", type=("build", "run")) depends_on("py-azure-identity@1.2.0:1.4", when="@2.10.0:", type=("build", "run")) - depends_on("py-azure-identity@1.2.0:1.2", when="@:2.0.2", type=("build", "run")) depends_on("py-fusepy@3.0.1:3", when="+fuse", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py index 5fa8ec77087c0c..56878089a0e127 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,18 +19,11 @@ class PyAzuremlDatasetRuntime(PythonPackage): sha256="96ca73d03ffedc0dd336d9383d2e17cf74548a89fc7ca4c201c599817c97bbc6", expand=False, ) - version( - "1.11.0.post1", - sha256="65c20f276399a7d406c4850af7a6f149472d301931fd1da6a60bad59d43fa47b", - expand=False, - ) variant("fuse", default=False, description="Build with FUSE support") depends_on("python@3.0:3", type=("build", "run")) depends_on("py-azureml-dataprep@2.10.0:2.10", when="@1.23.0", type=("build", "run")) - depends_on("py-azureml-dataprep@2.0.1:2.0", when="@1.11.0.post1", type=("build", "run")) depends_on("py-pyarrow@0.17.0:1", when="@1.23.0", type=("build", "run")) - depends_on("py-pyarrow@0.17.0:0", when="@1.11.0.post1", type=("build", "run")) depends_on("py-numpy@:1.19.2,1.19.4:", when="@1.23.0:", type=("build", "run")) depends_on("py-fusepy@3.0.1:3", when="+fuse", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py index 23f7a8ddccfa6f..4542e001fb9d26 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py index 2cfc6277c82964..6598be7b57b5d8 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,27 +18,9 @@ class PyAzuremlPipelineSteps(PythonPackage): sha256="72154c2f75624a1e7500b8e2239ae1354eeedf66d2cabb11e213b7eb80aedddb", expand=False, ) - version( - "1.11.0", - sha256="674317d9c74ec4cb05e443f50de1732e14dc4519cbe2743a44f8db0bc5e71214", - expand=False, - ) - version( - "1.8.0", - sha256="3310674207ed457a26fb978e7168e400306c695f7f854f354dee9d5c7c81304c", - expand=False, - ) depends_on("python@3:", type=("build", "run")) depends_on("py-azureml-train-core@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-train-automl-client@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-pipeline-core@1.23.0:1.23", when="@1.23.0", type=("build", "run")) - - depends_on("py-azureml-train-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-train-automl-client@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-pipeline-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - - depends_on("py-azureml-train-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-train-automl-client@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-pipeline-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py index 0f17a9e9bc4c87..cecf981ab91e25 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,24 +21,8 @@ class PyAzuremlPipeline(PythonPackage): sha256="ed0fae96771840d3ffd63d63df1b1eed2f50c3b8dbe7b672a4f1ba6e66d0a392", expand=False, ) - version( - "1.11.0", - sha256="8233c66b4120e86b9a9346608ca53bf48d5b9f0558300314034426dd0d7897d6", - expand=False, - ) - version( - "1.8.0", - sha256="43ce39789d9a255f147311e40274b5f2571c7ef3b52e218f248724ccb377a02c", - expand=False, - ) depends_on("python@3:", type=("build", "run")) depends_on("py-azureml-pipeline-core@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-pipeline-steps@1.23.0:1.23", when="@1.23.0", type=("build", "run")) - - depends_on("py-azureml-pipeline-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-pipeline-steps@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - - depends_on("py-azureml-pipeline-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-pipeline-steps@1.8.0:1.8", when="@1.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py index 4bc5be67b4385d..8e613aee9eb65c 100644 --- a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,16 +20,6 @@ class PyAzuremlSdk(PythonPackage): sha256="b9520f426831acb99fafa1ecd154b6bfd4f73fbf71e918d819f9db4a75438ab9", expand=False, ) - version( - "1.11.0", - sha256="d8c9d24ea90457214d798b0d922489863dad518adde3638e08ef62de28fb183a", - expand=False, - ) - version( - "1.8.0", - sha256="61107db1403ce2c1a12064eb0fa31a1d075debbf32dd17cb93b7639b615b7839", - expand=False, - ) # https://github.com/Azure/MachineLearningNotebooks/issues/1285 depends_on("python@3.5:3.8", type=("build", "run")) @@ -41,17 +31,3 @@ class PyAzuremlSdk(PythonPackage): depends_on("py-azureml-train@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-train-automl-client@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-pipeline@1.23.0:1.23", when="@1.23.0", type=("build", "run")) - - depends_on("py-azureml-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on( - "py-azureml-dataset-runtime@1.11.0:1.11 +fuse", when="@1.11.0", type=("build", "run") - ) - depends_on("py-azureml-train@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-train-automl-client@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-pipeline@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - - depends_on("py-azureml-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-train@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-train-automl-client@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-pipeline@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-dataprep@1.8.0:1.8 +fuse", when="@1.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py index 1387dc7b3b15f7..89e5f6a5a51593 100644 --- a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py index 0493fd87c7f64b..bd676ef78c65aa 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,16 +20,6 @@ class PyAzuremlTrainAutomlClient(PythonPackage): sha256="ac5f1ce9b04b4e61e2e28e0fa8d2d8e47937a546f624d1cd3aa6bc4f9110ecbe", expand=False, ) - version( - "1.11.0", - sha256="3184df60a46917e92140a299aecb54591b19df490a3f4f571ff1f92c5e70a715", - expand=False, - ) - version( - "1.8.0", - sha256="562300095db6c4dea7b052e255c53dd95c4c3d0589a828b545497fe1ca7e9677", - expand=False, - ) depends_on("python@3.5:3", type=("build", "run")) @@ -37,13 +27,3 @@ class PyAzuremlTrainAutomlClient(PythonPackage): depends_on("py-azureml-core@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-dataset-runtime@1.23.0:1.23", when="@1.23.0", type=("build", "run")) depends_on("py-azureml-telemetry@1.23.0:1.23", when="@1.23.0", type=("build", "run")) - - depends_on("py-azureml-automl-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-core@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-dataset-runtime@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - depends_on("py-azureml-telemetry@1.11.0:1.11", when="@1.11.0", type=("build", "run")) - - depends_on("py-azureml-dataprep@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-automl-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-core@1.8.0:1.8", when="@1.8.0", type=("build", "run")) - depends_on("py-azureml-telemetry@1.8.0:1.8", when="@1.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py index daadd94ec928fa..55a18dc6254992 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py index 4c207dd476883d..e0ec281e5ec31f 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-azureml-train/package.py b/var/spack/repos/builtin/packages/py-azureml-train/package.py index fdf679a6f13065..9c2ae180939497 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py index c0be3e99bbd4d3..1c73663fed2e34 100644 --- a/var/spack/repos/builtin/packages/py-babel/package.py +++ b/var/spack/repos/builtin/packages/py-babel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBabel(PythonPackage): pypi = "Babel/Babel-2.7.0.tar.gz" git = "https://github.com/python-babel/babel" + license("BSD-3-Clause") + version("2.12.1", sha256="cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455") version("2.10.3", sha256="7614553711ee97490f732126dc077f8d0ae084ebc6a96e23db1482afabdb2c51") version("2.9.1", sha256="bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0") diff --git a/var/spack/repos/builtin/packages/py-backcall/package.py b/var/spack/repos/builtin/packages/py-backcall/package.py index 7bc5f79662cfae..7b10a84388cd7b 100644 --- a/var/spack/repos/builtin/packages/py-backcall/package.py +++ b/var/spack/repos/builtin/packages/py-backcall/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackcall(PythonPackage): homepage = "https://github.com/takluyver/backcall" pypi = "backcall/backcall-0.1.0.tar.gz" + license("BSD-3-Clause") + version("0.2.0", sha256="5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e") version("0.1.0", sha256="38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4") diff --git a/var/spack/repos/builtin/packages/py-backoff/package.py b/var/spack/repos/builtin/packages/py-backoff/package.py index 8ccfcf6811ae91..12873e54d04877 100644 --- a/var/spack/repos/builtin/packages/py-backoff/package.py +++ b/var/spack/repos/builtin/packages/py-backoff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackoff(PythonPackage): homepage = "https://github.com/litl/backoff" pypi = "backoff/backoff-2.2.1.tar.gz" + license("MIT") + version("2.2.1", sha256="03f829f5bb1923180821643f8753b0502c3b682293992485b0eef2807afa5cba") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-backports-abc/package.py b/var/spack/repos/builtin/packages/py-backports-abc/package.py index 56b4e560f0c98b..34d3e340c006c7 100644 --- a/var/spack/repos/builtin/packages/py-backports-abc/package.py +++ b/var/spack/repos/builtin/packages/py-backports-abc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBackportsAbc(PythonPackage): homepage = "https://github.com/cython/backports_abc" url = "https://github.com/cython/backports_abc/archive/0.4.tar.gz" + license("PSF-2.0") + version("0.5", sha256="ca1872b55cc9e19ce7288670d360104d5aac88ff1d0a0e7ad6e97267705611f9") version("0.4", sha256="2b5c4e91e37ba8bcd3fb8fecc8530f941578fc2c911497da3f09bf5fec6a6705") diff --git a/var/spack/repos/builtin/packages/py-backports-cached-property/package.py b/var/spack/repos/builtin/packages/py-backports-cached-property/package.py index d36cac51882cdc..ab98121a38bfb8 100644 --- a/var/spack/repos/builtin/packages/py-backports-cached-property/package.py +++ b/var/spack/repos/builtin/packages/py-backports-cached-property/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackportsCachedProperty(PythonPackage): homepage = "https://github.com/penguinolog/backports.cached_property" pypi = "backports.cached-property/backports.cached-property-1.0.2.tar.gz" + license("MIT") + version("1.0.2", sha256="9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py index a46d057753a4df..5be10932dc1423 100644 --- a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py +++ b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,7 +12,7 @@ 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") + license("MIT") version("1.1.1", sha256="914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386") version("1.1.0", sha256="988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a") diff --git a/var/spack/repos/builtin/packages/py-backports-lzma/package.py b/var/spack/repos/builtin/packages/py-backports-lzma/package.py index 51ce080a2f3beb..d0fd466db745ef 100644 --- a/var/spack/repos/builtin/packages/py-backports-lzma/package.py +++ b/var/spack/repos/builtin/packages/py-backports-lzma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBackportsLzma(PythonPackage): homepage = "https://github.com/peterjc/backports.lzma" url = "https://github.com/peterjc/backports.lzma/archive/backports.lzma.v0.0.14.tar.gz" + license("BSD-3-Clause") + version("0.0.14", sha256="904854d152825b475ebf0f6074fa545474b4ef4eac833f2d9a565e2820dc3a2d") version("0.0.13", sha256="42c9d15fa16f691c07e3b325c90f7f9449811e9f7fc46bf4ad43c29bdbaf0b71") version("0.0.12", sha256="648592f13d34c7d10791cfb6ce1556cfa25f3657a24e349f266a87708f3af112") diff --git a/var/spack/repos/builtin/packages/py-backports-os/package.py b/var/spack/repos/builtin/packages/py-backports-os/package.py index 7cdf99936fee4c..0c272206343e4a 100644 --- a/var/spack/repos/builtin/packages/py-backports-os/package.py +++ b/var/spack/repos/builtin/packages/py-backports-os/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackportsOs(PythonPackage): homepage = "https://github.com/pjdelport/backports.os" pypi = "backports.os/backports.os-0.1.1.tar.gz" + license("PSF-2.0") + version("0.1.1", sha256="b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py index 00cfc327af23f8..322f31930b2fc5 100644 --- a/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py +++ b/var/spack/repos/builtin/packages/py-backports-ssl-match-hostname/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-backports-tempfile/package.py b/var/spack/repos/builtin/packages/py-backports-tempfile/package.py index 781029b402cbec..5621fff213ac50 100644 --- a/var/spack/repos/builtin/packages/py-backports-tempfile/package.py +++ b/var/spack/repos/builtin/packages/py-backports-tempfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBackportsTempfile(PythonPackage): homepage = "https://github.com/PiDelport/backports.tempfile" pypi = "backports.tempfile/backports.tempfile-1.0.tar.gz" + license("PSF-2.0") + version("1.0", sha256="1c648c452e8770d759bdc5a5e2431209be70d25484e1be24876cf2168722c762") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-backports-weakref/package.py b/var/spack/repos/builtin/packages/py-backports-weakref/package.py index 0cc4a34ca03f57..ec2ba82c442c8c 100644 --- a/var/spack/repos/builtin/packages/py-backports-weakref/package.py +++ b/var/spack/repos/builtin/packages/py-backports-weakref/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackportsWeakref(PythonPackage): homepage = "https://github.com/PiDelport/backports.weakref" pypi = "backports.weakref/backports.weakref-1.0.post1.tar.gz" + license("PSF-2.0") + version( "1.0.post1", sha256="bc4170a29915f8b22c9e7c4939701859650f2eb84184aee80da329ac0b9825c2", diff --git a/var/spack/repos/builtin/packages/py-backports-zoneinfo/package.py b/var/spack/repos/builtin/packages/py-backports-zoneinfo/package.py index 48f9520662030a..546c9e993bb114 100644 --- a/var/spack/repos/builtin/packages/py-backports-zoneinfo/package.py +++ b/var/spack/repos/builtin/packages/py-backports-zoneinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBackportsZoneinfo(PythonPackage): homepage = "https://github.com/pganssle/zoneinfo" pypi = "backports.zoneinfo/backports.zoneinfo-0.2.1.tar.gz" + license("Apache-2.0") + version("0.2.1", sha256="fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2") depends_on("py-setuptools@40.8.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-bagit-profile/package.py b/var/spack/repos/builtin/packages/py-bagit-profile/package.py index 20716507e80fd3..b36c1fcc29a608 100644 --- a/var/spack/repos/builtin/packages/py-bagit-profile/package.py +++ b/var/spack/repos/builtin/packages/py-bagit-profile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBagitProfile(PythonPackage): homepage = "https://github.com/bagit-profiles/bagit-profiles-validator" pypi = "bagit-profile/bagit_profile-1.3.1.tar.gz" + license("Unlicense") + version("1.3.1", sha256="57798cdcf98b32a413edb29382d85f4f8c44d3204940d7e12d84998521a98c3f") depends_on("python@2.7,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bagit/package.py b/var/spack/repos/builtin/packages/py-bagit/package.py index c2689681d83483..7a592a2f34052d 100644 --- a/var/spack/repos/builtin/packages/py-bagit/package.py +++ b/var/spack/repos/builtin/packages/py-bagit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBagit(PythonPackage): homepage = "https://libraryofcongress.github.io/bagit-python" pypi = "bagit/bagit-1.8.1.tar.gz" + license("CC0-1.0") + version("1.8.1", sha256="37df1330d2e8640c8dee8ab6d0073ac701f0614d25f5252f9e05263409cee60c") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bakta/package.py b/var/spack/repos/builtin/packages/py-bakta/package.py index 27c5870919b0d1..57dcbc64bb398c 100644 --- a/var/spack/repos/builtin/packages/py-bakta/package.py +++ b/var/spack/repos/builtin/packages/py-bakta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyBakta(PythonPackage): maintainers("oschwengers") + license("GPL-3.0-only") + version("1.5.1", sha256="36781612c4eaa99e6e24a00e8ab5b27dadf21c98ae6d16432f3e78c96a4adb5d") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bandit/package.py b/var/spack/repos/builtin/packages/py-bandit/package.py index b0a1730326d914..ba55a56b7b6ee8 100644 --- a/var/spack/repos/builtin/packages/py-bandit/package.py +++ b/var/spack/repos/builtin/packages/py-bandit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-barectf/package.py b/var/spack/repos/builtin/packages/py-barectf/package.py index 7975a3fff8f1af..4d7fb713732dac 100644 --- a/var/spack/repos/builtin/packages/py-barectf/package.py +++ b/var/spack/repos/builtin/packages/py-barectf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBarectf(PythonPackage): pypi = "barectf/barectf-3.1.2.tar.gz" + license("MIT") + version("3.1.2", sha256="d4d626b22a33b7d9bc9ac033bba8893890aba0ee1011c9e78429a67296c09e1c") depends_on("py-poetry-core", type="build") diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 5a11b06201178c..b5b4bae220a64e 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBasemap(PythonPackage): url = "https://github.com/matplotlib/basemap/archive/v1.2.0rel.tar.gz" homepage = "https://matplotlib.org/basemap/" + license("MIT") + version("1.2.1", sha256="3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7") # Per Github issue #3813, setuptools is required at runtime in order diff --git a/var/spack/repos/builtin/packages/py-bash-kernel/package.py b/var/spack/repos/builtin/packages/py-bash-kernel/package.py index 3c4a3be92d333e..69dfa8c384b763 100644 --- a/var/spack/repos/builtin/packages/py-bash-kernel/package.py +++ b/var/spack/repos/builtin/packages/py-bash-kernel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBashKernel(PythonPackage): homepage = "https://github.com/takluyver/bash_kernel" pypi = "bash_kernel/bash_kernel-0.7.2.tar.gz" + license("BSD-3-Clause") + version("0.7.2", sha256="a08c84eddd8179de5234105821fd5cc210015671a0bd3cd0bc4f631c475e1670") depends_on("py-flit", type="build") diff --git a/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py b/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py index b6fd1f28c5bbe3..378212266470ef 100644 --- a/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py +++ b/var/spack/repos/builtin/packages/py-basis-set-exchange/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBasisSetExchange(PythonPackage): maintainers("bennybp", "scemama") + license("BSD-3-Clause") + version("0.8.12", sha256="41f0242e2c11392c511d3308c0345e14b0eb3344686d865bdfcb48257910fc0d") version("0.8.11", sha256="dbd4cf9382d97b79a3143c6b2086d1d24562bd13e0ab0d18fc0423b9ee877b9b") version("0.8.10", sha256="7f974faf513791d59ef47dd4eba9d8386f75bbd85f253ca5c08732ff56004a57") diff --git a/var/spack/repos/builtin/packages/py-batchspawner/package.py b/var/spack/repos/builtin/packages/py-batchspawner/package.py index ddd733d4db1637..ad49383ca5aceb 100644 --- a/var/spack/repos/builtin/packages/py-batchspawner/package.py +++ b/var/spack/repos/builtin/packages/py-batchspawner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBatchspawner(PythonPackage): homepage = "https://github.com/jupyterhub/batchspawner" pypi = "batchspawner/batchspawner-1.1.0.tar.gz" + license("BSD-3-Clause") + version("1.1.0", sha256="9bae72f7c1bd9bb11aa58ecc3bc9fae5475a10fdd92dc0c0d67fa7eb95c9dd3a") depends_on("python@3.3:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py b/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py index fba7327d04fd23..c9be3b63c24266 100644 --- a/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py +++ b/var/spack/repos/builtin/packages/py-bayesian-optimization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py index 60b9ea00d6d8a6..5059965025a3b0 100644 --- a/var/spack/repos/builtin/packages/py-bcbio-gff/package.py +++ b/var/spack/repos/builtin/packages/py-bcbio-gff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bcolz/package.py b/var/spack/repos/builtin/packages/py-bcolz/package.py index ae29560d8271fc..9bfbd7839bef94 100644 --- a/var/spack/repos/builtin/packages/py-bcolz/package.py +++ b/var/spack/repos/builtin/packages/py-bcolz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bcrypt/package.py b/var/spack/repos/builtin/packages/py-bcrypt/package.py index ab4eea68a30335..d2021ea9e066d6 100644 --- a/var/spack/repos/builtin/packages/py-bcrypt/package.py +++ b/var/spack/repos/builtin/packages/py-bcrypt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBcrypt(PythonPackage): homepage = "https://github.com/pyca/bcrypt/" url = "https://github.com/pyca/bcrypt/archive/3.1.4.tar.gz" + license("Apache-2.0") + version("3.2.0", sha256="da18f9af11ec41c57daf3758f9d21bd90292c0cdb2a7ea4e6b803f39e753c350") version("3.1.7", sha256="3f7784000846dd85fd626c2cf50065f5078dd76b68f6bd7ba3f132b691035ff4") version("3.1.6", sha256="169d3e6edbf8717e8856748b72fb02abe8ce8e0b65d733b1509ae9942e77f2a9") diff --git a/var/spack/repos/builtin/packages/py-bdbag/package.py b/var/spack/repos/builtin/packages/py-bdbag/package.py index 03710bc671cc26..9a3cf74d8971b5 100644 --- a/var/spack/repos/builtin/packages/py-bdbag/package.py +++ b/var/spack/repos/builtin/packages/py-bdbag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBdbag(PythonPackage): homepage = "https://github.com/fair-research/bdbag/" pypi = "bdbag/bdbag-1.6.3.tar.gz" + license("Apache-2.0") + version("1.6.3", sha256="1ad2e4956045cb3d43a6276391ad919e42a90a2443727dbc5b1ac6eeb6d6e3c9") depends_on("python@2.7:2,3.5:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-beaker/package.py b/var/spack/repos/builtin/packages/py-beaker/package.py index 2cefed43725615..f21824ce253bed 100644 --- a/var/spack/repos/builtin/packages/py-beaker/package.py +++ b/var/spack/repos/builtin/packages/py-beaker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBeaker(PythonPackage): homepage = "https://beaker.readthedocs.io" pypi = "Beaker/Beaker-1.12.0.tar.gz" + license("BSD-3-Clause") + version("1.12.0", sha256="2d5f427e3b13259c98c934cab0e428fc1c18a4c4b94acbdae930df7e7f51d1ec") version("1.11.0", sha256="ad5d1c05027ee3be3a482ea39f8cb70339b41e5d6ace0cb861382754076d187e") diff --git a/var/spack/repos/builtin/packages/py-beancount/package.py b/var/spack/repos/builtin/packages/py-beancount/package.py index 82a44e0e32e131..9c9ec496e849ec 100644 --- a/var/spack/repos/builtin/packages/py-beancount/package.py +++ b/var/spack/repos/builtin/packages/py-beancount/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBeancount(PythonPackage): homepage = "http://furius.ca/beancount/" pypi = "beancount/beancount-2.3.3.tar.gz" + license("GPL-2.0-only") + version("2.3.3", sha256="d9a29839ea867d1dda7af1f4bf5d3959aa7c1574cd4a0bc86f69ee64c555c71c") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-beartype/package.py b/var/spack/repos/builtin/packages/py-beartype/package.py new file mode 100644 index 00000000000000..f730230576ab0d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-beartype/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyBeartype(PythonPackage): + """Unbearably fast near-real-time hybrid runtime-static type-checking in pure Python.""" + + homepage = "https://beartype.readthedocs.io/" + pypi = "beartype/beartype-0.15.0.tar.gz" + + license("MIT") + + version("0.16.2", sha256="47ec1c8c3be3f999f4f9f829e8913f65926aa7e85b180d9ffd305dc78d3e7d7b") + version("0.15.0", sha256="2af6a8d8a7267ccf7d271e1a3bd908afbc025d2a09aa51123567d7d7b37438df") + + # See PYTHON_VERSION_MIN in beartype/meta.py + depends_on("python@3.8:", type=("build", "run")) + depends_on("py-setuptools@:49,50.1:", type="build") diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index 1dd4ebb8aa8e5e..2906db7e3b5daa 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyBeautifulsoup4(PythonPackage): homepage = "https://www.crummy.com/software/BeautifulSoup" pypi = "beautifulsoup4/beautifulsoup4-4.8.0.tar.gz" + # Requires pytest + skip_modules = ["bs4.tests"] + version("4.12.2", sha256="492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da") version("4.11.1", sha256="ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693") version("4.10.0", sha256="c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891") diff --git a/var/spack/repos/builtin/packages/py-beniget/package.py b/var/spack/repos/builtin/packages/py-beniget/package.py index ca781396364c31..ea700a164d4b3a 100644 --- a/var/spack/repos/builtin/packages/py-beniget/package.py +++ b/var/spack/repos/builtin/packages/py-beniget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBeniget(PythonPackage): homepage = "https://github.com/serge-sans-paille/beniget/" pypi = "beniget/beniget-0.3.0.tar.gz" + license("BSD-3-Clause") + version("0.4.1", sha256="75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c") version("0.4.0", sha256="72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749") version("0.3.0", sha256="062c893be9cdf87c3144fb15041cce4d81c67107c1591952cd45fdce789a0ff1") diff --git a/var/spack/repos/builtin/packages/py-bids-validator/package.py b/var/spack/repos/builtin/packages/py-bids-validator/package.py index 5ba74c229de73f..ce5883363d3587 100644 --- a/var/spack/repos/builtin/packages/py-bids-validator/package.py +++ b/var/spack/repos/builtin/packages/py-bids-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bidscoin/package.py b/var/spack/repos/builtin/packages/py-bidscoin/package.py index a5b7dd83024578..b235dc2376103d 100644 --- a/var/spack/repos/builtin/packages/py-bidscoin/package.py +++ b/var/spack/repos/builtin/packages/py-bidscoin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBidscoin(PythonPackage): homepage = "https://github.com/Donders-Institute/bidscoin" pypi = "bidscoin/bidscoin-3.7.4.tar.gz" + license("GPL-3.0-or-later") + version("4.1.1", sha256="28730e9202d3c44d77c0bbdea9565e00adfdd23e85a6f3f121c1bfce1a7b462b") version("4.0.0", sha256="3b0c26f2e250e06b6f526cdbee09517e1f339da8035c0a316609b4463d75824d") version("3.7.4", sha256="efa32238fb7b75e533e7f5cc318ad5a703716d291985435d43f1de4f18402517") diff --git a/var/spack/repos/builtin/packages/py-bidskit/package.py b/var/spack/repos/builtin/packages/py-bidskit/package.py index 25e38c5127ef56..61eb70da94ce3b 100644 --- a/var/spack/repos/builtin/packages/py-bidskit/package.py +++ b/var/spack/repos/builtin/packages/py-bidskit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBidskit(PythonPackage): homepage = "https://github.com/jmtyszka/bidskit" pypi = "bidskit/bidskit-2022.10.13.tar.gz" + license("MIT") + version("2023.9.7", sha256="029d9aecbbcb2df733858ceb3e6d5dd5013c36e431e40fb522a580adc7b667a5") version("2023.2.16", sha256="b2e4e3246d43a6f00af6c0391ec8fecc59405241de1ea9ca68eb4d8128d62c7b") version( diff --git a/var/spack/repos/builtin/packages/py-bigdft/package.py b/var/spack/repos/builtin/packages/py-bigdft/package.py index 1177b7a4a308fb..cae97858e1d599 100644 --- a/var/spack/repos/builtin/packages/py-bigdft/package.py +++ b/var/spack/repos/builtin/packages/py-bigdft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bigfloat/package.py b/var/spack/repos/builtin/packages/py-bigfloat/package.py index 1400f93e6ef0f8..1044b752920734 100644 --- a/var/spack/repos/builtin/packages/py-bigfloat/package.py +++ b/var/spack/repos/builtin/packages/py-bigfloat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBigfloat(PythonPackage): homepage = "https://github.com/mdickinson/bigfloat" pypi = "bigfloat/bigfloat-0.4.0.tar.gz" + license("LGPL-3.0-or-later") + version("0.4.0", sha256="58b96bde872aca5989d13d82eba3acf2aa1b94e22117dd72a16ba5911b0c0cb8") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-billiard/package.py b/var/spack/repos/builtin/packages/py-billiard/package.py index 68a9466d964fbf..3a7802d4e61b21 100644 --- a/var/spack/repos/builtin/packages/py-billiard/package.py +++ b/var/spack/repos/builtin/packages/py-billiard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyBilliard(PythonPackage): pypi = "billiard/billiard-3.5.0.5.tar.gz" + license("BSD-3-Clause") + version("3.6.4.0", sha256="299de5a8da28a783d51b197d496bef4f1595dd023a93a4f59dde1886ae905547") version("3.6.3.0", sha256="d91725ce6425f33a97dfa72fb6bfef0e47d4652acd98a032bd1a7fbf06d5fa6a") version("3.6.1.0", sha256="b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26") diff --git a/var/spack/repos/builtin/packages/py-binaryornot/package.py b/var/spack/repos/builtin/packages/py-binaryornot/package.py index fbdb8dd58dde49..27f3c79c1dca8c 100644 --- a/var/spack/repos/builtin/packages/py-binaryornot/package.py +++ b/var/spack/repos/builtin/packages/py-binaryornot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBinaryornot(PythonPackage): homepage = "https://binaryornot.readthedocs.io" url = "https://github.com/audreyr/binaryornot/archive/0.4.0.tar.gz" + license("BSD-3-Clause") + version("0.4.4", sha256="8cca04876a5e9d01f0dda79390e99089da87f3c1948ab2720661ba379d1b23f2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-bintrees/package.py b/var/spack/repos/builtin/packages/py-bintrees/package.py index 52c3e5ad929dfc..9becd4bdbfad22 100644 --- a/var/spack/repos/builtin/packages/py-bintrees/package.py +++ b/var/spack/repos/builtin/packages/py-bintrees/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-binwalk/package.py b/var/spack/repos/builtin/packages/py-binwalk/package.py index b12ea48cebfd44..712dc29037e55d 100644 --- a/var/spack/repos/builtin/packages/py-binwalk/package.py +++ b/var/spack/repos/builtin/packages/py-binwalk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bioblend/package.py b/var/spack/repos/builtin/packages/py-bioblend/package.py index 5202be77274cfb..cd91a7d76fc0e2 100644 --- a/var/spack/repos/builtin/packages/py-bioblend/package.py +++ b/var/spack/repos/builtin/packages/py-bioblend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBioblend(PythonPackage): homepage = "https://bioblend.readthedocs.io" pypi = "bioblend/bioblend-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="3794288bbf891ae6edc1bcdd9618a3ae16b6ed4a04c946505f7e29f2f28898a5") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index 79175dbfcb2a50..44fced8eb31ccc 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-biomine/package.py b/var/spack/repos/builtin/packages/py-biomine/package.py index 707040a3aced63..90af7bb452f22e 100644 --- a/var/spack/repos/builtin/packages/py-biomine/package.py +++ b/var/spack/repos/builtin/packages/py-biomine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBiomine(PythonPackage): homepage = "https://github.com/AdamDS/BioMine" url = "https://github.com/AdamDS/BioMine/archive/v0.9.5.tar.gz" + license("MIT") + version("0.9.5", sha256="1b2a72cd2cb6e99d9b79fcc9ea94fa0e1892b02465620ba6bba59473dc7ff3ac") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-biopandas/package.py b/var/spack/repos/builtin/packages/py-biopandas/package.py index a2d7d0ec9e4cba..b6a2bff1d5eba3 100644 --- a/var/spack/repos/builtin/packages/py-biopandas/package.py +++ b/var/spack/repos/builtin/packages/py-biopandas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyBiopandas(PythonPackage): # is missing the requirements.txt so we have to download # from github + license("BSD-3-Clause") + version("0.2.5", branch="v0.2.5") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py index 20cd97de50d75b..fa3cdeefcc031b 100644 --- a/var/spack/repos/builtin/packages/py-biopython/package.py +++ b/var/spack/repos/builtin/packages/py-biopython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyBiopython(PythonPackage): maintainers("RMeli") + license("BSD-3-Clause") + version("1.81", sha256="2cf38112b6d8415ad39d6a611988cd11fb5f33eb09346666a87263beba9614e0") version("1.80", sha256="52805e9af88767e450e2df8113b5bc59e964e2e8a7bb803a83570bdbb51c0e43") version("1.79", sha256="edb07eac99d3b8abd7ba56ff4bedec9263f76dfc3c3f450e7d2e2bcdecf8559b") diff --git a/var/spack/repos/builtin/packages/py-bitarray/package.py b/var/spack/repos/builtin/packages/py-bitarray/package.py index bb9b9cbc190799..47ae50a3dcb8b4 100644 --- a/var/spack/repos/builtin/packages/py-bitarray/package.py +++ b/var/spack/repos/builtin/packages/py-bitarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bitshuffle/package.py b/var/spack/repos/builtin/packages/py-bitshuffle/package.py index ff20b638ad9a22..b41636ab2d4fc0 100644 --- a/var/spack/repos/builtin/packages/py-bitshuffle/package.py +++ b/var/spack/repos/builtin/packages/py-bitshuffle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBitshuffle(PythonPackage): homepage = "https://github.com/kiyo-masui/bitshuffle" pypi = "bitshuffle/bitshuffle-0.4.2.tar.gz" + license("MIT") + version("0.4.2", sha256="df7d7dc0add8a37f0c5f4704475db60a3c843171a49aa4e3301d1d7e827b2536") depends_on("py-cython@0.19:", type="build") diff --git a/var/spack/repos/builtin/packages/py-bitstring/package.py b/var/spack/repos/builtin/packages/py-bitstring/package.py index 61daaaefce749a..298b5aea706e20 100644 --- a/var/spack/repos/builtin/packages/py-bitstring/package.py +++ b/var/spack/repos/builtin/packages/py-bitstring/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBitstring(PythonPackage): homepage = "http://pythonhosted.org/bitstring" pypi = "bitstring/bitstring-3.1.6.tar.gz" + license("MIT") + version("4.0.2", sha256="a391db8828ac4485dd5ce72c80b27ebac3e7b989631359959e310cd9729723b2") version("3.1.5", sha256="c163a86fcef377c314690051885d86b47419e3e1770990c212e16723c1c08faa") diff --git a/var/spack/repos/builtin/packages/py-bitstruct/package.py b/var/spack/repos/builtin/packages/py-bitstruct/package.py index 252bb02b993c3c..d009d50c4e6b57 100644 --- a/var/spack/repos/builtin/packages/py-bitstruct/package.py +++ b/var/spack/repos/builtin/packages/py-bitstruct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyBitstruct(PythonPackage): maintainers("DaxLynch") + license("MIT") + version("8.17.0", sha256="eb94b40e4218a23aa8f90406b836a9e6ed83e48b8d112ce3f96408463bd1b874") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index a2cba61bc88951..2d350a192d3d8e 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,11 @@ class PyBlack(PythonPackage): maintainers("adamjstewart") + license("MIT", checked_by="tgamblin") + + version("24.1.0", sha256="30fbf768cd4f4576598b1db0202413fafea9a227ef808d1a12230c643cefe9fc") + version("23.12.1", sha256="4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5") + version("23.12.0", sha256="330a327b422aca0634ecd115985c1c7fd7bdb5b5a2ef8aa9888a82e2ebe9437a") version("23.11.0", sha256="4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05") version("23.10.1", sha256="1f8ce316753428ff68749c65a5f7844631aa18c8679dfd3ca9dc1a289979c258") version("23.10.0", sha256="31b9f87b277a68d0e99d2905edae08807c007973eaa609da5f0c62def6b7c0bd") @@ -37,6 +42,7 @@ class PyBlack(PythonPackage): variant("d", default=False, description="enable blackd HTTP server") variant("jupyter", default=False, description="enable Jupyter support") + depends_on("py-hatchling@1.20:", when="@23.12.1:", type="build") depends_on("py-hatchling@1.8:", when="@22.10:", type="build") depends_on("py-hatch-vcs", when="@22.10:", type="build") depends_on("py-hatch-fancy-pypi-readme", when="@22.10:", type="build") diff --git a/var/spack/repos/builtin/packages/py-bleach/package.py b/var/spack/repos/builtin/packages/py-bleach/package.py index daaf07fbc7f36e..50f7c149e9c320 100644 --- a/var/spack/repos/builtin/packages/py-bleach/package.py +++ b/var/spack/repos/builtin/packages/py-bleach/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBleach(PythonPackage): homepage = "https://github.com/mozilla/bleach" pypi = "bleach/bleach-3.1.0.tar.gz" + license("Apache-2.0") + version("6.0.0", sha256="1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414") version("5.0.1", sha256="0d03255c47eb9bd2f26aa9bb7f2107732e7e8fe195ca2f64709fcf3b0a4a085c") version("4.1.0", sha256="0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da") diff --git a/var/spack/repos/builtin/packages/py-blessed/package.py b/var/spack/repos/builtin/packages/py-blessed/package.py index c137ec5142addb..d2415b180e9070 100644 --- a/var/spack/repos/builtin/packages/py-blessed/package.py +++ b/var/spack/repos/builtin/packages/py-blessed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBlessed(PythonPackage): homepage = "https://github.com/jquast/blessed" pypi = "blessed/blessed-1.15.0.tar.gz" + license("MIT") + version("1.19.0", sha256="4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61") version("1.18.1", sha256="8b09936def6bc06583db99b65636b980075733e13550cb6af262ce724a55da23") version("1.18.0", sha256="1312879f971330a1b7f2c6341f2ae7e2cbac244bfc9d0ecfbbecd4b0293bc755") diff --git a/var/spack/repos/builtin/packages/py-blessings/package.py b/var/spack/repos/builtin/packages/py-blessings/package.py index b875afb2341a11..da36847c85d044 100644 --- a/var/spack/repos/builtin/packages/py-blessings/package.py +++ b/var/spack/repos/builtin/packages/py-blessings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBlessings(PythonPackage): homepage = "https://github.com/erikrose/blessings" pypi = "blessings/blessings-1.6.tar.gz" + license("MIT") + version("1.6", sha256="edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007") # Needs 2to3 diff --git a/var/spack/repos/builtin/packages/py-blight/package.py b/var/spack/repos/builtin/packages/py-blight/package.py index 4a980131d34c9c..bc3dca48598cf6 100644 --- a/var/spack/repos/builtin/packages/py-blight/package.py +++ b/var/spack/repos/builtin/packages/py-blight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBlight(PythonPackage): maintainers("woodruffw") + license("Apache-2.0") + version("0.0.47", sha256="eb4a881adb98e03a0a855b95bfcddb0f4b3ca568b00cb45b571f047ae75c5667") variant("dev", default=False, description="Install dependencies to help with development") diff --git a/var/spack/repos/builtin/packages/py-blinker/package.py b/var/spack/repos/builtin/packages/py-blinker/package.py index 110fe10fd5346f..594fecb89d2e31 100644 --- a/var/spack/repos/builtin/packages/py-blinker/package.py +++ b/var/spack/repos/builtin/packages/py-blinker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBlinker(PythonPackage): pypi = "blinker/blinker-1.4.tar.gz" git = "https://github.com/pallets-eco/blinker.git" + license("MIT") + version("1.6.2", sha256="4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213") version("1.4", sha256="471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6") diff --git a/var/spack/repos/builtin/packages/py-blis/package.py b/var/spack/repos/builtin/packages/py-blis/package.py index 954780e8e6f5e6..e2a158a11e054d 100644 --- a/var/spack/repos/builtin/packages/py-blis/package.py +++ b/var/spack/repos/builtin/packages/py-blis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBlis(PythonPackage): homepage = "https://github.com/explosion/cython-blis" pypi = "blis/blis-0.4.1.tar.gz" + license("BSD-3-Clause") + version("0.9.1", sha256="7ceac466801f9d97ecb34e10dded8c24cf5e0927ea7e834da1cc9d2ed3fc366f") version("0.7.9", sha256="29ef4c25007785a90ffc2f0ab3d3bd3b75cd2d7856a9a482b7d0dac8d511a09d") version("0.4.1", sha256="d69257d317e86f34a7f230a2fd1f021fd2a1b944137f40d8cdbb23bd334cd0c4") diff --git a/var/spack/repos/builtin/packages/py-blosc/package.py b/var/spack/repos/builtin/packages/py-blosc/package.py index afcc25b8307fdc..7d6b26ac6fcd19 100644 --- a/var/spack/repos/builtin/packages/py-blosc/package.py +++ b/var/spack/repos/builtin/packages/py-blosc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBlosc(PythonPackage): url = "https://github.com/Blosc/python-blosc/archive/v1.9.1.tar.gz" git = "https://github.com/Blosc/python-blosc.git" + license("BSD-3-Clause") + version("1.9.1", sha256="ffc884439a12409aa4e8945e21dc920d6bc21807357c51d24c7f0a27ae4f79b9") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-blosc2/package.py b/var/spack/repos/builtin/packages/py-blosc2/package.py index 983ed0273b27e2..238a963f362218 100644 --- a/var/spack/repos/builtin/packages/py-blosc2/package.py +++ b/var/spack/repos/builtin/packages/py-blosc2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBlosc2(PythonPackage): homepage = "https://github.com/Blosc/python-blosc2" pypi = "blosc2/blosc2-2.2.8.tar.gz" + license("BSD-3-Clause") + version("2.2.8", sha256="59065aac5e9b01b0e9f3825d8e7f69f64b59bbfab148a47c54e4115f62a97474") version("2.0.0", sha256="f19b0b3674f6c825b490f00d8264b0c540c2cdc11ec7e81178d38b83c57790a1") diff --git a/var/spack/repos/builtin/packages/py-bluepyefe/package.py b/var/spack/repos/builtin/packages/py-bluepyefe/package.py index 8a15e4edf9e2c5..613f85d67c6388 100644 --- a/var/spack/repos/builtin/packages/py-bluepyefe/package.py +++ b/var/spack/repos/builtin/packages/py-bluepyefe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-bluepyemodel/package.py b/var/spack/repos/builtin/packages/py-bluepyemodel/package.py index f865b9791b622b..5689b9a1e2f63f 100644 --- a/var/spack/repos/builtin/packages/py-bluepyemodel/package.py +++ b/var/spack/repos/builtin/packages/py-bluepyemodel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class PyBluepyemodel(PythonPackage): homepage = "https://github.com/BlueBrain/BluePyEModel" pypi = "bluepyemodel/bluepyemodel-0.0.46.tar.gz" + license("Apache-2.0") + + version("0.0.64", sha256="14fec4f77fb79295ce7cfe1711cd32f66e5d3e0ebc8da9404491ab7f59da1e71") + version("0.0.59", sha256="5e8869522d82e719f9775c2d95cfe953cedc66bc44355765a6f406289baf6791") + version("0.0.58", sha256="327de9d2c49e7ff83cc77850873293299d4eacf95b3cf33716e5a8501685f08c") + version("0.0.57", sha256="0b91e39e5066ab4a996bd932577b49648169e549c5f05bb3f93e345b4b186093") version("0.0.46", sha256="ad4c125e491f3337fcc341a4f389b8a616d883ce50fd77d9fb0ea6e13be5da61") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-bluepyopt/package.py b/var/spack/repos/builtin/packages/py-bluepyopt/package.py index ccc39f913558fe..826fc265ba9353 100644 --- a/var/spack/repos/builtin/packages/py-bluepyopt/package.py +++ b/var/spack/repos/builtin/packages/py-bluepyopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyBluepyopt(PythonPackage): homepage = "https://github.com/BlueBrain/BluePyOpt" pypi = "bluepyopt/bluepyopt-1.9.27.tar.gz" + license("LGPL-3.0-only") + # NOTE : while adding new release check pmi_rank.patch compatibility version("1.14.4", sha256="7567fd736053250ca06030f67ad93c607b100c2b98df8dc588c26b64cb3e171c") diff --git a/var/spack/repos/builtin/packages/py-bmap-tools/package.py b/var/spack/repos/builtin/packages/py-bmap-tools/package.py index 5eb5509894d435..adec4484da84db 100644 --- a/var/spack/repos/builtin/packages/py-bmap-tools/package.py +++ b/var/spack/repos/builtin/packages/py-bmap-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyBmapTools(PythonPackage): homepage = "https://github.com/intel/bmap-tools/" url = "https://github.com/intel/bmap-tools/archive/v3.4.tar.gz" + license("GPL-2.0-only") + version("3.5", sha256="d410e2d97192d0fc2f88ef160a0bb6ed83fce99da97a606d7f6890cc654ec594") version("3.4", sha256="483c5dd9589920b5bdec85d4cdbe150adb3ca404d205504f85c0fb03edc69c2a") version("3.2", sha256="4cf2adcd34be99cd4b892accaef6942cd9c67a4d09f5b1a5377d1e37ca5a2cd0") diff --git a/var/spack/repos/builtin/packages/py-bmtk/package.py b/var/spack/repos/builtin/packages/py-bmtk/package.py index f90e59af98aab4..35a45f7ac2bf16 100644 --- a/var/spack/repos/builtin/packages/py-bmtk/package.py +++ b/var/spack/repos/builtin/packages/py-bmtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBmtk(PythonPackage): homepage = "https://github.com/AllenInstitute/bmtk" pypi = "bmtk/bmtk-1.0.5.tar.gz" + license("BSD-3-Clause") + version("1.0.7", sha256="11e85098cf3c940a3d64718645f4a24ee13c8a47438ef5d28e054cb27ee01702") version("1.0.5", sha256="e0cb47b334467a6d124cfb99bbc67cc88f39f0291f4c39929f50d153130642a4") diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py index 9c6601dffe311e..8f79fb16c921c2 100644 --- a/var/spack/repos/builtin/packages/py-bokeh/package.py +++ b/var/spack/repos/builtin/packages/py-bokeh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,9 +9,12 @@ 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" + license("BSD-3-Clause") + + 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 +23,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 +41,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 +59,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:") diff --git a/var/spack/repos/builtin/packages/py-boltons/package.py b/var/spack/repos/builtin/packages/py-boltons/package.py index b025e184031328..a944f21f6c5b49 100644 --- a/var/spack/repos/builtin/packages/py-boltons/package.py +++ b/var/spack/repos/builtin/packages/py-boltons/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py b/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py index 82971caf68aa43..9a6a11be7cd84e 100644 --- a/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py +++ b/var/spack/repos/builtin/packages/py-boom-boot-manager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBoomBootManager(PythonPackage): homepage = "https://github.com/snapshotmanager/boom" url = "https://github.com/snapshotmanager/boom/archive/1.2.tar.gz" + license("GPL-2.0-or-later") + version("1.2", sha256="7e066caad5c91e7dd8475a5034e88bd0e8e6735aec412f904c0e93029b43ae47") version("1.1", sha256="0ddbfa914c1d997fae64833585eb6d781100ef32974c894ce2558cda6ce66d23") version("1.0", sha256="13f757e247f26959a9e64a0fbfcbf145881f299f892b164637b160089ae66a87") diff --git a/var/spack/repos/builtin/packages/py-boost-histogram/package.py b/var/spack/repos/builtin/packages/py-boost-histogram/package.py index e14dadae5350fd..bd743760411a8e 100644 --- a/var/spack/repos/builtin/packages/py-boost-histogram/package.py +++ b/var/spack/repos/builtin/packages/py-boost-histogram/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBoostHistogram(PythonPackage): homepage = "https://github.com/scikit-hep/boost-histogram" pypi = "boost_histogram/boost_histogram-1.2.1.tar.gz" + license("BSD-3-Clause") + version("1.3.2", sha256="e175efbc1054a27bc53fbbe95472cac9ea93999c91d0611840d776b99588d51a") version("1.3.1", sha256="31cd396656f3a37834e07d304cdb84d9906bc2172626a3d92fe577d08bcf410f") version("1.2.1", sha256="a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579") diff --git a/var/spack/repos/builtin/packages/py-boto/package.py b/var/spack/repos/builtin/packages/py-boto/package.py index 4b725a3b28f603..b521e13b67f06a 100644 --- a/var/spack/repos/builtin/packages/py-boto/package.py +++ b/var/spack/repos/builtin/packages/py-boto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBoto(PythonPackage): homepage = "https://github.com/boto/boto" url = "https://github.com/boto/boto/archive/2.49.0.tar.gz" + license("MIT") + version("2.49.0", sha256="3dbefd4f4542f85a323d4f54601f31ed4d362fc87945245f32e4a85029513314") depends_on("python@2.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-boto3/package.py b/var/spack/repos/builtin/packages/py-boto3/package.py index f1e73635b2c6d7..401af84037682e 100644 --- a/var/spack/repos/builtin/packages/py-boto3/package.py +++ b/var/spack/repos/builtin/packages/py-boto3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py index 460aa11b37eeab..feca4380de170a 100644 --- a/var/spack/repos/builtin/packages/py-botocore/package.py +++ b/var/spack/repos/builtin/packages/py-botocore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-botorch/package.py b/var/spack/repos/builtin/packages/py-botorch/package.py index 1f029ed0975739..6d13cb0988e740 100644 --- a/var/spack/repos/builtin/packages/py-botorch/package.py +++ b/var/spack/repos/builtin/packages/py-botorch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBotorch(PythonPackage): maintainers("adamjstewart", "meyersbs") + license("MIT") + version("0.8.4", sha256="e2c17efa8fcda3c9353bbd14ba283ddf237d66151097c0af483bbaaaac61288b") version("0.8.3", sha256="e529f7adbb2b54f46125ae904682fc0f0d02ab8bdb9067ede521c379b355bf73") version("0.6.4", sha256="3fd28417f55749501a45378f72cd5ca7614e2e05b7b65c6b4eb9b72378bc665a") diff --git a/var/spack/repos/builtin/packages/py-bottle/package.py b/var/spack/repos/builtin/packages/py-bottle/package.py index 5dbe1dde4ccaf7..a8bf824d778e7f 100644 --- a/var/spack/repos/builtin/packages/py-bottle/package.py +++ b/var/spack/repos/builtin/packages/py-bottle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBottle(PythonPackage): homepage = "https://github.com/bottlepy/bottle" url = "https://github.com/bottlepy/bottle/archive/0.12.18.tar.gz" + license("MIT") + version("0.12.23", sha256="f38c26395736ae4653cbeb94087d3bd1d2e1ad0c29b1d3e5384f5db20b63bc98") version("0.12.19", sha256="b97277f8e87d452a0aa5fbcd16cd604a189e2cc17fdb2d4eaf6baa732f8d111b") version("0.12.18", sha256="176721f1e26082c66fd4df76f31800933e4bb36de6814b0fda3851cb409a95e6") diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py index ad60002b9ecace..334975f9e19413 100644 --- a/var/spack/repos/builtin/packages/py-bottleneck/package.py +++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBottleneck(PythonPackage): homepage = "https://github.com/pydata/bottleneck" pypi = "Bottleneck/Bottleneck-1.0.0.tar.gz" + license("BSD-2-Clause") + version("1.3.7", sha256="e1467e373ad469da340ed0ff283214d6531cc08bfdca2083361a3aa6470681f8") version("1.3.5", sha256="2c0d27afe45351f6f421893362621804fa7dea14fe29a78eaa52d4323f646de7") version("1.3.2", sha256="20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573") diff --git a/var/spack/repos/builtin/packages/py-breakseq2/package.py b/var/spack/repos/builtin/packages/py-breakseq2/package.py index f17138d6372ade..ae7bc46a019c1e 100644 --- a/var/spack/repos/builtin/packages/py-breakseq2/package.py +++ b/var/spack/repos/builtin/packages/py-breakseq2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBreakseq2(PythonPackage): homepage = "https://bioinform.github.io/breakseq2/" url = "https://github.com/bioinform/breakseq2/archive/2.2.tar.gz" + license("BSD-2-Clause") + version("2.2", sha256="d149e803191e6bb0b749abfba2c258716d94a38e942aaed40eb1630ae84f91ee") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-breathe/package.py b/var/spack/repos/builtin/packages/py-breathe/package.py index 39bfb12122824a..8bc1fc6db7910f 100644 --- a/var/spack/repos/builtin/packages/py-breathe/package.py +++ b/var/spack/repos/builtin/packages/py-breathe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBreathe(PythonPackage): homepage = "https://github.com/michaeljones/breathe" url = "https://github.com/michaeljones/breathe/archive/v4.11.1.tar.gz" + license("BSD-3-Clause") + version("4.35.0", sha256="55b54723752fc04b892a0f868782b1df65e69db6ca94fb32cf04be495bfd7841") version("4.34.0", sha256="b22e70eb4000492508d687d71f258c8f9678398e277bcee0daf34cd438a46e25") version("4.33.1", sha256="acda75b216b227ec09ffd74378a6c7ed8f023df4539693c6e20574d1df52e75b") diff --git a/var/spack/repos/builtin/packages/py-brian/package.py b/var/spack/repos/builtin/packages/py-brian/package.py index 6a8b43cac7f9c3..4b7888e3f5f7ee 100644 --- a/var/spack/repos/builtin/packages/py-brian/package.py +++ b/var/spack/repos/builtin/packages/py-brian/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index f9ffeab3c91486..911377cd8a36bf 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBrian2(PythonPackage): homepage = "https://www.briansimulator.org" pypi = "Brian2/Brian2-2.2.2.1.tar.gz" + license("BSD-2-Clause") + version("2.5.0.2", sha256="70e6f88fb26f04ccafb91e0a29999774e45899771357aff7043951c853919a0f") version("2.5.0.1", sha256="1f719b563ae38658c4c59bac5aeb06b41970c6eedc52021ddf6d9254913733d3") version("2.4.2", sha256="7a711af40145d8c62b0bc0861d352dc64f341c3a738174d87ef9d71e50e959f2") diff --git a/var/spack/repos/builtin/packages/py-brotli/package.py b/var/spack/repos/builtin/packages/py-brotli/package.py index 44fcbda75a23b3..eece9c58daf1cc 100644 --- a/var/spack/repos/builtin/packages/py-brotli/package.py +++ b/var/spack/repos/builtin/packages/py-brotli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBrotli(PythonPackage): homepage = "https://github.com/google/brotli" pypi = "Brotli/Brotli-1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-brotlipy/package.py b/var/spack/repos/builtin/packages/py-brotlipy/package.py index fcff0ff9b4b4b4..8cb3c407b3ad25 100644 --- a/var/spack/repos/builtin/packages/py-brotlipy/package.py +++ b/var/spack/repos/builtin/packages/py-brotlipy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBrotlipy(PythonPackage): homepage = "https://github.com/python-hyper/brotlipy/" pypi = "brotlipy/brotlipy-0.7.0.tar.gz" + license("MIT") + version("0.7.0", sha256="36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-bsddb3/package.py b/var/spack/repos/builtin/packages/py-bsddb3/package.py index 0888cd778168c4..97db040831b86f 100644 --- a/var/spack/repos/builtin/packages/py-bsddb3/package.py +++ b/var/spack/repos/builtin/packages/py-bsddb3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyBsddb3(PythonPackage): pypi = "bsddb3/bsddb3-6.2.5.tar.gz" + license("BSD-3-Clause") + version("6.2.5", sha256="784bf40ad935258507594a89b32ea11f362cde120751c8b96de163955ced7db8") depends_on("python@2.6:") diff --git a/var/spack/repos/builtin/packages/py-build/package.py b/var/spack/repos/builtin/packages/py-build/package.py index 0812041e20ce1a..6d67ad3c077888 100644 --- a/var/spack/repos/builtin/packages/py-build/package.py +++ b/var/spack/repos/builtin/packages/py-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyBuild(PythonPackage): homepage = "https://github.com/pypa/build" pypi = "build/build-0.7.0.tar.gz" + license("MIT") + version("1.0.3", sha256="538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b") version("1.0.0", sha256="49a60f212df4d9925727c2118e1cbe3abf30b393eff7d0e7287d2170eb36844d") version("0.10.0", sha256="d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269") diff --git a/var/spack/repos/builtin/packages/py-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py index 810f243fa133e6..e37f48f4f77824 100644 --- a/var/spack/repos/builtin/packages/py-bx-python/package.py +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyBxPython(PythonPackage): homepage = "https://github.com/bxlab/bx-python" pypi = "bx-python/bx-python-0.8.8.tar.gz" + license("MIT") + version("0.9.0", sha256="fe545c44d2ea74b239d41e9090618aaf6a859d1a1f64b4a21b133cb602dfdb49") version("0.8.8", sha256="ad0808ab19c007e8beebadc31827e0d7560ac0e935f1100fb8cc93607400bb47") diff --git a/var/spack/repos/builtin/packages/py-cachecontrol/package.py b/var/spack/repos/builtin/packages/py-cachecontrol/package.py index 04a510f192381e..f56e110e37dbb5 100644 --- a/var/spack/repos/builtin/packages/py-cachecontrol/package.py +++ b/var/spack/repos/builtin/packages/py-cachecontrol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,13 +13,29 @@ class PyCachecontrol(PythonPackage): homepage = "https://github.com/ionrock/cachecontrol" pypi = "CacheControl/CacheControl-0.12.10.tar.gz" + license("Apache-2.0") + + version("0.13.1", sha256="f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b") + version("0.13.0", sha256="fd3fd2cb0ca66b9a6c1d56cc9709e7e49c63dbd19b1b1bcbd8d3f94cedfe8ce5") version("0.12.11", sha256="a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144") version("0.12.10", sha256="d8aca75b82eec92d84b5d6eb8c8f66ea16f09d2adb09dbca27fe2d5fc8d3732d") variant("filecache", default=False, description="Add lockfile dependency") + variant("redis", default=False, description="Add redis dependency") - depends_on("python@3.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") + depends_on("py-flit-core@3.2:3", when="@0.13.1", type="build") + depends_on("py-setuptools", when="@:0.13.0", type="build") + depends_on("py-requests@2.16.0:", when="@0.13", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-msgpack@0.5.2:", type=("build", "run")) - depends_on("py-lockfile@0.9:", when="+filecache", type="run") + depends_on("py-filelock@3.8.0:", when="@0.13+filecache", type=("build", "run")) + depends_on("py-lockfile@0.9:", when="@0.12+filecache", type=("build", "run")) + depends_on("py-redis@2.10.5:", when="+redis", type=("build", "run")) + + def url_for_version(self, version): + url = "https://files.pythonhosted.org/packages/source/c/cachecontrol/{0}-{1}.tar.gz" + if version <= Version("0.13.0"): + letter = "CacheControl" + else: + letter = "cachecontrol" + return url.format(letter, version) diff --git a/var/spack/repos/builtin/packages/py-cached-property/package.py b/var/spack/repos/builtin/packages/py-cached-property/package.py index 254881b14b1c88..430ab2629d1ab6 100644 --- a/var/spack/repos/builtin/packages/py-cached-property/package.py +++ b/var/spack/repos/builtin/packages/py-cached-property/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyCachedProperty(PythonPackage): pypi = "cached-property/cached-property-1.5.1.tar.gz" + license("BSD-3-Clause") + version("1.5.2", sha256="9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130") version("1.5.1", sha256="9217a59f14a5682da7c4b8829deadbfc194ac22e9908ccf7c8820234e80a1504") diff --git a/var/spack/repos/builtin/packages/py-cachetools/package.py b/var/spack/repos/builtin/packages/py-cachetools/package.py index da6cfe909b2003..edda79243e08a9 100644 --- a/var/spack/repos/builtin/packages/py-cachetools/package.py +++ b/var/spack/repos/builtin/packages/py-cachetools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCachetools(PythonPackage): homepage = "https://github.com/tkem/cachetools" pypi = "cachetools/cachetools-3.1.1.tar.gz" + license("MIT") + version("5.2.0", sha256="6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757") version("4.2.4", sha256="89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693") version("4.2.2", sha256="61b5ed1e22a0924aed1d23b478f37e8d52549ff8a961de2909c69bf950020cff") diff --git a/var/spack/repos/builtin/packages/py-cachy/package.py b/var/spack/repos/builtin/packages/py-cachy/package.py index 4ab11272c18726..f1bdae7f53ab69 100644 --- a/var/spack/repos/builtin/packages/py-cachy/package.py +++ b/var/spack/repos/builtin/packages/py-cachy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCachy(PythonPackage): homepage = "https://github.com/sdispater/cachy" pypi = "cachy/cachy-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1") depends_on("python@2.7,3.4:4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cairocffi/package.py b/var/spack/repos/builtin/packages/py-cairocffi/package.py index 0a9cd5f0537963..bfa66c3b911f85 100644 --- a/var/spack/repos/builtin/packages/py-cairocffi/package.py +++ b/var/spack/repos/builtin/packages/py-cairocffi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cairosvg/package.py b/var/spack/repos/builtin/packages/py-cairosvg/package.py new file mode 100644 index 00000000000000..7310465482429c --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cairosvg/package.py @@ -0,0 +1,26 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyCairosvg(PythonPackage): + """ + CairoSVG is an SVG converter based on Cairo. + It can export SVG files to PDF, EPS, PS, and PNG files. + """ + + homepage = "https://cairosvg.org/" + pypi = "CairoSVG/CairoSVG-2.7.1.tar.gz" + + version("2.7.1", sha256="432531d72347291b9a9ebfb6777026b607563fd8719c46ee742db0aef7271ba0") + + depends_on("python@3.5:", type=("build", "run")) + depends_on("py-setuptools", type="build") + depends_on("py-cairocffi", type=("build", "run")) + depends_on("py-cssselect2", type=("build", "run")) + depends_on("py-defusedxml", type=("build", "run")) + depends_on("py-pillow", type=("build", "run")) + depends_on("py-tinycss2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-callmonitor/package.py b/var/spack/repos/builtin/packages/py-callmonitor/package.py index e8220a6395a7e1..57068251a25cc3 100644 --- a/var/spack/repos/builtin/packages/py-callmonitor/package.py +++ b/var/spack/repos/builtin/packages/py-callmonitor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-calver/package.py b/var/spack/repos/builtin/packages/py-calver/package.py index c8d669a056cf33..8ede4f4e3e5563 100644 --- a/var/spack/repos/builtin/packages/py-calver/package.py +++ b/var/spack/repos/builtin/packages/py-calver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCalver(PythonPackage): homepage = "https://github.com/di/calver" pypi = "calver/calver-2022.6.26.tar.gz" + license("Apache-2.0") + version("2022.6.26", sha256="e05493a3b17517ef1748fbe610da11f10485faa7c416b9d33fd4a52d74894f8b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cantoolz/package.py b/var/spack/repos/builtin/packages/py-cantoolz/package.py index 26fe87e9574b94..86d6f1b4b03121 100644 --- a/var/spack/repos/builtin/packages/py-cantoolz/package.py +++ b/var/spack/repos/builtin/packages/py-cantoolz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCantoolz(PythonPackage): homepage = "https://github.com/CANToolz/CANToolz/" url = "https://github.com/CANToolz/CANToolz/archive/v3.7.0.tar.gz" + license("Apache-2.0") + version("3.7.0", sha256="36f5e8aa407e5c82abe84fb190ddd45ed12887ee833f06ef5eb78504017f0e5d") version("3.6.1", sha256="e40c712b726f1caaca16b0d0e0b3aeadd01426944663ba0dce5c47a340304e29") diff --git a/var/spack/repos/builtin/packages/py-carputils/package.py b/var/spack/repos/builtin/packages/py-carputils/package.py index 7082557d1d387a..9a50582c5343d2 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCarputils(PythonPackage): maintainers("MarieHouillon") + license("Apache-2.0") + version("master", branch="master") # Version to use with openCARP releases version("oc13.0", commit="216c3802c2ac2d14c739164dcd57f2e59aa2ede3") diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index 7091a3e965752a..ef7f72b4828ba2 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCartopy(PythonPackage): maintainers("adamjstewart") skip_modules = ["cartopy.tests"] + license("LGPL-3.0-or-later") + version("0.22.0", sha256="b300f90120931d43f11ef87c064ea1dacec1b59a4940aa76ebf82cf09548bb49") version("0.21.1", sha256="89d5649712c8582231c6e11825a04c85f6f0cee94dbb89e4db23eabca1cc250a") version("0.21.0", sha256="ce1d3a28a132e94c89ac33769a50f81f65634ab2bd40556317e15bd6cad1ce42") diff --git a/var/spack/repos/builtin/packages/py-casadi/package.py b/var/spack/repos/builtin/packages/py-casadi/package.py new file mode 100644 index 00000000000000..f4f47b771c8dd1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-casadi/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyCasadi(PythonPackage): + """CasADi -- framework for algorithmic differentiation and numeric optimization""" + + homepage = "https://web.casadi.org/" + pypi = "casadi/casadi-3.6.4.tar.gz" + + license("LGPL") + + version("3.6.4", sha256="affdca1a99c14580992cdf34d247754b7d851080b712c2922ad2e92442eeaa35") + + depends_on("py-setuptools", type="build") + depends_on("py-numpy", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-catalogue/package.py b/var/spack/repos/builtin/packages/py-catalogue/package.py index 6bf37575355277..66eed0f21d6b1e 100644 --- a/var/spack/repos/builtin/packages/py-catalogue/package.py +++ b/var/spack/repos/builtin/packages/py-catalogue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCatalogue(PythonPackage): homepage = "https://github.com/explosion/catalogue" pypi = "catalogue/catalogue-2.0.0.tar.gz" + license("MIT") + version("2.0.8", sha256="b325c77659208bfb6af1b0d93b1a1aa4112e1bb29a4c5ced816758a722f0e388") version("2.0.0", sha256="34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816") version("1.0.0", sha256="d74d1d856c6b36a37bf14aa6dbbc27d0582667b7ab979a6108e61a575e8723f5") diff --git a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py index 668e8e4142e909..a417c3bd51f02d 100644 --- a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py +++ b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cattrs/package.py b/var/spack/repos/builtin/packages/py-cattrs/package.py index 2a7fa715e6003e..939cf85f64e2fe 100644 --- a/var/spack/repos/builtin/packages/py-cattrs/package.py +++ b/var/spack/repos/builtin/packages/py-cattrs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCattrs(PythonPackage): homepage = "https://github.com/python-attrs/cattrs" pypi = "cattrs/cattrs-22.2.0.tar.gz" + license("MIT") + version("22.2.0", sha256="f0eed5642399423cf656e7b66ce92cdc5b963ecafd041d1b24d136fdde7acf6d") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cclib/package.py b/var/spack/repos/builtin/packages/py-cclib/package.py index 53aa86beae7f12..b346d8c1dc36b6 100644 --- a/var/spack/repos/builtin/packages/py-cclib/package.py +++ b/var/spack/repos/builtin/packages/py-cclib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index 3f261a13083a0a..752118b5cda177 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cdsapi/package.py b/var/spack/repos/builtin/packages/py-cdsapi/package.py index 6793eeebfe65e4..11e966f27a5161 100644 --- a/var/spack/repos/builtin/packages/py-cdsapi/package.py +++ b/var/spack/repos/builtin/packages/py-cdsapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCdsapi(PythonPackage): homepage = "https://cds.climate.copernicus.eu" pypi = "cdsapi/cdsapi-0.2.3.tar.gz" + license("Apache-2.0") + version("0.2.3", sha256="333b31ec263224399635db9b21a2e1a50cd73451f5179f8d967437e7c9161d9b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cekit/package.py b/var/spack/repos/builtin/packages/py-cekit/package.py index 43b27bb3a90353..440e888f2f30fd 100644 --- a/var/spack/repos/builtin/packages/py-cekit/package.py +++ b/var/spack/repos/builtin/packages/py-cekit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCekit(PythonPackage): homepage = "https://github.com/cekit/cekit/" url = "https://github.com/cekit/cekit/archive/3.7.0.tar.gz" + license("MIT") + version("3.7.0", sha256="2a778b50427f1d7478d5cd54a5df97fb1b8d540892a1e70d7f9a9c7b878f89ca") version("3.6.0", sha256="d046f25b533ffa1602e3c53e58cc90108bd8fb1f8d0c4fae92f28cf71f81add0") version("3.5.0", sha256="696a90098cde8a59b8e2c06e1b031ee1fd86e696d1e9894e836da2a1432bfd20") diff --git a/var/spack/repos/builtin/packages/py-celery/package.py b/var/spack/repos/builtin/packages/py-celery/package.py index 8ea05324f831af..7cbe513c974f28 100644 --- a/var/spack/repos/builtin/packages/py-celery/package.py +++ b/var/spack/repos/builtin/packages/py-celery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyCelery(PythonPackage): pypi = "celery/celery-4.2.1.tar.gz" + license("BSD-3-Clause") + version("5.2.3", sha256="e2cd41667ad97d4f6a2f4672d1c6a6ebada194c619253058b5f23704aaadaa82") version("5.0.0", sha256="313930fddde703d8e37029a304bf91429cd11aeef63c57de6daca9d958e1f255") version("4.4.7", sha256="d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f") diff --git a/var/spack/repos/builtin/packages/py-cerberus/package.py b/var/spack/repos/builtin/packages/py-cerberus/package.py index 2f3568847c2f5d..add1b278635cc4 100644 --- a/var/spack/repos/builtin/packages/py-cerberus/package.py +++ b/var/spack/repos/builtin/packages/py-cerberus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCerberus(PythonPackage): homepage = "http://docs.python-cerberus.org/" pypi = "Cerberus/Cerberus-1.3.4.tar.gz" + license("0BSD") + version("1.3.4", sha256="d1b21b3954b2498d9a79edf16b3170a3ac1021df88d197dc2ce5928ba519237c") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py index bcf14be2f068f0..39164886c8d4fb 100644 --- a/var/spack/repos/builtin/packages/py-certifi/package.py +++ b/var/spack/repos/builtin/packages/py-certifi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCertifi(PythonPackage): homepage = "https://github.com/certifi/python-certifi" pypi = "certifi/certifi-2020.6.20.tar.gz" + license("MPL-2.0") + version("2023.7.22", sha256="539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082") version("2023.5.7", sha256="0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7") version("2022.12.7", sha256="35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3") diff --git a/var/spack/repos/builtin/packages/py-certipy/package.py b/var/spack/repos/builtin/packages/py-certipy/package.py index a1cf5776a3182a..d08e10d1016342 100644 --- a/var/spack/repos/builtin/packages/py-certipy/package.py +++ b/var/spack/repos/builtin/packages/py-certipy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cf-units/package.py b/var/spack/repos/builtin/packages/py-cf-units/package.py index 8dd42723dfa4c6..8638fb94804643 100644 --- a/var/spack/repos/builtin/packages/py-cf-units/package.py +++ b/var/spack/repos/builtin/packages/py-cf-units/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCfUnits(PythonPackage): pypi = "cf-units/cf-units-2.1.1.tar.gz" git = "https://github.com/SciTools/cf-units.git" + license("LGPL-3.0-only") + version("master", branch="master") version("2.1.4", sha256="25f81ad994af30713ee8f5ef18ffddd83c6ec1ac308e1bd89d45de9d2e0f1c31") version("2.1.1", sha256="fa0ef8efd84546e61088aa23e76ebbaf7043167dc3a7f35f34549c234b543530") diff --git a/var/spack/repos/builtin/packages/py-cffconvert/package.py b/var/spack/repos/builtin/packages/py-cffconvert/package.py index bc770d431b37aa..2db1733a78c54d 100644 --- a/var/spack/repos/builtin/packages/py-cffconvert/package.py +++ b/var/spack/repos/builtin/packages/py-cffconvert/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCffconvert(PythonPackage): homepage = "https://github.com/citation-file-format/cff-converter-python" pypi = "cffconvert/cffconvert-2.0.0.tar.gz" + license("Apache-2.0") + version("2.0.0", sha256="b4379ee415c6637dc9e3e7ba196605cb3cedcea24613e4ea242c607d9e98eb50") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py index e43d40e2c36d85..a413a07e7d762a 100644 --- a/var/spack/repos/builtin/packages/py-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-cffi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCffi(PythonPackage): homepage = "https://cffi.readthedocs.io/en/latest/" pypi = "cffi/cffi-1.13.0.tar.gz" + license("MIT") + version("1.15.1", sha256="d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9") version("1.15.0", sha256="920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954") version("1.14.6", sha256="c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd") diff --git a/var/spack/repos/builtin/packages/py-cfgrib/package.py b/var/spack/repos/builtin/packages/py-cfgrib/package.py index 00bd3ea05feab6..cbbeba01fd13c3 100644 --- a/var/spack/repos/builtin/packages/py-cfgrib/package.py +++ b/var/spack/repos/builtin/packages/py-cfgrib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCfgrib(PythonPackage): homepage = "https://github.com/ecmwf/cfgrib" pypi = "cfgrib/cfgrib-0.9.8.5.tar.gz" + license("Apache-2.0") + version("0.9.9.0", sha256="6ff0227df9c5ee34aa7d6ab1f7af3fbe6838523a8a9891c74040b419b03ad289") version("0.9.8.5", sha256="07c224d7ac823a1df5738b96b9d3621515538f51f67e55044f9cc8ec1668e1bd") diff --git a/var/spack/repos/builtin/packages/py-cfgv/package.py b/var/spack/repos/builtin/packages/py-cfgv/package.py index 9158f42762f5b6..b07368f3ff6adf 100644 --- a/var/spack/repos/builtin/packages/py-cfgv/package.py +++ b/var/spack/repos/builtin/packages/py-cfgv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCfgv(PythonPackage): homepage = "https://github.com/asottile/cfgv/" pypi = "cfgv/cfgv-2.0.1.tar.gz" + license("MIT") + version("3.4.0", sha256="e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560") version("3.3.1", sha256="f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736") version("2.0.1", sha256="edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144") diff --git a/var/spack/repos/builtin/packages/py-cftime/package.py b/var/spack/repos/builtin/packages/py-cftime/package.py index a197b4b02fa6a9..7bc37434c1603e 100644 --- a/var/spack/repos/builtin/packages/py-cftime/package.py +++ b/var/spack/repos/builtin/packages/py-cftime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cgen/package.py b/var/spack/repos/builtin/packages/py-cgen/package.py index 55ec1293f1eea5..c82f0ea2e456a6 100644 --- a/var/spack/repos/builtin/packages/py-cgen/package.py +++ b/var/spack/repos/builtin/packages/py-cgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCgen(PythonPackage): homepage = "https://documen.tician.de/cgen/" pypi = "cgen/cgen-2020.1.tar.gz" + license("MIT") + version("2020.1", sha256="4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf") depends_on("py-pytools@2015.1.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-chai/package.py b/var/spack/repos/builtin/packages/py-chai/package.py index 2be1838dd69d95..77008344f37971 100644 --- a/var/spack/repos/builtin/packages/py-chai/package.py +++ b/var/spack/repos/builtin/packages/py-chai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyChai(PythonPackage): homepage = "https://github.com/agoragames/chai" pypi = "chai/chai-1.1.2.tar.gz" + license("BSD-3-Clause") + version("1.1.2", sha256="ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-chainer/package.py b/var/spack/repos/builtin/packages/py-chainer/package.py index 4585f1e814aa3a..1f78c76a30d3bb 100644 --- a/var/spack/repos/builtin/packages/py-chainer/package.py +++ b/var/spack/repos/builtin/packages/py-chainer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class PyChainer(PythonPackage): skip_modules = ["onnx_chainer"] + license("MIT") + version("7.2.0", sha256="6e2fba648cc5b8a5421e494385b76fe5ec154f1028a1c5908557f5d16c04f0b3") version("6.7.0", sha256="87cb3378a35e7c5c695028ec91d58dc062356bc91412384ea939d71374610389") diff --git a/var/spack/repos/builtin/packages/py-chainmap/package.py b/var/spack/repos/builtin/packages/py-chainmap/package.py index 49c1d4d77a9dac..150a40cbc53bfd 100644 --- a/var/spack/repos/builtin/packages/py-chainmap/package.py +++ b/var/spack/repos/builtin/packages/py-chainmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-chalice/package.py b/var/spack/repos/builtin/packages/py-chalice/package.py index f0ec3520e03566..911f1b16cd2d59 100644 --- a/var/spack/repos/builtin/packages/py-chalice/package.py +++ b/var/spack/repos/builtin/packages/py-chalice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyChalice(PythonPackage): homepage = "https://github.com/aws/chalice" url = "https://github.com/aws/chalice/archive/1.20.0.tar.gz" + license("Apache-2.0") + version("1.20.0", sha256="0504fa8492379a658b123a7aa173b008be1a01c5a06d65f8ef1f1e6b87515e33") version("1.19.0", sha256="6d2f9e2d39e836c9cf32451a39443bb8d08d8dfd5ddc75792519ec97817b4fdd") version("1.18.1", sha256="fb52dc3851998ebe41813a5448d8e5687cc64e734a174db6e7e677c634d87823") diff --git a/var/spack/repos/builtin/packages/py-chardet/package.py b/var/spack/repos/builtin/packages/py-chardet/package.py index f7a3f5cc621ff0..f8a6841af06665 100644 --- a/var/spack/repos/builtin/packages/py-chardet/package.py +++ b/var/spack/repos/builtin/packages/py-chardet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyChardet(PythonPackage): homepage = "https://github.com/chardet/chardet" pypi = "chardet/chardet-3.0.4.tar.gz" + license("LGPL-2.1-or-later") + version("5.2.0", sha256="1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7") version("5.1.0", sha256="0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5") version("5.0.0", sha256="0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa") diff --git a/var/spack/repos/builtin/packages/py-charm4py/package.py b/var/spack/repos/builtin/packages/py-charm4py/package.py index f84a0b06d69b47..0dc5d217bfeeea 100644 --- a/var/spack/repos/builtin/packages/py-charm4py/package.py +++ b/var/spack/repos/builtin/packages/py-charm4py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-charset-normalizer/package.py b/var/spack/repos/builtin/packages/py-charset-normalizer/package.py index 706c49c9884606..90b23449c3ea19 100644 --- a/var/spack/repos/builtin/packages/py-charset-normalizer/package.py +++ b/var/spack/repos/builtin/packages/py-charset-normalizer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCharsetNormalizer(PythonPackage): homepage = "https://github.com/ousret/charset_normalizer" pypi = "charset-normalizer/charset-normalizer-2.0.7.tar.gz" + license("MIT") + version("3.3.0", sha256="63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6") version("3.1.0", sha256="34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5") version("2.1.1", sha256="5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845") diff --git a/var/spack/repos/builtin/packages/py-chart-studio/package.py b/var/spack/repos/builtin/packages/py-chart-studio/package.py index af4aa0db5fd540..ddff3f87ba722e 100644 --- a/var/spack/repos/builtin/packages/py-chart-studio/package.py +++ b/var/spack/repos/builtin/packages/py-chart-studio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyChartStudio(PythonPackage): homepage = "https://pypi.org/project/chart-studio/" pypi = "chart-studio/chart-studio-1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="a17283b62470306d77060b200f13f9749c807dd15613c113d36f8d057f5c7019") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py index 36fb5e12be48f6..a0825cacf0cdad 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCheckmGenome(PythonPackage): homepage = "https://ecogenomics.github.io/CheckM" pypi = "checkm-genome/checkm-genome-1.0.11.tar.gz" + license("GPL-3.0-or-later") + version("1.2.1", sha256="33907aa7bbf029f8345e33df80d5c89b7a719041f55ece4f7470cd061c8eff76") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-cheetah3/package.py b/var/spack/repos/builtin/packages/py-cheetah3/package.py index 9481310841e381..373ae463f41781 100644 --- a/var/spack/repos/builtin/packages/py-cheetah3/package.py +++ b/var/spack/repos/builtin/packages/py-cheetah3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyCheetah3(PythonPackage): pypi = "Cheetah3/Cheetah3-3.2.6.tar.gz" + license("MIT") + version("3.2.6", sha256="f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-chemfiles/package.py b/var/spack/repos/builtin/packages/py-chemfiles/package.py index a3965c58f1fbc3..5cb22d838e08df 100644 --- a/var/spack/repos/builtin/packages/py-chemfiles/package.py +++ b/var/spack/repos/builtin/packages/py-chemfiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyChemfiles(PythonPackage): maintainers("RMeli") + license("BSD-3-Clause") + version("0.10.3", sha256="4bbb8b116492a57dbf6ddb4c84aad0133cd782e0cc0e53e4b957f2d93e6806ea") depends_on("chemfiles@0.10.3+shared", when="@0.10.3") diff --git a/var/spack/repos/builtin/packages/py-cheroot/package.py b/var/spack/repos/builtin/packages/py-cheroot/package.py index cda3e8af73a204..4a3f4e0a6fda83 100644 --- a/var/spack/repos/builtin/packages/py-cheroot/package.py +++ b/var/spack/repos/builtin/packages/py-cheroot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCheroot(PythonPackage): homepage = "https://cheroot.readthedocs.io/en/latest/" pypi = "cheroot/cheroot-6.5.5.tar.gz" + license("BSD-3-Clause") + version("8.3.0", sha256="a0577e1f28661727d472671a7cc4e0c12ea0cbc5220265e70f00a8b8cb628931") version("6.5.5", sha256="f6a85e005adb5bc5f3a92b998ff0e48795d4d98a0fbb7edde47a7513d4100601") diff --git a/var/spack/repos/builtin/packages/py-cherrypy/package.py b/var/spack/repos/builtin/packages/py-cherrypy/package.py index 1b786057b319fb..4f22db4cc6cf95 100644 --- a/var/spack/repos/builtin/packages/py-cherrypy/package.py +++ b/var/spack/repos/builtin/packages/py-cherrypy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCherrypy(PythonPackage): homepage = "https://cherrypy.readthedocs.io/en/latest/" pypi = "CherryPy/CherryPy-18.1.1.tar.gz" + license("BSD-3-Clause") + version("18.1.1", sha256="6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-chex/package.py b/var/spack/repos/builtin/packages/py-chex/package.py index 434a8c93578b3f..abc993fad1bf35 100644 --- a/var/spack/repos/builtin/packages/py-chex/package.py +++ b/var/spack/repos/builtin/packages/py-chex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyChex(PythonPackage): homepage = "https://github.com/deepmind/chex" pypi = "chex/chex-0.1.0.tar.gz" + license("Apache-2.0") + version("0.1.5", sha256="686858320f8f220c82a6c7eeb54dcdcaa4f3d7f66690dacd13a24baa1ee8299e") version("0.1.0", sha256="9e032058f5fed2fc1d5e9bf8e12ece5910cf6a478c12d402b6d30984695f2161") diff --git a/var/spack/repos/builtin/packages/py-chronyk/package.py b/var/spack/repos/builtin/packages/py-chronyk/package.py index 1631f9eb886163..3c2e4202ed6602 100644 --- a/var/spack/repos/builtin/packages/py-chronyk/package.py +++ b/var/spack/repos/builtin/packages/py-chronyk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyChronyk(PythonPackage): homepage = "https://github.com/KoffeinFlummi/Chronyk/" url = "https://github.com/KoffeinFlummi/Chronyk/archive/v1.0.1.tar.gz" + license("MIT") + version("1.0.1", sha256="fc47773ab27d68b56f241ff112b72c2b6590558769b3f225994175ca75115bc8") version("0.9.1", sha256="94ebef9f8cf282136413b3963a958b2ab8aad3d552987b56afb3d517cd1e3e59") diff --git a/var/spack/repos/builtin/packages/py-ci-info/package.py b/var/spack/repos/builtin/packages/py-ci-info/package.py index 69c4d278951b5c..4a13a63eb8bac4 100644 --- a/var/spack/repos/builtin/packages/py-ci-info/package.py +++ b/var/spack/repos/builtin/packages/py-ci-info/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyCiInfo(PythonPackage): homepage = "https://github.com/mgxd/ci-info" pypi = "ci-info/ci-info-0.2.0.tar.gz" + license("MIT") + version("0.3.0", sha256="1fd50cbd401f29adffeeb18b0489e232d16ac1a7458ac6bc316deab6ae535fb0") version("0.2.0", sha256="dd70632c977feb8797b1e633507166b64ad5f57183cebb2b0ea56934abba4616") diff --git a/var/spack/repos/builtin/packages/py-ci-sdr/package.py b/var/spack/repos/builtin/packages/py-ci-sdr/package.py index e40482d3c7eea0..e2ffca93e4fb46 100644 --- a/var/spack/repos/builtin/packages/py-ci-sdr/package.py +++ b/var/spack/repos/builtin/packages/py-ci-sdr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCiSdr(PythonPackage): homepage = "https://github.com/fgnt/ci_sdr" pypi = "ci_sdr/ci_sdr-0.0.0.tar.gz" + license("MIT") + version("0.0.0", sha256="a1387f39ccd55cce034e2c01000a0a337b3729d8a5010b42c5381d8c820fa4bb") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cinema-lib/package.py b/var/spack/repos/builtin/packages/py-cinema-lib/package.py index 9cfa2e511535a6..5c3e504389b8fb 100644 --- a/var/spack/repos/builtin/packages/py-cinema-lib/package.py +++ b/var/spack/repos/builtin/packages/py-cinema-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cinemasci/package.py b/var/spack/repos/builtin/packages/py-cinemasci/package.py index 35358d67fd5f5d..409b6cbda3b45e 100644 --- a/var/spack/repos/builtin/packages/py-cinemasci/package.py +++ b/var/spack/repos/builtin/packages/py-cinemasci/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-circus/package.py b/var/spack/repos/builtin/packages/py-circus/package.py index 25f17aad6f97d2..8a3451ad0ddb21 100644 --- a/var/spack/repos/builtin/packages/py-circus/package.py +++ b/var/spack/repos/builtin/packages/py-circus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCircus(PythonPackage): homepage = "https://github.com/circus-tent/circus" pypi = "circus/circus-0.18.0.tar.gz" + license("Apache-2.0") + version("0.18.0", sha256="193ce8224e068ced66724cf483106fb6674b51a57583ac1a0e7ed7a7ee8c71ab") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-citeproc-py/package.py b/var/spack/repos/builtin/packages/py-citeproc-py/package.py index 148f2e2217c8fc..c5aaeb5c4895ce 100644 --- a/var/spack/repos/builtin/packages/py-citeproc-py/package.py +++ b/var/spack/repos/builtin/packages/py-citeproc-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCiteprocPy(PythonPackage): homepage = "https://github.com/brechtm/citeproc-py" pypi = "citeproc-py/citeproc-py-0.6.0.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("0.6.0", sha256="d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-clean-text/package.py b/var/spack/repos/builtin/packages/py-clean-text/package.py index b4aa902dd81fad..3bf281578962c3 100644 --- a/var/spack/repos/builtin/packages/py-clean-text/package.py +++ b/var/spack/repos/builtin/packages/py-clean-text/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCleanText(PythonPackage): pypi = "clean-text/clean-text-0.5.0.tar.gz" + license("Apache-2.0") + version("0.6.0", sha256="8374b385fc2a26e06383f62aed076fa6be115e5832239e2a7fd8b344fa8d2ab2") version("0.5.0", sha256="e525951bef0c8b72e03c987fdac2c475b61d7debf7a8834366fd75716179b6e1") diff --git a/var/spack/repos/builtin/packages/py-cleo/package.py b/var/spack/repos/builtin/packages/py-cleo/package.py index 1852bd7b3eb76e..60f5ddb22b1858 100644 --- a/var/spack/repos/builtin/packages/py-cleo/package.py +++ b/var/spack/repos/builtin/packages/py-cleo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,17 +12,28 @@ 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") + + license("MIT") + + 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")) diff --git a/var/spack/repos/builtin/packages/py-click-didyoumean/package.py b/var/spack/repos/builtin/packages/py-click-didyoumean/package.py index eb91baecb52cd8..722f1bb9b68515 100644 --- a/var/spack/repos/builtin/packages/py-click-didyoumean/package.py +++ b/var/spack/repos/builtin/packages/py-click-didyoumean/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyClickDidyoumean(PythonPackage): homepage = "https://github.com/click-contrib/click-didyoumean" pypi = "click-didyoumean/click-didyoumean-0.0.3.tar.gz" + license("MIT") + version("0.0.3", sha256="112229485c9704ff51362fe34b2d4f0b12fc71cc20f6d2b3afabed4b8bfa6aeb") depends_on("python@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-click-plugins/package.py b/var/spack/repos/builtin/packages/py-click-plugins/package.py index 0b78b18a4a2f02..51df66fde97ce1 100644 --- a/var/spack/repos/builtin/packages/py-click-plugins/package.py +++ b/var/spack/repos/builtin/packages/py-click-plugins/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyClickPlugins(PythonPackage): pypi = "click-plugins/click-plugins-1.0.4.tar.gz" + license("BSD-3-Clause") + version("1.1.1", sha256="46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b") version("1.0.4", sha256="dfed74b5063546a137de99baaaf742b4de4337ad2b3e1df5ec7c8a256adc0847") diff --git a/var/spack/repos/builtin/packages/py-click-repl/package.py b/var/spack/repos/builtin/packages/py-click-repl/package.py index 98189c5bd5956a..e0ad86e16c9857 100644 --- a/var/spack/repos/builtin/packages/py-click-repl/package.py +++ b/var/spack/repos/builtin/packages/py-click-repl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyClickRepl(PythonPackage): homepage = "https://github.com/click-contrib/click-repl" pypi = "click-repl/click-repl-0.1.6.tar.gz" + license("MIT") + version("0.2.0", sha256="cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8") version("0.1.6", sha256="b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5") diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py index 16585406035fb4..ef62244ab3c1d2 100644 --- a/var/spack/repos/builtin/packages/py-click/package.py +++ b/var/spack/repos/builtin/packages/py-click/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyClick(PythonPackage): pypi = "click/click-7.1.2.tar.gz" git = "https://github.com/pallets/click.git" + license("BSD-3-Clause") + version("8.1.7", sha256="ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de") version("8.1.3", sha256="7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e") version("8.0.3", sha256="410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b") diff --git a/var/spack/repos/builtin/packages/py-cligj/package.py b/var/spack/repos/builtin/packages/py-cligj/package.py index 663d8945912a52..639780b3277603 100644 --- a/var/spack/repos/builtin/packages/py-cligj/package.py +++ b/var/spack/repos/builtin/packages/py-cligj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCligj(PythonPackage): homepage = "https://github.com/mapbox/cligj" pypi = "cligj/cligj-0.7.2.tar.gz" + license("BSD-3-Clause") + version("0.7.2", sha256="a4bc13d623356b373c2c27c53dbd9c68cae5d526270bfa71f6c6fa69669c6b27") version("0.5.0", sha256="6c7d52d529a78712491974f975c33473f430c0f7beb18c0d7a402a743dcb460a") version("0.4.0", sha256="12ad07994f5c1173b06087ffbaacec52f9ebe4687926e5aacfc22b6b0c8b3f54") diff --git a/var/spack/repos/builtin/packages/py-clikit/package.py b/var/spack/repos/builtin/packages/py-clikit/package.py index f364b9d8df70ff..259a60147154a5 100644 --- a/var/spack/repos/builtin/packages/py-clikit/package.py +++ b/var/spack/repos/builtin/packages/py-clikit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyClikit(PythonPackage): homepage = "https://github.com/sdispater/clikit" pypi = "clikit/clikit-0.6.2.tar.gz" + license("MIT") + version("0.6.2", sha256="442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59") depends_on("python@2.7,3.4:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-climate/package.py b/var/spack/repos/builtin/packages/py-climate/package.py index b50972091bc8f5..37e1f940696e41 100644 --- a/var/spack/repos/builtin/packages/py-climate/package.py +++ b/var/spack/repos/builtin/packages/py-climate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyClimate(PythonPackage): homepage = "https://pypi.org/project/climate/" url = "https://pypi.io/packages/py3/c/climate/climate-0.1.0-py3-none-any.whl" + license("Apache-2.0") + version( "0.1.0", sha256="01026c764b34d8204b8f527a730ef667fa5827fca765993ff1ed3e9dab2c11ae", diff --git a/var/spack/repos/builtin/packages/py-clint/package.py b/var/spack/repos/builtin/packages/py-clint/package.py index ea6e58892e3455..d863f1dfecfeda 100644 --- a/var/spack/repos/builtin/packages/py-clint/package.py +++ b/var/spack/repos/builtin/packages/py-clint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyClint(PythonPackage): homepage = "https://github.com/kennethreitz-archive/clint" pypi = "clint/clint-0.5.1.tar.gz" + license("ISC") + version("0.5.1", sha256="05224c32b1075563d0b16d0015faaf9da43aa214e4a2140e51f08789e7a4c5aa") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-clipboard/package.py b/var/spack/repos/builtin/packages/py-clipboard/package.py index b2870d235b5df6..44cf914aca626f 100644 --- a/var/spack/repos/builtin/packages/py-clipboard/package.py +++ b/var/spack/repos/builtin/packages/py-clipboard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyClipboard(PythonPackage): homepage = "https://github.com/terryyin/clipboard" pypi = "clipboard/clipboard-0.0.4.tar.gz" + license("MIT") + version("0.0.4", sha256="a72a78e9c9bf68da1c3f29ee022417d13ec9e3824b511559fd2b702b1dd5b817") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cloudauthz/package.py b/var/spack/repos/builtin/packages/py-cloudauthz/package.py index 6f669b5b05ad03..2ef53e00c83f1e 100644 --- a/var/spack/repos/builtin/packages/py-cloudauthz/package.py +++ b/var/spack/repos/builtin/packages/py-cloudauthz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCloudauthz(PythonPackage): homepage = "https://github.com/galaxyproject/cloudauthz" pypi = "cloudauthz/cloudauthz-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="7e62f3ae04b1842540ca484717d40bd9ec17c6764dd842c1f73f6290b9b54ac1") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cloudbridge/package.py b/var/spack/repos/builtin/packages/py-cloudbridge/package.py index 55fd4e49a8590b..678c80cd84508e 100644 --- a/var/spack/repos/builtin/packages/py-cloudbridge/package.py +++ b/var/spack/repos/builtin/packages/py-cloudbridge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCloudbridge(PythonPackage): homepage = "http://cloudbridge.cloudve.org" pypi = "cloudbridge/cloudbridge-3.1.0.tar.gz" + license("MIT") + version("3.1.0", sha256="f9d3c1ae36b14a1c953d36c21a35fa2c72d42831cbbfe6117d13b25e9cccb28c") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cloudpickle/package.py b/var/spack/repos/builtin/packages/py-cloudpickle/package.py index 8648cecc3273c0..044f472b7d0887 100644 --- a/var/spack/repos/builtin/packages/py-cloudpickle/package.py +++ b/var/spack/repos/builtin/packages/py-cloudpickle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCloudpickle(PythonPackage): homepage = "https://github.com/cloudpipe/cloudpickle" pypi = "cloudpickle/cloudpickle-0.5.2.tar.gz" + license("BSD-3-Clause") + version("2.2.0", sha256="3f4219469c55453cfe4737e564b67c2a149109dabf7f242478948b895f61106f") version("1.6.0", sha256="9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32") version("1.2.1", sha256="603244e0f552b72a267d47a7d9b347b27a3430f58a0536037a290e7e0e212ecf") diff --git a/var/spack/repos/builtin/packages/py-clustershell/package.py b/var/spack/repos/builtin/packages/py-clustershell/package.py index 8b0364b1f2466d..c9649a76e5cfac 100644 --- a/var/spack/repos/builtin/packages/py-clustershell/package.py +++ b/var/spack/repos/builtin/packages/py-clustershell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyClustershell(PythonPackage): homepage = "https://cea-hpc.github.io/clustershell/" url = "https://github.com/cea-hpc/clustershell/archive/v1.8.4.tar.gz" + license("LGPL-2.1-or-later") + version("1.8.4", sha256="763793f729bd1c275361717c540e01ad5fe536119eca92f14077c0995739b9d7") version("1.8.3", sha256="86b0d524e5e50c0a15faec01d8642f0ff12ba78d50b7e7b660261be5d53fed9c") version("1.8.2", sha256="abf5ed23b6adfc802ee65aa0208c697f617e5fb8fd0d8cb0100ee337e2721796") diff --git a/var/spack/repos/builtin/packages/py-cma/package.py b/var/spack/repos/builtin/packages/py-cma/package.py new file mode 100644 index 00000000000000..e07189162404d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cma/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyCma(PythonPackage): + """ + Python implementation of CMA-ES Covariance Matrix Adaptation Evolution Str + ategy for non-linear numerical optimization in Python + """ + + homepage = "https://github.com/CMA-ES/pycma" + pypi = "cma/cma-3.3.0.tar.gz" + + maintainers("LydDeb") + + version("3.3.0", sha256="b748b8e03f4e7ae816157d7b9bb2fc6b1fb2fee1d5fd3399329b646bb75861ec") + + variant("plotting", default=False, description="Build with matplotlib support.") + variant( + "constrained_solution_tracking", + default=False, + description="Build with moarchiving support.", + ) + + depends_on("py-setuptools", type="build") + depends_on("py-numpy", type=("build", "run")) + depends_on("py-matplotlib", type=("build", "run"), when="+plotting") + depends_on("py-moarchiving", type=("build", "run"), when="+constrained_solution_tracking") diff --git a/var/spack/repos/builtin/packages/py-cmaes/package.py b/var/spack/repos/builtin/packages/py-cmaes/package.py index 26730ea43d0c66..cf607ce2960b4c 100644 --- a/var/spack/repos/builtin/packages/py-cmaes/package.py +++ b/var/spack/repos/builtin/packages/py-cmaes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCmaes(PythonPackage): maintainers("eugeneswalker") + license("MIT") + version("0.10.0", sha256="48afc70df027114739872b50489ae6b32461c307b92d084a63c7090a9742faf9") depends_on("py-setuptools@61:", type="build") diff --git a/var/spack/repos/builtin/packages/py-cmake-format/package.py b/var/spack/repos/builtin/packages/py-cmake-format/package.py index 0f199890579b19..a99e2e996cb819 100644 --- a/var/spack/repos/builtin/packages/py-cmake-format/package.py +++ b/var/spack/repos/builtin/packages/py-cmake-format/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cmake/package.py b/var/spack/repos/builtin/packages/py-cmake/package.py index f6c3b9f782260e..15311893f2631b 100644 --- a/var/spack/repos/builtin/packages/py-cmake/package.py +++ b/var/spack/repos/builtin/packages/py-cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCmake(PythonPackage): git = "https://github.com/scikit-build/cmake-python-distributions.git" pypi = "cmake/cmake-3.22.2.tar.gz" + license("Apache-2.0") + version("3.22.2", sha256="b5bd5eeb488b13cf64ec963800f3d979eaeb90b4382861b86909df503379e219") version("3.21.4", sha256="30fa5ed8a5ad66dcd263adb87f3ce3dc2d0ec0ac3958f5becff577e4b62cd065") version("3.18.0", sha256="52b98c5ee70b5fa30a8623e96482227e065292f78794eb085fdf0fecb204b79b") diff --git a/var/spack/repos/builtin/packages/py-cmocean/package.py b/var/spack/repos/builtin/packages/py-cmocean/package.py index 89e9dc22dded35..c8b235ebbfbd9d 100644 --- a/var/spack/repos/builtin/packages/py-cmocean/package.py +++ b/var/spack/repos/builtin/packages/py-cmocean/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCmocean(PythonPackage): homepage = "https://matplotlib.org/cmocean/" pypi = "cmocean/cmocean-2.0.tar.gz" + license("MIT") + version("3.0.3", sha256="abaf99383c1a60f52970c86052ae6c14eafa84fc16984488040283c02db77c0b") version("2.0", sha256="13eea3c8994d8e303e32a2db0b3e686f6edfb41cb21e7b0e663c2b17eea9b03a") diff --git a/var/spack/repos/builtin/packages/py-cmseq/package.py b/var/spack/repos/builtin/packages/py-cmseq/package.py index 406de6f0758b7e..0c6502cb948b8e 100644 --- a/var/spack/repos/builtin/packages/py-cmseq/package.py +++ b/var/spack/repos/builtin/packages/py-cmseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCmseq(PythonPackage): homepage = "https://github.com/SegataLab/cmseq" pypi = "CMSeq/CMSeq-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="93038a6dba826e29a66df3ec8ab2b3e3872acac7af9df245e4a5a624584aca5c") depends_on("py-numpy", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cmsml/package.py b/var/spack/repos/builtin/packages/py-cmsml/package.py index a0e3dd22b6dab1..2eedf8b756ce61 100644 --- a/var/spack/repos/builtin/packages/py-cmsml/package.py +++ b/var/spack/repos/builtin/packages/py-cmsml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCmsml(PythonPackage): homepage = "https://github.com/cms-ml/cmsml" pypi = "cmsml/cmsml-0.1.2.tar.gz" + license("BSD-3-Clause") + version("0.1.2", sha256="2e2e114323441757a64e1c24179fc6295e7bd14920b7a9c3c37128eb40ad9ceb") depends_on("python@2.7:2.7,3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cmyt/package.py b/var/spack/repos/builtin/packages/py-cmyt/package.py index d88b7c1b0b2f2a..fd7e5dcc9d4c6e 100644 --- a/var/spack/repos/builtin/packages/py-cmyt/package.py +++ b/var/spack/repos/builtin/packages/py-cmyt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyCmyt(PythonPackage): maintainers("charmoniumq") + license("BSD-3-Clause") + version("main", branch="main") version("1.1.2", sha256="7027514a89331ee5cd672999e34c15feae218c8ed9b127832b6618c6771a869e") diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py deleted file mode 100644 index 2d5a23a34d8624..00000000000000 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCnvkit(PythonPackage): - """Copy number variation toolkit for high-throughput sequencing.""" - - homepage = "https://github.com/etal/cnvkit" - pypi = "CNVkit/CNVkit-0.9.6.tar.gz" - - version("0.9.6", sha256="be889c98a5cf0a994330b8c31c0a65151fb0095fe4e75a1e04118da2516248c2") - - depends_on("py-setuptools", type="build") - depends_on("py-biopython@1.62:", type=("build", "run")) - depends_on("py-future@0.15.2:", type=("build", "run")) - depends_on("py-pomegranate@0.9.0:", type=("build", "run")) - depends_on("py-matplotlib@1.3.1:", type=("build", "run")) - depends_on("py-numpy@1.9:", type=("build", "run")) - depends_on("py-pandas@0.20.1:0.24", type=("build", "run")) - depends_on("py-pyfaidx@0.4.7:", type=("build", "run")) - depends_on("py-pysam@0.10.0:", type=("build", "run")) - depends_on("py-reportlab@3.0:", type=("build", "run")) - depends_on("py-scipy@0.15.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-coapthon3/package.py b/var/spack/repos/builtin/packages/py-coapthon3/package.py index b5a740cc2ef2b8..b41dc1dadb06f0 100644 --- a/var/spack/repos/builtin/packages/py-coapthon3/package.py +++ b/var/spack/repos/builtin/packages/py-coapthon3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCoapthon3(PythonPackage): homepage = "https://github.com/Tanganelli/CoAPthon3/" url = "https://github.com/Tanganelli/CoAPthon3/archive/1.0.1.tar.gz" + license("MIT") + version("1.0.1", sha256="331150a581708d47b208cee3b067ced80a00f0cc1278e913ec546e6c6b28bffd") version("1.0", sha256="63eb083269c2a286aedd206d3df17ab67fa978dc43caf34eaab9498da15c497a") diff --git a/var/spack/repos/builtin/packages/py-coclust/package.py b/var/spack/repos/builtin/packages/py-coclust/package.py index db5ae24c97c8ed..781146ba9cc6b0 100644 --- a/var/spack/repos/builtin/packages/py-coclust/package.py +++ b/var/spack/repos/builtin/packages/py-coclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-codepy/package.py b/var/spack/repos/builtin/packages/py-codepy/package.py index 737e0506cb6fd3..342c3ce52a05db 100644 --- a/var/spack/repos/builtin/packages/py-codepy/package.py +++ b/var/spack/repos/builtin/packages/py-codepy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyCodepy(PythonPackage): homepage = "https://documen.tician.de/codepy/" pypi = "codepy/codepy-2019.1.tar.gz" + license("MIT") + version("2019.1", sha256="384f22c37fe987c0ca71951690c3c2fd14dacdeddbeb0fde4fd01cd84859c94e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-coilmq/package.py b/var/spack/repos/builtin/packages/py-coilmq/package.py index ed1468358cc5c6..36039477c924dd 100644 --- a/var/spack/repos/builtin/packages/py-coilmq/package.py +++ b/var/spack/repos/builtin/packages/py-coilmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-colorama/package.py b/var/spack/repos/builtin/packages/py-colorama/package.py index 7f8b9188ce2637..054a5c997541a8 100644 --- a/var/spack/repos/builtin/packages/py-colorama/package.py +++ b/var/spack/repos/builtin/packages/py-colorama/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyColorama(PythonPackage): homepage = "https://github.com/tartley/colorama" pypi = "colorama/colorama-0.3.7.tar.gz" + license("BSD-3-Clause") + version("0.4.6", sha256="08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44") version("0.4.5", sha256="e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4") version("0.4.4", sha256="5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b") diff --git a/var/spack/repos/builtin/packages/py-colorcet/package.py b/var/spack/repos/builtin/packages/py-colorcet/package.py index 569ecb0cd285c9..00b01e1704062a 100644 --- a/var/spack/repos/builtin/packages/py-colorcet/package.py +++ b/var/spack/repos/builtin/packages/py-colorcet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-colorclass/package.py b/var/spack/repos/builtin/packages/py-colorclass/package.py index 335601eb94ef58..6c4d8ca621bad5 100644 --- a/var/spack/repos/builtin/packages/py-colorclass/package.py +++ b/var/spack/repos/builtin/packages/py-colorclass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyColorclass(PythonPackage): homepage = "https://github.com/Robpol86/colorclass" pypi = "colorclass/colorclass-2.2.0.tar.gz" + license("MIT") + version("2.2.0", sha256="b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b") depends_on("python@3.3.0:") diff --git a/var/spack/repos/builtin/packages/py-colored-traceback/package.py b/var/spack/repos/builtin/packages/py-colored-traceback/package.py index 3dcea9dc4f2879..f2a1470d095808 100644 --- a/var/spack/repos/builtin/packages/py-colored-traceback/package.py +++ b/var/spack/repos/builtin/packages/py-colored-traceback/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyColoredTraceback(PythonPackage): homepage = "https://github.com/staticshock/colored-traceback.py" pypi = "colored-traceback/colored-traceback-0.3.0.tar.gz" + license("ISC") + version("0.3.0", sha256="6da7ce2b1da869f6bb54c927b415b95727c4bb6d9a84c4615ea77d9872911b05") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-colored/package.py b/var/spack/repos/builtin/packages/py-colored/package.py index defc8d5758580a..e94f5d857d2e8b 100644 --- a/var/spack/repos/builtin/packages/py-colored/package.py +++ b/var/spack/repos/builtin/packages/py-colored/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-coloredlogs/package.py b/var/spack/repos/builtin/packages/py-coloredlogs/package.py index 39c625f0a411f0..1bf0f574577419 100644 --- a/var/spack/repos/builtin/packages/py-coloredlogs/package.py +++ b/var/spack/repos/builtin/packages/py-coloredlogs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyColoredlogs(PythonPackage): pypi = "coloredlogs/coloredlogs-10.0.tar.gz" git = "https://github.com/xolox/python-coloredlogs.git" + license("MIT") + version("15.0.1", sha256="7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0") version("14.0", sha256="a1fab193d2053aa6c0a97608c4342d031f1f93a3d1218432c59322441d31a505") version("10.0", sha256="b869a2dda3fa88154b9dd850e27828d8755bfab5a838a1c97fbc850c6e377c36") diff --git a/var/spack/repos/builtin/packages/py-colorful/package.py b/var/spack/repos/builtin/packages/py-colorful/package.py index f7cd04f162ddbe..1c6290723222b3 100644 --- a/var/spack/repos/builtin/packages/py-colorful/package.py +++ b/var/spack/repos/builtin/packages/py-colorful/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyColorful(PythonPackage): homepage = "https://github.com/timofurrer/colorful" pypi = "colorful/colorful-0.5.4.tar.gz" + license("MIT") + version("0.5.4", sha256="86848ad4e2eda60cd2519d8698945d22f6f6551e23e95f3f14dfbb60997807ea") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-colorio/package.py b/var/spack/repos/builtin/packages/py-colorio/package.py index 2e9bffc999a1d1..c61108ccd5571b 100644 --- a/var/spack/repos/builtin/packages/py-colorio/package.py +++ b/var/spack/repos/builtin/packages/py-colorio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyColorio(PythonPackage): homepage = "https://github.com/nschloe/colorio" pypi = "colorio/colorio-0.11.2.tar.gz" + license("GPL-3.0-or-later") + version("0.11.2", sha256="aa45d8e0a2e506c4019d4fb488d34a107d7f803c8e8ff355e2e57c01f6f1cd81") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-colorlog/package.py b/var/spack/repos/builtin/packages/py-colorlog/package.py index 5148bd4a9f07e4..8c8810dd265d23 100644 --- a/var/spack/repos/builtin/packages/py-colorlog/package.py +++ b/var/spack/repos/builtin/packages/py-colorlog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-colorlover/package.py b/var/spack/repos/builtin/packages/py-colorlover/package.py index 4764e8a5528661..86ca54685ea172 100644 --- a/var/spack/repos/builtin/packages/py-colorlover/package.py +++ b/var/spack/repos/builtin/packages/py-colorlover/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyColorlover(PythonPackage): homepage = "https://github.com/plotly/colorlover" pypi = "colorlover/colorlover-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="b8fb7246ab46e1f5e6715649453c1762e245a515de5ff2d2b4aab7a6e67fa4e2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-colormath/package.py b/var/spack/repos/builtin/packages/py-colormath/package.py index f56a97166aea84..8b727d15e7f699 100644 --- a/var/spack/repos/builtin/packages/py-colormath/package.py +++ b/var/spack/repos/builtin/packages/py-colormath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyColormath(PythonPackage): pypi = "colormath/colormath-2.1.1.tar.gz" + license("BSD-3-Clause") + version("3.0.0", sha256="3d4605af344527da0e4f9f504fad7ddbebda35322c566a6c72e28edb1ff31217") version("2.1.1", sha256="003a2b2d9c1f43aa7d90addf1863fb2d822463c839b1166ae3092950792f9707") diff --git a/var/spack/repos/builtin/packages/py-colorpy/package.py b/var/spack/repos/builtin/packages/py-colorpy/package.py index 8c63b50e6cce0f..aacfbc3b90dcbb 100644 --- a/var/spack/repos/builtin/packages/py-colorpy/package.py +++ b/var/spack/repos/builtin/packages/py-colorpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyColorpy(PythonPackage): homepage = "http://markkness.net/colorpy/ColorPy.html" pypi = "colorpy/colorpy-0.1.1.tar.gz" + license("LGPL-3.0-or-later") + version("0.1.1", sha256="e400a7e879adc83c6098dde13cdd093723f3936778c245b1caf88f5f1411170d") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-colorspacious/package.py b/var/spack/repos/builtin/packages/py-colorspacious/package.py index 74a08a4909ca7c..ed83ff6b6fc48c 100644 --- a/var/spack/repos/builtin/packages/py-colorspacious/package.py +++ b/var/spack/repos/builtin/packages/py-colorspacious/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyColorspacious(PythonPackage): homepage = "https://github.com/njsmith/colorspacious" pypi = "colorspacious/colorspacious-1.1.2.tar.gz" + license("MIT") + version("1.1.2", sha256="5e9072e8cdca889dac445c35c9362a22ccf758e97b00b79ff0d5a7ba3e11b618") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-colossalai/package.py b/var/spack/repos/builtin/packages/py-colossalai/package.py index 5225327b3354ea..94113f6bad97b4 100644 --- a/var/spack/repos/builtin/packages/py-colossalai/package.py +++ b/var/spack/repos/builtin/packages/py-colossalai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-comm/package.py b/var/spack/repos/builtin/packages/py-comm/package.py index 5e82ade2c04fd2..b1a4aafaf8c234 100644 --- a/var/spack/repos/builtin/packages/py-comm/package.py +++ b/var/spack/repos/builtin/packages/py-comm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyComm(PythonPackage): homepage = "https://github.com/ipython/comm" pypi = "comm/comm-0.1.3.tar.gz" + license("BSD-3-Clause") + version("0.1.4", sha256="354e40a59c9dd6db50c5cc6b4acc887d82e9603787f83b68c01a80a923984d15") version("0.1.3", sha256="a61efa9daffcfbe66fd643ba966f846a624e4e6d6767eda9cf6e993aadaab93e") diff --git a/var/spack/repos/builtin/packages/py-common/package.py b/var/spack/repos/builtin/packages/py-common/package.py index 21fe32094b764c..01c0b10a399cac 100644 --- a/var/spack/repos/builtin/packages/py-common/package.py +++ b/var/spack/repos/builtin/packages/py-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCommon(PythonPackage): homepage = "https://pypi.python.org/pypi/common" pypi = "common/common-0.1.2.tar.gz" + license("Unlicense") + version("0.1.2", sha256="3dfa982670abefc870043b239eaa0ecd860be7aa952b1931c1356b426ff8c76a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-commonmark/package.py b/var/spack/repos/builtin/packages/py-commonmark/package.py index 7ebe54412a76c9..c5bfb6b7ce29b9 100644 --- a/var/spack/repos/builtin/packages/py-commonmark/package.py +++ b/var/spack/repos/builtin/packages/py-commonmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCommonmark(PythonPackage): homepage = "https://github.com/readthedocs/commonmark.py" pypi = "commonmark/commonmark-0.9.0.tar.gz" + license("BSD-3-Clause") + version("0.9.1", sha256="452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60") version("0.9.0", sha256="867fc5db078ede373ab811e16b6789e9d033b15ccd7296f370ca52d1ee792ce0") diff --git a/var/spack/repos/builtin/packages/py-conan/package.py b/var/spack/repos/builtin/packages/py-conan/package.py index d0016589fd94d3..4846ed0750b3d3 100644 --- a/var/spack/repos/builtin/packages/py-conan/package.py +++ b/var/spack/repos/builtin/packages/py-conan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyConan(PythonPackage): homepage = "https://conan.io/" pypi = "conan/conan-1.52.0.tar.gz" + license("MIT") + version("1.52.0", sha256="184761f16d00fde17615e60125d2f14fca692ffba7666cc7d6d834fc3858cf82") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-conda-souschef/package.py b/var/spack/repos/builtin/packages/py-conda-souschef/package.py index 5c4ddc7d937e41..2a83a9a74ea635 100644 --- a/var/spack/repos/builtin/packages/py-conda-souschef/package.py +++ b/var/spack/repos/builtin/packages/py-conda-souschef/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCondaSouschef(PythonPackage): homepage = "https://github.com/marcelotrevisani/souschef" pypi = "conda-souschef/conda-souschef-2.2.3.tar.gz" + license("Apache-2.0") + version("2.2.3", sha256="9bf3dba0676bc97616636b80ad4a75cd90582252d11c86ed9d3456afb939c0c3") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-confection/package.py b/var/spack/repos/builtin/packages/py-confection/package.py index c4e3813b8e143a..645055b65e1e89 100644 --- a/var/spack/repos/builtin/packages/py-confection/package.py +++ b/var/spack/repos/builtin/packages/py-confection/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyConfection(PythonPackage): homepage = "https://github.com/explosion/confection" pypi = "confection/confection-0.0.4.tar.gz" + license("MIT") + version("0.0.4", sha256="b1ddf5885da635f0e260a40b339730806dfb1bd17d30e08764f35af841b04ecf") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-configargparse/package.py b/var/spack/repos/builtin/packages/py-configargparse/package.py index 45e34036ceb445..59925f8305af5f 100644 --- a/var/spack/repos/builtin/packages/py-configargparse/package.py +++ b/var/spack/repos/builtin/packages/py-configargparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyConfigargparse(PythonPackage): homepage = "https://github.com/bw2/ConfigArgParse" url = "https://github.com/bw2/ConfigArgParse/archive/1.2.3.tar.gz" + license("MIT") + version("1.2.3", sha256="0f1144a204e3b896d6ac900e151c1d13bde3103d6b7d541e3bb57514a94083bf") depends_on("python@2.2:2,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-configobj/package.py b/var/spack/repos/builtin/packages/py-configobj/package.py index 011b9f0615de6c..94a27596559f13 100644 --- a/var/spack/repos/builtin/packages/py-configobj/package.py +++ b/var/spack/repos/builtin/packages/py-configobj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index 943b86a13d6062..a2f4062fec2902 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyConfigparser(PythonPackage): homepage = "https://docs.python.org/3/library/configparser.html" pypi = "configparser/configparser-3.5.0.tar.gz" + license("MIT") + version("5.2.0", sha256="1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa") version("3.5.1", sha256="f41e19cb29bebfccb1a78627b3f328ec198cc8f39510c7c55e7dfc0ab58c8c62") version("3.5.0", sha256="5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a") diff --git a/var/spack/repos/builtin/packages/py-configspace/package.py b/var/spack/repos/builtin/packages/py-configspace/package.py index 2da383f12801e0..e02780b25c7b18 100644 --- a/var/spack/repos/builtin/packages/py-configspace/package.py +++ b/var/spack/repos/builtin/packages/py-configspace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyConfigspace(PythonPackage): homepage = "https://automl.github.io/ConfigSpace/master/" pypi = "ConfigSpace/ConfigSpace-0.4.20.tar.gz" + license("BSD-3-Clause") + version("0.4.20", sha256="2e4ca06f5a6a61e5322a73dd7545468c79f2a3e8385cab92fdada317af41d9e9") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-connectionpool/package.py b/var/spack/repos/builtin/packages/py-connectionpool/package.py index 6704cca3a56913..dd6f81665d4b80 100644 --- a/var/spack/repos/builtin/packages/py-connectionpool/package.py +++ b/var/spack/repos/builtin/packages/py-connectionpool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyConnectionpool(PythonPackage): pypi = "connection_pool/connection_pool-0.0.3.tar.gz" maintainers("marcusboden") + license("MIT") + version("0.0.3", sha256="bf429e7aef65921c69b4ed48f3d48d3eac1383b05d2df91884705842d974d0dc") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-consolekit/package.py b/var/spack/repos/builtin/packages/py-consolekit/package.py index 6acef963218c21..7073b3662cc585 100644 --- a/var/spack/repos/builtin/packages/py-consolekit/package.py +++ b/var/spack/repos/builtin/packages/py-consolekit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyConsolekit(PythonPackage): homepage = "https://github.com/domdfcoding/consolekit" pypi = "consolekit/consolekit-1.5.1.tar.gz" + license("MIT") + version("1.5.1", sha256="55ea43e226863e1d618ec9b860c9842d84249d895c3376c03b158d8f3a335626") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-constantly/package.py b/var/spack/repos/builtin/packages/py-constantly/package.py index 49d1f7ebfd2ad2..b569b524348d90 100644 --- a/var/spack/repos/builtin/packages/py-constantly/package.py +++ b/var/spack/repos/builtin/packages/py-constantly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyConstantly(PythonPackage): homepage = "https://github.com/twisted/constantly" pypi = "constantly/constantly-15.1.0.tar.gz" + license("MIT") + version("15.1.0", sha256="586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-contextily/package.py b/var/spack/repos/builtin/packages/py-contextily/package.py index e92aafbd298a72..261ad914cdfe2e 100644 --- a/var/spack/repos/builtin/packages/py-contextily/package.py +++ b/var/spack/repos/builtin/packages/py-contextily/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyContextily(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("1.0.1", sha256="f7dc25dbc8e01163be6cdeedb49a56da9cd0d586c838861f442ef2ee45eba9d4") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-contextlib2/package.py b/var/spack/repos/builtin/packages/py-contextlib2/package.py index 1751943ade3c49..84fd1d03a63bfa 100644 --- a/var/spack/repos/builtin/packages/py-contextlib2/package.py +++ b/var/spack/repos/builtin/packages/py-contextlib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyContextlib2(PythonPackage): homepage = "https://contextlib2.readthedocs.io/en/stable/" pypi = "contextlib2/contextlib2-21.6.0.tar.gz" + license("PSF-2.0") + version("21.6.0", sha256="ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869") version("0.6.0", sha256="7197aa736777caac513dbd800944c209a49765bf1979b12b037dce0277077ed3") version("0.5.5", sha256="509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48") diff --git a/var/spack/repos/builtin/packages/py-contexttimer/package.py b/var/spack/repos/builtin/packages/py-contexttimer/package.py index 22aa01607b1f7e..0ef39b2004f117 100644 --- a/var/spack/repos/builtin/packages/py-contexttimer/package.py +++ b/var/spack/repos/builtin/packages/py-contexttimer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-continuum/package.py b/var/spack/repos/builtin/packages/py-continuum/package.py index a06139bcb19e5c..a039b51b98d188 100644 --- a/var/spack/repos/builtin/packages/py-continuum/package.py +++ b/var/spack/repos/builtin/packages/py-continuum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyContinuum(PythonPackage): maintainers("thomas-bouvier") + license("MIT") + version("1.2.7", sha256="baadcdbe2f5b3c05254307c73434a012f2a3d663e1be9469a03d4b82559e98e1") # This patch moves the `prospector` dependency of package continuum to the diff --git a/var/spack/repos/builtin/packages/py-contourpy/package.py b/var/spack/repos/builtin/packages/py-contourpy/package.py index 0ef7048c44c3e0..d4ee4a692722e3 100644 --- a/var/spack/repos/builtin/packages/py-contourpy/package.py +++ b/var/spack/repos/builtin/packages/py-contourpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyContourpy(PythonPackage): homepage = "https://github.com/contourpy/contourpy" pypi = "contourpy/contourpy-1.0.5.tar.gz" + license("BSD-3-Clause") + version("1.0.7", sha256="d8165a088d31798b59e91117d1f5fc3df8168d8b48c4acc10fc0df0d0bdbcc5e") version("1.0.5", sha256="896631cd40222aef3697e4e51177d14c3709fda49d30983269d584f034acc8a4") diff --git a/var/spack/repos/builtin/packages/py-control/package.py b/var/spack/repos/builtin/packages/py-control/package.py index 63d3e80b12245e..4ac987a18a28ee 100644 --- a/var/spack/repos/builtin/packages/py-control/package.py +++ b/var/spack/repos/builtin/packages/py-control/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyControl(PythonPackage): maintainers("haralmha") + license("BSD-3-Clause") + version("0.9.1", sha256="8c9084bf386eafcf5d74008f780fae6dec68d243d18a380c866ac10a3549f8d3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-convertdate/package.py b/var/spack/repos/builtin/packages/py-convertdate/package.py index 875deadbfe45b3..45bc14c28632d2 100644 --- a/var/spack/repos/builtin/packages/py-convertdate/package.py +++ b/var/spack/repos/builtin/packages/py-convertdate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyConvertdate(PythonPackage): homepage = "https://github.com/fitnr/convertdate/" pypi = "convertdate/convertdate-2.2.0.tar.gz" + license("MIT") + version("2.2.0", sha256="9d2b0cd8d5382d2458d4cfa59665abba398a9e9bfd3a01c6f61b7b47768d28bf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-convokit/package.py b/var/spack/repos/builtin/packages/py-convokit/package.py index b22632e16512ab..3df33804503356 100644 --- a/var/spack/repos/builtin/packages/py-convokit/package.py +++ b/var/spack/repos/builtin/packages/py-convokit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cookiecutter/package.py b/var/spack/repos/builtin/packages/py-cookiecutter/package.py index ee1164af2fff08..75e0d3e29d65b5 100644 --- a/var/spack/repos/builtin/packages/py-cookiecutter/package.py +++ b/var/spack/repos/builtin/packages/py-cookiecutter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCookiecutter(PythonPackage): homepage = "https://cookiecutter.readthedocs.io/en/latest/" url = "https://github.com/audreyr/cookiecutter/archive/1.6.0.tar.gz" + license("BSD-3-Clause") + version("1.6.0", sha256="0c9018699b556b83d7c37b27fe0cc17485b90b6e1f47365b3cdddf77f6ca9d36") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-copulas/package.py b/var/spack/repos/builtin/packages/py-copulas/package.py index d59b03b493c060..a88a18eedc61f4 100644 --- a/var/spack/repos/builtin/packages/py-copulas/package.py +++ b/var/spack/repos/builtin/packages/py-copulas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyCopulas(PythonPackage): homepage = "https://github.com/sdv-dev/Copulas" pypi = "copulas/copulas-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="9de6cc738769db19794fc18e2f506a4b5ee17e6902519c0842a4698c0efb6749") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-corner/package.py b/var/spack/repos/builtin/packages/py-corner/package.py index 81ae512123dd39..ab7929073070c1 100644 --- a/var/spack/repos/builtin/packages/py-corner/package.py +++ b/var/spack/repos/builtin/packages/py-corner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCorner(PythonPackage): maintainers("LydDeb") + license("BSD-2-Clause") + version("2.2.2", sha256="4bc79f3b6778c270103f0926e64ef2606c48c3b6f92daf5382fc4babf5d608d1") depends_on("python@3.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-correctionlib/package.py b/var/spack/repos/builtin/packages/py-correctionlib/package.py index 4c07abb8c5e315..677e75fa8843d8 100644 --- a/var/spack/repos/builtin/packages/py-correctionlib/package.py +++ b/var/spack/repos/builtin/packages/py-correctionlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCorrectionlib(PythonPackage): homepage = "https://github.com/cms-nanoAOD/correctionlib" pypi = "correctionlib/correctionlib-2.0.0.tar.gz" + license("BSD-3-Clause") + version("2.1.0", sha256="edf79644dc1d9d94f12b4b45366331e5da3f1e21d4cbcd3bb8b0d4b1421b0c44") version("2.0.0", sha256="e4d240cbdb2633a8955ddcd02d5b9bfb33d7e1a33554d6f7957f2dec56988a67") diff --git a/var/spack/repos/builtin/packages/py-counter/package.py b/var/spack/repos/builtin/packages/py-counter/package.py index b22d4fbcd33444..c12165b67fa24d 100644 --- a/var/spack/repos/builtin/packages/py-counter/package.py +++ b/var/spack/repos/builtin/packages/py-counter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCounter(PythonPackage): homepage = "https://github.com/KelSolaar/Counter" pypi = "Counter/Counter-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="9e008590e360936a66c98e1a01e7a9a0ecf6af19cc588107121f5fb4613bb60c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cov-core/package.py b/var/spack/repos/builtin/packages/py-cov-core/package.py index 1eb4bd39cd6f73..89a33671f2b4f0 100644 --- a/var/spack/repos/builtin/packages/py-cov-core/package.py +++ b/var/spack/repos/builtin/packages/py-cov-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCovCore(PythonPackage): homepage = "https://github.com/schlamar/cov-core" pypi = "cov-core/cov-core-1.15.0.tar.gz" + license("MIT") + version("1.15.0", sha256="4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-coverage/package.py b/var/spack/repos/builtin/packages/py-coverage/package.py index 3444aff9c4f53b..19d7d28d83a348 100644 --- a/var/spack/repos/builtin/packages/py-coverage/package.py +++ b/var/spack/repos/builtin/packages/py-coverage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCoverage(PythonPackage): homepage = "https://github.com/nedbat/coveragepy" pypi = "coverage/coverage-4.5.4.tar.gz" + license("Apache-2.0") + version("7.2.6", sha256="2025f913f2edb0272ef15d00b1f335ff8908c921c8eb2013536fcaf61f5a683d") version("6.4.4", sha256="e16c45b726acb780e1e6f88b286d3c10b3914ab03438f32117c4aa52d7f30d58") version("6.3.1", sha256="6c3f6158b02ac403868eea390930ae64e9a9a2a5bbfafefbb920d29258d9f2f8") diff --git a/var/spack/repos/builtin/packages/py-coveralls/package.py b/var/spack/repos/builtin/packages/py-coveralls/package.py index 9828c93aa77f3b..9fdcf135e8cd98 100644 --- a/var/spack/repos/builtin/packages/py-coveralls/package.py +++ b/var/spack/repos/builtin/packages/py-coveralls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCoveralls(PythonPackage): maintainers("dorton21") + license("MIT") + version("3.0.1", sha256="cbb942ae5ef3d2b55388cb5b43e93a269544911535f1e750e1c656aef019ce60") variant("pyyaml", default=False, description="Enable useage of pyyaml") diff --git a/var/spack/repos/builtin/packages/py-cppheaderparser/package.py b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py index a6c68cd7f88d37..570905e06506c2 100644 --- a/var/spack/repos/builtin/packages/py-cppheaderparser/package.py +++ b/var/spack/repos/builtin/packages/py-cppheaderparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cppy/package.py b/var/spack/repos/builtin/packages/py-cppy/package.py index b759799e1b65fc..1afe48e33ebd91 100644 --- a/var/spack/repos/builtin/packages/py-cppy/package.py +++ b/var/spack/repos/builtin/packages/py-cppy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,11 @@ class PyCppy(PythonPackage): homepage = "https://github.com/nucleic/cppy" pypi = "cppy/cppy-1.1.0.tar.gz" - maintainers("iarspider") + license("BSD-3-Clause") version("1.2.1", sha256="83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b") version("1.1.0", sha256="4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642") - depends_on("python@3.7:", when="@1.2:", type=("build", "run")) - depends_on("python@3:", type=("build", "run")) - depends_on("py-setuptools@61.2:", when="@1.2:", type="build") + depends_on("py-setuptools@61.2:", when="@1.2:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-setuptools-scm+toml@3.4.3:", when="@1.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-crashtest/package.py b/var/spack/repos/builtin/packages/py-crashtest/package.py index f16c993168ec74..715ba48038ea61 100644 --- a/var/spack/repos/builtin/packages/py-crashtest/package.py +++ b/var/spack/repos/builtin/packages/py-crashtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,13 @@ class PyCrashtest(PythonPackage): homepage = "https://github.com/sdispater/crashtest" pypi = "crashtest/crashtest-0.3.1.tar.gz" + license("MIT") + + 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") diff --git a/var/spack/repos/builtin/packages/py-crcmod/package.py b/var/spack/repos/builtin/packages/py-crcmod/package.py index 1f62ac8a554413..77b755b1929773 100644 --- a/var/spack/repos/builtin/packages/py-crcmod/package.py +++ b/var/spack/repos/builtin/packages/py-crcmod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCrcmod(PythonPackage): homepage = "http://crcmod.sourceforge.net/" pypi = "crcmod/crcmod-1.7.tar.gz" + license("MIT") + version("1.7", sha256="dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e") version("1.6", sha256="56d27d035ea029c6ed96779ca042c0136d39d106e3c30baa6422738c7d86aaa5") diff --git a/var/spack/repos/builtin/packages/py-croniter/package.py b/var/spack/repos/builtin/packages/py-croniter/package.py index 9a63a33f878884..f0763e4ab78bc5 100644 --- a/var/spack/repos/builtin/packages/py-croniter/package.py +++ b/var/spack/repos/builtin/packages/py-croniter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCroniter(PythonPackage): homepage = "http://github.com/kiorky/croniter" pypi = "croniter/croniter-1.3.8.tar.gz" + license("MIT") + version("1.3.8", sha256="32a5ec04e97ec0837bcdf013767abd2e71cceeefd3c2e14c804098ce51ad6cd9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py index f5605b2e12c951..b109d349896d7b 100644 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cryolobm/package.py b/var/spack/repos/builtin/packages/py-cryolobm/package.py index 57b18b2155268a..cf828f7aa3e958 100644 --- a/var/spack/repos/builtin/packages/py-cryolobm/package.py +++ b/var/spack/repos/builtin/packages/py-cryolobm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCryolobm(PythonPackage): homepage = "https://pypi.org/project/cryoloBM/#description" pypi = "cryoloBM/cryoloBM-1.3.7.tar.gz" + license("MIT") + version("1.3.7", sha256="e3505c95cddac3a344d1c6eddf1a9ff576a1384f9194b580287c76367912bedc") depends_on("python@3.4.0:") diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index cf8e782998dfb6..bf74f60b6a733a 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCryptography(PythonPackage): homepage = "https://github.com/pyca/cryptography" pypi = "cryptography/cryptography-1.8.1.tar.gz" + license("Apache-2.0") + version("41.0.3", sha256="6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34") version("40.0.2", sha256="c33c0d32b8594fa647d2e01dbccc303478e16fdd7cf98652d5b3ed11aa5e5c99") version("38.0.1", sha256="1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7") @@ -23,6 +25,7 @@ class PyCryptography(PythonPackage): version("3.4.7", sha256="3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713") version("3.3.2", sha256="5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed") version("3.2.1", sha256="d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3") + version("2.8", sha256="3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651") version("2.7", sha256="e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6") version("2.3.1", sha256="8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") version("1.8.1", sha256="323524312bb467565ebca7e50c8ae5e9674e544951d28a2904a50012a8828190") diff --git a/var/spack/repos/builtin/packages/py-css-parser/package.py b/var/spack/repos/builtin/packages/py-css-parser/package.py index 7ed99c56ca6e20..2e6f055d52668d 100644 --- a/var/spack/repos/builtin/packages/py-css-parser/package.py +++ b/var/spack/repos/builtin/packages/py-css-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCssParser(PythonPackage): maintainers("LydDeb") + license("LGPL-3.0-or-later") + version("1.0.9", sha256="196db822cef22745af6a58d180cf8206949ced58b48f5f3ee98f1de1627495bb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cssselect/package.py b/var/spack/repos/builtin/packages/py-cssselect/package.py index 260f3276e340b0..72e386cddbd84f 100644 --- a/var/spack/repos/builtin/packages/py-cssselect/package.py +++ b/var/spack/repos/builtin/packages/py-cssselect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCssselect(PythonPackage): homepage = "https://github.com/scrapy/cssselect" url = "https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz" + license("BSD-3-Clause") + version("1.1.0", sha256="dde8c1d4a2c82de6889a3af1c1adbce1a6f3ec08b07a854d873f3f3da92960af") version("1.0.3", sha256="203d9691c42c13cffe26a2f8fc714977882fcf54a6df82c8eda3371f6beaecdb") version("1.0.2", sha256="ee16bbb99b0a1f593ed4cd822f20bffefa4a4676d19d7dd1f231b4c1cc1cc1e2") diff --git a/var/spack/repos/builtin/packages/py-cssselect2/package.py b/var/spack/repos/builtin/packages/py-cssselect2/package.py new file mode 100644 index 00000000000000..a3acb25dafb720 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cssselect2/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyCssselect2(PythonPackage): + """ + cssselect2 is a straightforward implementation of CSS4 Selectors for markup + documents (HTML, XML, etc.) that can be read by ElementTree-like parsers + (including cElementTree, lxml, html5lib, etc.) + """ + + homepage = "https://github.com/Kozea/cssselect2" + pypi = "cssselect2/cssselect2-0.7.0.tar.gz" + + version("0.7.0", sha256="1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a") + depends_on("python@3.7:", type=("build", "run")) + depends_on("py-flit-core@3.2:3", type="build") + depends_on("py-tinycss2", type=("build", "run")) + depends_on("py-webencodings", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cssutils/package.py b/var/spack/repos/builtin/packages/py-cssutils/package.py index 3a6772edc5f134..512b88722c3f13 100644 --- a/var/spack/repos/builtin/packages/py-cssutils/package.py +++ b/var/spack/repos/builtin/packages/py-cssutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCssutils(PythonPackage): maintainers("LydDeb") + license("LGPL-3.0-or-later") + version("2.7.1", sha256="340ecfd9835d21df8f98500f0dfcea0aee41cb4e19ecbc2cf94f0a6d36d7cb6c") depends_on("py-setuptools@56:", type="build") diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 90970797e060ee..bfe437ba92f066 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCsvkit(PythonPackage): pypi = "csvkit/csvkit-0.9.1.tar.gz" git = "https://github.com/wireservice/csvkit.git" + license("MIT") + version("1.1.1", sha256="beddb7b78f6b22adbed6ead5ad5de4bfb31dd2c55f3211b2a2b3b65529049223") version("1.0.4", sha256="1353a383531bee191820edfb88418c13dfe1cdfa9dd3dc46f431c05cd2a260a0") version("0.9.1", sha256="92f8b8647becb5cb1dccb3af92a13a4e85702d42ba465ce8447881fb38c9f93a") diff --git a/var/spack/repos/builtin/packages/py-ctgan/package.py b/var/spack/repos/builtin/packages/py-ctgan/package.py index f2381cd6c7368a..f055b0ac011784 100644 --- a/var/spack/repos/builtin/packages/py-ctgan/package.py +++ b/var/spack/repos/builtin/packages/py-ctgan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCtgan(PythonPackage): homepage = "https://github.com/sdv-dev/CTGAN" pypi = "ctgan/ctgan-0.5.0.tar.gz" + license("MIT") + version("0.5.0", sha256="b8a5dbf21dab2d2e2690013f13feb0922f5bad13440b15bc031ce9d58c7fb988") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cudf/package.py b/var/spack/repos/builtin/packages/py-cudf/package.py index 331bd4c5ac35a5..0bf97fbfed0b91 100644 --- a/var/spack/repos/builtin/packages/py-cudf/package.py +++ b/var/spack/repos/builtin/packages/py-cudf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyCudf(PythonPackage): homepage = "https://rapids.ai" url = "https://github.com/rapidsai/cudf/archive/v0.15.0.tar.gz" + license("Apache-2.0") + version("0.15.0", sha256="2570636b72cce4c52f71e36307f51f630e2f9ea94a1abc018d40ce919ba990e4") build_directory = "python/cudf" diff --git a/var/spack/repos/builtin/packages/py-cufflinks/package.py b/var/spack/repos/builtin/packages/py-cufflinks/package.py index 7b22857040b829..45036424e633fe 100644 --- a/var/spack/repos/builtin/packages/py-cufflinks/package.py +++ b/var/spack/repos/builtin/packages/py-cufflinks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCufflinks(PythonPackage): homepage = "https://github.com/santosjorge/cufflinks" pypi = "cufflinks/cufflinks-0.17.3.tar.gz" + license("MIT") + version("0.17.3", sha256="48c1b3406dc030004121966489eebc5518cea70fd4e3f16379b491328501a644") depends_on("py-setuptools@34.4.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cuml/package.py b/var/spack/repos/builtin/packages/py-cuml/package.py index 931e9fb430d93f..4ad9862b893875 100644 --- a/var/spack/repos/builtin/packages/py-cuml/package.py +++ b/var/spack/repos/builtin/packages/py-cuml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCuml(PythonPackage): homepage = "https://github.com/rapidsai/cuml" url = "https://github.com/rapidsai/cuml/archive/v0.15.0.tar.gz" + license("Apache-2.0") + version("0.15.0", sha256="5c9c656ae4eaa94a426e07d7385fd5ea0e5dc7abff806af2941aee10d4ca99c7") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cupy/package.py b/var/spack/repos/builtin/packages/py-cupy/package.py index feffd1dcf66d46..1ba1c3b37b7b06 100644 --- a/var/spack/repos/builtin/packages/py-cupy/package.py +++ b/var/spack/repos/builtin/packages/py-cupy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-current/package.py b/var/spack/repos/builtin/packages/py-current/package.py index 1c26722d5ec321..bc87651911f0d8 100644 --- a/var/spack/repos/builtin/packages/py-current/package.py +++ b/var/spack/repos/builtin/packages/py-current/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCurrent(PythonPackage): homepage = "https://github.com/xflr6/current" pypi = "current/current-0.3.1.zip" + license("Condor-1.1") + version("0.3.1", sha256="207613dc19a6cc8e1a756f26e416733c8f82a70e4ae81103d22f483aae6492a8") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-currentscape/package.py b/var/spack/repos/builtin/packages/py-currentscape/package.py index eb6d75be89c8ab..239edbd993ff41 100644 --- a/var/spack/repos/builtin/packages/py-currentscape/package.py +++ b/var/spack/repos/builtin/packages/py-currentscape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCurrentscape(PythonPackage): git = "https://github.com/BlueBrain/Currentscape.git" pypi = "currentscape/currentscape-1.0.12.tar.gz" + license("Apache-2.0") + version("1.0.12", sha256="d83c5a58074e4d612553472a487e5d1d2854dc4d5c161817c6bafdf4a5988011") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-custodian/package.py b/var/spack/repos/builtin/packages/py-custodian/package.py index 5b6d6dd6c01de9..7c3fbdf4aeef3b 100644 --- a/var/spack/repos/builtin/packages/py-custodian/package.py +++ b/var/spack/repos/builtin/packages/py-custodian/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyCustodian(PythonPackage): maintainers("meyersbs") + license("MIT") + version("2022.5.26", sha256="92bdafa578c75f976176492e7bf3eb83abde97f112725e2e421633fa8954c6ef") # From setup.py: diff --git a/var/spack/repos/builtin/packages/py-custom-inherit/package.py b/var/spack/repos/builtin/packages/py-custom-inherit/package.py index ea17dadeb553a0..603841ae6d113e 100644 --- a/var/spack/repos/builtin/packages/py-custom-inherit/package.py +++ b/var/spack/repos/builtin/packages/py-custom-inherit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyCustomInherit(PythonPackage): maintainers("snehring") + license("MIT") + version("2.4.1", sha256="7052eb337bcce83551815264391cc4efc2bf70b295a3c52aba64f1ab57c3a8a2") version("2.2.2", sha256="83c048bc3415a9e38e44e78dbe231f837aa3d4fd91b4e71443b6f6e38034f583") diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index 230d106906ee93..a5f20ddf1c684f 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCutadapt(PythonPackage): pypi = "cutadapt/cutadapt-1.13.tar.gz" git = "https://github.com/marcelm/cutadapt.git" + license("MIT") + version("4.4", sha256="4554157c673022e1c433fcd6e3b803008fef60c8e71c01215e4aa04b0f09fe83") version("4.3", sha256="319de860f975977e080ea42d9d255322060693ca39b7be51187831311702fe29") version("4.2", sha256="ab0ac450baecc1576cc5ccbc06eab2685be9ee7676763938237d954a644237f1") diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py index 6a244606c7bf53..2fcf1433e6b5f5 100644 --- a/var/spack/repos/builtin/packages/py-cvxopt/package.py +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,9 @@ class PyCvxopt(PythonPackage): homepage = "https://cvxopt.org/" pypi = "cvxopt/cvxopt-1.1.9.tar.gz" + license("GPL-3.0-only") + version("1.2.5", sha256="94ec8c36bd6628a11de9014346692daeeef99b3b7bae28cef30c7490bbcb2d72") - version("1.1.9", sha256="8f157e7397158812cabd340b68546f1baa55a486ed0aad8bc26877593dc2983d") variant( "gsl", @@ -41,7 +42,6 @@ class PyCvxopt(PythonPackage): # Required dependencies depends_on("python@2.7:", type=("build", "link", "run")) - depends_on("python@2.7:3.7", type=("build", "link", "run"), when="@:1.1.9") depends_on("py-setuptools", type="build") depends_on("blas") depends_on("lapack") diff --git a/var/spack/repos/builtin/packages/py-cvxpy/package.py b/var/spack/repos/builtin/packages/py-cvxpy/package.py index e5a4c4e653ab31..828982503dd57a 100644 --- a/var/spack/repos/builtin/packages/py-cvxpy/package.py +++ b/var/spack/repos/builtin/packages/py-cvxpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCvxpy(PythonPackage): homepage = "https://www.cvxpy.org/index.html" pypi = "cvxpy/cvxpy-1.0.25.tar.gz" + license("Apache-2.0") + version("1.1.13", sha256="a9c781e74ad76097b47b86456cb3a943898f7ec9ac8f47bcefc922051cdc4a04") version("1.0.25", sha256="8535529ddb807067b0d59661dce1d9a6ddb2a218398a38ea7772328ad8a6ea13") diff --git a/var/spack/repos/builtin/packages/py-cwl-upgrader/package.py b/var/spack/repos/builtin/packages/py-cwl-upgrader/package.py index ef67f0949ac226..030a241abaadee 100644 --- a/var/spack/repos/builtin/packages/py-cwl-upgrader/package.py +++ b/var/spack/repos/builtin/packages/py-cwl-upgrader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCwlUpgrader(PythonPackage): homepage = "https://github.com/common-workflow-language/cwl-upgrader" pypi = "cwl-upgrader/cwl-upgrader-1.2.4.tar.gz" + license("Apache-2.0") + version("1.2.4", sha256="b25fc236407343d44cc830ac3f63eed395b8d872fc7e17db92cde583d4a3b2ec") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cwl-utils/package.py b/var/spack/repos/builtin/packages/py-cwl-utils/package.py index 99c6b92b30bf90..002c093e96cdac 100644 --- a/var/spack/repos/builtin/packages/py-cwl-utils/package.py +++ b/var/spack/repos/builtin/packages/py-cwl-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyCwlUtils(PythonPackage): homepage = "https://github.com/common-workflow-language/cwl-utils" pypi = "cwl-utils/cwl-utils-0.21.tar.gz" + license("Apache-2.0") + version("0.21", sha256="583f05010f7572f3a69310325472ccb6efc2db7f43dc6428d03552e0ffcbaaf9") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cwltool/package.py b/var/spack/repos/builtin/packages/py-cwltool/package.py index 21eed24542e125..e70c98c32a069f 100644 --- a/var/spack/repos/builtin/packages/py-cwltool/package.py +++ b/var/spack/repos/builtin/packages/py-cwltool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCwltool(PythonPackage): homepage = "https://github.com/common-workflow-language/cwltool" pypi = "cwltool/cwltool-3.1.20221201130942.tar.gz" + license("Apache-2.0") + version( "3.1.20221201130942", sha256="0152d8cdf6acaf3620f557b442941f577bff2851d9e2e866e6051ea48a37bdbe", diff --git a/var/spack/repos/builtin/packages/py-cx-oracle/package.py b/var/spack/repos/builtin/packages/py-cx-oracle/package.py index 4a4cb87f91971e..34c6b76002bccd 100644 --- a/var/spack/repos/builtin/packages/py-cx-oracle/package.py +++ b/var/spack/repos/builtin/packages/py-cx-oracle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cycler/package.py b/var/spack/repos/builtin/packages/py-cycler/package.py index dafd3edf0e0103..cc9f61ec018237 100644 --- a/var/spack/repos/builtin/packages/py-cycler/package.py +++ b/var/spack/repos/builtin/packages/py-cycler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCycler(PythonPackage): homepage = "https://matplotlib.org/cycler/" pypi = "cycler/cycler-0.11.0.tar.gz" + license("BSD-3-Clause") + version("0.11.0", sha256="9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f") version("0.10.0", sha256="cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8") diff --git a/var/spack/repos/builtin/packages/py-cykhash/package.py b/var/spack/repos/builtin/packages/py-cykhash/package.py index 85d67fb9799f9e..31f762e42ddb86 100644 --- a/var/spack/repos/builtin/packages/py-cykhash/package.py +++ b/var/spack/repos/builtin/packages/py-cykhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCykhash(PythonPackage): maintainers("snehring") + license("MIT") + version("2.0.1", sha256="b4794bc9f549114d8cf1d856d9f64e08ff5f246bf043cf369fdb414e9ceb97f7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cylc-flow/package.py b/var/spack/repos/builtin/packages/py-cylc-flow/package.py index de70e1de50cc26..2fe1d5dd4a863e 100644 --- a/var/spack/repos/builtin/packages/py-cylc-flow/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-flow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCylcFlow(PythonPackage): maintainers("LydDeb", "climbfuji") + license("GPL-3.0-only") + version("8.2.3", sha256="dd5bea9e4b8dad00edd9c3459a38fb778e5a073da58ad2725bc9b84ad718e073") version("8.2.0", sha256="cbe35e0d72d1ca36f28a4cebe9b9040a3445a74253bc94051a3c906cf179ded0") version("8.1.4", sha256="d1835ac18f6f24f3115c56b2bc821185484e834a86b12fd0033ff7e4dc3c1f63") diff --git a/var/spack/repos/builtin/packages/py-cylc-rose/package.py b/var/spack/repos/builtin/packages/py-cylc-rose/package.py index 37805c66d0fe8a..bb7d199d2506a6 100644 --- a/var/spack/repos/builtin/packages/py-cylc-rose/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-rose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCylcRose(PythonPackage): maintainers("LydDeb") + license("GPL-3.0-only") + version("1.3.0", sha256="017072b69d7a50fa6d309a911d2428743b07c095f308529b36b1b787ebe7ab88") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py b/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py index 57345f8a11257f..99a411d1fb5969 100644 --- a/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py +++ b/var/spack/repos/builtin/packages/py-cylc-uiserver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyCylcUiserver(PythonPackage): maintainers("LydDeb") + license("GPL-3.0-or-later") + version("1.3.0", sha256="f3526e470c7ac2b61bf69e9b8d17fc7a513392219d28baed9b1166dcc7033d7a") depends_on("py-wheel", type="build") diff --git a/var/spack/repos/builtin/packages/py-cylp/package.py b/var/spack/repos/builtin/packages/py-cylp/package.py index 865e98c43e95cf..ac9301f0ddcaa9 100644 --- a/var/spack/repos/builtin/packages/py-cylp/package.py +++ b/var/spack/repos/builtin/packages/py-cylp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyCylp(PythonPackage): homepage = "https://github.com/coin-or/cylp" pypi = "cylp/cylp-0.91.5.tar.gz" + license("EPL-2.0") + version("0.91.5", sha256="d68ab1dde125be60abf45c8fd9edd24ab880c8144ad881718ddfa01ff6674c77") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cymem/package.py b/var/spack/repos/builtin/packages/py-cymem/package.py index 986652b1150f63..8d321b098c0e31 100644 --- a/var/spack/repos/builtin/packages/py-cymem/package.py +++ b/var/spack/repos/builtin/packages/py-cymem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCymem(PythonPackage): homepage = "https://github.com/explosion/cymem" pypi = "cymem/cymem-2.0.3.tar.gz" + license("MIT") + version("2.0.7", sha256="e6034badb5dd4e10344211c81f16505a55553a7164adc314c75bd80cf07e57a8") version("2.0.3", sha256="5083b2ab5fe13ced094a82e0df465e2dbbd9b1c013288888035e24fd6eb4ed01") diff --git a/var/spack/repos/builtin/packages/py-cyordereddict/package.py b/var/spack/repos/builtin/packages/py-cyordereddict/package.py index 3629dfd730c924..debfa13e6a49f1 100644 --- a/var/spack/repos/builtin/packages/py-cyordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-cyordereddict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyCyordereddict(PythonPackage): homepage = "https://github.com/shoyer/cyordereddict" pypi = "cyordereddict/cyordereddict-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="d9b2c31796999770801a9a49403b8cb49510ecb64e5d1e9d4763ed44f2d5a76e") version("0.2.2", sha256="f8387caaffba695d704311842291ede696080a5ed306f07f1825de126fb7f1ec") diff --git a/var/spack/repos/builtin/packages/py-cython-bbox/package.py b/var/spack/repos/builtin/packages/py-cython-bbox/package.py index ca220f85534a1f..9320d12e3cbcc0 100644 --- a/var/spack/repos/builtin/packages/py-cython-bbox/package.py +++ b/var/spack/repos/builtin/packages/py-cython-bbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 5726db29972eef..d58863c5c44d24 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,13 +15,10 @@ class PyCython(PythonPackage): pypi = "cython/Cython-0.29.21.tar.gz" tags = ["build-tools"] + license("Apache-2.0") + version("3.0.4", sha256="2e379b491ee985d31e5faaf050f79f4a8f59f482835906efe4477b33b4fbe9ff") version("3.0.0", sha256="350b18f9673e63101dbbfcf774ee2f57c20ac4636d255741d76ca79016b1bd82") - version( - "3.0.0a9", - sha256="23931c45877432097cef9de2db2dc66322cbc4fc3ebbb42c476bb2c768cecff0", - deprecated=True, - ) version("0.29.36", sha256="41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f") version("0.29.35", sha256="6e381fa0bf08b3c26ec2f616b19ae852c06f5750f4290118bf986b6f85c8c527") version("0.29.34", sha256="1909688f5d7b521a60c396d20bba9e47a1b2d2784bfb085401e1e1e7d29a29a8") diff --git a/var/spack/repos/builtin/packages/py-cyvcf2/package.py b/var/spack/repos/builtin/packages/py-cyvcf2/package.py index 21a43365445a83..f00894b9e50c8b 100644 --- a/var/spack/repos/builtin/packages/py-cyvcf2/package.py +++ b/var/spack/repos/builtin/packages/py-cyvcf2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyCyvcf2(PythonPackage): homepage = "https://github.com/brentp/cyvcf2" pypi = "cyvcf2/cyvcf2-0.11.7.tar.gz" + license("MIT") + version("0.11.7", sha256="a4b6229b89a0a1043684c65cbdd702c366a8800dc3591fb44c4b5a08640cbeec") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-d2to1/package.py b/var/spack/repos/builtin/packages/py-d2to1/package.py index eb194d22147fd7..c8e89103b0c682 100644 --- a/var/spack/repos/builtin/packages/py-d2to1/package.py +++ b/var/spack/repos/builtin/packages/py-d2to1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dace/package.py b/var/spack/repos/builtin/packages/py-dace/package.py new file mode 100644 index 00000000000000..bfa8bf0d80efbe --- /dev/null +++ b/var/spack/repos/builtin/packages/py-dace/package.py @@ -0,0 +1,53 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyDace(PythonPackage): + """DaCe is a fast parallel programming framework that takes code in + Python/NumPy and other programming languages, and maps it to + high-performance CPU, GPU, and FPGA programs, which can be + optimized programmatically or interactively.""" + + homepage = "https://github.com/spcl/dace" + pypi = "dace/dace-0.15.1.tar.gz" + git = "https://github.com/spcl/dace.git" + + maintainers("tbennun") + + version("master", branch="master", submodules=True) + version("0.15.1", sha256="69bfdbbd5c7177f2926a874f5fa82fcdef61fc532c022b4bc12e1e9218724093") + + variant( + "counters", + description="Optional requirements that enable performance counter collection.", + default=False, + ) + + depends_on("python@3.6:3.12", type=("build", "run")) + depends_on("py-setuptools", type="build") + + # Dependencies from setup.py + depends_on("py-numpy", type=("build", "run")) + depends_on("py-networkx@2.5:", type=("build", "run")) + depends_on("py-astunparse", type=("build", "run")) + # A typo in the 0.15.1 setup.py specifies sympy <= 1.9 instead of >= 1.9. + # See https://github.com/spcl/dace/pull/1483 for more information. + depends_on("py-sympy@1.9:", type=("build", "run")) + depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-ply", type=("build", "run")) + depends_on("py-websockets", type=("build", "run")) + depends_on("py-requests", when="@:0.15.1", type=("build", "run")) + depends_on("py-flask", when="@:0.15.1", type=("build", "run")) + depends_on("py-fparser@0.1.3:", type=("build", "run")) + depends_on("py-aenum@3.1:", type=("build", "run")) + depends_on("py-dill", type=("build", "run")) + depends_on("py-pyreadline", when="platform=windows", type=("build", "run")) + + depends_on("cmake@3.15.0:", type=("build", "run")) + + # From performance counters requirements + depends_on("likwid@5.2.2:", when="+counters", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dadi/package.py b/var/spack/repos/builtin/packages/py-dadi/package.py index 9944896e502659..e059fb9411e1b5 100644 --- a/var/spack/repos/builtin/packages/py-dadi/package.py +++ b/var/spack/repos/builtin/packages/py-dadi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyDadi(PythonPackage): maintainers("dorton21") + license("BSD-3-Clause") + version("2020-12-02", commit="047bac0db5245009d9c724e91a851149c34c9de0") version("2.1.0", sha256="97a15aa7ef501850cad4cff66b11b66ecb65d5d68acbf2ff713585c81c3a1038") diff --git a/var/spack/repos/builtin/packages/py-dalib/package.py b/var/spack/repos/builtin/packages/py-dalib/package.py index 87b82339c5f3ee..dce01c5755783c 100644 --- a/var/spack/repos/builtin/packages/py-dalib/package.py +++ b/var/spack/repos/builtin/packages/py-dalib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-damask/package.py b/var/spack/repos/builtin/packages/py-damask/package.py index 524cb0bb2f1979..ca2ab0ae54db47 100644 --- a/var/spack/repos/builtin/packages/py-damask/package.py +++ b/var/spack/repos/builtin/packages/py-damask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class PyDamask(PythonPackage): maintainers("MarDiehl") + license("AGPL-3.0-only") + + version( + "3.0.0-alpha8", sha256="f62c38123213d1c1fe2eb8910b0ffbdc1cac56273c2520f3b64a553363190b9d" + ) version( "3.0.0-alpha7", sha256="442b06b824441293e72ff91b211a555c5d497aedf62be1c4332c426558b848a4" ) @@ -28,6 +33,13 @@ class PyDamask(PythonPackage): "3.0.0-alpha4", sha256="0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493" ) + depends_on("py-pandas@0.24:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-numpy@1.17:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-scipy@1.2:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-h5py@2.9:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("vtk+python@8.1:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-matplotlib@3.0:", type=("build", "run"), when="@3.0.0-alpha8:") + depends_on("py-pyyaml@3.12:", type=("build", "run"), when="@3.0.0-alpha8:") depends_on("python@3.8:", type=("build", "run"), when="@3.0.0-alpha6:") depends_on("python@3.7:", type=("build", "run")) depends_on("py-setuptools@40.6:", type="build") diff --git a/var/spack/repos/builtin/packages/py-darshan/package.py b/var/spack/repos/builtin/packages/py-darshan/package.py index 5c7450e0d762d9..4b9c929e25752f 100644 --- a/var/spack/repos/builtin/packages/py-darshan/package.py +++ b/var/spack/repos/builtin/packages/py-darshan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dask-glm/package.py b/var/spack/repos/builtin/packages/py-dask-glm/package.py index cfc3de80a17036..4557b08394a112 100644 --- a/var/spack/repos/builtin/packages/py-dask-glm/package.py +++ b/var/spack/repos/builtin/packages/py-dask-glm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,9 @@ class PyDaskGlm(PythonPackage): homepage = "https://dask-glm.readthedocs.io/en/latest/" pypi = "dask-glm/dask-glm-0.2.0.tar.gz" - version("0.2.0", sha256="58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5") + license("BSD-3-Clause") - variant("docs", default=False, description="Build HTML documentation") + version("0.2.0", sha256="58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5") depends_on("py-setuptools", type="build") depends_on("py-setuptools-scm", type="build") @@ -23,25 +23,4 @@ class PyDaskGlm(PythonPackage): depends_on("py-dask+array", type=("build", "run")) depends_on("py-multipledispatch@0.4.9:", type=("build", "run")) depends_on("py-scipy@0.18.1:", type=("build", "run")) - depends_on("py-scikit-learn@0.18:", type=("build", "run"), when="~docs") - depends_on("py-scikit-learn@0.18:0.21", type=("build", "run"), when="+docs") - depends_on("py-jupyter", type="build", when="+docs") - depends_on("py-nbsphinx", type="build", when="+docs") - depends_on("py-notebook", type="build", when="+docs") - depends_on("py-numpydoc", type="build", when="+docs") - depends_on("py-sphinx", type="build", when="+docs") - depends_on("py-sphinx-rtd-theme", type="build", when="+docs") - depends_on("pandoc", type="build", when="+docs") - depends_on("py-pip", type="build", when="+docs") - depends_on("py-s3fs", type="build", when="+docs") - depends_on("py-matplotlib", type="build", when="+docs") - depends_on("llvm@:10.0.1~flang", type="build", when="+docs") - depends_on("cairo+X+ft+fc+pdf+gobject", type="build", when="+docs") - depends_on("harfbuzz+graphite2", type="build", when="+docs") - - @run_after("install") - def install_docs(self): - if "+docs" in self.spec: - with working_dir("docs"): - make("html") - install_tree("docs", self.prefix.docs) + depends_on("py-scikit-learn@0.18:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dask-ml/package.py b/var/spack/repos/builtin/packages/py-dask-ml/package.py index 10f4e17a0e16e2..52eb401f573e62 100644 --- a/var/spack/repos/builtin/packages/py-dask-ml/package.py +++ b/var/spack/repos/builtin/packages/py-dask-ml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDaskMl(PythonPackage): homepage = "https://ml.dask.org/" pypi = "dask-ml/dask-ml-1.8.0.tar.gz" + license("BSD-3-Clause") + version("1.8.0", sha256="8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815") variant("docs", default=False, description="Build HTML documentation") diff --git a/var/spack/repos/builtin/packages/py-dask-mpi/package.py b/var/spack/repos/builtin/packages/py-dask-mpi/package.py index fb2c6a0e5eb7ac..be1db392c295a9 100644 --- a/var/spack/repos/builtin/packages/py-dask-mpi/package.py +++ b/var/spack/repos/builtin/packages/py-dask-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDaskMpi(PythonPackage): skip_modules = ["dask_mpi.tests"] + license("BSD-3-Clause") + version("2022.4.0", sha256="0a04f1d7d35a06cdff506593330d4414ea242c9172498ce191f5742eac499e17") version("2.21.0", sha256="76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7") version("2.0.0", sha256="774cd2d69e5f7154e1fa133c22498062edd31507ffa2ea19f4ab4d8975c27bc3") diff --git a/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py index a4d9389ff6e282..6e3b90c1dd8f91 100644 --- a/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-dask-sphinx-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDaskSphinxTheme(PythonPackage): homepage = "https://github.com/dask/dask-sphinx-theme/" pypi = "dask_sphinx_theme/dask_sphinx_theme-1.3.5.tar.gz" + license("BSD-3-Clause") + version("1.3.5", sha256="151970cf0efedeb398fd6ca080407d3e81b4584d333e24498262d954171baa33") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index df07a6e03e2c89..5980a9efe4368e 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDask(PythonPackage): maintainers("skosukhin") + license("BSD-3-Clause") + version("2023.4.1", sha256="9dc72ebb509f58f3fe518c12dd5a488c67123fdd66ccb0b968b34fd11e512153") version("2022.10.2", sha256="42cb43f601709575fa46ce09e74bea83fdd464187024f56954e09d9b428ceaab") version("2021.6.2", sha256="8588fcd1a42224b7cfcd2ebc8ad616734abb6b1a4517efd52d89c7dd66eb91f8") diff --git a/var/spack/repos/builtin/packages/py-databricks-cli/package.py b/var/spack/repos/builtin/packages/py-databricks-cli/package.py index 69b604dc97da06..0100407c6609f9 100644 --- a/var/spack/repos/builtin/packages/py-databricks-cli/package.py +++ b/var/spack/repos/builtin/packages/py-databricks-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dataclasses-json/package.py b/var/spack/repos/builtin/packages/py-dataclasses-json/package.py index 465265f834bcd0..3ba040060501da 100644 --- a/var/spack/repos/builtin/packages/py-dataclasses-json/package.py +++ b/var/spack/repos/builtin/packages/py-dataclasses-json/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDataclassesJson(PythonPackage): homepage = "https://github.com/lidatong/dataclasses-json" pypi = "dataclasses_json/dataclasses_json-0.5.12.tar.gz" + license("MIT") + version("0.5.12", sha256="70e28da52e36f4be6b724e1f1e77fbcd19e0e0a6bf9a4c4c6e5abf713d4dab5a") depends_on("python@3.7:3.11", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dataclasses/package.py b/var/spack/repos/builtin/packages/py-dataclasses/package.py index 0058cadbf673a7..029988906202f7 100644 --- a/var/spack/repos/builtin/packages/py-dataclasses/package.py +++ b/var/spack/repos/builtin/packages/py-dataclasses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-datacube/package.py b/var/spack/repos/builtin/packages/py-datacube/package.py index 79ad65725e70fd..db6d2dc76d5a5a 100644 --- a/var/spack/repos/builtin/packages/py-datacube/package.py +++ b/var/spack/repos/builtin/packages/py-datacube/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDatacube(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("1.8.3", sha256="d1e1a49c615fdaebf6e6008da7f925bc09e9d7bf94f259a1c596d266d1c36649") # Excluding 'datacube.utils.aws' since it requires 'boto3' diff --git a/var/spack/repos/builtin/packages/py-datalad-container/package.py b/var/spack/repos/builtin/packages/py-datalad-container/package.py index c63152d2914e28..85248078e19068 100644 --- a/var/spack/repos/builtin/packages/py-datalad-container/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-container/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDataladContainer(PythonPackage): homepage = "https://github.com/datalad/datalad-container/" pypi = "datalad_container/datalad_container-1.1.5.tar.gz" + license("MIT") + version("1.2.0", sha256="35239a7a00a7fec98828ef78f929d16047349ef0e921c8be9cf933ff845aece6") version("1.1.7", sha256="02574c1d3d1e83c8ef3ab75b6a3523ce5acc870b0b79af12ae433ac140c5cb16") version("1.1.5", sha256="f6099a0124ddb2f021531d5020a583eca3cd9243e4e609b0f58e3f72e779b601") diff --git a/var/spack/repos/builtin/packages/py-datalad-deprecated/package.py b/var/spack/repos/builtin/packages/py-datalad-deprecated/package.py index ae08094aaefaf6..803832db333438 100644 --- a/var/spack/repos/builtin/packages/py-datalad-deprecated/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-deprecated/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDataladDeprecated(PythonPackage): homepage = "https://github.com/datalad/datalad-deprecated" pypi = "datalad_deprecated/datalad_deprecated-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="874cf31c7640a9eafe7c5ecf36f0924d5d5b47222666a55ef10eabb9c29f46cd") depends_on("py-setuptools@43:", type="build") diff --git a/var/spack/repos/builtin/packages/py-datalad-hirni/package.py b/var/spack/repos/builtin/packages/py-datalad-hirni/package.py index 313d6bd573d791..a40fcdb0f7536c 100644 --- a/var/spack/repos/builtin/packages/py-datalad-hirni/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-hirni/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-datalad-metadata-model/package.py b/var/spack/repos/builtin/packages/py-datalad-metadata-model/package.py index 0bb37540ca263a..84136585220112 100644 --- a/var/spack/repos/builtin/packages/py-datalad-metadata-model/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-metadata-model/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDataladMetadataModel(PythonPackage): homepage = "https://github.com/datalad/metadata-model" pypi = "datalad-metadata-model/datalad-metadata-model-0.3.5.tar.gz" + license("MIT") + version("0.3.10", sha256="2d113d43fe5c611633e8e2c354e9ddc1224f4f8d7305b2e1fa20cdd7f5deedc4") version("0.3.5", sha256="992241adef6d36ad7f9a83d8c7762d887fbec7111e06a2bd12fd8816e6ee739a") diff --git a/var/spack/repos/builtin/packages/py-datalad-metalad/package.py b/var/spack/repos/builtin/packages/py-datalad-metalad/package.py index 986ea44bb4b112..a3badf187b0ac4 100644 --- a/var/spack/repos/builtin/packages/py-datalad-metalad/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-metalad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDataladMetalad(PythonPackage): homepage = "https://github.com/datalad/datalad-metalad/" pypi = "datalad_metalad/datalad_metalad-0.2.1.tar.gz" + license("MIT") + version("0.4.17", sha256="8854d5b8bc8387eff27639510f10c3cffe9cd76be018512a5d451be9708242b9") version("0.4.5", sha256="db1a0675e3c67fe2d9093e7098b142534f49588dea5ee048ee962422a9927fbf") version("0.2.1", sha256="70fe423136a168f7630b3e0ff1951e776d61e7d5f36670bddf24299ac0870285") diff --git a/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py b/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py index 1cee1e08c2c882..6ffedf5919a929 100644 --- a/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-neuroimaging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDataladNeuroimaging(PythonPackage): homepage = "https://github.com/datalad/datalad-neuroimaging" pypi = "datalad_neuroimaging/datalad_neuroimaging-0.3.1.tar.gz" + license("MIT") + version("0.3.3", sha256="49a6852e68892e6cd13f245bca2d400abded5ea4fd2a69c9be41c710d0c49bb1") version("0.3.1", sha256="aaf7a3d10e8e7df1d8dee09e485bbe26787f496fb2302ed7ddea55a470a0f96e") diff --git a/var/spack/repos/builtin/packages/py-datalad-webapp/package.py b/var/spack/repos/builtin/packages/py-datalad-webapp/package.py index 2711d7d643b578..6c221fd22abff1 100644 --- a/var/spack/repos/builtin/packages/py-datalad-webapp/package.py +++ b/var/spack/repos/builtin/packages/py-datalad-webapp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-datalad/package.py b/var/spack/repos/builtin/packages/py-datalad/package.py index fe91730d4ef1e7..904c2024d9a0bb 100644 --- a/var/spack/repos/builtin/packages/py-datalad/package.py +++ b/var/spack/repos/builtin/packages/py-datalad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-datasets/package.py b/var/spack/repos/builtin/packages/py-datasets/package.py index 2289e67e78115b..a85a40531c3a7a 100644 --- a/var/spack/repos/builtin/packages/py-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-datasets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyDatasets(PythonPackage): maintainers("thomas-bouvier") + license("Apache-2.0") + version("2.8.0", sha256="a843b69593914071f921fc1086fde939f30a63415a34cdda5db3c0acdd58aff2") version("1.8.0", sha256="d57c32bb29e453ee7f3eb0bbca3660ab4dd2d0e4648efcfa987432624cab29d3") diff --git a/var/spack/repos/builtin/packages/py-dateparser/package.py b/var/spack/repos/builtin/packages/py-dateparser/package.py index ec93b4dece9c70..36b28de7c2abf5 100644 --- a/var/spack/repos/builtin/packages/py-dateparser/package.py +++ b/var/spack/repos/builtin/packages/py-dateparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDateparser(PythonPackage): homepage = "https://github.com/scrapinghub/dateparser" pypi = "dateparser/dateparser-0.7.2.tar.gz" + license("BSD-3-Clause") + version("0.7.2", sha256="e1eac8ef28de69a554d5fcdb60b172d526d61924b1a40afbbb08df459a36006b") variant("calendars", default=True, description="Add calendar libraries") diff --git a/var/spack/repos/builtin/packages/py-dateutils/package.py b/var/spack/repos/builtin/packages/py-dateutils/package.py index 84bc4ff6c93774..7d938116729fa9 100644 --- a/var/spack/repos/builtin/packages/py-dateutils/package.py +++ b/var/spack/repos/builtin/packages/py-dateutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDateutils(PythonPackage): homepage = "https://github.com/jmcantrell/python-dateutils" pypi = "dateutils/dateutils-0.6.12.tar.gz" + license("0BSD") + version("0.6.12", sha256="03dd90bcb21541bd4eb4b013637e4f1b5f944881c46cc6e4b67a6059e370e3f1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-datrie/package.py b/var/spack/repos/builtin/packages/py-datrie/package.py index 90896189192307..9bb763aed512c3 100644 --- a/var/spack/repos/builtin/packages/py-datrie/package.py +++ b/var/spack/repos/builtin/packages/py-datrie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDatrie(PythonPackage): pypi = "datrie/datrie-0.8.2.tar.gz" maintainers("marcusboden") + license("LGPL-2.1-or-later") + version("0.8.2", sha256="525b08f638d5cf6115df6ccd818e5a01298cd230b2dac91c8ff2e6499d18765d") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dbf/package.py b/var/spack/repos/builtin/packages/py-dbf/package.py index 3919496adde364..c9332c49964ba9 100644 --- a/var/spack/repos/builtin/packages/py-dbf/package.py +++ b/var/spack/repos/builtin/packages/py-dbf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dbfread/package.py b/var/spack/repos/builtin/packages/py-dbfread/package.py index ed92fa1d651ca8..e9efe9d5d58574 100644 --- a/var/spack/repos/builtin/packages/py-dbfread/package.py +++ b/var/spack/repos/builtin/packages/py-dbfread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyDbfread(PythonPackage): homepage = "https://dbfread.readthedocs.io/en/latest/" pypi = "dbfread/dbfread-2.0.7.tar.gz" + license("MIT") + version("2.0.7", sha256="07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dcm2bids/package.py b/var/spack/repos/builtin/packages/py-dcm2bids/package.py index fe3deb15629ada..c69a4d71f23b6a 100644 --- a/var/spack/repos/builtin/packages/py-dcm2bids/package.py +++ b/var/spack/repos/builtin/packages/py-dcm2bids/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDcm2bids(PythonPackage): homepage = "https://github.com/unfmontreal/Dcm2Bids" pypi = "dcm2bids/dcm2bids-2.1.9.tar.gz" + license("GPL-3.0-only") + version("3.1.0", sha256="53a8a177d556df897e19d72bd517fdae0245927a8938bb9fbbd51f9f33f54f84") version("2.1.9", sha256="d962bd0a7f1ed200ecb699e8ddb29ff58f09ab2f850a7f37511b79c62189f715") diff --git a/var/spack/repos/builtin/packages/py-deap/package.py b/var/spack/repos/builtin/packages/py-deap/package.py index ec984500ce1f8f..cc4085cc65ff06 100644 --- a/var/spack/repos/builtin/packages/py-deap/package.py +++ b/var/spack/repos/builtin/packages/py-deap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDeap(PythonPackage): homepage = "https://deap.readthedocs.org/" pypi = "deap/deap-1.3.1.tar.gz" + license("LGPL-3.0-or-later") + version("1.3.3", sha256="8772f1b0fff042d5e516b0aebac2c706243045aa7d0de8e0b8658f380181cf31") version("1.3.1", sha256="11f54493ceb54aae10dde676577ef59fc52d52f82729d5a12c90b0813c857a2f") diff --git a/var/spack/repos/builtin/packages/py-debtcollector/package.py b/var/spack/repos/builtin/packages/py-debtcollector/package.py index a360689dba4fd8..a9eb4b31eff8a8 100644 --- a/var/spack/repos/builtin/packages/py-debtcollector/package.py +++ b/var/spack/repos/builtin/packages/py-debtcollector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-debugpy/package.py b/var/spack/repos/builtin/packages/py-debugpy/package.py index fe2d4c6b5ff03e..fe6b74ff478993 100644 --- a/var/spack/repos/builtin/packages/py-debugpy/package.py +++ b/var/spack/repos/builtin/packages/py-debugpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyDebugpy(PythonPackage): # 'debugpy._vendored' requires additional dependencies, Windows-specific skip_modules = ["debugpy._vendored"] + license("MIT") + version("1.6.7", sha256="c4c2f0810fa25323abfdfa36cbbbb24e5c3b1a42cb762782de64439c575d67f2") version("1.6.6", sha256="b9c2130e1c632540fbf9c2c88341493797ddf58016e7cba02e311de9b0a96b67") version("1.6.3", sha256="e8922090514a890eec99cfb991bab872dd2e353ebb793164d5f01c362b9a40bf") diff --git a/var/spack/repos/builtin/packages/py-decorator/package.py b/var/spack/repos/builtin/packages/py-decorator/package.py index a839bd731f4b2b..c58137246651b9 100644 --- a/var/spack/repos/builtin/packages/py-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-decorator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDecorator(PythonPackage): homepage = "https://github.com/micheles/decorator" pypi = "decorator/decorator-5.1.0.tar.gz" + license("BSD-2-Clause") + version("5.1.1", sha256="637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330") version("5.1.0", sha256="e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7") version("5.0.9", sha256="72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5") diff --git a/var/spack/repos/builtin/packages/py-deepdiff/package.py b/var/spack/repos/builtin/packages/py-deepdiff/package.py index ed4f4ddedcfefd..cd2180c4920072 100644 --- a/var/spack/repos/builtin/packages/py-deepdiff/package.py +++ b/var/spack/repos/builtin/packages/py-deepdiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDeepdiff(PythonPackage): homepage = "https://github.com/seperman/deepdiff" pypi = "deepdiff/deepdiff-5.6.0.tar.gz" + license("MIT") + version("6.3.0", sha256="6a3bf1e7228ac5c71ca2ec43505ca0a743ff54ec77aa08d7db22de6bc7b2b644") version("5.6.0", sha256="e3f1c3a375c7ea5ca69dba6f7920f9368658318ff1d8a496293c79481f48e649") diff --git a/var/spack/repos/builtin/packages/py-deepecho/package.py b/var/spack/repos/builtin/packages/py-deepecho/package.py index ad4a185bae6b45..9438da094a391b 100644 --- a/var/spack/repos/builtin/packages/py-deepecho/package.py +++ b/var/spack/repos/builtin/packages/py-deepecho/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDeepecho(PythonPackage): homepage = "https://github.com/sdv-dev/DeepEcho" pypi = "deepecho/deepecho-0.3.0.post1.tar.gz" + license("MIT") + version( "0.3.0.post1", sha256="9f67373a435b5bcd84441c53eae87a2ba17a27574419a59191f92198f400b914" ) diff --git a/var/spack/repos/builtin/packages/py-deephyper/package.py b/var/spack/repos/builtin/packages/py-deephyper/package.py index b90f77658ac0b3..2bde1cff747316 100644 --- a/var/spack/repos/builtin/packages/py-deephyper/package.py +++ b/var/spack/repos/builtin/packages/py-deephyper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyDeephyper(PythonPackage): maintainers("mdorier", "Deathn0t") + license("BSD-3-Clause") + version("master", branch="master") version("0.4.2", sha256="ee1811a22b08eff3c9098f63fbbb37f7c8703e2f878f2bdf2ec35a978512867f") diff --git a/var/spack/repos/builtin/packages/py-deepsig-biocomp/package.py b/var/spack/repos/builtin/packages/py-deepsig-biocomp/package.py index ac8c77a1bee692..01b527251fc52f 100644 --- a/var/spack/repos/builtin/packages/py-deepsig-biocomp/package.py +++ b/var/spack/repos/builtin/packages/py-deepsig-biocomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyDeepsigBiocomp(PythonPackage): url = "https://github.com/BolognaBiocomp/deepsig/archive/refs/tags/v1.2.5.tar.gz" + license("GPL-3.0-only") + version("1.2.5", sha256="e954b815d63c221c564c7d3fe27123d7cd2c39b191d6107369ab095d506496e0") depends_on("python@3.8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-deepsig/package.py b/var/spack/repos/builtin/packages/py-deepsig/package.py index 65b2cffb0efad3..7256d6caf77158 100644 --- a/var/spack/repos/builtin/packages/py-deepsig/package.py +++ b/var/spack/repos/builtin/packages/py-deepsig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-deepspeed/package.py b/var/spack/repos/builtin/packages/py-deepspeed/package.py index 390aa6e00489a5..e73d9552863d42 100644 --- a/var/spack/repos/builtin/packages/py-deepspeed/package.py +++ b/var/spack/repos/builtin/packages/py-deepspeed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyDeepspeed(PythonPackage): homepage = "http://deepspeed.ai/" pypi = "deepspeed/deepspeed-0.10.0.tar.gz" + license("Apache-2.0") + version("0.10.0", sha256="afb06a97fde2a33d0cbd60a8357a70087c037b9f647ca48377728330c35eff3e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-deeptools/package.py b/var/spack/repos/builtin/packages/py-deeptools/package.py index a886d6d95db483..6b143c287bba32 100644 --- a/var/spack/repos/builtin/packages/py-deeptools/package.py +++ b/var/spack/repos/builtin/packages/py-deeptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py b/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py index 91dab36a22b4c0..ac13c36108982f 100644 --- a/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py +++ b/var/spack/repos/builtin/packages/py-deeptoolsintervals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDeeptoolsintervals(PythonPackage): pypi = "deeptoolsintervals/deeptoolsintervals-0.1.9.tar.gz" + license("MIT") + version("0.1.9", sha256="7d94c36fd2b6f10d8b99e536d2672e8228971f1fc810497d33527bba2c40d4f6") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-defusedxml/package.py b/var/spack/repos/builtin/packages/py-defusedxml/package.py index 69fc7fd1f47eb5..6968c403115c65 100644 --- a/var/spack/repos/builtin/packages/py-defusedxml/package.py +++ b/var/spack/repos/builtin/packages/py-defusedxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDefusedxml(PythonPackage): homepage = "https://github.com/tiran/defusedxml" pypi = "defusedxml/defusedxml-0.5.0.tar.gz" + license("PSF-2.0") + version("0.7.1", sha256="1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69") version("0.6.0", sha256="f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5") version("0.5.0", sha256="24d7f2f94f7f3cb6061acb215685e5125fbcdc40a857eff9de22518820b0a4f4") diff --git a/var/spack/repos/builtin/packages/py-demjson/package.py b/var/spack/repos/builtin/packages/py-demjson/package.py index 015b58094da274..321fbf78d954bc 100644 --- a/var/spack/repos/builtin/packages/py-demjson/package.py +++ b/var/spack/repos/builtin/packages/py-demjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDemjson(PythonPackage): homepage = "http://deron.meranda.us/python/demjson/" pypi = "demjson/demjson-2.2.4.tar.gz" + license("LGPL-3.0-only") + version("2.2.4", sha256="31de2038a0fdd9c4c11f8bf3b13fe77bc2a128307f965c8d5fb4dc6d6f6beb79") version("2.2.3", sha256="9fb0f3c02fe500104680af2889a64d1637b395aebdb37341ae2309d77854f40c") version("2.2.2", sha256="5114563dd3a0324b6c9c74250528660adbb6a095b2a015038149e31a9b5727d5") diff --git a/var/spack/repos/builtin/packages/py-dendropy/package.py b/var/spack/repos/builtin/packages/py-dendropy/package.py index 4d71717600dda8..7d1ae2a82d115c 100644 --- a/var/spack/repos/builtin/packages/py-dendropy/package.py +++ b/var/spack/repos/builtin/packages/py-dendropy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyDendropy(PythonPackage): homepage = "https://www.dendropy.org" pypi = "dendropy/DendroPy-4.3.0.tar.gz" + license("CC-BY-NC-SA-4.0") + version("4.5.2", sha256="3e5d2522170058ebc8d1ee63a7f2d25b915e34957dc02693ebfdc15f347a0101") version("4.3.0", sha256="bd5b35ce1a1c9253209b7b5f3939ac22beaa70e787f8129149b4f7ffe865d510") version("3.12.0", sha256="38a0f36f2f7aae43ec5599408b0d0a4c80996b749589f025940d955a70fc82d4") diff --git a/var/spack/repos/builtin/packages/py-deprecated/package.py b/var/spack/repos/builtin/packages/py-deprecated/package.py index df224ec46cdbcd..e7bf985e55925d 100644 --- a/var/spack/repos/builtin/packages/py-deprecated/package.py +++ b/var/spack/repos/builtin/packages/py-deprecated/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDeprecated(PythonPackage): homepage = "https://github.com/tantale/deprecated" pypi = "Deprecated/Deprecated-1.2.13.tar.gz" + license("MIT") + version("1.2.13", sha256="43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d") version("1.2.7", sha256="408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308") diff --git a/var/spack/repos/builtin/packages/py-deprecation-alias/package.py b/var/spack/repos/builtin/packages/py-deprecation-alias/package.py index b16d2ffb2baa4c..4c56f887826b6d 100644 --- a/var/spack/repos/builtin/packages/py-deprecation-alias/package.py +++ b/var/spack/repos/builtin/packages/py-deprecation-alias/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDeprecationAlias(PythonPackage): homepage = "https://github.com/domdfcoding/deprecation-alias" pypi = "deprecation_alias/deprecation-alias-0.3.2.tar.gz" + license("Apache-2.0") + version("0.3.2", sha256="1c9e1a5ddd0a276a1a18e7a4f9d56b53232217491c4549eaa45e51753013ce76") depends_on("py-wheel@0.34.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-deprecation/package.py b/var/spack/repos/builtin/packages/py-deprecation/package.py index 83d69b3344d8c4..b6d0dc7d53f645 100644 --- a/var/spack/repos/builtin/packages/py-deprecation/package.py +++ b/var/spack/repos/builtin/packages/py-deprecation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDeprecation(PythonPackage): homepage = "https://deprecation.readthedocs.io/" pypi = "deprecation/deprecation-2.0.7.tar.gz" + license("Apache-2.0") + version("2.1.0", sha256="72b3bde64e5d778694b0cf68178aed03d15e15477116add3fb773e581f9518ff") version("2.0.7", sha256="c0392f676a6146f0238db5744d73e786a43510d54033f80994ef2f4c9df192ed") diff --git a/var/spack/repos/builtin/packages/py-descartes/package.py b/var/spack/repos/builtin/packages/py-descartes/package.py index 4253580cd4b600..b13be17aeacb13 100644 --- a/var/spack/repos/builtin/packages/py-descartes/package.py +++ b/var/spack/repos/builtin/packages/py-descartes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-devito/package.py b/var/spack/repos/builtin/packages/py-devito/package.py index a2fa989dd71854..e049091182da4d 100644 --- a/var/spack/repos/builtin/packages/py-devito/package.py +++ b/var/spack/repos/builtin/packages/py-devito/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyDevito(PythonPackage): homepage = "https://www.devitoproject.org/" pypi = "devito/devito-4.8.1.tar.gz" + license("MIT") + version("4.8.1", sha256="56d0957a3226ed2a81c408107a614f04faa896d42c83a8b2bd1c8b1100adf51d") variant("mpi", default=False, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/py-devlib/package.py b/var/spack/repos/builtin/packages/py-devlib/package.py index b55f17822256ef..941590e0e1e195 100644 --- a/var/spack/repos/builtin/packages/py-devlib/package.py +++ b/var/spack/repos/builtin/packages/py-devlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDevlib(PythonPackage): homepage = "https://github.com/ARM-software/devlib" url = "https://github.com/ARM-software/devlib/archive/v1.2.tar.gz" + license("Apache-2.0") + version("1.2", sha256="4cdb6767a9430b49eecffe34e2b9fcbcfc7e65328122d909aa71c3d11a86503d") version("1.1.2", sha256="c900420cb97239b4642f5e333e43884fb09507b530edb55466e7b82103b4deaa") version("1.1.1", sha256="eceb7a2721197a6023bbc2bbf346663fc117e4f54e1eb8334a3085dead9c8036") diff --git a/var/spack/repos/builtin/packages/py-dgl/package.py b/var/spack/repos/builtin/packages/py-dgl/package.py index 4a1d4b73cd2c1b..10c6cc2e3e3aa6 100644 --- a/var/spack/repos/builtin/packages/py-dgl/package.py +++ b/var/spack/repos/builtin/packages/py-dgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyDgl(CMakePackage, PythonExtension, CudaPackage): maintainers("adamjstewart", "meyersbs") + license("Apache-2.0") + version("master", branch="master", submodules=True) version( "1.0.1", tag="1.0.1", commit="cc2e9933f309f585fae90965ab61ad11ac1eecd5", submodules=True diff --git a/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py b/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py index ceb1d9ccc08cd8..f8387fdc525802 100644 --- a/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py +++ b/var/spack/repos/builtin/packages/py-dh-scikit-optimize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyDhScikitOptimize(PythonPackage): homepage = "https://github.com/deephyper/scikit-optimize" pypi = "dh-scikit-optimize/dh-scikit-optimize-0.9.0.tar.gz" + license("BSD-3-Clause") + version("0.9.5", sha256="c2777839a536215ab40fc5db2242809ccffd5e5b23718e23d58ea76ff35a7543") version("0.9.4", sha256="9acfba4077fe45f3854a4af255763a3e8a396c05bd2a7c761a969171366b3840") version("0.9.3", sha256="0c922c61dc1f010c7bbd2f0930c766e8ae040c35b129e4de6d51b611fd72b7c9") diff --git a/var/spack/repos/builtin/packages/py-dict2css/package.py b/var/spack/repos/builtin/packages/py-dict2css/package.py index 7e962e56d75e0a..8aa3e1ed3aaf88 100644 --- a/var/spack/repos/builtin/packages/py-dict2css/package.py +++ b/var/spack/repos/builtin/packages/py-dict2css/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDict2css(PythonPackage): maintainers("LydDeb") + license("MIT") + version("0.3.0", sha256="1e8b1bf580dca2083198f88a60ec88c878a8829d760dfe45483ef80fe2905117") depends_on("py-whey", type="build") diff --git a/var/spack/repos/builtin/packages/py-dictdiffer/package.py b/var/spack/repos/builtin/packages/py-dictdiffer/package.py index 06c719cc6f2e71..b689f722f615f0 100644 --- a/var/spack/repos/builtin/packages/py-dictdiffer/package.py +++ b/var/spack/repos/builtin/packages/py-dictdiffer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,11 @@ class PyDictdiffer(PythonPackage): homepage = "https://github.com/inveniosoftware/dictdiffer" pypi = "dictdiffer/dictdiffer-0.8.1.tar.gz" + version("0.9.0", sha256="17bacf5fbfe613ccf1b6d512bd766e6b21fb798822a133aa86098b8ac9997578") version("0.8.1", sha256="1adec0d67cdf6166bda96ae2934ddb5e54433998ceab63c984574d187cc563d2") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) + depends_on("py-setuptools", type="build", when="@0.9:") + depends_on("py-setuptools", type=("build", "run"), when="@:0.8") depends_on("py-setuptools-scm@3.1.0:", type="build") depends_on("py-pytest-runner@2.7:", type="build") diff --git a/var/spack/repos/builtin/packages/py-dictobj/package.py b/var/spack/repos/builtin/packages/py-dictobj/package.py index 7be7d8448de493..bdfb3b7b502279 100644 --- a/var/spack/repos/builtin/packages/py-dictobj/package.py +++ b/var/spack/repos/builtin/packages/py-dictobj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDictobj(PythonPackage): homepage = "https://github.com/grimwm/py-dictobj" pypi = "dictobj/dictobj-0.4.tar.gz" + license("Apache-2.0") + version("0.4", sha256="15d6ac1c720350dcce3d01c31882cbc8e4a14cb22a8bca290a18ca7b0c0988f1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dill/package.py b/var/spack/repos/builtin/packages/py-dill/package.py index f04e80d30700d6..94e14b18b9cde8 100644 --- a/var/spack/repos/builtin/packages/py-dill/package.py +++ b/var/spack/repos/builtin/packages/py-dill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDill(PythonPackage): homepage = "https://github.com/uqfoundation/dill" pypi = "dill/dill-0.2.7.tar.gz" + license("BSD-3-Clause") + version("0.3.6", sha256="e5db55f3687856d8fbdab002ed78544e1c4559a130302693d839dfe8f93f2373") version("0.3.5.1", sha256="d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86") version("0.3.4", sha256="9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675") diff --git a/var/spack/repos/builtin/packages/py-dipy/package.py b/var/spack/repos/builtin/packages/py-dipy/package.py index 467cb201602605..dfc95a71b76f46 100644 --- a/var/spack/repos/builtin/packages/py-dipy/package.py +++ b/var/spack/repos/builtin/packages/py-dipy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-discover/package.py b/var/spack/repos/builtin/packages/py-discover/package.py index 68d27a7ac510ee..7c8d3c9c2511c5 100644 --- a/var/spack/repos/builtin/packages/py-discover/package.py +++ b/var/spack/repos/builtin/packages/py-discover/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-diskcache/package.py b/var/spack/repos/builtin/packages/py-diskcache/package.py index 1783b39d427822..1e3e5e9693cad4 100644 --- a/var/spack/repos/builtin/packages/py-diskcache/package.py +++ b/var/spack/repos/builtin/packages/py-diskcache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDiskcache(PythonPackage): homepage = "http://www.grantjenks.com/docs/diskcache/" pypi = "diskcache/diskcache-4.1.0.tar.gz" + license("Apache-2.0") + version("5.2.1", sha256="1805acd5868ac10ad547208951a1190a0ab7bbff4e70f9a07cde4dbdfaa69f64") version("4.1.0", sha256="bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0") diff --git a/var/spack/repos/builtin/packages/py-dist-meta/package.py b/var/spack/repos/builtin/packages/py-dist-meta/package.py index c8ceed07f7a8ad..4aacf8aae684ce 100644 --- a/var/spack/repos/builtin/packages/py-dist-meta/package.py +++ b/var/spack/repos/builtin/packages/py-dist-meta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDistMeta(PythonPackage): homepage = "https://github.com/repo-helper/dist-meta" pypi = "dist_meta/dist-meta-0.8.0.tar.gz" + license("MIT") + version("0.8.0", sha256="541d51f75b7f580c80d8d7b23112d0b4bf3edbc9442e425a7c4fcd75f4138551") depends_on("py-wheel@0.34.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-distance/package.py b/var/spack/repos/builtin/packages/py-distance/package.py index 645a532bf0bfc7..214471881bb0ae 100644 --- a/var/spack/repos/builtin/packages/py-distance/package.py +++ b/var/spack/repos/builtin/packages/py-distance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyDistance(PythonPackage): homepage = "https://github.com/doukremt/distance" pypi = "Distance/Distance-0.1.3.tar.gz" + license("GPL-2.0-only") + version("0.1.3", sha256="60807584f5b6003f5c521aa73f39f51f631de3be5cccc5a1d67166fcbf0d4551") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-distlib/package.py b/var/spack/repos/builtin/packages/py-distlib/package.py index f0a4c8d6e2a59d..664f6621aa36a8 100644 --- a/var/spack/repos/builtin/packages/py-distlib/package.py +++ b/var/spack/repos/builtin/packages/py-distlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDistlib(PythonPackage): homepage = "https://bitbucket.org/pypa/distlib" pypi = "distlib/distlib-0.3.6.tar.gz" + license("PSF-2.0") + version("0.3.7", sha256="9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8") version("0.3.6", sha256="14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46") version("0.3.4", sha256="e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579") diff --git a/var/spack/repos/builtin/packages/py-distributed/package.py b/var/spack/repos/builtin/packages/py-distributed/package.py index ef4dbe7c15205d..2ee3139845a1db 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class PyDistributed(PythonPackage): "distributed.diagnostics", ] + license("BSD-3-Clause") + version("2023.4.1", sha256="0140376338efdcf8db1d03f7c1fdbb5eab2a337b03e955d927c116824ee94ac5") version("2022.10.2", sha256="53f0a5bf6efab9a5ab3345cd913f6d3f3d4ea444ee2edbea331c7fef96fd67d0") version("2022.2.1", sha256="fb62a75af8ef33bbe1aa80a68c01a33a93c1cd5a332dd017ab44955bf7ecf65b") diff --git a/var/spack/repos/builtin/packages/py-distro/package.py b/var/spack/repos/builtin/packages/py-distro/package.py index a041a04155befe..ffadf87a4cfb97 100644 --- a/var/spack/repos/builtin/packages/py-distro/package.py +++ b/var/spack/repos/builtin/packages/py-distro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDistro(PythonPackage): homepage = "https://github.com/nir0s/distro" pypi = "distro/distro-1.5.0.tar.gz" + license("Apache-2.0") + version("1.8.0", sha256="02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8") version("1.7.0", sha256="151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39") version("1.6.0", sha256="83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424") diff --git a/var/spack/repos/builtin/packages/py-django/package.py b/var/spack/repos/builtin/packages/py-django/package.py index 6bcb5875ea743f..96b8e4cf73715f 100644 --- a/var/spack/repos/builtin/packages/py-django/package.py +++ b/var/spack/repos/builtin/packages/py-django/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDjango(PythonPackage): homepage = "https://www.djangoproject.com/" url = "https://github.com/django/django/archive/3.0.5.tar.gz" + license("BSD-3-Clause") + version("3.0.5", sha256="ef2d4f26414dc9598afce9c56cee4578313b88861cedfc5b3d9a71078e5cc79b") version("3.0.4", sha256="99699643d83acfab51d3ad73c2c2904173e03a4f59fe24c3d494e4fafc0b679f") version("3.0.3", sha256="d953c950f0c395db065c8bc39d20e87faded376632a3aacf889ae92d5adaac8b") diff --git a/var/spack/repos/builtin/packages/py-dlcpar/package.py b/var/spack/repos/builtin/packages/py-dlcpar/package.py index a3f745bd2458c1..e81f40b6c29fa5 100644 --- a/var/spack/repos/builtin/packages/py-dlcpar/package.py +++ b/var/spack/repos/builtin/packages/py-dlcpar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dlio-profiler-py/package.py b/var/spack/repos/builtin/packages/py-dlio-profiler-py/package.py index ee18886ed1b15f..4c408c5ebf0d5f 100644 --- a/var/spack/repos/builtin/packages/py-dlio-profiler-py/package.py +++ b/var/spack/repos/builtin/packages/py-dlio-profiler-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,12 +13,21 @@ class PyDlioProfilerPy(PythonPackage): git = "https://github.com/hariharan-devarajan/dlio-profiler.git" maintainers("hariharan-devarajan") + license("MIT") + 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") diff --git a/var/spack/repos/builtin/packages/py-dm-haiku/package.py b/var/spack/repos/builtin/packages/py-dm-haiku/package.py index 924e464d2be20c..45adb2b7fc5306 100644 --- a/var/spack/repos/builtin/packages/py-dm-haiku/package.py +++ b/var/spack/repos/builtin/packages/py-dm-haiku/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDmHaiku(PythonPackage): homepage = "https://github.com/deepmind/dm-haiku" pypi = "dm-haiku/dm-haiku-0.0.5.tar.gz" + license("Apache-2.0") + version("0.0.7", sha256="86c34af6952a305a4bbfda6b9925998577acc4aa2ad9333da3d6047f4f8ed7c1") version("0.0.5", sha256="e986237e1f840aa3bd26217ecad84b611bf1456e2139f0f79ea71f9c6222d231") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dm-tree/package.py b/var/spack/repos/builtin/packages/py-dm-tree/package.py index 02002412e57a11..bd2d7e4eb3f130 100644 --- a/var/spack/repos/builtin/packages/py-dm-tree/package.py +++ b/var/spack/repos/builtin/packages/py-dm-tree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyDmTree(PythonPackage): maintainers("aweits") + license("Apache-2.0") + version("0.1.8", sha256="0fcaabbb14e7980377439e7140bd05552739ca5e515ecb3119f234acee4b9430") version("0.1.7", sha256="30fec8aca5b92823c0e796a2f33b875b4dccd470b57e91e6c542405c5f77fd2a") version("0.1.6", sha256="6776404b23b4522c01012ffb314632aba092c9541577004ab153321e87da439a") diff --git a/var/spack/repos/builtin/packages/py-dnaio/package.py b/var/spack/repos/builtin/packages/py-dnaio/package.py index 9c286c6b7244a5..f5c9494ab5e3c3 100644 --- a/var/spack/repos/builtin/packages/py-dnaio/package.py +++ b/var/spack/repos/builtin/packages/py-dnaio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDnaio(PythonPackage): pypi = "dnaio/dnaio-0.3.tar.gz" git = "https://github.com/marcelm/dnaio.git" + license("MIT") + version("0.10.0", sha256="de51a50948f00b864297d74eddb588fbee5ac229855754e77564d18b24619d18") version("0.9.1", sha256="a1a14181995b27197b7e2b8897994a3107c649b9fc2dfe263caff3c455b0d0c4") version("0.4.2", sha256="fa55a45bfd5d9272409b714158fb3a7de5dceac1034a0af84502c7f503ee84f8") diff --git a/var/spack/repos/builtin/packages/py-dnspython/package.py b/var/spack/repos/builtin/packages/py-dnspython/package.py index 339ae45e74955e..5b4dc076109842 100644 --- a/var/spack/repos/builtin/packages/py-dnspython/package.py +++ b/var/spack/repos/builtin/packages/py-dnspython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDnspython(PythonPackage): homepage = "https://www.dnspython.org" pypi = "dnspython/dnspython-2.2.1.tar.gz" + license("ISC") + version("2.2.1", sha256="0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-docker/package.py b/var/spack/repos/builtin/packages/py-docker/package.py index 0fbeecc68b6db3..907c3244e95080 100644 --- a/var/spack/repos/builtin/packages/py-docker/package.py +++ b/var/spack/repos/builtin/packages/py-docker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDocker(PythonPackage): homepage = "https://github.com/docker/docker-py" pypi = "docker/docker-4.2.1.tar.gz" + license("Apache-2.0") + version("6.0.1", sha256="896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97") version("5.0.3", sha256="d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb") version("4.2.1", sha256="380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2") diff --git a/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py b/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py index 8789d325eabecc..ed1788feeabb92 100644 --- a/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py +++ b/var/spack/repos/builtin/packages/py-dockerpy-creds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDockerpyCreds(PythonPackage): homepage = "https://github.com/shin-/dockerpy-creds" url = "https://github.com/shin-/dockerpy-creds/archive/0.4.0.tar.gz" + license("Apache-2.0") + version("0.4.0", sha256="c76c2863c6e9a31b8f70ee5b8b0e5ac6860bfd422d930c04a387599e4272b4b9") version("0.3.0", sha256="3660a5e9fc7c2816ab967e4bdb4802f211e35011357ae612a601d6944721e153") version("0.2.3", sha256="7278a7e3c904ccea4bcc777b991a39cac9d4702bfd7d76b95ff6179500d886c4") diff --git a/var/spack/repos/builtin/packages/py-docopt/package.py b/var/spack/repos/builtin/packages/py-docopt/package.py index 1b15fd8502c16f..bd161f347bc46b 100644 --- a/var/spack/repos/builtin/packages/py-docopt/package.py +++ b/var/spack/repos/builtin/packages/py-docopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDocopt(PythonPackage): homepage = "http://docopt.org/" pypi = "docopt/docopt-0.6.2.tar.gz" + license("MIT") + version("0.6.2", sha256="49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-docstring-parser/package.py b/var/spack/repos/builtin/packages/py-docstring-parser/package.py index 8bd271cc6e0f88..9bd5ed552596d3 100644 --- a/var/spack/repos/builtin/packages/py-docstring-parser/package.py +++ b/var/spack/repos/builtin/packages/py-docstring-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDocstringParser(PythonPackage): homepage = "https://github.com/rr-/docstring_parser" pypi = "docstring-parser/docstring_parser-0.15.tar.gz" + license("MIT") + version("0.15", sha256="48ddc093e8b1865899956fcc03b03e66bb7240c310fac5af81814580c55bf682") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-docstring-to-markdown/package.py b/var/spack/repos/builtin/packages/py-docstring-to-markdown/package.py index 440059e5c39bba..19eb538e6f5bb9 100644 --- a/var/spack/repos/builtin/packages/py-docstring-to-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-docstring-to-markdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDocstringToMarkdown(PythonPackage): maintainers("alecbcs") + license("LGPL-2.1-or-later") + version("0.11", sha256="5b1da2c89d9d0d09b955dec0ee111284ceadd302a938a03ed93f66e09134f9b5") version("0.10", sha256="12f75b0c7b7572defea2d9e24b57ef7ac38c3e26e91c0e5547cfc02b1c168bf6") diff --git a/var/spack/repos/builtin/packages/py-docutils-stubs/package.py b/var/spack/repos/builtin/packages/py-docutils-stubs/package.py index 7f978ae1318c6f..6ca09da95b4e47 100644 --- a/var/spack/repos/builtin/packages/py-docutils-stubs/package.py +++ b/var/spack/repos/builtin/packages/py-docutils-stubs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDocutilsStubs(PythonPackage): homepage = "https://github.com/tk0miya/docutils-stubs" pypi = "docutils-stubs/docutils-stubs-0.0.21.tar.gz" + license("Unlicense") + version("0.0.21", sha256="e0d3d2588a0c0b47bf66b917bf4ff2c100cf4cf77bbe2f518d97b8f4d63e735c") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py index 97ea6034e4e83e..537c0ea2ec4fe3 100644 --- a/var/spack/repos/builtin/packages/py-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-docutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyDocutils(PythonPackage): homepage = "http://docutils.sourceforge.net/" pypi = "docutils/docutils-0.15.2.tar.gz" + license("BSD-3-Clause") + version("0.20.1", sha256="f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b") version("0.19", sha256="33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6") version("0.18.1", sha256="679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06") diff --git a/var/spack/repos/builtin/packages/py-doit/package.py b/var/spack/repos/builtin/packages/py-doit/package.py index aad45a5c2fa6a8..fdd111efcde30c 100644 --- a/var/spack/repos/builtin/packages/py-doit/package.py +++ b/var/spack/repos/builtin/packages/py-doit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDoit(PythonPackage): homepage = "http://pydoit.org/" pypi = "doit/doit-0.36.0.tar.gz" + license("MIT") + version("0.36.0", sha256="71d07ccc9514cb22fe59d98999577665eaab57e16f644d04336ae0b4bae234bc") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dom-toml/package.py b/var/spack/repos/builtin/packages/py-dom-toml/package.py index 54c43de68c0b28..d9bfc1537b04e1 100644 --- a/var/spack/repos/builtin/packages/py-dom-toml/package.py +++ b/var/spack/repos/builtin/packages/py-dom-toml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDomToml(PythonPackage): homepage = "https://github.com/domdfcoding/dom_toml" pypi = "dom_toml/dom_toml-0.6.1.tar.gz" + license("MIT") + version("0.6.1", sha256="a0bfc204ae32c72ed36e526dce56108a3b20741ac3c055207206ce3b2f302868") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-domdf-python-tools/package.py b/var/spack/repos/builtin/packages/py-domdf-python-tools/package.py index d8e5444300fd90..169af9c430ae23 100644 --- a/var/spack/repos/builtin/packages/py-domdf-python-tools/package.py +++ b/var/spack/repos/builtin/packages/py-domdf-python-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDomdfPythonTools(PythonPackage): homepage = "https://github.com/domdfcoding/domdf_python_tools" pypi = "domdf_python_tools/domdf_python_tools-3.6.1.tar.gz" + license("MIT") + version("3.6.1", sha256="acc04563d23bce4d437dd08af6b9bea788328c412772a044d8ca428a7ad861be") depends_on("py-wheel@0.34.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-dominate/package.py b/var/spack/repos/builtin/packages/py-dominate/package.py index d26eb7406237a3..41e0b006b10f38 100644 --- a/var/spack/repos/builtin/packages/py-dominate/package.py +++ b/var/spack/repos/builtin/packages/py-dominate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyDominate(PythonPackage): pypi = "dominate/dominate-2.6.0.tar.gz" # license = "LGPL-3.0" + license("LGPL-3.0-or-later") + version("2.6.0", sha256="76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4") depends_on("python@2.7:2,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dotnetcore2/package.py b/var/spack/repos/builtin/packages/py-dotnetcore2/package.py index da7f0bf6cc85c3..901f10bcc33307 100644 --- a/var/spack/repos/builtin/packages/py-dotnetcore2/package.py +++ b/var/spack/repos/builtin/packages/py-dotnetcore2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-downhill/package.py b/var/spack/repos/builtin/packages/py-downhill/package.py index 47f3b6c552c2c8..26fdfb33648a50 100644 --- a/var/spack/repos/builtin/packages/py-downhill/package.py +++ b/var/spack/repos/builtin/packages/py-downhill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDownhill(PythonPackage): homepage = "http://github.com/lmjohns3/downhill" pypi = "downhill/downhill-0.4.0.tar.gz" + license("MIT") + version("0.4.0", sha256="074ad91deb06c05108c67d982ef71ffffb6ede2c77201abc69e332649f823b42") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-doxypypy/package.py b/var/spack/repos/builtin/packages/py-doxypypy/package.py index 2e7907b5ae3b48..3a79802847fd90 100644 --- a/var/spack/repos/builtin/packages/py-doxypypy/package.py +++ b/var/spack/repos/builtin/packages/py-doxypypy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyDoxypypy(PythonPackage): homepage = "https://github.com/Feneric/doxypypy" pypi = "doxypypy/doxypypy-0.8.8.6.tar.gz" + license("GPL-2.0-only") + version("0.8.8.6", sha256="627571455c537eb91d6998d95b32efc3c53562b2dbadafcb17e49593e0dae01b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dpath/package.py b/var/spack/repos/builtin/packages/py-dpath/package.py index 574464c1872c9c..fca145be19fb22 100644 --- a/var/spack/repos/builtin/packages/py-dpath/package.py +++ b/var/spack/repos/builtin/packages/py-dpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDpath(PythonPackage): homepage = "https://github.com/akesterson/dpath-python" pypi = "dpath/dpath-2.0.1.tar.gz" + license("MIT") + version("2.0.1", sha256="bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-drep/package.py b/var/spack/repos/builtin/packages/py-drep/package.py index 5fedf8af06c949..1e86ecef364d0f 100644 --- a/var/spack/repos/builtin/packages/py-drep/package.py +++ b/var/spack/repos/builtin/packages/py-drep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyDrep(PythonPackage): maintainers("MrOlm") + license("MIT") + version("3.4.2", sha256="90d61e40b987cef85b52209720afe15c090d6af8095f5ac8d14354b374007fa7") version("3.4.0", sha256="a6533eb585122c1ee66ae622b1b97450a3e1e493a3c3c1d55e79a580d5c46d40") diff --git a/var/spack/repos/builtin/packages/py-drmaa/package.py b/var/spack/repos/builtin/packages/py-drmaa/package.py index 0b8874a1c788ea..a398eaddb3677d 100644 --- a/var/spack/repos/builtin/packages/py-drmaa/package.py +++ b/var/spack/repos/builtin/packages/py-drmaa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDrmaa(PythonPackage): homepage = "https://github.com/pygridtools/drmaa-python" pypi = "drmaa/drmaa-0.7.9.tar.gz" + license("BSD-3-Clause") + version("0.7.9", sha256="12540cd98afc40d5c0b2f38d7b0e46468d1c45192a2f401f41fc2eda9c9f5542") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dryscrape/package.py b/var/spack/repos/builtin/packages/py-dryscrape/package.py index caed5942dc0361..1e21e166069296 100644 --- a/var/spack/repos/builtin/packages/py-dryscrape/package.py +++ b/var/spack/repos/builtin/packages/py-dryscrape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyDryscrape(PythonPackage): pypi = "dryscrape/dryscrape-1.0.tar.gz" git = "https://github.com/niklasb/dryscrape.git" + license("MIT") + version("develop", branch="master") version("1.0", sha256="a99858786434947266cb81d5634cb1722de48aaf6b9cdffda15b7cd4a8e07340") diff --git a/var/spack/repos/builtin/packages/py-duecredit/package.py b/var/spack/repos/builtin/packages/py-duecredit/package.py index 05f5ccdacb0efc..6134a78a442df8 100644 --- a/var/spack/repos/builtin/packages/py-duecredit/package.py +++ b/var/spack/repos/builtin/packages/py-duecredit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDuecredit(PythonPackage): homepage = "https://github.com/duecredit/duecredit" pypi = "duecredit/duecredit-0.9.1.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("0.9.2", sha256="0e0fd87e9e46ce6c94308e9f780c203fe836d89628404f8bf5af96a7457bed1c") version("0.9.1", sha256="f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8") version("0.6.5", sha256="da3746c24f048e1b2e9bd15c001f0f453a29780ebb9d26367f478a63d15dee9b") diff --git a/var/spack/repos/builtin/packages/py-dulwich/package.py b/var/spack/repos/builtin/packages/py-dulwich/package.py index 73f32c5875ea29..928e7d5eff0209 100644 --- a/var/spack/repos/builtin/packages/py-dulwich/package.py +++ b/var/spack/repos/builtin/packages/py-dulwich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,15 +15,18 @@ class PyDulwich(PythonPackage): homepage = "https://www.dulwich.io" pypi = "dulwich/dulwich-0.20.15.tar.gz" + license("Apache-2.0") + + version("0.21.6", sha256="30fbe87e8b51f3813c131e2841c86d007434d160bd16db586b40d47f31dd05b0") version("0.20.46", sha256="4f0e88ffff5db1523d93d92f1525fe5fa161318ffbaad502c1b9b3be7a067172") version("0.20.44", sha256="10e8d73763dd30c86a99a15ade8bfcf3ab8fe96532cdf497e8cb1d11832352b8") version("0.20.21", sha256="ac764c9a9b80fa61afe3404d5270c5060aa57f7f087b11a95395d3b76f3b71fd") version("0.20.15", sha256="fb1773373ec2af896031f8312af6962a1b8b0176a2de3fb3d84a84ec04498888") version("0.20.14", sha256="21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d") - depends_on("python@3.5.0:", type=("build", "run")) - depends_on("python@3.6.0:", when="@0.20.44:", type=("build", "run")) + depends_on("py-setuptools@61.2:", when="@0.21.6", type="build") depends_on("py-setuptools", type="build") depends_on("py-certifi", when="@:0.20.44", type=("build", "run")) - depends_on("py-urllib3@1.24.1:", type=("build", "run")) depends_on("py-urllib3@1.25:", when="@0.20.46:", type=("build", "run")) + depends_on("py-urllib3@1.24.1:", type=("build", "run")) + depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dunamai/package.py b/var/spack/repos/builtin/packages/py-dunamai/package.py index ea9d2d89312d7d..b3c0e7831b39cf 100644 --- a/var/spack/repos/builtin/packages/py-dunamai/package.py +++ b/var/spack/repos/builtin/packages/py-dunamai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDunamai(PythonPackage): homepage = "https://github.com/mtkennerly/dunamai" pypi = "dunamai/dunamai-1.13.1.tar.gz" + license("MIT") + version("1.18.0", sha256="5200598561ea5ba956a6174c36e402e92206c6a6aa4a93a6c5cb8003ee1e0997") version("1.17.0", sha256="459381b585a1e78e4070f0d38a6afb4d67de2ee95064bf6b0438ec620dde0820") version("1.13.1", sha256="49597bdf653bdacdeb51ec6e0f1d4d2327309376fc83e6f1d42af6e29600515f") diff --git a/var/spack/repos/builtin/packages/py-dvc/package.py b/var/spack/repos/builtin/packages/py-dvc/package.py index f3db3ab7ccfae0..83d53e97a66610 100644 --- a/var/spack/repos/builtin/packages/py-dvc/package.py +++ b/var/spack/repos/builtin/packages/py-dvc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyDvc(PythonPackage): homepage = "https://www.dvc.org" pypi = "dvc/dvc-1.11.10.tar.gz" + license("Apache-2.0") + version("2.1.0", sha256="46cfbf0db27107fb3a2d5c643e3a948bb24539bf165ef70e77ce64283959e481") version("1.11.10", sha256="6b53ebf1bd5619836f131181402bb21f7b44109166e9db8f8d6a0d8c7ce9458d") version("1.11.6", sha256="41ba76c51c6142b28dae3aab039cb12423ba52fed6bd2a838f8308f315cfc20b") diff --git a/var/spack/repos/builtin/packages/py-dxchange/package.py b/var/spack/repos/builtin/packages/py-dxchange/package.py index 6e9f6956c52890..d9a15782088d30 100644 --- a/var/spack/repos/builtin/packages/py-dxchange/package.py +++ b/var/spack/repos/builtin/packages/py-dxchange/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dxfile/package.py b/var/spack/repos/builtin/packages/py-dxfile/package.py index 7c6947ba866a1f..da08a1d5f84653 100644 --- a/var/spack/repos/builtin/packages/py-dxfile/package.py +++ b/var/spack/repos/builtin/packages/py-dxfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-dynaconf/package.py b/var/spack/repos/builtin/packages/py-dynaconf/package.py index 64c38a87683a8c..7cea1b43821050 100644 --- a/var/spack/repos/builtin/packages/py-dynaconf/package.py +++ b/var/spack/repos/builtin/packages/py-dynaconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyDynaconf(PythonPackage): homepage = "https://github.com/dynaconf/dynaconf" pypi = "dynaconf/dynaconf-3.2.2.tar.gz" + license("MIT") + version("3.2.2", sha256="2f98ec85a2b8edb767b3ed0f82c6d605d30af116ce4622932a719ba70ff152fc") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-dynim/package.py b/var/spack/repos/builtin/packages/py-dynim/package.py index 9adfde6e9f9b4d..1edce62c2db6bb 100644 --- a/var/spack/repos/builtin/packages/py-dynim/package.py +++ b/var/spack/repos/builtin/packages/py-dynim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyDynim(PythonPackage): maintainers("lpottier") + license("MIT") + version("main", branch="main", submodules=True) version("0.1", commit="aebd780376e7998f7f8b92ba5fdd320bdba7b0d3") diff --git a/var/spack/repos/builtin/packages/py-earthengine-api/package.py b/var/spack/repos/builtin/packages/py-earthengine-api/package.py index e910119f2b73f7..b17c7014eb7cb2 100644 --- a/var/spack/repos/builtin/packages/py-earthengine-api/package.py +++ b/var/spack/repos/builtin/packages/py-earthengine-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEarthengineApi(PythonPackage): homepage = "https://github.com/google/earthengine-api" pypi = "earthengine-api/earthengine-api-0.1.186.tar.gz" + license("Apache-2.0") + version("0.1.344", sha256="bc5a270b8296aaae8574e68dfd93fe878bc5fbe77d1c41f90bcb5e5b830ca5c8") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py index 384ecd5a84ae21..5589a9186c884e 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyEasybuildEasyblocks(PythonPackage): pypi = "easybuild-easyblocks/easybuild-easyblocks-4.0.0.tar.gz" maintainers("boegel") + license("GPL-2.0-only") + version("4.7.0", sha256="c23e81cbaa3e4fa5ab1bb8b2db759332867d61110bf4ec34763ea170780f0655") version("4.0.0", sha256="a0fdef6c33c786e323bde1b28bab942fd8e535c26842877d705e692e85b31b07") diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py index 416dfddaaa9cf7..3b8e299beb2f0e 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyEasybuildEasyconfigs(PythonPackage): pypi = "easybuild-easyconfigs/easybuild-easyconfigs-4.0.0.tar.gz" maintainers("boegel") + license("GPL-2.0-only") + version("4.7.0", sha256="c688f14a3b0dce45c6cc90d746f05127dbf7368bd9b5873ce50757992d8e6261") version("4.0.0", sha256="90d4e8f8abb11e7ae2265745bbd1241cd69d02570e9b4530175c4b2e2aba754e") diff --git a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py index 6a3b91a0cc8cbc..7f18df00f3a460 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyEasybuildFramework(PythonPackage): pypi = "easybuild-framework/easybuild-framework-4.0.0.tar.gz" maintainers("boegel") + license("GPL-2.0-or-later") + version("4.7.0", sha256="ea51c3cb88fca27daadd2fb55ee31f5f51fc60c4e3519ee9d275954540312df8") version("4.0.0", sha256="f5c40345cc8b9b5750f53263ade6c9c3a8cd3dfab488d58f76ac61a8ca7c5a77") diff --git a/var/spack/repos/builtin/packages/py-eccodes/package.py b/var/spack/repos/builtin/packages/py-eccodes/package.py index 7609ae91ee41f8..107cddc03e624f 100644 --- a/var/spack/repos/builtin/packages/py-eccodes/package.py +++ b/var/spack/repos/builtin/packages/py-eccodes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEccodes(PythonPackage): homepage = "https://github.com/ecmwf/eccodes-python" pypi = "eccodes/eccodes-1.3.2.tar.gz" + license("Apache-2.0") + version("1.5.0", sha256="e70c8f159140c343c215fd608ddf533be652ff05ad2ff17243c7b66cf92127fa") version("1.4.2", sha256="63fa80a1d1b445904f486bc396a6a6605df029f4e215acc28ceb1a1ff5eb664f") version("1.3.2", sha256="f282adfdc1bc658356163c9cef1857d4b2bae99399660d3d4fcb145a52d3b2a6") diff --git a/var/spack/repos/builtin/packages/py-ecdsa/package.py b/var/spack/repos/builtin/packages/py-ecdsa/package.py index 57e090599d9803..7fe8932b70077a 100644 --- a/var/spack/repos/builtin/packages/py-ecdsa/package.py +++ b/var/spack/repos/builtin/packages/py-ecdsa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEcdsa(PythonPackage): homepage = "https://github.com/warner/python-ecdsa" pypi = "ecdsa/ecdsa-0.15.tar.gz" + license("MIT") + version("0.15", sha256="8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277") version("0.13.2", sha256="5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884") diff --git a/var/spack/repos/builtin/packages/py-ecos/package.py b/var/spack/repos/builtin/packages/py-ecos/package.py index ca26f590d36704..d1e44f9ff1eb7a 100644 --- a/var/spack/repos/builtin/packages/py-ecos/package.py +++ b/var/spack/repos/builtin/packages/py-ecos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyEcos(PythonPackage): maintainers("meyersbs") + license("GPL-3.0-or-later") + version("2.0.12", sha256="f48816d73b87ae325556ea537b7c8743187311403c80e3832035224156337c4e") version( "2.0.7.post1", sha256="83e90f42b3f32e2a93f255c3cfad2da78dbd859119e93844c45d2fca20bdc758" diff --git a/var/spack/repos/builtin/packages/py-edam-ontology/package.py b/var/spack/repos/builtin/packages/py-edam-ontology/package.py index bc7e5f4c3460a3..d852f233447990 100644 --- a/var/spack/repos/builtin/packages/py-edam-ontology/package.py +++ b/var/spack/repos/builtin/packages/py-edam-ontology/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEdamOntology(PythonPackage): homepage = "https://github.com/edamontology/edam-ontology.py" pypi = "edam-ontology/edam-ontology-1.25.2.tar.gz" + license("MIT") + version("1.25.2", sha256="608c062ecb1ec260637645f73b4157d5abd47b19058a4ccca3bf292e373b8e06") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-edffile/package.py b/var/spack/repos/builtin/packages/py-edffile/package.py index ce8941b25c303f..c4e24b6e010d42 100644 --- a/var/spack/repos/builtin/packages/py-edffile/package.py +++ b/var/spack/repos/builtin/packages/py-edffile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEdffile(PythonPackage): homepage = "https://github.com/vasole/pymca/blob/master/PyMca5/PyMcaIO/EdfFile.py" git = "https://github.com/conda-forge/edffile-feedstock.git" + license("BSD-3-Clause") + version("5.0.0", commit="be5ab4199db9f8209c59e31874934b8536b52301") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-editables/package.py b/var/spack/repos/builtin/packages/py-editables/package.py index 260f1413cbc09a..990b2db11fd668 100644 --- a/var/spack/repos/builtin/packages/py-editables/package.py +++ b/var/spack/repos/builtin/packages/py-editables/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-editdistance/package.py b/var/spack/repos/builtin/packages/py-editdistance/package.py index 3b1157937fa921..ca627c31612796 100644 --- a/var/spack/repos/builtin/packages/py-editdistance/package.py +++ b/var/spack/repos/builtin/packages/py-editdistance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyEditdistance(PythonPackage): maintainers("meyersbs") + license("MIT") + # PyPI tarball for version 0.6.2 missing bycython.pyx file # https://github.com/roy-ht/editdistance/issues/94#issuecomment-1426279375 version("0.6.2", tag="v0.6.2", commit="3f5a5b0299f36662349df0917352a42c620e3dd4") diff --git a/var/spack/repos/builtin/packages/py-edlib/package.py b/var/spack/repos/builtin/packages/py-edlib/package.py index e2bb9cbdb6dbdc..f9f070eb7870f7 100644 --- a/var/spack/repos/builtin/packages/py-edlib/package.py +++ b/var/spack/repos/builtin/packages/py-edlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyEdlib(PythonPackage): homepage = "https://pypi.org/project/edlib/" pypi = "edlib/edlib-1.3.9.tar.gz" + license("MIT") + version("1.3.9", sha256="64c3dfab3ebe3e759565a0cc71eb4df23cf3ce1713fd558af3c473dddc2a3766") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-efel/package.py b/var/spack/repos/builtin/packages/py-efel/package.py index a33749b9af75eb..2a1282c38912d2 100644 --- a/var/spack/repos/builtin/packages/py-efel/package.py +++ b/var/spack/repos/builtin/packages/py-efel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyEfel(PythonPackage): homepage = "https://github.com/BlueBrain/eFEL" pypi = "efel/efel-3.0.80.tar.gz" + license("LGPL-3.0-or-later") + version("5.2.0", sha256="ed2c5efe22a4c703a4d9e47775b939009e1456713ac896898ebabf177c60b1dc") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py b/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py index 435c2d276d1a10..6af43e0ce41642 100644 --- a/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-efficientnet-pytorch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-eg/package.py b/var/spack/repos/builtin/packages/py-eg/package.py index 7bb270e06d8efc..84c13009c44f6b 100644 --- a/var/spack/repos/builtin/packages/py-eg/package.py +++ b/var/spack/repos/builtin/packages/py-eg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEg(PythonPackage): homepage = "https://github.com/srsudar/eg" url = "https://github.com/srsudar/eg/archive/v1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="dfeff9f8c16afec1b621c9484c8cdb670dbc69ab40590d16a9becb740ea289f3") version("1.1.1", sha256="99020af6ff24742b3eb93a15a289f36156fdb93abdbec50b614b982b1ba9c399") version("1.1.0", sha256="41316c79e8f7a999e82057ac54c6d57c58a50cd37dc91e172b634998f61b1b86") diff --git a/var/spack/repos/builtin/packages/py-einops/package.py b/var/spack/repos/builtin/packages/py-einops/package.py index d5d8eedebe6cf4..7bb19aafbf3b63 100644 --- a/var/spack/repos/builtin/packages/py-einops/package.py +++ b/var/spack/repos/builtin/packages/py-einops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyEinops(PythonPackage): homepage = "https://github.com/arogozhnikov/einops" pypi = "einops/einops-0.3.2.tar.gz" + license("MIT") + version("0.7.0", sha256="b2b04ad6081a3b227080c9bf5e3ace7160357ff03043cd66cc5b2319eb7031d1") version("0.6.1", sha256="f95f8d00f4ded90dbc4b19b6f98b177332614b0357dde66997f3ae5d474dc8c8") version("0.6.0", sha256="6f6c78739316a2e3ccbce8052310497e69da092935e4173f2e76ec4e3a336a35") diff --git a/var/spack/repos/builtin/packages/py-elastic-transport/package.py b/var/spack/repos/builtin/packages/py-elastic-transport/package.py index d43288b40f7ffc..4d25878e1ebaf4 100644 --- a/var/spack/repos/builtin/packages/py-elastic-transport/package.py +++ b/var/spack/repos/builtin/packages/py-elastic-transport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-elasticsearch-dsl/package.py b/var/spack/repos/builtin/packages/py-elasticsearch-dsl/package.py index d039aec89c5a5f..57d4d3454fb2f4 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch-dsl/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch-dsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyElasticsearchDsl(PythonPackage): homepage = "https://github.com/elastic/elasticsearch-dsl-py" pypi = "elasticsearch-dsl/elasticsearch-dsl-7.4.0.tar.gz" + license("Apache-2.0") + version("7.4.0", sha256="c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-elasticsearch/package.py b/var/spack/repos/builtin/packages/py-elasticsearch/package.py index 0f023ee275b778..4f34e01ee9fc2b 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyElasticsearch(PythonPackage): homepage = "https://github.com/elastic/elasticsearch-py" pypi = "elasticsearch/elasticsearch-5.2.0.tar.gz" + license("Apache-2.0") + version("8.6.2", sha256="084458e84caa91e3ad807b68aa82c022e785bead853a3b125641a25e894a1d47") version("7.6.0", sha256="d228b2d37ac0865f7631335268172dbdaa426adec1da3ed006dddf05134f89c8") version("7.5.1", sha256="2a0ca516378ae9b87ac840e7bb529ec508f3010360dd9feed605dff2a898aff5") diff --git a/var/spack/repos/builtin/packages/py-elephant/package.py b/var/spack/repos/builtin/packages/py-elephant/package.py index 41f94db3a5eeac..2b8a0abfc101f7 100644 --- a/var/spack/repos/builtin/packages/py-elephant/package.py +++ b/var/spack/repos/builtin/packages/py-elephant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,12 @@ class PyElephant(PythonPackage): # list of GitHub accounts to notify when the package is updated. maintainers("Moritz-Alexander-Kern") + license("BSD-3-Clause") + + 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 +34,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-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-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-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-nbsphinx@0.5.0:", 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-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-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-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-matplotlib@3.1.0:", type=("build", "run"), when="@0.8.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-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-matplotlib@3.1.0:", type=("build", "run"), when="@0.8.0+docs") diff --git a/var/spack/repos/builtin/packages/py-email-validator/package.py b/var/spack/repos/builtin/packages/py-email-validator/package.py index 463fba06d3f7a6..130824d5c3fcd6 100644 --- a/var/spack/repos/builtin/packages/py-email-validator/package.py +++ b/var/spack/repos/builtin/packages/py-email-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEmailValidator(PythonPackage): homepage = "https://github.com/JoshData/python-email-validator" pypi = "email_validator/email_validator-1.3.1.tar.gz" + license("CC0-1.0") + version("1.3.1", sha256="d178c5c6fa6c6824e9b04f199cf23e79ac15756786573c190d2ad13089411ad2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py index 089aed6c457ad6..a5d85ad92fe93a 100644 --- a/var/spack/repos/builtin/packages/py-emcee/package.py +++ b/var/spack/repos/builtin/packages/py-emcee/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEmcee(PythonPackage): homepage = "https://dan.iel.fm/emcee/current/" pypi = "emcee/emcee-2.2.1.tar.gz" + license("MIT") + version("3.1.1", sha256="48ffc6a7f5c51760b7a836056184c7286a9959ef81b45b977b02794f1210fb5c") version("3.0.2", sha256="035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388") version("2.2.1", sha256="b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172") diff --git a/var/spack/repos/builtin/packages/py-emoji/package.py b/var/spack/repos/builtin/packages/py-emoji/package.py index 23bc783f0e62dd..1810892314dba9 100644 --- a/var/spack/repos/builtin/packages/py-emoji/package.py +++ b/var/spack/repos/builtin/packages/py-emoji/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEmoji(PythonPackage): homepage = "https://github.com/carpedm20/emoji/" pypi = "emoji/emoji-1.5.0.tar.gz" + license("BSD-3-Clause") + version("1.5.0", sha256="2eddd062f940924fb25a3108d84d77dc571927d91a419b4c30f37e253c791b19") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-empy/package.py b/var/spack/repos/builtin/packages/py-empy/package.py index 8dd83e6bb967ac..404b68de4ff9aa 100644 --- a/var/spack/repos/builtin/packages/py-empy/package.py +++ b/var/spack/repos/builtin/packages/py-empy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEmpy(PythonPackage): homepage = "http://www.alcyone.com/software/empy" pypi = "empy/empy-3.3.4.tar.gz" + license("Ruby") + version("3.3.4", sha256="73ac49785b601479df4ea18a7c79bc1304a8a7c34c02b9472cf1206ae88f01b3") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index 87ceeae4fc6629..967326ba7e34b1 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEntrypoints(PythonPackage): homepage = "https://github.com/takluyver/entrypoints" pypi = "entrypoints/entrypoints-0.2.3.tar.gz" + license("MIT") + version("0.4", sha256="b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4") version("0.3", sha256="c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451") version("0.2.3", sha256="d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f") diff --git a/var/spack/repos/builtin/packages/py-enum-tools/package.py b/var/spack/repos/builtin/packages/py-enum-tools/package.py index e8bef99f69b127..00e5e19b8425f7 100644 --- a/var/spack/repos/builtin/packages/py-enum-tools/package.py +++ b/var/spack/repos/builtin/packages/py-enum-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEnumTools(PythonPackage): homepage = "https://github.com/domdfcoding/enum_tools" pypi = "enum_tools/enum_tools-0.10.0.tar.gz" + license("LGPL-3.0-or-later") + version("0.10.0", sha256="777dc3cfb4314780bb9ca2460b518be58c3f29e13bd77b33badead4c2c136976") depends_on("py-whey", type="build") diff --git a/var/spack/repos/builtin/packages/py-envisage/package.py b/var/spack/repos/builtin/packages/py-envisage/package.py index 649a999d091c36..22f0272834a8e8 100644 --- a/var/spack/repos/builtin/packages/py-envisage/package.py +++ b/var/spack/repos/builtin/packages/py-envisage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyEnvisage(PythonPackage): homepage = "https://github.com/enthought/envisage" pypi = "envisage/envisage-4.9.2.tar.gz" + license("BSD-3-Clause") + version("6.0.1", sha256="8864c29aa344f7ac26eeb94788798f2d0cc791dcf95c632da8d79ebc580e114c") version("4.9.2", sha256="ed9580ac6ea17b333f1cce5b94656aed584798d56d8bd364f996a06fe1ac32eb") diff --git a/var/spack/repos/builtin/packages/py-ephem/package.py b/var/spack/repos/builtin/packages/py-ephem/package.py index 2d6cca20ac9a09..74025e66cbaf24 100644 --- a/var/spack/repos/builtin/packages/py-ephem/package.py +++ b/var/spack/repos/builtin/packages/py-ephem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEphem(PythonPackage): homepage = "https://rhodesmill.org/pyephem/" url = "https://github.com/brandon-rhodes/pyephem/archive/v3.7.7.1.tar.gz" + license("MIT") + version("3.7.7.1", sha256="d9d05d85c0d38a79169acaef25964ac9df2d808f0d833354545b9ef681ff584d") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-eprosima-fastdds/package.py b/var/spack/repos/builtin/packages/py-eprosima-fastdds/package.py index bf01f4edc45696..1d65cd5f6c97b3 100644 --- a/var/spack/repos/builtin/packages/py-eprosima-fastdds/package.py +++ b/var/spack/repos/builtin/packages/py-eprosima-fastdds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyEprosimaFastdds(CMakePackage, PythonExtension): homepage = "https://www.eprosima.com/" url = "https://github.com/eProsima/Fast-DDS-python/archive/v1.2.2.tar.gz" + license("Apache-2.0") + version("1.2.2", sha256="78c53739a66544b8c91d0016560c267e11bd7fdaf727b3bfbffd44ae65c93c62") depends_on("cmake@3.15:", type="build") diff --git a/var/spack/repos/builtin/packages/py-epydoc/package.py b/var/spack/repos/builtin/packages/py-epydoc/package.py index d9a40e81077be9..903d13c4c77af2 100644 --- a/var/spack/repos/builtin/packages/py-epydoc/package.py +++ b/var/spack/repos/builtin/packages/py-epydoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEpydoc(PythonPackage): pypi = "epydoc/epydoc-3.0.1.tar.gz" + license("MIT") + version("3.0.1", sha256="c81469b853fab06ec42b39e35dd7cccbe9938dfddef324683d89c1e5176e48f2") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-equation/package.py b/var/spack/repos/builtin/packages/py-equation/package.py index 337e997c9c3036..a929acfc5da13b 100644 --- a/var/spack/repos/builtin/packages/py-equation/package.py +++ b/var/spack/repos/builtin/packages/py-equation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index ce209e534af6db..c189bb45405f3a 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class PyEspresso(CMakePackage): git = "https://github.com/espressomd/espresso.git" url = "https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz" + license("GPL-3.0-only") + version("develop", branch="python") version("4.0.2", sha256="89878ab44a58e90b69d56368e961b8ca13d9307f8d4b282967a1f3071a62c740") version("4.0.1", sha256="17b7268eeba652a77f861bc534cdd05d206e7641d203a9dd5029b44bd422304b") diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 6487641b9b3623..ecb9512620cb3e 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyEspressopp(CMakePackage): url = "https://github.com/espressopp/espressopp/tarball/v3.0.0" git = "https://github.com/espressopp/espressopp.git" + license("GPL-3.0-or-later") + version("master", branch="master") version("3.0.0", sha256="63518e768a98179ad5ef3be96eabaa4d38063b34962e2278db7d59ed2bb8a32e") diff --git a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py index 7a3194581dd4ce..81eda2682cd2f0 100644 --- a/var/spack/repos/builtin/packages/py-et-xmlfile/package.py +++ b/var/spack/repos/builtin/packages/py-et-xmlfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEtXmlfile(PythonPackage): homepage = "https://et-xmlfile.readthedocs.io/en/latest/" pypi = "et_xmlfile/et_xmlfile-1.0.1.tar.gz" + license("MIT") + version("1.0.1", sha256="614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ete3/package.py b/var/spack/repos/builtin/packages/py-ete3/package.py index 745e430610cd66..07a5711870eb0b 100644 --- a/var/spack/repos/builtin/packages/py-ete3/package.py +++ b/var/spack/repos/builtin/packages/py-ete3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyEte3(PythonPackage): maintainers("snehring") + license("GPL-3.0-only") + version("3.1.2", sha256="4fc987b8c529889d6608fab1101f1455cb5cbd42722788de6aea9c7d0a8e59e9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-etelemetry/package.py b/var/spack/repos/builtin/packages/py-etelemetry/package.py index 8e32d9f72f0f35..f88b749550413c 100644 --- a/var/spack/repos/builtin/packages/py-etelemetry/package.py +++ b/var/spack/repos/builtin/packages/py-etelemetry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEtelemetry(PythonPackage): homepage = "https://github.com/sensein/etelemetry-client" url = "https://github.com/sensein/etelemetry-client/archive/refs/tags/v0.2.2.tar.gz" + license("Apache-2.0") + version("0.3.0", sha256="5f710fdb17ec02f93be29d234b33c1c62ad641320d1b4047e61044679018de03") version("0.2.2", sha256="bfec416552d248ad0f50b90ba5ff015e825ad70e4a87f7a06cc7da6d19152897") diff --git a/var/spack/repos/builtin/packages/py-etils/package.py b/var/spack/repos/builtin/packages/py-etils/package.py index 6fd0d1887ffbea..59f1e0386d1ce3 100644 --- a/var/spack/repos/builtin/packages/py-etils/package.py +++ b/var/spack/repos/builtin/packages/py-etils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyEtils(PythonPackage): homepage = "https://github.com/google/etils" pypi = "etils/etils-0.9.0.tar.gz" + license("Apache-2.0") + version("0.9.0", sha256="489103e9e499a566765c60458ee15d185cf0065f2060a4d16a68f8f46962ed0d") variant("epath", default=False, description="with epath module") diff --git a/var/spack/repos/builtin/packages/py-eventlet/package.py b/var/spack/repos/builtin/packages/py-eventlet/package.py index ee98c59cc7d734..03e440844d37a2 100644 --- a/var/spack/repos/builtin/packages/py-eventlet/package.py +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyEventlet(PythonPackage): homepage = "https://github.com/eventlet/eventlet" url = "https://github.com/eventlet/eventlet/releases/download/v0.22.0/eventlet-0.22.0.tar.gz" + license("MIT") + version("0.22.0", sha256="6d22464f448fdf144a9d566c157299d686bbe324554dd7729df9ccd05ca66439") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-exarl/package.py b/var/spack/repos/builtin/packages/py-exarl/package.py index 0506a21778cbcf..a4fde23a02cef4 100644 --- a/var/spack/repos/builtin/packages/py-exarl/package.py +++ b/var/spack/repos/builtin/packages/py-exarl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyExarl(PythonPackage): maintainers("cmahrens") + license("BSD-3-Clause") + version("master", branch="master") version("develop", branch="develop") version("update-spack", branch="update-spack") diff --git a/var/spack/repos/builtin/packages/py-exceptiongroup/package.py b/var/spack/repos/builtin/packages/py-exceptiongroup/package.py index 745835f0a2a087..7dfb5da6389cba 100644 --- a/var/spack/repos/builtin/packages/py-exceptiongroup/package.py +++ b/var/spack/repos/builtin/packages/py-exceptiongroup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-execnet/package.py b/var/spack/repos/builtin/packages/py-execnet/package.py index 7509e07d3fa398..bc63402341eab8 100644 --- a/var/spack/repos/builtin/packages/py-execnet/package.py +++ b/var/spack/repos/builtin/packages/py-execnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyExecnet(PythonPackage): homepage = "https://codespeak.net/execnet" pypi = "execnet/execnet-1.7.1.tar.gz" + license("MIT") + version("1.9.0", sha256="8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5") version("1.7.1", sha256="cacb9df31c9680ec5f95553976c4da484d407e85e41c83cb812aa014f0eddc50") version("1.4.1", sha256="f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6") diff --git a/var/spack/repos/builtin/packages/py-executing/package.py b/var/spack/repos/builtin/packages/py-executing/package.py index f6e6838c8b5ee8..022d2f323ae127 100644 --- a/var/spack/repos/builtin/packages/py-executing/package.py +++ b/var/spack/repos/builtin/packages/py-executing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyExecuting(PythonPackage): homepage = "https://github.com/alexmojaki/executing" pypi = "executing/executing-0.8.2.tar.gz" + license("MIT") + version("1.2.0", sha256="19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107") version("1.1.0", sha256="2c2c07d1ec4b2d8f9676b25170f1d8445c0ee2eb78901afb075a4b8d83608c6a") version("1.0.0", sha256="98daefa9d1916a4f0d944880d5aeaf079e05585689bebd9ff9b32e31dd5e1017") diff --git a/var/spack/repos/builtin/packages/py-exhale/package.py b/var/spack/repos/builtin/packages/py-exhale/package.py index 8c6d3b0edf9dbf..564213cc45ae0a 100644 --- a/var/spack/repos/builtin/packages/py-exhale/package.py +++ b/var/spack/repos/builtin/packages/py-exhale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyExhale(PythonPackage): maintainers("svenevs") + license("BSD-3-Clause") + version("0.3.6", sha256="ab41be313e1236bd4386e4696fb35f37ce8103c2059cf8d1f083da5411bb74d7") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-exifread/package.py b/var/spack/repos/builtin/packages/py-exifread/package.py index 54cb72c0030e5a..023480b6a90178 100644 --- a/var/spack/repos/builtin/packages/py-exifread/package.py +++ b/var/spack/repos/builtin/packages/py-exifread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyExifread(PythonPackage): homepage = "https://github.com/ianare/exif-py" pypi = "ExifRead/ExifRead-2.3.2.tar.gz" + license("BSD-3-Clause") + version("3.0.0", sha256="0ac5a364169dbdf2bd62f94f5c073970ab6694a3166177f5e448b10c943e2ca4") version("2.3.2", sha256="a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766") diff --git a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py index 83f90f595d6f4c..cbb4fb6d430671 100644 --- a/var/spack/repos/builtin/packages/py-exodus-bundler/package.py +++ b/var/spack/repos/builtin/packages/py-exodus-bundler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyExodusBundler(PythonPackage): homepage = "https://github.com/intoli/exodus" pypi = "exodus-bundler/exodus-bundler-2.0.2.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("2.0.2", sha256="4e896a2034b94cf7b4fb33d86a68e29a7d3b08e57541e444db34dddc6ac1ef68") depends_on("musl", type="run", when="%apple-clang") diff --git a/var/spack/repos/builtin/packages/py-expecttest/package.py b/var/spack/repos/builtin/packages/py-expecttest/package.py index 60857d5a9bdb8a..f71c85b0992a9d 100644 --- a/var/spack/repos/builtin/packages/py-expecttest/package.py +++ b/var/spack/repos/builtin/packages/py-expecttest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyExpecttest(PythonPackage): homepage = "https://github.com/ezyang/expecttest" pypi = "expecttest/expecttest-0.1.6.tar.gz" + license("MIT") + version("0.1.6", sha256="fd49563b6703b9c060a0bc946dfafc62bad74898867432192927eb1e5f9d8952") depends_on("python@:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-extension-helpers/package.py b/var/spack/repos/builtin/packages/py-extension-helpers/package.py index 025a8bb5d871f6..298d78a8b259fa 100644 --- a/var/spack/repos/builtin/packages/py-extension-helpers/package.py +++ b/var/spack/repos/builtin/packages/py-extension-helpers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyExtensionHelpers(PythonPackage): homepage = "https://github.com/astropy/astropy-helpers" pypi = "extension-helpers/extension-helpers-0.1.tar.gz" + license("BSD-3-Clause") + version("0.1", sha256="ac8a6fe91c6d98986a51a9f08ca0c7945f8fd70d95b662ced4040ae5eb973882") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-extras/package.py b/var/spack/repos/builtin/packages/py-extras/package.py index 6ce546f2af2fa2..a1363ae2d1e7fe 100644 --- a/var/spack/repos/builtin/packages/py-extras/package.py +++ b/var/spack/repos/builtin/packages/py-extras/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyExtras(PythonPackage): homepage = "https://github.com/testing-cabal/extras" pypi = "extras/extras-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ez-setup/package.py b/var/spack/repos/builtin/packages/py-ez-setup/package.py index defdaa098c979f..8021a922d30552 100644 --- a/var/spack/repos/builtin/packages/py-ez-setup/package.py +++ b/var/spack/repos/builtin/packages/py-ez-setup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-f90nml/package.py b/var/spack/repos/builtin/packages/py-f90nml/package.py index 3e018f79396d49..3374978c1e4893 100644 --- a/var/spack/repos/builtin/packages/py-f90nml/package.py +++ b/var/spack/repos/builtin/packages/py-f90nml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-f90wrap/package.py b/var/spack/repos/builtin/packages/py-f90wrap/package.py index 1fdffbe60c84d9..705cddc2e8c879 100644 --- a/var/spack/repos/builtin/packages/py-f90wrap/package.py +++ b/var/spack/repos/builtin/packages/py-f90wrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyF90wrap(PythonPackage): homepage = "https://github.com/jameskermode/f90wrap" pypi = "f90wrap/f90wrap-0.2.3.tar.gz" + license("LGPL-3.0-only") + version("0.2.6", sha256="e0748eb5e288be7f47829a272fc230373469fb40afccddf91e9973c56da43dd4") version("0.2.3", sha256="5577ea92934c5aad378df21fb0805b5fb433d6f2b8b9c1bf1a9ec1e3bf842cff") diff --git a/var/spack/repos/builtin/packages/py-fabric/package.py b/var/spack/repos/builtin/packages/py-fabric/package.py index 74c68d5de29bb2..d674d0e2228e7b 100644 --- a/var/spack/repos/builtin/packages/py-fabric/package.py +++ b/var/spack/repos/builtin/packages/py-fabric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFabric(PythonPackage): homepage = "http://fabfile.org/" pypi = "fabric/fabric-2.5.0.tar.gz" + license("BSD-2-Clause") + version("2.5.0", sha256="24842d7d51556adcabd885ac3cf5e1df73fc622a1708bf3667bf5927576cdfa6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fabric3/package.py b/var/spack/repos/builtin/packages/py-fabric3/package.py index d07b76cd9fd62a..9884db5821875e 100644 --- a/var/spack/repos/builtin/packages/py-fabric3/package.py +++ b/var/spack/repos/builtin/packages/py-fabric3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFabric3(PythonPackage): homepage = "https://github.com/mathiasertl/fabric/" pypi = "fabric3/Fabric3-1.14.post1.tar.gz" + license("BSD-2-Clause") + version( "1.14.post1", sha256="647e485ec83f30b587862f92374d6affc217f3d79819d1d7f512e42e7ae51e81" ) diff --git a/var/spack/repos/builtin/packages/py-fairscale/package.py b/var/spack/repos/builtin/packages/py-fairscale/package.py index f740269beb921a..15aee19a6270fe 100644 --- a/var/spack/repos/builtin/packages/py-fairscale/package.py +++ b/var/spack/repos/builtin/packages/py-fairscale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFairscale(PythonPackage): homepage = "https://github.com/facebookresearch/fairscale" pypi = "fairscale/fairscale-0.4.13.tar.gz" + license("Apache-2.0") + version("0.4.13", sha256="1b797825c427f5dba92253fd0d8daa574e8bd651a2423497775fab1b30cfb768") version("0.4.4", sha256="7719898743dc58c04a2294c896ee6308c92ccb3af9e10632b2a62f77cb689357") diff --git a/var/spack/repos/builtin/packages/py-faker/package.py b/var/spack/repos/builtin/packages/py-faker/package.py index 7bc9754a53ccc2..4ede2fcc415b7d 100644 --- a/var/spack/repos/builtin/packages/py-faker/package.py +++ b/var/spack/repos/builtin/packages/py-faker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFaker(PythonPackage): homepage = "https://github.com/joke2k/faker" pypi = "Faker/Faker-9.8.2.tar.gz" + license("MIT") + version("9.8.2", sha256="393bd1b5becf3ccbc04a4f0f13da7e437914b24cafd1a4d8b71b5fecff54fb34") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-falcon/package.py b/var/spack/repos/builtin/packages/py-falcon/package.py index 5cdc1d3f9475a7..c6475fd12b8b59 100644 --- a/var/spack/repos/builtin/packages/py-falcon/package.py +++ b/var/spack/repos/builtin/packages/py-falcon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFalcon(PythonPackage): homepage = "https://github.com/falconry/falcon" url = "https://github.com/falconry/falcon/archive/3.0.0a2.tar.gz" + license("Apache-2.0") + version("3.0.0a2", sha256="2e8471cf07df33a1b9929de8953aeb301c64a963c86d770ef296ce4dc8af34cd") version("3.0.0a1", sha256="cdc47996f664fa8c97041a2a4a586a472442654ee7e86075bb72c720744150ca") version("2.0.0rc4", sha256="30bb6a982cf3ab273b9605c9d2ab1e7d01323fee13fe53a485befd92186c3665") diff --git a/var/spack/repos/builtin/packages/py-fallocate/package.py b/var/spack/repos/builtin/packages/py-fallocate/package.py index 28ee1944e6589c..ad9927e94f886b 100644 --- a/var/spack/repos/builtin/packages/py-fallocate/package.py +++ b/var/spack/repos/builtin/packages/py-fallocate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFallocate(PythonPackage): homepage = "https://github.com/trbs/fallocate" pypi = "fallocate/fallocate-1.6.4.tar.gz" + license("PSF-2.0") + version("1.6.4", sha256="85ebeb2786761fbe80d88c52590a610bd3425fc89e188c208a3f261a5bd6acb3") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-fastai/package.py b/var/spack/repos/builtin/packages/py-fastai/package.py index 8365bec067a702..8c2d99aa204edb 100644 --- a/var/spack/repos/builtin/packages/py-fastai/package.py +++ b/var/spack/repos/builtin/packages/py-fastai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyFastai(PythonPackage): homepage = "https://github.com/fastai/fastai/tree/master/" pypi = "fastai/fastai-2.5.3.tar.gz" + license("Apache-2.0") + version("2.5.3", sha256="0cae50617979b052f0ed7337800e6814ee346b792203cf48305709c935e8eeb7") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fastaindex/package.py b/var/spack/repos/builtin/packages/py-fastaindex/package.py index 00d646b4be1fa4..200f3eab62e097 100644 --- a/var/spack/repos/builtin/packages/py-fastaindex/package.py +++ b/var/spack/repos/builtin/packages/py-fastaindex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFastaindex(PythonPackage): homepage = "https://github.com/lpryszcz/FastaIndex" pypi = "FastaIndex/FastaIndex-0.11rc7.tar.gz" + license("GPL-3.0-or-later") + version("0.11rc7", sha256="c130a2146bb178ea4f9d228e0d360787046ab4cb0ab53b5b43711dd57e31aff7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fastapi-utils/package.py b/var/spack/repos/builtin/packages/py-fastapi-utils/package.py index 31c6e1255896ab..04532aad85d35c 100644 --- a/var/spack/repos/builtin/packages/py-fastapi-utils/package.py +++ b/var/spack/repos/builtin/packages/py-fastapi-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFastapiUtils(PythonPackage): homepage = "https://fastapi-utils.davidmontague.xyz" pypi = "fastapi-utils/fastapi-utils-0.2.1.tar.gz" + license("MIT") + version("0.2.1", sha256="0e6c7fc1870b80e681494957abf65d4f4f42f4c7f70005918e9181b22f1bd759") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fastapi/package.py b/var/spack/repos/builtin/packages/py-fastapi/package.py index 876f4f1ddf37c3..36e48025b34efa 100644 --- a/var/spack/repos/builtin/packages/py-fastapi/package.py +++ b/var/spack/repos/builtin/packages/py-fastapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFastapi(PythonPackage): homepage = "https://github.com/tiangolo/fastapi" pypi = "fastapi/fastapi-0.88.0.tar.gz" + license("MIT") + version("0.98.0", sha256="0d3c18886f652038262b5898fec6b09f4ca92ee23e9d9b1d1d24e429f84bf27b") version("0.88.0", sha256="915bf304180a0e7c5605ec81097b7d4cd8826ff87a02bb198e336fb9f3b5ff02") diff --git a/var/spack/repos/builtin/packages/py-fastavro/package.py b/var/spack/repos/builtin/packages/py-fastavro/package.py index 1b320c31678d6c..8c4c60261bc4d9 100644 --- a/var/spack/repos/builtin/packages/py-fastavro/package.py +++ b/var/spack/repos/builtin/packages/py-fastavro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFastavro(PythonPackage): homepage = "https://github.com/fastavro/fastavro" url = "https://github.com/fastavro/fastavro/archive/1.0.0.post1.tar.gz" + license("MIT") + version( "1.0.0.post1", sha256="74f9bf0f9bc9e484c6d42fad603d6e6f907e716a78189873761dc86ce64cc6c5" ) diff --git a/var/spack/repos/builtin/packages/py-fastcache/package.py b/var/spack/repos/builtin/packages/py-fastcache/package.py index d2b8e624723d70..0137184e1a734d 100644 --- a/var/spack/repos/builtin/packages/py-fastcache/package.py +++ b/var/spack/repos/builtin/packages/py-fastcache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFastcache(PythonPackage): homepage = "https://github.com/pbrady/fastcache" pypi = "fastcache/fastcache-1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="6de1b16e70335b7bde266707eb401a3aaec220fb66c5d13b02abf0eab8be782b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fastcluster/package.py b/var/spack/repos/builtin/packages/py-fastcluster/package.py index 4b11af512910c5..0eb63dc1a1b98c 100644 --- a/var/spack/repos/builtin/packages/py-fastcluster/package.py +++ b/var/spack/repos/builtin/packages/py-fastcluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFastcluster(PythonPackage): homepage = "http://danifold.net/" pypi = "fastcluster/fastcluster-1.1.26.tar.gz" + license("BSD-2-Clause") + version("1.1.26", sha256="a202f44a3b06f5cf9cdba3c67d6c523288922d6e6a1cdf737292f93759aa82f7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fastcore/package.py b/var/spack/repos/builtin/packages/py-fastcore/package.py index 63396035e567be..21a38d38684a6e 100644 --- a/var/spack/repos/builtin/packages/py-fastcore/package.py +++ b/var/spack/repos/builtin/packages/py-fastcore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyFastcore(PythonPackage): homepage = "https://github.com/fastai/fastcore/tree/master/" pypi = "fastcore/fastcore-1.3.27.tar.gz" + license("Apache-2.0") + version("1.3.27", sha256="0161f538d5b913932869a46bb90e98193eee79b8798b566272a394f7ef957243") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fastcov/package.py b/var/spack/repos/builtin/packages/py-fastcov/package.py index 6c392444ffaef7..a2466832cbe8c0 100644 --- a/var/spack/repos/builtin/packages/py-fastcov/package.py +++ b/var/spack/repos/builtin/packages/py-fastcov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyFastcov(PythonPackage): maintainers("haampie") + license("MIT") + version("1.13", sha256="ec8a5271f90a2f8b894cb999e262c33e225ed6072d9a6ca38f636f88cc0543e8") # Depends on gcov too, but that's installed with the compiler diff --git a/var/spack/repos/builtin/packages/py-fastdownload/package.py b/var/spack/repos/builtin/packages/py-fastdownload/package.py index c527feb62efcd8..4f5fa29dc0b6a1 100644 --- a/var/spack/repos/builtin/packages/py-fastdownload/package.py +++ b/var/spack/repos/builtin/packages/py-fastdownload/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFastdownload(PythonPackage): homepage = "https://github.com/fastai/fastdownload/tree/master/" pypi = "fastdownload/fastdownload-0.0.5.tar.gz" + license("Apache-2.0") + version("0.0.5", sha256="64e67af30690fa98ae1c8a1b52495769842f723565239a5430208ad05585af18") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fastdtw/package.py b/var/spack/repos/builtin/packages/py-fastdtw/package.py index 5e63cbc616eb93..a7dd56cd65eba7 100644 --- a/var/spack/repos/builtin/packages/py-fastdtw/package.py +++ b/var/spack/repos/builtin/packages/py-fastdtw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyFastdtw(PythonPackage): homepage = "https://github.com/slaypni/fastdtw" pypi = "fastdtw/fastdtw-0.3.4.tar.gz" + license("MIT") + version("0.3.4", sha256="2350fa6ec36bcad186eaf81f46eff35181baf04e324f522de8aeb43d0243f64f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fasteners/package.py b/var/spack/repos/builtin/packages/py-fasteners/package.py index 4e1bb06a4e9ca1..a4d17dd7fb71ce 100644 --- a/var/spack/repos/builtin/packages/py-fasteners/package.py +++ b/var/spack/repos/builtin/packages/py-fasteners/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFasteners(PythonPackage): homepage = "https://github.com/harlowja/fasteners" pypi = "fasteners/fasteners-0.14.1.tar.gz" + license("Apache-2.0") + version("0.18", sha256="cb7c13ef91e0c7e4fe4af38ecaf6b904ec3f5ce0dda06d34924b6b74b869d953") version("0.17.3", sha256="a9a42a208573d4074c77d041447336cf4e3c1389a256fd3e113ef59cf29b7980") version("0.16.3", sha256="b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de") diff --git a/var/spack/repos/builtin/packages/py-fastfold/package.py b/var/spack/repos/builtin/packages/py-fastfold/package.py index 270e93140bf7d5..6d741ead6c8c6f 100644 --- a/var/spack/repos/builtin/packages/py-fastfold/package.py +++ b/var/spack/repos/builtin/packages/py-fastfold/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py index 15a458ede5ebaf..a6a1ac6e17502b 100644 --- a/var/spack/repos/builtin/packages/py-fastjsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-fastjsonschema/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFastjsonschema(PythonPackage): homepage = "https://github.com/horejsek/python-fastjsonschema" pypi = "fastjsonschema/fastjsonschema-2.15.1.tar.gz" + license("BSD-3-Clause") + version("2.16.3", sha256="4a30d6315a68c253cfa8f963b9697246315aa3db89f98b97235e345dedfb0b8e") version("2.16.2", sha256="01e366f25d9047816fe3d288cbfc3e10541daf0af2044763f3d0ade42476da18") version("2.15.1", sha256="671f36d225b3493629b5e789428660109528f373cf4b8a22bac6fa2f8191c2d2") diff --git a/var/spack/repos/builtin/packages/py-fastpath/package.py b/var/spack/repos/builtin/packages/py-fastpath/package.py index c77a401dbcbf47..a94b8d545fbc9c 100644 --- a/var/spack/repos/builtin/packages/py-fastpath/package.py +++ b/var/spack/repos/builtin/packages/py-fastpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFastpath(PythonPackage): homepage = "https://github.com/deprekate/fastpath" pypi = "fastpath/fastpath-1.9.tar.gz" + license("GPL-3.0-only") + version("1.9", sha256="3372d306a3c4e4e764b3995946132333726a229e9002879b9112779dd442b31a") depends_on("python@3.5.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fastprogress/package.py b/var/spack/repos/builtin/packages/py-fastprogress/package.py index c04f0c1c9c62ac..73da1b551bf8f9 100644 --- a/var/spack/repos/builtin/packages/py-fastprogress/package.py +++ b/var/spack/repos/builtin/packages/py-fastprogress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-fastrlock/package.py b/var/spack/repos/builtin/packages/py-fastrlock/package.py index 8d025b1afac5b6..e45bc5f3a75cbd 100644 --- a/var/spack/repos/builtin/packages/py-fastrlock/package.py +++ b/var/spack/repos/builtin/packages/py-fastrlock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFastrlock(PythonPackage): homepage = "https://github.com/scoder/fastrlock" pypi = "fastrlock/fastrlock-0.5.tar.gz" + license("MIT") + version("0.8.1", sha256="8a5f2f00021c4ac72e4dab910dc1863c0e008a2e7fb5c843933ae9bcfc3d0802") version("0.5", sha256="9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f") diff --git a/var/spack/repos/builtin/packages/py-faststructure/package.py b/var/spack/repos/builtin/packages/py-faststructure/package.py index c2a71cf1153ed0..256dc429cbf171 100644 --- a/var/spack/repos/builtin/packages/py-faststructure/package.py +++ b/var/spack/repos/builtin/packages/py-faststructure/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFaststructure(PythonPackage): homepage = "https://github.com/rajanil/fastStructure" url = "https://github.com/rajanil/fastStructure/archive/v1.0.tar.gz" + license("MIT") + version("1.0", sha256="f1bfb24bb5ecd108bc3a90145fad232012165c1e60608003f1c87d200f867b81") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-fava/package.py b/var/spack/repos/builtin/packages/py-fava/package.py index 323622d34adfd7..e458ec0c52f95d 100644 --- a/var/spack/repos/builtin/packages/py-fava/package.py +++ b/var/spack/repos/builtin/packages/py-fava/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFava(PythonPackage): homepage = "https://beancount.github.io/fava/" pypi = "fava/fava-1.18.tar.gz" + license("MIT") + version("1.18", sha256="21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5") # Some of the dependencies are not listed as required at diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py index 6d3ffa6cae3754..b3f011451fd9ed 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFenicsBasix(PythonPackage): git = "https://github.com/FEniCS/basix.git" maintainers("chrisrichardson", "mscroggs", "garth-wells", "jhale") + license("MIT") + version("main", branch="main") version("0.7.0", sha256="9bee81b396ee452eec8d9735f278cb44cb6994c6bc30aec8ed9bb4b12d83fa7f") version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") @@ -27,14 +29,16 @@ class PyFenicsBasix(PythonPackage): depends_on("fenics-basix@0.4.2", type=("build", "run"), when="@0.4.2") # See python/CMakeLists.txt - depends_on("cmake@3.16:", type="build") + depends_on("cmake@3.16:", when="@:0.7", type="build") + depends_on("cmake@3.19:", when="@0.8:", type="build") # See python/pyproject.toml - depends_on("python@3.8:", when="@0.7.0:", type=("build", "run")) - depends_on("py-setuptools@42:", type="build") + depends_on("python@3.8:", when="@0.7:", type=("build", "run")) depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("py-pybind11@2.9.1:", when="@:0.7", type="build") - depends_on("py-nanobind@1.5.1:", when="@0.8:", type="build") + depends_on("py-setuptools@42:", when="@:0.7", type="build") + depends_on("py-nanobind@1.6.0:", when="@0.8:", type="build") + depends_on("py-scikit-build-core+pyproject@0.5.0:", when="@0.8:", type="build") depends_on("xtensor@0.23.10:", type="build", when="@:0.4") diff --git a/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py b/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py index 461fec51b77b2a..aec17246878b85 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dijitso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFenicsDijitso(PythonPackage): git = "https://bitbucket.org/fenics-project/dijitso.git" maintainers("js947", "chrisrichardson") + license("LGPL-3.0-only") + version("master", branch="master") version("2019.1.0", sha256="eaa45eec4457f3f865d72a926b7cba86df089410e78de04cd89b15bb405e8fd9") version("2018.1.0", sha256="2084ada1e7bd6ecec0999b15a17db98c72e26f1ccbf3fcbe240b1a035a1a2e64") diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index 8c07879efd608c..a54a5a694bfabd 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class PyFenicsDolfinx(PythonPackage): git = "https://github.com/FEniCS/dolfinx.git" maintainers("chrisrichardson", "garth-wells", "nate-sime", "jhale") + license("LGPL-3.0-only") + version("main", branch="main") + version("0.7.2", sha256="7d9ce1338ce66580593b376327f23ac464a4ce89ef63c105efc1a38e5eae5c0b") version("0.6.0", sha256="eb8ac2bb2f032b0d393977993e1ab6b4101a84d54023a67206e3eac1a8d79b80") version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") @@ -30,22 +33,27 @@ class PyFenicsDolfinx(PythonPackage): depends_on("python@3.7:3.10", when="@0.4", type=("build", "run")) depends_on("fenics-dolfinx@main", when="@main") + depends_on("fenics-dolfinx@0.7.2", when="@0.7.2") depends_on("fenics-dolfinx@0.6.0", when="@0.6.0") depends_on("fenics-dolfinx@0.5.1", when="@0.5.1") depends_on("fenics-dolfinx@0.5.0", when="@0.5.0") depends_on("fenics-dolfinx@0.4.1", when="@0.4.1") + depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") depends_on("fenics-basix@main", type=("build", "link"), when="@main") + depends_on("fenics-basix@0.7", type=("build", "link"), when="@0.7") depends_on("fenics-basix@0.6.0:0.6", type=("build", "link"), when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", type=("build", "link"), when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1") depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main") + depends_on("py-fenics-ffcx@0.7", type=("build", "run"), when="@0.7") depends_on("py-fenics-ffcx@0.6", type=("build", "run"), when="@0.6") depends_on("py-fenics-ffcx@0.5.0.post0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ffcx@0.4.2", type=("build", "run"), when="@0.4.1") depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") + depends_on("py-fenics-ufl@2023.2", type=("build", "run"), when="@0.7") depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6") depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.1") @@ -53,11 +61,13 @@ class PyFenicsDolfinx(PythonPackage): depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) - depends_on("py-pybind11@2.7.0:", type=("build", "run")) - depends_on("xtensor@0.23.10:", type="build", when="@:0.5") + depends_on("py-cffi", type=("build", "run")) - depends_on("py-setuptools@42:", type="build") + depends_on("py-nanobind@1.8:", when="@0.8:", type="build") + depends_on("py-scikit-build-core+pyproject@0.5:", when="@0.8:", type="build") - depends_on("py-cffi", type=("build", "run")) + depends_on("py-pybind11@2.7.0:", when="@:0.7", type=("build", "run")) + depends_on("py-setuptools@42:", when="@:0.7", type="build") + depends_on("xtensor@0.23.10:", type="build", when="@:0.5") build_directory = "python" diff --git a/var/spack/repos/builtin/packages/py-fenics-ffc/package.py b/var/spack/repos/builtin/packages/py-fenics-ffc/package.py index 8cd6f401f91437..aea3d1ac146246 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffc/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyFenicsFfc(PythonPackage): url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-2019.1.0.post0.tar.gz" maintainers("emai-imcs") + license("LGPL-3.0-or-later") + version( "2019.1.0.post0", sha256="306e1179630200a34202975a5369194939b3482eebfc34bc44ad74dab1f109e8" ) diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index f2cec1e21e9b0d..e6ab11fc8bb6f1 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFenicsFfcx(PythonPackage): git = "https://github.com/FEniCS/ffcx.git" maintainers("chrisrichardson", "garth-wells", "jhale") + license("LGPL-3.0-or-later") + version("main", branch="main") version("0.7.0", sha256="7f3c3ca91d63ce7831d37799cc19d0551bdcd275bdfa4c099711679533dd1c71") version("0.6.0", sha256="076fad61d406afffd41019ae1abf6da3f76406c035c772abad2156127667980e") diff --git a/var/spack/repos/builtin/packages/py-fenics-fiat/package.py b/var/spack/repos/builtin/packages/py-fenics-fiat/package.py index 86c10ae64fcc74..c164bc1c61e5c1 100644 --- a/var/spack/repos/builtin/packages/py-fenics-fiat/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-fiat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyFenicsFiat(PythonPackage): git = "https://github.com/FEniCS/fiat.git" maintainers("js947", "chrisrichardson") + license("LGPL-3.0-or-later") + version("master", branch="master") version("2019.1.0", sha256="2a6d175a825ed725843918ef28846edbcf710a879c2fe8caaeda77b1ce9b9a1c") version("2018.1.0", sha256="7468709c7aacf7dfb22c09fb5250448eb24084b9dd088ec2632a96d56c0f3830") diff --git a/var/spack/repos/builtin/packages/py-fenics-instant/package.py b/var/spack/repos/builtin/packages/py-fenics-instant/package.py index f88f4e4d41c6f8..46f745827730a1 100644 --- a/var/spack/repos/builtin/packages/py-fenics-instant/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-instant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFenicsInstant(PythonPackage): url = "https://bitbucket.org/fenics-project/instant/downloads/instant-2017.2.0.tar.gz" maintainers("emai-imcs") + license("LGPL-3.0-or-later") + version("2017.2.0", sha256="be24f162fd1a89b82fae002db8df0b4f111fd50db83d78c0c121015c02e45b7b") version("2016.2.0", sha256="df5e8ca306546fd1ee1a28e36b61c5d46456dc8b07e3293d674ddff62cf8d953") diff --git a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py index 890b1934649b07..252e87af122044 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ufl/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ufl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyFenicsUfl(PythonPackage): git = "https://github.com/FEniCS/ufl.git" maintainers("chrisrichardson", "garth-wells", "jhale") + license("LGPL-3.0-or-later") + version("main", branch="main") version("2023.2.0", sha256="d1d3209e8ebd4bd70513c26890f51823bac90edc956233c47bd8e686e064436e") version( diff --git a/var/spack/repos/builtin/packages/py-ffmpy/package.py b/var/spack/repos/builtin/packages/py-ffmpy/package.py index 65ec6762b62fab..e6053fd8bedda2 100644 --- a/var/spack/repos/builtin/packages/py-ffmpy/package.py +++ b/var/spack/repos/builtin/packages/py-ffmpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFfmpy(PythonPackage): homepage = "https://github.com/Ch00k/ffmpy" pypi = "ffmpy/ffmpy-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="757591581eee25b4a50ac9ffb9b58035a2794533db47e0512f53fb2d7b6f9adc") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-file-magic/package.py b/var/spack/repos/builtin/packages/py-file-magic/package.py index a321ffffc03a50..03a0bc03cbb5f3 100644 --- a/var/spack/repos/builtin/packages/py-file-magic/package.py +++ b/var/spack/repos/builtin/packages/py-file-magic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-filecheck/package.py b/var/spack/repos/builtin/packages/py-filecheck/package.py index 18839444d1cb5c..3a31815c5d8ecf 100644 --- a/var/spack/repos/builtin/packages/py-filecheck/package.py +++ b/var/spack/repos/builtin/packages/py-filecheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyFilecheck(PythonPackage): pypi = "filecheck/filecheck-0.0.23.tar.gz" + license("Apache-2.0") + version("0.0.23", sha256="1c5db511fb7b5a32e1e24736479cfe754ea27c9ae0d5b6d52c0af132c8db3e7d") depends_on("python@3.6.2:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-filelock/package.py b/var/spack/repos/builtin/packages/py-filelock/package.py index be882c5ebc84b0..e7d46db160e32d 100644 --- a/var/spack/repos/builtin/packages/py-filelock/package.py +++ b/var/spack/repos/builtin/packages/py-filelock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFilelock(PythonPackage): homepage = "https://github.com/tox-dev/py-filelock" pypi = "filelock/filelock-3.0.4.tar.gz" + license("Unlicense") + version("3.12.4", sha256="2e6f249f1f3654291606e046b09f1fd5eac39b360664c27f5aad072012f8bcbd") version("3.12.0", sha256="fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718") version("3.8.0", sha256="55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc") diff --git a/var/spack/repos/builtin/packages/py-filemagic/package.py b/var/spack/repos/builtin/packages/py-filemagic/package.py index 8602ed8a92bc69..10236cd7e1e9b5 100644 --- a/var/spack/repos/builtin/packages/py-filemagic/package.py +++ b/var/spack/repos/builtin/packages/py-filemagic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFilemagic(PythonPackage): homepage = "https://filemagic.readthedocs.io/en/latest/" pypi = "filemagic/filemagic-1.6.tar.gz" + license("Apache-2.0") + version("1.6", sha256="e684359ef40820fe406f0ebc5bf8a78f89717bdb7fed688af68082d991d6dbf3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-filetype/package.py b/var/spack/repos/builtin/packages/py-filetype/package.py index 136cace1afabd8..71e11b26c4f5f2 100644 --- a/var/spack/repos/builtin/packages/py-filetype/package.py +++ b/var/spack/repos/builtin/packages/py-filetype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFiletype(PythonPackage): homepage = "https://github.com/h2non/filetype.py" pypi = "filetype/filetype-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-filterpy/package.py b/var/spack/repos/builtin/packages/py-filterpy/package.py index c46759ff7b76f7..d0baf3965397ed 100644 --- a/var/spack/repos/builtin/packages/py-filterpy/package.py +++ b/var/spack/repos/builtin/packages/py-filterpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFilterpy(PythonPackage): homepage = "https://github.com/rlabbe/filterpy/" pypi = "filterpy/filterpy-1.4.5.zip" + license("MIT") + version("1.4.5", sha256="4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-findlibs/package.py b/var/spack/repos/builtin/packages/py-findlibs/package.py index 68b586b929e812..ab8264f065f754 100644 --- a/var/spack/repos/builtin/packages/py-findlibs/package.py +++ b/var/spack/repos/builtin/packages/py-findlibs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFindlibs(PythonPackage): homepage = "https://github.com/ecmwf/findlibs" pypi = "findlibs/findlibs-0.0.2.tar.gz" + license("Apache-2.0") + version("0.0.2", sha256="6c7e038496f9a97783ab2cd5736bb68522d5bebd8b0eb17c976b6a4ae4032c8d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fiona/package.py b/var/spack/repos/builtin/packages/py-fiona/package.py index 917a20ab09099d..1b65c3c15b232d 100644 --- a/var/spack/repos/builtin/packages/py-fiona/package.py +++ b/var/spack/repos/builtin/packages/py-fiona/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFiona(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("master", branch="master") version("1.9.5", sha256="99e2604332caa7692855c2ae6ed91e1fffdf9b59449aa8032dd18e070e59a2f7") version("1.9.4", sha256="49f18cbcd3b1f97128c1bb038c3451b2e1be25baa52f02ce906c25cf75af95b6") diff --git a/var/spack/repos/builtin/packages/py-fire/package.py b/var/spack/repos/builtin/packages/py-fire/package.py index a96f764571c22c..269af3a38163d5 100644 --- a/var/spack/repos/builtin/packages/py-fire/package.py +++ b/var/spack/repos/builtin/packages/py-fire/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFire(PythonPackage): homepage = "https://github.com/google/python-fire" pypi = "fire/fire-0.2.1.tar.gz" + license("Apache-2.0") + version("0.4.0", sha256="c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62") version("0.3.1", sha256="9736a16227c3d469e5d2d296bce5b4d8fa8d7851e953bda327a455fc2994307f") version("0.3.0", sha256="96c372096afcf33ddbadac8a7ca5b7e829e8d7157d0030bd964bf959afde5c2c") diff --git a/var/spack/repos/builtin/packages/py-fireworks/package.py b/var/spack/repos/builtin/packages/py-fireworks/package.py index 7b4917f8ec6566..17308e4fa7c63d 100644 --- a/var/spack/repos/builtin/packages/py-fireworks/package.py +++ b/var/spack/repos/builtin/packages/py-fireworks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-fiscalyear/package.py b/var/spack/repos/builtin/packages/py-fiscalyear/package.py index 5639394a06e48f..01966ea7e11d2b 100644 --- a/var/spack/repos/builtin/packages/py-fiscalyear/package.py +++ b/var/spack/repos/builtin/packages/py-fiscalyear/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyFiscalyear(PythonPackage): maintainers("adamjstewart") + license("MIT") + version("master", branch="master") version("0.4.0", sha256="12857a48bd7b97bda78d833b29e81f30ec5aa018241f690e714b472b25fa1b47") version("0.3.2", sha256="0697b2af4ab2d4c6188fac33d340f31dea9b0e1f0d3666d6752faeedd744f019") diff --git a/var/spack/repos/builtin/packages/py-fisher/package.py b/var/spack/repos/builtin/packages/py-fisher/package.py index e1b43d098ddca7..301d15ca15a63c 100644 --- a/var/spack/repos/builtin/packages/py-fisher/package.py +++ b/var/spack/repos/builtin/packages/py-fisher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFisher(PythonPackage): homepage = "https://github.com/brentp/fishers_exact_test" pypi = "fisher/fisher-0.1.9.tar.gz" + license("BSD-3-Clause") + version("0.1.10", sha256="0ec89019e814cf102f33be5674a6205af433711ecb742a7ed5b48896af243523") version("0.1.9", sha256="d378b3f7e488e2a679c6d0e5ea1bce17bc931c2bfe8ec8424ee47a74f251968d") diff --git a/var/spack/repos/builtin/packages/py-fits-tools/package.py b/var/spack/repos/builtin/packages/py-fits-tools/package.py index 7d95b1fdb85ab2..56984139f1138a 100644 --- a/var/spack/repos/builtin/packages/py-fits-tools/package.py +++ b/var/spack/repos/builtin/packages/py-fits-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFitsTools(PythonPackage): homepage = "https://github.com/keflavich/FITS_tools" url = "https://github.com/keflavich/FITS_tools/archive/v0.2.tar.gz" + license("BSD-3-Clause") + version("1.1.2", sha256="6c7596533ea66f5ca05e4326ae6db643edb03aca4b6b654dce091834155d03e8") version("1.1.1", sha256="5b79ef24fadb43458388754381644712c05cd89da4f89c197e3bd80ca158c525") version("1.1", sha256="995ebf53dc0ffd8bdb5270c4fa0cf52f639aac05cfb68dc6fd5d58ab40148a8a") diff --git a/var/spack/repos/builtin/packages/py-fitter/package.py b/var/spack/repos/builtin/packages/py-fitter/package.py index 5bd98a7dcc3c33..00454183c6c819 100644 --- a/var/spack/repos/builtin/packages/py-fitter/package.py +++ b/var/spack/repos/builtin/packages/py-fitter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFitter(PythonPackage): maintainers("carsonwoods") + license("GPL-3.0-or-later") + version("1.5.1", sha256="893b35ad0a84c3b96b63ec203a6a79effdba98777aed966ae61709f5e1e8cf99") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fixtures/package.py b/var/spack/repos/builtin/packages/py-fixtures/package.py index 2d112e68b729f7..8231f69a654792 100644 --- a/var/spack/repos/builtin/packages/py-fixtures/package.py +++ b/var/spack/repos/builtin/packages/py-fixtures/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFixtures(PythonPackage): homepage = "https://launchpad.net/python-fixtures" pypi = "fixtures/fixtures-3.0.0.tar.gz" + license("Apache-2.0") + version("3.0.0", sha256="fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py index 432e51faf351aa..11fc0b79f6f3d2 100644 --- a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFlake8ImportOrder(PythonPackage): homepage = "https://github.com/PyCQA/flake8-import-order" pypi = "flake8-import-order/flake8-import-order-0.18.1.tar.gz" + license("LGPL-3.0-only") + version("0.18.1", sha256="a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92") depends_on("py-pycodestyle", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py index a8ab9d289466a6..c89a7c13f49535 100644 --- a/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-polyfill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFlake8Polyfill(PythonPackage): homepage = "https://gitlab.com/pycqa/flake8-polyfill" pypi = "flake8-polyfill/flake8-polyfill-1.0.2.tar.gz" + license("MIT") + version("1.0.2", sha256="e44b087597f6da52ec6393a709e7108b2905317d0c0b744cdca6208e670d8eda") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index 7cc6124a5197b6..0a773af36c5af9 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFlake8(PythonPackage): homepage = "https://github.com/PyCQA/flake8" pypi = "flake8/flake8-4.0.1.tar.gz" + license("MIT") + version("6.1.0", sha256="d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23") version("6.0.0", sha256="c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181") version("5.0.4", sha256="6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db") diff --git a/var/spack/repos/builtin/packages/py-flaky/package.py b/var/spack/repos/builtin/packages/py-flaky/package.py index 7f83219c3286b3..91d702ad720e01 100644 --- a/var/spack/repos/builtin/packages/py-flaky/package.py +++ b/var/spack/repos/builtin/packages/py-flaky/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-flameprof/package.py b/var/spack/repos/builtin/packages/py-flameprof/package.py index d82dcaaff07838..979d60755f788d 100644 --- a/var/spack/repos/builtin/packages/py-flameprof/package.py +++ b/var/spack/repos/builtin/packages/py-flameprof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFlameprof(PythonPackage): maintainers("haampie") + license("MIT") + version("0.4", sha256="dbc86d4190cbbba624f1e0a40f44d9db96138e27534d83c8ef42d420857875a3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flask-babel/package.py b/var/spack/repos/builtin/packages/py-flask-babel/package.py index bff3f168d50db1..fa5b144db8fc6c 100644 --- a/var/spack/repos/builtin/packages/py-flask-babel/package.py +++ b/var/spack/repos/builtin/packages/py-flask-babel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFlaskBabel(PythonPackage): homepage = "https://pythonhosted.org/Flask-Babel/" pypi = "Flask-Babel/Flask-Babel-2.0.0.tar.gz" + license("BSD-3-Clause") + version("2.0.0", sha256="f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flask-compress/package.py b/var/spack/repos/builtin/packages/py-flask-compress/package.py index f5002b0c43440f..2b037a3da45857 100644 --- a/var/spack/repos/builtin/packages/py-flask-compress/package.py +++ b/var/spack/repos/builtin/packages/py-flask-compress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFlaskCompress(PythonPackage): homepage = "https://github.com/libwilliam/flask-compress" pypi = "Flask-Compress/Flask-Compress-1.4.0.tar.gz" + license("MIT") + version("1.4.0", sha256="468693f4ddd11ac6a41bca4eb5f94b071b763256d54136f77957cfee635badb3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flask-cors/package.py b/var/spack/repos/builtin/packages/py-flask-cors/package.py index 70c2f6350bf838..6eac377c7b8dbf 100644 --- a/var/spack/repos/builtin/packages/py-flask-cors/package.py +++ b/var/spack/repos/builtin/packages/py-flask-cors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFlaskCors(PythonPackage): homepage = "https://flask-cors.corydolphin.com/en/latest/index.html" pypi = "Flask-Cors/Flask-Cors-3.0.10.tar.gz" + license("MIT") + version("3.0.10", sha256="b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flask-paginate/package.py b/var/spack/repos/builtin/packages/py-flask-paginate/package.py index 365da7fcc7775c..e23f5ca04a8050 100644 --- a/var/spack/repos/builtin/packages/py-flask-paginate/package.py +++ b/var/spack/repos/builtin/packages/py-flask-paginate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFlaskPaginate(PythonPackage): maintainers("meyersbs") + license("BSD-3-Clause") + version("2022.1.8", sha256="a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2") # From setup.py: diff --git a/var/spack/repos/builtin/packages/py-flask-restful/package.py b/var/spack/repos/builtin/packages/py-flask-restful/package.py index 5628e0b91b1008..2de446ba7a8324 100644 --- a/var/spack/repos/builtin/packages/py-flask-restful/package.py +++ b/var/spack/repos/builtin/packages/py-flask-restful/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFlaskRestful(PythonPackage): homepage = "https://www.github.com/flask-restful/flask-restful/" pypi = "Flask-RESTful/Flask-RESTful-0.3.8.tar.gz" + license("BSD-3-Clause") + version("0.3.9", sha256="ccec650b835d48192138c85329ae03735e6ced58e9b2d9c2146d6c84c06fa53e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flask-socketio/package.py b/var/spack/repos/builtin/packages/py-flask-socketio/package.py index 71e52edd2667ac..a40a0c231cd89e 100644 --- a/var/spack/repos/builtin/packages/py-flask-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-flask-socketio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-flask-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-flask-sqlalchemy/package.py index d8dc60e277f08b..950351e578ca41 100644 --- a/var/spack/repos/builtin/packages/py-flask-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-flask-sqlalchemy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFlaskSqlalchemy(PythonPackage): maintainers("charmoniumq") + license("BSD-3-Clause") + version("3.0.2", sha256="16199f5b3ddfb69e0df2f52ae4c76aedbfec823462349dabb21a1b2e0a2b65e9") # https://github.com/pallets-eco/flask-sqlalchemy/blob/3.0.2/pyproject.toml diff --git a/var/spack/repos/builtin/packages/py-flask/package.py b/var/spack/repos/builtin/packages/py-flask/package.py index 861fdb71063cb9..091ebed06bb981 100644 --- a/var/spack/repos/builtin/packages/py-flask/package.py +++ b/var/spack/repos/builtin/packages/py-flask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFlask(PythonPackage): pypi = "Flask/Flask-1.1.1.tar.gz" git = "https://github.com/pallets/flask.git" + license("BSD-3-Clause") + version("2.3.2", sha256="8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef") version("2.2.2", sha256="642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b") version("2.0.2", sha256="7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2") diff --git a/var/spack/repos/builtin/packages/py-flatbuffers/package.py b/var/spack/repos/builtin/packages/py-flatbuffers/package.py index d87b1cbdc2d3db..d91f04e672a9de 100644 --- a/var/spack/repos/builtin/packages/py-flatbuffers/package.py +++ b/var/spack/repos/builtin/packages/py-flatbuffers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyFlatbuffers(PythonPackage): maintainers("gperrotta") + license("Apache-2.0") + version("23.5.26", sha256="9ea1144cac05ce5d86e2859f431c6cd5e66cd9c78c558317c7955fb8d4c78d89") version("2.0.7", sha256="0ae7d69c5b82bf41962ca5fde9cc43033bc9501311d975fd5a25e8a7d29c1245") version("2.0", sha256="12158ab0272375eab8db2d663ae97370c33f152b27801fa6024e1d6105fd4dd2") diff --git a/var/spack/repos/builtin/packages/py-flatten-dict/package.py b/var/spack/repos/builtin/packages/py-flatten-dict/package.py index 89324fdff9a0b3..d7942bea189d19 100644 --- a/var/spack/repos/builtin/packages/py-flatten-dict/package.py +++ b/var/spack/repos/builtin/packages/py-flatten-dict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFlattenDict(PythonPackage): homepage = "https://github.com/ianlini/flatten-dict" pypi = "flatten-dict/flatten-dict-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="0ccc43f15c7c84c5ef387ad19254f6769a32d170313a1bcbf4ce582089313d7e") depends_on("python@2.7,3.5:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flawfinder/package.py b/var/spack/repos/builtin/packages/py-flawfinder/package.py index 34701087727280..56a6a80e3cb02b 100644 --- a/var/spack/repos/builtin/packages/py-flawfinder/package.py +++ b/var/spack/repos/builtin/packages/py-flawfinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFlawfinder(PythonPackage, SourceforgePackage): homepage = "http://dwheeler.com/flawfinder/" sourceforge_mirror_path = "project/flawfinder/flawfinder-2.0.19.tar.gz" + license("GPL-2.0+") + version("2.0.19", sha256="fe550981d370abfa0a29671346cc0b038229a9bd90b239eab0f01f12212df618") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flexmock/package.py b/var/spack/repos/builtin/packages/py-flexmock/package.py index 5487b7848f4f50..28ba2d60f54033 100644 --- a/var/spack/repos/builtin/packages/py-flexmock/package.py +++ b/var/spack/repos/builtin/packages/py-flexmock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyFlexmock(PythonPackage): maintainers("dorton21") + license("BSD-2-Clause") + version("0.10.4", sha256="5033ceb974d6452cf8716c2ff5059074b77e546df5c849fb44a53f98dfe0d82c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-flexx/package.py b/var/spack/repos/builtin/packages/py-flexx/package.py index 0ffd19c556fdf1..5a2248aaf3d67a 100644 --- a/var/spack/repos/builtin/packages/py-flexx/package.py +++ b/var/spack/repos/builtin/packages/py-flexx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-flit-core/package.py b/var/spack/repos/builtin/packages/py-flit-core/package.py index a05cd05fc102d7..162fdff298fefb 100644 --- a/var/spack/repos/builtin/packages/py-flit-core/package.py +++ b/var/spack/repos/builtin/packages/py-flit-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,8 +11,14 @@ class PyFlitCore(PythonPackage): homepage = "https://github.com/pypa/flit" pypi = "flit-core/flit_core-3.9.0.tar.gz" + + # Tests import of a non-existing package + skip_modules = ["flit_core.tests"] + maintainers("takluyver") + license("BSD-3-Clause") + version("3.9.0", sha256="72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba") version("3.8.0", sha256="b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3") version("3.7.1", sha256="14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f") diff --git a/var/spack/repos/builtin/packages/py-flit-scm/package.py b/var/spack/repos/builtin/packages/py-flit-scm/package.py index 6acefb579e99c5..b7b724c78c2ac5 100644 --- a/var/spack/repos/builtin/packages/py-flit-scm/package.py +++ b/var/spack/repos/builtin/packages/py-flit-scm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyFlitScm(PythonPackage): homepage = "https://gitlab.com/WillDaSilva/flit_scm" pypi = "flit-scm/flit_scm-1.7.0.tar.gz" + license("MIT") + version("1.7.0", sha256="961bd6fb24f31bba75333c234145fff88e6de0a90fc0f7e5e7c79deca69f6bb2") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flit/package.py b/var/spack/repos/builtin/packages/py-flit/package.py index 859594c01699f2..176512ec879503 100644 --- a/var/spack/repos/builtin/packages/py-flit/package.py +++ b/var/spack/repos/builtin/packages/py-flit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFlit(PythonPackage): pypi = "flit/flit-3.9.0.tar.gz" maintainers("takluyver") + license("BSD-3-Clause") + version("3.9.0", sha256="d75edf5eb324da20d53570a6a6f87f51e606eee8384925cd66a90611140844c7") version("3.8.0", sha256="d0f2a8f4bd45dc794befbf5839ecc0fd3830d65a57bd52b5997542fac5d5e937") version("3.7.1", sha256="3c9bd9c140515bfe62dd938c6610d10d6efb9e35cc647fc614fe5fb3a5036682") diff --git a/var/spack/repos/builtin/packages/py-flufl-lock/package.py b/var/spack/repos/builtin/packages/py-flufl-lock/package.py index 1198dbea8ee14b..87b91e3fc8413a 100644 --- a/var/spack/repos/builtin/packages/py-flufl-lock/package.py +++ b/var/spack/repos/builtin/packages/py-flufl-lock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFluflLock(PythonPackage): homepage = "https://fluflock.readthedocs.io" pypi = "flufl.lock/flufl.lock-5.0.4.tar.gz" + license("Apache-2.0") + version("5.0.4", sha256="09ffef831d57c4d182e398e97bb74ad8c8ffbd1710175a5a0b0f057095db12f1") version("5.0.3", sha256="94df161caa489d74afc26df8c0b640770923ecc0c6c5d331fbeabe7b91d306cb") version("3.2", sha256="a8d66accc9ab41f09961cd8f8db39f9c28e97e2769659a3567c63930a869ff5b") diff --git a/var/spack/repos/builtin/packages/py-flye/package.py b/var/spack/repos/builtin/packages/py-flye/package.py index 2e19485f86bbf7..8ec6ca4c9f46ff 100644 --- a/var/spack/repos/builtin/packages/py-flye/package.py +++ b/var/spack/repos/builtin/packages/py-flye/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFlye(PythonPackage): homepage = "https://github.com/fenderglass/Flye" url = "https://github.com/fenderglass/Flye/archive/2.6.tar.gz" + license("BSD-3-Clause") + version("2.9", sha256="158ea620d4aa92a53dae1832b09fd605e17552e45b83eecbf28e41a4516a6957") version("2.8.3", sha256="070f9fbee28eef8e8f87aaecc048053f50a8102a3715e71b16c9c46819a4e07c") version("2.8.2", sha256="f1284bd2a777356fbf808d89052bc0f9bf5602560dde7cf722d7974d9a94d03b") diff --git a/var/spack/repos/builtin/packages/py-fn-py/package.py b/var/spack/repos/builtin/packages/py-fn-py/package.py index 253ebf7ead826f..721016ec614710 100644 --- a/var/spack/repos/builtin/packages/py-fn-py/package.py +++ b/var/spack/repos/builtin/packages/py-fn-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFnPy(PythonPackage): homepage = "https://github.com/fnpy/fn.py" url = "https://github.com/fnpy/fn.py/archive/v0.5.2.tar.gz" + license("Apache-2.0") + version("0.6.0", sha256="85d4d4ae6ce3c13e9dbe45df2895188f742ebddbf100a95d360d73a8965ee0c8") version("0.5.2", sha256="fda2253d792867a79514496932630622df9340f214a2f4b2d597b60a8cc3d96b") diff --git a/var/spack/repos/builtin/packages/py-fonttools/package.py b/var/spack/repos/builtin/packages/py-fonttools/package.py index 3f5d97ce658ffa..ceb5040128830d 100644 --- a/var/spack/repos/builtin/packages/py-fonttools/package.py +++ b/var/spack/repos/builtin/packages/py-fonttools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyFonttools(PythonPackage): skip_modules = ["fontTools.ufoLib"] + license("MIT") + version("4.39.4", sha256="dba8d7cdb8e2bac1b3da28c5ed5960de09e59a2fe7e63bb73f5a59e57b0430d2") version("4.37.3", sha256="f32ef6ec966cf0e7d2aa88601fed2e3a8f2851c26b5db2c80ccc8f82bee4eedc") version("4.31.2", sha256="236b29aee6b113e8f7bee28779c1230a86ad2aac9a74a31b0aedf57e7dfb62a4") diff --git a/var/spack/repos/builtin/packages/py-ford/package.py b/var/spack/repos/builtin/packages/py-ford/package.py index ef9129468a03b9..0bab66112a3636 100644 --- a/var/spack/repos/builtin/packages/py-ford/package.py +++ b/var/spack/repos/builtin/packages/py-ford/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFord(PythonPackage): maintainers("wscullin") + license("GPL-3.0-only") + version("6.1.13", sha256="95b743ea25c5a9c6a9e13db3633e04f91e11d1debb69f48ca3ef7fefc51f0559") version("6.1.12", sha256="101191e1aa33cfe780ea5b2d66d02c7281b9b314e82bb138d76809a49c08506a") version("6.1.11", sha256="feb9a88040e717e84c632e4b023904ab36a463fc9a8ff80c8c7f86454e5d8043") diff --git a/var/spack/repos/builtin/packages/py-formatizer/package.py b/var/spack/repos/builtin/packages/py-formatizer/package.py index ec6ce913876d83..d284ff70e4590e 100644 --- a/var/spack/repos/builtin/packages/py-formatizer/package.py +++ b/var/spack/repos/builtin/packages/py-formatizer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFormatizer(PythonPackage): homepage = "https://github.com/fgimian/formatizer" pypi = "formatizer/formatizer-0.1.1.tar.gz" + license("MIT") + version("0.1.1", sha256="3061ced1daa08f1836b79f4a3de16a33a54179331273e0b9c757d27ab339c29f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-formulaic/package.py b/var/spack/repos/builtin/packages/py-formulaic/package.py index ace0295a31f09b..298cbcf086dd5d 100644 --- a/var/spack/repos/builtin/packages/py-formulaic/package.py +++ b/var/spack/repos/builtin/packages/py-formulaic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-fortls/package.py b/var/spack/repos/builtin/packages/py-fortls/package.py index ae089b96e60cfa..47e9aafed33af3 100644 --- a/var/spack/repos/builtin/packages/py-fortls/package.py +++ b/var/spack/repos/builtin/packages/py-fortls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyFortls(PythonPackage): maintainers("RMeli") + license("MIT") + version("2.13.0", sha256="23c5013e8dd8e1d65bf07be610d0827bc48aa7331a7a7ce13612d4c646d0db31") depends_on("py-setuptools@45:", type="build") diff --git a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py index 4e333bbf8d4e96..7187cea8db8258 100644 --- a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py +++ b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyFortranLanguageServer(PythonPackage): maintainers("AndrewGaspar") + license("MIT") + version("1.12.0", sha256="5cda6341b1d2365cce3d80ba40043346c5dcbd0b35f636bfa57cb34df789ff17") version("1.11.1", sha256="8f03782dd992d6652a3f2d349115fdad3aa3464fee3fafbbc4f8ecf780166e3c") diff --git a/var/spack/repos/builtin/packages/py-fortranformat/package.py b/var/spack/repos/builtin/packages/py-fortranformat/package.py index fa9e534e0f63c4..c08935be4066ac 100644 --- a/var/spack/repos/builtin/packages/py-fortranformat/package.py +++ b/var/spack/repos/builtin/packages/py-fortranformat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFortranformat(PythonPackage): homepage = "http://bitbucket.org/brendanarnold/py-fortranformat" pypi = "fortranformat/fortranformat-0.2.5.tar.gz" + license("MIT") + version("0.2.5", sha256="6b5fbc1f129c7a70543c3a81f334fb4d57f07df2834b22ce69f6d7e8539cd3f9") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-fparser/package.py b/var/spack/repos/builtin/packages/py-fparser/package.py index 295d27a2842686..68d022c17b63c4 100644 --- a/var/spack/repos/builtin/packages/py-fparser/package.py +++ b/var/spack/repos/builtin/packages/py-fparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,19 +11,28 @@ class PyFparser(PythonPackage): homepage = "https://github.com/stfc/fparser" git = "https://github.com/stfc/fparser.git" - pypi = "fparser/fparser-0.0.16.tar.gz" + pypi = "fparser/fparser-0.1.3.tar.gz" + + license("BSD-3-Clause") version("develop", branch="master") + version("0.1.3", sha256="10ba8b2803632846f6f011278e3810188a078d89afcb4a38bed0cbf10f775736") version("0.0.16", sha256="a06389b95a1b9ed12f8141b69c67343da5ba0a29277b2997b02573a93af14e13") version("0.0.6", sha256="bf8a419cb528df1bfc24ddd26d63f2ebea6f1e103f1a259d8d3a6c9b1cd53012") version("0.0.5", sha256="f3b5b0ac56fd22abed558c0fb0ba4f28edb8de7ef24cfda8ca8996562215822f") + depends_on("py-setuptools@42:", type="build", when="@0.1:") depends_on("py-setuptools", type="build") + depends_on("py-setuptools-scm@6.2:+toml", type=("build", "run"), when="@0.1:") + depends_on("py-setuptools-scm-git-archive", type="build", when="@0.1:") + depends_on("py-wheel@0.29:", type="build", when="@0.1:") + + depends_on("py-importlib-metadata", type=("build", "run"), when="@0.1:") depends_on("py-numpy", type=("build", "run"), when="@:0.0.5") depends_on("py-nose", type=("build", "run"), when="@:0.0.7") # six is unused as of 0.0.15, but still listed in setup.py - depends_on("py-six", type=("build", "run"), when="@0.0.6:") + depends_on("py-six", type=("build", "run"), when="@0.0.6:0.0.16") depends_on("py-pytest", type="test") diff --git a/var/spack/repos/builtin/packages/py-fprettify/package.py b/var/spack/repos/builtin/packages/py-fprettify/package.py index 9807f25fb6eb0a..f0fe59ce046d4a 100644 --- a/var/spack/repos/builtin/packages/py-fprettify/package.py +++ b/var/spack/repos/builtin/packages/py-fprettify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-fqdn/package.py b/var/spack/repos/builtin/packages/py-fqdn/package.py index beed2102618d38..ed0340894a691d 100644 --- a/var/spack/repos/builtin/packages/py-fqdn/package.py +++ b/var/spack/repos/builtin/packages/py-fqdn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFqdn(PythonPackage): homepage = "https://github.com/ypcrts/fqdn" pypi = "fqdn/fqdn-1.5.1.tar.gz" + license("MPL-2.0") + version("1.5.1", sha256="105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-fracridge/package.py b/var/spack/repos/builtin/packages/py-fracridge/package.py index 1d48013723edf3..95032a7533a151 100644 --- a/var/spack/repos/builtin/packages/py-fracridge/package.py +++ b/var/spack/repos/builtin/packages/py-fracridge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFracridge(PythonPackage): pypi = "fracridge/fracridge-1.4.3.tar.gz" git = "https://github.com/nrdg/fracridge" + license("BSD-2-Clause") + version("2.0", sha256="d49fbffbd58e85da38f572e6ca2ef7563b1a6c8c4e1ab779e2dd207ac944db90") version("1.4.3", sha256="0446d486f00fea02110567fd9df14b8b2a7b155dc72700af9201873ea11c27cc") diff --git a/var/spack/repos/builtin/packages/py-fraction/package.py b/var/spack/repos/builtin/packages/py-fraction/package.py index 919d14cadf0c19..873a1b7612a726 100644 --- a/var/spack/repos/builtin/packages/py-fraction/package.py +++ b/var/spack/repos/builtin/packages/py-fraction/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyFraction(PythonPackage): maintainers("LydDeb") + license("MIT") + version("2.2.0", sha256="2c1179f20c8b749622935fe04db1c7f2987f011f2376bdad84c2a39c8e3d0fdb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-freezegun/package.py b/var/spack/repos/builtin/packages/py-freezegun/package.py index 7b6fd79e2ba6bf..dc5c32a4e19e6a 100644 --- a/var/spack/repos/builtin/packages/py-freezegun/package.py +++ b/var/spack/repos/builtin/packages/py-freezegun/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFreezegun(PythonPackage): homepage = "https://github.com/spulec/freezegun" pypi = "freezegun/freezegun-0.3.12.tar.gz" + license("Apache-2.0") + version("0.3.12", sha256="2a4d9c8cd3c04a201e20c313caf8b6338f1cfa4cda43f46a94cc4a9fd13ea5e7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-frozendict/package.py b/var/spack/repos/builtin/packages/py-frozendict/package.py index 44f1bc03261df8..cfe5a80225dc0e 100644 --- a/var/spack/repos/builtin/packages/py-frozendict/package.py +++ b/var/spack/repos/builtin/packages/py-frozendict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFrozendict(PythonPackage): homepage = "An immutable dictionary" pypi = "frozendict/frozendict-1.2.tar.gz" + license("LGPL-3.0-only") + version("2.3.4", sha256="15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78") version("1.2", sha256="774179f22db2ef8a106e9c38d4d1f8503864603db08de2e33be5b778230f6e45") diff --git a/var/spack/repos/builtin/packages/py-frozenlist/package.py b/var/spack/repos/builtin/packages/py-frozenlist/package.py index 2a553efa36cec8..619c8981fb911f 100644 --- a/var/spack/repos/builtin/packages/py-frozenlist/package.py +++ b/var/spack/repos/builtin/packages/py-frozenlist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFrozenlist(PythonPackage): homepage = "https://github.com/aio-libs/frozenlist" pypi = "frozenlist/frozenlist-1.2.0.tar.gz" + license("Apache-2.0") + version("1.3.1", sha256="3a735e4211a04ccfa3f4833547acdf5d2f863bfeb01cfd3edaffbc251f15cec8") version("1.3.0", sha256="ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b") version("1.2.0", sha256="68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de") diff --git a/var/spack/repos/builtin/packages/py-fs/package.py b/var/spack/repos/builtin/packages/py-fs/package.py index ef92284291c84c..1d7e8e4145b8ea 100644 --- a/var/spack/repos/builtin/packages/py-fs/package.py +++ b/var/spack/repos/builtin/packages/py-fs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFs(PythonPackage): homepage = "https://github.com/PyFilesystem/pyfilesystem2" pypi = "fs/fs-2.4.14.tar.gz" + license("MIT") + version("2.4.14", sha256="9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c") version("0.5.4", sha256="ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197") diff --git a/var/spack/repos/builtin/packages/py-fsspec/package.py b/var/spack/repos/builtin/packages/py-fsspec/package.py index e9a2d3f41192f9..ce4af47d63cf95 100644 --- a/var/spack/repos/builtin/packages/py-fsspec/package.py +++ b/var/spack/repos/builtin/packages/py-fsspec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,12 @@ class PyFsspec(PythonPackage): homepage = "https://github.com/intake/filesystem_spec" pypi = "fsspec/fsspec-0.4.4.tar.gz" + license("BSD-3-Clause") + + # Requires pytest + skip_modules = ["fsspec.tests"] + + version("2023.10.0", sha256="330c66757591df346ad3091a53bd907e15348c2ba17d63fd54f5c39c4457d2a5") version("2023.1.0", sha256="fbae7f20ff801eb5f7d0bedf81f25c787c0dfac5e982d98fa3884a9cde2b5411") version("2022.11.0", sha256="259d5fd5c8e756ff2ea72f42e7613c32667dc2049a4ac3d84364a7ca034acb8b") version("2021.7.0", sha256="792ebd3b54de0b30f1ce73f0ba0a8bcc864724f2d9f248cb8d0ece47db0cbde8") diff --git a/var/spack/repos/builtin/packages/py-ftfy/package.py b/var/spack/repos/builtin/packages/py-ftfy/package.py index c1136995305df5..168ebec6fb2ee3 100644 --- a/var/spack/repos/builtin/packages/py-ftfy/package.py +++ b/var/spack/repos/builtin/packages/py-ftfy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFtfy(PythonPackage): homepage = "https://ftfy.readthedocs.io" pypi = "ftfy/ftfy-5.8.tar.gz" + license("Apache-2.0") + version("6.0.3", sha256="ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b") version("5.8", sha256="51c7767f8c4b47d291fcef30b9625fb5341c06a31e6a3b627039c706c42f3720") version("4.4.3", sha256="3c0066db64a98436e751e56414f03f1cdea54f29364c0632c141c36cca6a5d94") diff --git a/var/spack/repos/builtin/packages/py-ftputil/package.py b/var/spack/repos/builtin/packages/py-ftputil/package.py index ab7b38998b1983..e0865c6a30b2da 100644 --- a/var/spack/repos/builtin/packages/py-ftputil/package.py +++ b/var/spack/repos/builtin/packages/py-ftputil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFtputil(PythonPackage): pypi = "ftputil/ftputil-5.0.4.tar.gz" maintainers("charmoniumQ") + license("AFL-2.1") + version("5.0.4", sha256="6889db8649dd20d9b6d40a6c5f0f84ccf340a7dac1e0bfc0f0024090fc2afb33") # https://git.sr.ht/~sschwarzer/ftputil/tree/v5.0.4/item/setup.py diff --git a/var/spack/repos/builtin/packages/py-funcy/package.py b/var/spack/repos/builtin/packages/py-funcy/package.py index a008804bb6905c..37d98da0366d26 100644 --- a/var/spack/repos/builtin/packages/py-funcy/package.py +++ b/var/spack/repos/builtin/packages/py-funcy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFuncy(PythonPackage): homepage = "https://funcy.readthedocs.io" pypi = "funcy/funcy-1.15.tar.gz" + license("BSD-3-Clause") + version("1.15", sha256="65b746fed572b392d886810a98d56939c6e0d545abb750527a717c21ced21008") version("1.14", sha256="75ee84c3b446f92e68a857c2267b15a1b49c631c9d5a87a5f063cd2d6761a5c4") diff --git a/var/spack/repos/builtin/packages/py-furo/package.py b/var/spack/repos/builtin/packages/py-furo/package.py index a4ca3e1ce4d2d7..09c36a1b2d9ab5 100644 --- a/var/spack/repos/builtin/packages/py-furo/package.py +++ b/var/spack/repos/builtin/packages/py-furo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFuro(PythonPackage): homepage = "https://github.com/pradyunsg/furo" pypi = "furo/furo-2023.5.20.tar.gz" + license("MIT") + version("2023.9.10", sha256="5707530a476d2a63b8cad83b4f961f3739a69f4b058bcf38a03a39fa537195b2") version("2023.5.20", sha256="40e09fa17c6f4b22419d122e933089226dcdb59747b5b6c79363089827dea16f") diff --git a/var/spack/repos/builtin/packages/py-fury/package.py b/var/spack/repos/builtin/packages/py-fury/package.py index ff3edf19b1865a..12024d9f25bfd1 100644 --- a/var/spack/repos/builtin/packages/py-fury/package.py +++ b/var/spack/repos/builtin/packages/py-fury/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFury(PythonPackage): homepage = "https://github.com/fury-gl/fury" pypi = "fury/fury-0.7.1.tar.gz" + license("BSD-3-Clause") + version("0.7.1", sha256="bc7bdbdf1632f317f40c717c2f34a6b8424ce5abda3ebda31a058c0b725a316a") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fusepy/package.py b/var/spack/repos/builtin/packages/py-fusepy/package.py index 2c65ad5a240529..2abbbf68f9d202 100644 --- a/var/spack/repos/builtin/packages/py-fusepy/package.py +++ b/var/spack/repos/builtin/packages/py-fusepy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFusepy(PythonPackage): homepage = "https://github.com/fusepy/fusepy" pypi = "fusepy/fusepy-3.0.1.tar.gz" + license("ISC") + version("3.0.1", sha256="72ff783ec2f43de3ab394e3f7457605bf04c8cf288a2f4068b4cde141d4ee6bd") version("2.0.4", sha256="10f5c7f5414241bffecdc333c4d3a725f1d6605cae6b4eaf86a838ff49cdaf6c") diff --git a/var/spack/repos/builtin/packages/py-future/package.py b/var/spack/repos/builtin/packages/py-future/package.py index c4833db3f47b9e..14a51ad53bcb94 100644 --- a/var/spack/repos/builtin/packages/py-future/package.py +++ b/var/spack/repos/builtin/packages/py-future/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyFuture(PythonPackage): pypi = "future/future-0.18.2.tar.gz" git = "https://github.com/PythonCharmers/python-future.git" + license("MIT") + version("0.18.3", sha256="34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307") version("0.18.2", sha256="b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d") version("0.17.1", sha256="67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8") diff --git a/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py b/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py index 6b47c26a217bea..4c47685ad173ee 100644 --- a/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py +++ b/var/spack/repos/builtin/packages/py-fuzzywuzzy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFuzzywuzzy(PythonPackage): homepage = "https://github.com/seatgeek/fuzzywuzzy" pypi = "fuzzywuzzy/fuzzywuzzy-0.18.0.tar.gz" + license("GPL-2.0-only") + version("0.18.0", sha256="45016e92264780e58972dca1b3d939ac864b78437422beecebb3095f8efd00e8") variant("speedup", default=False, description="Provide a 4-10x speedup") diff --git a/var/spack/repos/builtin/packages/py-fypp/package.py b/var/spack/repos/builtin/packages/py-fypp/package.py index 0f128bb8be1076..be1690ca0ecf2c 100644 --- a/var/spack/repos/builtin/packages/py-fypp/package.py +++ b/var/spack/repos/builtin/packages/py-fypp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyFypp(PythonPackage): homepage = "https://github.com/aradi/fypp" url = "https://github.com/aradi/fypp/archive/2.1.1.zip" + license("BSD-2-Clause") + version("3.1", sha256="bac9d02be308b6bff7fd17da835f01fb9ce9b2dddaaad1ccd22ac7628b2dc53c") version("2.1.1", sha256="3744ad17045e91466bbb75a33ce0cab0f65bc2c377127067a932cdf15655e049") diff --git a/var/spack/repos/builtin/packages/py-galaxy-containers/package.py b/var/spack/repos/builtin/packages/py-galaxy-containers/package.py index 537ae376343dc9..bcac4870ed6e35 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-containers/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-containers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGalaxyContainers(PythonPackage): homepage = "https://github.com/galaxyproject/galaxy" pypi = "galaxy-containers/galaxy-containers-22.1.1.tar.gz" + license("CC-BY-3.0") + version("22.1.1", sha256="41e0003b18e580175d443cf21e9c2d2eb21a265c012164f7255cdb0c03a76334") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-galaxy-job-metrics/package.py b/var/spack/repos/builtin/packages/py-galaxy-job-metrics/package.py index d8679f33c72d6e..36a7c652ca9674 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-job-metrics/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-job-metrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxyJobMetrics(PythonPackage): homepage = "https://github.com/galaxyproject/galaxy" pypi = "galaxy-job-metrics/galaxy-job-metrics-22.1.1.tar.gz" + license("CC-BY-3.0") + version("22.1.1", sha256="53d9c791d60372a90a59709863570246066f395b9e83f0011865f930a53a63b4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-galaxy-objectstore/package.py b/var/spack/repos/builtin/packages/py-galaxy-objectstore/package.py index ad007c8c7654e3..3db0480cc661ee 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-objectstore/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-objectstore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxyObjectstore(PythonPackage): homepage = "https://github.com/galaxyproject/galaxy" pypi = "galaxy-objectstore/galaxy-objectstore-22.1.1.tar.gz" + license("CC-BY-3.0") + version("22.1.1", sha256="321a70f8bce89fec8d0322ba5821ee0b26d5cd3170a8dc9b7278cd383a9e88dd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-galaxy-sequence-utils/package.py b/var/spack/repos/builtin/packages/py-galaxy-sequence-utils/package.py index 87776782502da4..157b0eadc7bce4 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-sequence-utils/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-sequence-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxySequenceUtils(PythonPackage): homepage = "https://github.com/galaxyproject/sequence_utils" pypi = "galaxy-sequence-utils/galaxy_sequence_utils-1.1.5.tar.gz" + license("CC-BY-3.0") + version("1.1.5", sha256="c32bd91f6ff11ad6e8b62f8de309d695ef5c33a782afbf5122c1db7144ef1162") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-galaxy-tool-util/package.py b/var/spack/repos/builtin/packages/py-galaxy-tool-util/package.py index 5b02cb236c430b..0959545a7f75e5 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-tool-util/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-tool-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxyToolUtil(PythonPackage): homepage = "https://github.com/galaxyproject/galaxy" pypi = "galaxy-tool-util/galaxy-tool-util-22.1.5.tar.gz" + license("CC-BY-3.0") + version("22.1.5", sha256="60e0372f16255c5c11ec5c49dff432ed3beb97123d026f463cf633bc605c0112") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-galaxy-util/package.py b/var/spack/repos/builtin/packages/py-galaxy-util/package.py index 58828ed58466d8..22b1deac33557e 100644 --- a/var/spack/repos/builtin/packages/py-galaxy-util/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxyUtil(PythonPackage): homepage = "https://github.com/galaxyproject/galaxy" pypi = "galaxy-util/galaxy-util-22.1.2.tar.gz" + license("CC-BY-3.0") + version("22.1.2", sha256="80257c94dc9122ebf80d643aa3962fe8beda23dbba8fc4820a0d2b720f479f98") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py b/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py index cb8c9657ce5544..663c754000c0e9 100644 --- a/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py +++ b/var/spack/repos/builtin/packages/py-galaxy2cwl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGalaxy2cwl(PythonPackage): homepage = "https://github.com/workflowhub-eu/galaxy2cwl" url = "https://github.com/workflowhub-eu/galaxy2cwl/archive/refs/tags/0.1.4.tar.gz" + license("BSD-3-Clause") + version("0.1.4", sha256="ceb9024a7bf74c874be216c943cc97343563b1ec78f85fd3ec5b482c64350290") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gast/package.py b/var/spack/repos/builtin/packages/py-gast/package.py index 17353509d40527..6a2c52df05904d 100644 --- a/var/spack/repos/builtin/packages/py-gast/package.py +++ b/var/spack/repos/builtin/packages/py-gast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGast(PythonPackage): homepage = "https://github.com/serge-sans-paille/gast" pypi = "gast/gast-0.3.2.tar.gz" + license("BSD-3-Clause") + version("0.5.4", sha256="9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97") version("0.5.3", sha256="cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea") version("0.5.2", sha256="f81fcefa8b982624a31c9e4ec7761325a88a0eba60d36d1da90e47f8fe3c67f7") diff --git a/var/spack/repos/builtin/packages/py-gcovr/package.py b/var/spack/repos/builtin/packages/py-gcovr/package.py index 690c2ae7209f94..bd26134bc260ca 100644 --- a/var/spack/repos/builtin/packages/py-gcovr/package.py +++ b/var/spack/repos/builtin/packages/py-gcovr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py index ab3fbdde05be4d..12f30744695aff 100644 --- a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py +++ b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGcsOauth2BotoPlugin(PythonPackage): maintainers("dorton21") + license("Apache-2.0") + version("3.0", sha256="f4120b08b7f8d32904674c98f07d4caf4083a58343c0c0fa0016e0f0254dfe31") version("2.7", sha256="c95b011717911a6c40fbd3aa07a8faa0ab57570dee178d7148531327c4c6f93e") diff --git a/var/spack/repos/builtin/packages/py-gcsfs/package.py b/var/spack/repos/builtin/packages/py-gcsfs/package.py index d4f49c8a25594d..fbd53aef29c5ac 100644 --- a/var/spack/repos/builtin/packages/py-gcsfs/package.py +++ b/var/spack/repos/builtin/packages/py-gcsfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGcsfs(PythonPackage): homepage = "https://github.com/fsspec/gcsfs" pypi = "gcsfs/gcsfs-2023.1.0.tar.gz" + license("BSD-3-Clause") + version("2023.1.0", sha256="0a7b7ca8c1affa126a14ba35d7b7dff81c49e2aaceedda9732c7f159a4837a26") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gdbgui/package.py b/var/spack/repos/builtin/packages/py-gdbgui/package.py index f01d107024d981..3872c1951146a0 100644 --- a/var/spack/repos/builtin/packages/py-gdbgui/package.py +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGdbgui(PythonPackage): homepage = "https://gdbgui.com" pypi = "gdbgui/gdbgui-0.11.2.1.tar.gz" + license("GPL-3.0-or-later") + version("0.13.2.0", sha256="80e347a08b8cc630ab9f68482a1ed92c844fbfde46dc21fd39f3e6ef14b72e54") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gdc-client/package.py b/var/spack/repos/builtin/packages/py-gdc-client/package.py index 342199909d6550..e4d751196b3375 100644 --- a/var/spack/repos/builtin/packages/py-gdc-client/package.py +++ b/var/spack/repos/builtin/packages/py-gdc-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGdcClient(PythonPackage): homepage = "https://github.com/NCI-GDC/gdc-client" url = "https://github.com/NCI-GDC/gdc-client/archive/1.4.0.tar.gz" + license("Apache-2.0") + version("1.4.0", sha256="3ae6664f9666c75ffbf3c883409cfa51333f61d23b7aa99010925a084b4c9582") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py b/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py index 3d19e66da76a76..5736abba7bf7aa 100644 --- a/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py +++ b/var/spack/repos/builtin/packages/py-gee-asset-manager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGeeAssetManager(PythonPackage): url = "https://github.com/tracek/gee_asset_manager/archive/0.1.tar.gz" git = "https://github.com/tracek/gee_asset_manager.git" + license("Apache-2.0") + version("master", branch="master") version("0.1", sha256="0d3345855352354d8b84188705a09a35c21af2b753cda5c688ffb2e3a454ee23") diff --git a/var/spack/repos/builtin/packages/py-geeadd/package.py b/var/spack/repos/builtin/packages/py-geeadd/package.py index a18fbaf0a302fa..3d09a37bf99dfb 100644 --- a/var/spack/repos/builtin/packages/py-geeadd/package.py +++ b/var/spack/repos/builtin/packages/py-geeadd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGeeadd(PythonPackage): homepage = "https://github.com/samapriya/gee_asset_manager_addon" pypi = "geeadd/geeadd-0.3.0.tar.gz" + license("Apache-2.0") + version("0.3.0", sha256="591e6ff2847122598ed5b0452a892a76e332ce227d4ba75e4d03eca2c7a4beea") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-geeup/package.py b/var/spack/repos/builtin/packages/py-geeup/package.py index bd9fbae7679261..45f47aaec76352 100644 --- a/var/spack/repos/builtin/packages/py-geeup/package.py +++ b/var/spack/repos/builtin/packages/py-geeup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGeeup(PythonPackage): homepage = "https://github.com/samapriya/geeup" pypi = "geeup/geeup-0.2.4.tar.gz" + license("Apache-2.0") + version("0.2.4", sha256="20f62306ea900d7fa28a97cc92204716212dc030c50a6ac8214772a61a1a83fe") depends_on("py-setuptools@38.3.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-genders/package.py b/var/spack/repos/builtin/packages/py-genders/package.py index 6f44374158b669..b548d374b1700c 100644 --- a/var/spack/repos/builtin/packages/py-genders/package.py +++ b/var/spack/repos/builtin/packages/py-genders/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGenders(Package): homepage = "https://github.com/chaos/genders" url = "https://github.com/chaos/genders/releases/download/genders-1-22-1/genders-1.22.tar.gz" + license("GPL-2.0-or-later") + version( "1.22", sha256="0ff292825a29201106239c4d47d9ce4c6bda3f51c78c0463eb2634ecc337b774", diff --git a/var/spack/repos/builtin/packages/py-geneimpacts/package.py b/var/spack/repos/builtin/packages/py-geneimpacts/package.py index 164717ffc46015..224668ac106be1 100644 --- a/var/spack/repos/builtin/packages/py-geneimpacts/package.py +++ b/var/spack/repos/builtin/packages/py-geneimpacts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGeneimpacts(PythonPackage): homepage = "https://github.com/brentp/geneimpacts" url = "https://github.com/brentp/geneimpacts/archive/v0.3.7.tar.gz" + license("MIT") + version("0.3.7", sha256="895a0aa64935bf8528257fc5a3747c09adbf30c4885d95b0fa69ba4bb858c133") version("0.3.6", sha256="7998e469e7c25b15ecb1d7a73620cc42f13ca91f3f49384513729c180e3a9b97") diff --git a/var/spack/repos/builtin/packages/py-generateds/package.py b/var/spack/repos/builtin/packages/py-generateds/package.py index bcf82787cf4dd3..ee342c424a866a 100644 --- a/var/spack/repos/builtin/packages/py-generateds/package.py +++ b/var/spack/repos/builtin/packages/py-generateds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGenerateds(PythonPackage): maintainers("LydDeb") + license("MIT") + version("2.43.2", sha256="e86f033f4d93414dd5b04cab9544a68b8f46d559073d85cd0990266b7b9ec09e") version("2.43.1", sha256="2d3d71b42a09ba153bc51d2204324d04e384d0f15e41bdba881ee2daff9bbd68") version("2.42.2", sha256="1d322aa7e074c262062b068660dd0c53bbdb0bb2b30152bb9e0074bd29fd365a") diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index 0027757f55b6ec..66c8de0fd05816 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyGenshi(PythonPackage): pypi = "Genshi/Genshi-0.7.7.tar.gz" + license("BSD-3-Clause") + version("0.7.7", sha256="c100520862cd69085d10ee1a87e91289e7f59f6b3d9bd622bf58b2804e6b9aab") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gensim/package.py b/var/spack/repos/builtin/packages/py-gensim/package.py index 9ab2c5317fc1a9..c5ac143f0e59bc 100644 --- a/var/spack/repos/builtin/packages/py-gensim/package.py +++ b/var/spack/repos/builtin/packages/py-gensim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGensim(PythonPackage): maintainers("adamjstewart") + license("LGPL-2.1-only") + version("4.3.1", sha256="8b5f11c0e6a5308086b48e8f6841223a4fa1a37d513684612b7ee854b533015f") version("3.8.3", sha256="786adb0571f75114e9c5f7a31dd2e6eb39a9791f22c8757621545e2ded3ea367") version("3.8.1", sha256="33277fc0a8d7b0c7ce70fcc74bb82ad39f944c009b334856c6e86bf552b1dfdc") diff --git a/var/spack/repos/builtin/packages/py-geoalchemy2/package.py b/var/spack/repos/builtin/packages/py-geoalchemy2/package.py index ce1bb17c71d76d..1286c9c2312c7c 100644 --- a/var/spack/repos/builtin/packages/py-geoalchemy2/package.py +++ b/var/spack/repos/builtin/packages/py-geoalchemy2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGeoalchemy2(PythonPackage): homepage = "https://geoalchemy-2.readthedocs.io/en/latest" pypi = "GeoAlchemy2/GeoAlchemy2-0.6.3.tar.gz" + license("MIT") + version("0.6.3", sha256="4dc4c6c2bda0fc82cccab4aaff185a6570e13a5351d85e29e12984a55d4138ee") version("0.4.2", sha256="17fa10b0c01bd2ab036ea56975dfa850098aa394a5d6ee04d88b2aefc16751cb") diff --git a/var/spack/repos/builtin/packages/py-geocube/package.py b/var/spack/repos/builtin/packages/py-geocube/package.py index 010b197be58d4a..6f691751c6f2a1 100644 --- a/var/spack/repos/builtin/packages/py-geocube/package.py +++ b/var/spack/repos/builtin/packages/py-geocube/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGeocube(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("0.3.2", sha256="71ff0228f1ef44e3a649d29a045ff7e2a2094a5cfca30fadab8f88f4ec23a41d") version("0.3.1", sha256="5c97131010cd8d556a5fad2a3824452120640ac33a6a45b6ca9ee3c28f2e266f") version("0.0.17", sha256="bf8da0fa96d772ebaea0b98bafa0ba5b8639669d5feb07465d4255af177bddc0") diff --git a/var/spack/repos/builtin/packages/py-geographiclib/package.py b/var/spack/repos/builtin/packages/py-geographiclib/package.py index 65cde009fd8ba5..db31acac54510f 100644 --- a/var/spack/repos/builtin/packages/py-geographiclib/package.py +++ b/var/spack/repos/builtin/packages/py-geographiclib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGeographiclib(PythonPackage): maintainers("adamjstewart") + license("MIT") + version("1.50", sha256="12bd46ee7ec25b291ea139b17aa991e7ef373e21abd053949b75c0e9ca55c632") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-geomdl/package.py b/var/spack/repos/builtin/packages/py-geomdl/package.py new file mode 100644 index 00000000000000..7a4447e84b68bf --- /dev/null +++ b/var/spack/repos/builtin/packages/py-geomdl/package.py @@ -0,0 +1,28 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyGeomdl(PythonPackage): + """Object-oriented pure Python B-Spline and NURBS library.""" + + homepage = "https://pypi.org/project/geomdl" + pypi = "geomdl/geomdl-5.3.1.tar.gz" + + license("MIT") + + version("5.3.1", sha256="e81a31b4d5f111267b16045ba1d9539235a98b2cff5e4bad18f7ddcd4cb804c8") + + depends_on("py-setuptools@40.6.3:", type="build") + + # For compiling geomdl.core module + depends_on("py-cython@:2", type="build") + + variant("viz", default=False, description="Add viz dependencies") + + depends_on("py-numpy@1.15.4:", type="run", when="+viz") + depends_on("py-matplotlib@2.2.3:", type="run", when="+viz") + depends_on("py-plotly", type="run", when="+viz") diff --git a/var/spack/repos/builtin/packages/py-geopandas/package.py b/var/spack/repos/builtin/packages/py-geopandas/package.py index 9f297deb37b266..4b11243b2731f7 100644 --- a/var/spack/repos/builtin/packages/py-geopandas/package.py +++ b/var/spack/repos/builtin/packages/py-geopandas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyGeopandas(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("master", branch="master") version("0.11.1", sha256="f0f0c8d0423d30cf81de2056d853145c4362739350a7f8f2d72cc7409ef1eca1") version("0.11.0", sha256="562fe7dc19a6e0f61532d654c4752f7bf46e0714990c5844fe3de3f9c99cb873") diff --git a/var/spack/repos/builtin/packages/py-geoplot/package.py b/var/spack/repos/builtin/packages/py-geoplot/package.py index 5bdbc5d2a0b2c5..76acbb2ec0e803 100644 --- a/var/spack/repos/builtin/packages/py-geoplot/package.py +++ b/var/spack/repos/builtin/packages/py-geoplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-geopy/package.py b/var/spack/repos/builtin/packages/py-geopy/package.py index 11c67c838253ba..7d0b7d714aa810 100644 --- a/var/spack/repos/builtin/packages/py-geopy/package.py +++ b/var/spack/repos/builtin/packages/py-geopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGeopy(PythonPackage): maintainers("adamjstewart") + license("MIT") + version("2.1.0", sha256="892b219413e7955587b029949af3a1949c6fbac9d5ad17b79d850718f6a9550f") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py index 8b10c1749fcb66..85b6d5ff209303 100644 --- a/var/spack/repos/builtin/packages/py-gevent/package.py +++ b/var/spack/repos/builtin/packages/py-gevent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGevent(PythonPackage): pypi = "gevent/gevent-23.7.0.tar.gz" git = "https://github.com/gevent/gevent.git" + license("MIT") + version("23.7.0", sha256="d0d3630674c1b344b256a298ab1ff43220f840b12af768131b5d74e485924237") version("21.12.0", sha256="f48b64578c367b91fa793bf8eaaaf4995cb93c8bc45860e473bf868070ad094e") version("21.8.0", sha256="43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575") diff --git a/var/spack/repos/builtin/packages/py-gf256/package.py b/var/spack/repos/builtin/packages/py-gf256/package.py index 23554da22f6893..b7482d0c41fb6e 100644 --- a/var/spack/repos/builtin/packages/py-gf256/package.py +++ b/var/spack/repos/builtin/packages/py-gf256/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-gffutils/package.py b/var/spack/repos/builtin/packages/py-gffutils/package.py index debac34c789333..df4d9e6c3a343f 100644 --- a/var/spack/repos/builtin/packages/py-gffutils/package.py +++ b/var/spack/repos/builtin/packages/py-gffutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyGffutils(PythonPackage): maintainers("dorton21") + license("MIT") + version("0.10.1", sha256="a8fc39006d7aa353147238160640e2210b168f7849cb99896be3fc9441e351cb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ghp-import/package.py b/var/spack/repos/builtin/packages/py-ghp-import/package.py index b866482412292b..30b48796d0912d 100644 --- a/var/spack/repos/builtin/packages/py-ghp-import/package.py +++ b/var/spack/repos/builtin/packages/py-ghp-import/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGhpImport(PythonPackage): homepage = "https://github.com/c-w/ghp-import" pypi = "ghp-import/ghp-import-2.1.0.tar.gz" + license("Apache-2.0") + version("2.1.0", sha256="9c535c4c61193c2df8871222567d7fd7e5014d835f97dc7b7439069e2413d343") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gidgethub/package.py b/var/spack/repos/builtin/packages/py-gidgethub/package.py new file mode 100644 index 00000000000000..94a47b49c6263a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-gidgethub/package.py @@ -0,0 +1,38 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class PyGidgethub(PythonPackage): + """An async GitHub API library for Python.""" + + homepage = "https://github.com/gidgethub/gidgethub" + pypi = "gidgethub/gidgethub-5.3.0.tar.gz" + git = "https://github.com/gidgethub/gidgethub.git" + + maintainers("alecbcs") + + license("Apache-2.0") + + version("main", branch="main") + version("5.3.0", sha256="9ece7d37fbceb819b80560e7ed58f936e48a65d37ec5f56db79145156b426a25") + + variant( + "aiohttp", default=False, description="Enable aiohttp functionality through dependency." + ) + variant( + "tornado", default=False, description="Enable tornado functionality through dependency." + ) + + depends_on("py-flit", type="build", when="@:5.3.0") + depends_on("py-flit-core", type="build", when="@5.3.1:") + + depends_on("py-uritemplate@3.0.1:", type=("build", "run")) + depends_on("py-pyjwt+crypto@2.4.0:", type=("build", "run")) + + depends_on("py-aiohttp", type=("build", "run"), when="+aiohttp") + depends_on("py-tornado", type=("build", "run"), when="+tornado") diff --git a/var/spack/repos/builtin/packages/py-gidgetlab/package.py b/var/spack/repos/builtin/packages/py-gidgetlab/package.py new file mode 100644 index 00000000000000..bd73c1b33c1277 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-gidgetlab/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class PyGidgetlab(PythonPackage): + """An asynchronous GitLab API library.""" + + homepage = "https://gitlab.com/beenje/gidgetlab" + pypi = "gidgetlab/gidgetlab-1.1.0.tar.gz" + git = "https://gitlab.com/beenje/gidgetlab.git" + + maintainers("alecbcs") + + license("Apache-2.0") + + version("main", branch="main") + version("1.1.0", sha256="314ec2cddc898317ec45d99068665dbf33c0fee1f52df6671f28ad35bb51f902") + + variant( + "aiohttp", default=False, description="Enable aiohttp functionality through dependency." + ) + + depends_on("py-setuptools@45:", type=("build", "run")) + depends_on("py-setuptools-scm@6.2:", type="build") + + depends_on("py-aiohttp", type=("build", "run"), when="+aiohttp") + depends_on("py-cachetools", type=("build", "run"), when="+aiohttp") diff --git a/var/spack/repos/builtin/packages/py-gimmik/package.py b/var/spack/repos/builtin/packages/py-gimmik/package.py index 05de9682db8ec2..2d14aca41e3640 100644 --- a/var/spack/repos/builtin/packages/py-gimmik/package.py +++ b/var/spack/repos/builtin/packages/py-gimmik/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyGimmik(PythonPackage): maintainers("MichaelLaufer") + license("BSD-3-Clause") + version("3.0", sha256="45c2da7acff3201b7796ba731e4be7f3b4f39469ff1f1bc0ddf4f19c4a6af010") version("2.3", sha256="c019c85316bcf0d5e84de9b7d10127355dfe8037c0e37f1880a9819ce92b74e1") version("2.2", sha256="9144640f94aab92f9c5dfcaf16885a79428ab97337cf503a4b2dddeb870f3cf0") diff --git a/var/spack/repos/builtin/packages/py-gin-config/package.py b/var/spack/repos/builtin/packages/py-gin-config/package.py index d427057f3fdf85..2e15fcc554c15c 100644 --- a/var/spack/repos/builtin/packages/py-gin-config/package.py +++ b/var/spack/repos/builtin/packages/py-gin-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGinConfig(PythonPackage): homepage = "https://github.com/google/gin-config" pypi = "gin-config/gin-config-0.5.0.tar.gz" + license("Apache-2.0") + version("0.5.0", sha256="0c6ea5026ded927c8c93c990b01c695257c1df446e45e549a158cfbc79e19ed6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-git-review/package.py b/var/spack/repos/builtin/packages/py-git-review/package.py index 99a200a046fce9..72e6396c7d63b8 100644 --- a/var/spack/repos/builtin/packages/py-git-review/package.py +++ b/var/spack/repos/builtin/packages/py-git-review/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGitReview(PythonPackage): homepage = "https://docs.openstack.org/infra/git-review" pypi = "git-review/git-review-1.25.0.tar.gz" + license("Apache-2.0") + version("2.1.0", sha256="3a6c775645b1fa8c40c49fbfce6f8d7e225a1e797a0aa92912607b1d97e61ed6") version("2.0.0", sha256="6e6c86b61334526c5c0f200fdf61957310b0c32208339a38c890db7fe0de5452") version("1.28.0", sha256="8e3aabb7b9484063e49c2504d137609401e32ad5128ff2a5cf43e98d5d3dc15a") diff --git a/var/spack/repos/builtin/packages/py-gitdb/package.py b/var/spack/repos/builtin/packages/py-gitdb/package.py index 2d6012bbacb4a4..946eb381d7db4a 100644 --- a/var/spack/repos/builtin/packages/py-gitdb/package.py +++ b/var/spack/repos/builtin/packages/py-gitdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGitdb(PythonPackage): homepage = "https://gitdb.readthedocs.io" pypi = "gitdb/gitdb-4.0.5.tar.gz" + license("BSD-3-Clause") + version("4.0.9", sha256="bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa") version("4.0.8", sha256="858966a9310649cb24a387c101429bb5a1110068a312517722b0281077e78bc6") version("4.0.7", sha256="96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005") diff --git a/var/spack/repos/builtin/packages/py-gitpython/package.py b/var/spack/repos/builtin/packages/py-gitpython/package.py index 69a0f5ec393acc..6a6e41a8eacd40 100644 --- a/var/spack/repos/builtin/packages/py-gitpython/package.py +++ b/var/spack/repos/builtin/packages/py-gitpython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,10 @@ class PyGitpython(PythonPackage): homepage = "https://gitpython.readthedocs.org" pypi = "GitPython/GitPython-3.1.12.tar.gz" + license("BSD-3-Clause") + + 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") diff --git a/var/spack/repos/builtin/packages/py-glmnet/package.py b/var/spack/repos/builtin/packages/py-glmnet/package.py index ac999711f80118..f4f11ce6112eb1 100644 --- a/var/spack/repos/builtin/packages/py-glmnet/package.py +++ b/var/spack/repos/builtin/packages/py-glmnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGlmnet(PythonPackage): homepage = "https://github.com/civisanalytics/python-glmnet" pypi = "glmnet/glmnet-2.2.1.tar.gz" + license("GPL-2.0-only") + version("2.2.1", sha256="3222bca2e901b3f60c2dc22df7aeba6bb9c7b6451b44cbbe1b91084b66f14481") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-glmsingle/package.py b/var/spack/repos/builtin/packages/py-glmsingle/package.py index a47fe0d82d5645..3b3e3c28c1dd72 100644 --- a/var/spack/repos/builtin/packages/py-glmsingle/package.py +++ b/var/spack/repos/builtin/packages/py-glmsingle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGlmsingle(PythonPackage): url = "https://github.com/cvnlab/GLMsingle/archive/refs/tags/1.0.tar.gz" git = "https://github.com/cvnlab/GLMsingle.git" + license("BSD-3-Clause") + version("main", branch="main") version("1.1", sha256="3fe3cb1f0d1e96976f2c707b1f9e8ddb932b74f58e99debbfa6f17761fdbd37b") version("1.0", sha256="0481f8ea7637d7e9cb53a7f22c73ba67b9fb8aefebc8c6c98bd4712de95db6aa") diff --git a/var/spack/repos/builtin/packages/py-glob2/package.py b/var/spack/repos/builtin/packages/py-glob2/package.py index 5b925968afe9ee..03bc375a98ce32 100644 --- a/var/spack/repos/builtin/packages/py-glob2/package.py +++ b/var/spack/repos/builtin/packages/py-glob2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-globus-sdk/package.py b/var/spack/repos/builtin/packages/py-globus-sdk/package.py index 9a90b038ba5e7c..33458b22d81bb5 100644 --- a/var/spack/repos/builtin/packages/py-globus-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-globus-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyGlobusSdk(PythonPackage): maintainers("hategan", "climbfuji") + license("Apache-2.0") + version("3.25.0", sha256="d9be275d4ec18054db04732f75649c4227800c79b31fbcfb3f4f31eccfa5f4f7") version("3.10.1", sha256="c20fec55fc7e099f4d0c8224a36e194604577539445c5985cb465b23779baee8") version("3.10.0", sha256="7a7e7cd5cfbc40c6dc75bdb92b050c4191f992b5f7081cd08895bf119fd97bbf") diff --git a/var/spack/repos/builtin/packages/py-gluoncv/package.py b/var/spack/repos/builtin/packages/py-gluoncv/package.py index 3099006c4025c7..00990450aa1173 100644 --- a/var/spack/repos/builtin/packages/py-gluoncv/package.py +++ b/var/spack/repos/builtin/packages/py-gluoncv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyGluoncv(PythonPackage): pypi = "gluoncv/gluoncv-0.6.0.tar.gz" git = "https://github.com/dmlc/gluon-cv.git" + license("Apache-2.0") + version( "0.10.5.post0", sha256="4598b9612e8b459a5a14ebeffedefcdae4a5700302a91f9b99fc82e9b08928a5" ) diff --git a/var/spack/repos/builtin/packages/py-glymur/package.py b/var/spack/repos/builtin/packages/py-glymur/package.py index 0a6c4bb97759e7..aa8e50de83821f 100644 --- a/var/spack/repos/builtin/packages/py-glymur/package.py +++ b/var/spack/repos/builtin/packages/py-glymur/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGlymur(PythonPackage): homepage = "https://github.com/quintusdias/glymur" pypi = "Glymur/Glymur-0.9.9.tar.gz" + license("MIT") + version("0.9.9", sha256="25b8a6ac07892c98b4613f959295ada9ca5e76b27bfa25069ab0a8a5bb4048f4") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gmsh-interop/package.py b/var/spack/repos/builtin/packages/py-gmsh-interop/package.py index 6770dab0fcf941..0e8edccffe6693 100644 --- a/var/spack/repos/builtin/packages/py-gmsh-interop/package.py +++ b/var/spack/repos/builtin/packages/py-gmsh-interop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGmshInterop(PythonPackage): maintainers("cgcgcg") + license("MIT") + version("2021.1.1", sha256="5456903283327dfa57fd973bb463c5fbc1c98c8f7ad15327441acb75da10b5f1") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gmxapi/package.py b/var/spack/repos/builtin/packages/py-gmxapi/package.py index 430dac619337f4..77a03d6fd4257d 100644 --- a/var/spack/repos/builtin/packages/py-gmxapi/package.py +++ b/var/spack/repos/builtin/packages/py-gmxapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,9 @@ class PyGmxapi(PythonPackage): maintainers("eirrgang", "peterkasson") pypi = "gmxapi/gmxapi-0.4.2.tar.gz" + + license("LGPL-2.1-or-later") + version("0.4.2", sha256="c746c6498c73a75913d7fcb01c13cc001d4bcb82999e9bf91d63578565ed1a1f") version("0.4.1", sha256="cc7a2e509ab8a59c187d388dcfd21ea78b785c3b355149b1818085f34dbda62a") version("0.4.0", sha256="7fd58e6a4b1391043379e8ba55555ebeba255c5b394f5df9d676e6a5571d7eba") diff --git a/var/spack/repos/builtin/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py index 2d06c48a457809..4b87213469e738 100644 --- a/var/spack/repos/builtin/packages/py-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGnuplot(PythonPackage): "http://downloads.sourceforge.net/project/gnuplot-py/Gnuplot-py/1.8/gnuplot-py-1.8.tar.gz" ) + license("LGPL-2.1-or-later") + version("1.8", sha256="ab339be7847d30a8acfd616f27b5021bfde0999b7bf2d68400fbe62c53106e21") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-goatools/package.py b/var/spack/repos/builtin/packages/py-goatools/package.py index 3e988e3ed3d5d8..9282cc9e324314 100644 --- a/var/spack/repos/builtin/packages/py-goatools/package.py +++ b/var/spack/repos/builtin/packages/py-goatools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoatools(PythonPackage): homepage = "https://github.com/tanghaibao/goatools" pypi = "goatools/goatools-0.7.11.tar.gz" + license("BSD-2-Clause") + version("0.7.11", sha256="753c6fb8c901367aa5d64ce5ad487d82903e424cf8ec7bac50ee069b307f6364") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gooey/package.py b/var/spack/repos/builtin/packages/py-gooey/package.py index faac492ef54973..f65909c19beb01 100644 --- a/var/spack/repos/builtin/packages/py-gooey/package.py +++ b/var/spack/repos/builtin/packages/py-gooey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGooey(PythonPackage): maintainers("dorton21") + license("MIT") + version("1.0.8.1", sha256="08d6bf534f4d50d50dafba5cfc68dcf31a6e9eeef13a94cbe3ea17c4e45c4671") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-google-api-core/package.py b/var/spack/repos/builtin/packages/py-google-api-core/package.py index 3c698f4e6516a1..be636c355308c2 100644 --- a/var/spack/repos/builtin/packages/py-google-api-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-api-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGoogleApiCore(PythonPackage): # Leave them out of 'import_modules' to avoid optional dependency. import_modules = ["google.api_core", "google.api_core.future"] + license("Apache-2.0") + version("2.11.0", sha256="4b9bb5d5a380a0befa0573b302651b8a9a89262c1730e37bf423cec511804c22") version("1.14.2", sha256="2c23fbc81c76b941ffb71301bb975ed66a610e9b03f918feacd1ed59cf43a6ec") diff --git a/var/spack/repos/builtin/packages/py-google-api-python-client/package.py b/var/spack/repos/builtin/packages/py-google-api-python-client/package.py index ca6f577d2879c4..ae019205fc7014 100644 --- a/var/spack/repos/builtin/packages/py-google-api-python-client/package.py +++ b/var/spack/repos/builtin/packages/py-google-api-python-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGoogleApiPythonClient(PythonPackage): homepage = "https://github.com/google/google-api-python-client/" pypi = "google-api-python-client/google-api-python-client-1.7.10.tar.gz" + license("Apache-2.0") + version("2.80.0", sha256="51dd62d467da7ad3df63c3f0e6fca84266ce50c2218691204b2e8cd651a0719a") version("1.7.10", sha256="2e55a5c7b56233c68945b6804c73e253445933f4d485d4e69e321b38772b9dd6") diff --git a/var/spack/repos/builtin/packages/py-google-apitools/package.py b/var/spack/repos/builtin/packages/py-google-apitools/package.py index 4834de86e99e87..8f67a403d8d7c4 100644 --- a/var/spack/repos/builtin/packages/py-google-apitools/package.py +++ b/var/spack/repos/builtin/packages/py-google-apitools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGoogleApitools(PythonPackage): maintainers("dorton21") + license("Apache-2.0") + version("0.5.32", sha256="c3763e52289f61e21c41d5531e20fbda9cc8484a088b8686fd460770db8bad13") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py b/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py index 24f0bedd28f6f0..a3ed68b22e5126 100644 --- a/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth-httplib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleAuthHttplib2(PythonPackage): homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2" pypi = "google-auth-httplib2/google-auth-httplib2-0.0.3.tar.gz" + license("Apache-2.0") + version("0.1.0", sha256="a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac") version("0.0.3", sha256="098fade613c25b4527b2c08fa42d11f3c2037dda8995d86de0745228e965d445") diff --git a/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py b/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py index 1a7cd2a9e0c900..b100b4fbe01375 100644 --- a/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth-oauthlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGoogleAuthOauthlib(PythonPackage): homepage = "https://github.com/googleapis/google-auth-library-python-oauthlib" pypi = "google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz" + license("Apache-2.0") + version("0.5.2", sha256="d5e98a71203330699f92a26bc08847a92e8c3b1b8d82a021f1af34164db143ae") version("0.4.6", sha256="a90a072f6993f2c327067bf65270046384cda5a8ecb20b94ea9a687f1f233a7a") version("0.4.1", sha256="88d2cd115e3391eb85e1243ac6902e76e77c5fe438b7276b297fbe68015458dd") diff --git a/var/spack/repos/builtin/packages/py-google-auth/package.py b/var/spack/repos/builtin/packages/py-google-auth/package.py index 1a420c85d54fd6..e115907e967066 100644 --- a/var/spack/repos/builtin/packages/py-google-auth/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGoogleAuth(PythonPackage): homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python" pypi = "google-auth/google-auth-1.6.3.tar.gz" + license("Apache-2.0") + version("2.20.0", sha256="030af34138909ccde0fbce611afc178f1d65d32fbff281f25738b1fe1c6f3eaa") version("2.16.2", sha256="07e14f34ec288e3f33e00e2e3cc40c8942aa5d4ceac06256a28cd8e786591420") version("2.11.0", sha256="ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb") diff --git a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py index 503a4044d0b275..c0f9b7e655b2b6 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleCloudCore(PythonPackage): homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python" pypi = "google-cloud-core/google-cloud-core-1.0.3.tar.gz" + license("Apache-2.0") + version("2.3.2", sha256="b9529ee7047fd8d4bf4a2182de619154240df17fbe60ead399078c1ae152af9a") version("1.0.3", sha256="10750207c1a9ad6f6e082d91dbff3920443bdaf1c344a782730489a9efa802f1") diff --git a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py index e0c06d18bc212c..f62f3f561e58b0 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleCloudStorage(PythonPackage): homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python" pypi = "google-cloud-storage/google-cloud-storage-1.18.0.tar.gz" + license("Apache-2.0") + version("2.7.0", sha256="1ac2d58d2d693cb1341ebc48659a3527be778d9e2d8989697a2746025928ff17") version("1.18.0", sha256="9fb3dc68948f4c893c2b16f5a3db3daea2d2f3b8e9d5c2d505fe1523758009b6") diff --git a/var/spack/repos/builtin/packages/py-google-crc32c/package.py b/var/spack/repos/builtin/packages/py-google-crc32c/package.py index 0ae4b383bbffa4..a083dd9cbc3965 100644 --- a/var/spack/repos/builtin/packages/py-google-crc32c/package.py +++ b/var/spack/repos/builtin/packages/py-google-crc32c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGoogleCrc32c(PythonPackage): maintainers("marcusboden") + license("Apache-2.0") + version("1.3.0", sha256="276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-google-pasta/package.py b/var/spack/repos/builtin/packages/py-google-pasta/package.py index cb149e0c1fde8f..e504939ea55512 100644 --- a/var/spack/repos/builtin/packages/py-google-pasta/package.py +++ b/var/spack/repos/builtin/packages/py-google-pasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGooglePasta(PythonPackage): homepage = "https://github.com/google/pasta" pypi = "google-pasta/google-pasta-0.1.8.tar.gz" + license("Apache-2.0") + version("0.2.0", sha256="c9f2c8dfc8f96d0d5808299920721be30c9eec37f2389f28904f454565c8a16e") version("0.1.8", sha256="713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb") version("0.1.7", sha256="324ae96cea1c27af1bbe289e502ad26673d9e00236a64a3efd68bf12dfd85a51") diff --git a/var/spack/repos/builtin/packages/py-google-reauth/package.py b/var/spack/repos/builtin/packages/py-google-reauth/package.py index 08ebba6e491611..4238ad5a085620 100644 --- a/var/spack/repos/builtin/packages/py-google-reauth/package.py +++ b/var/spack/repos/builtin/packages/py-google-reauth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleReauth(PythonPackage): homepage = "https://github.com/Google/google-reauth-python" pypi = "google-reauth/google-reauth-0.1.1.tar.gz" + license("Apache-2.0") + version("0.1.1", sha256="f9f6852a55c2c5453d581cd01f3d1278e86147c03d008409800390a834235892") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-google-resumable-media/package.py b/var/spack/repos/builtin/packages/py-google-resumable-media/package.py index 67b51a840f4908..1ccd2434851ce1 100644 --- a/var/spack/repos/builtin/packages/py-google-resumable-media/package.py +++ b/var/spack/repos/builtin/packages/py-google-resumable-media/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleResumableMedia(PythonPackage): homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python" pypi = "google-resumable-media/google-resumable-media-0.3.2.tar.gz" + license("Apache-2.0") + version("2.4.1", sha256="15b8a2e75df42dc6502d1306db0bce2647ba6013f9cd03b6e17368c0886ee90a") version("0.3.2", sha256="3e38923493ca0d7de0ad91c31acfefc393c78586db89364e91cb4f11990e51ba") diff --git a/var/spack/repos/builtin/packages/py-google/package.py b/var/spack/repos/builtin/packages/py-google/package.py index b0701c99e350ee..480aac0586c1d9 100644 --- a/var/spack/repos/builtin/packages/py-google/package.py +++ b/var/spack/repos/builtin/packages/py-google/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py b/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py index dc08a6f727b930..2bc2e4f57d27e0 100644 --- a/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py +++ b/var/spack/repos/builtin/packages/py-googleapis-common-protos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGoogleapisCommonProtos(PythonPackage): homepage = "https://github.com/googleapis/googleapis" pypi = "googleapis-common-protos/googleapis-common-protos-1.6.0.tar.gz" + license("Apache-2.0") + version("1.58.0", sha256="c727251ec025947d545184ba17e3578840fc3a24a0516a020479edab660457df") version("1.55.0", sha256="53eb313064738f45d5ac634155ae208e121c963659627b90dfcb61ef514c03e1") version("1.6.0", sha256="e61b8ed5e36b976b487c6e7b15f31bb10c7a0ca7bd5c0e837f4afab64b53a0c6") diff --git a/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py b/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py index f8168ea306101b..5525be6dac5e86 100644 --- a/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py +++ b/var/spack/repos/builtin/packages/py-googledrivedownloader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGoogledrivedownloader(PythonPackage): homepage = "https://github.com/ndrplz/google-drive-downloader" pypi = "googledrivedownloader/googledrivedownloader-0.4.tar.gz" + license("MIT") + version("0.4", sha256="4b34c1337b2ff3bf2bd7581818efbdcaea7d50ffd484ccf80809688f5ca0e204") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gosam/package.py b/var/spack/repos/builtin/packages/py-gosam/package.py index 9779e82a58f434..22e8f70f15938b 100644 --- a/var/spack/repos/builtin/packages/py-gosam/package.py +++ b/var/spack/repos/builtin/packages/py-gosam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyGosam(Package): extends("python") + license("GPL-3.0-only") + version( "2.1.1", url="https://github.com/gudrunhe/gosam/releases/download/2.1.1/gosam-2.1.1-4b98559.tar.gz", diff --git a/var/spack/repos/builtin/packages/py-gpaw/package.py b/var/spack/repos/builtin/packages/py-gpaw/package.py index f6759fb279ea53..8a94a37b1d0077 100644 --- a/var/spack/repos/builtin/packages/py-gpaw/package.py +++ b/var/spack/repos/builtin/packages/py-gpaw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGpaw(PythonPackage): homepage = "https://wiki.fysik.dtu.dk/gpaw/index.html" pypi = "gpaw/gpaw-1.3.0.tar.gz" + license("GPL-3.0-only") + version("21.1.0", sha256="96843b68e04bd1c12606036c9f99b0ddfa5e6ee08ce46835e6bb347a6bd560a3") version("20.10.0", sha256="77c3d3918f5cc118e448f8063af4807d163b31d502067f5cbe31fc756eb3971d") version("20.1.0", sha256="c84307eb9943852d78d966c0c8856fcefdefa68621139906909908fb641b8421") diff --git a/var/spack/repos/builtin/packages/py-gpustat/package.py b/var/spack/repos/builtin/packages/py-gpustat/package.py index 12b1fa58e8b8ac..af78bd45d66345 100644 --- a/var/spack/repos/builtin/packages/py-gpustat/package.py +++ b/var/spack/repos/builtin/packages/py-gpustat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGpustat(PythonPackage): homepage = "https://github.com/wookayin/gpustat" pypi = "gpustat/gpustat-0.6.0.tar.gz" + license("MIT") + version("1.0.0b1", sha256="a25c460c5751180265814f457249ba5100baf7a055b23ad762a4e3ab3f6496dd") version( "0.6.0", diff --git a/var/spack/repos/builtin/packages/py-gputil/package.py b/var/spack/repos/builtin/packages/py-gputil/package.py index c28ee433dc1a6c..585752afd5e39f 100644 --- a/var/spack/repos/builtin/packages/py-gputil/package.py +++ b/var/spack/repos/builtin/packages/py-gputil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGputil(PythonPackage): homepage = "https://github.com/anderskm/gputil" pypi = "GPUtil/GPUtil-1.4.0.tar.gz" + license("MIT") + version("1.4.0", sha256="099e52c65e512cdfa8c8763fca67f5a5c2afb63469602d5dcb4d296b3661efb9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gpy/package.py b/var/spack/repos/builtin/packages/py-gpy/package.py index 82a85e94ec4687..18cf0f24efbe74 100644 --- a/var/spack/repos/builtin/packages/py-gpy/package.py +++ b/var/spack/repos/builtin/packages/py-gpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGpy(PythonPackage): pypi = "gpy/GPy-1.9.9.tar.gz" maintainers("liuyangzhuan") + license("BSD-3-Clause") + version("1.10.0", sha256="a2b793ef8d0ac71739e7ba1c203bc8a5afa191058b42caa617e0e29aa52aa6fb") version("1.9.9", sha256="04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed") version("0.8.8", sha256="e135d928cf170e2ec7fb058a035b5a7e334dc6b84d0bfb981556782528341988") diff --git a/var/spack/repos/builtin/packages/py-gpyopt/package.py b/var/spack/repos/builtin/packages/py-gpyopt/package.py index 83014070953a44..c2722daaba789e 100644 --- a/var/spack/repos/builtin/packages/py-gpyopt/package.py +++ b/var/spack/repos/builtin/packages/py-gpyopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGpyopt(PythonPackage): homepage = "http://sheffieldml.github.io/GPyOpt/" pypi = "GPyOpt/GPyOpt-1.2.6.tar.gz" + license("BSD-3-Clause") + version("1.2.6", sha256="e714daa035bb529a6db23c53665a762a4ab3456b9329c19ad3b03983f94c9b2a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-gpytorch/package.py b/var/spack/repos/builtin/packages/py-gpytorch/package.py index 753081d410618f..c4a98153f60582 100644 --- a/var/spack/repos/builtin/packages/py-gpytorch/package.py +++ b/var/spack/repos/builtin/packages/py-gpytorch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyGpytorch(PythonPackage): maintainers("adamjstewart", "meyersbs") + license("MIT") + version("1.10", sha256="6dc978ab9fbf220a845a4f1ea13104180fc50e6934081f421b37f6120afb7f18") version("1.9.1", sha256="0bdbba6f6d5957a0f43ef6dc7fec39c47e8a55f632ca33760c6189f259b3ccc3") version("1.9.0", sha256="a0608184c18a1f518d6a102473427abf00f5351421e12a934530953f6887b34b") diff --git a/var/spack/repos/builtin/packages/py-gql/package.py b/var/spack/repos/builtin/packages/py-gql/package.py index e3262535f8bd02..6bd7b2cd6ee942 100644 --- a/var/spack/repos/builtin/packages/py-gql/package.py +++ b/var/spack/repos/builtin/packages/py-gql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGql(PythonPackage): homepage = "https://github.com/graphql-python/gql" pypi = "gql/gql-2.0.0.tar.gz" + license("MIT") + version("3.0.0a1", sha256="ecd8fd0b6a5a8bb5c9e1a97eefad3f267fc889bd03316211193640d49b3e4525") version("0.4.0", sha256="259b0c66d8dfe61feb06fe45b57713da0fe2e5ca13fa500a1fafc9bf2f195e81") diff --git a/var/spack/repos/builtin/packages/py-gradio-client/package.py b/var/spack/repos/builtin/packages/py-gradio-client/package.py index bcedd71047c8ec..b839bf27096c5e 100644 --- a/var/spack/repos/builtin/packages/py-gradio-client/package.py +++ b/var/spack/repos/builtin/packages/py-gradio-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-gradio/package.py b/var/spack/repos/builtin/packages/py-gradio/package.py index 43f9b74c4ea8bb..3070071ab7ca04 100644 --- a/var/spack/repos/builtin/packages/py-gradio/package.py +++ b/var/spack/repos/builtin/packages/py-gradio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGradio(PythonPackage): homepage = "https://github.com/gradio-app/gradio" pypi = "gradio/gradio-3.36.1.tar.gz" + license("Apache-2.0") + version("3.36.1", sha256="1d821cee15da066c24c197248ba9aaed5f5e59505d17754561c2f96f90e73a89") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-grandalf/package.py b/var/spack/repos/builtin/packages/py-grandalf/package.py index 9a708a0ff72731..805a75036ab604 100644 --- a/var/spack/repos/builtin/packages/py-grandalf/package.py +++ b/var/spack/repos/builtin/packages/py-grandalf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGrandalf(PythonPackage): homepage = "https://github.com/bdcht/grandalf" url = "https://github.com/bdcht/grandalf/archive/v0.7.tar.gz" + license("EPL-1.0") + version("0.7", sha256="b3112299fe0a9123c088a16bf2f1b541d0d91199b77170a9739b569bd16a828e") version("0.6", sha256="928db4b90f7aff01e252a833951086b20d5958c00083411193c794de7bf59df2") diff --git a/var/spack/repos/builtin/packages/py-grapheme/package.py b/var/spack/repos/builtin/packages/py-grapheme/package.py index f006d4436ed592..2670c50dc58d61 100644 --- a/var/spack/repos/builtin/packages/py-grapheme/package.py +++ b/var/spack/repos/builtin/packages/py-grapheme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGrapheme(PythonPackage): homepage = "https://github.com/alvinlindstam/grapheme" pypi = "grapheme/grapheme-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="44c2b9f21bbe77cfb05835fec230bd435954275267fea1858013b102f8603cca") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-graphene-tornado/package.py b/var/spack/repos/builtin/packages/py-graphene-tornado/package.py index d54b40676c9b1f..6ba048d40b1c82 100644 --- a/var/spack/repos/builtin/packages/py-graphene-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-graphene-tornado/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGrapheneTornado(PythonPackage): maintainers("LydDeb") + license("MIT") + version("2.6.1", sha256="953bf812267177224ce1ac2a93c669069d85a8fa187a9fac681b76b63dffebc2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-graphene/package.py b/var/spack/repos/builtin/packages/py-graphene/package.py index 407156127f32ec..43c030e625bf25 100644 --- a/var/spack/repos/builtin/packages/py-graphene/package.py +++ b/var/spack/repos/builtin/packages/py-graphene/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGraphene(PythonPackage): maintainers("LydDeb") + license("MIT") + version("2.1.9", sha256="b9f2850e064eebfee9a3ef4a1f8aa0742848d97652173ab44c82cc8a62b9ed93") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-graphlib-backport/package.py b/var/spack/repos/builtin/packages/py-graphlib-backport/package.py index e177b4da96c9a7..5c201c6cd9169f 100644 --- a/var/spack/repos/builtin/packages/py-graphlib-backport/package.py +++ b/var/spack/repos/builtin/packages/py-graphlib-backport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-graphql-core/package.py b/var/spack/repos/builtin/packages/py-graphql-core/package.py index 492444f5ccc429..d2fd396ed24ed0 100644 --- a/var/spack/repos/builtin/packages/py-graphql-core/package.py +++ b/var/spack/repos/builtin/packages/py-graphql-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGraphqlCore(PythonPackage): homepage = "https://github.com/graphql-python/graphql-core" pypi = "graphql-core/graphql-core-3.1.5.tar.gz" + license("MIT") + version("3.1.2", sha256="c056424cbdaa0ff67446e4379772f43746bad50a44ec23d643b9bdcd052f5b3a") version("3.0.5", sha256="51f7dab06b5035515b23984f6fcb677ed909b56c672152699cca32e03624992e") version("2.3.2", sha256="aac46a9ac524c9855910c14c48fc5d60474def7f99fd10245e76608eba7af746") diff --git a/var/spack/repos/builtin/packages/py-graphql-relay/package.py b/var/spack/repos/builtin/packages/py-graphql-relay/package.py index 67aaa8d25a2c6a..3629fa83d370b8 100644 --- a/var/spack/repos/builtin/packages/py-graphql-relay/package.py +++ b/var/spack/repos/builtin/packages/py-graphql-relay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGraphqlRelay(PythonPackage): maintainers("LydDeb") + license("MIT") + version("2.0.1", sha256="870b6b5304123a38a0b215a79eace021acce5a466bf40cd39fa18cb8528afabb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-graphql-ws/package.py b/var/spack/repos/builtin/packages/py-graphql-ws/package.py index c89e5d8fd9d800..815feb5833ea08 100644 --- a/var/spack/repos/builtin/packages/py-graphql-ws/package.py +++ b/var/spack/repos/builtin/packages/py-graphql-ws/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGraphqlWs(PythonPackage): maintainers("LydDeb") + license("MIT") + version("0.4.4", sha256="2ad38db70f37964f54d7eb3e2ede86dbe3f2a1ed7ea0a9f9a3b8b17162a22852") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-graphviz/package.py b/var/spack/repos/builtin/packages/py-graphviz/package.py index daba0071f5b689..259f33d5e23409 100644 --- a/var/spack/repos/builtin/packages/py-graphviz/package.py +++ b/var/spack/repos/builtin/packages/py-graphviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGraphviz(PythonPackage): homepage = "https://github.com/xflr6/graphviz" pypi = "graphviz/graphviz-0.10.1.zip" + license("MIT") + version("0.13.2", sha256="60acbeee346e8c14555821eab57dbf68a169e6c10bce40e83c1bf44f63a62a01") version("0.13", sha256="dc08677f37c65a4a480f00df4bd0d19a0a103c06aad95f21a37f0b7fd440de81") version("0.12", sha256="c60e232a66e4847f9f644fbaa94730ca4f78385a1314a2cc1e7f4cb2d7461298") diff --git a/var/spack/repos/builtin/packages/py-gravity/package.py b/var/spack/repos/builtin/packages/py-gravity/package.py index 2b6dc9666af811..1b1c124641093d 100644 --- a/var/spack/repos/builtin/packages/py-gravity/package.py +++ b/var/spack/repos/builtin/packages/py-gravity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGravity(PythonPackage): homepage = "https://github.com/galaxyproject/gravity" pypi = "gravity/gravity-0.13.6.tar.gz" + license("MIT") + version("0.13.6", sha256="6fc2377e7c61b7db9406fb5b5c70bf72c571fb777f1313fc98787ef4cd007394") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-grayskull/package.py b/var/spack/repos/builtin/packages/py-grayskull/package.py index f1375aa4567062..50ad9904bedcb5 100644 --- a/var/spack/repos/builtin/packages/py-grayskull/package.py +++ b/var/spack/repos/builtin/packages/py-grayskull/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGrayskull(PythonPackage): homepage = "https://github.com/conda/grayskull" pypi = "grayskull/grayskull-2.5.0.tar.gz" + license("Apache-2.0") + version("2.5.0", sha256="b021138655be550fd1b93b8db08b9c66169fac9cba6bcdad1411263e12fc703f") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-greenlet/package.py b/var/spack/repos/builtin/packages/py-greenlet/package.py index 5a379ff7d427bc..920fa2f4907946 100644 --- a/var/spack/repos/builtin/packages/py-greenlet/package.py +++ b/var/spack/repos/builtin/packages/py-greenlet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,11 @@ class PyGreenlet(PythonPackage): homepage = "https://github.com/python-greenlet/greenlet" pypi = "greenlet/greenlet-0.4.17.tar.gz" + # Requires objgraph + skip_modules = ["greenlet.tests"] + + license("MIT AND PSF-2.0", checked_by="tgamblin") + version("3.0.0a1", sha256="1bd4ea36f0aeb14ca335e0c9594a5aaefa1ac4e2db7d86ba38f0be96166b3102") version( "2.0.2", diff --git a/var/spack/repos/builtin/packages/py-grequests/package.py b/var/spack/repos/builtin/packages/py-grequests/package.py index a6871430355bdc..84b297549d0050 100644 --- a/var/spack/repos/builtin/packages/py-grequests/package.py +++ b/var/spack/repos/builtin/packages/py-grequests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-griddataformats/package.py b/var/spack/repos/builtin/packages/py-griddataformats/package.py index 97222314850df9..d91e53a05edbbd 100644 --- a/var/spack/repos/builtin/packages/py-griddataformats/package.py +++ b/var/spack/repos/builtin/packages/py-griddataformats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyGriddataformats(PythonPackage): maintainers("RMeli") + license("LGPL-3.0-only") + version("1.0.1", sha256="ad2c9ab7d672a6d8c426de7d083eee4f3e2b0bd59391675d30683c768ab83cc4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-griffe/package.py b/var/spack/repos/builtin/packages/py-griffe/package.py index fd89c3283bbe1d..9427d9c727c11a 100644 --- a/var/spack/repos/builtin/packages/py-griffe/package.py +++ b/var/spack/repos/builtin/packages/py-griffe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGriffe(PythonPackage): homepage = "https://mkdocstrings.github.io/griffe/" pypi = "griffe/griffe-0.22.0.tar.gz" + license("ISC") + version("0.22.0", sha256="a3c25a2b7bf729ecee7cd455b4eff548f01c620b8f58a8097a800caad221f12e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py index e2cc8d79db6289..b46a70255eb73b 100644 --- a/var/spack/repos/builtin/packages/py-grpcio-tools/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -41,8 +41,10 @@ def setup_build_environment(self, env): for dep in self.spec.dependencies(deptype="link"): query = self.spec[dep.name] - env.prepend_path("LIBRARY_PATH", query.libs.directories[0]) - env.prepend_path("CPATH", query.headers.directories[0]) + for p in query.libs.directories: + env.prepend_path("LIBRARY_PATH", p) + for p in query.headers.directories: + env.prepend_path("CPATH", p) def patch(self): if self.spec.satisfies("%fj"): diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py index 8a185d480265f0..7a7f8f6e9104c6 100644 --- a/var/spack/repos/builtin/packages/py-grpcio/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyGrpcio(PythonPackage): homepage = "https://grpc.io/" pypi = "grpcio/grpcio-1.32.0.tar.gz" + license("Apache-2.0") + version("1.52.0", sha256="a5d4a83d29fc39af429c10b9b326c174fec49b73398e4a966a1f2a4f30aa4fdb") version("1.48.1", sha256="660217eccd2943bf23ea9a36e2a292024305aec04bf747fbcff1f5032b83610e") version("1.43.0", sha256="735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5") @@ -55,8 +57,10 @@ def setup_build_environment(self, env): for dep in self.spec.dependencies(deptype="link"): query = self.spec[dep.name] - env.prepend_path("LIBRARY_PATH", query.libs.directories[0]) - env.prepend_path("CPATH", query.headers.directories[0]) + for p in query.libs.directories: + env.prepend_path("LIBRARY_PATH", p) + for p in query.headers.directories: + env.prepend_path("CPATH", p) def patch(self): filter_file("-std=gnu99", "", "setup.py") diff --git a/var/spack/repos/builtin/packages/py-gsd/package.py b/var/spack/repos/builtin/packages/py-gsd/package.py index 0b6d6ffb5224a2..2ab33471af47f3 100644 --- a/var/spack/repos/builtin/packages/py-gsd/package.py +++ b/var/spack/repos/builtin/packages/py-gsd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyGsd(PythonPackage): maintainers("RMeli") + license("BSD-2-Clause") + version("2.8.0", sha256="f2b031a26a7a5bee5f3940dc2f36c5a5b6670307b297c526adf2e26c1f5b46ae") version("1.9.3", sha256="c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838") diff --git a/var/spack/repos/builtin/packages/py-gssapi/package.py b/var/spack/repos/builtin/packages/py-gssapi/package.py index 488848eea3db44..081196475338d7 100644 --- a/var/spack/repos/builtin/packages/py-gssapi/package.py +++ b/var/spack/repos/builtin/packages/py-gssapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-gsutil/package.py b/var/spack/repos/builtin/packages/py-gsutil/package.py index 2b703e12a0eae3..0a07a29bf85224 100644 --- a/var/spack/repos/builtin/packages/py-gsutil/package.py +++ b/var/spack/repos/builtin/packages/py-gsutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGsutil(PythonPackage): maintainers("dorton21") + license("Apache-2.0") + version("5.24", sha256="1f841645cda40fcc817e9ca84d285cdf541cc015fd38a5862017b085756729a0") version("5.2", sha256="08857eedbd89c7c6d10176b14f94fb1168d5ef88f5b5b15b3e8a37e29302b79b") version("4.59", sha256="349e0e0b48c281659acec205917530ae57e2eb23db7220375f5add44688d3ddf") diff --git a/var/spack/repos/builtin/packages/py-gtdbtk/package.py b/var/spack/repos/builtin/packages/py-gtdbtk/package.py index 75b5171ffa95c0..a78e86eed08d6c 100644 --- a/var/spack/repos/builtin/packages/py-gtdbtk/package.py +++ b/var/spack/repos/builtin/packages/py-gtdbtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyGtdbtk(PythonPackage): homepage = "https://github.com/Ecogenomics/GTDBTk" pypi = "gtdbtk/gtdbtk-2.1.0.tar.gz" + license("GPL-3.0-only") + version("2.3.2", sha256="80efd31e10007d835f56a3d6fdf039a59db3b6ba4be26b234692da5e688aa99f") version("2.3.0", sha256="4f237a03657be4540ac653c276fe31c002b6923af0411316719a9541d6e97d4b") version("2.1.0", sha256="980885141f13502afdf05e720871427e3de4fe27f4f3f97e74af6fed87eb50a7") diff --git a/var/spack/repos/builtin/packages/py-gunicorn/package.py b/var/spack/repos/builtin/packages/py-gunicorn/package.py index b598b582f22d7b..372afb9cc6823c 100644 --- a/var/spack/repos/builtin/packages/py-gunicorn/package.py +++ b/var/spack/repos/builtin/packages/py-gunicorn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyGunicorn(PythonPackage): homepage = "https://gunicorn.org" pypi = "gunicorn/gunicorn-20.1.0.tar.gz" + license("MIT") + version("20.1.0", sha256="e0a968b5ba15f8a328fdfd7ab1fcb5af4470c28aaf7e55df02a99bc13138e6e8") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gxformat2/package.py b/var/spack/repos/builtin/packages/py-gxformat2/package.py index 343709f92c5ad9..56b70a9e062367 100644 --- a/var/spack/repos/builtin/packages/py-gxformat2/package.py +++ b/var/spack/repos/builtin/packages/py-gxformat2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyGxformat2(PythonPackage): pypi = "gxformat2/gxformat2-0.16.0.tar.gz" # note that requirements.txt is missing from the tarball. it can be found on github. + license("MIT") + version("0.16.0", sha256="16ff5aae1456e0a65c1ed644537e66626ea047a567c8eda19d2a2eb0b20fb752") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gym/package.py b/var/spack/repos/builtin/packages/py-gym/package.py index 7c6aa0e699f39e..5347f71b9fb297 100644 --- a/var/spack/repos/builtin/packages/py-gym/package.py +++ b/var/spack/repos/builtin/packages/py-gym/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyGym(PythonPackage): homepage = "https://github.com/openai/gym" pypi = "gym/gym-0.18.0.tar.gz" + license("MIT") + version("0.19.0", sha256="940069b983806e1ccc400fa6d47b4e34e462accf6a4fb0acb0a5e509ad0f502d") version("0.18.0", sha256="a0dcd25c1373f3938f4cb4565f74f434fba6faefb73a42d09c9dddd0c08af53e") diff --git a/var/spack/repos/builtin/packages/py-h11/package.py b/var/spack/repos/builtin/packages/py-h11/package.py index c87aa3a4d4deda..f03a0b3cd4138b 100644 --- a/var/spack/repos/builtin/packages/py-h11/package.py +++ b/var/spack/repos/builtin/packages/py-h11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyH11(PythonPackage): homepage = "https://github.com/python-hyper/h11" pypi = "h11/h11-0.10.0.tar.gz" + license("MIT") + version("0.13.0", sha256="70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06") version("0.12.0", sha256="47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042") version("0.11.0", sha256="3c6c61d69c6f13d41f1b80ab0322f1872702a3ba26e12aa864c928f6a43fbaab") diff --git a/var/spack/repos/builtin/packages/py-h2/package.py b/var/spack/repos/builtin/packages/py-h2/package.py index ddde9a755a1c2a..af414d12646d8c 100644 --- a/var/spack/repos/builtin/packages/py-h2/package.py +++ b/var/spack/repos/builtin/packages/py-h2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyH2(PythonPackage): homepage = "https://github.com/python-hyper/hyper-h2" pypi = "h2/h2-4.0.0.tar.gz" + license("MIT") + version("4.1.0", sha256="a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb") version("4.0.0", sha256="bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d") version("3.2.0", sha256="875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14") diff --git a/var/spack/repos/builtin/packages/py-h5glance/package.py b/var/spack/repos/builtin/packages/py-h5glance/package.py index 215765065e4034..0343669af3faa7 100644 --- a/var/spack/repos/builtin/packages/py-h5glance/package.py +++ b/var/spack/repos/builtin/packages/py-h5glance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyH5glance(PythonPackage): homepage = "https://github.com/European-XFEL/h5glance" pypi = "h5glance/h5glance-0.4.tar.gz" + license("BSD-3-Clause") + version("0.6", sha256="203369ab614273aaad3419f151e234609bb8390b201b65f678d7e17c57633e35") version("0.5", sha256="bc34ee42429f0440b329083e3f67fbf3d7016a4aed9e8b30911e5905217bc8d9") version("0.4", sha256="03babaee0d481991062842796126bc9e6b11e2e6e7daba57c26f2b58bf3bbd32") diff --git a/var/spack/repos/builtin/packages/py-h5io/package.py b/var/spack/repos/builtin/packages/py-h5io/package.py index ec53e6e99a97f7..7fba3793157f0e 100644 --- a/var/spack/repos/builtin/packages/py-h5io/package.py +++ b/var/spack/repos/builtin/packages/py-h5io/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyH5io(PythonPackage): pypi = "h5io/h5io-0.1.7.tar.gz" git = "https://github.com/h5io/h5io.git" + license("BSD-3-Clause") + version("0.1.7", sha256="be2684e678a28a5d59140de838f0165f095af865e48b8e498a279a3c2b89303e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-h5netcdf/package.py b/var/spack/repos/builtin/packages/py-h5netcdf/package.py index 925d936bbddc14..3c2a2193cd5d9f 100644 --- a/var/spack/repos/builtin/packages/py-h5netcdf/package.py +++ b/var/spack/repos/builtin/packages/py-h5netcdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyH5netcdf(PythonPackage): homepage = "https://github.com/h5netcdf/h5netcdf" pypi = "h5netcdf/h5netcdf-0.10.0.tar.gz" + license("BSD-3-Clause") + version("0.10.0", sha256="fc1cfec33bb9f730c412f87fcbc259167fd7620635679ccfc6e31971730dbd60") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 01c4e2194cf8a2..9aad3c0396466b 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,13 +15,10 @@ class PyH5py(PythonPackage): git = "https://github.com/h5py/h5py.git" maintainers("bryanherman", "takluyver") + license("BSD-3-Clause") + version("master", branch="master") - # DH* 20230710 - IS THIS STILL TRUE? if not, simply activate the line and remove - # the commend below, and it's like in main spack - # Version 3.8.0 seems to be broken or configured incorrectly, it's only building - # and installing the cpython extension, but none of the actual Python modules. - # version("3.8.0", sha256="6fead82f0c4000cf38d53f9c030780d81bfa0220218aee13b90b7701c937d95f") - # *DH 20230710 + version("3.8.0", sha256="6fead82f0c4000cf38d53f9c030780d81bfa0220218aee13b90b7701c937d95f") version("3.7.0", sha256="3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3") version("3.6.0", sha256="8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29") version("3.5.0", sha256="77c7be4001ac7d3ed80477de5b6942501d782de1bbe4886597bdfec2a7ab821f") @@ -43,44 +40,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.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") - # https://forum.hdfgroup.org/t/runtimeerror-wrong-file-driver-version/10123 - depends_on("hdf5@1.8.4:1.12.99 +hl", when="@3:3.6") - depends_on("hdf5@1.8.4: +hl", when="@3.7:") # 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")) - - # Patch version 3.7.0 so that it works with hdf5@1.14.0 (3.8.0 doesn't build correctly) - # https://github.com/h5py/h5py/pull/2194/commits - patch("h5py370_hdf51140.patch", when="@3.7.0") + depends_on("py-mpi4py", when="@:2 +mpi", type=("build", "run")) def flag_handler(self, name, flags): if name == "cflags": diff --git a/var/spack/repos/builtin/packages/py-h5sh/package.py b/var/spack/repos/builtin/packages/py-h5sh/package.py index e06481dde4c8ba..8fb5ab6103b69c 100644 --- a/var/spack/repos/builtin/packages/py-h5sh/package.py +++ b/var/spack/repos/builtin/packages/py-h5sh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyH5sh(PythonPackage): maintainers("sethrj") + license("BSD-3-Clause") + version("0.1.1", sha256="ccd8fed532d479d297baef044265100a4fb9cd119bce6f43270f2ee9f63a2183") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hacking/package.py b/var/spack/repos/builtin/packages/py-hacking/package.py index 1ec3c34dcd6fa0..579a3dc7509033 100644 --- a/var/spack/repos/builtin/packages/py-hacking/package.py +++ b/var/spack/repos/builtin/packages/py-hacking/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-handy-archives/package.py b/var/spack/repos/builtin/packages/py-handy-archives/package.py index f9a3dba92ae2d5..613cfa38129587 100644 --- a/var/spack/repos/builtin/packages/py-handy-archives/package.py +++ b/var/spack/repos/builtin/packages/py-handy-archives/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHandyArchives(PythonPackage): homepage = "https://github.com/domdfcoding/handy-archives" pypi = "handy_archives/handy_archives-0.2.0.tar.gz" + license("MIT") + version("0.2.0", sha256="fba21101fd9e29d5e3b72823261aaae06b9350686f0d2067786d64dce73eb3f6") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-haphpipe/package.py b/var/spack/repos/builtin/packages/py-haphpipe/package.py index 47a1ab3601b347..017b5eb40a45d2 100644 --- a/var/spack/repos/builtin/packages/py-haphpipe/package.py +++ b/var/spack/repos/builtin/packages/py-haphpipe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyHaphpipe(PythonPackage): maintainers("dorton21") + license("GPL-3.0-or-later") + version("1.0.3", sha256="9a9e8632a217ff4207c1dea66887a471e0ea04bbb7c0f0d72631acaba214bd37") # Deps. taken from diff --git a/var/spack/repos/builtin/packages/py-hatch-fancy-pypi-readme/package.py b/var/spack/repos/builtin/packages/py-hatch-fancy-pypi-readme/package.py index b480ca85fc32ec..904ac57749ae0e 100644 --- a/var/spack/repos/builtin/packages/py-hatch-fancy-pypi-readme/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-fancy-pypi-readme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py b/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py index c163222f295643..0bd62053a1aa52 100644 --- a/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-jupyter-builder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHatchJupyterBuilder(PythonPackage): homepage = "https://github.com/jupyterlab/hatch-jupyter-builder" pypi = "hatch_jupyter_builder/hatch_jupyter_builder-0.8.3.tar.gz" + license("BSD-3-Clause") + version("0.8.3", sha256="0dbd14a8aef6636764f88a8fd1fcc9a91921e5c50356e6aab251782f264ae960") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py b/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py index a634e4d0a348ee..5648c0c24792ee 100644 --- a/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-nodejs-version/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHatchNodejsVersion(PythonPackage): homepage = "https://github.com/agoose77/hatch-nodejs-version" pypi = "hatch_nodejs_version/hatch_nodejs_version-0.3.1.tar.gz" + license("MIT") + version("0.3.1", sha256="0e55fd713d92c5c1ccfee778efecaa780fd8bcd276d4ca7aff9f6791f6f76d9c") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hatch-requirements-txt/package.py b/var/spack/repos/builtin/packages/py-hatch-requirements-txt/package.py index 6f2489e2a9e9da..e36bb88f623c87 100644 --- a/var/spack/repos/builtin/packages/py-hatch-requirements-txt/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-requirements-txt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHatchRequirementsTxt(PythonPackage): homepage = "https://github.com/repo-helper/hatch-requirements-txt" pypi = "hatch_requirements_txt/hatch_requirements_txt-0.4.0.tar.gz" + license("MIT") + version("0.4.0", sha256="800509946e85d9e56d73242fab223ec36db50372e870a04e2dd1fd9bad98455d") depends_on("python@3.6.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py index 10e05abbd2c143..fe34688b98d2f5 100644 --- a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHatchVcs(PythonPackage): homepage = "https://github.com/ofek/hatch-vcs" pypi = "hatch_vcs/hatch_vcs-0.2.0.tar.gz" + license("MIT") + version("0.3.0", sha256="cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee") version("0.2.0", sha256="9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff") diff --git a/var/spack/repos/builtin/packages/py-hatchet/package.py b/var/spack/repos/builtin/packages/py-hatchet/package.py index 368d91280a3ef1..1a3a69b543ad44 100644 --- a/var/spack/repos/builtin/packages/py-hatchet/package.py +++ b/var/spack/repos/builtin/packages/py-hatchet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyHatchet(PythonPackage): maintainers("slabasan", "bhatele", "tgamblin") + license("MIT") + version("1.3.0", sha256="d77d071fc37863fdc9abc3fd9ea1088904cd98c6980a014a31e44595d2deac5e") version("1.2.0", sha256="1d5f80abfa69d1a379dff7263908c5c915023f18f26d50b639556e2f43ac755e") version("1.1.0", sha256="71bfa2881ef295294e5b4493acb8cce98d14c354e9ae59b42fb56a76d8ec7056") diff --git a/var/spack/repos/builtin/packages/py-hatchling/package.py b/var/spack/repos/builtin/packages/py-hatchling/package.py index 29fcce5df9aa2d..930a7067ae730e 100644 --- a/var/spack/repos/builtin/packages/py-hatchling/package.py +++ b/var/spack/repos/builtin/packages/py-hatchling/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class PyHatchling(PythonPackage): pypi = "hatchling/hatchling-1.4.1.tar.gz" git = "https://github.com/pypa/hatch" + license("MIT", checked_by="tgamblin") + + version("1.21.0", sha256="5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c") version("1.18.0", sha256="50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca") version("1.17.0", sha256="b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930") version("1.14.0", sha256="462ea91df03ff5d52813b5613fec1313a1a2059d2e37343e572b3f979867c5da") @@ -21,9 +24,7 @@ class PyHatchling(PythonPackage): version("1.8.1", sha256="448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd") version("1.4.1", sha256="13461b42876ade4f75ee5d2a2c656b288ca0aab7f048ef66657ef166996b2118") - depends_on("python@3.8:", when="@1.18:", type=("build", "run")) depends_on("py-editables@0.3:", type=("build", "run")) - depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run")) depends_on("py-packaging@21.3:", type=("build", "run")) depends_on("py-pathspec@0.10.1:", when="@1.9:", type=("build", "run")) depends_on("py-pathspec@0.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hclust2/package.py b/var/spack/repos/builtin/packages/py-hclust2/package.py index 9e65998e1ce581..ac5459a4289b7e 100644 --- a/var/spack/repos/builtin/packages/py-hclust2/package.py +++ b/var/spack/repos/builtin/packages/py-hclust2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hdbscan/package.py b/var/spack/repos/builtin/packages/py-hdbscan/package.py index c23ec59ae4a452..a28d8b183b43e1 100644 --- a/var/spack/repos/builtin/packages/py-hdbscan/package.py +++ b/var/spack/repos/builtin/packages/py-hdbscan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class PyHdbscan(PythonPackage): homepage = "https://github.com/scikit-learn-contrib/hdbscan" url = "https://github.com/scikit-learn-contrib/hdbscan/archive/0.8.26.tar.gz" + license("BSD-3-Clause") + version("0.8.29", sha256="67ba1c00b5ad7c0dca2d662d6036b6df235bd61522a785d68a8458b732555d76") version("0.8.26", sha256="2fd10906603b6565ee138656b6d59df3494c03c5e8099aede400d50b13af912b") diff --git a/var/spack/repos/builtin/packages/py-hdfs/package.py b/var/spack/repos/builtin/packages/py-hdfs/package.py index 0bcb530c69523b..a14de2adc30345 100644 --- a/var/spack/repos/builtin/packages/py-hdfs/package.py +++ b/var/spack/repos/builtin/packages/py-hdfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHdfs(PythonPackage): homepage = "https://hdfscli.readthedocs.io/en/latest/" pypi = "hdfs/hdfs-2.1.0.tar.gz" + license("MIT") + version("2.1.0", sha256="a40fe99ccb03b5c3247b33a4110eb21b57405dd7c3f1b775e362e66c19b44bc6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-healpy/package.py b/var/spack/repos/builtin/packages/py-healpy/package.py index 371655967bb607..eb7931bf2504ab 100644 --- a/var/spack/repos/builtin/packages/py-healpy/package.py +++ b/var/spack/repos/builtin/packages/py-healpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHealpy(PythonPackage): homepage = "https://healpy.readthedocs.io/" pypi = "healpy/healpy-1.13.0.tar.gz" + license("GPL-2.0-only") + version("1.14.0", sha256="2720b5f96c314bdfdd20b6ffc0643ac8091faefcf8fd20a4083cedff85a66c5e") version("1.13.0", sha256="d0ae02791c2404002a09c643e9e50bc58e3d258f702c736dc1f39ce1e6526f73") version("1.7.4", sha256="3cca7ed7786ffcca70e2f39f58844667ffb8521180ac890d4da651b459f51442") diff --git a/var/spack/repos/builtin/packages/py-heapdict/package.py b/var/spack/repos/builtin/packages/py-heapdict/package.py index 5646748c087560..eb028eed2d97b4 100644 --- a/var/spack/repos/builtin/packages/py-heapdict/package.py +++ b/var/spack/repos/builtin/packages/py-heapdict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-heat/package.py b/var/spack/repos/builtin/packages/py-heat/package.py new file mode 100644 index 00000000000000..90e5bcaf4ce15b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-heat/package.py @@ -0,0 +1,49 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyHeat(PythonPackage): + """Heat is a flexible and seamless open-source software for high performance data analytics + and machine learning. It provides highly optimized algorithms and data structures for tensor + computations using CPUs, GPUs and distributed cluster systems on top of MPI.""" + + homepage = "https://github.com/helmholtz-analytics/heat/" + pypi = "heat/heat-1.3.0.tar.gz" + + maintainers("mrfh92", "ClaudiaComito", "JuanPedroGHM") + + license("MIT") + + version("1.3.0", sha256="fa247539a559881ffe574a70227d3c72551e7c4a9fb29b0945578d6a840d1c87") + + variant("docutils", default=False, description="Use the py-docutils package") + variant("hdf5", default=False, description="Use the py-h5py package needed for HDF5 support") + variant( + "netcdf", default=False, description="Use the py-netcdf4 package needed for NetCDF support" + ) + variant("dev", default=False, description="Use the py-pre-commit package") + variant( + "examples", + default=False, + description="Use py-scikit-learn and py-matplotlib for the example tests", + ) + + depends_on("python@3.8:", type=("build", "run")) + depends_on("py-numpy@1.20:", type=("build", "run")) + depends_on("py-torch@1.8:2.0.1", type=("build", "run")) + depends_on("py-scipy@0.14:", type=("build", "run")) + depends_on("pil@6:", type=("build", "run")) + depends_on("py-torchvision@0.8:", type=("build", "run")) + depends_on("py-mpi4py@3:", type=("build", "run")) + depends_on("py-setuptools", type="build") + + depends_on("py-docutils@0.16:", when="+docutils", type=("build", "link", "run")) + depends_on("py-h5py@2.8.0:", when="+hdf5", type=("build", "link", "run")) + depends_on("py-netcdf4@1.5.6:", when="+netcdf", type=("build", "link", "run")) + depends_on("py-pre-commit@1.18.3:", when="+dev", type=("build", "link", "run")) + depends_on("py-scikit-learn@0.24.0:", when="+examples", type=("build", "link", "run")) + depends_on("py-matplotlib@3.1.0:", when="+examples", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-hep-ml/package.py b/var/spack/repos/builtin/packages/py-hep-ml/package.py index 602eada3aed148..a13ab98ca53ad2 100644 --- a/var/spack/repos/builtin/packages/py-hep-ml/package.py +++ b/var/spack/repos/builtin/packages/py-hep-ml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHepMl(PythonPackage): homepage = "https://github.com/arogozhnikov/hep_ml" pypi = "hep_ml/hep_ml-0.7.0.tar.gz" + license("Apache-2.0") + version("0.7.1", sha256="f13635dac09ffc32ae276af9c58ebf93c593dae3da25c4e456e10e965708320b") version("0.7.0", sha256="0402037064d78f5723106b385ad5f20df8f67cb312c57cb4ce3839c5616f328e") diff --git a/var/spack/repos/builtin/packages/py-hepdata-converter/package.py b/var/spack/repos/builtin/packages/py-hepdata-converter/package.py index 0a54ae8f57d4d8..b796172eefbc10 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-converter/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-converter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py index 53ada4226b34df..d1b9fe2c4a889e 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-lib/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyHepdataLib(PythonPackage): # pypi = "hepdata_lib/hepdata_lib-0.9.0.tar.gz" url = "https://github.com/HEPData/hepdata_lib/archive/refs/tags/v0.9.0.tar.gz" + license("MIT") + version("0.10.1", sha256="71c635963883c51e7be18e03d80bfe42c5de350852b01010e3e45cbd1bff7a81") version("0.9.0", sha256="c9238e45c603d7c061ed670cf197ff03ad9d370ab50419b6916fda2cd86d6150") diff --git a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py index 50154d5000f473..d5f3088af19e49 100644 --- a/var/spack/repos/builtin/packages/py-hepdata-validator/package.py +++ b/var/spack/repos/builtin/packages/py-hepdata-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hepunits/package.py b/var/spack/repos/builtin/packages/py-hepunits/package.py index d096f1193adbae..470c9225b70781 100644 --- a/var/spack/repos/builtin/packages/py-hepunits/package.py +++ b/var/spack/repos/builtin/packages/py-hepunits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyHepunits(PythonPackage): maintainers("vvolkl") + license("BSD-3-Clause") + version("master", branch="master") version("2.3.2", sha256="8a3366fa5d72c16af1166ed579cdaa81edd2676acb8f6a1fe7da290cefca3b08") version("2.3.1", sha256="b1174bba4d575b9939c01f341e24d9bdbe0e0cd4cc4ce2e7d77692da19145cfb") diff --git a/var/spack/repos/builtin/packages/py-hieroglyph/package.py b/var/spack/repos/builtin/packages/py-hieroglyph/package.py index 154d3c9086d30e..36dca2661dd006 100644 --- a/var/spack/repos/builtin/packages/py-hieroglyph/package.py +++ b/var/spack/repos/builtin/packages/py-hieroglyph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyHieroglyph(PythonPackage): homepage = "https://github.com/nyergler/hieroglyph" pypi = "hieroglyph/hieroglyph-1.0.0.tar.gz" + license("BSD-3-Clause") + version("2.1.0", sha256="b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf") version("1.0.0", sha256="8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c") diff --git a/var/spack/repos/builtin/packages/py-hiredis/package.py b/var/spack/repos/builtin/packages/py-hiredis/package.py index bc4f2c0473106a..03379ae6777f6a 100644 --- a/var/spack/repos/builtin/packages/py-hiredis/package.py +++ b/var/spack/repos/builtin/packages/py-hiredis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyHiredis(PythonPackage): homepage = "https://github.com/redis/hiredis-py" pypi = "hiredis/hiredis-1.1.0.tar.gz" + license("BSD-3-Clause") + version("1.1.0", sha256="996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hist/package.py b/var/spack/repos/builtin/packages/py-hist/package.py index 3e606e79dbbaf1..948ed46e6bdb75 100644 --- a/var/spack/repos/builtin/packages/py-hist/package.py +++ b/var/spack/repos/builtin/packages/py-hist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHist(PythonPackage): homepage = "https://github.com/scikit-hep/hist" pypi = "hist/hist-2.5.2.tar.gz" + license("BSD-3-Clause") + version("2.6.1", sha256="ee9034795fd2feefed923461aaccaf76f87c1f8d5414b1e704faa293ceb4fc27") version("2.5.2", sha256="0bafb8b956cc041f1b26e8f5663fb8d3b8f7673f56336facb84d8cfdc30ae2cf") diff --git a/var/spack/repos/builtin/packages/py-histbook/package.py b/var/spack/repos/builtin/packages/py-histbook/package.py index 612281755acdfb..b3ba8b4b963c95 100644 --- a/var/spack/repos/builtin/packages/py-histbook/package.py +++ b/var/spack/repos/builtin/packages/py-histbook/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHistbook(PythonPackage): homepage = "https://github.com/scikit-hep/histbook" pypi = "histbook/histbook-1.2.5.tar.gz" + license("BSD-3-Clause") + version("1.2.5", sha256="76d1f143f8abccf5539029fbef8133db84f377fc7752ac9e7e6d19ac9a277967") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-histogrammar/package.py b/var/spack/repos/builtin/packages/py-histogrammar/package.py index 44f1037e8c29c0..929d7fed731cee 100644 --- a/var/spack/repos/builtin/packages/py-histogrammar/package.py +++ b/var/spack/repos/builtin/packages/py-histogrammar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-histoprint/package.py b/var/spack/repos/builtin/packages/py-histoprint/package.py index 847c7a4b839900..25f16f15e1f7cd 100644 --- a/var/spack/repos/builtin/packages/py-histoprint/package.py +++ b/var/spack/repos/builtin/packages/py-histoprint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHistoprint(PythonPackage): homepage = "https://github.com/scikit-hep/histoprint" pypi = "histoprint/histoprint-2.2.0.tar.gz" + license("MIT") + version("2.4.0", sha256="328f789d186e3bd76882d57b5aad3fa08c7870a856cc83bcdbad9f4aefbda94d") version("2.2.0", sha256="ef8b65f7926aaa989f076857b76291175245dd974804b408483091d1e28b00f6") diff --git a/var/spack/repos/builtin/packages/py-hjson/package.py b/var/spack/repos/builtin/packages/py-hjson/package.py index 99fedec5d2ed4d..6a70782b09f692 100644 --- a/var/spack/repos/builtin/packages/py-hjson/package.py +++ b/var/spack/repos/builtin/packages/py-hjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHjson(PythonPackage): homepage = "https://github.com/hjson/hjson-py" pypi = "hjson/hjson-3.0.2.tar.gz" + license("AFL-2.1") + version("3.1.0", sha256="55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75") version("3.0.2", sha256="2838fd7200e5839ea4516ece953f3a19892c41089f0d933ba3f68e596aacfcd5") diff --git a/var/spack/repos/builtin/packages/py-hmmlearn/package.py b/var/spack/repos/builtin/packages/py-hmmlearn/package.py index 16bfb20ccf3f66..cbb457b6e7f735 100644 --- a/var/spack/repos/builtin/packages/py-hmmlearn/package.py +++ b/var/spack/repos/builtin/packages/py-hmmlearn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyHmmlearn(PythonPackage): maintainers("snehring") + license("BSD-3-Clause") + version("0.3.0", sha256="d13a91ea3695df881465e3d36132d7eef4e84d483f4ba538a4b46e24b5ea100f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-holland-backup/package.py b/var/spack/repos/builtin/packages/py-holland-backup/package.py index 6030290cfde560..22a405a15f4b65 100644 --- a/var/spack/repos/builtin/packages/py-holland-backup/package.py +++ b/var/spack/repos/builtin/packages/py-holland-backup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyHollandBackup(PythonPackage): homepage = "https://hollandbackup.org/" url = "https://github.com/holland-backup/holland/archive/1.2.2.tar.gz" + license("BSD-3-Clause") + version("1.2.2", sha256="836337c243b2dff5ff6a3ce0b647f123ab24697a5de8ac8ae8b7839aa23dff68") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-horovod/package.py b/var/spack/repos/builtin/packages/py-horovod/package.py index 5e221c0296824f..56effd1982ec36 100644 --- a/var/spack/repos/builtin/packages/py-horovod/package.py +++ b/var/spack/repos/builtin/packages/py-horovod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyHorovod(PythonPackage, CudaPackage): maintainers("adamjstewart", "aweits", "tgaddair", "thomas-bouvier") + license("Apache-2.0") + version("master", branch="master", submodules=True) version( "0.28.1", tag="v0.28.1", commit="1d217b59949986d025f6db93c49943fb6b6cc78f", submodules=True diff --git a/var/spack/repos/builtin/packages/py-hpack/package.py b/var/spack/repos/builtin/packages/py-hpack/package.py index 331425d9dcdf6d..f87bd916a073d7 100644 --- a/var/spack/repos/builtin/packages/py-hpack/package.py +++ b/var/spack/repos/builtin/packages/py-hpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHpack(PythonPackage): homepage = "https://github.com/python-hyper/hpack" pypi = "hpack/hpack-4.0.0.tar.gz" + license("MIT") + version("4.0.0", sha256="fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095") version("3.0.0", sha256="8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2") diff --git a/var/spack/repos/builtin/packages/py-hpbandster/package.py b/var/spack/repos/builtin/packages/py-hpbandster/package.py index 48eaa6456d5c9f..7cb26bc3ce7342 100644 --- a/var/spack/repos/builtin/packages/py-hpbandster/package.py +++ b/var/spack/repos/builtin/packages/py-hpbandster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hpccm/package.py b/var/spack/repos/builtin/packages/py-hpccm/package.py index 38bace9fd932c5..559b0941f5059d 100644 --- a/var/spack/repos/builtin/packages/py-hpccm/package.py +++ b/var/spack/repos/builtin/packages/py-hpccm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHpccm(PythonPackage): homepage = "https://github.com/NVIDIA/hpc-container-maker" pypi = "hpccm/hpccm-19.2.0.tar.gz" + license("Apache-2.0") + version("19.2.0", sha256="c60eec914a802b0a76596cfd5fdf7122d3f8665fcef06ef928323f5dfb5219a6") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hstspreload/package.py b/var/spack/repos/builtin/packages/py-hstspreload/package.py index ccb5eb5f4bf8fd..7ec4e9b71974bb 100644 --- a/var/spack/repos/builtin/packages/py-hstspreload/package.py +++ b/var/spack/repos/builtin/packages/py-hstspreload/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHstspreload(PythonPackage): homepage = "https://github.com/sethmlarson/hstspreload" pypi = "hstspreload/hstspreload-2020.9.23.tar.gz" + license("BSD-3-Clause") + version("2020.9.23", sha256="35822733ba67cfb4efc6cd7d1230b509f0bd42c90eeb329faf2fe679f801e40f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-htgettoken/package.py b/var/spack/repos/builtin/packages/py-htgettoken/package.py index 4ddc0c25bdf627..152da6f44ce982 100644 --- a/var/spack/repos/builtin/packages/py-htgettoken/package.py +++ b/var/spack/repos/builtin/packages/py-htgettoken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyHtgettoken(PythonPackage): maintainers("wdconinc") + license("BSD-3-Clause") + # The following versions refer to setuptools-buildable commits after 1.16; # they are special reproducible version numbers from `git describe` version("1.16-33-g3788bb4", commit="3788bb4733e5e8f856cee51566df9a36cbfe097d") @@ -33,8 +35,8 @@ class PyHtgettoken(PythonPackage): depends_on("py-urllib3", type=("build", "run")) def setup_run_environment(self, env): - dir = env.get("XDG_RUNTIME_DIR") or "/tmp" - uid = env.get("UID") or os.geteuid() + dir = os.environ.get("XDG_RUNTIME_DIR", "/tmp") + uid = os.environ.get("UID", str(os.geteuid())) file = join_path(dir, "bt_u" + uid) env.set("BEARER_TOKEN", file) env.set("BEARER_TOKEN_FILE", file) diff --git a/var/spack/repos/builtin/packages/py-html2text/package.py b/var/spack/repos/builtin/packages/py-html2text/package.py index 68d86a46f9a7f4..d9af75db746bf6 100644 --- a/var/spack/repos/builtin/packages/py-html2text/package.py +++ b/var/spack/repos/builtin/packages/py-html2text/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHtml2text(PythonPackage): homepage = "https://github.com/Alir3z4/html2text/" pypi = "html2text/html2text-2016.9.19.tar.gz" + license("GPL-3.0-only") + version("2016.9.19", sha256="554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index 692980c4085476..00d7fbfb02d66a 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHtml5lib(PythonPackage): homepage = "https://github.com/html5lib/html5lib-python" pypi = "html5lib/html5lib-1.1.tar.gz" + license("MIT") + version("1.1", sha256="b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f") version("1.0.1", sha256="66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736") version("0.99", sha256="aff6fd3031c563883197e5a04b7df324086ff5f358278a0386808c463a077e59") diff --git a/var/spack/repos/builtin/packages/py-htmlgen/package.py b/var/spack/repos/builtin/packages/py-htmlgen/package.py index 1a96709665eac0..3e0e5637f6e6f6 100644 --- a/var/spack/repos/builtin/packages/py-htmlgen/package.py +++ b/var/spack/repos/builtin/packages/py-htmlgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHtmlgen(PythonPackage): homepage = "https://github.com/srittau/python-htmlgen" url = "https://github.com/srittau/python-htmlgen/archive/v1.2.2.tar.gz" + license("MIT") + version("1.2.2", sha256="9dc60e10511f0fd13014659514c6c333498c21779173deb585cd4964ea667770") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-htseq/package.py b/var/spack/repos/builtin/packages/py-htseq/package.py index 5049ed9b1351d1..8b90b775640b5c 100644 --- a/var/spack/repos/builtin/packages/py-htseq/package.py +++ b/var/spack/repos/builtin/packages/py-htseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHtseq(PythonPackage): homepage = "https://htseq.readthedocs.io/en/master/index.html" pypi = "HTSeq/HTSeq-2.0.3.tar.gz" + license("GPL-3.0-only") + version("2.0.3", sha256="c7e7eb29bdc44e80d2d68e3599fa8a8f1d9d6475624dcf1b9644285a8a9c0fac") version("0.11.2", sha256="65c4c13968506c7df92e97124df96fdd041c4476c12a548d67350ba8b436bcfc") version("0.9.1", sha256="af5bba775e3fb45ed4cde64c691ebef36b0bf7a86efd35c884ad0734c27ad485") diff --git a/var/spack/repos/builtin/packages/py-httpbin/package.py b/var/spack/repos/builtin/packages/py-httpbin/package.py index b911ec849d7ffd..5a462973cab3e1 100644 --- a/var/spack/repos/builtin/packages/py-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-httpbin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHttpbin(PythonPackage): homepage = "https://github.com/Runscope/httpbin" pypi = "httpbin/httpbin-0.7.0.tar.gz" + license("0BSD") + version("0.7.0", sha256="cbb37790c91575f4f15757f42ad41d9f729eb227d5edbe89e4ec175486db8dfa") version("0.5.0", sha256="79fbc5d27e4194ea908b0fa18e09a59d95d287c91667aa69bcd010342d1589b5") diff --git a/var/spack/repos/builtin/packages/py-httpcore/package.py b/var/spack/repos/builtin/packages/py-httpcore/package.py index a8c2f6632e00bf..8a72e47aa05c06 100644 --- a/var/spack/repos/builtin/packages/py-httpcore/package.py +++ b/var/spack/repos/builtin/packages/py-httpcore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHttpcore(PythonPackage): homepage = "https://github.com/encode/httpcore" pypi = "httpcore/httpcore-0.11.0.tar.gz" + license("BSD-3-Clause") + version("0.16.3", sha256="c5d6f04e2fc530f39e0c077e6a30caa53f1451096120f1f38b954afd0b17c0cb") version("0.14.7", sha256="7503ec1c0f559066e7e39bc4003fd2ce023d01cf51793e3c173b864eb456ead1") version("0.11.0", sha256="35ffc735d746b83f8fc6d36f82600e56117b9e8adc65d0c0423264b6ebfef7bf") diff --git a/var/spack/repos/builtin/packages/py-httplib2/package.py b/var/spack/repos/builtin/packages/py-httplib2/package.py index 01af04b32ca344..cbf4e4e585a2a4 100644 --- a/var/spack/repos/builtin/packages/py-httplib2/package.py +++ b/var/spack/repos/builtin/packages/py-httplib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHttplib2(PythonPackage): homepage = "https://github.com/httplib2/httplib2" pypi = "httplib2/httplib2-0.13.1.tar.gz" + license("MIT") + version("0.22.0", sha256="d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d82df81") version("0.20.4", sha256="58a98e45b4b1a48273073f905d2961666ecf0fbac4250ea5b47aef259eb5c585") version("0.18.0", sha256="b0e1f3ed76c97380fe2485bc47f25235453b40ef33ca5921bb2897e257a49c4c") diff --git a/var/spack/repos/builtin/packages/py-httpretty/package.py b/var/spack/repos/builtin/packages/py-httpretty/package.py index 4ae0c6d8bc7e50..20650f7c0001b0 100644 --- a/var/spack/repos/builtin/packages/py-httpretty/package.py +++ b/var/spack/repos/builtin/packages/py-httpretty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHttpretty(PythonPackage): homepage = "https://httpretty.readthedocs.io/en/latest/" pypi = "httpretty/httpretty-1.1.3.tar.gz" + license("MIT") + version("1.1.4", sha256="20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68") version("1.1.3", sha256="229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601") diff --git a/var/spack/repos/builtin/packages/py-httpstan/package.py b/var/spack/repos/builtin/packages/py-httpstan/package.py index e9ad1e7cb8e9d9..efa08de8110fc7 100644 --- a/var/spack/repos/builtin/packages/py-httpstan/package.py +++ b/var/spack/repos/builtin/packages/py-httpstan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyHttpstan(PythonPackage): maintainers("haralmha") + license("ISC") + version("4.8.0", sha256="cadfce05d24ec2af50d71c5212c648cbee5684a7f98fedd3838e124e5a9b4962") version("4.7.2", sha256="94f6631d969cbd91d136194b074d02642d8c9e2a05674877a39059be87c5bf7b") version("4.6.1", sha256="703e5e04e60651e0004574bb9695827d759fd13eb0d6bd67f827c1bfa0a1fd31") diff --git a/var/spack/repos/builtin/packages/py-httptools/package.py b/var/spack/repos/builtin/packages/py-httptools/package.py index 7629eb4652cfc0..d4708c117bdc99 100644 --- a/var/spack/repos/builtin/packages/py-httptools/package.py +++ b/var/spack/repos/builtin/packages/py-httptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHttptools(PythonPackage): homepage = "https://github.com/MagicStack/httptools" pypi = "httptools/httptools-0.1.1.tar.gz" + license("MIT") + version("0.5.0", sha256="295874861c173f9101960bba332429bb77ed4dcd8cdf5cee9922eb00e4f6bc09") version("0.1.1", sha256="41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce") diff --git a/var/spack/repos/builtin/packages/py-httpx/package.py b/var/spack/repos/builtin/packages/py-httpx/package.py index d2f57abee02aa0..4da435bbd3cc1c 100644 --- a/var/spack/repos/builtin/packages/py-httpx/package.py +++ b/var/spack/repos/builtin/packages/py-httpx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHttpx(PythonPackage): homepage = "https://github.com/encode/httpx" pypi = "httpx/httpx-0.15.2.tar.gz" + license("BSD-3-Clause") + version("0.23.3", sha256="9818458eb565bb54898ccb9b8b251a28785dd4a55afbc23d0eb410754fe7d0f9") version("0.22.0", sha256="d8e778f76d9bbd46af49e7f062467e3157a5a3d2ae4876a4bbfd8a51ed9c9cb4") version("0.15.2", sha256="713a2deaf96d85bbd4a1fbdf0edb27d6b4ee2c9aaeda8433042367e4b9e1628d") diff --git a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py index 6865a0d40e08ce..d9ee1717de2b6a 100644 --- a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py +++ b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyHuggingfaceHub(PythonPackage): homepage = "https://github.com/huggingface/huggingface_hub" pypi = "huggingface_hub/huggingface_hub-0.0.10.tar.gz" + license("Apache-2.0") + + version("0.19.4", sha256="176a4fc355a851c17550e7619488f383189727eab209534d7cef2114dae77b22") version("0.14.1", sha256="9ab899af8e10922eac65e290d60ab956882ab0bf643e3d990b1394b6b47b7fbc") version("0.10.1", sha256="5c188d5b16bec4b78449f8681f9975ff9d321c16046cc29bcf0d7e464ff29276") version("0.0.10", sha256="556765e4c7edd2d2c4c733809bae1069dca20e10ff043870ec40d53e498efae2") @@ -28,14 +31,14 @@ class PyHuggingfaceHub(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-filelock", type=("build", "run")) + depends_on("py-fsspec@2023.5:", when="@0.18:", type=("build", "run")) depends_on("py-fsspec", when="@0.14:", type=("build", "run")) depends_on("py-requests", type=("build", "run")) - depends_on("py-tqdm@4.42.1:", type=("build", "run")) + depends_on("py-tqdm@4.42.1:", when="@0.12:", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) depends_on("py-pyyaml@5.1:", when="@0.10:", type=("build", "run")) depends_on("py-typing-extensions@3.7.4.3:", when="@0.10:", type=("build", "run")) depends_on("py-typing-extensions", when="@0.0.10:", type=("build", "run")) - depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run")) depends_on("py-packaging@20.9:", when="@0.10:", type=("build", "run")) depends_on("py-inquirerpy@0.3.4", when="@0.14:+cli", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-humanfriendly/package.py b/var/spack/repos/builtin/packages/py-humanfriendly/package.py index 960d630b18d1c3..f5a2ad4ee2d35b 100644 --- a/var/spack/repos/builtin/packages/py-humanfriendly/package.py +++ b/var/spack/repos/builtin/packages/py-humanfriendly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHumanfriendly(PythonPackage): pypi = "humanfriendly/humanfriendly-8.1.tar.gz" git = "https://github.com/xolox/python-humanfriendly.git" + license("MIT") + version("10.0", sha256="6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc") version("8.2", sha256="bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12") version("8.1", sha256="25c2108a45cfd1e8fbe9cdb30b825d34ef5d5675c8e11e4775c9aedbfb0bdee2") diff --git a/var/spack/repos/builtin/packages/py-humanize/package.py b/var/spack/repos/builtin/packages/py-humanize/package.py index 45f62591787850..d9efe5ef12cd9f 100644 --- a/var/spack/repos/builtin/packages/py-humanize/package.py +++ b/var/spack/repos/builtin/packages/py-humanize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyHumanize(PythonPackage): homepage = "https://github.com/python-humanize/humanize" pypi = "humanize/humanize-0.5.1.tar.gz" + license("MIT") + version("4.6.0", sha256="5f1f22bc65911eb1a6ffe7659bd6598e33dcfeeb904eb16ee1e705a09bf75916") version("4.4.0", sha256="efb2584565cc86b7ea87a977a15066de34cdedaf341b11c851cfcfd2b964779c") version("4.0.0", sha256="ee1f872fdfc7d2ef4a28d4f80ddde9f96d36955b5d6b0dac4bdeb99502bddb00") diff --git a/var/spack/repos/builtin/packages/py-hvac/package.py b/var/spack/repos/builtin/packages/py-hvac/package.py index 70f9b58a1bf3c5..5e2ab6643f483f 100644 --- a/var/spack/repos/builtin/packages/py-hvac/package.py +++ b/var/spack/repos/builtin/packages/py-hvac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHvac(PythonPackage): homepage = "https://github.com/hvac/hvac/" url = "https://github.com/hvac/hvac/archive/v0.2.17.tar.gz" + license("Apache-2.0") + version("0.9.6", sha256="ff60972edc512c73ac4811e91bcffccdb99f0d8975c0b41e44a4c79d73c711af") version("0.9.5", sha256="3e4af2d84833b8f61c9c3351d4a9799bf8e8e4344d0ad4e162609a7379961a16") version("0.9.4", sha256="ebb14b9a5b347c4f0b4dcea59f435dcc190d8ccb4cb9a20e5daf260af6509dd6") diff --git a/var/spack/repos/builtin/packages/py-hydra-core/package.py b/var/spack/repos/builtin/packages/py-hydra-core/package.py index 0f21e3f371aa92..380f8aa4af4e42 100644 --- a/var/spack/repos/builtin/packages/py-hydra-core/package.py +++ b/var/spack/repos/builtin/packages/py-hydra-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHydraCore(PythonPackage): homepage = "https://github.com/facebookresearch/hydra" pypi = "hydra-core/hydra-core-1.3.1.tar.gz" + license("MIT") + version("1.3.1", sha256="8dd42d551befc43dfca0c612cbd58c4f3e273dbd97a87214c1a030ba557d238b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-hypercorn/package.py b/var/spack/repos/builtin/packages/py-hypercorn/package.py index 6121af1cda08ff..e8229e8bb99797 100644 --- a/var/spack/repos/builtin/packages/py-hypercorn/package.py +++ b/var/spack/repos/builtin/packages/py-hypercorn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyHypercorn(PythonPackage): homepage = "https://gitlab.com/pgjones/hypercorn/" pypi = "Hypercorn/Hypercorn-0.13.2.tar.gz" + license("MIT") + version("0.13.2", sha256="6307be5cbdf6ba411967d4661202dc4f79bd511b5d318bc4eed88b09418427f8") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hyperframe/package.py b/var/spack/repos/builtin/packages/py-hyperframe/package.py index ba2d0a3d722f65..1841c472352840 100644 --- a/var/spack/repos/builtin/packages/py-hyperframe/package.py +++ b/var/spack/repos/builtin/packages/py-hyperframe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHyperframe(PythonPackage): homepage = "https://github.com/python-hyper/hyperframe/" pypi = "hyperframe/hyperframe-6.0.0.tar.gz" + license("MIT") + version("6.0.0", sha256="742d2a4bc3152a340a49d59f32e33ec420aa8e7054c1444ef5c7efff255842f1") version("5.2.0", sha256="a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f") diff --git a/var/spack/repos/builtin/packages/py-hyperlink/package.py b/var/spack/repos/builtin/packages/py-hyperlink/package.py index fff8c20be67a63..2fe3d284e6c4ee 100644 --- a/var/spack/repos/builtin/packages/py-hyperlink/package.py +++ b/var/spack/repos/builtin/packages/py-hyperlink/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHyperlink(PythonPackage): homepage = "https://github.com/python-hyper/hyperlink" pypi = "hyperlink/hyperlink-21.0.0.tar.gz" + license("MIT") + version("21.0.0", sha256="427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b") depends_on("python@2.6:2,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hyperopt/package.py b/var/spack/repos/builtin/packages/py-hyperopt/package.py index 5d4f8e51b27e5b..3f0517cfbbe7d7 100644 --- a/var/spack/repos/builtin/packages/py-hyperopt/package.py +++ b/var/spack/repos/builtin/packages/py-hyperopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-hypothesis/package.py b/var/spack/repos/builtin/packages/py-hypothesis/package.py index 47daa3124ee04e..90469c997b0995 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyHypothesis(PythonPackage): homepage = "https://github.com/HypothesisWorks/hypothesis-python" pypi = "hypothesis/hypothesis-4.41.2.tar.gz" + license("MPL-2.0") + version("6.23.1", sha256="23a1b0488aec5719e2f9e399342e10f30d497cbb9fd39470ef0975c1b502ae35") version("5.3.0", sha256="c9fdb53fe3bf1f8e7dcca1a7dd6e430862502f088aca2903d141511212e79429") version("4.57.1", sha256="3c4369a4b0a1348561048bcda5f1db951a1b8e2a514ea8e8c70d36e656bf6fa0") diff --git a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py index e3cd6dd23f17dd..3dc9093ac989be 100644 --- a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyIbmCloudSdkCore(PythonPackage): homepage = "https://github.com/IBM/python-sdk-core" pypi = "ibm-cloud-sdk-core/ibm-cloud-sdk-core-3.9.0.tar.gz" + license("Apache-2.0") + version("3.10.0", sha256="ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6") version("3.9.0", sha256="51403f33003254d83d5028d8cebd7617f5cca82af85b6e9c4ad553eccd079dbf") diff --git a/var/spack/repos/builtin/packages/py-ibm-watson/package.py b/var/spack/repos/builtin/packages/py-ibm-watson/package.py index d549d41864473c..abe2c7d75c3470 100644 --- a/var/spack/repos/builtin/packages/py-ibm-watson/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-watson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIbmWatson(PythonPackage): homepage = "https://github.com/watson-developer-cloud/python-sdk" pypi = "ibm-watson/ibm-watson-5.1.0.tar.gz" + license("Apache-2.0") + version("5.1.0", sha256="faea1e519f6d846a5ca9e03aefc9f894ff8da1eed9117ace6a6fa8f218ba0bc7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ics/package.py b/var/spack/repos/builtin/packages/py-ics/package.py index a032c1034caf5b..aa1feb33e51984 100644 --- a/var/spack/repos/builtin/packages/py-ics/package.py +++ b/var/spack/repos/builtin/packages/py-ics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-identify/package.py b/var/spack/repos/builtin/packages/py-identify/package.py index 14880cdd5bc25c..ece373a71a71df 100644 --- a/var/spack/repos/builtin/packages/py-identify/package.py +++ b/var/spack/repos/builtin/packages/py-identify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyIdentify(PythonPackage): homepage = "https://github.com/pre-commit/identify" pypi = "identify/identify-1.4.7.tar.gz" + license("MIT") + version("2.5.24", sha256="0aac67d5b4812498056d28a9a512a483f5085cc28640b02b258a59dac34301d4") version("2.5.5", sha256="322a5699daecf7c6fd60e68852f36f2ecbb6a36ff6e6e973e0d2bb6fca203ee6") version("2.5.3", sha256="887e7b91a1be152b0d46bbf072130235a8117392b9f1828446079a816a05ef44") diff --git a/var/spack/repos/builtin/packages/py-idna-ssl/package.py b/var/spack/repos/builtin/packages/py-idna-ssl/package.py index 7614817eb136d3..565e18b9228c04 100644 --- a/var/spack/repos/builtin/packages/py-idna-ssl/package.py +++ b/var/spack/repos/builtin/packages/py-idna-ssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIdnaSsl(PythonPackage): homepage = "https://github.com/aio-libs/idna-ssl" url = "https://github.com/aio-libs/idna-ssl/archive/v1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="cdbefa2429a6a2fa5cbe8d2a47c677ca671e84531618d3460fc0bcfc840684c5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-idna/package.py b/var/spack/repos/builtin/packages/py-idna/package.py index d77b30664ece14..ca9c0892a29293 100644 --- a/var/spack/repos/builtin/packages/py-idna/package.py +++ b/var/spack/repos/builtin/packages/py-idna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIdna(PythonPackage): homepage = "https://github.com/kjd/idna" pypi = "idna/idna-3.2.tar.gz" + license("BSD-3-Clause") + version("3.4", sha256="814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4") version("3.3", sha256="9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d") version("3.2", sha256="467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3") diff --git a/var/spack/repos/builtin/packages/py-igor/package.py b/var/spack/repos/builtin/packages/py-igor/package.py index 9afc66f8c8df5d..0249ee1caa2c42 100644 --- a/var/spack/repos/builtin/packages/py-igor/package.py +++ b/var/spack/repos/builtin/packages/py-igor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIgor(PythonPackage): homepage = "http://blog.tremily.us/posts/igor/" pypi = "igor/igor-0.3.tar.gz" + license("LGPL-3.0-only") + version("0.3", sha256="b04ac38c68fb81cf3167a9981dc5a20379112d40268bb72c5a8514dc8051abba") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-igraph/package.py b/var/spack/repos/builtin/packages/py-igraph/package.py index c995834236c493..7d3b4b32266949 100644 --- a/var/spack/repos/builtin/packages/py-igraph/package.py +++ b/var/spack/repos/builtin/packages/py-igraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIgraph(PythonPackage): homepage = "https://github.com/igraph/python-igraph" pypi = "igraph/igraph-0.10.6.tar.gz" + license("GPL-2.0-or-later") + version("0.10.6", sha256="76f7aad294514412f835366a7d9a9c1e7a34c3e6ef0a6c3a1a835234323228e8") variant("matplotlib", default=False, description="Enable plotting with Matplotlib") diff --git a/var/spack/repos/builtin/packages/py-illumina-utils/package.py b/var/spack/repos/builtin/packages/py-illumina-utils/package.py index 0517d1d6b8296b..d4d56ab5404dc9 100644 --- a/var/spack/repos/builtin/packages/py-illumina-utils/package.py +++ b/var/spack/repos/builtin/packages/py-illumina-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIlluminaUtils(PythonPackage): homepage = "https://github.com/meren/illumina-utils" pypi = "illumina-utils/illumina-utils-2.2.tar.gz" + license("GPL-2.0-or-later") + version("2.3", sha256="0e8407b91d530d9a53d8ec3c83e60f25e7f8f80d06ce17b8e4f57a02d3262441") version("2.2", sha256="6039c72d077c101710fe4fdbfeaa30caa1c3c2c84ffa6295456927d82def8e6d") diff --git a/var/spack/repos/builtin/packages/py-ilmbase/package.py b/var/spack/repos/builtin/packages/py-ilmbase/package.py index f96cd9de39d34c..7b55335768f406 100644 --- a/var/spack/repos/builtin/packages/py-ilmbase/package.py +++ b/var/spack/repos/builtin/packages/py-ilmbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-imagecodecs/package.py b/var/spack/repos/builtin/packages/py-imagecodecs/package.py index 03195578b6087f..86360d53d142ed 100644 --- a/var/spack/repos/builtin/packages/py-imagecodecs/package.py +++ b/var/spack/repos/builtin/packages/py-imagecodecs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyImagecodecs(PythonPackage): homepage = "https://www.lfd.uci.edu/~gohlke/" pypi = "imagecodecs/imagecodecs-2022.2.22.tar.gz" + license("BSD-3-Clause") + version("2022.2.22", sha256="062bef6b003290a8163abed2744b406854238208dfdd41cf7165253c6e01c0bd") depends_on("python@3.8:", type=("build", "run")) @@ -66,11 +68,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 diff --git a/var/spack/repos/builtin/packages/py-imagehash/package.py b/var/spack/repos/builtin/packages/py-imagehash/package.py index f09d72720c9aaa..2a95f6f695c4d5 100644 --- a/var/spack/repos/builtin/packages/py-imagehash/package.py +++ b/var/spack/repos/builtin/packages/py-imagehash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyImagehash(PythonPackage): maintainers("thomas-bouvier") + license("BSD-2-Clause") + version("4.3.1", sha256="7038d1b7f9e0585beb3dd8c0a956f02b95a346c0b5f24a9e8cc03ebadaf0aa70") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py b/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py index 2c2ace9765c362..f28725b391c8c8 100644 --- a/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/py-imageio-ffmpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyImageioFfmpeg(PythonPackage): homepage = "https://github.com/imageio/imageio-ffmpeg" pypi = "imageio-ffmpeg/imageio-ffmpeg-0.4.3.tar.gz" + license("BSD-2-Clause") + version("0.4.5", sha256="f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139") version("0.4.3", sha256="f826260a3207b872f1a4ba87ec0c8e02c00afba4fd03348a59049bdd8215841e") diff --git a/var/spack/repos/builtin/packages/py-imageio/package.py b/var/spack/repos/builtin/packages/py-imageio/package.py index 731b1040e2573d..c82511a03be4d4 100644 --- a/var/spack/repos/builtin/packages/py-imageio/package.py +++ b/var/spack/repos/builtin/packages/py-imageio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyImageio(PythonPackage): homepage = "https://github.com/imageio/imageio" pypi = "imageio/imageio-2.3.0.tar.gz" + license("BSD-2-Clause") + version("2.30.0", sha256="7fc6ad5b5677cb1e58077875a72512aa8c392b6d40885eca0a6ab250efb4b8f4") version("2.22.0", sha256="a332d127ec387b2d3dca967fd065a90f1c1a4ba2343570b03fe2cebb6ed064ea") version("2.16.0", sha256="7f7d8d8e1eb6f8bb1d15e0dd93bee3f72026a4c3b96e9c690e42f403f7bdea3e") diff --git a/var/spack/repos/builtin/packages/py-imagesize/package.py b/var/spack/repos/builtin/packages/py-imagesize/package.py index 981b6ee930670a..28e8aa9ec05721 100644 --- a/var/spack/repos/builtin/packages/py-imagesize/package.py +++ b/var/spack/repos/builtin/packages/py-imagesize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyImagesize(PythonPackage): homepage = "https://github.com/shibukawa/imagesize_py" pypi = "imagesize/imagesize-0.7.1.tar.gz" + license("MIT") + version("1.4.1", sha256="69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a") version("1.3.0", sha256="cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d") version("1.1.0", sha256="f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5") diff --git a/var/spack/repos/builtin/packages/py-imbalanced-learn/package.py b/var/spack/repos/builtin/packages/py-imbalanced-learn/package.py index 6dad8ea075274e..7ee96645bc4df1 100644 --- a/var/spack/repos/builtin/packages/py-imbalanced-learn/package.py +++ b/var/spack/repos/builtin/packages/py-imbalanced-learn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyImbalancedLearn(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.10.1", sha256="bc7609619ec3c38c442292928239ad3d10b5deb0af8a29c83822b7b57b319f8b") # From setup.py: diff --git a/var/spack/repos/builtin/packages/py-imgaug/package.py b/var/spack/repos/builtin/packages/py-imgaug/package.py index 31b2c3fec98e1c..559f9fff659f1c 100644 --- a/var/spack/repos/builtin/packages/py-imgaug/package.py +++ b/var/spack/repos/builtin/packages/py-imgaug/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyImgaug(PythonPackage): homepage = "https://github.com/aleju/imgaug" pypi = "imgaug/imgaug-0.3.0.tar.gz" + license("MIT") + version("0.4.0", sha256="46bab63ed38f8980630ff721a09ca2281b7dbd4d8c11258818b6ebcc69ea46c7") version("0.3.0", sha256="e1354d41921f1b306b50c5141b4870f17e81b531cae2f5c3093da9dc4dcb3cf4") diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py index ea4d320e664fdd..45311c7595661e 100644 --- a/var/spack/repos/builtin/packages/py-iminuit/package.py +++ b/var/spack/repos/builtin/packages/py-iminuit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-immutabledict/package.py b/var/spack/repos/builtin/packages/py-immutabledict/package.py index 2b080c660fa2ba..bc96b170349831 100644 --- a/var/spack/repos/builtin/packages/py-immutabledict/package.py +++ b/var/spack/repos/builtin/packages/py-immutabledict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyImmutabledict(PythonPackage): homepage = "https://github.com/corenting/immutabledict" pypi = "immutabledict/immutabledict-2.2.1.tar.gz" + license("MIT") + version("2.2.1", sha256="1ddb0edf1bb6c70d0197eb90ce1fe2b2d58502334f5fdfde72d7c633d723ec3a") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-immutables/package.py b/var/spack/repos/builtin/packages/py-immutables/package.py index 19fa44f28fc815..02fe3e6a1eb1b9 100644 --- a/var/spack/repos/builtin/packages/py-immutables/package.py +++ b/var/spack/repos/builtin/packages/py-immutables/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyImmutables(PythonPackage): homepage = "https://github.com/MagicStack/immutables" pypi = "immutables/immutables-0.14.tar.gz" + license("Apache-2.0") + version("0.18", sha256="5336c7974084cce62f7e29aaff81a3c3f75e0fd0a23a2faeb986ae0ea08d8cf4") version("0.16", sha256="d67e86859598eed0d926562da33325dac7767b7b1eff84e232c22abea19f4360") version("0.14", sha256="a0a1cc238b678455145bae291d8426f732f5255537ed6a5b7645949704c70a78") diff --git a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py index 0abad1fe97ef49..d4ce2ae07dcd82 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyImportlibMetadata(PythonPackage): pypi = "importlib_metadata/importlib_metadata-1.2.0.tar.gz" git = "https://github.com/python/importlib_metadata" + license("Apache-2.0") + version("6.6.0", sha256="92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705") version("5.1.0", sha256="d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b") version("4.12.0", sha256="637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670") diff --git a/var/spack/repos/builtin/packages/py-importlib-resources/package.py b/var/spack/repos/builtin/packages/py-importlib-resources/package.py index e6c1b4130d8aaa..a70092208afce2 100644 --- a/var/spack/repos/builtin/packages/py-importlib-resources/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-resources/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyImportlibResources(PythonPackage): homepage = "https://github.com/python/importlib_resources" pypi = "importlib_resources/importlib_resources-1.0.2.tar.gz" + license("Apache-2.0") + version("5.12.0", sha256="4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6") version("5.9.0", sha256="5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681") version("5.3.0", sha256="f2e58e721b505a79abe67f5868d99f8886aec8594c962c7490d0c22925f518da") diff --git a/var/spack/repos/builtin/packages/py-incremental/package.py b/var/spack/repos/builtin/packages/py-incremental/package.py index 554e87c20f2630..8550e3759804bc 100644 --- a/var/spack/repos/builtin/packages/py-incremental/package.py +++ b/var/spack/repos/builtin/packages/py-incremental/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIncremental(PythonPackage): homepage = "https://github.com/twisted/incremental" pypi = "incremental/incremental-21.3.0.tar.gz" + license("MIT") + version("21.3.0", sha256="02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-inference-schema/package.py b/var/spack/repos/builtin/packages/py-inference-schema/package.py deleted file mode 100644 index 6bc247642ee38d..00000000000000 --- a/var/spack/repos/builtin/packages/py-inference-schema/package.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PyInferenceSchema(PythonPackage): - """This package is intended to provide a uniform schema for common machine - learning applications, as well as a set of decorators that can be used to - aid in web based ML prediction applications.""" - - homepage = "https://pypi.org/project/inference-schema/" - url = "https://pypi.io/packages/py3/i/inference-schema/inference_schema-1.0.2-py3-none-any.whl" - - version( - "1.0.2", - sha256="fd379becbd12dcf9f7a1ad5c03b163d501ef1dcc4fb85204735c84b1d139f478", - expand=False, - ) - - variant("numpy", default=False, description="Enable numpy support") - variant("pandas", default=False, description="Enable pandas support") - variant("pyspark", default=False, description="Enable pyspark support") - - depends_on("python@3:", type=("build", "run")) - depends_on("py-python-dateutil@2.5.3:", type=("build", "run")) - depends_on("py-pytz@2017.2:", type=("build", "run")) - depends_on("py-wrapt@1.11.1", type=("build", "run")) - depends_on("py-numpy@1.13.0:", when="+numpy", type=("build", "run")) - depends_on("py-pandas@0.20.2:", when="+pandas", type=("build", "run")) - depends_on("py-pyspark@2.3.2", when="+pyspark", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-inflect/package.py b/var/spack/repos/builtin/packages/py-inflect/package.py index a57fb13192038a..afebf284b9cf01 100644 --- a/var/spack/repos/builtin/packages/py-inflect/package.py +++ b/var/spack/repos/builtin/packages/py-inflect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyInflect(PythonPackage): homepage = "https://github.com/jaraco/inflect" pypi = "inflect/inflect-5.0.2.tar.gz" + license("MIT") + version("6.0.2", sha256="f1a6bcb0105046f89619fde1a7d044c612c614c2d85ef182582d9dc9b86d309a") version("5.0.2", sha256="d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0") diff --git a/var/spack/repos/builtin/packages/py-inheritance/package.py b/var/spack/repos/builtin/packages/py-inheritance/package.py index 3dea3b0cc950c7..884e3a4d14c4a3 100644 --- a/var/spack/repos/builtin/packages/py-inheritance/package.py +++ b/var/spack/repos/builtin/packages/py-inheritance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyInheritance(PythonPackage): homepage = "https://github.com/brentp/inheritance" url = "https://github.com/brentp/inheritance/archive/v0.1.5.tar.gz" + license("MIT") + version("0.1.5", sha256="d0621328649a636a42766488fbd0d36d7fb898429120fc579d656711147a0c7c") version("0.1.3", sha256="c12e668ff3d34d9544b0eb4a58e7ba94f265d610545bb151e330ec014a07fda6") diff --git a/var/spack/repos/builtin/packages/py-iniconfig/package.py b/var/spack/repos/builtin/packages/py-iniconfig/package.py index 324ebaa4d2815c..f268c982add0f8 100644 --- a/var/spack/repos/builtin/packages/py-iniconfig/package.py +++ b/var/spack/repos/builtin/packages/py-iniconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIniconfig(PythonPackage): pypi = "iniconfig/iniconfig-1.1.1.tar.gz" + license("MIT") + version("2.0.0", sha256="2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3") version("1.1.1", sha256="bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32") diff --git a/var/spack/repos/builtin/packages/py-iniparse/package.py b/var/spack/repos/builtin/packages/py-iniparse/package.py index a0c91e4d77f048..8a80e5ad410c26 100644 --- a/var/spack/repos/builtin/packages/py-iniparse/package.py +++ b/var/spack/repos/builtin/packages/py-iniparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIniparse(PythonPackage): pypi = "iniparse/iniparse-0.4.tar.gz" git = "https://github.com/candlepin/python-iniparse.git" + license("MIT") + version("master", branch="master") depends_on("python@2.6:2.8,3.3:", when="@master:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-inquirer/package.py b/var/spack/repos/builtin/packages/py-inquirer/package.py index 8d062fe675ee29..25729f9399f332 100644 --- a/var/spack/repos/builtin/packages/py-inquirer/package.py +++ b/var/spack/repos/builtin/packages/py-inquirer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyInquirer(PythonPackage): homepage = "https://github.com/magmax/python-inquirer" pypi = "inquirer/inquirer-3.1.3.tar.gz" + license("MIT") + version("3.1.3", sha256="aac309406f5b49d4b8ab7c6872117f43bf082a552dc256aa16bc95e16bb58bec") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-inquirerpy/package.py b/var/spack/repos/builtin/packages/py-inquirerpy/package.py index 6ba944ce6fc220..01afd834f30cd7 100644 --- a/var/spack/repos/builtin/packages/py-inquirerpy/package.py +++ b/var/spack/repos/builtin/packages/py-inquirerpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyInquirerpy(PythonPackage): homepage = "https://github.com/kazhala/InquirerPy" pypi = "inquirerpy/InquirerPy-0.3.4.tar.gz" + license("MIT") + version("0.3.4", sha256="89d2ada0111f337483cb41ae31073108b2ec1e618a49d7110b0d7ade89fc197e") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-installer/package.py b/var/spack/repos/builtin/packages/py-installer/package.py index 1bedecf074160a..7de649a5e91f68 100644 --- a/var/spack/repos/builtin/packages/py-installer/package.py +++ b/var/spack/repos/builtin/packages/py-installer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,11 @@ class PyInstaller(Package, PythonExtension): ) list_url = "https://pypi.org/simple/installer/" + version( + "0.7.0", + sha256="05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", + expand=False, + ) version( "0.6.0", sha256="ae7c62d1d6158b5c096419102ad0d01fdccebf857e784cee57f94165635fe038", diff --git a/var/spack/repos/builtin/packages/py-instrain/package.py b/var/spack/repos/builtin/packages/py-instrain/package.py index e87950d5f18755..457a0db8580f9a 100644 --- a/var/spack/repos/builtin/packages/py-instrain/package.py +++ b/var/spack/repos/builtin/packages/py-instrain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyInstrain(PythonPackage): variant("prodigal", default=False, description="Enables profiling on a gene by gene level") + license("MIT") + version("1.6.3", sha256="8cc4af185a41f860aa3a58dfacabfe635bf7b28535ac0bb4db67983f95dbd528") version("1.5.7", sha256="c5dcb01dae244927fe987b5f0695d895ccf521c9dfd87a2cb59057ad50bd9bfa") diff --git a/var/spack/repos/builtin/packages/py-intbitset/package.py b/var/spack/repos/builtin/packages/py-intbitset/package.py index 479f789c674ee5..01a55114bc043e 100644 --- a/var/spack/repos/builtin/packages/py-intbitset/package.py +++ b/var/spack/repos/builtin/packages/py-intbitset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyIntbitset(PythonPackage): homepage = "https://github.com/inveniosoftware/intbitset" pypi = "intbitset/intbitset-3.0.1.tar.gz" + license("LGPL-3.0-or-later") + version("3.0.1", sha256="f1e6d03c6729922a223c51849df65b9e916e625aefb911784e7f9acd4c207d53") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-intel-openmp/package.py b/var/spack/repos/builtin/packages/py-intel-openmp/package.py index 3074db7f9e5639..bfb28c441ca9ca 100644 --- a/var/spack/repos/builtin/packages/py-intel-openmp/package.py +++ b/var/spack/repos/builtin/packages/py-intel-openmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-intensity-normalization/package.py b/var/spack/repos/builtin/packages/py-intensity-normalization/package.py index 9494297c71243f..5d880c3fde7962 100644 --- a/var/spack/repos/builtin/packages/py-intensity-normalization/package.py +++ b/var/spack/repos/builtin/packages/py-intensity-normalization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIntensityNormalization(PythonPackage): homepage = "https://github.com/jcreinhold/intensity-normalization" pypi = "intensity-normalization/intensity-normalization-2.1.1.tar.gz" + license("Apache-2.0") + version("2.1.1", sha256="686b86754a9a520a03f793cb15c87e945f68ede78ac0ad1b3564c5d5b7ac9486") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-interface-meta/package.py b/var/spack/repos/builtin/packages/py-interface-meta/package.py index 44564beb19dd73..a986282d758e6f 100644 --- a/var/spack/repos/builtin/packages/py-interface-meta/package.py +++ b/var/spack/repos/builtin/packages/py-interface-meta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyInterfaceMeta(PythonPackage): homepage = "https://github.com/matthewwardrop/interface_meta" pypi = "interface_meta/interface_meta-1.2.4.tar.gz" + license("MIT") + version("1.3.0", sha256="8a4493f8bdb73fb9655dcd5115bc897e207319e36c8835f39c516a2d7e9d79a1") version("1.2.4", sha256="4c7725dd4b80f97b7eecfb26023e1a8a7cdbb6d6a7207a8e93f9d4bfef9ee566") diff --git a/var/spack/repos/builtin/packages/py-intervaltree/package.py b/var/spack/repos/builtin/packages/py-intervaltree/package.py index 77d8db3e68dc72..a6ce9c817f4e39 100644 --- a/var/spack/repos/builtin/packages/py-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/py-intervaltree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIntervaltree(PythonPackage): homepage = "https://github.com/chaimleib/intervaltree" url = "https://github.com/chaimleib/intervaltree/archive/3.0.2.tar.gz" + license("Apache-2.0") + version("3.0.2", sha256="e8ab75b66077f2e5fb85ac56cb6df834689edb048d38601d53d8867cce3b77d1") version("2.1.0", sha256="e444398cbc9582a51c372a344cc7e05d53c53daaac2aae827951ff88554b96ff") diff --git a/var/spack/repos/builtin/packages/py-invoke/package.py b/var/spack/repos/builtin/packages/py-invoke/package.py index 08089934a09af6..53c54538aaacd0 100644 --- a/var/spack/repos/builtin/packages/py-invoke/package.py +++ b/var/spack/repos/builtin/packages/py-invoke/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyInvoke(PythonPackage): homepage = "https://www.pyinvoke.org/" pypi = "invoke/invoke-1.4.1.tar.gz" + license("BSD-2-Clause") + version("1.4.1", sha256="de3f23bfe669e3db1085789fd859eb8ca8e0c5d9c20811e2407fa042e8a5e15d") version("1.2.0", sha256="dc492f8f17a0746e92081aec3f86ae0b4750bf41607ea2ad87e5a7b5705121b7") diff --git a/var/spack/repos/builtin/packages/py-iocapture/package.py b/var/spack/repos/builtin/packages/py-iocapture/package.py index 5b02c4c8683037..5d8268b7b3f15f 100644 --- a/var/spack/repos/builtin/packages/py-iocapture/package.py +++ b/var/spack/repos/builtin/packages/py-iocapture/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyIocapture(PythonPackage): maintainers("dorton21") + license("MIT") + version("0.1.2", sha256="86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8") depends_on("python@2.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-iopath/package.py b/var/spack/repos/builtin/packages/py-iopath/package.py index 576454c6fa983c..98fa71462f2ba5 100644 --- a/var/spack/repos/builtin/packages/py-iopath/package.py +++ b/var/spack/repos/builtin/packages/py-iopath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIopath(PythonPackage): homepage = "https://github.com/facebookresearch/iopath" pypi = "iopath/iopath-0.1.10.tar.gz" + license("MIT") + version("0.1.10", sha256="3311c16a4d9137223e20f141655759933e1eda24f8bff166af834af3c645ef01") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ipaddress/package.py b/var/spack/repos/builtin/packages/py-ipaddress/package.py index 7375cbaae4f251..cff2737a7f8237 100644 --- a/var/spack/repos/builtin/packages/py-ipaddress/package.py +++ b/var/spack/repos/builtin/packages/py-ipaddress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpaddress(PythonPackage): homepage = "https://github.com/phihag/ipaddress" pypi = "ipaddress/ipaddress-1.0.23.tar.gz" + license("PSF-2.0") + version("1.0.23", sha256="b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2") version("1.0.22", sha256="b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c") version("1.0.18", sha256="5d8534c8e185f2d8a1fda1ef73f2c8f4b23264e8e30063feeb9511d492a413e1") diff --git a/var/spack/repos/builtin/packages/py-ipdb/package.py b/var/spack/repos/builtin/packages/py-ipdb/package.py index 08cbabe843e599..cd0a8db13906bd 100644 --- a/var/spack/repos/builtin/packages/py-ipdb/package.py +++ b/var/spack/repos/builtin/packages/py-ipdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpdb(PythonPackage): pypi = "ipdb/ipdb-0.13.11.tar.gz" + license("BSD-3-Clause") + version("0.13.11", sha256="c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93") version("0.13.10", sha256="6950715f491d59df6c27b49cb372f22c2f1763478a5e9ed03fb0507e2d85f460") version("0.13.9", sha256="951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5") diff --git a/var/spack/repos/builtin/packages/py-ipycanvas/package.py b/var/spack/repos/builtin/packages/py-ipycanvas/package.py index d61e222fb47a0d..019a7d433a718f 100644 --- a/var/spack/repos/builtin/packages/py-ipycanvas/package.py +++ b/var/spack/repos/builtin/packages/py-ipycanvas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpycanvas(PythonPackage): homepage = "https://github.com/martinRenou/ipycanvas" pypi = "ipycanvas/ipycanvas-0.9.0.tar.gz" + license("BSD-3-Clause") + version("0.10.2", sha256="a02c494834cb3c60509801172e7429beae837b3cb6c61d3becf8b586c5a66004") version("0.9.0", sha256="f29e56b93fe765ceace0676c3e75d44e02a3ff6c806f3b7e5b869279f470cc43") diff --git a/var/spack/repos/builtin/packages/py-ipyevents/package.py b/var/spack/repos/builtin/packages/py-ipyevents/package.py index 042cff2119353b..45ccdd102a21e9 100644 --- a/var/spack/repos/builtin/packages/py-ipyevents/package.py +++ b/var/spack/repos/builtin/packages/py-ipyevents/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpyevents(PythonPackage): homepage = "https://github.com/mwcraig/ipyevents" pypi = "ipyevents/ipyevents-2.0.1.tar.gz" + license("BSD-3-Clause") + version("2.0.1", sha256="23eb2afab13d9056397f120a88051dd3beb067b698d08b33adffc9e077f019cb") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index 0311feefbdf451..2357fbb56d5ffb 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIpykernel(PythonPackage): homepage = "https://github.com/ipython/ipykernel" pypi = "ipykernel/ipykernel-5.3.4.tar.gz" + license("BSD-3-Clause") + version("6.23.1", sha256="1aba0ae8453e15e9bc6b24e497ef6840114afcdb832ae597f32137fa19d42a6f") version("6.22.0", sha256="302558b81f1bc22dc259fb2a0c5c7cf2f4c0bdb21b50484348f7bafe7fb71421") version("6.16.0", sha256="7fe42c0d58435e971dc15fd42189f20d66bf35f3056bda4f6554271bc1fa3d0d") diff --git a/var/spack/repos/builtin/packages/py-ipympl/package.py b/var/spack/repos/builtin/packages/py-ipympl/package.py index 56eefb8429f3e6..c83d6392b0c12c 100644 --- a/var/spack/repos/builtin/packages/py-ipympl/package.py +++ b/var/spack/repos/builtin/packages/py-ipympl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIpympl(PythonPackage): pypi = "ipympl/ipympl-0.8.8.tar.gz" maintainers("haralmha") + license("BSD-3-Clause") + version("0.8.8", sha256="5bf5d780b07fafe7924922ac6b2f3abd22721f341e5e196b3b82737dfbd0e1c9") depends_on("py-setuptools@40.8:", type="build") diff --git a/var/spack/repos/builtin/packages/py-ipyparallel/package.py b/var/spack/repos/builtin/packages/py-ipyparallel/package.py index 65b887c2ea3020..3b566e9484a014 100644 --- a/var/spack/repos/builtin/packages/py-ipyparallel/package.py +++ b/var/spack/repos/builtin/packages/py-ipyparallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-ipyrad/package.py b/var/spack/repos/builtin/packages/py-ipyrad/package.py index 1419f75bfa4770..0e0c3fa3097292 100644 --- a/var/spack/repos/builtin/packages/py-ipyrad/package.py +++ b/var/spack/repos/builtin/packages/py-ipyrad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyIpyrad(PythonPackage): url = "https://github.com/dereneaton/ipyrad/archive/refs/tags/0.9.85.tar.gz" + license("GPL-3.0-only") + version("0.9.90", sha256="8b95aa3bae30da15baba90abb03176932411ff708c54d5e4481b811cceb8a4a8") version("0.9.85", sha256="17b07466531655db878919e426743ac649cfab2e92c06c4e45f76ee1517633f9") diff --git a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py index a7d97c21719917..17848d69cd336f 100644 --- a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyIpythonClusterHelper(PythonPackage): homepage = "https://github.com/roryk/ipython-cluster-helper" url = "https://github.com/roryk/ipython-cluster-helper/archive/v0.6.4.tar.gz" + license("MIT") + version("0.6.4", sha256="6c8b42e1428305eeb0c54d1a8ecf3c551ec9ee02e1f039b4b12260bef66fc446") version("0.6.3", sha256="0256e6f72c31f846fd3bf7ed0a87bc362d77a0731cb52dbdc19c41686e44faeb") diff --git a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py index dd874b76617e79..847a0968e3f41f 100644 --- a/var/spack/repos/builtin/packages/py-ipython-genutils/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-genutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index 1963265d5493b9..d1f1044e7674a5 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyIpython(PythonPackage): # for py-ipython@8: "IPython.kernel" was removed skip_modules = ["IPython.kernel"] + license("BSD-3-Clause") + version("8.14.0", sha256="1d197b907b6ba441b692c48cf2a3a2de280dc0ac91a3405b39349a50272ca0a1") version("8.11.0", sha256="735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04") version("8.5.0", sha256="097bdf5cd87576fd066179c9f7f208004f7a6864ee1b20f37d346c0bcb099f84") diff --git a/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py b/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py index 50d6511532eb7f..115c1c91f6fa79 100644 --- a/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py +++ b/var/spack/repos/builtin/packages/py-ipyvtk-simple/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpyvtkSimple(PythonPackage): homepage = "https://github.com/Kitware/ipyvtklink" pypi = "ipyvtk_simple/ipyvtk_simple-0.1.4.tar.gz" + license("BSD-3-Clause") + version("0.1.4", sha256="ffac12e9287affd7c31538ac7f2d2390c72342a73b31010735b275ca841ceaa5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index 4c291a04546150..0291b0e18b17e4 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIpywidgets(PythonPackage): homepage = "https://github.com/ipython/ipywidgets" pypi = "ipywidgets/ipywidgets-7.6.5.tar.gz" + license("BSD-3-Clause") + version("8.0.2", sha256="08cb75c6e0a96836147cbfdc55580ae04d13e05d26ffbc377b4e1c68baa28b1f") version("7.7.0", sha256="ab4a5596855a88b83761921c768707d65e5847068139bc1729ddfe834703542a") version("7.6.5", sha256="00974f7cb4d5f8d494c19810fedb9fa9b64bffd3cda7c2be23c133a1ad3c99c5") diff --git a/var/spack/repos/builtin/packages/py-irpf90/package.py b/var/spack/repos/builtin/packages/py-irpf90/package.py index 2db8e863a49365..2bf1c183eaf800 100644 --- a/var/spack/repos/builtin/packages/py-irpf90/package.py +++ b/var/spack/repos/builtin/packages/py-irpf90/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-isa-rwval/package.py b/var/spack/repos/builtin/packages/py-isa-rwval/package.py index 1ede7949aaefa1..8e43fd8e046c68 100644 --- a/var/spack/repos/builtin/packages/py-isa-rwval/package.py +++ b/var/spack/repos/builtin/packages/py-isa-rwval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-isal/package.py b/var/spack/repos/builtin/packages/py-isal/package.py index ef5df1bc682b29..1a8bbcb444f7b0 100644 --- a/var/spack/repos/builtin/packages/py-isal/package.py +++ b/var/spack/repos/builtin/packages/py-isal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyIsal(PythonPackage): homepage = "https://github.com/pycompression/python-isal" pypi = "isal/isal-1.1.0.tar.gz" + license("PSF-2.0") + version("1.1.0", sha256="1364f4e3255a57d51c01422ab3ae785a43c076d516ebf49f6a25adecf8232105") version("1.0.0", sha256="a30369de6852109eef8ca1bdd46d7e4b5c4517846a25acfc707cbb19db66ac80") diff --git a/var/spack/repos/builtin/packages/py-iso8601/package.py b/var/spack/repos/builtin/packages/py-iso8601/package.py index 38963344b45fe9..ff1b02250ee61e 100644 --- a/var/spack/repos/builtin/packages/py-iso8601/package.py +++ b/var/spack/repos/builtin/packages/py-iso8601/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIso8601(PythonPackage): homepage = "https://github.com/micktwomey/pyiso8601" pypi = "iso8601/iso8601-0.1.14.tar.gz" + license("MIT") + version("1.1.0", sha256="32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f") version("1.0.2", sha256="27f503220e6845d9db954fb212b95b0362d8b7e6c1b2326a87061c3de93594b1") version("0.1.14", sha256="8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79") diff --git a/var/spack/repos/builtin/packages/py-isodate/package.py b/var/spack/repos/builtin/packages/py-isodate/package.py index 78caa65e9e216e..aa07ce7fc1dbe8 100644 --- a/var/spack/repos/builtin/packages/py-isodate/package.py +++ b/var/spack/repos/builtin/packages/py-isodate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-isoduration/package.py b/var/spack/repos/builtin/packages/py-isoduration/package.py index db47fb020166c3..d26c0a426845d9 100644 --- a/var/spack/repos/builtin/packages/py-isoduration/package.py +++ b/var/spack/repos/builtin/packages/py-isoduration/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyIsoduration(PythonPackage): homepage = "https://github.com/bolsote/isoduration" pypi = "isoduration/isoduration-20.11.0.tar.gz" + license("0BSD") + version("20.11.0", sha256="ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index aca4dd29047753..54877beaec45f8 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,17 +12,36 @@ class PyIsort(PythonPackage): homepage = "https://github.com/timothycrosley/isort" pypi = "isort/isort-4.2.15.tar.gz" + license("MIT") + version("5.12.0", sha256="8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504") + version("5.11.5", sha256="6be1f76a507cb2ecf16c7cf14a37e41609ca082330be4e3436a18ef74add55db") version("5.10.1", sha256="e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951") version("5.9.3", sha256="9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899") version("5.9.1", sha256="83510593e07e433b77bd5bff0f6f607dbafa06d1a89022616f02d8b699cfcd56") - version("4.3.20", sha256="c40744b6bc5162bbb39c1257fe298b7a393861d50978b565f3ccd9cb9de0182a") - version("4.2.15", sha256="79f46172d3a4e2e53e7016e663cc7a8b538bec525c36675fcfd2767df30b3983") + version( + "4.3.20", + sha256="c40744b6bc5162bbb39c1257fe298b7a393861d50978b565f3ccd9cb9de0182a", + deprecated=True, + ) + version( + "4.2.15", + sha256="79f46172d3a4e2e53e7016e663cc7a8b538bec525c36675fcfd2767df30b3983", + deprecated=True, + ) variant("colors", default=False, description="Install colorama for --color support") - depends_on("python@3.8:", when="@5.12:", type=("build", "run")) - depends_on("python@3.6.1:3", when="@5:5.10", type=("build", "run")) + with default_args(type=("build", "run")): + depends_on("python@3.8:", when="@5.12:") + depends_on("python@3.7:", when="@5.11") + # This needs to be @3.6 since for bootstrapping the current Spack interpreter is + # identified by major.minor (and the new versioning identifies it as @=3.6) + depends_on("python@3.6:3", when="@5.10") + depends_on("python@3.6:3", when="@5.9") + + conflicts("python@3.6.0", when="@5:") + depends_on("py-setuptools", when="@:4", type=("build", "run")) depends_on("py-poetry-core@1:", when="@5:", type="build") depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-iterative-stats/package.py b/var/spack/repos/builtin/packages/py-iterative-stats/package.py index 1e4692b94ec2ac..9c1559ba87b59d 100644 --- a/var/spack/repos/builtin/packages/py-iterative-stats/package.py +++ b/var/spack/repos/builtin/packages/py-iterative-stats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyIterativeStats(PythonPackage): git = "https://github.com/IterativeStatistics/BasicIterativeStatistics.git" maintainers("robcaulk") + license("BSD-3-Clause") + version("main", branch="main") version("0.1.0", sha256="bb4f378a8fa117d1f24e9ea5ac0f1bd13c04b1ab3693a148ba936ffb237f2fba") version("0.0.4", sha256="7e838aa79de867b0e312be8cdf9319bb70824b624c684e968636cc8d4c9d5712") diff --git a/var/spack/repos/builtin/packages/py-itk/package.py b/var/spack/repos/builtin/packages/py-itk/package.py index e9a0f8a7127593..b76245a204305d 100644 --- a/var/spack/repos/builtin/packages/py-itk/package.py +++ b/var/spack/repos/builtin/packages/py-itk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,12 +17,6 @@ class PyItk(PythonPackage): if sys.platform == "darwin": # version 5.1.1 - version( - "5.1.1-cp37", - url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", - sha256="f112515483a073fae96d5cfce4eb9f95cbf57a145bbd196b2369a3194e27febf", - expand=False, - ) version( "5.1.1-cp38", url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp38-cp38-macosx_10_9_x86_64.whl", @@ -31,12 +25,6 @@ class PyItk(PythonPackage): ) # version 5.1.2 - version( - "5.1.2-cp37", - url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", - sha256="0b494485d05306240eaa5ab1a5e00895fcce8fe684c632c02a2373f36d123902", - expand=False, - ) version( "5.1.2-cp38", url="https://pypi.io/packages/cp38/i/itk/itk-5.1.2-cp38-cp38-macosx_10_9_x86_64.whl", @@ -51,12 +39,6 @@ class PyItk(PythonPackage): ) # version 5.3.0 - version( - "5.3.0-cp37", - url="https://pypi.io/packages/cp37/i/itk/itk-5.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", - sha256="493e28a3c9f38502f82613fa6ab9855fb19bff671095c287100a441830a921d0", - expand=False, - ) version( "5.3.0-cp38", url="https://pypi.io/packages/cp38/i/itk/itk-5.3.0-cp38-cp38-macosx_10_9_x86_64.whl", @@ -83,12 +65,6 @@ class PyItk(PythonPackage): ) elif sys.platform.startswith("linux"): # version 5.1.1 - version( - "5.1.1-cp37", - url="https://pypi.io/packages/cp37/i/itk/itk-5.1.1-cp37-cp37m-manylinux1_x86_64.whl", - sha256="7c313d2e3a3e37b8e78d0b2d70be2d478c87fde6f27912c714c855a05584b8ee", - expand=False, - ) version( "5.1.1-cp38", url="https://pypi.io/packages/cp38/i/itk/itk-5.1.1-cp38-cp38-manylinux1_x86_64.whl", @@ -97,12 +73,6 @@ class PyItk(PythonPackage): ) # version 5.1.2 - version( - "5.1.2-cp37", - url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-manylinux1_x86_64.whl", - sha256="064d9cfdd9547ae3ed850c35b989e0141c4bd434672bc2dd124248aab7bdf09a", - expand=False, - ) version( "5.1.2-cp38", url="https://pypi.io/packages/cp38/i/itk/itk-5.1.2-cp38-cp38-manylinux1_x86_64.whl", @@ -117,12 +87,6 @@ class PyItk(PythonPackage): ) # version 5.3.0 - version( - "5.3.0-cp37", - url="https://pypi.io/packages/cp37/i/itk/itk-5.3.0-cp37-cp37m-manylinux_2_28_x86_64.whl", - sha256="265c8b28469164a45fd9d94c211b2ed017acc7cda7a9e74bbb20b38c49c1af61", - expand=False, - ) version( "5.3.0-cp38", url="https://pypi.io/packages/cp38/i/itk/itk-5.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", @@ -148,7 +112,6 @@ class PyItk(PythonPackage): expand=False, ) - depends_on("python@3.7.0:3.7", when="@5.1.1-cp37,5.1.2-cp37,5.3.0-cp37", type=("build", "run")) depends_on("python@3.8.0:3.8", when="@5.1.1-cp38,5.1.2-cp38,5.3.0-cp38", type=("build", "run")) depends_on("python@3.9.0:3.9", when="@5.1.2-cp39,5.3.0-cp39", type=("build", "run")) depends_on("python@3.10.0:3.10", when="@5.3.0-cp310", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-itolapi/package.py b/var/spack/repos/builtin/packages/py-itolapi/package.py index 95b1922544fc8e..99a6d50f5d8963 100644 --- a/var/spack/repos/builtin/packages/py-itolapi/package.py +++ b/var/spack/repos/builtin/packages/py-itolapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyItolapi(PythonPackage): maintainers("snehring") + license("MIT") + version("4.1.2", sha256="37a866a117a80d3d72a6eb6b2cba30444751c644cc6bc4242f050750375a8397") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-itsdangerous/package.py b/var/spack/repos/builtin/packages/py-itsdangerous/package.py index 97934416ca84f6..b685012ef14660 100644 --- a/var/spack/repos/builtin/packages/py-itsdangerous/package.py +++ b/var/spack/repos/builtin/packages/py-itsdangerous/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyItsdangerous(PythonPackage): homepage = "https://github.com/mitsuhiko/itsdangerous" pypi = "itsdangerous/itsdangerous-1.1.0.tar.gz" + license("BSD-3-Clause") + version("2.1.2", sha256="5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a") version("2.0.1", sha256="9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0") version("1.1.0", sha256="321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19") diff --git a/var/spack/repos/builtin/packages/py-jaconv/package.py b/var/spack/repos/builtin/packages/py-jaconv/package.py index d8e2bb4ba1c4fc..e92160bbe1353e 100644 --- a/var/spack/repos/builtin/packages/py-jaconv/package.py +++ b/var/spack/repos/builtin/packages/py-jaconv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJaconv(PythonPackage): homepage = "https://github.com/ikegami-yukino/jaconv" pypi = "jaconv/jaconv-0.3.tar.gz" + license("MIT") + version("0.3", sha256="cc70c796c19a6765598c03eac59d1399a555a9a8839cc70e540ec26f0ec3e66e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jamo/package.py b/var/spack/repos/builtin/packages/py-jamo/package.py index d3d694d85861e7..e4a357f18b6e92 100644 --- a/var/spack/repos/builtin/packages/py-jamo/package.py +++ b/var/spack/repos/builtin/packages/py-jamo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJamo(PythonPackage): homepage = "https://github.com/jdongian/python-jamo" pypi = "jamo/jamo-0.4.1.tar.gz" + license("Apache-2.0") + version("0.4.1", sha256="ea65cf9d35338d0e0af48d75ff426d8a369b0ebde6f07051c3ac37256f56d025") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jaraco-classes/package.py b/var/spack/repos/builtin/packages/py-jaraco-classes/package.py index ed96573467ec92..6bf5aa173d27c0 100644 --- a/var/spack/repos/builtin/packages/py-jaraco-classes/package.py +++ b/var/spack/repos/builtin/packages/py-jaraco-classes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJaracoClasses(PythonPackage): homepage = "https://github.com/jaraco/jaraco.classes" pypi = "jaraco.classes/jaraco.classes-3.2.2.tar.gz" + license("MIT") + version("3.2.3", sha256="89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a") version("3.2.2", sha256="6745f113b0b588239ceb49532aa09c3ebb947433ce311ef2f8e3ad64ebb74594") diff --git a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py index 12fddbf99f16af..e55b35655c3075 100644 --- a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py +++ b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJaracoFunctools(PythonPackage): homepage = "https://github.com/jaraco/jaraco.functools" pypi = "jaraco.functools/jaraco.functools-2.0.tar.gz" + license("MIT") + version("2.0", sha256="35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jarowinkler/package.py b/var/spack/repos/builtin/packages/py-jarowinkler/package.py new file mode 100644 index 00000000000000..1ae633e44e139d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-jarowinkler/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class 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") + + license("MIT") + + 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") diff --git a/var/spack/repos/builtin/packages/py-jarvis-util/package.py b/var/spack/repos/builtin/packages/py-jarvis-util/package.py index 109210802dd6ad..48bab7567841d9 100644 --- a/var/spack/repos/builtin/packages/py-jarvis-util/package.py +++ b/var/spack/repos/builtin/packages/py-jarvis-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-javaproperties/package.py b/var/spack/repos/builtin/packages/py-javaproperties/package.py index 962b4217e5c0ac..1332333b7e5d23 100644 --- a/var/spack/repos/builtin/packages/py-javaproperties/package.py +++ b/var/spack/repos/builtin/packages/py-javaproperties/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJavaproperties(PythonPackage): homepage = "https://github.com/jwodder/javaproperties" pypi = "javaproperties/javaproperties-0.7.0.tar.gz" + license("MIT") + version("0.7.0", sha256="cf45b39fcbaeced1dfc0b7f2bda16e34fc0349116269e001dada42fd2e145d87") version("0.5.1", sha256="2b0237b054af4d24c74f54734b7d997ca040209a1820e96fb4a82625f7bd40cf") diff --git a/var/spack/repos/builtin/packages/py-jax/package.py b/var/spack/repos/builtin/packages/py-jax/package.py index a2a3900c5d4ea7..76c6ce28e7a37f 100644 --- a/var/spack/repos/builtin/packages/py-jax/package.py +++ b/var/spack/repos/builtin/packages/py-jax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyJax(PythonPackage): homepage = "https://github.com/google/jax" pypi = "jax/jax-0.2.25.tar.gz" + license("Apache-2.0") + version("0.4.3", sha256="d43f08f940aa30eb339965cfb3d6bee2296537b0dc2f0c65ccae3009279529ae") version("0.3.23", sha256="bff436e15552a82c0ebdef32737043b799e1e10124423c57a6ae6118c3a7b6cd") version("0.2.25", sha256="822e8d1e06257eaa0fdc4c0a0686c4556e9f33647fa2a766755f984786ae7446") diff --git a/var/spack/repos/builtin/packages/py-jaxlib/package.py b/var/spack/repos/builtin/packages/py-jaxlib/package.py index b4c7daba27c817..23ddc076d4e9b2 100644 --- a/var/spack/repos/builtin/packages/py-jaxlib/package.py +++ b/var/spack/repos/builtin/packages/py-jaxlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyJaxlib(PythonPackage, CudaPackage): tmp_path = "" buildtmp = "" + license("Apache-2.0") + version("0.4.3", sha256="2104735dc22be2b105e5517bd5bc6ae97f40e8e9e54928cac1585c6112a3d910") version("0.3.22", sha256="680a6f5265ba26d5515617a95ae47244005366f879a5c321782fde60f34e6d0d") version("0.1.74", sha256="bbc78c7a4927012dcb1b7cd135c7521f782d7dad516a2401b56d3190f81afe35") diff --git a/var/spack/repos/builtin/packages/py-jdatetime/package.py b/var/spack/repos/builtin/packages/py-jdatetime/package.py index adf4f9a57be0af..b4a5e7ed558558 100644 --- a/var/spack/repos/builtin/packages/py-jdatetime/package.py +++ b/var/spack/repos/builtin/packages/py-jdatetime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jdcal/package.py b/var/spack/repos/builtin/packages/py-jdcal/package.py index 9b87eb54c76be8..01ccc2e1d6549b 100644 --- a/var/spack/repos/builtin/packages/py-jdcal/package.py +++ b/var/spack/repos/builtin/packages/py-jdcal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJdcal(PythonPackage): homepage = "https://github.com/phn/jdcal" pypi = "jdcal/jdcal-1.3.tar.gz" + license("BSD-2-Clause") + version("1.3", sha256="b760160f8dc8cc51d17875c6b663fafe64be699e10ce34b6a95184b5aa0fdc9e") version("1.2", sha256="5ebedb58b95ebabd30f56abef65139c6f69ec1687cf1d2f3a7c503f9a2cdfa4d") diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index cdeea3b49240f5..4ac1c9574c4824 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJedi(PythonPackage): homepage = "https://github.com/davidhalter/jedi" pypi = "jedi/jedi-0.9.0.tar.gz" + license("MIT") + version("0.18.2", sha256="bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612") version("0.18.1", sha256="74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab") version("0.18.0", sha256="92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707") diff --git a/var/spack/repos/builtin/packages/py-jeepney/package.py b/var/spack/repos/builtin/packages/py-jeepney/package.py index a8334a25a426e0..bb7bcb7ca700e0 100644 --- a/var/spack/repos/builtin/packages/py-jeepney/package.py +++ b/var/spack/repos/builtin/packages/py-jeepney/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJeepney(PythonPackage): homepage = "https://gitlab.com/takluyver/jeepney" pypi = "jeepney/jeepney-0.4.3.tar.gz" + license("MIT") + version("0.8.0", sha256="5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806") version("0.7.1", sha256="fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f") version("0.6.0", sha256="7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657") diff --git a/var/spack/repos/builtin/packages/py-jellyfish/package.py b/var/spack/repos/builtin/packages/py-jellyfish/package.py index 9e7318444c21a9..d0ccd6ba3958a6 100644 --- a/var/spack/repos/builtin/packages/py-jellyfish/package.py +++ b/var/spack/repos/builtin/packages/py-jellyfish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJellyfish(PythonPackage): pypi = "jellyfish/jellyfish-0.6.1.tar.gz" + license("MIT") + version("0.6.1", sha256="5104e45a2b804b48a46a92a5e6d6e86830fe60ae83b1da32c867402c8f4c2094") version("0.5.6", sha256="887a9a49d0caee913a883c3e7eb185f6260ebe2137562365be422d1316bd39c9") diff --git a/var/spack/repos/builtin/packages/py-jinja2-cli/package.py b/var/spack/repos/builtin/packages/py-jinja2-cli/package.py index c4c9fc16cb38e6..155bb45e77684e 100644 --- a/var/spack/repos/builtin/packages/py-jinja2-cli/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJinja2Cli(PythonPackage): homepage = "https://github.com/mattrobenolt/jinja2-cli" pypi = "jinja2-cli/jinja2-cli-0.6.0.tar.gz" + license("BSD-2-Clause") + version("0.8.2", sha256="a16bb1454111128e206f568c95938cdef5b5a139929378f72bb8cf6179e18e50") version("0.6.0", sha256="4b1be17ce8a8f133df02205c3f0d3ebfc3a68e795d26987f846a2316636427b7") diff --git a/var/spack/repos/builtin/packages/py-jinja2-time/package.py b/var/spack/repos/builtin/packages/py-jinja2-time/package.py index 29472f9b7a6a11..973dca3eb24a1e 100644 --- a/var/spack/repos/builtin/packages/py-jinja2-time/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2-time/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJinja2Time(PythonPackage): homepage = "https://github.com/hackebrot/jinja2-time" url = "https://github.com/hackebrot/jinja2-time/archive/0.2.0.tar.gz" + license("MIT") + version("0.2.0", sha256="0e647e525ba47523fa400a58fdec090b1cc6dcec4afbf095ee01e9e589e5a5ef") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py index a4c92d359415cf..07ac0c8acf5358 100644 --- a/var/spack/repos/builtin/packages/py-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-jinja2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyJinja2(PythonPackage): pypi = "Jinja2/Jinja2-2.10.3.tar.gz" git = "https://github.com/pallets/jinja" + license("BSD-3-Clause") + version("3.1.2", sha256="31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852") version("3.0.3", sha256="611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7") version("3.0.1", sha256="703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4") diff --git a/var/spack/repos/builtin/packages/py-jmespath/package.py b/var/spack/repos/builtin/packages/py-jmespath/package.py index 55cf8e6018c2eb..c8c8f4cbfb1a03 100644 --- a/var/spack/repos/builtin/packages/py-jmespath/package.py +++ b/var/spack/repos/builtin/packages/py-jmespath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJmespath(PythonPackage): homepage = "https://github.com/jmespath/jmespath.py" pypi = "jmespath/jmespath-0.9.4.tar.gz" + license("MIT") + version("1.0.1", sha256="90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe") version("0.10.0", sha256="b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9") version("0.9.4", sha256="bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c") diff --git a/var/spack/repos/builtin/packages/py-jmp/package.py b/var/spack/repos/builtin/packages/py-jmp/package.py index 6288fbe7a988a2..1613cf4a8e6122 100644 --- a/var/spack/repos/builtin/packages/py-jmp/package.py +++ b/var/spack/repos/builtin/packages/py-jmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJmp(PythonPackage): # pypi tarball has requirements.txt missing url = "https://github.com/deepmind/jmp/archive/refs/tags/v0.0.2.tar.gz" + license("Apache-2.0") + version("0.0.2", sha256="4d242fb14502b15a7c072e112bdcd7cb5d8b373d9733162eea23e0b9b7dbb6d0") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-joblib/package.py b/var/spack/repos/builtin/packages/py-joblib/package.py index 77535d65b03cad..4e85d0030b0177 100644 --- a/var/spack/repos/builtin/packages/py-joblib/package.py +++ b/var/spack/repos/builtin/packages/py-joblib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyJoblib(PythonPackage): # unnecessary dependencies. skip_modules = ["joblib.test"] + license("BSD-3-Clause") + version("1.2.0", sha256="e1cee4a79e4af22881164f218d4311f60074197fb707e082e803b61f6d137018") version("1.1.0", sha256="4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35") version("1.0.1", sha256="9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7") diff --git a/var/spack/repos/builtin/packages/py-jplephem/package.py b/var/spack/repos/builtin/packages/py-jplephem/package.py index 477732003dc158..f0905606641358 100644 --- a/var/spack/repos/builtin/packages/py-jplephem/package.py +++ b/var/spack/repos/builtin/packages/py-jplephem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJplephem(PythonPackage): pypi = "jplephem/jplephem-2.9.tar.gz" + license("MIT") + version("2.9", sha256="9dffb9f3d3f6d996ade875102431fe385e8ea422da25c8ba17b0508d9ca1282b") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-jprops/package.py b/var/spack/repos/builtin/packages/py-jprops/package.py index ba63831add08f6..c0519fdffddf1c 100644 --- a/var/spack/repos/builtin/packages/py-jprops/package.py +++ b/var/spack/repos/builtin/packages/py-jprops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jpype1/package.py b/var/spack/repos/builtin/packages/py-jpype1/package.py index 09fbb0b40f8654..8c2f32f41a9bb3 100644 --- a/var/spack/repos/builtin/packages/py-jpype1/package.py +++ b/var/spack/repos/builtin/packages/py-jpype1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jsmin/package.py b/var/spack/repos/builtin/packages/py-jsmin/package.py index f1080d9540430b..5a522102d30054 100644 --- a/var/spack/repos/builtin/packages/py-jsmin/package.py +++ b/var/spack/repos/builtin/packages/py-jsmin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJsmin(PythonPackage): homepage = "https://github.com/tikitu/jsmin/" pypi = "jsmin/jsmin-2.2.2.tar.gz" + license("MIT") + version("3.0.1", sha256="c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc") version("2.2.2", sha256="b6df99b2cd1c75d9d342e4335b535789b8da9107ec748212706ef7bbe5c2553b") diff --git a/var/spack/repos/builtin/packages/py-json-get/package.py b/var/spack/repos/builtin/packages/py-json-get/package.py index 1bd6699ad9da8b..278273b1b855d6 100644 --- a/var/spack/repos/builtin/packages/py-json-get/package.py +++ b/var/spack/repos/builtin/packages/py-json-get/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJsonGet(PythonPackage): homepage = "https://github.com/srittau/python-json-get" url = "https://github.com/srittau/python-json-get/archive/v1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="0d436f1f2dc8c51ab0249d964bb7f176d724131f76c14adf6fc4687e68ec37ab") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-json2html/package.py b/var/spack/repos/builtin/packages/py-json2html/package.py index 99b33e9eefdabc..3b09ea87b3b892 100644 --- a/var/spack/repos/builtin/packages/py-json2html/package.py +++ b/var/spack/repos/builtin/packages/py-json2html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyJson2html(PythonPackage): maintainers("meyersbs") + license("MIT") + version("1.3.0", sha256="8951a53662ae9cfd812685facdba693fc950ffc1c1fd1a8a2d3cf4c34600689c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-json5/package.py b/var/spack/repos/builtin/packages/py-json5/package.py index 26e31df2b8f528..6862b676d64ae9 100644 --- a/var/spack/repos/builtin/packages/py-json5/package.py +++ b/var/spack/repos/builtin/packages/py-json5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJson5(PythonPackage): homepage = "https://github.com/dpranke/pyjson5" pypi = "json5/json5-0.9.4.tar.gz" + license("Apache-2.0") + version("0.9.14", sha256="9ed66c3a6ca3510a976a9ef9b8c0787de24802724ab1860bc0153c7fdd589b02") version("0.9.10", sha256="ad9f048c5b5a4c3802524474ce40a622fae789860a86f10cc4f7e5f9cf9b46ab") version("0.9.6", sha256="9175ad1bc248e22bb8d95a8e8d765958bf0008fef2fe8abab5bc04e0f1ac8302") diff --git a/var/spack/repos/builtin/packages/py-jsonargparse/package.py b/var/spack/repos/builtin/packages/py-jsonargparse/package.py index a84a23c7fc6926..d618b5f6378da9 100644 --- a/var/spack/repos/builtin/packages/py-jsonargparse/package.py +++ b/var/spack/repos/builtin/packages/py-jsonargparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyJsonargparse(PythonPackage): homepage = "https://github.com/omni-us/jsonargparse" pypi = "jsonargparse/jsonargparse-4.19.0.tar.gz" + license("MIT") + version("4.25.0", sha256="4eaadae69c387a3d83a76b1eaf20ca98d5274d8637f180dca0754ce5405adb6b") version("4.19.0", sha256="63aa3c7bbdb219d0f254a5ae86f3d54384ebc1ffa905e776cc19283bc843787b") diff --git a/var/spack/repos/builtin/packages/py-jsondiff/package.py b/var/spack/repos/builtin/packages/py-jsondiff/package.py index c6c967f9d2b661..943581c66c9088 100644 --- a/var/spack/repos/builtin/packages/py-jsondiff/package.py +++ b/var/spack/repos/builtin/packages/py-jsondiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJsondiff(PythonPackage): homepage = "https://github.com/ZoomerAnalytics/jsondiff" pypi = "jsondiff/jsondiff-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="34941bc431d10aa15828afe1cbb644977a114e75eef6cc74fb58951312326303") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jsonpatch/package.py b/var/spack/repos/builtin/packages/py-jsonpatch/package.py index 52458ab353dd92..e93227d206ad64 100644 --- a/var/spack/repos/builtin/packages/py-jsonpatch/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJsonpatch(PythonPackage): homepage = "https://github.com/stefankoegl/python-json-patch" pypi = "jsonpatch/jsonpatch-1.23.tar.gz" + license("BSD-3-Clause") + version("1.23", sha256="49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py b/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py index 0d2274f997fb33..dfa5273ee9d6a7 100644 --- a/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpath-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,9 +15,13 @@ class PyJsonpathNg(PythonPackage): homepage = "https://github.com/h2non/jsonpath-ng" pypi = "jsonpath-ng/jsonpath-ng-1.5.2.tar.gz" + license("Apache-2.0") + + 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") diff --git a/var/spack/repos/builtin/packages/py-jsonpickle/package.py b/var/spack/repos/builtin/packages/py-jsonpickle/package.py index 4672b8cb7fbcb7..4ad9ac4a608f90 100644 --- a/var/spack/repos/builtin/packages/py-jsonpickle/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpickle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJsonpickle(PythonPackage): homepage = "https://github.com/jsonpickle/jsonpickle" pypi = "jsonpickle/jsonpickle-1.4.1.tar.gz" + license("BSD-3-Clause") + version("2.2.0", sha256="7b272918b0554182e53dc340ddd62d9b7f902fec7e7b05620c04f3ccef479a0e") version("2.0.0", sha256="0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a") version("1.4.1", sha256="e8d4b7cd0bd6826001a74377df1079a76ad8bae0f909282de2554164c837c8ba") diff --git a/var/spack/repos/builtin/packages/py-jsonpointer/package.py b/var/spack/repos/builtin/packages/py-jsonpointer/package.py index 975cdd4379baa9..665ee050825892 100644 --- a/var/spack/repos/builtin/packages/py-jsonpointer/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpointer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJsonpointer(PythonPackage): homepage = "https://github.com/stefankoegl/python-json-pointer" pypi = "jsonpointer/jsonpointer-2.0.tar.gz" + license("BSD-3-Clause") + version("2.0", sha256="c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362") version("1.9", sha256="39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308") diff --git a/var/spack/repos/builtin/packages/py-jsonref/package.py b/var/spack/repos/builtin/packages/py-jsonref/package.py index aefe9095b612a8..b113b0b0d03599 100644 --- a/var/spack/repos/builtin/packages/py-jsonref/package.py +++ b/var/spack/repos/builtin/packages/py-jsonref/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJsonref(PythonPackage): homepage = "https://github.com/gazpachoking/jsonref" pypi = "jsonref/jsonref-0.2.tar.gz" + license("MIT") + version("0.2", sha256="f3c45b121cf6257eafabdc3a8008763aed1cd7da06dbabc59a9e4d2a5e4e6697") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index 4c09ce5902fc15..2ba338975bbe7b 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJsonschema(PythonPackage): homepage = "https://github.com/Julian/jsonschema" pypi = "jsonschema/jsonschema-3.2.0.tar.gz" + license("MIT") + version("4.17.3", sha256="0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d") version("4.16.0", sha256="165059f076eff6971bae5b742fc029a7b4ef3f9bcf04c14e4776a7605de14b23") version("4.10.0", sha256="8ff7b44c6a99c6bfd55ca9ac45261c649cefd40aaba1124c29aaef1bcb378d84") diff --git a/var/spack/repos/builtin/packages/py-junit-xml/package.py b/var/spack/repos/builtin/packages/py-junit-xml/package.py index a1afd5d2d9c2c7..4e5e23212f8cba 100644 --- a/var/spack/repos/builtin/packages/py-junit-xml/package.py +++ b/var/spack/repos/builtin/packages/py-junit-xml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJunitXml(PythonPackage): homepage = "https://github.com/kyrus/python-junit-xml" pypi = "junit-xml/junit-xml-1.7.tar.gz" + license("MIT") + version("1.7", sha256="5bc851b53e3e2153dcc62278ce2aa796a8ae9208f1dec36d1507b5af445ce355") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-jupyter-client/package.py b/var/spack/repos/builtin/packages/py-jupyter-client/package.py index e57084a03942e8..2c36c3693dc02d 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-client/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJupyterClient(PythonPackage): homepage = "https://github.com/jupyter/jupyter_client" pypi = "jupyter-client/jupyter_client-6.1.7.tar.gz" + license("BSD-3-Clause") + version("8.2.0", sha256="9fe233834edd0e6c0aa5f05ca2ab4bdea1842bfd2d8a932878212fc5301ddaf0") version("8.1.0", sha256="3fbab64100a0dcac7701b1e0f1a4412f1ccb45546ff2ad9bc4fcbe4e19804811") version("7.3.5", sha256="3c58466a1b8d55dba0bf3ce0834e4f5b7760baf98d1d73db0add6f19de9ecd1d") diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 8288170b853493..9a64963286e98c 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jupyter-core/package.py b/var/spack/repos/builtin/packages/py-jupyter-core/package.py index d544fc46fa5094..8303cadb9a94c9 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-core/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJupyterCore(PythonPackage): pypi = "jupyter-core/jupyter_core-4.6.0.tar.gz" git = "https://github.com/jupyter/jupyter_core.git" + license("BSD-3-Clause") + version("5.3.0", sha256="6db75be0c83edbf1b7c9f91ec266a9a24ef945da630f3120e1a0046dc13713fc") version("5.1.0", sha256="a5ae7c09c55c0b26f692ec69323ba2b62e8d7295354d20f6cd57b749de4a05bf") version("4.11.1", sha256="2e5f244d44894c4154d06aeae3419dd7f1b0ef4494dc5584929b398c61cfd314") diff --git a/var/spack/repos/builtin/packages/py-jupyter-events/package.py b/var/spack/repos/builtin/packages/py-jupyter-events/package.py index 71b9f7e9d8571b..e87818492b324d 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-events/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-events/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jupyter-lsp/package.py b/var/spack/repos/builtin/packages/py-jupyter-lsp/package.py index 33d98743b06160..c4da87a8b20545 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-lsp/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-lsp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJupyterLsp(PythonPackage): homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp" pypi = "jupyter-lsp/jupyter-lsp-2.2.0.tar.gz" + license("BSD-3-Clause") + version("2.2.0", sha256="8ebbcb533adb41e5d635eb8fe82956b0aafbf0fd443b6c4bfa906edeeb8635a1") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py index cf333579fd2031..c45a7b86dc3841 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-packaging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJupyterPackaging(PythonPackage): tags = ["build-tools"] + license("BSD-3-Clause") + version("0.12.0", sha256="b27455d60adc93a7baa2e0b8f386be81b932bb4e3c0116046df9ed230cd3faac") version("0.11.1", sha256="6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec") version("0.10.6", sha256="a8a2c90bf2e0cae83be63ccb0b7035032a1589f268cc08b1d479e37ce50fc940") diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py deleted file mode 100644 index b15cfe8752e480..00000000000000 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging11/package.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyJupyterPackaging11(PythonPackage): - """Jupyter Packaging Utilities, version 11.""" - - # TODO: This package only exists because different packages in the Jupyter ecosystem - # require different versions of jupyter_packaging. Once the concretizer is capable - # of concretizing build dependencies separately, this package should be removed. - - homepage = "https://github.com/jupyter/jupyter-packaging" - pypi = "jupyter_packaging/jupyter_packaging-0.11.1.tar.gz" - - version( - "0.12.3", - sha256="9d9b2b63b97ffd67a8bc5391c32a421bc415b264a32c99e4d8d8dd31daae9cf4", - deprecated=True, - ) - version( - "0.12.0", - sha256="b27455d60adc93a7baa2e0b8f386be81b932bb4e3c0116046df9ed230cd3faac", - deprecated=True, - ) - version( - "0.11.1", - sha256="6f5c7eeea98f7f3c8fb41d565a94bf59791768a93f93148b3c2dfb7ebade8eec", - deprecated=True, - ) - - depends_on("python@3.7:", type=("build", "run")) - depends_on("py-packaging", type=("build", "run")) - depends_on("py-tomlkit", type=("build", "run")) - depends_on("py-hatchling@0.25:", when="@0.12.3:", type="build") - depends_on("py-setuptools@60.2:", when="@0.12:", type=("build", "run")) - depends_on("py-setuptools@46.4:", type=("build", "run")) - # https://github.com/jupyter/jupyter-packaging/issues/130 - depends_on("py-setuptools@:60", when="@:0.11", type=("build", "run")) - depends_on("py-wheel", type=("build", "run")) - depends_on("py-deprecation", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py b/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py deleted file mode 100644 index 8f0da9b9999cb4..00000000000000 --- a/var/spack/repos/builtin/packages/py-jupyter-packaging7/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyJupyterPackaging7(PythonPackage): - """Jupyter Packaging Utilities, version 7.""" - - # TODO: This package only exists because different packages in the Jupyter ecosystem - # require different versions of jupyter_packaging. Once the concretizer is capable - # of concretizing build dependencies separately, this package should be removed. - - homepage = "https://github.com/jupyter/jupyter-packaging" - pypi = "jupyter_packaging/jupyter-packaging-0.7.12.tar.gz" - - version( - "0.7.12", - sha256="b140325771881a7df7b7f2d14997b619063fe75ae756b9025852e4346000bbb8", - deprecated=True, - ) - - depends_on("python@3.6:", type=("build", "run")) - depends_on("py-packaging", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py b/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py index c86e2f18147c0c..18cf66199606a3 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server-mathjax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJupyterServerMathjax(PythonPackage): homepage = "http://jupyter.org/" pypi = "jupyter_server_mathjax/jupyter_server_mathjax-0.2.3.tar.gz" + license("BSD-3-Clause") + version("0.2.6", sha256="bb1e6b6dc0686c1fe386a22b5886163db548893a99c2810c36399e9c4ca23943") version("0.2.3", sha256="564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451") diff --git a/var/spack/repos/builtin/packages/py-jupyter-server-proxy/package.py b/var/spack/repos/builtin/packages/py-jupyter-server-proxy/package.py index 4e111148069580..4ae95e030d8ff4 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server-proxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyJupyterServerProxy(PythonPackage): homepage = "https://github.com/jupyterhub/jupyter-server-proxy" pypi = "jupyter-server-proxy/jupyter-server-proxy-3.2.2.tar.gz" + license("BSD-3-Clause") + version("3.2.2", sha256="54690ea9467035d187c930c599e76065017baf16e118e6eebae0d3a008c4d946") depends_on("py-jupyter-packaging@0.7.9:0.7", type="build") diff --git a/var/spack/repos/builtin/packages/py-jupyter-server-terminals/package.py b/var/spack/repos/builtin/packages/py-jupyter-server-terminals/package.py index bf4c6a4c83b1b0..4b01b2c2f4d7aa 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server-terminals/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server-terminals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyJupyterServerTerminals(PythonPackage): # for windows depends_on pywinpty@2.0.3: # py-pywinpty is not in spack and requires the build system maturin depends_on("py-terminado@0.8.3:", type=("build", "run")) + # to prevent: ModuleNotFoundError: Jupyter Server must be installed to use this extension. # there should be a dependency on `py-jupyter-server` but this would create # a cyclic dependency + skip_modules = ["jupyter_server_terminals"] diff --git a/var/spack/repos/builtin/packages/py-jupyter-server/package.py b/var/spack/repos/builtin/packages/py-jupyter-server/package.py index 4f461dca212cf3..87afeb95f66095 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJupyterServer(PythonPackage): homepage = "https://github.com/jupyter-server/jupyter_server" pypi = "jupyter_server/jupyter_server-1.9.0.tar.gz" + license("BSD-3-Clause") + version("2.6.0", sha256="ae4af349f030ed08dd78cb7ac1a03a92d886000380c9ea6283f3c542a81f4b06") version("1.21.0", sha256="d0adca19913a3763359be7f0b8c2ea8bfde356f4b8edd8e3149d7d0fbfaa248b") version("1.18.1", sha256="2b72fc595bccae292260aad8157a0ead8da2c703ec6ae1bb7b36dbad0e267ea7") diff --git a/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py index f40ee282f5b668..ef6df789290345 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-telemetry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyJupyterTelemetry(PythonPackage): pypi = "jupyter-telemetry/jupyter_telemetry-0.1.0.tar.gz" + license("BSD-3-Clause") + version("0.1.0", sha256="445c613ae3df70d255fe3de202f936bba8b77b4055c43207edf22468ac875314") version("0.0.5", sha256="d3eaac14be17510a4d288f3737580107ce14eef543e6133d56654d3f0e742b9b") diff --git a/var/spack/repos/builtin/packages/py-jupyter/package.py b/var/spack/repos/builtin/packages/py-jupyter/package.py index 79f707eeeeff2d..9569b16c0314c8 100644 --- a/var/spack/repos/builtin/packages/py-jupyter/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyJupyter(PythonPackage): homepage = "https://jupyter.org/" pypi = "jupyter/jupyter-1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.0.0", sha256="d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-jupyterhub/package.py b/var/spack/repos/builtin/packages/py-jupyterhub/package.py index cd596202e0eb5c..2bf8498f39c48d 100644 --- a/var/spack/repos/builtin/packages/py-jupyterhub/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterhub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py index d5d6dd9dfe0fae..a0b96f0c5cbf8c 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py index d6791671f645c4..5f7b07f9ca3c18 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJupyterlabServer(PythonPackage): homepage = "https://github.com/jupyterlab/jupyterlab_server" pypi = "jupyterlab_server/jupyterlab_server-1.2.0.tar.gz" + license("BSD-3-Clause") + version("2.22.1", sha256="dfaaf898af84b9d01ae9583b813f378b96ee90c3a66f24c5186ea5d1bbdb2089") version("2.10.3", sha256="3fb84a5813d6d836ceda773fb2d4e9ef3c7944dbc1b45a8d59d98641a80de80a") version("2.6.0", sha256="f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d") diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py index 7d9d19462cdecc..5aada203f6e55f 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJupyterlabWidgets(PythonPackage): # https://github.com/jupyter-widgets/ipywidgets/issues/3324 url = "https://files.pythonhosted.org/packages/py3/j/jupyterlab_widgets/jupyterlab_widgets-1.0.2-py3-none-any.whl" + license("BSD-3-Clause") + version( "3.0.3", sha256="6aa1bc0045470d54d76b9c0b7609a8f8f0087573bae25700a370c11f82cb38c8", diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py index ccacf77c8e8d62..08c57c99a9eda4 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyJupyterlab(PythonPackage): homepage = "https://github.com/jupyterlab/jupyterlab" pypi = "jupyterlab/jupyterlab-2.2.7.tar.gz" + license("BSD-3-Clause") + version("4.0.1", sha256="4dc3901f7bbfd4704c994b7a893a49955256abf57dba9831f4825e3f3165b8bb") version("3.4.8", sha256="1fafb8b657005d91603f3c3adfd6d9e8eaf33fdc601537fef09283332efe67cb") version("3.4.2", sha256="38abd3a4f83a8f97e3f15bebbcc0825903c15519809eedfaa41340d260be2160") @@ -24,11 +26,6 @@ class PyJupyterlab(PythonPackage): version("3.1.14", sha256="13174cb6076dd5da6f1b85725ccfcc9518d8f98e86b8b644fc89b1dfaeda63a9") version("3.0.18", sha256="0e4bb4b89014607a16658b54f13df2f0af14f3c286109a0e14d5a46cbbe28caf") version("3.0.16", sha256="7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23") - version( - "3.0.14", - sha256="713a84991dfcca8c0bc260911f1bd54ac25a386a86285713b9555a60f795059b", - deprecated=True, - ) version("2.2.7", sha256="a72ffd0d919cba03a5ef8422bc92c3332a957ff97b0490494209c83ad93826da") version("2.1.0", sha256="8c239aababf5baa0b3d36e375fddeb9fd96f3a9a24a8cda098d6a414f5bbdc81") @@ -41,7 +38,7 @@ class PyJupyterlab(PythonPackage): depends_on("py-importlib-metadata@4.8.3:", when="@4: ^python@:3.9", type=("build", "run")) depends_on("py-importlib-resources@1.4:", when="@4: ^python@:3.8", type=("build", "run")) depends_on("py-ipykernel", when="@4:", type=("build", "run")) - depends_on("py-jinja2@3.0.3", when="@4:", type=("build", "run")) + depends_on("py-jinja2@3.0.3:", when="@4:", type=("build", "run")) depends_on("py-jupyter-core", when="@3:", type=("build", "run")) depends_on("py-jupyter-lsp@2:", when="@4:", type=("build", "run")) depends_on("py-jupyter-server@2.4:2", when="@4:", type=("build", "run")) @@ -56,7 +53,6 @@ class PyJupyterlab(PythonPackage): depends_on("py-setuptools", when="@:3", type=("build", "run")) depends_on("py-jupyter-packaging@0.9:1", when="@3.4.8", type="build") depends_on("py-jupyter-packaging@0.9:0", when="@3.0.15:3.4.2", type="build") - depends_on("py-jupyter-packaging@0.7.3:0.7", when="@3.0.0:3.0.14", type=("build", "run")) depends_on("py-pre-commit", when="@3.4:3.4.3", type="build") depends_on("py-ipython", when="@3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jupytext/package.py b/var/spack/repos/builtin/packages/py-jupytext/package.py index 6491fd575611dc..42298b11b5c2c9 100644 --- a/var/spack/repos/builtin/packages/py-jupytext/package.py +++ b/var/spack/repos/builtin/packages/py-jupytext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyJupytext(PythonPackage): maintainers("vvolkl") + license("MIT") + version("1.14.1", sha256="314fa0e732b1d14764271843b676938ef8a7b9d53c3575ade636b45d13f341c8") version("1.13.6", sha256="c6c25918ddb6403d0d8504e08d35f6efc447baf0dbeb6a28b73adf39e866a0c4") version("1.13.0", sha256="fb220af65d2bd32d01c779b0e935c4c2b71e3f5f2f01bf1bab10d5f23fe121d4") diff --git a/var/spack/repos/builtin/packages/py-kaggle/package.py b/var/spack/repos/builtin/packages/py-kaggle/package.py index 842d14603ddbc4..294349f1d8149b 100644 --- a/var/spack/repos/builtin/packages/py-kaggle/package.py +++ b/var/spack/repos/builtin/packages/py-kaggle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyKaggle(PythonPackage): homepage = "https://github.com/Kaggle/kaggle-api" pypi = "kaggle/kaggle-1.5.12.tar.gz" + license("Apache-2.0") + version("1.5.12", sha256="b4d87d107bff743aaa805c2b382c3661c4c175cdb159656d4972be2a9cef42cb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-kaldiio/package.py b/var/spack/repos/builtin/packages/py-kaldiio/package.py index 2dcfd255ef8e27..1ea391900e6767 100644 --- a/var/spack/repos/builtin/packages/py-kaldiio/package.py +++ b/var/spack/repos/builtin/packages/py-kaldiio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-kaleido/package.py b/var/spack/repos/builtin/packages/py-kaleido/package.py new file mode 100644 index 00000000000000..b9d65bc80028bb --- /dev/null +++ b/var/spack/repos/builtin/packages/py-kaleido/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 PyKaleido(PythonPackage): + """Static image export for web-based visualization libraries with zero dependencies""" + + homepage = "https://github.com/wdecoster/nanostat" + url = "https://github.com/plotly/Kaleido/archive/refs/tags/v0.2.1.tar.gz" + + maintainers("Pandapip1") + + version("0.2.1", sha256="fdb673a9759835d4f455990fc1ff8919bd100a0d34f2d3de7bd5eeb2162b57ec") + + depends_on("py-setuptools", type="build") + + build_directory = join_path("repos", "kaleido", "py") diff --git a/var/spack/repos/builtin/packages/py-kb-python/package.py b/var/spack/repos/builtin/packages/py-kb-python/package.py index a508607a6967cd..59f9f886a0388c 100644 --- a/var/spack/repos/builtin/packages/py-kb-python/package.py +++ b/var/spack/repos/builtin/packages/py-kb-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyKbPython(PythonPackage): homepage = "https://github.com/pachterlab/kb_python" pypi = "kb_python/kb_python-0.27.3.tar.gz" + license("BSD-2-Clause") + version("0.27.3", sha256="dc98f6ceb4402d666b7e0d19be17c63d33e8b710a35cdc33de7c0f457122f43f") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-keras-applications/package.py b/var/spack/repos/builtin/packages/py-keras-applications/package.py index bc55a10e9a57fc..aaa59a10f59a73 100644 --- a/var/spack/repos/builtin/packages/py-keras-applications/package.py +++ b/var/spack/repos/builtin/packages/py-keras-applications/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyKerasApplications(PythonPackage): homepage = "https://keras.io" url = "https://github.com/keras-team/keras-applications/archive/1.0.4.tar.gz" + license("MIT") + version("1.0.8", sha256="7c37f9e9ef93efac9b4956301cb21ce46c474ce9da41fac9a46753bab6823dfc") version("1.0.7", sha256="8580a885c8abe4bf8429cb0e551f23e79b14eda73d99138cfa1d355968dd4b0a") version("1.0.6", sha256="2cb412c97153160ec267b238e958d281ac3532b139cab42045c2d7086a157c21") diff --git a/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py b/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py index 7a6ecb840460ab..fda06d7c76eeba 100644 --- a/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py +++ b/var/spack/repos/builtin/packages/py-keras-preprocessing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyKerasPreprocessing(PythonPackage): homepage = "https://github.com/keras-team/keras-preprocessing" pypi = "Keras-Preprocessing/Keras_Preprocessing-1.1.2.tar.gz" + license("MIT") + version("1.1.2", sha256="add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3") version("1.1.0", sha256="5a8debe01d840de93d49e05ccf1c9b81ae30e210d34dacbcc47aeb3049b528e5") version("1.0.9", sha256="5e3700117981c2db762e512ed6586638124fac5842170701628088a11aeb51ac") diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index c6f65dc957cb07..614174fcac84f8 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,18 +9,21 @@ class PyKeras(PythonPackage): - """Deep Learning for humans. + """Multi-backend Keras. - Keras is a deep learning API written in Python, running on top of the machine - learning platform TensorFlow. It was developed with a focus on enabling fast - experimentation. Being able to go from idea to result as fast as possible is - key to doing good research. + Keras 3 is a new multi-backend implementation of the Keras API, + with support for TensorFlow, JAX, and PyTorch. """ homepage = "https://keras.io" git = "https://github.com/keras-team/keras.git" - url = "https://github.com/keras-team/keras/archive/refs/tags/v2.7.0.tar.gz" + pypi = "keras/keras-3.0.0.tar.gz" + version("3.0.4", sha256="ff2204792582e3889c51c77722cc6e8258dbb1ece7db192f5a9bcd1887cf3385") + version("3.0.3", sha256="1e455a82be63b7fb4f699e26bd1e04b7dbcbf66fa3a799117afca9ab067b5d61") + version("3.0.2", sha256="526b6c053cdd880a33467c5bfd5c460a5bdc0c58869c2683171c2dec2ad3c2d0") + version("3.0.1", sha256="d993721510fa654582132192193f69b1b3165418a6e00a73c3edce615b3cc672") + version("3.0.0", sha256="82a9fa4b32a049b38151d11188ed15d74f21f853f163e78da0950dce1f244ccc") version("2.14.0", sha256="a845d446b6ae626f61dde5ab2fa952530b6c17b4f9ed03e9362bd20172d00cca") version("2.13.1", sha256="b3591493cce75a69adef7b192cec6be222e76e2386d132cd4e34aa190b0ecbd5") version("2.12.0", sha256="6336cebb6b2b0a91f7efd3ff3a9db3a94f2abccf07a40323138afb80826aec62") @@ -43,25 +46,55 @@ class PyKeras(PythonPackage): version("2.2.1", sha256="0d3cb14260a3fa2f4a5c4c9efa72226ffac3b4c50135ba6edaf2b3d1d23b11ee") version("2.2.0", sha256="5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf") - # Supported Python versions listed in multiple places: - # * keras/tools/pip_package/setup.py - # * CONTRIBUTING.md - # * PKG-INFO + variant( + "backend", + default="tensorflow", + description="backend library", + values=["tensorflow", "jax", "torch"], + multi=False, + when="@3:", + ) + + # setup.py + depends_on("python@3.9:", type=("build", "run"), when="@3:") depends_on("python@3.8:", type=("build", "run"), when="@2.12:") depends_on("py-setuptools", type="build") - - # Required dependencies listed in multiple places: - # * BUILD - # * WORKSPACE depends_on("py-absl-py", type=("build", "run"), when="@2.6:") - depends_on("py-h5py", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) - depends_on("py-pandas", type=("build", "run")) - depends_on("pil", type=("build", "run")) - depends_on("py-portpicker", type=("build", "run"), when="@2.10:") - depends_on("py-pydot", type=("build", "run")) + depends_on("py-rich", type=("build", "run"), when="@3:") + depends_on("py-namex", type=("build", "run"), when="@3:") + depends_on("py-h5py", type=("build", "run")) + depends_on("py-dm-tree", type=("build", "run"), when="@3:") + + # requirements-common.txt depends_on("py-scipy", type=("build", "run")) - depends_on("py-six", type=("build", "run")) + depends_on("py-pandas", type=("build", "run")) + depends_on("py-requests", type=("build", "run"), when="@3:") + depends_on("py-protobuf", type=("build", "run"), when="@3:") + + # requirements-tensorflow-cuda.txt + conflicts("backend=tensorflow", msg="Requires TensorFlow 2.16, not yet released") + # depends_on("py-tensorflow@2.16.0", type=("build", "run"), when="@3.0 backend=tensorflow") + + # requirements-jax-cuda.txt + depends_on("py-jax", type=("build", "run"), when="@3: backend=jax") + + # requirements-torch-cuda.txt + depends_on("py-torch@2.1.2", type=("build", "run"), when="@3.0.3: backend=torch") + depends_on("py-torch@2.1.1", type=("build", "run"), when="@3.0.1:3.0.2 backend=torch") + depends_on("py-torch@2.1.0", type=("build", "run"), when="@3.0.0 backend=torch") + depends_on("py-torchvision@0.16.2", type=("build", "run"), when="@3.0.3: backend=torch") + depends_on("py-torchvision@0.16.1", type=("build", "run"), when="@3.0.1:3.0.2 backend=torch") + depends_on("py-torchvision@0.16.0", type=("build", "run"), when="@3.0.0 backend=torch") + + # Historical dependencies + depends_on("bazel", type="build", when="@2.5:2") + depends_on("protobuf", type="build", when="@2.5:2") + depends_on("pil", type=("build", "run"), when="@:2") + depends_on("py-portpicker", type=("build", "run"), when="@2.10:2") + depends_on("py-pydot", type=("build", "run"), when="@:2") + depends_on("py-pyyaml", type=("build", "run"), when="@:2") + depends_on("py-six", type=("build", "run"), when="@:2") for minor_ver in range(6, 15): depends_on( "py-tensorflow@2.{}".format(minor_ver), @@ -73,18 +106,21 @@ class PyKeras(PythonPackage): type=("build", "run"), when="@2.{}".format(minor_ver), ) - depends_on("py-pyyaml", type=("build", "run")) - depends_on("bazel", type="build", when="@2.5:") - depends_on("protobuf", type="build", when="@2.5:") def url_for_version(self, version): - if version >= Version("2.6"): - return super().url_for_version(version) + if version >= Version("3"): + url = "https://files.pythonhosted.org/packages/source/k/keras/keras-{}.tar.gz" + elif version >= Version("2.6"): + url = "https://github.com/keras-team/keras/archive/refs/tags/v{}.tar.gz" else: - url = "https://pypi.io/packages/source/K/Keras/Keras-{0}.tar.gz" - return url.format(version.dotted) + url = "https://files.pythonhosted.org/packages/source/k/keras/Keras-{}.tar.gz" + return url.format(version) + + def setup_run_environment(self, env): + if self.spec.satisfies("@3:"): + env.set("KERAS_BACKEND", self.spec.variants["backend"].value) - @when("@2.5:") + @when("@2.5:2") def patch(self): infile = join_path(self.package_dir, "protobuf_build.patch") with open(infile, "r") as source_file: @@ -99,7 +135,7 @@ def patch(self): string=True, ) - @when("@2.5:") + @when("@2.5:2") def install(self, spec, prefix): self.tmp_path = tempfile.mkdtemp(prefix="spack") env["HOME"] = self.tmp_path diff --git a/var/spack/repos/builtin/packages/py-keras2onnx/package.py b/var/spack/repos/builtin/packages/py-keras2onnx/package.py index 9e027f38a11387..a9c86679bd887b 100644 --- a/var/spack/repos/builtin/packages/py-keras2onnx/package.py +++ b/var/spack/repos/builtin/packages/py-keras2onnx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyKeras2onnx(PythonPackage): url = "https://github.com/onnx/keras-onnx/archive/refs/tags/v1.7.0.tar.gz" + license("MIT") + version("1.7.0", sha256="8ec9c4e1c1f870d420934d1aa7cbc9faab80c6af366900bf95e5f48280c0d199") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-kerberos/package.py b/var/spack/repos/builtin/packages/py-kerberos/package.py index 7836d6a42c2daf..f6f62be68179cc 100644 --- a/var/spack/repos/builtin/packages/py-kerberos/package.py +++ b/var/spack/repos/builtin/packages/py-kerberos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-keyboard/package.py b/var/spack/repos/builtin/packages/py-keyboard/package.py index c96e0020eb0603..3b9456e824aea4 100644 --- a/var/spack/repos/builtin/packages/py-keyboard/package.py +++ b/var/spack/repos/builtin/packages/py-keyboard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyKeyboard(PythonPackage): homepage = "https://github.com/boppreh/keyboard" pypi = "keyboard/keyboard-0.13.5.zip" + license("MIT") + version("0.13.5", sha256="63ed83305955939ca5c9a73755e5cc43e8242263f5ad5fd3bb7e0b032f3d308b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-keyring/package.py b/var/spack/repos/builtin/packages/py-keyring/package.py index c2e0337ffe7747..42163bc656df37 100644 --- a/var/spack/repos/builtin/packages/py-keyring/package.py +++ b/var/spack/repos/builtin/packages/py-keyring/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyKeyring(PythonPackage): homepage = "https://github.com/jaraco/keyring" pypi = "keyring/keyring-23.0.1.tar.gz" + license("MIT") + + version("24.3.0", sha256="e730ecffd309658a08ee82535a3b5ec4b4c8669a9be11efb66249d8e0aeb9a25") version("23.13.1", sha256="ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678") version("23.9.1", sha256="39e4f6572238d2615a82fcaa485e608b84b503cf080dc924c43bbbacb11c1c18") version("23.5.0", sha256="9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9") diff --git a/var/spack/repos/builtin/packages/py-keyrings-alt/package.py b/var/spack/repos/builtin/packages/py-keyrings-alt/package.py index c0074e6bbc608f..da8f64b111089a 100644 --- a/var/spack/repos/builtin/packages/py-keyrings-alt/package.py +++ b/var/spack/repos/builtin/packages/py-keyrings-alt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyKeyringsAlt(PythonPackage): homepage = "https://github.com/jaraco/keyrings.alt" pypi = "keyrings.alt/keyrings.alt-4.0.2.tar.gz" + license("MIT") + version("4.2.0", sha256="2ba3d56441ba0637f5f9c096068f67010ac0453f9d0b626de2aa3019353b6431") version("4.1.0", sha256="52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2") version("4.0.2", sha256="cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25") diff --git a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py index 4561583d9306ad..4d9088d889c967 100644 --- a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py +++ b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-kitchen/package.py b/var/spack/repos/builtin/packages/py-kitchen/package.py index 81a900026500e4..907a136fb3445c 100644 --- a/var/spack/repos/builtin/packages/py-kitchen/package.py +++ b/var/spack/repos/builtin/packages/py-kitchen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyKitchen(PythonPackage): homepage = "https://fedorahosted.org/kitchen" pypi = "kitchen/kitchen-1.2.6.tar.gz" + license("LGPL-2.1-or-later") + version("1.2.6", sha256="b84cf582f1bd1556b60ebc7370b9d331eb9247b6b070ce89dfe959cba2c0b03c") version("1.1.1", sha256="25670f80bcbabd0656946125cfad310980d5a5900d6c160d4f0187292120284e") diff --git a/var/spack/repos/builtin/packages/py-kiwisolver/package.py b/var/spack/repos/builtin/packages/py-kiwisolver/package.py index 9c83a2b25894a6..b7ffca2bdf3034 100644 --- a/var/spack/repos/builtin/packages/py-kiwisolver/package.py +++ b/var/spack/repos/builtin/packages/py-kiwisolver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-kmodes/package.py b/var/spack/repos/builtin/packages/py-kmodes/package.py index 0a9132bae836e2..fd40c20e1659db 100644 --- a/var/spack/repos/builtin/packages/py-kmodes/package.py +++ b/var/spack/repos/builtin/packages/py-kmodes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyKmodes(PythonPackage): homepage = "https://github.com/nicodv/kmodes" pypi = "kmodes/kmodes-0.10.1.tar.gz" + license("MIT") + version("0.10.1", sha256="3222c2f672a6356be353955c02d1e38472d9f6074744b4ffb0c058e8c2235ea1") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-knack/package.py b/var/spack/repos/builtin/packages/py-knack/package.py index e9a421e16b50c2..57dc5a0974c4e7 100644 --- a/var/spack/repos/builtin/packages/py-knack/package.py +++ b/var/spack/repos/builtin/packages/py-knack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyKnack(PythonPackage): homepage = "https://github.com/microsoft/knack" pypi = "knack/knack-0.7.1.tar.gz" + license("MIT") + version("0.7.1", sha256="fcef6040164ebe7d69629e4e089b398c9b980791446496301befcf8381dba0fc") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-kombu/package.py b/var/spack/repos/builtin/packages/py-kombu/package.py index 257b0acd7f0953..f3ddf98eee708a 100644 --- a/var/spack/repos/builtin/packages/py-kombu/package.py +++ b/var/spack/repos/builtin/packages/py-kombu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyKombu(PythonPackage): pypi = "kombu/kombu-4.3.0.tar.gz" + license("BSD-3-Clause") + version("5.2.3", sha256="81a90c1de97e08d3db37dbf163eaaf667445e1068c98bfd89f051a40e9f6dbbd") version("5.0.2", sha256="f4965fba0a4718d47d470beeb5d6446e3357a62402b16c510b6a2f251e05ac3c") version("4.6.11", sha256="ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74") diff --git a/var/spack/repos/builtin/packages/py-kornia/package.py b/var/spack/repos/builtin/packages/py-kornia/package.py index 2ba1a1a4aed52d..bb9c788f574631 100644 --- a/var/spack/repos/builtin/packages/py-kornia/package.py +++ b/var/spack/repos/builtin/packages/py-kornia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,9 @@ class PyKornia(PythonPackage): homepage = "https://www.kornia.org/" pypi = "kornia/kornia-0.5.10.tar.gz" + license("Apache-2.0") + + version("0.7.1", sha256="65b54a50f70c1f88240b557fda3fdcc1ab866982a5d062e52213130f5a48465c") version("0.7.0", sha256="72cba6a0965a15caf10a664647654412effb7c0b9afcf40e458bc005f976ffac") version("0.6.12", sha256="e30bd3d830226f7a159dff1f7757c6200e8f27d1333f06e9d2f98bdb33ce18d3") version("0.6.11", sha256="ba77198f2c2e4044c87e4503ff277aadbfc0db20495da5a5289663f380b4be32") diff --git a/var/spack/repos/builtin/packages/py-kosh/package.py b/var/spack/repos/builtin/packages/py-kosh/package.py index 4e1eae2e06eb01..23ec139e4d8f96 100644 --- a/var/spack/repos/builtin/packages/py-kosh/package.py +++ b/var/spack/repos/builtin/packages/py-kosh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyKosh(PythonPackage): # notify when the package is updated. maintainers("doutriaux1") + license("MIT") + version("3.0.1", sha256="e0d97c93476930ccfe8ed892517439d555760d66d57f9a8e52459fb5910ba398") version("2.2", sha256="3c79c3b7e7b64018ec5987dd7148886a6c619a28cda6f84e61a57439c9f3d7a3") version("2.1", sha256="597ed5beb4c3c3675b4af15ee7bfb60a463d5bda2222cd927061737ed073d562") diff --git a/var/spack/repos/builtin/packages/py-kt-legacy/package.py b/var/spack/repos/builtin/packages/py-kt-legacy/package.py index 56b05681f434fd..8a7f24cb5f50bc 100644 --- a/var/spack/repos/builtin/packages/py-kt-legacy/package.py +++ b/var/spack/repos/builtin/packages/py-kt-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyKtLegacy(PythonPackage): homepage = "https://github.com/haifeng-jin/kt-legacy" pypi = "kt-legacy/kt-legacy-1.0.4.tar.gz" + license("Apache-2.0") + version("1.0.4", sha256="a94112e42a50e7cc3aad31f3287aa384c23555ea1432c55b5823852e09e706cf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-kubernetes/package.py b/var/spack/repos/builtin/packages/py-kubernetes/package.py index 54ede50798d7c7..de2dd819b8ad0a 100644 --- a/var/spack/repos/builtin/packages/py-kubernetes/package.py +++ b/var/spack/repos/builtin/packages/py-kubernetes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyKubernetes(PythonPackage): maintainers("vvolkl") + license("Apache-2.0") + version("25.3.0", sha256="213befbb4e5aed95f94950c7eed0c2322fc5a2f8f40932e58d28fdd42d90836c") version("21.7.0", sha256="c9849afc2eafdce60efa210049ee7a94e7ef6cf3a7afa14a69b3bf0447825977") version("20.13.0", sha256="ce5e881c13dc56f21a243804f90bc3c507af93c380f505c00e392c823968e4de") diff --git a/var/spack/repos/builtin/packages/py-labours/package.py b/var/spack/repos/builtin/packages/py-labours/package.py deleted file mode 100644 index 3d0fe6eb8e9496..00000000000000 --- a/var/spack/repos/builtin/packages/py-labours/package.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PyLabours(PythonPackage): - """Python module dependency visualization.""" - - homepage = "https://github.com/src-d/hercules" - url = "https://github.com/src-d/hercules/archive/v10.7.2.tar.gz" - - version("10.7.2", sha256="4654dcfb1eee5af1610fd05677c6734c2ca1161535fcc14d3933d6debda4bc34") - - build_directory = "python" - - depends_on("py-setuptools", type=("build", "run")) - depends_on("py-matplotlib@2.0:3", type=("build", "run")) - depends_on("py-numpy@1.12.0:1", type=("build", "run")) - depends_on("py-pandas@0.20.0:0", type=("build", "run")) - depends_on("py-pyyaml@3.0:5", type=("build", "run")) - depends_on("py-scipy@0.19.0:1.2.1", type=("build", "run")) - depends_on("py-protobuf@3.5.0:3", type=("build", "run")) - depends_on("py-munch@2.0:2", type=("build", "run")) - depends_on("py-python-dateutil@2.6.0:2", type=("build", "run")) - depends_on("py-tqdm@4.3:4", type=("build", "run")) - - depends_on("py-hdbscan@0.8.0:1", type=("build", "run")) - depends_on("py-seriate@1.1.2:1", type=("build", "run")) - depends_on("py-fastdtw@0.3.2:1", type=("build", "run")) - depends_on("py-lifelines@0.20.0:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lagom/package.py b/var/spack/repos/builtin/packages/py-lagom/package.py index 63dd4c92b8d110..839924475e7455 100644 --- a/var/spack/repos/builtin/packages/py-lagom/package.py +++ b/var/spack/repos/builtin/packages/py-lagom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLagom(PythonPackage): url = "https://github.com/meadsteve/lagom/archive/refs/tags/2.2.0.tar.gz" git = "https://github.com/meadsteve/lagom.git" + license("MIT") + version("2.2.0", sha256="69f701a2f81d9ca0ea7c93a5b15f7420bbe03d14175ec128959ad82e2b67460b") depends_on("py-setuptools@59.6:", type="build") diff --git a/var/spack/repos/builtin/packages/py-langcodes/package.py b/var/spack/repos/builtin/packages/py-langcodes/package.py index aeab20c9f5864b..c25b0d3486a233 100644 --- a/var/spack/repos/builtin/packages/py-langcodes/package.py +++ b/var/spack/repos/builtin/packages/py-langcodes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLangcodes(PythonPackage): homepage = "https://github.com/rspeer/langcodes" pypi = "langcodes/langcodes-3.3.0.tar.gz" + license("MIT") + version("3.3.0", sha256="794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-langsmith/package.py b/var/spack/repos/builtin/packages/py-langsmith/package.py index e5c8363487b6e3..2066c16a4a22eb 100644 --- a/var/spack/repos/builtin/packages/py-langsmith/package.py +++ b/var/spack/repos/builtin/packages/py-langsmith/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyLangsmith(PythonPackage): pypi = "langsmith/langsmith-0.0.10.tar.gz" + license("MIT") + version("0.0.11", sha256="7c1be28257d6c7279c85f81e6d8359d1006af3b1238fc198d13ca75c8fe421c8") version("0.0.10", sha256="11e5db0d8e29ee5583cabd872eeece8ce50738737b1f52f316ac984f4a1a58c5") version("0.0.7", sha256="2f18e51cfd4e42f2b3cf00fa87e9d03012eb7269cdafd8e7c0cf7aa828dcc03e") diff --git a/var/spack/repos/builtin/packages/py-lap/package.py b/var/spack/repos/builtin/packages/py-lap/package.py index 4154687f2f4ba3..61202d4f97b734 100644 --- a/var/spack/repos/builtin/packages/py-lap/package.py +++ b/var/spack/repos/builtin/packages/py-lap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLap(PythonPackage): homepage = "https://github.com/gatagat/lap" pypi = "lap/lap-0.4.0.tar.gz" + license("BSD-2-Clause") + version("0.4.0", sha256="c4dad9976f0e9f276d8a676a6d03632c3cb7ab7c80142e3b27303d49f0ed0e3b") depends_on("py-setuptools", type="build") depends_on("py-cython@0.21:", type="build") diff --git a/var/spack/repos/builtin/packages/py-lark-parser/package.py b/var/spack/repos/builtin/packages/py-lark-parser/package.py index de1417a28355b5..58c6bb6ab5c3f9 100644 --- a/var/spack/repos/builtin/packages/py-lark-parser/package.py +++ b/var/spack/repos/builtin/packages/py-lark-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLarkParser(PythonPackage): homepage = "https://github.com/lark-parser/lark/" pypi = "lark-parser/lark-parser-0.6.2.tar.gz" + license("MIT") + version("0.12.0", sha256="15967db1f1214013dca65b1180745047b9be457d73da224fcda3d9dd4e96a138") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lark/package.py b/var/spack/repos/builtin/packages/py-lark/package.py index 7f459c42bae32a..30529efb5b634c 100644 --- a/var/spack/repos/builtin/packages/py-lark/package.py +++ b/var/spack/repos/builtin/packages/py-lark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLark(PythonPackage): homepage = "https://github.com/lark-parser/lark/" pypi = "lark/lark-1.0.0.tar.gz" + license("MIT") + version("1.1.2", sha256="7a8d0c07d663da9391d7faee1bf1d7df4998c47ca43a593cbef5c7566acd057a") version("1.1.1", sha256="5115193433051f079374c4f81059fa4bf2afa78cc87dd87817ed4435e8647c82") version("1.1.0", sha256="669eab99a9627b2b9e0c6fb97f23113c64d673c93d804bca40b05b2a765f13c0") diff --git a/var/spack/repos/builtin/packages/py-laspy/package.py b/var/spack/repos/builtin/packages/py-laspy/package.py index 2de959da422252..babd8bf528fd89 100644 --- a/var/spack/repos/builtin/packages/py-laspy/package.py +++ b/var/spack/repos/builtin/packages/py-laspy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLaspy(PythonPackage): homepage = "https://github.com/laspy/laspy" pypi = "laspy/laspy-2.0.3.tar.gz" + license("BSD-2-Clause") + version("2.2.0", sha256="69d36f01acecd719cbe3c3cf58353f247f391ccadb1da37731d45bfe919685df") version("2.0.3", sha256="95c6367bc3a7c1e0d8dc118ae4a6b038bf9e8ad3e60741ecb8d59c36d32f822a") diff --git a/var/spack/repos/builtin/packages/py-latexcodec/package.py b/var/spack/repos/builtin/packages/py-latexcodec/package.py index cd640b7e99fa6e..e20f5b1671d782 100644 --- a/var/spack/repos/builtin/packages/py-latexcodec/package.py +++ b/var/spack/repos/builtin/packages/py-latexcodec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLatexcodec(PythonPackage): homepage = "https://latexcodec.readthedocs.io" pypi = "latexcodec/latexcodec-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="62bf8a3ee298f169a4d014dad5522bc1325b54dc98789a453fd338620387cb6c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-law/package.py b/var/spack/repos/builtin/packages/py-law/package.py index 3c4e728cc2e4d6..0a745ee7a4d76e 100644 --- a/var/spack/repos/builtin/packages/py-law/package.py +++ b/var/spack/repos/builtin/packages/py-law/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLaw(PythonPackage): homepage = "https://github.com/riga/law" pypi = "law/law-0.1.6.tar.gz" + license("BSD-3-Clause") + version("0.1.7", sha256="1907989263087baaae652f00b8f196ed31df57cf749d2583d90c6e6af18fb2c3") version("0.1.6", sha256="17c2c1837080590bff4d2e7228bfb418733f11b60e2bac8f589e68da78cf2ab8") diff --git a/var/spack/repos/builtin/packages/py-lazy-loader/package.py b/var/spack/repos/builtin/packages/py-lazy-loader/package.py index 5836be0335b3e9..305eb740c89dca 100644 --- a/var/spack/repos/builtin/packages/py-lazy-loader/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-loader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLazyLoader(PythonPackage): homepage = "https://scientific-python.org/specs/spec-0001/" pypi = "lazy_loader/lazy_loader-0.1.tar.gz" + license("BSD-3-Clause") + version("0.1", sha256="77ce7f2737ebabf9c0ff73b4a99c947876d74d24c2f026544e32246ecca5feca") depends_on("py-flit-core@3.7:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py index 65bdb6b69eafa0..89cbbfb72602d9 100644 --- a/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-object-proxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLazyObjectProxy(PythonPackage): homepage = "https://github.com/ionelmc/python-lazy-object-proxy" pypi = "lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz" + license("BSD-2-Clause") + version("1.7.1", sha256="d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4") version("1.7.0", sha256="2185392631e9d1733749d06ee5210438908d46cc04666a0eba5679d885754894") version("1.6.0", sha256="489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726") diff --git a/var/spack/repos/builtin/packages/py-lazy-property/package.py b/var/spack/repos/builtin/packages/py-lazy-property/package.py index c60dbb9e41c09c..b21229d2779644 100644 --- a/var/spack/repos/builtin/packages/py-lazy-property/package.py +++ b/var/spack/repos/builtin/packages/py-lazy-property/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLazyProperty(PythonPackage): homepage = "https://github.com/jackmaney/lazy-property" url = "https://github.com/jackmaney/lazy-property/archive/0.0.1.tar.gz" + license("MIT") + version("0.0.1", sha256="2cde89dc6f06366b3ab2423da65c469e1fe8b19f52bbd264698d1cdfdb1ef102") version("0.0.0", sha256="f43bea2619656eda1f80e5c781f771fee191ac3dba225f0583852be8f6d03c3f") diff --git a/var/spack/repos/builtin/packages/py-lazy/package.py b/var/spack/repos/builtin/packages/py-lazy/package.py index c18b87d7cdc9bf..2cca38958c491b 100644 --- a/var/spack/repos/builtin/packages/py-lazy/package.py +++ b/var/spack/repos/builtin/packages/py-lazy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyLazy(PythonPackage): pypi = "lazy/lazy-1.2.zip" + license("BSD-2-Clause") + version("1.5", sha256="cb3d8612aa895a48afe8f08860573ba8ef5ee4fdbe1b3cd606c5f50a16152186") version("1.4", sha256="2c6d27a5ab130fb85435320651a47403adcb37ecbcc501b0c6606391f65f5b43") version("1.2", sha256="127ea610418057b953f0d102bed83f2c367be13b59f8d0ddf3b8a86c7d31b970") diff --git a/var/spack/repos/builtin/packages/py-lazyarray/package.py b/var/spack/repos/builtin/packages/py-lazyarray/package.py index cfd13d92383327..85b07b4714ea7a 100644 --- a/var/spack/repos/builtin/packages/py-lazyarray/package.py +++ b/var/spack/repos/builtin/packages/py-lazyarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLazyarray(PythonPackage): homepage = "https://lazyarray.readthedocs.io/en/latest/" pypi = "lazyarray/lazyarray-0.2.8.tar.gz" + license("BSD-3-Clause") + version("0.5.2", sha256="fe31804d82115ed7c382840a1708f498419ec1455cac084707ece9908310c7d1") version("0.5.1", sha256="76964dd1384a6d020ae0e70806983d15d8fcd731734063f716696ebe300ab0af") version("0.5.0", sha256="4cc4b54940def52fd96818a1c10528c4b7ecca77aa617d9e4fecfb42b51e73cf") diff --git a/var/spack/repos/builtin/packages/py-lcls-krtc/package.py b/var/spack/repos/builtin/packages/py-lcls-krtc/package.py index 5eb1d25f2b731f..f150222512a82f 100644 --- a/var/spack/repos/builtin/packages/py-lcls-krtc/package.py +++ b/var/spack/repos/builtin/packages/py-lcls-krtc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLclsKrtc(PythonPackage): maintainers("valmar") + license("MIT") + version("0.2.0", sha256="20e6327d488d23e29135be44504bf7df72e4425a518f4222841efcd2cd2985f9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ldap3/package.py b/var/spack/repos/builtin/packages/py-ldap3/package.py index 646870b2971ec0..b12fcc9a96a377 100644 --- a/var/spack/repos/builtin/packages/py-ldap3/package.py +++ b/var/spack/repos/builtin/packages/py-ldap3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLdap3(PythonPackage): maintainers("LydDeb") + license("LGPL-3.0-or-later") + version("2.9.1", sha256="f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-leather/package.py b/var/spack/repos/builtin/packages/py-leather/package.py index 4bfa2e8f2086a3..1d2b0624b71d70 100644 --- a/var/spack/repos/builtin/packages/py-leather/package.py +++ b/var/spack/repos/builtin/packages/py-leather/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLeather(PythonPackage): homepage = "https://leather.readthedocs.io/en/stable/" pypi = "leather/leather-0.3.3.tar.gz" + license("MIT") + version("0.3.3", sha256="076d1603b5281488285718ce1a5ce78cf1027fe1e76adf9c548caf83c519b988") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lerc/package.py b/var/spack/repos/builtin/packages/py-lerc/package.py index dd80055755a453..fe75d8653f4074 100644 --- a/var/spack/repos/builtin/packages/py-lerc/package.py +++ b/var/spack/repos/builtin/packages/py-lerc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-lfpykit/package.py b/var/spack/repos/builtin/packages/py-lfpykit/package.py index f7397903c8ec46..c20f8d9acb8a04 100644 --- a/var/spack/repos/builtin/packages/py-lfpykit/package.py +++ b/var/spack/repos/builtin/packages/py-lfpykit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLfpykit(PythonPackage): homepage = "https://github.com/LFPy/LFPykit" pypi = "lfpykit/LFPykit-0.5.tar.gz" + license("GPL-3.0-only") + version("0.5", sha256="9a7ae80ad905bb8dd0eeab8517b43c3d5b4fff2b8766c9d5a36320a7a67bd545") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lhsmdu/package.py b/var/spack/repos/builtin/packages/py-lhsmdu/package.py index 866c70e04d6f81..b6386e0b7e328c 100644 --- a/var/spack/repos/builtin/packages/py-lhsmdu/package.py +++ b/var/spack/repos/builtin/packages/py-lhsmdu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyLhsmdu(PythonPackage): pypi = "lhsmdu/lhsmdu-1.1.tar.gz" maintainers("liuyangzhuan") + license("MIT") + version("1.1", sha256="4bc1df6b9cdd27bae0bff75cf1693f455ba32e4fa87ca9a932f60696607fe712") version("0.1", sha256="ef462054b354cd20b10c6d80876c8fdb552a8d2e23eaf74179dc91956d68d32a") diff --git a/var/spack/repos/builtin/packages/py-liac-arff/package.py b/var/spack/repos/builtin/packages/py-liac-arff/package.py index 781a83005ef6b8..fe432a9e1db262 100644 --- a/var/spack/repos/builtin/packages/py-liac-arff/package.py +++ b/var/spack/repos/builtin/packages/py-liac-arff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLiacArff(PythonPackage): homepage = "https://github.com/renatopp/liac-arff" pypi = "liac-arff/liac-arff-2.5.0.tar.gz" + license("MIT") + version("2.5.0", sha256="3220d0af6487c5aa71b47579be7ad1d94f3849ff1e224af3bf05ad49a0b5c4da") depends_on("python@2.7:2.999,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-libclang/package.py b/var/spack/repos/builtin/packages/py-libclang/package.py index 57a41a438f1fa4..0ce9997290411a 100644 --- a/var/spack/repos/builtin/packages/py-libclang/package.py +++ b/var/spack/repos/builtin/packages/py-libclang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLibclang(PythonPackage): url = "https://github.com/sighingnow/libclang/archive/refs/tags/llvm-11.1.0.tar.gz" + license("Apache-2.0") + version("14.0.6", sha256="3666679d9f23270a230a4d4dae49bc48fc2515c272ff5855b2618e23daa50100") version("14.0.1", sha256="58a255381d6360aca8d4978c8bb2e6be55ac0bdd18bc10372da0febe0a7f9472") version("13.0.0", sha256="2638e81fe3976f4ad487dc6094dacf306dcb161e11b0830391d58d1ae1e05c80") diff --git a/var/spack/repos/builtin/packages/py-libconf/package.py b/var/spack/repos/builtin/packages/py-libconf/package.py index 881742030dc5c8..7c6b3f2283bc29 100644 --- a/var/spack/repos/builtin/packages/py-libconf/package.py +++ b/var/spack/repos/builtin/packages/py-libconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyLibconf(PythonPackage): pypi = "libconf/libconf-2.0.1.tar.gz" + license("MIT") + version("2.0.1", sha256="2f907258953ba60a95a82d5633726b47c81f2d5cf8d8801b092579016d757f4a") version("1.0.1", sha256="6dd62847bb69ab5a09155cb8be2328cce01e7ef88a35e7c37bea2b1a70f8bd58") diff --git a/var/spack/repos/builtin/packages/py-libcst/package.py b/var/spack/repos/builtin/packages/py-libcst/package.py index 0978f4067acba7..b5c31f36e2b4dc 100644 --- a/var/spack/repos/builtin/packages/py-libcst/package.py +++ b/var/spack/repos/builtin/packages/py-libcst/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLibcst(PythonPackage): homepage = "https://github.com/Instagram/LibCST" pypi = "libcst/libcst-0.4.9.tar.gz" + license("Apache-2.0") + version("0.4.9", sha256="01786c403348f76f274dbaf3888ae237ffb73e6ed6973e65eba5c1fc389861dd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-libensemble/package.py b/var/spack/repos/builtin/packages/py-libensemble/package.py index d47a3d68fb932e..9895ff575c19e6 100644 --- a/var/spack/repos/builtin/packages/py-libensemble/package.py +++ b/var/spack/repos/builtin/packages/py-libensemble/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,16 @@ class PyLibensemble(PythonPackage): """Library for managing ensemble-like collections of computations.""" homepage = "https://libensemble.readthedocs.io" - pypi = "libensemble/libensemble-1.0.0.tar.gz" + pypi = "libensemble/libensemble-1.1.0.tar.gz" git = "https://github.com/Libensemble/libensemble.git" maintainers("shuds13", "jlnav") tags = ["e4s"] + license("BSD-3-Clause") + version("develop", branch="develop") + version("1.1.0", sha256="3e3ddc4233272d3651e9d62c7bf420018930a4b9b135ef9ede01d5356235c1c6") version("1.0.0", sha256="b164e044f16f15b68fd565684ad8ce876c93aaeb84e5078f4ea2a29684b110ca") version("0.10.2", sha256="ef8dfe5d233dcae2636a3d6aa38f3c2ad0f42c65bd38f664e99b3e63b9f86622") version("0.10.1", sha256="56ae42ec9a28d3df8f46bdf7d016db9526200e9df2a28d849902e3c44fe5c1ba") diff --git a/var/spack/repos/builtin/packages/py-liblas/package.py b/var/spack/repos/builtin/packages/py-liblas/package.py index ff5e6d173d822e..d27532ad66ce36 100644 --- a/var/spack/repos/builtin/packages/py-liblas/package.py +++ b/var/spack/repos/builtin/packages/py-liblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-librosa/package.py b/var/spack/repos/builtin/packages/py-librosa/package.py index 050916efccfc1b..a7ace24c0689ac 100644 --- a/var/spack/repos/builtin/packages/py-librosa/package.py +++ b/var/spack/repos/builtin/packages/py-librosa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLibrosa(PythonPackage): homepage = "https://github.com/librosa/librosa" pypi = "librosa/librosa-0.7.2.tar.gz" + license("ISC") + version("0.9.1", sha256="7ed5d6e3f4546e5e3c2840691f9ddc56878f914a35a50060df5fca2b26d4b614") version("0.7.2", sha256="656bbda80e98e6330db1ead79cd084b13a762284834d7603fcf7cf7c0dc65f3c") diff --git a/var/spack/repos/builtin/packages/py-lifelines/package.py b/var/spack/repos/builtin/packages/py-lifelines/package.py index 97f6c6b1e858ed..6a0538de9261e3 100644 --- a/var/spack/repos/builtin/packages/py-lifelines/package.py +++ b/var/spack/repos/builtin/packages/py-lifelines/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyLifelines(PythonPackage): homepage = "https://github.com/CamDavidsonPilon/lifelines" pypi = "lifelines/lifelines-0.25.5.tar.gz" + license("MIT") + version("0.25.5", sha256="f24260aa371829354440dfc2c1be8d59d9e841cce7a933230213cecd67787b89") version("0.9.4", sha256="0f19a8b18ace80c231de60487b2b1a3de3eb418445c6a6d0d72c1110d860f676") diff --git a/var/spack/repos/builtin/packages/py-lightgbm/package.py b/var/spack/repos/builtin/packages/py-lightgbm/package.py index 14b1a2e34f4118..0596e07ecc68b5 100644 --- a/var/spack/repos/builtin/packages/py-lightgbm/package.py +++ b/var/spack/repos/builtin/packages/py-lightgbm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLightgbm(PythonPackage): homepage = "https://github.com/microsoft/LightGBM" pypi = "lightgbm/lightgbm-3.1.1.tar.gz" + license("MIT") + version("3.1.1", sha256="babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20") variant("mpi", default=False, description="Build with mpi support") diff --git a/var/spack/repos/builtin/packages/py-lightly-utils/package.py b/var/spack/repos/builtin/packages/py-lightly-utils/package.py index 9762e3a2dcd541..028174a170489d 100644 --- a/var/spack/repos/builtin/packages/py-lightly-utils/package.py +++ b/var/spack/repos/builtin/packages/py-lightly-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLightlyUtils(PythonPackage): homepage = "https://www.lightly.ai/" pypi = "lightly_utils/lightly_utils-0.0.2.tar.gz" + license("MIT") + version("0.0.2", sha256="a351f3d600f0ab08d12f294725c6457ae000645cb0a1083d0845cb196ccfe698") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lightly/package.py b/var/spack/repos/builtin/packages/py-lightly/package.py index 260679e84696ea..246de47f0050fb 100644 --- a/var/spack/repos/builtin/packages/py-lightly/package.py +++ b/var/spack/repos/builtin/packages/py-lightly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class PyLightly(PythonPackage): maintainers("adamjstewart") + license("MIT") + + version("1.4.26", sha256="7bbcf0a358f23659eb4089043c559c4584ef339266b1c0a9a2598c3100f2f3b8") version("1.4.18", sha256="41794f6815db178b031236793b379e5573e074fdf730506872b73766396a6bdf") version("1.4.17", sha256="1533ddf28c8a08b3eafd404964d03f9a62fe76405fcf8dc7206ca4093725285e") version("1.4.16", sha256="9bd2af53e144e4f9823409cd33b39651f579ed671ff242a1445640c9df504d92") @@ -36,6 +39,8 @@ class PyLightly(PythonPackage): # setup.py depends_on("py-setuptools@21:", when="@1.4.2:", type="build") + depends_on("py-setuptools@21:", when="@1.4.8,1.4.15:1.4.25", type=("build", "run")) + depends_on("py-setuptools@21:65.5.1", when="@:1.4.1", type=("build", "run")) # requirements/base.txt depends_on("py-certifi@14.05.14:", type=("build", "run")) @@ -46,12 +51,8 @@ class PyLightly(PythonPackage): depends_on("py-requests@2.23:", type=("build", "run")) depends_on("py-six@1.10:", type=("build", "run")) depends_on("py-tqdm@4.44:", type=("build", "run")) - depends_on("py-urllib3@1.15.1:", type=("build", "run")) - - # requirements/openapi.txt - depends_on("py-python-dateutil@2.5.3:", when="@1.4.8:", type=("build", "run")) - depends_on("py-setuptools@21:", when="@1.4.15:", type=("build", "run")) depends_on("py-urllib3@1.25.3:", when="@1.4.8:", type=("build", "run")) + depends_on("py-urllib3@1.15.1:", type=("build", "run")) depends_on("py-pydantic@1.10.5:1", when="@1.4.8:", type=("build", "run")) depends_on("py-aenum@3.1.11:", when="@1.4.8:", type=("build", "run")) @@ -64,7 +65,3 @@ class PyLightly(PythonPackage): # https://github.com/lightly-ai/lightly/issues/1153 depends_on("py-torch+distributed", when="@:1.4.4", type=("build", "run")) - - # Historical dependencies - depends_on("py-setuptools@21:", when="@1.4.8", type=("build", "run")) - depends_on("py-setuptools@21:65.5.1", when="@:1.4.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lightning-api-access/package.py b/var/spack/repos/builtin/packages/py-lightning-api-access/package.py index fbff25407a23a3..a61f0f87a516ed 100644 --- a/var/spack/repos/builtin/packages/py-lightning-api-access/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-api-access/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-lightning-cloud/package.py b/var/spack/repos/builtin/packages/py-lightning-cloud/package.py index 80417b11c17cc2..965282eec2bfee 100644 --- a/var/spack/repos/builtin/packages/py-lightning-cloud/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-cloud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLightningCloud(PythonPackage): homepage = "https://lightning.ai/" pypi = "lightning_cloud/lightning_cloud-0.5.31.tar.gz" + license("Apache-2.0") + version("0.5.38", sha256="86fd5144b721bb289e9fd863604a67d55515688ccbadf0d858adfca1cefaf78f") version("0.5.37", sha256="1e0d577e1696e3aef974c589c4bd1ed22c70a332750863a393ec3949166137e0") version("0.5.36", sha256="990558d93a1b67d8bcbf8a87feb2ac455e13ec5223916ad2d5707d96df9558c9") diff --git a/var/spack/repos/builtin/packages/py-lightning-fabric/package.py b/var/spack/repos/builtin/packages/py-lightning-fabric/package.py index 53ed48fd811ced..7eb4ea2c5de5ab 100644 --- a/var/spack/repos/builtin/packages/py-lightning-fabric/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-fabric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLightningFabric(PythonPackage): homepage = "https://github.com/Lightning-AI/lightning" pypi = "lightning-fabric/lightning-fabric-2.0.0.tar.gz" + license("Apache-2.0") + version("2.0.0", sha256="56ecf23e2857f76cc1ca4528cc314b884fed1541182d4e8b130e3c2efd39c896") # src/lightning_fabric/__setup__.py diff --git a/var/spack/repos/builtin/packages/py-lightning-lite/package.py b/var/spack/repos/builtin/packages/py-lightning-lite/package.py index 120af3edd16f2a..1f6cd2caf60093 100644 --- a/var/spack/repos/builtin/packages/py-lightning-lite/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLightningLite(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("1.8.0", sha256="a71940409d3d1a5bb20f63716c86a745157ce30100f1c16600dfe33d9b657955") # src/lightning_lite/__setup__.py diff --git a/var/spack/repos/builtin/packages/py-lightning-utilities/package.py b/var/spack/repos/builtin/packages/py-lightning-utilities/package.py index 9cee8bda3e1236..f93c80f2eca55d 100644 --- a/var/spack/repos/builtin/packages/py-lightning-utilities/package.py +++ b/var/spack/repos/builtin/packages/py-lightning-utilities/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLightningUtilities(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.8.0", sha256="8e5d95c7c57f026cdfed7c154303e88c93a7a5e868c9944cb02cf71f1db29720") version( "0.6.0.post0", sha256="6f02cfe59e6576487e709a0e66e07671563bde9e21b40e1c567918e4d753278c" @@ -25,7 +27,7 @@ class PyLightningUtilities(PythonPackage): version("0.3.0", sha256="d769ab9b76ebdee3243d1051d509aafee57d7947734ddc22977deef8a6427f2f") # setup.py - depends_on("py-setuptools", type="build") + depends_on("py-setuptools", type=("build", "run")) # requirements/base.txt depends_on("py-importlib-metadata@4:", when="@0.4.1: ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lightning/package.py b/var/spack/repos/builtin/packages/py-lightning/package.py index 8bec9806ee3478..2abba277d928ff 100644 --- a/var/spack/repos/builtin/packages/py-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-lightning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class PyLightning(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + + version("2.1.3", sha256="70867a59e6b67e7720958ceb14476a2a00f34c12ad03680faed3163ed70138e2") + version("2.1.2", sha256="3b2599a8a719916cb03526e6570356809729680c6cda09391232e2aba0a4ed4b") + version("2.1.1", sha256="865491940d20a9754eac7494aa18cab893e0c2b31e83743349eeeaf31dfb52db") version("2.1.0", sha256="1f78f5995ae7dcffa1edf34320db136902b73a0d1b304404c48ec8be165b3a93") version("2.0.9", sha256="2395ece6e29e12064718ff16b8edec5685df7f7095d4fee78edb0a654f5cd7eb") version("2.0.8", sha256="db914e211b5c3b079a821be6e4344e72d0a729163676a65c4e00aae98390ae7b") @@ -34,7 +39,8 @@ class PyLightning(PythonPackage): # src/lightning.egg-info/requires.txt depends_on("py-pyyaml@5.4:7", type=("build", "run")) - depends_on("py-fsspec@2021.6.1:2024+http", when="@2.1:", type=("build", "run")) + depends_on("py-fsspec@2022.5:2024+http", when="@2.1.3:", type=("build", "run")) + depends_on("py-fsspec@2021.6.1:2024+http", when="@2.1.0:2.1.2", type=("build", "run")) depends_on("py-fsspec@2022.5:2024+http", when="@2.0.5:2.0", type=("build", "run")) depends_on("py-fsspec@2022.5:2023+http", when="@:2.0.4", type=("build", "run")) depends_on("py-lightning-utilities@0.8:1", when="@2.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ligo-segments/package.py b/var/spack/repos/builtin/packages/py-ligo-segments/package.py index 0da4009ec4ca4e..0182330d79ad76 100644 --- a/var/spack/repos/builtin/packages/py-ligo-segments/package.py +++ b/var/spack/repos/builtin/packages/py-ligo-segments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyLigoSegments(PythonPackage): pypi = "ligo-segments/ligo-segments-1.2.0.tar.gz" + license("GPL-3.0-or-later") + version("1.2.0", sha256="5edbcb88cae007c4e154a61cb2c9d0a6d6d4016c1ecaf0a59a667a267bd20e7a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-line-profiler/package.py b/var/spack/repos/builtin/packages/py-line-profiler/package.py index acd0a1fd8fc8fd..8adc1106186c14 100644 --- a/var/spack/repos/builtin/packages/py-line-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-line-profiler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLineProfiler(PythonPackage): homepage = "https://github.com/rkern/line_profiler" pypi = "line_profiler/line_profiler-2.0.tar.gz" + license("PSF-2.0") + version("2.1.2", sha256="efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c") version("2.0", sha256="739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381") diff --git a/var/spack/repos/builtin/packages/py-linear-operator/package.py b/var/spack/repos/builtin/packages/py-linear-operator/package.py index dfd772002f6d77..00c78994137622 100644 --- a/var/spack/repos/builtin/packages/py-linear-operator/package.py +++ b/var/spack/repos/builtin/packages/py-linear-operator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLinearOperator(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.4.0", sha256="7c57c9f8f258c9785c0db4dd7625f4dd03a340313d7314cba0b633644909f5c6") version("0.3.0", sha256="84bf572631a7e1576de6920d81600ca0fedcf6bda2f29dbaf440d6e72ce6abab") version("0.1.1", sha256="81adc1aea9e98f3c4f07f5608eb77b689bc61793e9beebfea82155e9237bf1be") diff --git a/var/spack/repos/builtin/packages/py-linecache2/package.py b/var/spack/repos/builtin/packages/py-linecache2/package.py index 5e726cbd527894..29af8743815bd6 100644 --- a/var/spack/repos/builtin/packages/py-linecache2/package.py +++ b/var/spack/repos/builtin/packages/py-linecache2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-lineenhancer/package.py b/var/spack/repos/builtin/packages/py-lineenhancer/package.py index d9c7578bbbe87b..1d8fc4df9909b3 100644 --- a/var/spack/repos/builtin/packages/py-lineenhancer/package.py +++ b/var/spack/repos/builtin/packages/py-lineenhancer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLineenhancer(PythonPackage): maintainers("dorton21") + license("MIT") + version("1.0.8", sha256="a1c7f2556110135d7298b0002674b669b8bbf23f94d63e3e3db8f17f2fd3efbe") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-linkify-it-py/package.py b/var/spack/repos/builtin/packages/py-linkify-it-py/package.py index e6671f3e8e3694..a112f21767e5be 100644 --- a/var/spack/repos/builtin/packages/py-linkify-it-py/package.py +++ b/var/spack/repos/builtin/packages/py-linkify-it-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLinkifyItPy(PythonPackage): homepage = "https://github.com/tsutsu3/linkify-it-py" pypi = "linkify-it-py/linkify-it-py-2.0.2.tar.gz" + license("MIT") + version("2.0.2", sha256="19f3060727842c254c808e99d465c80c49d2c7306788140987a1a7a29b0d6ad2") version("1.0.3", sha256="2b3f168d5ce75e3a425e34b341a6b73e116b5d9ed8dbbbf5dc7456843b7ce2ee") diff --git a/var/spack/repos/builtin/packages/py-lit/package.py b/var/spack/repos/builtin/packages/py-lit/package.py index ed6cdc754fb769..cf80edfa865d9d 100644 --- a/var/spack/repos/builtin/packages/py-lit/package.py +++ b/var/spack/repos/builtin/packages/py-lit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-littleutils/package.py b/var/spack/repos/builtin/packages/py-littleutils/package.py index 5584733b7df0fa..3bf6e19f9f8f7c 100644 --- a/var/spack/repos/builtin/packages/py-littleutils/package.py +++ b/var/spack/repos/builtin/packages/py-littleutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLittleutils(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.2.2", sha256="e6cae3a4203e530d51c9667ed310ffe3b1948f2876e3d69605b3de4b7d96916f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-lizard/package.py b/var/spack/repos/builtin/packages/py-lizard/package.py index f3e23690fbebfc..e6741e90b929e6 100644 --- a/var/spack/repos/builtin/packages/py-lizard/package.py +++ b/var/spack/repos/builtin/packages/py-lizard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyLizard(PythonPackage): homepage = "http://www.lizard.ws/" pypi = "lizard/lizard-1.17.9.tar.gz" + license("MIT") + version("1.17.10", sha256="62d78acd64724be28b5f4aa27a630dfa4b4afbd1596d1f25d5ad1c1a3a075adc") version("1.17.9", sha256="76ee0e631d985bea1dd6521a03c6c2fa9dce5a2248b3d26c49890e9e085b7aed") diff --git a/var/spack/repos/builtin/packages/py-llnl-sina/package.py b/var/spack/repos/builtin/packages/py-llnl-sina/package.py index 8084a43dd4262a..d55adb4510cb73 100644 --- a/var/spack/repos/builtin/packages/py-llnl-sina/package.py +++ b/var/spack/repos/builtin/packages/py-llnl-sina/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,9 @@ class PyLlnlSina(PythonPackage): git = "https://github.com/LLNL/Sina.git" # notify when the package is updated. + + license("MIT") + maintainers("HaluskaR", "estebanpauli", "murray55", "doutriaux1") version("1.11.0", tag="v1.11.0", commit="f3e9bb3a122cfae2a9fd82c3c5613cff939d3aa1") version("1.10.0", tag="v1.10.0", commit="9c3c0acca5f0d4ac02470571688f00ab0bd61a30") diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index a6f7cd8a4db2bd..d8fae01eb09e79 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,11 @@ class PyLlvmlite(PythonPackage): pypi = "llvmlite/llvmlite-0.23.0.tar.gz" git = "https://github.com/numba/llvmlite.git" + license("BSD-2-Clause") + + version("0.41.1", sha256="f19f767a018e6ec89608e1f6b13348fa2fcde657151137cb64e56d48598a92db") + version("0.41.0", sha256="7d41db345d76d2dfa31871178ce0d8e9fd8aa015aa1b7d4dab84b5cb393901e0") + version("0.40.1", sha256="5cdb0d45df602099d833d50bd9e81353a5e036242d3c003c5b294fc61d1986b4") version("0.40.0", sha256="c910b8fbfd67b8e9d0b10ebc012b23cd67cbecef1b96f00d391ddd298d71671c") version("0.39.1", sha256="b43abd7c82e805261c425d50335be9a6c4f84264e34d6d6e475207300005d572") version("0.39.0", sha256="01098be54f1aa25e391cebba8ea71cd1533f8cd1f50e34c7dd7540c2560a93af") @@ -22,17 +27,12 @@ class PyLlvmlite(PythonPackage): version("0.34.0", sha256="f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63") version("0.33.0", sha256="9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596") version("0.31.0", sha256="22ab2b9d7ec79fab66ac8b3d2133347de86addc2e2df1b3793e523ac84baa3c8") - version("0.29.0", sha256="3adb0d4c9a17ad3dca82c7e88118babd61eeee0ee985ce31fa43ec27aa98c963") - version("0.27.1", sha256="48a1c3ae69fd8920cba153bfed8a46ac46474bc706a2100226df4abffe0000ab") - version("0.26.0", sha256="13e84fe6ebb0667233074b429fd44955f309dead3161ec89d9169145dbad2ebf") - version("0.25.0", sha256="fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025") depends_on("py-setuptools", type="build") depends_on("python@3.8:3.11", when="@0.40:", type=("build", "run")) depends_on("python@:3.10", when="@0.38:0.39", type=("build", "run")) depends_on("python@:3.9", when="@0.36:0.37", type=("build", "run")) depends_on("python@:3.8", when="@0.31:0.35", type=("build", "run")) - depends_on("python@:3.7", when="@:0.30", type=("build", "run")) # https://github.com/numba/llvmlite#compatibility depends_on("llvm@14", when="@0.41:") @@ -53,8 +53,6 @@ class PyLlvmlite(PythonPackage): depends_on("llvm@9.0", when="@0.34:0.36 target=aarch64:") depends_on("llvm@9.0", when="@0.33") depends_on("llvm@7.0:7.1,8.0", when="@0.29:0.32") - depends_on("llvm@7.0", when="@0.27:0.28") - depends_on("llvm@6.0", when="@0.23:0.26") depends_on("binutils", type="build") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/py-lmdb/package.py b/var/spack/repos/builtin/packages/py-lmdb/package.py index eb77d8726175b7..9a953753e38915 100644 --- a/var/spack/repos/builtin/packages/py-lmdb/package.py +++ b/var/spack/repos/builtin/packages/py-lmdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLmdb(PythonPackage): pypi = "lmdb/lmdb-1.3.0.tar.gz" homepage = "https://github.com/jnwatson/py-lmdb/" + license("OLDAP-2.8") + version("1.3.0", sha256="60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e") version("1.1.1", sha256="165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac") diff --git a/var/spack/repos/builtin/packages/py-lmfit/package.py b/var/spack/repos/builtin/packages/py-lmfit/package.py index 4a3b035644ae5b..3b0ead7298f294 100644 --- a/var/spack/repos/builtin/packages/py-lmfit/package.py +++ b/var/spack/repos/builtin/packages/py-lmfit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLmfit(PythonPackage): homepage = "https://lmfit.github.io/lmfit-py/" pypi = "lmfit/lmfit-0.9.5.tar.gz" + license("BSD-3-Clause") + version("1.0.2", sha256="67090ce56685cf7f92bd7358a1e7d4ad862b3758988109ec440e9825e5184b45") version("1.0.1", sha256="d249eb756899360f4d2a544c9458f47fc8f765ac22c09e099530585fd64e286e") version("0.9.15", sha256="cd7bdf47c09a3d49f30dff9a1c7f778973d15d1e1b5dc642f14c22f6630eaf2f") diff --git a/var/spack/repos/builtin/packages/py-lmodule/package.py b/var/spack/repos/builtin/packages/py-lmodule/package.py index 48533a545323e5..b40ad17c10f1ab 100644 --- a/var/spack/repos/builtin/packages/py-lmodule/package.py +++ b/var/spack/repos/builtin/packages/py-lmodule/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyLmodule(PythonPackage): maintainers("shahzebsiddiqui") + license("MIT") + version("0.1.0", sha256="cac8f3dad2df27b10e051b2c56ccbde1fcdd7044af594d13fd2e4144d3d46a29") depends_on("python@3.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-localcider/package.py b/var/spack/repos/builtin/packages/py-localcider/package.py index bf75fe76b8fd3a..ed49dcb3f7699a 100644 --- a/var/spack/repos/builtin/packages/py-localcider/package.py +++ b/var/spack/repos/builtin/packages/py-localcider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLocalcider(PythonPackage): homepage = "https://pappulab.github.io/localCIDER" pypi = "localcider/localcider-0.1.14.tar.gz" + license("GPL-2.0-or-later") + version("0.1.14", sha256="54ff29e8a011947cca5df79e96f3c69a76c49c4db41dcf1608663992be3e3f5f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-locket/package.py b/var/spack/repos/builtin/packages/py-locket/package.py index e1ee7385c53fae..1cb30f482653e0 100644 --- a/var/spack/repos/builtin/packages/py-locket/package.py +++ b/var/spack/repos/builtin/packages/py-locket/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLocket(PythonPackage): homepage = "https://github.com/mwilliamson/locket.py" pypi = "locket/locket-0.2.0.tar.gz" + license("BSD-2-Clause") + version("1.0.0", sha256="5c0d4c052a8bbbf750e056a8e65ccd309086f4f0f18a2eac306a8dfa4112a632") version("0.2.0", sha256="1fee63c1153db602b50154684f5725564e63a0f6d09366a1cb13dffcec179fb4") diff --git a/var/spack/repos/builtin/packages/py-lockfile/package.py b/var/spack/repos/builtin/packages/py-lockfile/package.py index d26a014c9f79af..33a196afa19093 100644 --- a/var/spack/repos/builtin/packages/py-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-lockfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyLockfile(PythonPackage): pypi = "lockfile/lockfile-0.10.2.tar.gz" homepage = "https://launchpad.net/pylockfile" + license("MIT") + version("0.12.2", sha256="6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799") version("0.10.2", sha256="9e42252f17d1dd89ee31745e0c4fbe58862c25147eb0ef5295c9cd9bcb4ea2c1") diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index 22e89e37cfc6d4..013aef995d405f 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLogilabCommon(PythonPackage): homepage = "https://www.logilab.org/project/logilab-common" pypi = "logilab-common/logilab-common-1.2.0.tar.gz" + license("LGPL-2.1-or-later") + version("1.4.2", sha256="cdda9ed0deca7c68f87f7a404ad742e47aaa1ca5956d12988236a5ec3bda13a0") version("1.2.0", sha256="d4e5cec3be3a89f06ff05e359a221e69bd1da33cb7096cad648ddcccea8465b7") diff --git a/var/spack/repos/builtin/packages/py-logmuse/package.py b/var/spack/repos/builtin/packages/py-logmuse/package.py index 14497ae06039d9..f70128960f84d4 100644 --- a/var/spack/repos/builtin/packages/py-logmuse/package.py +++ b/var/spack/repos/builtin/packages/py-logmuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLogmuse(PythonPackage): homepage = "https://github.com/databio/logmuse/" pypi = "logmuse/logmuse-0.2.7.tar.gz" + license("BSD-2-Clause") + version("0.2.7", sha256="a4692c44ddfa912c3cb149ca4c7545f80119aa7485868fd1412e7c647e9a7e7e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-loguru/package.py b/var/spack/repos/builtin/packages/py-loguru/package.py index 4bbf22a749ad56..a516195dc3a747 100644 --- a/var/spack/repos/builtin/packages/py-loguru/package.py +++ b/var/spack/repos/builtin/packages/py-loguru/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLoguru(PythonPackage): homepage = "https://github.com/Delgan/loguru" pypi = "loguru/loguru-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="066bd06758d0a513e9836fd9c6b5a75bfb3fd36841f4b996bc60b547a309d41c") version("0.3.0", sha256="f2a0fa92f334d37a13351aa36ab18e8039649a3741836b4b6d8b8bce7e8457ac") version("0.2.5", sha256="68297d9f23064c2f4764bb5d0c5c767f3ed7f9fc1218244841878f5fc7c94add") diff --git a/var/spack/repos/builtin/packages/py-loompy/package.py b/var/spack/repos/builtin/packages/py-loompy/package.py index 5b91109e5d91b4..61d6b6ae9f82bb 100644 --- a/var/spack/repos/builtin/packages/py-loompy/package.py +++ b/var/spack/repos/builtin/packages/py-loompy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLoompy(PythonPackage): homepage = "https://github.com/linnarsson-lab/loompy" pypi = "loompy/loompy-3.0.7.tar.gz" + license("BSD-2-Clause") + version("3.0.7", sha256="b5cdf7b54734c6bed3a181d11947af70af2c6e0dcadc02fd0e871df232faa8f4") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-looseversion/package.py b/var/spack/repos/builtin/packages/py-looseversion/package.py index 6dcce6e39b246a..0faf517b8bb51f 100644 --- a/var/spack/repos/builtin/packages/py-looseversion/package.py +++ b/var/spack/repos/builtin/packages/py-looseversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-louie/package.py b/var/spack/repos/builtin/packages/py-louie/package.py index 941b93462ca328..de29344af63c92 100644 --- a/var/spack/repos/builtin/packages/py-louie/package.py +++ b/var/spack/repos/builtin/packages/py-louie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-lru-dict/package.py b/var/spack/repos/builtin/packages/py-lru-dict/package.py index 4c5b6a29c183f3..d5d88abb93a3a6 100644 --- a/var/spack/repos/builtin/packages/py-lru-dict/package.py +++ b/var/spack/repos/builtin/packages/py-lru-dict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLruDict(PythonPackage): homepage = "https://github.com/amitdev/lru-dict" pypi = "lru-dict/lru-dict-1.1.6.tar.gz" + license("MIT") + version("1.1.6", sha256="365457660e3d05b76f1aba3e0f7fedbfcd6528e97c5115a351ddd0db488354cc") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py b/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py index 832214b0b33996..d35d5544325fde 100644 --- a/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py +++ b/var/spack/repos/builtin/packages/py-lscsoft-glue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLscsoftGlue(PythonPackage): homepage = "https://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html" pypi = "lscsoft-glue/lscsoft-glue-2.0.0.tar.gz" + license("GPL-3.0-only") + version("2.0.0", sha256="9bdfaebe4c921d83d1e3d1ca24379a644665e9d7530e7070665f387767c66923") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-luigi/package.py b/var/spack/repos/builtin/packages/py-luigi/package.py index d79e9c77ff52de..a5f25370525751 100644 --- a/var/spack/repos/builtin/packages/py-luigi/package.py +++ b/var/spack/repos/builtin/packages/py-luigi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLuigi(PythonPackage): homepage = "https://github.com/spotify/luigi" pypi = "luigi/luigi-2.8.3.tar.gz" + license("Apache-2.0") + version("3.2.0", sha256="5ef267ebfbbd5747576821b6835e08e956e24055841dee0ef7b1319b4e9d4740") version("3.1.1", sha256="29961582db2704d8df4ec01f6b8f7f0d529cc8f27cff67733ccd809299771218") version("3.1.0", sha256="1ae7d76e6f8889e9ed40c699891f990eb6697c974eeaf8ab010f0dfc3766adf1") diff --git a/var/spack/repos/builtin/packages/py-lvis/package.py b/var/spack/repos/builtin/packages/py-lvis/package.py index 4824f487d5fe52..cd36e993a88891 100644 --- a/var/spack/repos/builtin/packages/py-lvis/package.py +++ b/var/spack/repos/builtin/packages/py-lvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-lws/package.py b/var/spack/repos/builtin/packages/py-lws/package.py index 3fe139df13f132..783fc91e008f81 100644 --- a/var/spack/repos/builtin/packages/py-lws/package.py +++ b/var/spack/repos/builtin/packages/py-lws/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyLws(PythonPackage): homepage = "https://pypi.org/project/lws/" pypi = "lws/lws-1.2.6.tar.gz" + license("Apache-2.0") + version("1.2.6", sha256="ac94834832aadfcd53fcf4a77e1d95155063b39adbce14c733f8345bdac76e87") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lxml/package.py b/var/spack/repos/builtin/packages/py-lxml/package.py index 4024a4782f599d..7b6c31b08fa7cb 100644 --- a/var/spack/repos/builtin/packages/py-lxml/package.py +++ b/var/spack/repos/builtin/packages/py-lxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyLxml(PythonPackage): pypi = "lxml/lxml-4.6.1.tar.gz" git = "https://github.com/lxml/lxml" + license("BSD-3-Clause") + version("4.9.2", sha256="2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67") version("4.9.1", sha256="fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f") version("4.9.0", sha256="520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7") @@ -22,6 +24,7 @@ class PyLxml(PythonPackage): version("4.6.3", sha256="39b78571b3b30645ac77b95f7c69d1bffc4cf8c3b157c435a34da72e78c82468") version("4.6.1", sha256="c152b2e93b639d1f36ec5a8ca24cde4a8eefb2b6b83668fcd8e83a67badcb367") version("4.5.2", sha256="cdc13a1682b2a6241080745b1953719e7fe0850b40a5c71ca574f090a1391df6") + version("4.4.2", sha256="eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06") version("4.4.1", sha256="c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692") version("4.3.3", sha256="4a03dd682f8e35a10234904e0b9508d705ff98cf962c5851ed052e9340df3d90") version("4.2.5", sha256="36720698c29e7a9626a0dc802ef8885f8f0239bfd1689628ecd459a061f2807f") diff --git a/var/spack/repos/builtin/packages/py-lz4/package.py b/var/spack/repos/builtin/packages/py-lz4/package.py index 21c9ca92b17f68..f3b889859dc223 100644 --- a/var/spack/repos/builtin/packages/py-lz4/package.py +++ b/var/spack/repos/builtin/packages/py-lz4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyLz4(PythonPackage): homepage = "https://github.com/python-lz4/python-lz4" pypi = "lz4/lz4-3.1.0.tar.gz" + license("BSD-3-Clause") + version("4.0.2", sha256="083b7172c2938412ae37c3a090250bfdd9e4a6e855442594f86c3608ed12729b") version("3.1.3", sha256="081ef0a3b5941cb03127f314229a1c78bd70c9c220bb3f4dd80033e707feaa18") version("3.1.0", sha256="debe75513db3eb9e5cdcd82a329ff38374b6316ab65b848b571e0404746c1e05") diff --git a/var/spack/repos/builtin/packages/py-lzstring/package.py b/var/spack/repos/builtin/packages/py-lzstring/package.py index 37a1e44afbb477..cb07f1ea48f3e5 100644 --- a/var/spack/repos/builtin/packages/py-lzstring/package.py +++ b/var/spack/repos/builtin/packages/py-lzstring/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-m2r/package.py b/var/spack/repos/builtin/packages/py-m2r/package.py index 9c616ee51308c3..ed92357a33060f 100644 --- a/var/spack/repos/builtin/packages/py-m2r/package.py +++ b/var/spack/repos/builtin/packages/py-m2r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyM2r(PythonPackage): homepage = "https://github.com/miyakogi/m2r" url = "https://github.com/miyakogi/m2r/archive/v0.2.1.tar.gz" + license("MIT") + version("0.2.1", sha256="9286c1a5d7548f34b0a12017444e4c441781bef4b71f321f723e314b76b6c498") version("0.2.0", sha256="e9b7476203c4a5e3b822eb0ef110011d7b427d2c0dbdc4030f9cbcd239fbd4d6") version("0.1.15", sha256="4ca4c73385512f6e54db8e152ba157fc3eea84f9e942fe60a12ace5078ff83df") diff --git a/var/spack/repos/builtin/packages/py-macholib/package.py b/var/spack/repos/builtin/packages/py-macholib/package.py index a1e9cfcaf5fa25..c04472628c1fbd 100644 --- a/var/spack/repos/builtin/packages/py-macholib/package.py +++ b/var/spack/repos/builtin/packages/py-macholib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyMacholib(PythonPackage): pypi = "macholib/macholib-1.11.tar.gz" + license("MIT") + version("1.16", sha256="001bf281279b986a66d7821790d734e61150d52f40c080899df8fefae056e9f7") version("1.11", sha256="c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db") diff --git a/var/spack/repos/builtin/packages/py-machotools/package.py b/var/spack/repos/builtin/packages/py-machotools/package.py index 9d9f51fa90f56d..3ce943d59147f2 100644 --- a/var/spack/repos/builtin/packages/py-machotools/package.py +++ b/var/spack/repos/builtin/packages/py-machotools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py index 55a19b303f9e11..ffddbafe0eb250 100644 --- a/var/spack/repos/builtin/packages/py-macs2/package.py +++ b/var/spack/repos/builtin/packages/py-macs2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMacs2(PythonPackage): homepage = "https://github.com/taoliu/MACS" pypi = "MACS2/MACS2-2.2.4.tar.gz" + license("BSD-3-Clause") + version("2.2.8", sha256="2a0a436ac89d8f8c94a1e410690037760e5e37929ad719c54696e74ef84a98e0") version("2.2.7.1", sha256="ad2ca69bdd02a8942a68aae23133289b5c16ba382bcbe20c39fabf3948929de5") version("2.2.4", sha256="b131aadc8f5fd94bec35308b821e1f7585def788d2e7c756fc8cac402ffee25b") diff --git a/var/spack/repos/builtin/packages/py-macs3/package.py b/var/spack/repos/builtin/packages/py-macs3/package.py index be94b9c290cd7c..0c547d66d56ac5 100644 --- a/var/spack/repos/builtin/packages/py-macs3/package.py +++ b/var/spack/repos/builtin/packages/py-macs3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMacs3(PythonPackage): maintainers("snehring") + license("BSD-3-Clause") + version("3.0.0b3", sha256="caa794d4cfcd7368447eae15878505315dac44c21546e8fecebb3561e9cee362") depends_on("python@3.9:", type=("build", "run")) @@ -24,3 +26,5 @@ class PyMacs3(PythonPackage): depends_on("py-numpy@1.19:", type=("build", "run")) depends_on("py-cykhash@2", type=("build", "run")) depends_on("py-hmmlearn@0.3:", type=("build", "run")) + + depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index 1cbcbe7c5acc79..e0cfd9e32b6d2b 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMaestrowf(PythonPackage): maintainers("FrankD412") + license("MIT") + # git branches version("develop", branch="develop") version("master", branch="master") @@ -33,20 +35,6 @@ class PyMaestrowf(PythonPackage): version("1.1.0", sha256="1bfec546831f2ef577d7823bb50dcd12622644dad0d3d761998eafd0905b6977") version("1.0.1", sha256="dd42ffeac1f0492a576c630b37e5d3593273e59664407f2ebf78d49322d37146") - version( - "1.1.9dev1", - tag="1.1.9dev1", - commit="097e6b842fd4a9540432a9dec1e41f0d1a2c2c2f", - deprecated=True, - ) - version( - "1.1.7dev0", - sha256="bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0", - deprecated=True, - ) - - depends_on("python@2.7:2.8,3.5:", type=("build", "run")) - depends_on("python@3.6:", type=("build", "run"), when="@1.1.9:") depends_on("py-setuptools", type=("build"), when="@:1.1.8") depends_on("py-poetry-core@1.0.8:", type=("build"), when="@1.1.9:") depends_on("py-coloredlogs", type=("build", "run"), when="@1.1.7:") diff --git a/var/spack/repos/builtin/packages/py-mahotas/package.py b/var/spack/repos/builtin/packages/py-mahotas/package.py new file mode 100644 index 00000000000000..0a8badbe14c132 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-mahotas/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyMahotas(PythonPackage): + """Mahotas: Computer Vision Library.""" + + homepage = "http://luispedro.org/software/mahotas" + pypi = "mahotas/mahotas-1.4.13.tar.gz" + + maintainers("LydDeb") + + license("MIT") + + version("1.4.13", sha256="a78dfe15045a20a0d9e01538b80f874580cd3525ae3eaa2c83ced51eb455879c") + + depends_on("py-setuptools", type="build") + depends_on("py-numpy", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mailchecker/package.py b/var/spack/repos/builtin/packages/py-mailchecker/package.py index 21028fda422a80..af74f1464454f8 100644 --- a/var/spack/repos/builtin/packages/py-mailchecker/package.py +++ b/var/spack/repos/builtin/packages/py-mailchecker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMailchecker(PythonPackage): homepage = "https://github.com/FGRibreau/mailchecker" pypi = "mailchecker/mailchecker-4.0.3.tar.gz" + license("MIT") + version("4.0.3", sha256="00dbe9739c754366233eb3887c5deef987672482a26e814314c3e749fc7b1d1f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-make/package.py b/var/spack/repos/builtin/packages/py-make/package.py index 40ddcd7b73d6c3..dac86540d63139 100644 --- a/var/spack/repos/builtin/packages/py-make/package.py +++ b/var/spack/repos/builtin/packages/py-make/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py index 50a9a9eb607e6e..d03fca3ed189a1 100644 --- a/var/spack/repos/builtin/packages/py-mako/package.py +++ b/var/spack/repos/builtin/packages/py-mako/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMako(PythonPackage): pypi = "Mako/Mako-1.0.1.tar.gz" git = "https://github.com/sqlalchemy/mako" + license("MIT") + version("1.2.4", sha256="d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34") version("1.2.2", sha256="3724869b363ba630a272a5f89f68c070352137b8fd1757650017b7e06fda163f") version("1.1.6", sha256="4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2") diff --git a/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py b/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py index 7deaa836fe7630..4b529cd9c5ec88 100644 --- a/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py +++ b/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMapboxEarcut(PythonPackage): pypi = "mapbox-earcut/mapbox_earcut-1.0.1.tar.gz" git = "https://github.com/skogler/mapbox_earcut_python" + license("ISC") + version("1.0.1", sha256="9f155e429a22e27387cfd7a6372c3a3865aafa609ad725e2c4465257f154a438") depends_on("py-setuptools@42:", type="build") diff --git a/var/spack/repos/builtin/packages/py-mapclassify/package.py b/var/spack/repos/builtin/packages/py-mapclassify/package.py index f35ab23c113d46..006787e4274ac6 100644 --- a/var/spack/repos/builtin/packages/py-mapclassify/package.py +++ b/var/spack/repos/builtin/packages/py-mapclassify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMapclassify(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("2.4.2", sha256="bc20954aa433466f5fbc572e3f23b05f9606b59209f40b0ded93ac1ca983d24e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mariadb/package.py b/var/spack/repos/builtin/packages/py-mariadb/package.py index 55435a499ea952..1082fd0f42e774 100644 --- a/var/spack/repos/builtin/packages/py-mariadb/package.py +++ b/var/spack/repos/builtin/packages/py-mariadb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyMariadb(PythonPackage): homepage = "https://github.com/mariadb-corporation/mariadb-connector-python" pypi = "mariadb/mariadb-1.1.5.post3.tar.gz" + license("LGPL-2.1") + version( "1.1.5.post3", sha256="f9336dd4cb3207e621933bb5221f33fac0d7184db64dc44c70531430f4ecdcee" ) diff --git a/var/spack/repos/builtin/packages/py-markdown-include/package.py b/var/spack/repos/builtin/packages/py-markdown-include/package.py index 9d078b2a900aa5..7bc0af8a01a9fc 100644 --- a/var/spack/repos/builtin/packages/py-markdown-include/package.py +++ b/var/spack/repos/builtin/packages/py-markdown-include/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py index 3ff44a6088f38a..8a6139e498914f 100644 --- a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py +++ b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMarkdownItPy(PythonPackage): git = "https://github.com/executablebooks/markdown-it-py" pypi = "markdown-it-py/markdown-it-py-1.1.0.tar.gz" + license("MIT") + version("3.0.0", sha256="e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb") version("2.2.0", sha256="7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1") version("1.1.0", sha256="36be6bb3ad987bfdb839f5ba78ddf094552ca38ccbd784ae4f74a4e1419fc6e3") diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index 4ed8c04917ba2f..cd30ab06a041d2 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMarkdown(PythonPackage): homepage = "https://python-markdown.github.io/" pypi = "markdown/Markdown-2.6.11.tar.gz" + license("BSD-3-Clause") + version("3.4.1", sha256="3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff") version("3.3.4", sha256="31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49") version("3.1.1", sha256="2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") diff --git a/var/spack/repos/builtin/packages/py-markdown2/package.py b/var/spack/repos/builtin/packages/py-markdown2/package.py index d073900f2abc9a..6c1622cc133549 100644 --- a/var/spack/repos/builtin/packages/py-markdown2/package.py +++ b/var/spack/repos/builtin/packages/py-markdown2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMarkdown2(PythonPackage): homepage = "https://github.com/trentm/python-markdown2" pypi = "markdown2/markdown2-2.3.9.tar.gz" + license("MIT") + version("2.4.0", sha256="28d769f0e544e6f68f684f01e9b186747b079a6927d9ca77ebc8c640a2829b1b") depends_on("python@3.5:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-markovify/package.py b/var/spack/repos/builtin/packages/py-markovify/package.py index ae89b365c13c38..2d1dda0d823ea1 100644 --- a/var/spack/repos/builtin/packages/py-markovify/package.py +++ b/var/spack/repos/builtin/packages/py-markovify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMarkovify(PythonPackage): homepage = "https://github.com/jsvine/markovify" pypi = "markovify/markovify-0.8.3.tar.gz" + license("MIT") + version("0.8.3", sha256="254405c5b2f819ae388c39a53e6bc038bfbc24713441869ce90a1cd67e4a89ce") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-markupsafe/package.py b/var/spack/repos/builtin/packages/py-markupsafe/package.py index 910cff66286f30..1dee1e7b4c47fc 100644 --- a/var/spack/repos/builtin/packages/py-markupsafe/package.py +++ b/var/spack/repos/builtin/packages/py-markupsafe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyMarkupsafe(PythonPackage): pypi = "MarkupSafe/MarkupSafe-1.1.1.tar.gz" git = "https://github.com/pallets/markupsafe.git" + license("BSD-3-Clause") + version("2.1.3", sha256="af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad") version("2.1.1", sha256="7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b") version("2.0.1", sha256="594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a") diff --git a/var/spack/repos/builtin/packages/py-marshmallow/package.py b/var/spack/repos/builtin/packages/py-marshmallow/package.py index f8de1f05346078..dc74551dc55517 100644 --- a/var/spack/repos/builtin/packages/py-marshmallow/package.py +++ b/var/spack/repos/builtin/packages/py-marshmallow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMarshmallow(PythonPackage): maintainers("haralmha") + license("MIT") + version("3.19.0", sha256="90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78") version("3.15.0", sha256="2aaaab4f01ef4f5a011a21319af9fce17ab13bf28a026d1252adab0e035648d5") diff --git a/var/spack/repos/builtin/packages/py-matminer/package.py b/var/spack/repos/builtin/packages/py-matminer/package.py index 063a99ed1c85b1..8eff248a55b2c9 100644 --- a/var/spack/repos/builtin/packages/py-matminer/package.py +++ b/var/spack/repos/builtin/packages/py-matminer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py b/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py index 8d65b5252b3ee1..dbe2c9a5a82a64 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib-inline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMatplotlibInline(PythonPackage): homepage = "https://github.com/ipython/matplotlib-inline" pypi = "matplotlib-inline/matplotlib-inline-0.1.2.tar.gz" + license("BSD-3-Clause") + version("0.1.6", sha256="f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304") version("0.1.3", sha256="a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee") version("0.1.2", sha256="f41d5ff73c9f5385775d5c0bc13b424535c8402fe70ea8210f93e11f3683993e") @@ -19,3 +21,6 @@ class PyMatplotlibInline(PythonPackage): depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-traitlets", type=("build", "run")) + + # Undocumented dependency + depends_on("py-matplotlib", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-matplotlib-scalebar/package.py b/var/spack/repos/builtin/packages/py-matplotlib-scalebar/package.py index 0e49bb17316373..e0058958eea8dd 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib-scalebar/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib-scalebar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMatplotlibScalebar(PythonPackage): pypi = "matplotlib-scalebar/matplotlib-scalebar-0.6.1.tar.gz" git = "https://github.com/ppinard/matplotlib-scalebar.git" + license("BSD-2-Clause") + version("master", branch="master") version("0.8.1", sha256="14887af1093579c5e6afae51a0a1ecc3f715cdbc5c4d7ef59cdeec76ee6bb15d") version("0.6.1", sha256="85cec2bacf85aaf00a70cafa5786f7e66e7c0f6e9dc5c894fd6d1afaa7264ecd") diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 18d8d98f0ac880..30e0ed25582c0e 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,8 +24,12 @@ class PyMatplotlib(PythonPackage): "mpl_toolkits.mplot3d.tests", ] + license("Apache-2.0") + + 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") diff --git a/var/spack/repos/builtin/packages/py-maturin/package.py b/var/spack/repos/builtin/packages/py-maturin/package.py index 487e808e6aaf38..34e39ee79e7aa4 100644 --- a/var/spack/repos/builtin/packages/py-maturin/package.py +++ b/var/spack/repos/builtin/packages/py-maturin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyMaturin(PythonPackage): homepage = "https://github.com/pyo3/maturin" pypi = "maturin/maturin-0.13.7.tar.gz" + license("Apache-2.0") + + version("1.4.0", sha256="ed12e1768094a7adeafc3a74ebdb8dc2201fa64c4e7e31f14cfc70378bf93790") version("1.1.0", sha256="4650aeaa8debd004b55aae7afb75248cbd4d61cd7da2dcf4ead8b22b58cecae0") version("0.14.17", sha256="fb4e3311e8ce707843235fbe8748a05a3ae166c3efd6d2aa335b53dfc2bd3b88") version("0.13.7", sha256="c0a77aa0c57f945649ca711c806203a1b6888ad49c2b8b85196ffdcf0421db77") diff --git a/var/spack/repos/builtin/packages/py-mayavi/package.py b/var/spack/repos/builtin/packages/py-mayavi/package.py index ff9a6d1612252c..31e6c2bd43d81a 100644 --- a/var/spack/repos/builtin/packages/py-mayavi/package.py +++ b/var/spack/repos/builtin/packages/py-mayavi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMayavi(PythonPackage): homepage = "https://github.com/enthought/mayavi" pypi = "mayavi/mayavi-4.7.3.tar.gz" + license("EPL-1.0") + version("4.7.3", sha256="670d0023b9cd2d2346c451db9ba2f61da23a5df5033b25aea89cb6d81b9464f0") version( "4.7.1", diff --git a/var/spack/repos/builtin/packages/py-mccabe/package.py b/var/spack/repos/builtin/packages/py-mccabe/package.py index 34c815af30e5d0..405513c501b513 100644 --- a/var/spack/repos/builtin/packages/py-mccabe/package.py +++ b/var/spack/repos/builtin/packages/py-mccabe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMccabe(PythonPackage): homepage = "https://github.com/PyCQA/mccabe" pypi = "mccabe/mccabe-0.7.0.tar.gz" + license("MIT") + version("0.7.0", sha256="348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325") version("0.6.1", sha256="dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f") version("0.6.0", sha256="de9bbfe5b771e4c11b1521f3e338fe265a12296b59302f43a3bbf3e02d4b98b1") diff --git a/var/spack/repos/builtin/packages/py-md-environ/package.py b/var/spack/repos/builtin/packages/py-md-environ/package.py index 27dc28232c7f77..734b2523cff67b 100644 --- a/var/spack/repos/builtin/packages/py-md-environ/package.py +++ b/var/spack/repos/builtin/packages/py-md-environ/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mda-xdrlib/package.py b/var/spack/repos/builtin/packages/py-mda-xdrlib/package.py index e33c8354863ee1..2e1985a8b60705 100644 --- a/var/spack/repos/builtin/packages/py-mda-xdrlib/package.py +++ b/var/spack/repos/builtin/packages/py-mda-xdrlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMdaXdrlib(PythonPackage): maintainers("RMeli") + license("0BSD") + version("0.2.0", sha256="f26f7158a83c32b96d15b530fce2cbc1190c4b7024e41faa4ab3e3db74e272af") depends_on("py-setuptools@61.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-mdanalysis/package.py b/var/spack/repos/builtin/packages/py-mdanalysis/package.py index f961975e3c5372..6950060f380f07 100644 --- a/var/spack/repos/builtin/packages/py-mdanalysis/package.py +++ b/var/spack/repos/builtin/packages/py-mdanalysis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyMdanalysis(PythonPackage): maintainers("RMeli") + license("CC-BY-ND-3.0") + version("2.6.1", sha256="9cc69b94bddd026f26ffcaf5bdbed6d568c1c10e19a341d84f8d37a2a70222f2") version("2.6.0", sha256="210b198a115165004c36fbbbe5eb83a13323f52b10ccaef30dd40bfe25ba3e61") version("2.5.0", sha256="06ce4efab6ca1dbd2ee2959fc668049e1d574a8fe94ab948a4608244da1d016b") diff --git a/var/spack/repos/builtin/packages/py-mdanalysistests/package.py b/var/spack/repos/builtin/packages/py-mdanalysistests/package.py index df2633ef74c8b3..97facba4e5aa73 100644 --- a/var/spack/repos/builtin/packages/py-mdanalysistests/package.py +++ b/var/spack/repos/builtin/packages/py-mdanalysistests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMdanalysistests(PythonPackage): maintainers("RMeli") + license("GPL-3.0-or-later") + version("2.6.1", sha256="043f7451f4d9c42ea9e6609a81a6002948e2c74fd268282e0831416789b22e5e") version("2.6.0", sha256="16fdd10e5240b606e8f9210b7cbd9e4be110e6b8d79bb6e72ce6250c4731a817") version("2.5.0", sha256="a15b53b7f8bed67900a2bf542bbb3cab81dc71674fa6cddb3248dd11880e4c9d") diff --git a/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py b/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py index d65e586cd5f90d..f0e5aceecb4a38 100644 --- a/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py +++ b/var/spack/repos/builtin/packages/py-mdit-py-plugins/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMditPyPlugins(PythonPackage): git = "https://github.com/executablebooks/mdit-py-plugins/" pypi = "mdit-py-plugins/mdit-py-plugins-0.3.1.tar.gz" + license("MIT") + version("0.3.1", sha256="3fc13298497d6e04fe96efdd41281bfe7622152f9caa1815ea99b5c893de9441") version("0.2.8", sha256="5991cef645502e80a5388ec4fc20885d2313d4871e8b8e320ca2de14ac0c015f") diff --git a/var/spack/repos/builtin/packages/py-mdurl/package.py b/var/spack/repos/builtin/packages/py-mdurl/package.py index ad25526c4bfc38..d1fd16f44a1078 100644 --- a/var/spack/repos/builtin/packages/py-mdurl/package.py +++ b/var/spack/repos/builtin/packages/py-mdurl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMdurl(PythonPackage): homepage = "https://github.com/executablebooks/mdurl" pypi = "mdurl/mdurl-0.1.2.tar.gz" + license("MIT") + version("0.1.2", sha256="bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-meautility/package.py b/var/spack/repos/builtin/packages/py-meautility/package.py index effc526f9d8ec0..96f810744d1376 100644 --- a/var/spack/repos/builtin/packages/py-meautility/package.py +++ b/var/spack/repos/builtin/packages/py-meautility/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMeautility(PythonPackage): homepage = "https://github.com/alejoe91/MEAutility" pypi = "meautility/MEAutility-1.5.1.tar.gz" + license("GPL-3.0-or-later") + version("1.5.1", sha256="de12cc9c1772d3321e941af78e6bfb36cdcb5702a7b1272a852cc95f413bbfcb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mechanize/package.py b/var/spack/repos/builtin/packages/py-mechanize/package.py index c8df1eca78bbda..87d28468fa9367 100644 --- a/var/spack/repos/builtin/packages/py-mechanize/package.py +++ b/var/spack/repos/builtin/packages/py-mechanize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMechanize(PythonPackage): homepage = "https://github.com/python-mechanize/mechanize" pypi = "mechanize/mechanize-0.4.3.tar.gz" + license("BSD-3-Clause") + version("0.4.3", sha256="d7d7068be5e1b3069575c98c870aaa96dd26603fe8c8697b470e2f65259fddbf") version("0.2.5", sha256="2e67b20d107b30c00ad814891a095048c35d9d8cb9541801cebe85684cc84766") diff --git a/var/spack/repos/builtin/packages/py-medaka/package.py b/var/spack/repos/builtin/packages/py-medaka/package.py index 6b026ddd9150ac..e866e691d167bb 100644 --- a/var/spack/repos/builtin/packages/py-medaka/package.py +++ b/var/spack/repos/builtin/packages/py-medaka/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMedaka(PythonPackage): homepage = "https://github.com/nanoporetech/medaka" pypi = "medaka/medaka-1.7.2.tar.gz" + license("MPL-2.0") + version("1.7.2", sha256="7629546ed9193ffb6b1f881a6ce74b7d13d94972e032556098577ddb43bee763") # disable Makefile driven build of htslib and link to system htslib instead diff --git a/var/spack/repos/builtin/packages/py-meldmd/package.py b/var/spack/repos/builtin/packages/py-meldmd/package.py index 7fdefa4bd91400..d831c2d05617a8 100644 --- a/var/spack/repos/builtin/packages/py-meldmd/package.py +++ b/var/spack/repos/builtin/packages/py-meldmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMeldmd(CMakePackage, PythonExtension, CudaPackage): homepage = "http://meldmd.org/" url = "https://github.com/maccallumlab/meld/archive/refs/tags/0.4.20.tar.gz" + license("LGPL-3.0-or-later") + version("0.6.1", sha256="aae8e5bfbdacc1e6de61768a3298314c51575cda477a511e98dc11f5730fd918") version("0.4.20", sha256="8c8d2b713f8dc0ecc137d19945b3957e12063c8dda569696e47c8820eeac6c92") diff --git a/var/spack/repos/builtin/packages/py-melissa-core/package.py b/var/spack/repos/builtin/packages/py-melissa-core/package.py index b9f4d00babe41b..78358c4401dc00 100644 --- a/var/spack/repos/builtin/packages/py-melissa-core/package.py +++ b/var/spack/repos/builtin/packages/py-melissa-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMelissaCore(PythonPackage): git = "https://gitlab.inria.fr/melissa/melissa.git" maintainers("robcaulk", "mschouler", "raffino") + license("BSD-3-Clause") + version("develop", branch="develop", preferred=True) version("joss", tag="JOSS_v2", commit="20bbe68c1a7b73aa2ea3ad35681c332c7a5fc516") version("sc23", tag="SC23", commit="8bb5b6817d4abe4eaa5893552d711150e53535f3") diff --git a/var/spack/repos/builtin/packages/py-memory-profiler/package.py b/var/spack/repos/builtin/packages/py-memory-profiler/package.py index 28f96c3b04e094..021b2f3d109299 100644 --- a/var/spack/repos/builtin/packages/py-memory-profiler/package.py +++ b/var/spack/repos/builtin/packages/py-memory-profiler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-memprof/package.py b/var/spack/repos/builtin/packages/py-memprof/package.py index 64422fa2daeedb..d64b91e82463f1 100644 --- a/var/spack/repos/builtin/packages/py-memprof/package.py +++ b/var/spack/repos/builtin/packages/py-memprof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMemprof(PythonPackage): homepage = "https://jmdana.github.io/memprof/" pypi = "memprof/memprof-0.3.6.tar.gz" + license("GPL-3.0-or-later") + version("0.3.6", sha256="a8376ce476bf82a5eb465d1a30b8ffc86cc55b0b6de7aa4cdeccb4c99586d967") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-memray/package.py b/var/spack/repos/builtin/packages/py-memray/package.py index 94c912d1222630..c8f752729323ba 100644 --- a/var/spack/repos/builtin/packages/py-memray/package.py +++ b/var/spack/repos/builtin/packages/py-memray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMemray(PythonPackage): homepage = "https://github.com/bloomberg/memray" pypi = "memray/memray-1.1.0.tar.gz" + license("Apache-2.0") + version("1.1.0", sha256="876e46e0cd42394be48b33f81314bc946f4eb023b04bf1def084c25ccf1d2bb6") depends_on("python@3.7:", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-mercantile/package.py b/var/spack/repos/builtin/packages/py-mercantile/package.py index 68f0692a1f3ff3..e20829e1067a50 100644 --- a/var/spack/repos/builtin/packages/py-mercantile/package.py +++ b/var/spack/repos/builtin/packages/py-mercantile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mergedeep/package.py b/var/spack/repos/builtin/packages/py-mergedeep/package.py index a32e1bb6ccf46b..edcc65345e8f2a 100644 --- a/var/spack/repos/builtin/packages/py-mergedeep/package.py +++ b/var/spack/repos/builtin/packages/py-mergedeep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMergedeep(PythonPackage): homepage = "https://github.com/clarketm/mergedeep" pypi = "mergedeep/mergedeep-1.3.4.tar.gz" + license("MIT") + version("1.3.4", sha256="0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-merlin/package.py b/var/spack/repos/builtin/packages/py-merlin/package.py index 35296b5c394d5e..344b31ae575513 100644 --- a/var/spack/repos/builtin/packages/py-merlin/package.py +++ b/var/spack/repos/builtin/packages/py-merlin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,33 +14,21 @@ class PyMerlin(PythonPackage): git = "https://github.com/LLNL/merlin.git" tags = ["radiuss"] - version("1.10.3", sha256="6edaf17b502db090cef0bc53ae0118c55f77d7a16f43c7a235e0dd1770decadb") - version("1.7.5", sha256="1994c1770ec7fc9da216f9d0ca8214684dcc0daa5fd55337b96e308b2e68daaa") - version("1.7.4", sha256="9a6f8a84a1b52d0bfb0dc7bdbd7e15677e4a1041bd25a49a2d965efe503a6c20") - version("1.4.1", sha256="9d515cfdbcde2443892afd92b78dbc5bf2aed2060ed3a336e683188e015bca7c") - version("master", branch="master") + license("MIT") + version("develop", branch="develop") + version("master", branch="master") + version("1.10.3", sha256="6edaf17b502db090cef0bc53ae0118c55f77d7a16f43c7a235e0dd1770decadb") - depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("py-cached-property", type=("build", "run")) - depends_on("py-celery@5.0.3:+redis+sqlalchemy", when="@1.7.6:", type=("build", "run")) - depends_on("py-celery@5.0.0:+redis+sqlalchemy", when="@1.7.5", type=("build", "run")) - depends_on("py-celery@4.4.5:+redis+sqlalchemy", when="@1.6.2:1.7.4", type=("build", "run")) - depends_on("py-celery@4.3.0:+redis+sqlalchemy", when="@:1.5.2", type=("build", "run")) - depends_on("py-celery@4.3.0:+redis", when="@1.4.1:1.5.1", type=("build", "run")) - # The upperbound on py-celery is not in requirements.txt because there was no 5.x release - # then. See commit 61b4fc708a3d6fd22709b35836065c778bf6304e for why it's needed. - depends_on("py-celery@:4", when="@:1.7.4", type=("build", "run")) + depends_on("py-celery@5.0.3:+redis+sqlalchemy", type=("build", "run")) depends_on("py-coloredlogs", type=("build", "run")) depends_on("py-cryptography", type=("build", "run")) - depends_on("py-importlib-metadata@:4", when="@1.10: ^python@3.7", type=("build", "run")) - depends_on("py-maestrowf@1.1.9:", when="@1.9.0:", type=("build", "run")) - depends_on("py-maestrowf@1.1.7dev0", when="@1.2.0:1.8", type=("build", "run")) - depends_on("py-maestrowf@1.1.6:", when="@:1.1", type=("build", "run")) + depends_on("py-maestrowf@1.1.9:", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-parse", type=("build", "run")) depends_on("py-psutil@5.1.0:", type=("build", "run")) depends_on("py-pyyaml@5.1.2:", type=("build", "run")) depends_on("py-tabulate", type=("build", "run")) - depends_on("py-redis@4.3.4:", when="@1.9.0:", type=("build", "run")) + depends_on("py-redis@4.3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-meshio/package.py b/var/spack/repos/builtin/packages/py-meshio/package.py index 47111e9b4cf6eb..275496f986ed44 100644 --- a/var/spack/repos/builtin/packages/py-meshio/package.py +++ b/var/spack/repos/builtin/packages/py-meshio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMeshio(PythonPackage): homepage = "https://github.com/nschloe/meshio" pypi = "meshio/meshio-5.0.0.tar.gz" + license("MIT") + version("5.0.1", sha256="e283f40b5fb68fc5c232829c33c086789661438960762b22dc2823571a089a8b") version("5.0.0", sha256="f6327c06d6171d30e0991d3dcb048751035f9cfac1f19e2444971275fd971188") version("4.4.6", sha256="be352a0924c9eff99768a6f402b7558dbb280bbf1e7bf43f18cef92db418684f") diff --git a/var/spack/repos/builtin/packages/py-meshpy/package.py b/var/spack/repos/builtin/packages/py-meshpy/package.py index 106d71fb053db7..8e1832b114d14b 100644 --- a/var/spack/repos/builtin/packages/py-meshpy/package.py +++ b/var/spack/repos/builtin/packages/py-meshpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMeshpy(PythonPackage): maintainers("cgcgcg") + license("MIT") + version("2022.1.3", sha256="a7158e31ece25fa6c6cebce9fd1e968157d661dc8769fb30ceba69c351478475") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-meson-python/package.py b/var/spack/repos/builtin/packages/py-meson-python/package.py index 8c63595a4f6303..9ce8cc07a5c0ae 100644 --- a/var/spack/repos/builtin/packages/py-meson-python/package.py +++ b/var/spack/repos/builtin/packages/py-meson-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,13 +14,9 @@ class PyMesonPython(PythonPackage): maintainers("eli-schwartz", "adamjstewart", "rgommers") - # Needed for py-scikit-image, deprecate and remove once 0.13.0 is officially released + license("MIT") + version("0.13.1", sha256="63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618") - version( - "0.13.0.pre0", - sha256="8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95", - deprecated=True, - ) version("0.12.0", sha256="8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d") version("0.11.0", sha256="110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09") version("0.10.0", sha256="08dd122c1074dbd5c55b53993a719cca73dd8216372c91217f7a550260f9e7e1") diff --git a/var/spack/repos/builtin/packages/py-metaphlan/package.py b/var/spack/repos/builtin/packages/py-metaphlan/package.py index b599f61ddaf57f..969fc11cdd2856 100644 --- a/var/spack/repos/builtin/packages/py-metaphlan/package.py +++ b/var/spack/repos/builtin/packages/py-metaphlan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-metasv/package.py b/var/spack/repos/builtin/packages/py-metasv/package.py index b825907b858bc0..d262333106970e 100644 --- a/var/spack/repos/builtin/packages/py-metasv/package.py +++ b/var/spack/repos/builtin/packages/py-metasv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMetasv(PythonPackage): homepage = "https://bioinform.github.io/metasv/" url = "https://github.com/bioinform/metasv/archive/0.5.4.tar.gz" + license("BSD-2-Clause") + version("0.5.4", sha256="c8613b56f44b9303b9e126618b2aee9dbc0b26c03d14e70e1aeed918582eeec1") depends_on("py-pybedtools@0.6.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-metomi-isodatetime/package.py b/var/spack/repos/builtin/packages/py-metomi-isodatetime/package.py index 02d38147e22715..2aca4f43862b3c 100644 --- a/var/spack/repos/builtin/packages/py-metomi-isodatetime/package.py +++ b/var/spack/repos/builtin/packages/py-metomi-isodatetime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,6 +10,7 @@ class PyMetomiIsodatetime(PythonPackage): """Python ISO 8601 date time parser and data model/manipulation utilities.""" homepage = "https://github.com/metomi/isodatetime" + # NOTE: spack checksum does not yet work for epoch versions pypi = "metomi-isodatetime/metomi-isodatetime-1!3.0.0.tar.gz" maintainers("LydDeb") @@ -20,5 +21,4 @@ class PyMetomiIsodatetime(PythonPackage): depends_on("py-setuptools", type="build") def url_for_version(self, version): - url = "https://files.pythonhosted.org/packages/source/m/metomi-isodatetime/metomi-isodatetime-1!{}.tar.gz" - return url.format(version) + return f"https://files.pythonhosted.org/packages/source/m/metomi-isodatetime/metomi-isodatetime-1!{version}.tar.gz" diff --git a/var/spack/repos/builtin/packages/py-metomi-rose/package.py b/var/spack/repos/builtin/packages/py-metomi-rose/package.py index 161edeb582ce8e..d6a6ae2caceb13 100644 --- a/var/spack/repos/builtin/packages/py-metomi-rose/package.py +++ b/var/spack/repos/builtin/packages/py-metomi-rose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMetomiRose(PythonPackage): maintainers("LydDeb") + license("GPL-3.0-only") + version("2.1.0", sha256="1b60135a434fe4325d364a57e8f5e81e90f39b373b9d68733458c1adc2513c05") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-metpy/package.py b/var/spack/repos/builtin/packages/py-metpy/package.py index 0459649eef6752..f6bd28c139c8b6 100644 --- a/var/spack/repos/builtin/packages/py-metpy/package.py +++ b/var/spack/repos/builtin/packages/py-metpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyMetpy(PythonPackage): # https://github.com/Unidata/MetPy/issues/1888 import_modules = ["metpy", "metpy._vendor", "metpy.calc", "metpy.interpolate"] + license("BSD-3-Clause") + version("1.0.1", sha256="16fa9806facc24f31f454b898741ec5639a72ba9d4ff8a19ad0e94629d93cb95") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mffpy/package.py b/var/spack/repos/builtin/packages/py-mffpy/package.py index eb238b1606d39f..d4d1a3ad6c2c73 100644 --- a/var/spack/repos/builtin/packages/py-mffpy/package.py +++ b/var/spack/repos/builtin/packages/py-mffpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMffpy(PythonPackage): homepage = "https://github.com/BEL-Public/mffpy" pypi = "mffpy/mffpy-0.6.3.tar.gz" + license("Apache-2.0") + version("0.6.3", sha256="fceaf59f5fccb26b6e8a0363579d27e53db547493af353737a24983d95dc012d") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py index d9bc8625e89691..cd823484f248f9 100644 --- a/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py +++ b/var/spack/repos/builtin/packages/py-mg-rast-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mido/package.py b/var/spack/repos/builtin/packages/py-mido/package.py index a97829c3789d08..d5d61a1fc4ef53 100644 --- a/var/spack/repos/builtin/packages/py-mido/package.py +++ b/var/spack/repos/builtin/packages/py-mido/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMido(PythonPackage): homepage = "https://mido.readthedocs.io/" url = "https://github.com/mido/mido/archive/1.2.9.tar.gz" + license("MIT") + version("1.2.9", sha256="6d68d7514bb3320f505ba4d7e06006c4725c0b97f281126bc983f3f7eeed697a") version("1.2.8", sha256="4d26706430ea87dfcd950b19979d3edb97b2b113eb7e233c64290713cf7ec7b9") version("1.2.7", sha256="7fb8d2c4b16b1d4f18b2e440654905ad63a8d24121f41b0126f39e3c7db89cf1") diff --git a/var/spack/repos/builtin/packages/py-mikado/package.py b/var/spack/repos/builtin/packages/py-mikado/package.py index fc001bf45467a2..0a0b8e3e397730 100644 --- a/var/spack/repos/builtin/packages/py-mikado/package.py +++ b/var/spack/repos/builtin/packages/py-mikado/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mike/package.py b/var/spack/repos/builtin/packages/py-mike/package.py index 25b7a2d85cff59..27168cdc7278a9 100644 --- a/var/spack/repos/builtin/packages/py-mike/package.py +++ b/var/spack/repos/builtin/packages/py-mike/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMike(PythonPackage): homepage = "https://github.com/jimporter/mike" pypi = "mike/mike-1.1.2.tar.gz" + license("BSD-3-Clause") + version("1.1.2", sha256="56c3f1794c2d0b5fdccfa9b9487beb013ca813de2e3ad0744724e9d34d40b77b") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-minio/package.py b/var/spack/repos/builtin/packages/py-minio/package.py index 37d2f6dae2187e..0b0b6188b8beb7 100644 --- a/var/spack/repos/builtin/packages/py-minio/package.py +++ b/var/spack/repos/builtin/packages/py-minio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMinio(PythonPackage): homepage = "https://github.com/minio/minio-py" pypi = "minio/minio-7.1.2.tar.gz" + license("Apache-2.0") + version("7.1.2", sha256="40d0cdb4dba5d5610d6599ea740cf827102db5bfa71279fc220c3cf7305bedc1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-minkowskiengine/package.py b/var/spack/repos/builtin/packages/py-minkowskiengine/package.py index 03b5609140e921..41fa2afc87f241 100644 --- a/var/spack/repos/builtin/packages/py-minkowskiengine/package.py +++ b/var/spack/repos/builtin/packages/py-minkowskiengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-minrpc/package.py b/var/spack/repos/builtin/packages/py-minrpc/package.py index 2e6db0e8b6aa94..26d4d15faf0bd6 100644 --- a/var/spack/repos/builtin/packages/py-minrpc/package.py +++ b/var/spack/repos/builtin/packages/py-minrpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMinrpc(PythonPackage): homepage = "https://github.com/hibtc/minrpc" pypi = "minrpc/minrpc-0.0.11.tar.gz" + license("GPL-3.0-only") + version("0.0.11", sha256="bed53160f2774fdae7bd3d0fb5d1c77d17395394ec28a9e95a5859f486b54893") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-misopy/package.py b/var/spack/repos/builtin/packages/py-misopy/package.py index dfbd7675600945..61d42fff953495 100644 --- a/var/spack/repos/builtin/packages/py-misopy/package.py +++ b/var/spack/repos/builtin/packages/py-misopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mistletoe/package.py b/var/spack/repos/builtin/packages/py-mistletoe/package.py index 74e0d8928e1374..bebab09274a02d 100644 --- a/var/spack/repos/builtin/packages/py-mistletoe/package.py +++ b/var/spack/repos/builtin/packages/py-mistletoe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMistletoe(PythonPackage): homepage = "https://github.com/miyuchina/mistletoe" pypi = "mistletoe/mistletoe-1.2.1.tar.gz" + license("MIT") + version("1.2.1", sha256="7d0c1ab3747047d169f9fc4b925d1cba3f5c13eaf0b90c365b72e47e59d00a02") depends_on("python@3.5:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py index 5590035d459083..7d0aee16b13223 100644 --- a/var/spack/repos/builtin/packages/py-mistune/package.py +++ b/var/spack/repos/builtin/packages/py-mistune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMistune(PythonPackage): homepage = "https://github.com/lepture/mistune" pypi = "mistune/mistune-2.0.2.tar.gz" + license("BSD-3-Clause") + version("2.0.5", sha256="0246113cb2492db875c6be56974a7c893333bf26cd92891c85f63151cee09d34") version("2.0.4", sha256="9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808") version("2.0.2", sha256="6fc88c3cb49dba8b16687b41725e661cf85784c12e8974a29b9d336dd596c3a1") diff --git a/var/spack/repos/builtin/packages/py-mizani/package.py b/var/spack/repos/builtin/packages/py-mizani/package.py index f05572bb66355a..f2fb1aa5746245 100644 --- a/var/spack/repos/builtin/packages/py-mizani/package.py +++ b/var/spack/repos/builtin/packages/py-mizani/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMizani(PythonPackage): homepage = "https://mizani.readthedocs.io/en/latest" pypi = "mizani/mizani-0.7.4.tar.gz" + license("BSD-3-Clause") + version("0.8.1", sha256="8ad0a0efa52f1bcdf41f675b64a8c0f7cd24e763d53baced6613f20bd6ed4928") version("0.7.4", sha256="b84b923cd3b8b4c0421a750672e5a85ed2aa05e632bd37af8419d5bbf65c397c") version("0.7.3", sha256="f521300bd29ca918fcd629bc8ab50fa04e41bdbe00f6bcf74055d3c6273770a4") diff --git a/var/spack/repos/builtin/packages/py-mkdocs-autorefs/package.py b/var/spack/repos/builtin/packages/py-mkdocs-autorefs/package.py index 8a8ab63cc17b9b..3147d5dce1a58a 100644 --- a/var/spack/repos/builtin/packages/py-mkdocs-autorefs/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocs-autorefs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMkdocsAutorefs(PythonPackage): homepage = "https://mkdocstrings.github.io/autorefs/" pypi = "mkdocs-autorefs/mkdocs-autorefs-0.4.1.tar.gz" + license("ISC") + version("0.4.1", sha256="70748a7bd025f9ecd6d6feeba8ba63f8e891a1af55f48e366d6d6e78493aba84") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mkdocs-jupyter/package.py b/var/spack/repos/builtin/packages/py-mkdocs-jupyter/package.py index 25e12824cae059..8a96d9328e598b 100644 --- a/var/spack/repos/builtin/packages/py-mkdocs-jupyter/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocs-jupyter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMkdocsJupyter(PythonPackage): homepage = "https://github.com/danielfrg/mkdocs-jupyter" pypi = "mkdocs-jupyter/mkdocs-jupyter-0.21.0.tar.gz" + license("Apache-2.0") + version("0.21.0", sha256="c8c00ce44456e3cf50c5dc3fe0cb18fab6467fb5bafc2c0bfe1efff3e0a52470") version("0.20.1", sha256="3b6ef675ee2f22ad94047db7f84e212f5278529df659f7584b5a2b8662db39f6") diff --git a/var/spack/repos/builtin/packages/py-mkdocs-material-extensions/package.py b/var/spack/repos/builtin/packages/py-mkdocs-material-extensions/package.py index 2b369ff31b2bb3..22e5118ecd911d 100644 --- a/var/spack/repos/builtin/packages/py-mkdocs-material-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocs-material-extensions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMkdocsMaterialExtensions(PythonPackage): homepage = "https://github.com/facelessuser/mkdocs-material-extensions" pypi = "mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.tar.gz" + license("MIT") + version("1.0.3", sha256="bfd24dfdef7b41c312ede42648f9eb83476ea168ec163b613f9abd12bbfddba2") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mkdocs-material/package.py b/var/spack/repos/builtin/packages/py-mkdocs-material/package.py index c8542ba5fa411f..9d27a0d19da353 100644 --- a/var/spack/repos/builtin/packages/py-mkdocs-material/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocs-material/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMkdocsMaterial(PythonPackage): homepage = "https://squidfunk.github.io/mkdocs-material/" pypi = "mkdocs-material/mkdocs-material-8.4.0.tar.gz" + license("MIT") + version("8.4.0", sha256="6c0a6e6cda8b43956e0c562374588160af8110584a1444f422b1cfd91930f9c7") version("8.3.6", sha256="be8f95c0dfb927339b55b2cc066423dc0b381be9828ff74a5b02df979a859b66") diff --git a/var/spack/repos/builtin/packages/py-mkdocs/package.py b/var/spack/repos/builtin/packages/py-mkdocs/package.py index db3dd5aaddfe40..d2a6d35b6875d6 100644 --- a/var/spack/repos/builtin/packages/py-mkdocs/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMkdocs(PythonPackage): homepage = "https://www.mkdocs.org/" pypi = "mkdocs/mkdocs-1.3.1.tar.gz" + license("BSD-2-Clause") + version("1.3.1", sha256="a41a2ff25ce3bbacc953f9844ba07d106233cd76c88bac1f59cb1564ac0d87ed") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mkdocstrings-python/package.py b/var/spack/repos/builtin/packages/py-mkdocstrings-python/package.py index 5d271d78bdcae6..5b8090fdd97739 100644 --- a/var/spack/repos/builtin/packages/py-mkdocstrings-python/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocstrings-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMkdocstringsPython(PythonPackage): homepage = "https://mkdocstrings.github.io/python/" pypi = "mkdocstrings-python/mkdocstrings-python-0.7.1.tar.gz" + license("ISC") + version("0.7.1", sha256="c334b382dca202dfa37071c182418a6df5818356a95d54362a2b24822ca3af71") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mkdocstrings/package.py b/var/spack/repos/builtin/packages/py-mkdocstrings/package.py index 04d282f164d393..c6fdf28bad0e87 100644 --- a/var/spack/repos/builtin/packages/py-mkdocstrings/package.py +++ b/var/spack/repos/builtin/packages/py-mkdocstrings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMkdocstrings(PythonPackage): homepage = "https://mkdocstrings.github.io/" pypi = "mkdocstrings/mkdocstrings-0.19.0.tar.gz" + license("ISC") + version("0.19.0", sha256="efa34a67bad11229d532d89f6836a8a215937548623b64f3698a1df62e01cc3e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ml-collections/package.py b/var/spack/repos/builtin/packages/py-ml-collections/package.py index 525149b3afb6b5..3ce956472a70b4 100644 --- a/var/spack/repos/builtin/packages/py-ml-collections/package.py +++ b/var/spack/repos/builtin/packages/py-ml-collections/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMlCollections(PythonPackage): pypi = "ml_collections/ml_collections-0.1.0.tar.gz" git = "https://github.com/google/ml_collections" + license("Apache-2.0") + version("0.1.1", sha256="3fefcc72ec433aa1e5d32307a3e474bbb67f405be814ea52a2166bfc9dbe68cc") version("0.1.0", commit="63a7c22d1bf3521c3bb3f9da6ebf07972c25fec4") diff --git a/var/spack/repos/builtin/packages/py-ml-dtypes/package.py b/var/spack/repos/builtin/packages/py-ml-dtypes/package.py index 192069e21973d1..5e3f85ab7b63a0 100644 --- a/var/spack/repos/builtin/packages/py-ml-dtypes/package.py +++ b/var/spack/repos/builtin/packages/py-ml-dtypes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMlDtypes(PythonPackage): git = "https://github.com/jax-ml/ml_dtypes.git" submodules = True + license("Apache-2.0") + version("0.3.1", tag="v0.3.1", commit="bbeedd470ecac727c42e97648c0f27bfc312af30") version("0.2.0", tag="v0.2.0", commit="5b9fc9ad978757654843f4a8d899715dbea30e88") diff --git a/var/spack/repos/builtin/packages/py-mlflow/package.py b/var/spack/repos/builtin/packages/py-mlflow/package.py index a162194d92b7b2..b108dd9cf6b9b4 100644 --- a/var/spack/repos/builtin/packages/py-mlflow/package.py +++ b/var/spack/repos/builtin/packages/py-mlflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMlflow(PythonPackage): homepage = "https://pypi.org/project/mlflow/" pypi = "mlflow/mlflow-2.0.1.tar.gz" + license("Apache-2.0") + version("2.0.1", sha256="7ce6caf3c6acb022d6f5ce8a0995a92be1db524ae16aade1f83da661cdf993de") version("1.17.0", sha256="4898c58899e3101e09e2b37cf5bee7db04c5d73389a56942d3ef5a5e4396799e") diff --git a/var/spack/repos/builtin/packages/py-mlperf-logging/package.py b/var/spack/repos/builtin/packages/py-mlperf-logging/package.py index cf06ae2616d766..36e2238649a360 100644 --- a/var/spack/repos/builtin/packages/py-mlperf-logging/package.py +++ b/var/spack/repos/builtin/packages/py-mlperf-logging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMlperfLogging(PythonPackage): homepage = "https://github.com/mlperf/logging" url = "https://github.com/mlperf/logging/archive/0.7.1.tar.gz" + license("Apache-2.0") + version("0.7.1", sha256="32fb6885d8bbf20e1225dc7ec57dc964649df696278cdd2d575aeef8e891f7bb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mlxtend/package.py b/var/spack/repos/builtin/packages/py-mlxtend/package.py index 6b2aaf640f7451..fee1f8436993a7 100644 --- a/var/spack/repos/builtin/packages/py-mlxtend/package.py +++ b/var/spack/repos/builtin/packages/py-mlxtend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMlxtend(PythonPackage): homepage = "https://rasbt.github.io/mlxtend/" url = "https://github.com/rasbt/mlxtend/archive/v0.16.0.tar.gz" + license("BSD-3-Clause") + version("0.16.0", sha256="38789b36173630bf18e2244b035e7e6b44a87a0ae65cf04935cd2eecbf6595a1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mmcv/package.py b/var/spack/repos/builtin/packages/py-mmcv/package.py index de828f8a2a1e5d..015c8ded2a66fa 100644 --- a/var/spack/repos/builtin/packages/py-mmcv/package.py +++ b/var/spack/repos/builtin/packages/py-mmcv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMmcv(PythonPackage): homepage = "https://mmcv.readthedocs.io/en/latest/" url = "https://github.com/open-mmlab/mmcv/archive/v0.5.1.tar.gz" + license("Apache-2.0") + version("0.5.1", sha256="7c5ad30d9b61e44019e81ef46c406aa85dd08b5d0ba12ddd5cdc9c445835a55e") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mmtf-python/package.py b/var/spack/repos/builtin/packages/py-mmtf-python/package.py index 4fd4e3825a087c..7252a5a5f54de5 100644 --- a/var/spack/repos/builtin/packages/py-mmtf-python/package.py +++ b/var/spack/repos/builtin/packages/py-mmtf-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMmtfPython(PythonPackage): homepage = "https://github.com/rcsb/mmtf-python" pypi = "mmtf-python/mmtf-python-1.1.2.tar.gz" + license("Apache-2.0") + version("1.1.2", sha256="a5caa7fcd2c1eaa16638b5b1da2d3276cbd3ed3513f0c2322957912003b6a8df") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mne/package.py b/var/spack/repos/builtin/packages/py-mne/package.py index 0311f7bd848f3a..e5fd29ebd51fa5 100644 --- a/var/spack/repos/builtin/packages/py-mne/package.py +++ b/var/spack/repos/builtin/packages/py-mne/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMne(PythonPackage): pypi = "mne/mne-0.23.4.tar.gz" git = "https://github.com/mne-tools/mne-python.git" + license("BSD-3-Clause") + version("1.4.2", sha256="dd2bf35a90d951bef15ff3a651045b0373eff26018a821667109c727d55c7d63") version("1.4.0", sha256="7834f5b79c2c9885ca601bbddd8db3c2b2f37c34443fc0caf0447751f6c37a2a") version("1.3.1", sha256="0d0626d3187dd0ee6f8740d054660a1b5fce4c879f814b745b13c5a587baf32b") diff --git a/var/spack/repos/builtin/packages/py-mo-pack/package.py b/var/spack/repos/builtin/packages/py-mo-pack/package.py index 71e6a64f9666f7..3b8a40fcd4a965 100644 --- a/var/spack/repos/builtin/packages/py-mo-pack/package.py +++ b/var/spack/repos/builtin/packages/py-mo-pack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMoPack(PythonPackage): homepage = "https://github.com/SciTools/mo_pack" url = "https://github.com/SciTools/mo_pack/archive/v0.2.0.tar.gz" + license("LGPL-3.0-only") + version("0.2.0", sha256="4aa70e1f846b666670843bc2514435dedf7393203e88abaf74d48f8f2717a726") depends_on("libmo-unpack") diff --git a/var/spack/repos/builtin/packages/py-moarchiving/package.py b/var/spack/repos/builtin/packages/py-moarchiving/package.py index a43a9c9efad260..918ef804c749bd 100644 --- a/var/spack/repos/builtin/packages/py-moarchiving/package.py +++ b/var/spack/repos/builtin/packages/py-moarchiving/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index cb32ffe6f87d60..3c198d42178040 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMock(PythonPackage): homepage = "https://github.com/testing-cabal/mock" pypi = "mock/mock-4.0.3.tar.gz" + license("BSD-2-Clause") + version("4.0.3", sha256="7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc") version("3.0.5", sha256="83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3") version("3.0.3", sha256="5eda46efb363128828d6fd2bf8d16f6ebb66f5b543b9f7f8f4eb224c5cb503fe") diff --git a/var/spack/repos/builtin/packages/py-model-index/package.py b/var/spack/repos/builtin/packages/py-model-index/package.py index 111d44af30ea41..255953d390f10f 100644 --- a/var/spack/repos/builtin/packages/py-model-index/package.py +++ b/var/spack/repos/builtin/packages/py-model-index/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyModelIndex(PythonPackage): homepage = "https://github.com/paperswithcode/model-index" git = "https://github.com/paperswithcode/model-index.git" + license("MIT") + version("0.1.11", commit="a39af5f8aaa2a90b8fc7180744a855282360067a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-modepy/package.py b/var/spack/repos/builtin/packages/py-modepy/package.py index 067364c1e29b7b..2fb3952f3ce9de 100644 --- a/var/spack/repos/builtin/packages/py-modepy/package.py +++ b/var/spack/repos/builtin/packages/py-modepy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyModepy(PythonPackage): maintainers("cgcgcg") + license("MIT") + version("2021.1", sha256="4cddd2d4720128356e0019e8d972d979552eafad059f4acef01e106b22d8d297") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-modin/package.py b/var/spack/repos/builtin/packages/py-modin/package.py index 3b757ff74d6726..db594d0051f58f 100644 --- a/var/spack/repos/builtin/packages/py-modin/package.py +++ b/var/spack/repos/builtin/packages/py-modin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyModin(PythonPackage): homepage = "https://github.com/modin-project/modin" pypi = "modin/modin-0.16.2.tar.gz" + license("Apache-2.0") + version("0.16.2", sha256="8e3f4cb478ae08dcc71b5a345781d57f29d6b95bc6ce1dc5c14d597a382f1354") variant( diff --git a/var/spack/repos/builtin/packages/py-modred/package.py b/var/spack/repos/builtin/packages/py-modred/package.py index 565da9c41e86b8..d3d771f260c13c 100644 --- a/var/spack/repos/builtin/packages/py-modred/package.py +++ b/var/spack/repos/builtin/packages/py-modred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyModred(PythonPackage): homepage = "https://github.com/belson17/modred" git = "https://github.com/belson17/modred.git" + license("BSD-2-Clause") + version("2.0.4", tag="v2.0.4", commit="b793efd353434799ec8c4c350757037f87dcf99a") version("2.0.3", tag="v2.0.3", commit="70f61fddf4192a33952f5c98103d2b90955c4e79") version("2.0.2", tag="v2.0.2", commit="674d6962f87c93697e4cbb4efd0785cd3398c4b1") diff --git a/var/spack/repos/builtin/packages/py-moltemplate/package.py b/var/spack/repos/builtin/packages/py-moltemplate/package.py index 62009c3d5d50d5..0cef1de3ca1fc7 100644 --- a/var/spack/repos/builtin/packages/py-moltemplate/package.py +++ b/var/spack/repos/builtin/packages/py-moltemplate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMoltemplate(PythonPackage): homepage = "https://moltemplate.org" url = "https://github.com/jewettaij/moltemplate/archive/v2.5.8.tar.gz" + license("MIT") + version("2.5.8", sha256="f1e2d52249e996d85f5b1b7b50f50037da9e4b9c252cdfc622b21e79aa21162f") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-monkeytype/package.py b/var/spack/repos/builtin/packages/py-monkeytype/package.py index fc4e8d9733b525..dfcf0b0ca1591c 100644 --- a/var/spack/repos/builtin/packages/py-monkeytype/package.py +++ b/var/spack/repos/builtin/packages/py-monkeytype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMonkeytype(PythonPackage): homepage = "https://github.com/instagram/MonkeyType" pypi = "MonkeyType/MonkeyType-22.2.0.tar.gz" + license("BSD-3-Clause") + version("22.2.0", sha256="6b0c00b49dcc5095a2c08d28246cf005e05673fc51f64d203f9a6bca2036dfab") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-monotonic/package.py b/var/spack/repos/builtin/packages/py-monotonic/package.py index 86c7adce1e7159..a6311ac07e606a 100644 --- a/var/spack/repos/builtin/packages/py-monotonic/package.py +++ b/var/spack/repos/builtin/packages/py-monotonic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyMonotonic(PythonPackage): pypi = "monotonic/monotonic-1.6.tar.gz" + license("Apache-2.0") + version("1.6", sha256="3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7") version("1.2", sha256="c0e1ceca563ca6bb30b0fb047ee1002503ae6ad3585fc9c6af37a8f77ec274ba") diff --git a/var/spack/repos/builtin/packages/py-monty/package.py b/var/spack/repos/builtin/packages/py-monty/package.py index b1b89d1eb6d6cd..2dc8df059da2df 100644 --- a/var/spack/repos/builtin/packages/py-monty/package.py +++ b/var/spack/repos/builtin/packages/py-monty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py index 9172927a557e04..3a1443e7bae934 100644 --- a/var/spack/repos/builtin/packages/py-more-itertools/package.py +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMoreItertools(PythonPackage): homepage = "https://github.com/erikrose/more-itertools" pypi = "more-itertools/more-itertools-7.2.0.tar.gz" + license("MIT") + version("9.1.0", sha256="cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d") version("8.14.0", sha256="c09443cd3d5438b8dafccd867a6bc1cb0894389e90cb53d227456b0b0bccb750") version("8.12.0", sha256="7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064") diff --git a/var/spack/repos/builtin/packages/py-morph-tool/package.py b/var/spack/repos/builtin/packages/py-morph-tool/package.py index 7927b468c07edf..e056a2af216f43 100644 --- a/var/spack/repos/builtin/packages/py-morph-tool/package.py +++ b/var/spack/repos/builtin/packages/py-morph-tool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMorphTool(PythonPackage): git = "https://github.com/BlueBrain/morph-tool.git" pypi = "morph-tool/morph-tool-2.9.1.tar.gz" + license("LGPL-3.0-or-later") + version("master", branch="master") version("2.9.1", sha256="305e9456c8047726588b23dfa070eb95ccbe5573e9fea3e0a83dc93eacdf61dc") version("2.9.0", sha256="c60d4010e17ddcc3f53c864c374fffee05713c8f8fd2ba4eed7706041ce1fa47") diff --git a/var/spack/repos/builtin/packages/py-morphio/package.py b/var/spack/repos/builtin/packages/py-morphio/package.py index a5a9fee7deaf3c..80705367d7fdc5 100644 --- a/var/spack/repos/builtin/packages/py-morphio/package.py +++ b/var/spack/repos/builtin/packages/py-morphio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMorphio(PythonPackage): git = "https://github.com/BlueBrain/MorphIO.git" pypi = "morphio/MorphIO-3.3.2.tar.gz" + license("LGPL-3.0-or-later") + version("master", branch="master", submodules=True) version("3.3.6", sha256="0f2e55470d92a3d89f2141ae905ee104fd16257b93dafb90682d90171de2f4e6") diff --git a/var/spack/repos/builtin/packages/py-motmetrics/package.py b/var/spack/repos/builtin/packages/py-motmetrics/package.py index 6a70f89284a1e0..894ea313539c57 100644 --- a/var/spack/repos/builtin/packages/py-motmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-motmetrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMotmetrics(PythonPackage): homepage = "https://github.com/cheind/py-motmetrics" pypi = "motmetrics/motmetrics-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="7328d8468c948400b38fcc212f3e448bc1f2fdfc727e170d85a029e49f1cdbc6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-motor/package.py b/var/spack/repos/builtin/packages/py-motor/package.py index 74df05cb8b1f8d..abbe1937de46bb 100644 --- a/var/spack/repos/builtin/packages/py-motor/package.py +++ b/var/spack/repos/builtin/packages/py-motor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMotor(PythonPackage): homepage = "https://github.com/mongodb/motor/" pypi = "motor/motor-2.5.1.tar.gz" + license("Apache-2.0") + version("2.5.1", sha256="663473f4498f955d35db7b6f25651cb165514c247136f368b84419cb7635f6b8") depends_on("python@3.5.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mouseinfo/package.py b/var/spack/repos/builtin/packages/py-mouseinfo/package.py index 2268e6d119c7b9..48e1a88463431a 100644 --- a/var/spack/repos/builtin/packages/py-mouseinfo/package.py +++ b/var/spack/repos/builtin/packages/py-mouseinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-moviepy/package.py b/var/spack/repos/builtin/packages/py-moviepy/package.py index ce5c8efafe8e62..9906d22abd8320 100644 --- a/var/spack/repos/builtin/packages/py-moviepy/package.py +++ b/var/spack/repos/builtin/packages/py-moviepy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMoviepy(PythonPackage): homepage = "https://zulko.github.io/moviepy/" pypi = "moviepy/moviepy-1.0.3.tar.gz" + license("MIT") + version("1.0.3", sha256="2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5") version("1.0.1", sha256="9d5b0a0e884c0eb92c431baa110e560059720aab15d2ef3e4cba3892c34cf1ed") diff --git a/var/spack/repos/builtin/packages/py-mpi4jax/package.py b/var/spack/repos/builtin/packages/py-mpi4jax/package.py index e221830e40d776..0e4544c3f4a73f 100644 --- a/var/spack/repos/builtin/packages/py-mpi4jax/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4jax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMpi4jax(PythonPackage, CudaPackage): maintainers("bhaveshshrimali") + license("MIT") + version( "0.3.11.post3", sha256="ad4c5840c81ead40b68f4885d705c06eeca22cd4e998790de589c6566db75a75" ) diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index 402429b6216ed0..76e4891780a8e5 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,10 @@ class PyMpi4py(PythonPackage): pypi = "mpi4py/mpi4py-3.0.3.tar.gz" git = "https://github.com/mpi4py/mpi4py.git" + license("BSD-2-Clause") + version("master", branch="master") + version("3.1.5", sha256="a706e76db9255135c2fb5d1ef54cb4f7b0e4ad9e33cbada7de27626205f2a153") version("3.1.4", sha256="17858f2ebc623220d0120d1fa8d428d033dde749c4bc35b33d81a66ad7f93480") version("3.1.3", sha256="f1e9fae1079f43eafdd9f817cdb3fd30d709edc093b5d5dada57a461b2db3008") version("3.1.2", sha256="40dd546bece8f63e1131c3ceaa7c18f8e8e93191a762cd446a8cfcf7f9cce770") @@ -29,14 +32,11 @@ class PyMpi4py(PythonPackage): version("1.3.1", sha256="e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507") depends_on("py-setuptools@40.9:", type="build") + depends_on("py-cython@0.27:2", type="build") depends_on("mpi") - depends_on("py-cython@0.27.0:", type="build") - - # https://github.com/mpi4py/mpi4py/pull/311 - conflicts("^py-cython@3:") def setup_build_environment(self, env): - env.set("MPICC", f"{self.spec['mpi'].mpicc} -shared") + env.set("MPICC", self.spec["mpi"].mpicc) @run_before("install") def cythonize(self): diff --git a/var/spack/repos/builtin/packages/py-mpld3/package.py b/var/spack/repos/builtin/packages/py-mpld3/package.py index 2cadcfc5b3d210..0b53a6af5ad849 100644 --- a/var/spack/repos/builtin/packages/py-mpld3/package.py +++ b/var/spack/repos/builtin/packages/py-mpld3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMpld3(PythonPackage): homepage = "https://mpld3.github.io/" pypi = "mpld3/mpld3-0.3.tar.gz" + license("BSD-3-Clause") + version("0.5.8", sha256="1a167dbef836dd7c66d8aa71c06a32d50bffa18725f304d93cb74fdb3545043b") version("0.5.5", sha256="b080f3535238a71024c0158280ab4f6091717c45347c41c907012f8dd6da1bd5") version("0.3", sha256="4d455884a211bf99b37ecc760759435c7bb6a5955de47d8daf4967e301878ab7") diff --git a/var/spack/repos/builtin/packages/py-mpldock/package.py b/var/spack/repos/builtin/packages/py-mpldock/package.py new file mode 100644 index 00000000000000..24f9ea94ab3bb4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-mpldock/package.py @@ -0,0 +1,24 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyMpldock(PythonPackage): + """Dock matplotlib figures and other widgets.""" + + homepage = "https://github.com/peper0/mpldock" + pypi = "mpldock/mpldock-0.1.tar.gz" + + maintainers("LydDeb") + + license("MIT") + + version("0.1", sha256="8fee2e9cb25e122c9e11c15ea3ad22c9d03e78a08a0bc2b7f453230d58a31a55") + + depends_on("py-setuptools", type="build") + depends_on("py-pyqt5", type=("build", "run")) + depends_on("py-matplotlib", type=("build", "run")) + depends_on("py-appdirs", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mplhep-data/package.py b/var/spack/repos/builtin/packages/py-mplhep-data/package.py index 70613efd6f9d11..e02e6dbcf5f79a 100644 --- a/var/spack/repos/builtin/packages/py-mplhep-data/package.py +++ b/var/spack/repos/builtin/packages/py-mplhep-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMplhepData(PythonPackage): homepage = "https://github.com/Scikit-HEP/mplhep_data" pypi = "mplhep_data/mplhep_data-0.0.3.tar.gz" + license("MIT") + version("0.0.3", sha256="b54d257f3f53c93a442cda7a6681ce267277e09173c0b41fd78820f78321772f") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mplhep/package.py b/var/spack/repos/builtin/packages/py-mplhep/package.py index d5f47ee24a984b..81327777994c96 100644 --- a/var/spack/repos/builtin/packages/py-mplhep/package.py +++ b/var/spack/repos/builtin/packages/py-mplhep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMplhep(PythonPackage): homepage = "https://github.com/scikit-hep/mplhep" pypi = "mplhep/mplhep-0.3.15.tar.gz" + license("MIT") + version("0.3.26", sha256="d707a95ce59b0bac2fe4fe1c57fede14e15da639f3a7c732e7513a753fd9e9ac") version("0.3.15", sha256="595f796ea65930094e86a805214e0d44537ead267a7487ae16eda02d1670653e") diff --git a/var/spack/repos/builtin/packages/py-mpmath/package.py b/var/spack/repos/builtin/packages/py-mpmath/package.py index 25d7bdf6f243dd..f38a363292181d 100644 --- a/var/spack/repos/builtin/packages/py-mpmath/package.py +++ b/var/spack/repos/builtin/packages/py-mpmath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMpmath(PythonPackage): homepage = "https://mpmath.org" pypi = "mpmath/mpmath-1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.2.1", sha256="79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a") version("1.1.0", sha256="fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6") version("1.0.0", sha256="04d14803b6875fe6d69e6dccea87d5ae5599802e4b1df7997bddd2024001050c") diff --git a/var/spack/repos/builtin/packages/py-mrcfile/package.py b/var/spack/repos/builtin/packages/py-mrcfile/package.py index 92791311975380..a07b505c57e310 100644 --- a/var/spack/repos/builtin/packages/py-mrcfile/package.py +++ b/var/spack/repos/builtin/packages/py-mrcfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMrcfile(PythonPackage): maintainers("dorton21") + license("BSD-3-Clause") + version("1.3.0", sha256="034f1868abf87f4e494b8b039030b50045cabccf352b8b3e88a6bd3a6d665715") depends_on("python@3.4.0:") diff --git a/var/spack/repos/builtin/packages/py-msal-extensions/package.py b/var/spack/repos/builtin/packages/py-msal-extensions/package.py index fac71be3d83b48..380cf8b67c08d3 100644 --- a/var/spack/repos/builtin/packages/py-msal-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-msal-extensions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyMsalExtensions(PythonPackage): homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python" pypi = "msal-extensions/msal-extensions-0.2.2.tar.gz" + license("MIT") + version("1.0.0", sha256="c676aba56b0cce3783de1b5c5ecfe828db998167875126ca4b47dc6436451354") version("0.2.2", sha256="31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9") version("0.1.3", sha256="59e171a9a4baacdbf001c66915efeaef372fb424421f1a4397115a3ddd6205dc") diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py index 6658c812290fe1..b742cfd284d65d 100644 --- a/var/spack/repos/builtin/packages/py-msal/package.py +++ b/var/spack/repos/builtin/packages/py-msal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyMsal(PythonPackage): homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python" pypi = "msal/msal-1.3.0.tar.gz" + license("MIT") + # If you get diamond dependency problems on py-pyjwt, # consider using v1.20.0, which has looser constraints version("1.20.0", sha256="78344cd4c91d6134a593b5e3e45541e666e37b747ff8a6316c3668dd1e6ab6b2") diff --git a/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py b/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py index d0057263d4dcd0..664e0a764f56e3 100644 --- a/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-msgpack-numpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyMsgpackNumpy(PythonPackage): homepage = "https://github.com/lebedov/msgpack-numpy" pypi = "msgpack-numpy/msgpack-numpy-0.4.7.1.tar.gz" + license("BSD-3-Clause") + version("0.4.7.1", sha256="7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1") version("0.4.7", sha256="8e975dd7dd9eb13cbf5e8cd90af1f12af98706bbeb7acfcbd8d558fd005a85d7") version("0.4.6", sha256="ef3c5fe3d6cbab5c9db97de7062681c18f82d32a37177aaaf58b483d0336f135") diff --git a/var/spack/repos/builtin/packages/py-msgpack/package.py b/var/spack/repos/builtin/packages/py-msgpack/package.py index 8089d116de1f4a..44e6e84ec0db68 100644 --- a/var/spack/repos/builtin/packages/py-msgpack/package.py +++ b/var/spack/repos/builtin/packages/py-msgpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMsgpack(PythonPackage): pypi = "msgpack/msgpack-1.0.0.tar.gz" git = "https://github.com/msgpack/msgpack-python" + license("Apache-2.0") + version("1.0.5", sha256="c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c") version("1.0.4", sha256="f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f") version("1.0.3", sha256="51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e") diff --git a/var/spack/repos/builtin/packages/py-msrest/package.py b/var/spack/repos/builtin/packages/py-msrest/package.py index 070696d5ac6aa6..7466a510bed4cf 100644 --- a/var/spack/repos/builtin/packages/py-msrest/package.py +++ b/var/spack/repos/builtin/packages/py-msrest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-msrestazure/package.py b/var/spack/repos/builtin/packages/py-msrestazure/package.py index 98c414c9b1a071..bc84f1851887e6 100644 --- a/var/spack/repos/builtin/packages/py-msrestazure/package.py +++ b/var/spack/repos/builtin/packages/py-msrestazure/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-multi-imbalance/package.py b/var/spack/repos/builtin/packages/py-multi-imbalance/package.py new file mode 100644 index 00000000000000..02cdad82ebf056 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-multi-imbalance/package.py @@ -0,0 +1,33 @@ +# 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 PyMultiImbalance(PythonPackage): + """Multi-class imbalance is a common problem occurring in real-world + supervised classifications tasks. While there has already been some + research on the specialized methods aiming to tackle that challenging + problem, most of them still lack coherent Python implementation that is + simple, intuitive and easy to use. multi-imbalance is a python package + tackling the problem of multi-class imbalanced datasets in machine + learnin""" + + homepage = "https://github.com/damianhorna/multi-imbalance" + pypi = "multi-imbalance/multi-imbalance-0.0.14.tar.gz" + + version("0.0.14", sha256="5b9e1ba5e012e0343c588fa5a4b9d69ca99464d2126f1392bac3fca24370498f") + + depends_on("py-setuptools", type="build") + depends_on("py-numpy@1.17.0:", type=("build", "run")) + depends_on("py-scikit-learn@0.22:", type=("build", "run")) + depends_on("py-pandas@0.25.1:", type=("build", "run")) + depends_on("py-pytest@5.1.2:", type=("build", "run")) + depends_on("py-imbalanced-learn@0.6.1:", type=("build", "run")) + depends_on("py-coverage@5.1:", type=("build", "run")) + depends_on("py-pytest-cov@2.8.1:", type=("build", "run")) + depends_on("py-ipython@7.13.0:", type=("build", "run")) + depends_on("py-seaborn@0.10.1:", type=("build", "run")) + depends_on("py-matplotlib@3.2.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-multi-key-dict/package.py b/var/spack/repos/builtin/packages/py-multi-key-dict/package.py index 779474fd69edfe..55a88f5c8e65bb 100644 --- a/var/spack/repos/builtin/packages/py-multi-key-dict/package.py +++ b/var/spack/repos/builtin/packages/py-multi-key-dict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-multidict/package.py b/var/spack/repos/builtin/packages/py-multidict/package.py index a5b675cfb9e225..f37228dc1965e2 100644 --- a/var/spack/repos/builtin/packages/py-multidict/package.py +++ b/var/spack/repos/builtin/packages/py-multidict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMultidict(PythonPackage): homepage = "https://github.com/aio-libs/multidict" pypi = "multidict/multidict-6.0.2.tar.gz" + license("Apache-2.0") + version("6.0.4", sha256="3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49") version("6.0.2", sha256="5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013") version("5.2.0", sha256="0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce") diff --git a/var/spack/repos/builtin/packages/py-multiecho/package.py b/var/spack/repos/builtin/packages/py-multiecho/package.py index 73c0c3bdecd816..f1b5e7e8e16a6e 100644 --- a/var/spack/repos/builtin/packages/py-multiecho/package.py +++ b/var/spack/repos/builtin/packages/py-multiecho/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMultiecho(PythonPackage): homepage = "https://github.com/Donders-Institute/multiecho" pypi = "multiecho/multiecho-0.28.tar.gz" + license("MIT") + version("0.28", sha256="d0459bd03398547116d8e989b2d2b7922af0ae7ae77e233794dd7253a2abced3") depends_on("python@3.6:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-multipledispatch/package.py b/var/spack/repos/builtin/packages/py-multipledispatch/package.py index acec79577ce73c..2f1e5903d14810 100644 --- a/var/spack/repos/builtin/packages/py-multipledispatch/package.py +++ b/var/spack/repos/builtin/packages/py-multipledispatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMultipledispatch(PythonPackage): homepage = "https://multiple-dispatch.readthedocs.io/" url = "https://github.com/mrocklin/multipledispatch/archive/0.6.0.tar.gz" + license("BSD-3-Clause") + version("0.6.0", sha256="649f6e61b8a6ce581c75f32365c926b55495c01b8177135408b83aa03886cde0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-multiprocess/package.py b/var/spack/repos/builtin/packages/py-multiprocess/package.py index 72f2e82762472f..cbde426ee81a3d 100644 --- a/var/spack/repos/builtin/packages/py-multiprocess/package.py +++ b/var/spack/repos/builtin/packages/py-multiprocess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMultiprocess(PythonPackage): homepage = "https://github.com/uqfoundation/multiprocess" pypi = "multiprocess/multiprocess-0.70.5.zip" + license("BSD-3-Clause") + version("0.70.12.2", sha256="206bb9b97b73f87fec1ed15a19f8762950256aa84225450abc7150d02855a083") version("0.70.9", sha256="9fd5bd990132da77e73dec6e9613408602a4612e1d73caf2e2b813d2b61508e5") version("0.70.7", sha256="3394f1fbd0d87112690a877e49eb7917d851ee8d822294d522dd4deae12febdb") diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index c4f79799862fdd..161d46cb356783 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMultiqc(PythonPackage): homepage = "https://multiqc.info" pypi = "multiqc/multiqc-1.0.tar.gz" + license("GPL-3.0-only") + version("1.15", sha256="ce5359a12226cf4ce372c6fdad142cfe2ae7501ffa97ac7aab544ced4db5ea3c") version("1.14", sha256="dcbba405f0c9521ed2bbd7e8f7a9200643047311c9619878b81d167300149362") version("1.13", sha256="0564fb0f894e6ca0822a0f860941b3ed2c33dce407395ac0c2103775d45cbfa0") diff --git a/var/spack/repos/builtin/packages/py-munch/package.py b/var/spack/repos/builtin/packages/py-munch/package.py index 747104b56d7e62..d4afaa905380ee 100644 --- a/var/spack/repos/builtin/packages/py-munch/package.py +++ b/var/spack/repos/builtin/packages/py-munch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,10 +13,12 @@ class PyMunch(PythonPackage): homepage = "https://github.com/Infinidat/munch" pypi = "munch/munch-2.5.0.tar.gz" + license("MIT") + version("2.5.0", sha256="2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2") version("2.2.0", sha256="62fb4fb318e965a464b088e6af52a63e0905a50500b770596a939d3855e7aa15") depends_on("py-pbr@3:", when="@2.5:", type="build") - depends_on("py-setuptools@17.1:", when="@2.5:", type="build") + depends_on("py-setuptools@17.1:", when="@2.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-munkres/package.py b/var/spack/repos/builtin/packages/py-munkres/package.py index 942fc34e7ca76b..1ec1fa362b8bf9 100644 --- a/var/spack/repos/builtin/packages/py-munkres/package.py +++ b/var/spack/repos/builtin/packages/py-munkres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMunkres(PythonPackage): homepage = "https://github.com/bmc/munkres" pypi = "munkres/munkres-1.1.2.tar.gz" + license("Apache-2.0") + version("1.1.4", sha256="fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03") version("1.1.2", sha256="81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea") diff --git a/var/spack/repos/builtin/packages/py-murmurhash/package.py b/var/spack/repos/builtin/packages/py-murmurhash/package.py index 130196a170ccd7..ecd8d65d1ea7af 100644 --- a/var/spack/repos/builtin/packages/py-murmurhash/package.py +++ b/var/spack/repos/builtin/packages/py-murmurhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMurmurhash(PythonPackage): homepage = "https://github.com/explosion/murmurhash" pypi = "murmurhash/murmurhash-1.0.2.tar.gz" + license("MIT") + version("1.0.2", sha256="c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-mutagen/package.py b/var/spack/repos/builtin/packages/py-mutagen/package.py index c1848a39892109..b3265eef973352 100644 --- a/var/spack/repos/builtin/packages/py-mutagen/package.py +++ b/var/spack/repos/builtin/packages/py-mutagen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyMutagen(PythonPackage): homepage = "https://github.com/quodlibet/mutagen" pypi = "mutagen/mutagen-1.45.1.tar.gz" + license("GPL-2.0-or-later") + version("1.45.1", sha256="6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1") depends_on("python@3.5:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mx/package.py b/var/spack/repos/builtin/packages/py-mx/package.py index 2e8e71c47292c4..f247ea1b0ddc67 100644 --- a/var/spack/repos/builtin/packages/py-mx/package.py +++ b/var/spack/repos/builtin/packages/py-mx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyMx(PythonPackage): homepage = "https://www.egenix.com/products/python/mxBase/" url = "https://downloads.egenix.com/python/egenix-mx-base-3.2.8.tar.gz" + license("eGenix") + version("3.2.8", sha256="0da55233e45bc3f88870e62e60a79c2c86bad4098b8128343fd7be877f44a3c0") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-mxfold2/package.py b/var/spack/repos/builtin/packages/py-mxfold2/package.py index 1d44fbbfb56a01..92df3ac7f2aa17 100644 --- a/var/spack/repos/builtin/packages/py-mxfold2/package.py +++ b/var/spack/repos/builtin/packages/py-mxfold2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMxfold2(PythonPackage): maintainers("dorton21") + license("MIT") + version("0.1.1", sha256="9f39c6ff4138212d1ad2639005f5c05ffb4df0f7e22f5e7ad49466a05aa047e5") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-myhdl/package.py b/var/spack/repos/builtin/packages/py-myhdl/package.py index 92d8b35d2cd4c4..0b669e65294774 100644 --- a/var/spack/repos/builtin/packages/py-myhdl/package.py +++ b/var/spack/repos/builtin/packages/py-myhdl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMyhdl(PythonPackage): homepage = "http://www.myhdl.org" pypi = "myhdl/myhdl-0.9.0.tar.gz" + license("LGPL-2.1-or-later") + version("0.9.0", sha256="52d12a5fe2cda22558806272af3c2b519b6f7095292b8e6c8ad255fb604507a5") depends_on("python@2.6:2.8,3.4:") diff --git a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py index 6dedf3ab130891..bfe942a3b82eb5 100644 --- a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyMypyExtensions(PythonPackage): homepage = "https://github.com/python/mypy_extensions" pypi = "mypy-extensions/mypy_extensions-0.4.3.tar.gz" + license("MIT") + version("1.0.0", sha256="75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782") version("0.4.3", sha256="2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8") diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index 68896c792adb98..3c7164f651a355 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,17 @@ class PyMypy(PythonPackage): maintainers("adamjstewart") + license("MIT AND PSF-2.0", checked_by="tgamblin") + + version("1.8.0", sha256="6ff8b244d7085a0b425b56d327b480c3b29cafbd2eff27316a004f9a7391ae07") + version("1.7.1", sha256="fcb6d9afb1b6208b4c712af0dafdc650f518836065df0d4fb1d800f5d6773db2") + version("1.7.0", sha256="1e280b5697202efa698372d2f39e9a6713a0395a756b1c6bd48995f8d72690dc") + version("1.6.1", sha256="4d01c00d09a0be62a4ca3f933e315455bde83f37f892ba4b08ce92f3cf44bcc1") + version("1.6.0", sha256="4f3d27537abde1be6d5f2c96c29a454da333a2a271ae7d5bc7110e6d4b7beb3f") + version("1.5.1", sha256="b031b9601f1060bf1281feab89697324726ba0c0bae9d7cd7ab4b690940f0b92") + version("1.5.0", sha256="f3460f34b3839b9bc84ee3ed65076eb827cd99ed13ed08d723f9083cada4a212") + version("1.4.1", sha256="9bbcd9ab8ea1f2e1c8031c21445b511442cc45c89951e49bbf852cbb70755b1b") + version("1.4.0", sha256="de1e7e68148a213036276d1f5303b3836ad9a774188961eb2684eddff593b042") version("1.3.0", sha256="e1f4d16e296f5135624b34e8fb741eb0eadedca90862405b1f1fde2040b9bd11") version("1.2.0", sha256="f70a40410d774ae23fcb4afbbeca652905a04de7948eaf0b1789c8d1426b72d1") version("1.1.1", sha256="ae9ceae0f5b9059f33dbc62dea087e942c0ccab4b7a003719cb70f9b8abfa32f") @@ -43,31 +54,34 @@ class PyMypy(PythonPackage): version("0.670", sha256="e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d") # pyproject.toml - depends_on("py-setuptools@40.6.2:", when="@0.790:", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) + depends_on("py-setuptools@40.6.2:", when="@0.790:", type="build") + depends_on("py-setuptools", type="build") depends_on("py-wheel@0.30:", when="@0.790:", type="build") + depends_on("py-types-psutil", when="@0.981:", type="build") + depends_on("py-types-setuptools", when="@0.981:", type="build") + + # setup.py + depends_on("python@3.8:", when="@1.5:", type=("build", "run")) + depends_on("python@3.7:", when="@0.981:", type=("build", "run")) + depends_on("py-typing-extensions@4.1:", when="@1.5:", type=("build", "run")) depends_on("py-typing-extensions@3.10:", when="@0.930:", type=("build", "run")) depends_on("py-typing-extensions@3.7.4:", when="@0.700:", type=("build", "run")) depends_on("py-mypy-extensions@1:", when="@1.1:", type=("build", "run")) depends_on("py-mypy-extensions@0.4.3:", when="@0.930:1.0", type=("build", "run")) depends_on("py-mypy-extensions@0.4.3:0.4", when="@0.700:0.929", type=("build", "run")) depends_on("py-mypy-extensions@0.4.0:0.4", when="@:0.699", type=("build", "run")) - depends_on("py-typed-ast@1.4.0:1", when="@0.920: ^python@:3.7", type=("build", "run")) - depends_on("py-typed-ast@1.4.0:1.4", when="@0.900:0.910 ^python@:3.7", type=("build", "run")) - depends_on("py-typed-ast@1.4.0:1.4", when="@0.700:0.899", type=("build", "run")) - depends_on("py-typed-ast@1.3.1:1.3", when="@:0.699", type=("build", "run")) depends_on("py-tomli@1.1:", when="@0.950: ^python@:3.10", type=("build", "run")) depends_on("py-tomli@1.1:", when="@0.930:0.949", type=("build", "run")) depends_on("py-tomli@1.1:2", when="@0.920:0.929", type=("build", "run")) - depends_on("py-types-psutil", when="@0.981:", type="build") - depends_on("py-types-setuptools", when="@0.981:", type="build") - depends_on("py-types-typed-ast@1.5.8:1.5", when="@0.981:", type="build") - - # setup.py - depends_on("python@3.7:", when="@0.981:", type=("build", "run")) # Historical dependencies + depends_on("py-types-typed-ast@1.5.8.5:1.5", when="@1.2:1.4", type="build") + depends_on("py-types-typed-ast@1.5.8:1.5", when="@0.981:1.1", type="build") depends_on("py-toml", when="@0.900:0.910", type=("build", "run")) + depends_on("py-typed-ast@1.4.0:1", when="@0.920:1.4 ^python@:3.7", type=("build", "run")) + depends_on("py-typed-ast@1.4.0:1.4", when="@0.900:0.910 ^python@:3.7", type=("build", "run")) + depends_on("py-typed-ast@1.4.0:1.4", when="@0.700:0.899", type=("build", "run")) + depends_on("py-typed-ast@1.3.1:1.3", when="@:0.699", type=("build", "run")) # https://github.com/python/mypy/issues/13627 conflicts("^python@3.10.7:", when="@:0.971") diff --git a/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py b/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py index 05c881e02cedf5..81f152e53b16cf 100644 --- a/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py +++ b/var/spack/repos/builtin/packages/py-mysql-connector-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyMysqlConnectorPython(PythonPackage): url = "https://github.com/mysql/mysql-connector-python/archive/8.0.13.tar.gz" git = "https://github.com/mysql/mysql-connector-python.git" + license("Artistic-1.0-Perl") + version("8.0.13", sha256="d4c0834c583cdb90c0aeae90b1917d58355a4bf9b0266c16fd58874a5607f9d4") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mysqlclient/package.py b/var/spack/repos/builtin/packages/py-mysqlclient/package.py index 7e1121dd2a7f60..c864f5a32ba63d 100644 --- a/var/spack/repos/builtin/packages/py-mysqlclient/package.py +++ b/var/spack/repos/builtin/packages/py-mysqlclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyMysqlclient(PythonPackage): homepage = "https://github.com/PyMySQL/mysqlclient-python" pypi = "mysqlclient/mysqlclient-1.4.4.tar.gz" + license("GPL-2.0-or-later") + version("1.4.6", sha256="f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16") version("1.4.5", sha256="e80109b0ae8d952b900b31b623181532e5e89376d707dcbeb63f99e69cefe559") version("1.4.4", sha256="9c737cc55a5dc8dd3583a942d5a9b21be58d16f00f5fefca4e575e7d9682e98c") diff --git a/var/spack/repos/builtin/packages/py-mysqldb1/package.py b/var/spack/repos/builtin/packages/py-mysqldb1/package.py index c8c50690fdbd18..8a332fa90f84b5 100644 --- a/var/spack/repos/builtin/packages/py-mysqldb1/package.py +++ b/var/spack/repos/builtin/packages/py-mysqldb1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-myst-parser/package.py b/var/spack/repos/builtin/packages/py-myst-parser/package.py index 8ddd529ea506bf..891796dda38082 100644 --- a/var/spack/repos/builtin/packages/py-myst-parser/package.py +++ b/var/spack/repos/builtin/packages/py-myst-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyMystParser(PythonPackage): homepage = "https://github.com/executablebooks/MyST-Parser" pypi = "myst-parser/myst-parser-0.18.1.tar.gz" + license("MIT") + version("0.18.1", sha256="79317f4bb2c13053dd6e64f9da1ba1da6cd9c40c8a430c447a7b146a594c246d") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-namex/package.py b/var/spack/repos/builtin/packages/py-namex/package.py new file mode 100644 index 00000000000000..de93e1e98c8748 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-namex/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyNamex(PythonPackage): + """A simple utility to separate the implementation of your Python package + and its public API surface.""" + + pypi = "namex/namex-0.0.7.tar.gz" + + license("Apache-2.0") + + version("0.0.7", sha256="84ba65bc4d22bd909e3d26bf2ffb4b9529b608cb3f9a4336f776b04204ced69b") + + depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nanobind/package.py b/var/spack/repos/builtin/packages/py-nanobind/package.py index 5c39cf271cfc14..eaf5572a362273 100644 --- a/var/spack/repos/builtin/packages/py-nanobind/package.py +++ b/var/spack/repos/builtin/packages/py-nanobind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,7 +22,12 @@ class PyNanobind(PythonPackage): maintainers("chrisrichardson", "garth-wells", "ma595") + license("BSD-3-Clause") + version("master", branch="master", submodules=True) + version( + "1.8.0", tag="v1.8.0", commit="1a309ba444a47e081dc6213d72345a2fbbd20795", submodules=True + ) version( "1.7.0", tag="v1.7.0", commit="555ec7595c89c60ce7cf53e803bc226dc4899abb", submodules=True ) diff --git a/var/spack/repos/builtin/packages/py-nanoget/package.py b/var/spack/repos/builtin/packages/py-nanoget/package.py new file mode 100644 index 00000000000000..dfb86cfbdd2f16 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nanoget/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 PyNanoget(PythonPackage): + """Functions to extract information from Oxford Nanopore sequencing data and alignments""" + + homepage = "https://github.com/wdecoster/nanoget" + pypi = "nanoget/nanoget-1.19.3.tar.gz" + + maintainers("Pandapip1") + + version("1.19.3", sha256="da981810edb1cbe42cbbfbe5fcf753f29bf5555204cd51256b28a284a036a71b") + + depends_on("py-setuptools", type=("build",)) + depends_on("py-pandas@2.0.0:", type=("build", "run")) + depends_on("py-numpy", type=("build", "run")) + depends_on("py-biopython", type=("build", "run")) + depends_on("py-pysam@0.10.0.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nanomath/package.py b/var/spack/repos/builtin/packages/py-nanomath/package.py new file mode 100644 index 00000000000000..f9db95f64aee7f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nanomath/package.py @@ -0,0 +1,22 @@ +# 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 PyNanomath(PythonPackage): + """A few simple math function for other Oxford Nanopore processing scripts""" + + homepage = "https://github.com/wdecoster/nanomath" + pypi = "nanomath/nanomath-1.3.0.tar.gz" + + maintainers("Pandapip1") + + version("1.3.0", sha256="c35a024b10b34dd8f539cefed1fd69e0a46d18037ca48bed63c7941c67ae028e") + + depends_on("py-setuptools", type=("build",)) + depends_on("py-python-deprecated", type=("build", "run")) + depends_on("py-pandas", type=("build", "run")) + depends_on("py-numpy@1.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nanoplot/package.py b/var/spack/repos/builtin/packages/py-nanoplot/package.py new file mode 100644 index 00000000000000..080ae62bf0991f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nanoplot/package.py @@ -0,0 +1,30 @@ +# 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 PyNanoplot(PythonPackage): + """Plotting scripts for long read sequencing data""" + + homepage = "https://github.com/wdecoster/NanoPlot" + pypi = "NanoPlot/NanoPlot-1.42.0.tar.gz" + + maintainers("Pandapip1") + + version("1.42.0", sha256="0f8fd2cffd33a346b3306716058c6cb4091c931e8ab502f10b17a28749e8b6d9") + + depends_on("py-setuptools", type=("build",)) + depends_on("py-biopython", type=("build", "run")) + depends_on("py-pysam@0.10.0.1:", type=("build", "run")) + depends_on("py-pandas@1.1.0:", type=("build", "run")) + depends_on("py-numpy@1.16.5:", type=("build", "run")) + depends_on("py-scipy", type=("build", "run")) + depends_on("py-python-dateutil", type=("build", "run")) + depends_on("py-nanoget@1.19.1:", type=("build", "run")) + depends_on("py-nanomath@1.0.0:", type=("build", "run")) + depends_on("py-plotly@5.4.0:", type=("build", "run")) + depends_on("py-pyarrow", type=("build", "run")) + depends_on("py-kaleido", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nanostat/package.py b/var/spack/repos/builtin/packages/py-nanostat/package.py new file mode 100644 index 00000000000000..d15151d5304db4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nanostat/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 PyNanostat(PythonPackage): + """Calculate statistics for Oxford Nanopore sequencing data and alignments""" + + homepage = "https://github.com/wdecoster/nanostat" + pypi = "NanoStat/NanoStat-1.6.0.tar.gz" + + maintainers("Pandapip1") + + version("1.6.0", sha256="e45fa8d1ab49bdaed17596c26c0af148b44e4af46238391a8bb7a1b4cc940079") + + depends_on("py-setuptools", type=("build",)) + depends_on("py-nanoget@1.13.2:", type=("build", "run")) + depends_on("py-nanomath@1.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nanotime/package.py b/var/spack/repos/builtin/packages/py-nanotime/package.py index 7f9276cef8f91d..5473a463510c24 100644 --- a/var/spack/repos/builtin/packages/py-nanotime/package.py +++ b/var/spack/repos/builtin/packages/py-nanotime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyNanotime(PythonPackage): homepage = "https://github.com/jbenet/nanotime" pypi = "nanotime/nanotime-0.5.2.tar.gz" + license("MIT") + version("0.5.2", sha256="c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nara-wpe/package.py b/var/spack/repos/builtin/packages/py-nara-wpe/package.py index 2dc63ee5dc3d49..36821782dfa5b1 100644 --- a/var/spack/repos/builtin/packages/py-nara-wpe/package.py +++ b/var/spack/repos/builtin/packages/py-nara-wpe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyNaraWpe(PythonPackage): homepage = "https://github.com/fgnt/nara_wpe" pypi = "nara_wpe/nara_wpe-0.0.7.tar.gz" + license("MIT") + version("0.0.7", sha256="7aa2edd5261e5d953e584e69a9233d60fc588fc8a4b7886c3ce43cc8ac8cd99b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-natsort/package.py b/var/spack/repos/builtin/packages/py-natsort/package.py index 1ae7d2c6d0a095..d360b11b8efa7d 100644 --- a/var/spack/repos/builtin/packages/py-natsort/package.py +++ b/var/spack/repos/builtin/packages/py-natsort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNatsort(PythonPackage): homepage = "https://github.com/SethMMorton/natsort" url = "https://github.com/SethMMorton/natsort/archive/5.2.0.zip" + license("MIT") + version("7.1.1", sha256="ada96d9ca0db0d44b891718ff7baff5ac34cf5b6d9def356c0f7a8ea67ae2113") version("7.1.0", sha256="c3de32c8e5e91cf4f2dd1655b4c167ca4676cc28ce397050fc8d229582a71f0d") version("7.0.1", sha256="1a422a344d089f7a2acba788087ca6253ca47a544bda677721f99516cdfd8668") diff --git a/var/spack/repos/builtin/packages/py-nbclassic/package.py b/var/spack/repos/builtin/packages/py-nbclassic/package.py index e46a6cd01e48e4..0a0e1e0207d496 100644 --- a/var/spack/repos/builtin/packages/py-nbclassic/package.py +++ b/var/spack/repos/builtin/packages/py-nbclassic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNbclassic(PythonPackage): homepage = "https://github.com/jupyterlab/nbclassic" pypi = "nbclassic/nbclassic-0.3.1.tar.gz" + license("BSD-3-Clause") + version("1.0.0", sha256="0ae11eb2319455d805596bf320336cda9554b41d99ab9a3c31bf8180bffa30e3") version("0.4.8", sha256="c74d8a500f8e058d46b576a41e5bc640711e1032cf7541dde5f73ea49497e283") version("0.3.5", sha256="99444dd63103af23c788d9b5172992f12caf8c3098dd5a35c787f0df31490c29") diff --git a/var/spack/repos/builtin/packages/py-nbclient/package.py b/var/spack/repos/builtin/packages/py-nbclient/package.py index 60fc39e964b4c3..fa8081304fc9e3 100644 --- a/var/spack/repos/builtin/packages/py-nbclient/package.py +++ b/var/spack/repos/builtin/packages/py-nbclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyNbclient(PythonPackage): pypi = "nbclient/nbclient-0.5.0.tar.gz" git = "https://github.com/jupyter/nbclient.git" + license("BSD-3-Clause") + version("0.8.0", sha256="f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55") version("0.7.2", sha256="884a3f4a8c4fc24bb9302f263e0af47d97f0d01fe11ba714171b320c8ac09547") version("0.6.7", sha256="3c5a7fc6bb74be7d31edf2817b44501a65caa99e5e56363bc359649b97cd24b9") diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py index 3243c5d6373f01..af19eb9f220ec1 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNbconvert(PythonPackage): homepage = "https://github.com/jupyter/nbconvert" pypi = "nbconvert/nbconvert-6.0.1.tar.gz" + license("BSD-3-Clause") + version("7.4.0", sha256="51b6c77b507b177b73f6729dba15676e42c4e92bcb00edc8cc982ee72e7d89d7") version("7.0.0", sha256="fd1e361da30e30e4c5a5ae89f7cae95ca2a4d4407389672473312249a7ba0060") version("6.5.1", sha256="2c01f3f518fee736c3d3f999dd20e0a16febba17a0d60a3b0fd28fbdec14115d") diff --git a/var/spack/repos/builtin/packages/py-nbdime/package.py b/var/spack/repos/builtin/packages/py-nbdime/package.py index 8cd9dc999746d5..deb6039b930aa8 100644 --- a/var/spack/repos/builtin/packages/py-nbdime/package.py +++ b/var/spack/repos/builtin/packages/py-nbdime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py index d8ad51a5f5f6e3..8422a56c0e79a3 100644 --- a/var/spack/repos/builtin/packages/py-nbformat/package.py +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNbformat(PythonPackage): homepage = "https://github.com/jupyter/nbformat" pypi = "nbformat/nbformat-5.0.7.tar.gz" + license("BSD-3-Clause") + version("5.8.0", sha256="46dac64c781f1c34dfd8acba16547024110348f9fc7eab0f31981c2a3dc48d1f") version("5.7.0", sha256="1d4760c15c1a04269ef5caf375be8b98dd2f696e5eb9e603ec2bf091f9b0d3f3") version("5.4.0", sha256="44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501") diff --git a/var/spack/repos/builtin/packages/py-nbmake/package.py b/var/spack/repos/builtin/packages/py-nbmake/package.py index 7fc05fe369e363..983fe908735813 100644 --- a/var/spack/repos/builtin/packages/py-nbmake/package.py +++ b/var/spack/repos/builtin/packages/py-nbmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNbmake(PythonPackage): homepage = "https://github.com/treebeardtech/nbmake" pypi = "nbmake/nbmake-0.5.tar.gz" + license("Apache-2.0") + version("1.4.3", sha256="9afc46ba05cc22f5a78047a758dca32386c95eaaa41501b25ce108cf733d9622") version("1.4.1", sha256="7f602ba5195e80e4f2527944bb06d3b4df0d1520e73ba66126b51132b1f646ea") version("1.4", sha256="2d3b97b83a8a378d5d828ad7b5412e509b82ed883662af16533236c909cfa20a") diff --git a/var/spack/repos/builtin/packages/py-nbqa/package.py b/var/spack/repos/builtin/packages/py-nbqa/package.py index 0d9683b45b8b40..e93c55f8241227 100644 --- a/var/spack/repos/builtin/packages/py-nbqa/package.py +++ b/var/spack/repos/builtin/packages/py-nbqa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNbqa(PythonPackage): homepage = "https://github.com/nbQA-dev/nbQA" pypi = "nbqa/nbqa-1.6.3.tar.gz" + license("MIT") + version("1.6.3", sha256="5394a29fc6d27b9a950c0a36d2d9de25de980be9acfe2a3f3aea0d27b5f7fec1") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nbsphinx/package.py b/var/spack/repos/builtin/packages/py-nbsphinx/package.py index 245a80d54fe90b..80c2639bf7f2d9 100644 --- a/var/spack/repos/builtin/packages/py-nbsphinx/package.py +++ b/var/spack/repos/builtin/packages/py-nbsphinx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyNbsphinx(PythonPackage): homepage = "https://nbsphinx.readthedocs.io" pypi = "nbsphinx/nbsphinx-0.8.0.tar.gz" + license("MIT") + version("0.8.8", sha256="b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec") version("0.8.7", sha256="ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c") version("0.8.1", sha256="24d59aa3a1077ba58d9769c64c38fb05b761a1af21c1ac15f6393500cd008ea6") diff --git a/var/spack/repos/builtin/packages/py-nbstripout/package.py b/var/spack/repos/builtin/packages/py-nbstripout/package.py index cfda6b41899d6c..43c9e97b714ea4 100644 --- a/var/spack/repos/builtin/packages/py-nbstripout/package.py +++ b/var/spack/repos/builtin/packages/py-nbstripout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNbstripout(PythonPackage): homepage = "https://github.com/kynan/nbstripout" pypi = "nbstripout/nbstripout-0.6.1.tar.gz" + license("MIT") + version("0.6.1", sha256="9065bcdd1488b386e4f3c081ffc1d48f4513a2f8d8bf4d0d9a28208c5dafe9d3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nbval/package.py b/var/spack/repos/builtin/packages/py-nbval/package.py index c1e0ee3a2773b1..91f62a3724ab3b 100644 --- a/var/spack/repos/builtin/packages/py-nbval/package.py +++ b/var/spack/repos/builtin/packages/py-nbval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyNbval(PythonPackage): homepage = "https://github.com/computationalmodelling/nbval" pypi = "nbval/nbval-0.9.6.tar.gz" + license("BSD-3-Clause") + version("0.9.6", sha256="cfefcd2ef66ee2d337d0b252c6bcec4023384eb32e8b9e5fcc3ac80ab8cd7d40") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nc-time-axis/package.py b/var/spack/repos/builtin/packages/py-nc-time-axis/package.py index c3d844d53506be..769761b6240d1d 100644 --- a/var/spack/repos/builtin/packages/py-nc-time-axis/package.py +++ b/var/spack/repos/builtin/packages/py-nc-time-axis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNcTimeAxis(PythonPackage): homepage = "https://github.com/scitools/nc-time-axis" pypi = "nc-time-axis/nc-time-axis-1.1.0.tar.gz" + license("BSD-3-Clause") + version("1.1.0", sha256="ea9d4f7f9e9189c96f7d320235ac6c4be7f63dc5aa256b3ee5d5cca5845e6e26") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ncbi-genome-download/package.py b/var/spack/repos/builtin/packages/py-ncbi-genome-download/package.py index 0d872ebdaddfe5..9cbd83fc07d240 100644 --- a/var/spack/repos/builtin/packages/py-ncbi-genome-download/package.py +++ b/var/spack/repos/builtin/packages/py-ncbi-genome-download/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNcbiGenomeDownload(PythonPackage): homepage = "https://github.com/kblin/ncbi-genome-download/" pypi = "ncbi-genome-download/ncbi-genome-download-0.3.1.tar.gz" + license("Apache-2.0") + version("0.3.1", sha256="74675e94f184b8d80429641b27ed6d46ed81028d95156337de6d09f8dd739c6e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py b/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py index f268df4df00711..c61a3b269a9e08 100644 --- a/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py +++ b/var/spack/repos/builtin/packages/py-ndg-httpsclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,7 @@ class PyNdgHttpsclient(PythonPackage): pypi = "ndg_httpsclient/ndg_httpsclient-0.5.1.tar.gz" version("0.5.1", sha256="d72faed0376ab039736c2ba12e30695e2788c4aa569c9c3e3d72131de2592210") + version("0.5.0", sha256="c009f5430790936b3a97eaf9f968516664d97e146ab2bda991f0caadb7cc088b") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ndindex/package.py b/var/spack/repos/builtin/packages/py-ndindex/package.py index b8d579c08a33fc..46311a61176021 100644 --- a/var/spack/repos/builtin/packages/py-ndindex/package.py +++ b/var/spack/repos/builtin/packages/py-ndindex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNdindex(PythonPackage): homepage = "https://quansight-labs.github.io/ndindex/" pypi = "ndindex/ndindex-1.7.tar.gz" + license("MIT") + version("1.7", sha256="bf9bd0b76eeada1c8275e04091f8291869ed2b373b7af48e56faf7579fd2efd2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py index 8803b8eebb0ff0..36fb4911863403 100644 --- a/var/spack/repos/builtin/packages/py-neo/package.py +++ b/var/spack/repos/builtin/packages/py-neo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,11 @@ class PyNeo(PythonPackage): homepage = "https://neuralensemble.org/neo" pypi = "neo/neo-0.4.1.tar.gz" + license("BSD-3-Clause") + + version("0.12.0", sha256="3b6ca4fc05dfdb4e953e253e70994bfbbc8fe2e90958fbda7fa5860caf3fa63a") + version("0.11.1", sha256="f4a206044b332ad00b10072b0dc7a70b359fa365ec786f92ab757ef4ae588474") + version("0.11.0", sha256="cdf8e1324a3fbbd1efd5618dcd37cfc497b1997923bd710b598472c1d846674a") version("0.10.2", sha256="2d4218b0826daeea880e155227060029ec38a00238ceb5f097138d9467c6399b") version("0.10.0", sha256="e591a53e18cfa4478603a0e133f3fa0e07bc016b2a279d21d72cf8196eca8353") version("0.9.0", sha256="6e31c88d7c52174fa2512df589b2b5003e9471fde27fca9f315f4770ba3bd3cb") @@ -22,12 +27,20 @@ class PyNeo(PythonPackage): version("0.4.1", sha256="a5a4f3aa31654d52789f679717c9fb622ad4f59b56d227dca490357b9de0a1ce") version("0.3.3", sha256="6b80eb5bdc9eb4eca829f7464f861c5f1a3a6289559de037930d529bb3dddefb") + depends_on("python@3.8:", type=("build", "run"), when="@0.12.0:") + + # py-setuptools@:61 doesn't support PEP 621 + depends_on("py-setuptools@62:", type="build", when="@0.12:") depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.3.0:", type=("build", "run"), when="@0.3.3:0.4.1") - depends_on("py-numpy@1.7.1:", type=("build", "run"), when="@0.5.2:0.8.0") + depends_on("py-packaging", type=("build", "run")) + + depends_on("py-numpy@1.19.5:", type=("build", "run"), when="@0.12.0:") + depends_on("py-numpy@1.18.5:", type=("build", "run"), when="@0.11.0:0.11.1") + depends_on("py-numpy@1.16.1:", type=("build", "run"), when="@0.10.0:0.10.2") depends_on("py-numpy@1.13.0:", type=("build", "run"), when="@0.9.0") - depends_on("py-numpy@1.16.1:", type=("build", "run"), when="@0.10.0:") + depends_on("py-numpy@1.7.1:", type=("build", "run"), when="@0.5.2:0.8.0") - depends_on("py-quantities@0.9.0:", type=("build", "run"), when="@0.3.3:0.8.0") - depends_on("py-quantities@0.12.1:", type=("build", "run"), when="@0.9.0:") + depends_on("py-quantities@0.14.1:", type=("build", "run"), when="@0.12.0:") + depends_on("py-quantities@0.12.1:", type=("build", "run"), when="@0.9.0:0.11.1") + depends_on("py-quantities@0.9.0:", type=("build", "run"), when="@0.5.2:0.8.0") diff --git a/var/spack/repos/builtin/packages/py-neobolt/package.py b/var/spack/repos/builtin/packages/py-neobolt/package.py index 8b1fb04b6cfbc4..6cf9fd00b5533d 100644 --- a/var/spack/repos/builtin/packages/py-neobolt/package.py +++ b/var/spack/repos/builtin/packages/py-neobolt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-neotime/package.py b/var/spack/repos/builtin/packages/py-neotime/package.py index e3c4d47c205c49..0b7bcd39216734 100644 --- a/var/spack/repos/builtin/packages/py-neotime/package.py +++ b/var/spack/repos/builtin/packages/py-neotime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNeotime(PythonPackage): homepage = "https://github.com/neo4j-drivers/neotime" pypi = "neotime/neotime-1.7.4.tar.gz" + license("Apache-2.0") + version("1.7.4", sha256="4e0477ba0f24e004de2fa79a3236de2bd941f20de0b5db8d976c52a86d7363eb") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-neovim-remote/package.py b/var/spack/repos/builtin/packages/py-neovim-remote/package.py index 8d4596957bec5b..e9d722262df578 100644 --- a/var/spack/repos/builtin/packages/py-neovim-remote/package.py +++ b/var/spack/repos/builtin/packages/py-neovim-remote/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNeovimRemote(PythonPackage): maintainers("trws") + license("MIT") + version("2.4.0", sha256="f199ebb61c3decf462feed4e7d467094ed38d8afaf43620736b5983a12fe2427") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py index d39d0a645174a4..9cf65d6e334168 100644 --- a/var/spack/repos/builtin/packages/py-nest-asyncio/package.py +++ b/var/spack/repos/builtin/packages/py-nest-asyncio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNestAsyncio(PythonPackage): homepage = "https://github.com/erdewit/nest_asyncio" pypi = "nest-asyncio/nest_asyncio-1.4.0.tar.gz" + license("BSD-2-Clause") + version("1.5.6", sha256="d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290") version("1.5.5", sha256="e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65") version("1.5.4", sha256="f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd") diff --git a/var/spack/repos/builtin/packages/py-nestle/package.py b/var/spack/repos/builtin/packages/py-nestle/package.py index 6579613114aa54..5e0272d99055cc 100644 --- a/var/spack/repos/builtin/packages/py-nestle/package.py +++ b/var/spack/repos/builtin/packages/py-nestle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNestle(PythonPackage): homepage = "https://kbarbary.github.io/nestle/" pypi = "nestle/nestle-0.1.1.tar.gz" + license("MIT") + version("0.1.1", sha256="d236a04f25494af5cda572eecf62729592b3231fbd874b1f72aff54718a3bb08") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-netaddr/package.py b/var/spack/repos/builtin/packages/py-netaddr/package.py index cccca0f8969887..2615f5dd531e1d 100644 --- a/var/spack/repos/builtin/packages/py-netaddr/package.py +++ b/var/spack/repos/builtin/packages/py-netaddr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNetaddr(PythonPackage): maintainers("haampie") + license("BSD-3-Clause") + version("0.8.0", sha256="d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-netcdf4/package.py b/var/spack/repos/builtin/packages/py-netcdf4/package.py index b37553e04a56d2..85105b1b460b15 100644 --- a/var/spack/repos/builtin/packages/py-netcdf4/package.py +++ b/var/spack/repos/builtin/packages/py-netcdf4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNetcdf4(PythonPackage): maintainers("skosukhin") + license("MIT") + version("1.6.2", sha256="0382b02ff6a288419f6ffec85dec40f451f41b8755547154c575ddd9f0f4ae53") version("1.5.8", sha256="ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84") version("1.5.3", sha256="2a3ca855848f4bbf07fac366da77a681fcead18c0a8813d91d46302f562dc3be") diff --git a/var/spack/repos/builtin/packages/py-netifaces/package.py b/var/spack/repos/builtin/packages/py-netifaces/package.py index 88cc6a09359e1a..5cf1394c7bb0b2 100644 --- a/var/spack/repos/builtin/packages/py-netifaces/package.py +++ b/var/spack/repos/builtin/packages/py-netifaces/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNetifaces(PythonPackage): ) pypi = "netifaces/netifaces-0.10.5.tar.gz" + license("Unlicense") + version("0.10.5", sha256="59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-netket/package.py b/var/spack/repos/builtin/packages/py-netket/package.py index 35b749406ba6d5..02f83773298118 100644 --- a/var/spack/repos/builtin/packages/py-netket/package.py +++ b/var/spack/repos/builtin/packages/py-netket/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyNetket(PythonPackage): homepage = "https://github.com/netket/netket" url = "https://github.com/netket/netket/archive/v2.1.1.tar.gz" + license("Apache-2.0") + version("2.1.1", sha256="881ae8605a829364b2116bc4398084766b24e2cd8958d0cb2b85595650e7bfd6") version("2.1", sha256="041d2b058c5d2945bf0a4194ad2bf3c426ad9b6ce0dd323a81a7154bc6e45452") version("2.0", sha256="c2890361b16ffb5265023a736536c435ccb3ad956d897e5820eac431d72cdb0e") diff --git a/var/spack/repos/builtin/packages/py-netpyne/package.py b/var/spack/repos/builtin/packages/py-netpyne/package.py index 3604320e7ff25c..1b4c0bb01e5c3a 100644 --- a/var/spack/repos/builtin/packages/py-netpyne/package.py +++ b/var/spack/repos/builtin/packages/py-netpyne/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyNetpyne(PythonPackage): url = "https://github.com/suny-downstate-medical-center/netpyne/archive/refs/tags/v1.0.3.1.tar.gz" git = "https://github.com/suny-downstate-medical-center/netpyne.git" + license("MIT") + version("master", branch="master") version("1.0.3.1", sha256="4f8492d58ff1dd7ec5ba6ed1f58f94548b8c1e4e9fd50b8a6d2e9f8eb400736d") diff --git a/var/spack/repos/builtin/packages/py-networkit/package.py b/var/spack/repos/builtin/packages/py-networkit/package.py index 6279cb0a017868..283ba61173980c 100644 --- a/var/spack/repos/builtin/packages/py-networkit/package.py +++ b/var/spack/repos/builtin/packages/py-networkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyNetworkit(PythonPackage): maintainers("fabratu") + license("MIT") + version("9.0", sha256="e27872d0d6a8a0a1ba862b0dab6adb4f0046fe6b20d3c47863075d1ee70226d3") version("8.1", sha256="5ff9e61496259280df4f913b1e37f51ca6f94974c4b9f623851f4d518f5ce0d5") version("8.0", sha256="36c30e894e835bf93f0aa0fb0b526758234e74318150820911e024ffe5ec1fd2") diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index 01fc91904e3666..693761d3ab3556 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNetworkx(PythonPackage): pypi = "networkx/networkx-2.4.tar.gz" git = "https://github.com/networkx/networkx.git" + license("BSD-3-Clause") + version("3.1", sha256="de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61") version("2.8.6", sha256="bd2b7730300860cbd2dafe8e5af89ff5c9a65c3975b352799d87a6238b4301a6") version("2.7.1", sha256="d1194ba753e5eed07cdecd1d23c5cd7a3c772099bd8dbd2fea366788cf4de7ba") diff --git a/var/spack/repos/builtin/packages/py-neurokit2/package.py b/var/spack/repos/builtin/packages/py-neurokit2/package.py index a448348bc3ab4b..c41d0efbfaf82e 100644 --- a/var/spack/repos/builtin/packages/py-neurokit2/package.py +++ b/var/spack/repos/builtin/packages/py-neurokit2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyNeurokit2(PythonPackage): homepage = "https://github.com/neuropsychology/NeuroKit" pypi = "neurokit2/neurokit2-0.1.2.tar.gz" + license("MIT") + version("0.2.4", sha256="4699704f6890ae3510d5abf1deec86a59d793d31cda51b627f6eae65360d298f") version("0.2.2", sha256="0c33b060f9ac5ec8a6a0e23261fdbc36a98cb48e06142a1653fd12698806a952") version("0.1.5", sha256="4df48c0ce8971e32e32f36c2263986b00fd83da5eadaaa98e4bb5ab6bcd930e5") diff --git a/var/spack/repos/builtin/packages/py-neurolab/package.py b/var/spack/repos/builtin/packages/py-neurolab/package.py index 47a3d00e943356..e207ce1e2679b7 100644 --- a/var/spack/repos/builtin/packages/py-neurolab/package.py +++ b/var/spack/repos/builtin/packages/py-neurolab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-neurom/package.py b/var/spack/repos/builtin/packages/py-neurom/package.py index 19bad5fc7b94c7..bd870a056cf2c9 100644 --- a/var/spack/repos/builtin/packages/py-neurom/package.py +++ b/var/spack/repos/builtin/packages/py-neurom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNeurom(PythonPackage): git = "https://github.com/BlueBrain/NeuroM.git" pypi = "neurom/neurom-2.2.1.tar.gz" + license("BSD-3-Clause") + version("master", branch="master") version("3.2.4", sha256="a584e0979b54deee906dd716ea90de20773e20b527d83960d0fe655b0905eb4a") diff --git a/var/spack/repos/builtin/packages/py-neurora/package.py b/var/spack/repos/builtin/packages/py-neurora/package.py index 53566f123a0247..3c2de950ba51e6 100644 --- a/var/spack/repos/builtin/packages/py-neurora/package.py +++ b/var/spack/repos/builtin/packages/py-neurora/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNeurora(PythonPackage): homepage = "https://github.com/ZitongLu1996/NeuroRA" pypi = "neurora/neurora-1.1.5.16.tar.gz" + license("MIT") + version("1.1.6.10", sha256="cdfed753b9d2e227cd15e3215fc0297ad5df0b131ef87a849e3fcec90788c514") version("1.1.6.9", sha256="052d826e17d6a40171d487b188bd68863e36e41e37740da5eec33562241e36ce") version("1.1.6.8", sha256="84aebe82ce0e8e99b306dcab7b5e15f85269862c379f16b8161dbab64e7d1dd2") diff --git a/var/spack/repos/builtin/packages/py-neurotools/package.py b/var/spack/repos/builtin/packages/py-neurotools/package.py index 3c65399b60b0ba..3f748c0497c201 100644 --- a/var/spack/repos/builtin/packages/py-neurotools/package.py +++ b/var/spack/repos/builtin/packages/py-neurotools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNeurotools(PythonPackage): homepage = "http://neuralensemble.org/NeuroTools" pypi = "neurotools/NeuroTools-0.3.1.tar.gz" + license("GPL-2.0-or-later") + version("0.3.1", sha256="a459420fc0e9ff6b59af28716ddb0c75d11a63b8db80a5f4844e0d7a90c2c653") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nexus-sdk/package.py b/var/spack/repos/builtin/packages/py-nexus-sdk/package.py index 27bb28b90c1d18..0004df8fd41c71 100644 --- a/var/spack/repos/builtin/packages/py-nexus-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-nexus-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNexusSdk(PythonPackage): homepage = "https://github.com/BlueBrain/nexus-python-sdk" pypi = "nexus-sdk/nexus-sdk-0.3.2.tar.gz" + license("Apache-2.0") + version("0.3.2", sha256="cd5668a062283410c5ff57a68c218440df607da84e0a813a8c9390611f7212b3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nexusforge/package.py b/var/spack/repos/builtin/packages/py-nexusforge/package.py index 0e75abb528c86b..6a84838cca4d92 100644 --- a/var/spack/repos/builtin/packages/py-nexusforge/package.py +++ b/var/spack/repos/builtin/packages/py-nexusforge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class PyNexusforge(PythonPackage): homepage = "https://github.com/BlueBrain/nexus-forge" pypi = "nexusforge/nexusforge-0.7.0.tar.gz" + license("Apache-2.0") + + version("0.8.1", sha256="eb2909cbec185e7a73191c1be1e62902a0d8534f0d93454ef3e4e3b18b5129cf") version("0.8.0", sha256="4358505ead26e41c2a0c4e6113cf3a486c9661e2a3899394497a2b5a94b70424") version("0.7.0", sha256="a8d2951d9ad18df9f2f4db31a4c18fcdd27bfcec929b03a3c91f133ea439413c") @@ -29,6 +32,8 @@ class PyNexusforge(PythonPackage): depends_on("py-nexus-sdk", type=("build", "run")) depends_on("py-aiohttp", type=("build", "run")) depends_on("py-rdflib@6.0.0:", type=("build", "run")) + depends_on("py-rdflib@6.2.0", type=("build", "run"), when="@0.8.1") + depends_on("py-rdflib@6.3.2", type=("build", "run"), when="@0.8.2:") depends_on("py-pyld", type=("build", "run")) depends_on("py-pyshacl@0.17.2", type=("build", "run")) depends_on("py-nest-asyncio@1.5.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nglview/package.py b/var/spack/repos/builtin/packages/py-nglview/package.py new file mode 100644 index 00000000000000..b6d81c1819e184 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-nglview/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyNglview(PythonPackage): + """Jupyter widget to interactively view molecular structures and trajectories.""" + + homepage = "http://nglviewer.org" + pypi = "nglview/nglview-3.0.8.tar.gz" + + maintainers("w8jcik") + + version("3.0.8", sha256="f9e468cd813dac319cbeca6ae20ae099008ff3a06399f5d23d75582dde28623a") + + depends_on("py-ipywidgets@7:", type=("build", "run")) + depends_on("py-jupyterlab-widgets", type=("build", "run")) + depends_on("py-numpy", type=("build", "run")) + + depends_on("py-setuptools@40.8.0:", type="build") + depends_on("py-jupyter-packaging@0.7.9:0.7", type="build") + depends_on("py-versioneer-518", type="build") diff --git a/var/spack/repos/builtin/packages/py-ngs-tools/package.py b/var/spack/repos/builtin/packages/py-ngs-tools/package.py index 12f55bd8ee4527..b55f87f41d9229 100644 --- a/var/spack/repos/builtin/packages/py-ngs-tools/package.py +++ b/var/spack/repos/builtin/packages/py-ngs-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNgsTools(PythonPackage): homepage = "https://github.com/Lioscro/ngs-tools" pypi = "ngs-tools/ngs-tools-1.8.1.tar.gz" + license("MIT") + version("1.8.1", sha256="59d606d6c3ff3024e5e1ccad947c4d7608098fca105762e344742e16aa2f0de3") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nibabel/package.py b/var/spack/repos/builtin/packages/py-nibabel/package.py index 2f86dcf506d860..382e95ac3bb114 100644 --- a/var/spack/repos/builtin/packages/py-nibabel/package.py +++ b/var/spack/repos/builtin/packages/py-nibabel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNibabel(PythonPackage): pypi = "nibabel/nibabel-3.2.1.tar.gz" git = "https://github.com/nipy/nibabel" + license("PDDL-1.0") + version("5.1.0", sha256="ce73ca5e957209e7219a223cb71f77235c9df2acf4d3f27f861ba38e9481ac53") version("4.0.2", sha256="45c49b5349351b45f6c045a91aa02b4f0d367686ff3284632ef95ac65b930786") version("3.2.2", sha256="b0dcc174b30405ce9e8fec1eab3cbbb20f5c5e4920976c08b22e050b7c124f94") diff --git a/var/spack/repos/builtin/packages/py-nibetaseries/package.py b/var/spack/repos/builtin/packages/py-nibetaseries/package.py index f3298884ddc97a..cc0d547a150df4 100644 --- a/var/spack/repos/builtin/packages/py-nibetaseries/package.py +++ b/var/spack/repos/builtin/packages/py-nibetaseries/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,9 @@ class PyNibetaseries(PythonPackage): pypi = "nibetaseries/nibetaseries-0.6.0.tar.gz" git = "https://github.com/HBClab/NiBetaSeries.git" + license("MIT") + version("master", branch="master") - version("0.6.0", sha256="afddea1bf9b9de4ae446a5d9d2a56bdc88a5a9588bec5ecd3c8ac978fe416515") depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools@40.8:", type="build") @@ -35,21 +36,6 @@ class PyNibetaseries(PythonPackage): depends_on("py-mne", type=("build", "run")) # pypiwin32; platform_system=="Windows" - with when("@:0.6"): - depends_on("py-nipype@1.4.2:1.4", type=("build", "run")) - depends_on("py-pybids@0.9.3:0.9", type=("build", "run")) - depends_on("py-nibabel@2.4.0:2.4", type=("build", "run")) - depends_on("py-nistats@0.0.1b2", type=("build", "run")) - depends_on("py-nilearn@0.4.2:0.4", type=("build", "run")) - depends_on("py-pandas@0.24.0:0.24", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-niworkflows@1.0.2:1.0", type=("build", "run")) - depends_on("py-duecredit@0.6.4:0.6", type=("build", "run")) - depends_on("py-scikit-learn@0.19.2:0.19", type=("build", "run")) - depends_on("py-matplotlib@2.2.4:2.2", type=("build", "run")) - depends_on("py-mne@0.18.1:0.18", type=("build", "run")) - # pypiwin32; platform_system=="Windows" - @run_after("install") def patch_bin(self): # pkg_resources fails to find the dependencies, resulting in errors diff --git a/var/spack/repos/builtin/packages/py-nilearn/package.py b/var/spack/repos/builtin/packages/py-nilearn/package.py index 7671b048690b87..b98c4bc7497af7 100644 --- a/var/spack/repos/builtin/packages/py-nilearn/package.py +++ b/var/spack/repos/builtin/packages/py-nilearn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-ninja/package.py b/var/spack/repos/builtin/packages/py-ninja/package.py index e3fcee1742477e..db6cbd2417117a 100644 --- a/var/spack/repos/builtin/packages/py-ninja/package.py +++ b/var/spack/repos/builtin/packages/py-ninja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNinja(PythonPackage): homepage = "https://ninja-build.org" pypi = "ninja/ninja-1.10.2.tar.gz" + license("Apache-2.0") + version("1.10.2", sha256="bb5e54b9a7343b3a8fc6532ae2c169af387a45b0d4dd5b72c2803e21658c5791") depends_on("cmake@3.6:", type="build") diff --git a/var/spack/repos/builtin/packages/py-nipype/package.py b/var/spack/repos/builtin/packages/py-nipype/package.py index 21fe36c3cff6ea..a1ae411dc5471d 100644 --- a/var/spack/repos/builtin/packages/py-nipype/package.py +++ b/var/spack/repos/builtin/packages/py-nipype/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNipype(PythonPackage): homepage = "https://github.com/nipy/nipype" pypi = "nipype/nipype-1.6.0.tar.gz" + license("Apache-2.0") + version("1.8.6", sha256="977b1315e8f70f94163ec07e31e5571be83f2add6023141c5a06ac700126f8d1") version("1.8.5", sha256="e3842743fb660464dd29de73dcfc9ef66d273be10bcc64059ff21cd5ef1e9655") version("1.7.0", sha256="e689fe2e5049598c9cd3708e8df1cac732fa1a88696f283e3bc0a70fecb8ab51") diff --git a/var/spack/repos/builtin/packages/py-nistats/package.py b/var/spack/repos/builtin/packages/py-nistats/package.py index f9c5ab2574f627..c97d36aa556713 100644 --- a/var/spack/repos/builtin/packages/py-nistats/package.py +++ b/var/spack/repos/builtin/packages/py-nistats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-nitransforms/package.py b/var/spack/repos/builtin/packages/py-nitransforms/package.py index 6206c2d05a8a8c..642ffa21891222 100644 --- a/var/spack/repos/builtin/packages/py-nitransforms/package.py +++ b/var/spack/repos/builtin/packages/py-nitransforms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNitransforms(PythonPackage): homepage = "https://github.com/poldracklab/nitransforms" pypi = "nitransforms/nitransforms-21.0.0.tar.gz" + license("MIT") + version("21.0.0", sha256="9e326a1ea5d5c6577219f99d33c1a680a760213e243182f370ce7e6b2476103a") version("20.0.0rc5", sha256="650eb12155f01fae099298445cc33721b9935d9c880f54ec486ec4adf3bffe6e") diff --git a/var/spack/repos/builtin/packages/py-niworkflows/package.py b/var/spack/repos/builtin/packages/py-niworkflows/package.py index caedf49ab5bdc5..c581ac82cb9077 100644 --- a/var/spack/repos/builtin/packages/py-niworkflows/package.py +++ b/var/spack/repos/builtin/packages/py-niworkflows/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNiworkflows(PythonPackage): homepage = "https://github.com/nipreps/niworkflows" pypi = "niworkflows/niworkflows-1.4.0.tar.gz" + license("Apache-2.0") + version("1.4.0", sha256="d4e59070fde0290e0bfeece120ff1d2ff1f9573e3f2e6a719fe463c913af25ec") version("1.3.5", sha256="92e24f3462fb3ad4d8ee724506fba05da2b3ca0626850dd2e637a553e17d69b8") version("1.0.4", sha256="34bfa5561e6f872dbd85bb30a1b44c5e1be525167abe3932aee8ac06d15f6ed9") diff --git a/var/spack/repos/builtin/packages/py-nltk/package.py b/var/spack/repos/builtin/packages/py-nltk/package.py index 80a3b07b5f3a26..db9cc2c5b85941 100644 --- a/var/spack/repos/builtin/packages/py-nltk/package.py +++ b/var/spack/repos/builtin/packages/py-nltk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyNltk(PythonPackage): homepage = "https://www.nltk.org/" pypi = "nltk/nltk-3.5.zip" + license("Apache-2.0") + version("3.8.1", sha256="1834da3d0682cba4f2cede2f9aad6b0fafb6461ba451db0efb6f9c39798d64d3") version("3.5", sha256="845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35") diff --git a/var/spack/repos/builtin/packages/py-node-semver/package.py b/var/spack/repos/builtin/packages/py-node-semver/package.py index f7c9778a200363..b4859a1ee37a83 100644 --- a/var/spack/repos/builtin/packages/py-node-semver/package.py +++ b/var/spack/repos/builtin/packages/py-node-semver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNodeSemver(PythonPackage): homepage = "https://github.com/podhmo/python-semver" pypi = "node-semver/node-semver-0.8.1.tar.gz" + license("MIT") + version("0.8.1", sha256="281600d009606f4f63ddcbe148992e235b39a69937b9c20359e2f4a2adbb1e00") version("0.6.1", sha256="4016f7c1071b0493f18db69ea02d3763e98a633606d7c7beca811e53b5ac66b7") diff --git a/var/spack/repos/builtin/packages/py-nodeenv/package.py b/var/spack/repos/builtin/packages/py-nodeenv/package.py index 592ca340a53d78..ef8028d21f7b3b 100644 --- a/var/spack/repos/builtin/packages/py-nodeenv/package.py +++ b/var/spack/repos/builtin/packages/py-nodeenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-nose-cov/package.py b/var/spack/repos/builtin/packages/py-nose-cov/package.py index a4f5165f7810a2..8ba5515b10a48f 100644 --- a/var/spack/repos/builtin/packages/py-nose-cov/package.py +++ b/var/spack/repos/builtin/packages/py-nose-cov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyNoseCov(PythonPackage): pypi = "nose-cov/nose-cov-1.6.tar.gz" + license("MIT") + version("1.6", sha256="8bec0335598f1cc69e3262cc50d7678c1a6010fa44625ce343c4ec1500774412") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-nose/package.py b/var/spack/repos/builtin/packages/py-nose/package.py index 17dd6cfd148431..a67e51d807a5b7 100644 --- a/var/spack/repos/builtin/packages/py-nose/package.py +++ b/var/spack/repos/builtin/packages/py-nose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNose(PythonPackage): pypi = "nose/nose-1.3.4.tar.gz" + license("LGPL-2.1-or-later") + version("1.3.7", sha256="f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98") version("1.3.6", sha256="f61e0909a743eed37b1207e38a8e7b4a2fe0a82185e36f2be252ef1b3f901758") version("1.3.4", sha256="76bc63a4e2d5e5a0df77ca7d18f0f56e2c46cfb62b71103ba92a92c79fab1e03") diff --git a/var/spack/repos/builtin/packages/py-nose2/package.py b/var/spack/repos/builtin/packages/py-nose2/package.py index db721c63b7da12..b3aa71a2cc87c9 100644 --- a/var/spack/repos/builtin/packages/py-nose2/package.py +++ b/var/spack/repos/builtin/packages/py-nose2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNose2(PythonPackage): homepage = "https://github.com/nose-devs/nose2" pypi = "nose2/nose2-0.9.1.tar.gz" + license("BSD-2-Clause") + version("0.9.1", sha256="0ede156fd7974fa40893edeca0b709f402c0ccacd7b81b22e76f73c116d1b999") version("0.6.0", sha256="daa633e92a52e0db60ade7e105a2ba5cad7ac819f3608740dcfc6140b9fd0a94") diff --git a/var/spack/repos/builtin/packages/py-nosexcover/package.py b/var/spack/repos/builtin/packages/py-nosexcover/package.py index 9acb81a9fa4cb7..f4f2779d4e8c0b 100644 --- a/var/spack/repos/builtin/packages/py-nosexcover/package.py +++ b/var/spack/repos/builtin/packages/py-nosexcover/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-notebook-shim/package.py b/var/spack/repos/builtin/packages/py-notebook-shim/package.py index d2008923ba9e1f..d2a007717684bc 100644 --- a/var/spack/repos/builtin/packages/py-notebook-shim/package.py +++ b/var/spack/repos/builtin/packages/py-notebook-shim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNotebookShim(PythonPackage): homepage = "https://github.com/jupyter/notebook_shim" pypi = "notebook_shim/notebook_shim-0.2.2.tar.gz" + license("BSD-3-Clause") + version("0.2.3", sha256="f69388ac283ae008cd506dda10d0288b09a017d822d5e8c7129a152cbd3ce7e9") version("0.2.2", sha256="090e0baf9a5582ff59b607af523ca2db68ff216da0c69956b62cab2ef4fc9c3f") diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py index 382c0aa91d2e18..1f62831bfc44c9 100644 --- a/var/spack/repos/builtin/packages/py-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-notebook/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-nptyping/package.py b/var/spack/repos/builtin/packages/py-nptyping/package.py index f59291190d8090..454e0d252b20c2 100644 --- a/var/spack/repos/builtin/packages/py-nptyping/package.py +++ b/var/spack/repos/builtin/packages/py-nptyping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNptyping(PythonPackage): url = "https://github.com/ramonhagenaars/nptyping/archive/v2.4.1.tar.gz" # avoid pypi for now: https://github.com/ramonhagenaars/nptyping/issues/98 + license("MIT") + version("2.4.1", sha256="1c1b2b08220d271f3e52dbf2bd9190e4dd15b3c04abfcf7a04ec533d3cc9fdab") version("1.4.1", sha256="bbcedb967f8be1302dffdd999eb531b99712c6914078294b4411758d5899b3b6") version("1.0.1", sha256="a00e672bfdaddc99aa6b25dd1ae89d7d58d2b76e8ad099bd69577bac2598589f") diff --git a/var/spack/repos/builtin/packages/py-npx/package.py b/var/spack/repos/builtin/packages/py-npx/package.py index 96d6a7bd7b27d2..ff20fb026efef0 100644 --- a/var/spack/repos/builtin/packages/py-npx/package.py +++ b/var/spack/repos/builtin/packages/py-npx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNpx(PythonPackage): homepage = "https://github.com/nschloe/npx" pypi = "npx/npx-0.1.0.tar.gz" + license("BSD-3-Clause") + version("0.1.0", sha256="3edec9508326b6724d7c176dbcba2098508788241b8a671aab583d0c72b2f05b") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py index 0b8d5ea14324e1..19b099cee5de02 100644 --- a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py +++ b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNtlmAuth(PythonPackage): homepage = "https://github.com/jborean93/ntlm-auth" pypi = "ntlm-auth/ntlm-auth-1.5.0.tar.gz" + license("MIT") + version("1.5.0", sha256="c9667d361dc09f6b3750283d503c689070ff7d89f2f6ff0d38088d5436ff8543") depends_on("python@2.6:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ntplib/package.py b/var/spack/repos/builtin/packages/py-ntplib/package.py index 629f4eae37e1d9..ba9fcf2bb93367 100644 --- a/var/spack/repos/builtin/packages/py-ntplib/package.py +++ b/var/spack/repos/builtin/packages/py-ntplib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNtplib(PythonPackage): git = "https://github.com/cf-natali/ntplib.git" pypi = "ntplib/ntplib-0.4.0.tar.gz" + license("MIT") + version("0.4.0", sha256="899d8fb5f8c2555213aea95efca02934c7343df6ace9d7628a5176b176906267") depends_on("python@2.7,3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-num2words/package.py b/var/spack/repos/builtin/packages/py-num2words/package.py index 517d856ee367d3..af7f78f71d2e67 100644 --- a/var/spack/repos/builtin/packages/py-num2words/package.py +++ b/var/spack/repos/builtin/packages/py-num2words/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNum2words(PythonPackage): homepage = "https://github.com/savoirfairelinux/num2words" pypi = "num2words/num2words-0.5.10.tar.gz" + license("LGPL-2.1-or-later") + version("0.5.12", sha256="7e7c0b0f080405aa3a1dd9d32b1ca90b3bf03bab17b8e54db05e1b78301a0988") version("0.5.10", sha256="37cd4f60678f7e1045cdc3adf6acf93c8b41bf732da860f97d301f04e611cc57") diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index c266f53a7487d0..add71b169e7c1b 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,11 @@ class PyNumba(PythonPackage): pypi = "numba/numba-0.35.0.tar.gz" git = "https://github.com/numba/numba.git" + skip_modules = ["numba.core.rvsdg_frontend"] + + license("BSD-2-Clause") + + version("0.58.1", sha256="487ded0633efccd9ca3a46364b40006dbdaca0f95e99b8b83e778d1195ebcbaa") version("0.57.0", sha256="2af6d81067a5bdc13960c6d2519dbabbf4d5d597cf75d640c5aeaefd48c6420a") version("0.56.4", sha256="32d9fef412c81483d7efe0ceb6cf4d3310fde8b624a9cecca00f790573ac96ee") version("0.56.0", sha256="87a647dd4b8fce389869ff71f117732de9a519fe07663d9a02d75724eb8e244d") @@ -22,32 +27,30 @@ class PyNumba(PythonPackage): version("0.51.1", sha256="1e765b1a41535684bf3b0465c1d0a24dcbbff6af325270c8f4dad924c0940160") version("0.50.1", sha256="89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7") version("0.48.0", sha256="9d21bc77e67006b5723052840c88cc59248e079a907cc68f1a1a264e1eaba017") - version("0.40.1", sha256="52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33") - depends_on("python@3.8:3.11", when="@0.57", type=("build", "run")) + depends_on("python@3.8:3.11", when="@0.57:", type=("build", "run")) depends_on("python@3.7:3.10", when="@0.55:0.56", type=("build", "run")) depends_on("python@3.7:3.9", when="@0.54", type=("build", "run")) depends_on("python@3.6:3.9", when="@0.53", type=("build", "run")) depends_on("python@3.6:3.8", when="@0.52", type=("build", "run")) depends_on("python@3.6:3.8", when="@0.48:0.51", type=("build", "run")) - depends_on("python@3.3:3.7", when="@0.40.1:0.47", type=("build", "run")) - depends_on("py-numpy@1.21:1.24", when="@0.57:", type=("build", "run")) + depends_on("py-numpy@1.22:1.26", when="@0.58.1:", type=("build", "run")) + depends_on("py-numpy@1.21:1.25", when="@0.58.0", type=("build", "run")) + depends_on("py-numpy@1.21:1.24", when="@0.57", type=("build", "run")) depends_on("py-numpy@1.18:1.23", when="@0.56.1:0.56.4", type=("build", "run")) depends_on("py-numpy@1.18:1.22", when="@0.55.2:0.56.0", type=("build", "run")) depends_on("py-numpy@1.18:1.21", when="@0.55.0:0.55.1", type=("build", "run")) depends_on("py-numpy@1.17:1.20", when="@0.54", type=("build", "run")) depends_on("py-numpy@1.15:1.20", when="@0.48:0.53", type=("build", "run")) - depends_on("py-numpy@1.10:1.20", when="@:0.47", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) + depends_on("py-llvmlite@0.41", when="@0.58", type=("build", "run")) depends_on("py-llvmlite@0.40", when="@0.57", type=("build", "run")) depends_on("py-llvmlite@0.39", when="@0.56", type=("build", "run")) depends_on("py-llvmlite@0.38", when="@0.55", type=("build", "run")) depends_on("py-llvmlite@0.37", when="@0.54.0", type=("build", "run")) depends_on("py-llvmlite@0.34", when="@0.51.1", type=("build", "run")) depends_on("py-llvmlite@0.33", when="@0.50.1", type=("build", "run")) - depends_on("py-llvmlite@0.31", when="@0.47,0.48", type=("build", "run")) - depends_on("py-llvmlite@0.25", when="@0.40", type=("build", "run")) - depends_on("py-llvmlite@0.20:0.25", when="@0.35.1", type=("build", "run")) + depends_on("py-llvmlite@0.31", when="@0.48", type=("build", "run")) depends_on("py-importlib-metadata", when="@0.56:^python@:3.8", type=("build", "run")) # Version 6.0.0 of llvm had a hidden symbol which breaks numba at runtime. diff --git a/var/spack/repos/builtin/packages/py-numcodecs/package.py b/var/spack/repos/builtin/packages/py-numcodecs/package.py index 6d466c19175c48..5414661794c0a9 100644 --- a/var/spack/repos/builtin/packages/py-numcodecs/package.py +++ b/var/spack/repos/builtin/packages/py-numcodecs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyNumcodecs(PythonPackage): # an additional dependency on 'pytest' import_modules = ["numcodecs"] + license("MIT") + version("master", branch="master", submodules=True) version("0.11.0", sha256="6c058b321de84a1729299b0eae4d652b2e48ea1ca7f9df0da65cb13470e635eb") version("0.7.3", sha256="022b12ad83eb623ec53f154859d49f6ec43b15c36052fa864eaf2d9ee786dd85") diff --git a/var/spack/repos/builtin/packages/py-numdifftools/package.py b/var/spack/repos/builtin/packages/py-numdifftools/package.py new file mode 100644 index 00000000000000..33b6534480a575 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-numdifftools/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class PyNumdifftools(PythonPackage): + """Solves automatic numerical differentiation problems in one or more + variables.""" + + homepage = "https://github.com/pbrod/numdifftools" + pypi = "numdifftools/numdifftools-0.9.41.tar.gz" + + version("0.9.41", sha256="4ef705cd3c06211b3a4e9fd05ad622be916dcfda40732f0128805a2c4be389b4") + + depends_on("python@3.7:", type=("build", "run")) + + depends_on("py-setuptools@39.2:", type="build") + depends_on("py-numpy@1.9:", type=("build", "run")) + depends_on("py-scipy@0.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py index dcad64baaa114b..9e340b58fc90ea 100644 --- a/var/spack/repos/builtin/packages/py-numexpr/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNumexpr(PythonPackage): homepage = "https://github.com/pydata/numexpr" url = "https://github.com/pydata/numexpr/archive/v2.7.0.tar.gz" + license("MIT") + version("2.8.4", sha256="0e21addd25db5f62d60d97e4380339d9c1fb2de72c88b070c279776ee6455d10") version("2.8.3", sha256="389ceefca74eff30ec3fd03fc4c3b7ab3df8f22d1f235117a392ce702ed208c0") version("2.7.3", sha256="00d6b1518605afe0ed10417e0ff07123e5d531c02496c6eed7dd4b9923238e1e") diff --git a/var/spack/repos/builtin/packages/py-numexpr3/package.py b/var/spack/repos/builtin/packages/py-numexpr3/package.py index 004a7bdef0aa07..5162eca2a3d6d7 100644 --- a/var/spack/repos/builtin/packages/py-numexpr3/package.py +++ b/var/spack/repos/builtin/packages/py-numexpr3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyNumexpr3(PythonPackage): homepage = "https://github.com/pydata/numexpr/tree/numexpr-3.0" pypi = "numexpr3/numexpr3-3.0.1a1.tar.gz" + license("BSD-3-Clause") + version("3.0.1a1", sha256="de06f1b4206704b5bc19ea09b5c94350b97c211c26bc866f275252a8461b87e6") # TODO: Add CMake build system for better control of passing flags related # to CPU ISA. diff --git a/var/spack/repos/builtin/packages/py-numpy-groupies/package.py b/var/spack/repos/builtin/packages/py-numpy-groupies/package.py index 14098272753433..b2f12ad78ed0ad 100644 --- a/var/spack/repos/builtin/packages/py-numpy-groupies/package.py +++ b/var/spack/repos/builtin/packages/py-numpy-groupies/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyNumpyGroupies(PythonPackage): homepage = "https://github.com/ml31415/numpy-groupies" pypi = "numpy_groupies/numpy_groupies-0.9.20.tar.gz" + license("BSD-2-Clause") + version("0.9.20", sha256="923a382d6bc6876384b58a9c0503b05b9d36a660f329695c2d33e4f93fcbbe3d") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py b/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py index 404d7a090b4217..fffb983756b84c 100644 --- a/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py +++ b/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyNumpyQuaternion(PythonPackage): homepage = "https://github.com/moble/quaternion" pypi = "numpy-quaternion/numpy-quaternion-2021.11.4.15.26.3.tar.gz" + license("MIT") + version( "2021.11.4.15.26.3", sha256="b0dc670b2adc8ff2fb8d6105a48769873f68d6ccbe20af6a19e899b1e8d48aaf", diff --git a/var/spack/repos/builtin/packages/py-numpy-stl/package.py b/var/spack/repos/builtin/packages/py-numpy-stl/package.py index e7892351327b9c..827b52416214d2 100644 --- a/var/spack/repos/builtin/packages/py-numpy-stl/package.py +++ b/var/spack/repos/builtin/packages/py-numpy-stl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNumpyStl(PythonPackage): homepage = "https://github.com/WoLpH/numpy-stl/" pypi = "numpy-stl/numpy-stl-2.10.1.tar.gz" + license("BSD-3-Clause") + version("3.0.0", sha256="578b78eacb0529ac9aba2f17dcc363d58c7c3c5708710c18f8c1e9965f2e81ac") version("2.10.1", sha256="f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c") diff --git a/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch b/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch deleted file mode 100644 index ac27d87dcdf81f..00000000000000 --- a/var/spack/repos/builtin/packages/py-numpy/blas-lapack-order.patch +++ /dev/null @@ -1,347 +0,0 @@ -Allows you to specify order of BLAS/LAPACK preference -https://github.com/numpy/numpy/pull/13132 -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 806f4f7d3..0480d7b5a 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -474,6 +474,13 @@ class LapackSrcNotFoundError(LapackNotFoundError): - the LAPACK_SRC environment variable.""" - - -+class BlasOptNotFoundError(NotFoundError): -+ """ -+ Optimized (vendor) Blas libraries are not found. -+ Falls back to netlib Blas library which has worse performance. -+ A better performance should be easily gained by switching -+ Blas library.""" -+ - class BlasNotFoundError(NotFoundError): - """ - Blas (http://www.netlib.org/blas/) libraries not found. -@@ -1541,139 +1548,219 @@ Make sure that -lgfortran is used for C++ extensions. - class lapack_opt_info(system_info): - - notfounderror = LapackNotFoundError -+ # Default order of LAPACK checks -+ lapack_order = ['mkl', 'openblas', 'atlas', 'accelerate', 'lapack'] - -- def calc_info(self): -+ def _calc_info_mkl(self): -+ info = get_info('lapack_mkl') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- lapack_mkl_info = get_info('lapack_mkl') -- if lapack_mkl_info: -- self.set_info(**lapack_mkl_info) -- return -+ def _calc_info_openblas(self): -+ info = get_info('openblas_lapack') -+ if info: -+ self.set_info(**info) -+ return True -+ info = get_info('openblas_clapack') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- openblas_info = get_info('openblas_lapack') -- if openblas_info: -- self.set_info(**openblas_info) -- return -+ def _calc_info_atlas(self): -+ info = get_info('atlas_3_10_threads') -+ if not info: -+ info = get_info('atlas_3_10') -+ if not info: -+ info = get_info('atlas_threads') -+ if not info: -+ info = get_info('atlas') -+ if info: -+ # Figure out if ATLAS has lapack... -+ # If not we need the lapack library, but not BLAS! -+ l = info.get('define_macros', []) -+ if ('ATLAS_WITH_LAPACK_ATLAS', None) in l \ -+ or ('ATLAS_WITHOUT_LAPACK', None) in l: -+ # Get LAPACK (with possible warnings) -+ # If not found we don't accept anything -+ # since we can't use ATLAS with LAPACK! -+ lapack_info = self._get_info_lapack() -+ if not lapack_info: -+ return False -+ dict_append(info, **lapack_info) -+ self.set_info(**info) -+ return True -+ return False - -- openblas_info = get_info('openblas_clapack') -- if openblas_info: -- self.set_info(**openblas_info) -- return -+ def _calc_info_accelerate(self): -+ info = get_info('accelerate') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- atlas_info = get_info('atlas_3_10_threads') -- if not atlas_info: -- atlas_info = get_info('atlas_3_10') -- if not atlas_info: -- atlas_info = get_info('atlas_threads') -- if not atlas_info: -- atlas_info = get_info('atlas') -- -- accelerate_info = get_info('accelerate') -- if accelerate_info and not atlas_info: -- self.set_info(**accelerate_info) -- return -+ def _get_info_blas(self): -+ # Default to get the optimized BLAS implementation -+ info = get_info('blas_opt') -+ if not info: -+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=3) -+ info_src = get_info('blas_src') -+ if not info_src: -+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=3) -+ return {} -+ dict_append(info, libraries=[('fblas_src', info_src)]) -+ return info - -- need_lapack = 0 -- need_blas = 0 -- info = {} -- if atlas_info: -- l = atlas_info.get('define_macros', []) -- if ('ATLAS_WITH_LAPACK_ATLAS', None) in l \ -- or ('ATLAS_WITHOUT_LAPACK', None) in l: -- need_lapack = 1 -- info = atlas_info -+ def _get_info_lapack(self): -+ info = get_info('lapack') -+ if not info: -+ warnings.warn(LapackNotFoundError.__doc__ or '', stacklevel=3) -+ info_src = get_info('lapack_src') -+ if not info_src: -+ warnings.warn(LapackSrcNotFoundError.__doc__ or '', stacklevel=3) -+ return {} -+ dict_append(info, libraries=[('flapack_src', info_src)]) -+ return info - -- else: -- warnings.warn(AtlasNotFoundError.__doc__, stacklevel=2) -- need_blas = 1 -- need_lapack = 1 -+ def _calc_info_lapack(self): -+ info = self._get_info_lapack() -+ if info: -+ info_blas = self._get_info_blas() -+ dict_append(info, **info_blas) - dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)]) -+ self.set_info(**info) -+ return True -+ return False - -- if need_lapack: -- lapack_info = get_info('lapack') -- #lapack_info = {} ## uncomment for testing -- if lapack_info: -- dict_append(info, **lapack_info) -- else: -- warnings.warn(LapackNotFoundError.__doc__, stacklevel=2) -- lapack_src_info = get_info('lapack_src') -- if not lapack_src_info: -- warnings.warn(LapackSrcNotFoundError.__doc__, stacklevel=2) -- return -- dict_append(info, libraries=[('flapack_src', lapack_src_info)]) -- -- if need_blas: -- blas_info = get_info('blas') -- if blas_info: -- dict_append(info, **blas_info) -- else: -- warnings.warn(BlasNotFoundError.__doc__, stacklevel=2) -- blas_src_info = get_info('blas_src') -- if not blas_src_info: -- warnings.warn(BlasSrcNotFoundError.__doc__, stacklevel=2) -- return -- dict_append(info, libraries=[('fblas_src', blas_src_info)]) -+ def calc_info(self): -+ user_order = os.environ.get('NPY_LAPACK_ORDER', None) -+ if user_order is None: -+ lapack_order = self.lapack_order -+ else: -+ # the user has requested the order of the -+ # check they are all in the available list, a COMMA SEPARATED list -+ user_order = user_order.lower().split(',') -+ non_existing = [] -+ lapack_order = [] -+ for order in user_order: -+ if order in self.lapack_order: -+ lapack_order.append(order) -+ elif len(order) > 0: -+ non_existing.append(order) -+ if len(non_existing) > 0: -+ raise ValueError("lapack_opt_info user defined " -+ "LAPACK order has unacceptable " -+ "values: {}".format(non_existing)) -+ -+ for lapack in lapack_order: -+ if getattr(self, '_calc_info_{}'.format(lapack))(): -+ return - -- self.set_info(**info) -- return -+ if 'lapack' not in lapack_order: -+ # Since the user may request *not* to use any library, we still need -+ # to raise warnings to signal missing packages! -+ warnings.warn(LapackNotFoundError.__doc__ or '', stacklevel=2) -+ warnings.warn(LapackSrcNotFoundError.__doc__ or '', stacklevel=2) - - - class blas_opt_info(system_info): - - notfounderror = BlasNotFoundError -+ # Default order of BLAS checks -+ blas_order = ['mkl', 'blis', 'openblas', 'atlas', 'accelerate', 'blas'] - -- def calc_info(self): -+ def _calc_info_mkl(self): -+ info = get_info('blas_mkl') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- blas_mkl_info = get_info('blas_mkl') -- if blas_mkl_info: -- self.set_info(**blas_mkl_info) -- return -+ def _calc_info_blis(self): -+ info = get_info('blis') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- blis_info = get_info('blis') -- if blis_info: -- self.set_info(**blis_info) -- return -+ def _calc_info_openblas(self): -+ info = get_info('openblas') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- openblas_info = get_info('openblas') -- if openblas_info: -- self.set_info(**openblas_info) -- return -+ def _calc_info_atlas(self): -+ info = get_info('atlas_3_10_blas_threads') -+ if not info: -+ info = get_info('atlas_3_10_blas') -+ if not info: -+ info = get_info('atlas_blas_threads') -+ if not info: -+ info = get_info('atlas_blas') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- atlas_info = get_info('atlas_3_10_blas_threads') -- if not atlas_info: -- atlas_info = get_info('atlas_3_10_blas') -- if not atlas_info: -- atlas_info = get_info('atlas_blas_threads') -- if not atlas_info: -- atlas_info = get_info('atlas_blas') -- -- accelerate_info = get_info('accelerate') -- if accelerate_info and not atlas_info: -- self.set_info(**accelerate_info) -- return -+ def _calc_info_accelerate(self): -+ info = get_info('accelerate') -+ if info: -+ self.set_info(**info) -+ return True -+ return False - -- need_blas = 0 -+ def _calc_info_blas(self): -+ # Warn about a non-optimized BLAS library -+ warnings.warn(BlasOptNotFoundError.__doc__ or '', stacklevel=3) - info = {} -- if atlas_info: -- info = atlas_info -+ dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)]) -+ -+ blas = get_info('blas') -+ if blas: -+ dict_append(info, **blas) - else: -- warnings.warn(AtlasNotFoundError.__doc__, stacklevel=2) -- need_blas = 1 -- dict_append(info, define_macros=[('NO_ATLAS_INFO', 1)]) -+ # Not even BLAS was found! -+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=3) - -- if need_blas: -- blas_info = get_info('blas') -- if blas_info: -- dict_append(info, **blas_info) -- else: -- warnings.warn(BlasNotFoundError.__doc__, stacklevel=2) -- blas_src_info = get_info('blas_src') -- if not blas_src_info: -- warnings.warn(BlasSrcNotFoundError.__doc__, stacklevel=2) -- return -- dict_append(info, libraries=[('fblas_src', blas_src_info)]) -+ blas_src = get_info('blas_src') -+ if not blas_src: -+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=3) -+ return False -+ dict_append(info, libraries=[('fblas_src', blas_src)]) - - self.set_info(**info) -- return -+ return True -+ -+ def calc_info(self): -+ user_order = os.environ.get('NPY_BLAS_ORDER', None) -+ if user_order is None: -+ blas_order = self.blas_order -+ else: -+ # the user has requested the order of the -+ # check they are all in the available list -+ user_order = user_order.lower().split(',') -+ non_existing = [] -+ blas_order = [] -+ for order in user_order: -+ if order in self.blas_order: -+ blas_order.append(order) -+ elif len(order) > 0: -+ non_existing.append(order) -+ if len(non_existing) > 0: -+ raise ValueError("blas_opt_info user defined BLAS order has unacceptable values: {}".format(non_existing)) -+ -+ for blas in blas_order: -+ if getattr(self, '_calc_info_{}'.format(blas))(): -+ return -+ -+ if 'blas' not in blas_order: -+ # Since the user may request *not* to use any library, we still need -+ # to raise warnings to signal missing packages! -+ warnings.warn(BlasNotFoundError.__doc__ or '', stacklevel=2) -+ warnings.warn(BlasSrcNotFoundError.__doc__ or '', stacklevel=2) - - - class blas_info(system_info): diff --git a/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch b/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch deleted file mode 100644 index b553acb46f9218..00000000000000 --- a/var/spack/repos/builtin/packages/py-numpy/check_executables4.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- spack-src/numpy/distutils/fcompiler/__init__.py.orig 2018-11-03 10:49:58.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/__init__.py 2021-02-12 17:57:50.632263931 +0900 -@@ -318,7 +318,12 @@ - if not exe_from_environ: - possibles = [f90, f77] + self.possible_executables - else: -- possibles = [exe_from_environ] + self.possible_executables -+ matching_executables = [] -+ for e in exe_from_environ: -+ for p in self.possible_executables: -+ if p in e: -+ matching_executables.append(e) -+ possibles = [matching_executables] + self.possible_executables - - seen = set() - unique_possibles = [] diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 24bc86134b0dc9..aeab552bd51ab0 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,11 @@ class PyNumpy(PythonPackage): maintainers("adamjstewart", "rgommers") + license("BSD-3-Clause") + version("main", branch="main") + version("1.26.3", sha256="697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4") + version("1.26.2", sha256="f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea") version("1.26.1", sha256="c8c6c72d4a9f831f328efb1312642a1cafafaa88981d9ab76368d50d07d93cbe") version("1.26.0", sha256="f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf") version("1.25.2", sha256="fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760") @@ -67,24 +71,6 @@ class PyNumpy(PythonPackage): version("1.17.5", sha256="16507ba6617f62ae3c6ab1725ae6f550331025d4d9a369b83f6d5a470446c342") version("1.17.4", sha256="f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316") version("1.17.3", sha256="a0678793096205a4d784bd99f32803ba8100f639cf3b932dc63b21621390ea7e") - version("1.17.2", sha256="73615d3edc84dd7c4aeb212fa3748fb83217e00d201875a47327f55363cef2df") - version("1.17.1", sha256="f11331530f0eff69a758d62c2461cd98cdc2eae0147279d8fc86e0464eb7e8ca") - version("1.17.0", sha256="951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a") - version("1.16.6", sha256="e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff") - version("1.16.5", sha256="8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c") - version("1.16.4", sha256="7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7") - version("1.16.3", sha256="78a6f89da87eeb48014ec652a65c4ffde370c036d780a995edaeb121d3625621") - version("1.16.2", sha256="6c692e3879dde0b67a9dc78f9bfb6f61c666b4562fd8619632d7043fb5b691b0") - version("1.16.1", sha256="31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288") - version("1.16.0", sha256="cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb") - version("1.15.4", sha256="3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7") - version("1.15.3", sha256="1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6") - version("1.15.2", sha256="27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1") - version("1.15.2", sha256="27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1") - version("1.15.1", sha256="7b9e37f194f8bcdca8e9e6af92e2cbad79e360542effc2dd6b98d63955d8d8a3") - version("1.15.0", sha256="f28e73cf18d37a413f7d5de35d024e6b98f14566a10d82100f9dc491a7d449f9") - version("1.14.6", sha256="1250edf6f6c43e1d7823f0967416bc18258bb271dc536298eb0ea00a9e45b80a") - version("1.14.5", sha256="a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac") depends_on("python@3.9:3.12", when="@1.26:", type=("build", "link", "run")) depends_on("python@3.9:3.11", when="@1.25", type=("build", "link", "run")) @@ -93,7 +79,6 @@ class PyNumpy(PythonPackage): depends_on("python@:3.10", when="@1.21.2:1.21", type=("build", "link", "run")) depends_on("python@:3.9", when="@1.19.3:1.21.1", type=("build", "link", "run")) depends_on("python@:3.8", when="@1.17.3:1.19.2", type=("build", "link", "run")) - depends_on("python@:3.7", when="@1.14.5:1.17.2", type=("build", "link", "run")) depends_on("py-cython@0.29.34:3", when="@1.26:", type="build") depends_on("py-cython@0.29.34:2", when="@1.25", type="build") @@ -119,15 +104,10 @@ class PyNumpy(PythonPackage): depends_on("lapack") # test_requirements.txt - depends_on("py-nose@1.0.0:", when="@:1.14", type="test") - depends_on("py-pytest", when="@1.15:", type="test") + depends_on("py-pytest", type="test") depends_on("py-hypothesis", when="@1.19:", type="test") depends_on("py-typing-extensions@4.2:", when="@1.23:", type="test") - # Allows you to specify order of BLAS/LAPACK preference - # https://github.com/numpy/numpy/pull/13132 - patch("blas-lapack-order.patch", when="@1.15:1.16") - # Add Fujitsu Fortran compiler patch("add_fj_compiler.patch", when="@1.19.3:1.19.5%fj") patch("add_fj_compiler2.patch", when="@1.19.0:1.19.2%fj") @@ -136,7 +116,6 @@ class PyNumpy(PythonPackage): patch("check_executables.patch", when="@1.20.0:") patch("check_executables2.patch", when="@1.19.0:1.19.5") patch("check_executables3.patch", when="@1.16.0:1.18.5") - patch("check_executables4.patch", when="@1.14.0:1.15.4") # Backport bug fix for f2py's define for threading when building with Mingw patch( diff --git a/var/spack/repos/builtin/packages/py-numpydoc/package.py b/var/spack/repos/builtin/packages/py-numpydoc/package.py index 2c3a2f42e29c3c..c39a805e3a674e 100644 --- a/var/spack/repos/builtin/packages/py-numpydoc/package.py +++ b/var/spack/repos/builtin/packages/py-numpydoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyNumpydoc(PythonPackage): homepage = "https://github.com/numpy/numpydoc" pypi = "numpydoc/numpydoc-0.6.0.tar.gz" + license("BSD-2-Clause") + version("1.5.0", sha256="b0db7b75a32367a0e25c23b397842c65e344a1206524d16c8069f0a1c91b5f4c") version("1.1.0", sha256="c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e") version("0.6.0", sha256="1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1") diff --git a/var/spack/repos/builtin/packages/py-nvidia-dali/package.py b/var/spack/repos/builtin/packages/py-nvidia-dali/package.py index 93804505fb5e5c..b67fe5c01ec1db 100644 --- a/var/spack/repos/builtin/packages/py-nvidia-dali/package.py +++ b/var/spack/repos/builtin/packages/py-nvidia-dali/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py b/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py index d2fefe3d0bc84d..52015c526a5767 100644 --- a/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py +++ b/var/spack/repos/builtin/packages/py-nvidia-ml-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNvidiaMlPy(PythonPackage): homepage = "https://www.nvidia.com/" pypi = "nvidia-ml-py/nvidia-ml-py-11.450.51.tar.gz" + license("Unlicense") + version("11.450.51", sha256="5aa6dd23a140b1ef2314eee5ca154a45397b03e68fd9ebc4f72005979f511c73") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py b/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py index 2de151351b39a2..92af3febefbbfc 100644 --- a/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py +++ b/var/spack/repos/builtin/packages/py-nvidia-ml-py3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyNvidiaMlPy3(PythonPackage): homepage = "https://www.nvidia.com/" pypi = "nvidia-ml-py3/nvidia-ml-py3-7.352.0.tar.gz" + license("Unlicense") + version("7.352.0", sha256="390f02919ee9d73fe63a98c73101061a6b37fa694a793abf56673320f1f51277") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-oauth2client/package.py b/var/spack/repos/builtin/packages/py-oauth2client/package.py index 54460de7a85e66..bb530519f62bc0 100644 --- a/var/spack/repos/builtin/packages/py-oauth2client/package.py +++ b/var/spack/repos/builtin/packages/py-oauth2client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyOauth2client(PythonPackage): homepage = "https://github.com/google/oauth2client/" pypi = "oauth2client/oauth2client-4.1.3.tar.gz" + license("Apache-2.0") + version("4.1.3", sha256="d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6") version("3.0.0", sha256="5b5b056ec6f2304e7920b632885bd157fa71d1a7f3ddd00a43b1541a8d1a2460") diff --git a/var/spack/repos/builtin/packages/py-oauthlib/package.py b/var/spack/repos/builtin/packages/py-oauthlib/package.py index e326bb4f196ecd..afb835bcfac47f 100644 --- a/var/spack/repos/builtin/packages/py-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-oauthlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOauthlib(PythonPackage): homepage = "https://github.com/oauthlib/oauthlib" pypi = "oauthlib/oauthlib-3.1.0.tar.gz" + license("BSD-3-Clause") + version("3.2.1", sha256="1565237372795bf6ee3e5aba5e2a85bd5a65d0e2aa5c628b9a97b7d7a0da3721") version("3.1.1", sha256="8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3") version("3.1.0", sha256="bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889") diff --git a/var/spack/repos/builtin/packages/py-ocnn/package.py b/var/spack/repos/builtin/packages/py-ocnn/package.py index e66be99351c3a7..40bd5ec8d51871 100644 --- a/var/spack/repos/builtin/packages/py-ocnn/package.py +++ b/var/spack/repos/builtin/packages/py-ocnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOcnn(PythonPackage): maintainers("wdconinc") + license("MIT") + version("2.2.0", sha256="5fb54305130921ece4cccf1697ec281f49d3e95837ba0e124cab9f8a567ecb80") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ocp-models/package.py b/var/spack/repos/builtin/packages/py-ocp-models/package.py index 0e19540c7b1a2b..bcced6374d6379 100644 --- a/var/spack/repos/builtin/packages/py-ocp-models/package.py +++ b/var/spack/repos/builtin/packages/py-ocp-models/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-odc-geo/package.py b/var/spack/repos/builtin/packages/py-odc-geo/package.py index 7d855710ac6846..1f70d6b901d6d1 100644 --- a/var/spack/repos/builtin/packages/py-odc-geo/package.py +++ b/var/spack/repos/builtin/packages/py-odc-geo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOdcGeo(PythonPackage): homepage = "https://github.com/opendatacube/odc-geo/" pypi = "odc-geo/odc-geo-0.1.2.tar.gz" + license("Apache-2.0") + version("0.1.2", sha256="c5ec3c66a326b138df5a28aa639b1c2c3c644093af463948255219bdc2513408") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-odfpy/package.py b/var/spack/repos/builtin/packages/py-odfpy/package.py index 338fb3beab4bd3..65741b77b1aea2 100644 --- a/var/spack/repos/builtin/packages/py-odfpy/package.py +++ b/var/spack/repos/builtin/packages/py-odfpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOdfpy(PythonPackage): homepage = "https://github.com/eea/odfpy" pypi = "odfpy/odfpy-1.4.1.tar.gz" + license("GPL-2.0-or-later") + version("1.4.1", sha256="db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ogb/package.py b/var/spack/repos/builtin/packages/py-ogb/package.py index b8362aae76ecf6..1aafade506d40d 100644 --- a/var/spack/repos/builtin/packages/py-ogb/package.py +++ b/var/spack/repos/builtin/packages/py-ogb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyOgb(PythonPackage): maintainers("meyersbs") + license("MIT") + version("1.3.5", sha256="ac958094ac3019822e742155b82cb2bf02830aa72a4264ba9ee09b288f0c080c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-olefile/package.py b/var/spack/repos/builtin/packages/py-olefile/package.py index 908dbe4a123eb3..b417e855456e06 100644 --- a/var/spack/repos/builtin/packages/py-olefile/package.py +++ b/var/spack/repos/builtin/packages/py-olefile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOlefile(PythonPackage): homepage = "https://www.decalage.info/python/olefileio" pypi = "olefile/olefile-0.44.zip" + license("Unlicense") + version("0.44", sha256="61f2ca0cd0aa77279eb943c07f607438edf374096b66332fae1ee64a6f0f73ad") depends_on("python@2.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-omegaconf/package.py b/var/spack/repos/builtin/packages/py-omegaconf/package.py index 4fc4afb417680a..78e1970140a361 100644 --- a/var/spack/repos/builtin/packages/py-omegaconf/package.py +++ b/var/spack/repos/builtin/packages/py-omegaconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyOmegaconf(PythonPackage): maintainers("calebrob6") + license("BSD-3-Clause") + version("2.3.0", sha256="d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7") version("2.2.2", sha256="10a89b5cb81887d68137b69a7c5c046a060e2239af4e37f20c3935ad2e5fd865") version("2.1.0", sha256="a08aec03a63c66449b550b85d70238f4dee9c6c4a0541d6a98845dcfeb12439d") diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index debc723696ae82..3b0044e57c1f06 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyOnnx(PythonPackage): homepage = "https://github.com/onnx/onnx" pypi = "Onnx/onnx-1.6.0.tar.gz" + license("Apache-2.0") + version("1.13.1", sha256="0bdcc25c2c1ce4a8750e4ffbd93ae945442e7fac6e51176f38e366b74a97dfd9") version("1.13.0", sha256="410b39950367857f97b65093681fe2495a2e23d63777a8aceaf96c56a16d166e") version("1.12.0", sha256="13b3e77d27523b9dbf4f30dfc9c959455859d5e34e921c44f712d69b8369eff9") diff --git a/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py b/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py index 9df26165096fa2..54d5e3496384f2 100644 --- a/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py +++ b/var/spack/repos/builtin/packages/py-onnxconverter-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOnnxconverterCommon(PythonPackage): homepage = "https://github.com/microsoft/onnxconverter-common" url = "https://github.com/microsoft/onnxconverter-common/archive/refs/tags/v1.9.0.tar.gz" + license("MIT") + version("1.9.0", sha256="32315bcc844a8203092f3117a4a092ac6cf03d6a20145477e284f1172557d6f9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-onnxmltools/package.py b/var/spack/repos/builtin/packages/py-onnxmltools/package.py index 2b6bb46cd153f8..b6853634b74faa 100644 --- a/var/spack/repos/builtin/packages/py-onnxmltools/package.py +++ b/var/spack/repos/builtin/packages/py-onnxmltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOnnxmltools(PythonPackage): homepage = "https://github.com/onnx/onnxmltools" pypi = "onnxmltools/onnxmltools-1.10.0.tar.gz" + license("Apache-2.0") + # Source tarball not available on PyPI version( "1.11.1", diff --git a/var/spack/repos/builtin/packages/py-onnxruntime/package.py b/var/spack/repos/builtin/packages/py-onnxruntime/package.py index 205785a4db66f9..b3fb62d0db05a9 100644 --- a/var/spack/repos/builtin/packages/py-onnxruntime/package.py +++ b/var/spack/repos/builtin/packages/py-onnxruntime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyOnnxruntime(CMakePackage, PythonExtension): homepage = "https://github.com/microsoft/onnxruntime" git = "https://github.com/microsoft/onnxruntime.git" + license("MIT") + version( "1.10.0", tag="v1.10.0", commit="0d9030e79888d1d5828730b254fedc53c7b640c1", submodules=True ) @@ -63,6 +65,12 @@ class PyOnnxruntime(CMakePackage, PythonExtension): patch("libiconv-1.10.patch", level=0, when="@1.10.0 ^libiconv") # https://github.com/microsoft/onnxruntime/commit/de4089f8cbe0baffe56a363cc3a41595cc8f0809.patch patch("gcc11.patch", level=1, when="@1.7.2") + # https://github.com/microsoft/onnxruntime/pull/16257 + patch( + "https://github.com/microsoft/onnxruntime/commit/a3a443c80431c390cbf8855e9c7b2a95d413cd54.patch?full_index=1", + sha256="537c43b061d31bf97d2778d723a41fbd390160f9ebc304f06726e3bfd8dc4583", + when="@1.10:1.15", + ) dynamic_cpu_arch_values = ("NOAVX", "AVX", "AVX2", "AVX512") diff --git a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py index bd3b70ba161c12..d09f7dd572a6de 100644 --- a/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py +++ b/var/spack/repos/builtin/packages/py-ont-fast5-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyOntFast5Api(PythonPackage): homepage = "https://github.com/nanoporetech/ont_fast5_api" pypi = "ont-fast5-api/ont-fast5-api-0.3.2.tar.gz" + license("MPL-2.0") + version("4.1.0", sha256="afa58fb0a73ac33161fe0d13d32698b3325756c370f2f440a8a43b4b68c75f32") version("0.3.2", sha256="ae44b1bcd812e8acf8beff3db92456647c343cf19340f97cff4847de5cc905d8") diff --git a/var/spack/repos/builtin/packages/py-opcodes/package.py b/var/spack/repos/builtin/packages/py-opcodes/package.py index a3126fc95e19fe..de24b54db7387b 100644 --- a/var/spack/repos/builtin/packages/py-opcodes/package.py +++ b/var/spack/repos/builtin/packages/py-opcodes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpcodes(PythonPackage): homepage = "https://github.com/Maratyszcza/Opcodes" pypi = "opcodes/opcodes-0.3.14.tar.gz" + license("BSD-2-Clause") + version("0.3.14", sha256="16ec1cea4cf3dda767e6c0a718f664ef97a34ed24c91998a3c25c3f960c15fba") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-openai/package.py b/var/spack/repos/builtin/packages/py-openai/package.py index 62efe6ad1cc4a3..127fdd0135d3fa 100644 --- a/var/spack/repos/builtin/packages/py-openai/package.py +++ b/var/spack/repos/builtin/packages/py-openai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyOpenai(PythonPackage): homepage = "https://github.com/openai/openai-python" pypi = "openai/openai-0.27.8.tar.gz" + license("MIT") + version("0.27.8", sha256="2483095c7db1eee274cebac79e315a986c4e55207bb4fa7b82d185b3a2ed9536") variant("datalib", default=False, description="facilities for data loading") diff --git a/var/spack/repos/builtin/packages/py-openapi-schema-pydantic/package.py b/var/spack/repos/builtin/packages/py-openapi-schema-pydantic/package.py index 26d014da638371..c91f7d98385fbe 100644 --- a/var/spack/repos/builtin/packages/py-openapi-schema-pydantic/package.py +++ b/var/spack/repos/builtin/packages/py-openapi-schema-pydantic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpenapiSchemaPydantic(PythonPackage): homepage = "https://github.com/kuimono/openapi-schema-pydantic" pypi = "openapi-schema-pydantic/openapi-schema-pydantic-1.2.4.tar.gz" + license("MIT") + version("1.2.4", sha256="3e22cf58b74a69f752cc7e5f1537f6e44164282db2700cbbcd3bb99ddd065196") depends_on("python@3.6.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-opencensus-context/package.py b/var/spack/repos/builtin/packages/py-opencensus-context/package.py index 9358ee281e6379..4364138728f0b4 100644 --- a/var/spack/repos/builtin/packages/py-opencensus-context/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus-context/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyOpencensusContext(PythonPackage): homepage = "https://github.com/census-instrumentation/opencensus-python/tree/master/context/opencensus-context" url = "https://pypi.io/packages/py2.py3/o/opencensus-context/opencensus_context-0.1.1-py2.py3-none-any.whl" + license("Apache-2.0") + version( "0.1.1", sha256="1a3fdf6bec537031efcc93d51b04f1edee5201f8c9a0c85681d63308b76f5702", diff --git a/var/spack/repos/builtin/packages/py-opencensus/package.py b/var/spack/repos/builtin/packages/py-opencensus/package.py index b1298d44ed5d57..c75916d75729b4 100644 --- a/var/spack/repos/builtin/packages/py-opencensus/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyOpencensus(PythonPackage): homepage = "https://github.com/census-instrumentation/opencensus-python" pypi = "opencensus/opencensus-0.7.10.tar.gz" + license("Apache-2.0") + version("0.7.10", sha256="2921e3e570cfadfd123cd8e3636a405031367fddff74c55d3fe627a4cf8b981c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-opendatalab/package.py b/var/spack/repos/builtin/packages/py-opendatalab/package.py index 886b3c5eac31ad..5294209992f841 100644 --- a/var/spack/repos/builtin/packages/py-opendatalab/package.py +++ b/var/spack/repos/builtin/packages/py-opendatalab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpendatalab(PythonPackage): homepage = "https://github.com/opendatalab/opendatalab-python-sdk" pypi = "opendatalab/opendatalab-0.0.9.tar.gz" + license("MIT") + version("0.0.9", sha256="4648b66d5be096ba38fa087b6c7906c24218d02a49906c8b41c069b9a8747530") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-openidc-client/package.py b/var/spack/repos/builtin/packages/py-openidc-client/package.py index 56d527ed07fee6..20f9eb7b1bc57a 100644 --- a/var/spack/repos/builtin/packages/py-openidc-client/package.py +++ b/var/spack/repos/builtin/packages/py-openidc-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpenidcClient(PythonPackage): homepage = "https://github.com/puiterwijk/python-openidc-client" pypi = "openidc-client/openidc-client-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="680e969cae18c30adbddd6a087ed09f6a296b4937b4c8bc69be813bdbbfa9847") version("0.5.0", sha256="59d59d6fbfd26c5b57c53e582bdf2379274602f96133a163e7ff1ef39c363353") version("0.2.0", sha256="50a1f5abc1960c206a462b3b2f2da1f03abdcb542beb1d6d89d2736def228ab9") diff --git a/var/spack/repos/builtin/packages/py-openmc/package.py b/var/spack/repos/builtin/packages/py-openmc/package.py index 81b7ce41971ef8..1ace8bc018cb56 100644 --- a/var/spack/repos/builtin/packages/py-openmc/package.py +++ b/var/spack/repos/builtin/packages/py-openmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-openmesh/package.py b/var/spack/repos/builtin/packages/py-openmesh/package.py index 6a6b2d914c3dbe..3dcd44e89020f4 100644 --- a/var/spack/repos/builtin/packages/py-openmesh/package.py +++ b/var/spack/repos/builtin/packages/py-openmesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyOpenmesh(PythonPackage): homepage = "https://www.graphics.rwth-aachen.de:9000/OpenMesh/openmesh-python" pypi = "openmesh/openmesh-1.1.3.tar.gz" + license("BSD-3-Clause") + version("1.2.1", sha256="6fd3fa41a68148e4a7523f562426aa9758bf65ccc6642abcf79c37bae9c6af3c") version("1.1.3", sha256="c1d24abc85b7b518fe619639f89750bf19ed3b8938fed4dd739a72f1e6f8b0f6") diff --git a/var/spack/repos/builtin/packages/py-openmim/package.py b/var/spack/repos/builtin/packages/py-openmim/package.py index e9765051fbf72a..c4df141a123885 100644 --- a/var/spack/repos/builtin/packages/py-openmim/package.py +++ b/var/spack/repos/builtin/packages/py-openmim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpenmim(PythonPackage): homepage = "https://github.com/open-mmlab/mim" pypi = "openmim/openmim-0.3.9.tar.gz" + license("Apache-2.0") + version("0.3.9", sha256="b3977b92232b4b8c4d987cbc73e4515826d5543ccd3a66d49fcfc602cc5b3352") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py index d7f3e487ab65ed..df22fc5e0c3273 100644 --- a/var/spack/repos/builtin/packages/py-openpmd-validator/package.py +++ b/var/spack/repos/builtin/packages/py-openpmd-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyOpenpmdValidator(PythonPackage): maintainers("ax3l") + license("ISC") + version("1.1.0.3", sha256="b2e57123c1dc09cdc121011d007e30fab82b3d21732d02e4f1ba919b24345810") version("1.1.0.2", sha256="6ac6e2860351d9940821ca6f3b44ab63629e0bd06f6984225c55830c3e58b83c") version("1.1.0.1", sha256="7585abbd32523ae6b8065772e1cc27a45e232c526a9fc0bd8ce85182d1b4b325") diff --git a/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py b/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py index 543509ebb10d4c..b95c6a452e5e3a 100644 --- a/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py +++ b/var/spack/repos/builtin/packages/py-openpmd-viewer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOpenpmdViewer(PythonPackage): maintainers("RemiLehe", "ax3l") + license("BSD-3-Clause-LBNL") + version("1.4.0", sha256="53b4c10a508a012b9609f079a1d419aaeac769852117c676faf43e6cd9369f8b") version("1.3.0", sha256="236c065a37881fcb7603efde0bf2d61acc355a8acc595bebc3d6b9d03251b081") version("1.2.0", sha256="a27f8ac522c4c76fd774095e156a8b280c9211128f50aa07f16ac70d8222384d") diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py index 246164f68837e7..1e0d3d0789b35c 100644 --- a/var/spack/repos/builtin/packages/py-openpyxl/package.py +++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpenpyxl(PythonPackage): homepage = "https://openpyxl.readthedocs.org/" pypi = "openpyxl/openpyxl-3.1.2.tar.gz" + license("MIT") + version("3.1.2", sha256="a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184") version("3.0.7", sha256="6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251") version("3.0.3", sha256="547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64") diff --git a/var/spack/repos/builtin/packages/py-openslide-python/package.py b/var/spack/repos/builtin/packages/py-openslide-python/package.py index 775c4cf1ee7f92..16806c586ff933 100644 --- a/var/spack/repos/builtin/packages/py-openslide-python/package.py +++ b/var/spack/repos/builtin/packages/py-openslide-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOpenslidePython(PythonPackage): homepage = "https://github.com/openslide/openslide-python" url = "https://github.com/openslide/openslide-python/archive/v1.1.1.tar.gz" + license("LGPL-2.1-or-later") + version("1.1.2", sha256="83e064ab4a29658e7ddf86bf1d3e54d2508cc19ece35d55b55519c826e45d83f") version("1.1.1", sha256="33c390fe43e3d7d443fafdd66969392d3e9efd2ecd5d4af73c3dbac374485ed5") diff --git a/var/spack/repos/builtin/packages/py-opentree/package.py b/var/spack/repos/builtin/packages/py-opentree/package.py index a4b5d9b21ffb6e..1902700415a233 100644 --- a/var/spack/repos/builtin/packages/py-opentree/package.py +++ b/var/spack/repos/builtin/packages/py-opentree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py index 2623be661c8be1..1547f1f152ed03 100644 --- a/var/spack/repos/builtin/packages/py-opentuner/package.py +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyOpentuner(PythonPackage): maintainers("matthiasdiener") + license("MIT") + version("0.8.7", commit="070c5cef6d933eb760a2f9cd5cd08c95f27aee75") version("0.8.2", commit="8e720a2094e7964d7a1225e58aca40b0e78bff7d") diff --git a/var/spack/repos/builtin/packages/py-opppy/package.py b/var/spack/repos/builtin/packages/py-opppy/package.py index 538960874f6c1e..cba5964ccc2c02 100644 --- a/var/spack/repos/builtin/packages/py-opppy/package.py +++ b/var/spack/repos/builtin/packages/py-opppy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyOpppy(PythonPackage): git = "https://github.com/lanl/OPPPY.git" maintainers("clevelam") + license("BSD-3-Clause") + version("master", branch="master") version("0_1_7", sha256="6ef17e289de2c469ac931288fc5debee77583b300e35fa72080ee06d0e27f7af") version("0_1_6", sha256="1f385ffa39c90d3b338aceb563c5f4952d01041fff0ec94084c84e9e1107023e") diff --git a/var/spack/repos/builtin/packages/py-opt-einsum/package.py b/var/spack/repos/builtin/packages/py-opt-einsum/package.py index d4a17d15083acd..e33397342696f1 100644 --- a/var/spack/repos/builtin/packages/py-opt-einsum/package.py +++ b/var/spack/repos/builtin/packages/py-opt-einsum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOptEinsum(PythonPackage): homepage = "https://github.com/dgasmith/opt_einsum" pypi = "opt_einsum/opt_einsum-3.1.0.tar.gz" + license("MIT") + version("3.3.0", sha256="59f6475f77bbc37dcf7cd748519c0ec60722e91e63ca114e68821c0c54a46549") version("3.2.1", sha256="83b76a98d18ae6a5cc7a0d88955a7f74881f0e567a0f4c949d24c942753eb998") version("3.2.0", sha256="738b0a1db1d3084d360081bb64d826f9db06d2df7cc0bf8e2c9356028da1fa31") diff --git a/var/spack/repos/builtin/packages/py-optax/package.py b/var/spack/repos/builtin/packages/py-optax/package.py new file mode 100644 index 00000000000000..683a2d9cce57bf --- /dev/null +++ b/var/spack/repos/builtin/packages/py-optax/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyOptax(PythonPackage): + """A gradient processing and optimisation library in JAX.""" + + homepage = "https://github.com/deepmind/optax" + pypi = "optax/optax-0.1.7.tar.gz" + + license("Apache-2.0") + + version("0.1.7", sha256="6a5a848bc5e55e619b187c749fdddc4a5443ea14be85cc769f995779865c110d") + + depends_on("python@3.8:", type=("build", "run")) + depends_on("py-flit-core@3.2:3", type="build") + depends_on("py-absl-py@0.7.1:", type=("build", "run")) + depends_on("py-chex@0.1.5:", type=("build", "run")) + depends_on("py-jax@0.1.55:", type=("build", "run")) + depends_on("py-jaxlib@0.1.37:", type=("build", "run")) + depends_on("py-numpy@1.18.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-optuna/package.py b/var/spack/repos/builtin/packages/py-optuna/package.py index de74a405ece1cd..c3be0252791b9a 100644 --- a/var/spack/repos/builtin/packages/py-optuna/package.py +++ b/var/spack/repos/builtin/packages/py-optuna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyOptuna(PythonPackage): maintainers("elliottslaughter", "eugeneswalker") + license("MIT") + version("3.2.0", sha256="683d8693643a761a41d251a6b8e13263b24acacf9fc46a9233d5f6aa3ce5c683") depends_on("py-setuptools@61.1:", type="build") diff --git a/var/spack/repos/builtin/packages/py-or-tools/package.py b/var/spack/repos/builtin/packages/py-or-tools/package.py index 0347b074b418b8..a9debf9a3b33f9 100644 --- a/var/spack/repos/builtin/packages/py-or-tools/package.py +++ b/var/spack/repos/builtin/packages/py-or-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOrTools(CMakePackage): homepage = "https://developers.google.com/optimization/" url = "https://github.com/google/or-tools/archive/v7.8.tar.gz" + license("Apache-2.0") + version("7.8", sha256="d93a9502b18af51902abd130ff5f23768fcf47e266e6d1f34b3586387aa2de68") depends_on("cmake@3.14:", type="build") diff --git a/var/spack/repos/builtin/packages/py-oracledb/package.py b/var/spack/repos/builtin/packages/py-oracledb/package.py index ff69ddd928e366..f53f97fd3834ee 100644 --- a/var/spack/repos/builtin/packages/py-oracledb/package.py +++ b/var/spack/repos/builtin/packages/py-oracledb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyOracledb(PythonPackage): homepage = "https://oracle.github.io/python-oracledb/" pypi = "oracledb/oracledb-1.2.2.tar.gz" + license("Apache-2.0") + version("1.2.2", sha256="dd9f63084e44642b484a46b2fcfb4fc921f39facf494a1bab00628fa6409f4fc") depends_on("py-setuptools@40.6.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-ordered-set/package.py b/var/spack/repos/builtin/packages/py-ordered-set/package.py index 461e94247db27c..4ef84915c7574b 100644 --- a/var/spack/repos/builtin/packages/py-ordered-set/package.py +++ b/var/spack/repos/builtin/packages/py-ordered-set/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyOrderedSet(PythonPackage): homepage = "https://github.com/LuminosoInsight/ordered-set" pypi = "ordered-set/ordered-set-4.0.2.tar.gz" + license("MIT") + version("4.0.2", sha256="ba93b2df055bca202116ec44b9bead3df33ea63a7d5827ff8e16738b97f33a95") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-orjson/package.py b/var/spack/repos/builtin/packages/py-orjson/package.py index 37b373d54d7783..4bddb15e5099ea 100644 --- a/var/spack/repos/builtin/packages/py-orjson/package.py +++ b/var/spack/repos/builtin/packages/py-orjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOrjson(PythonPackage): homepage = "https://github.com/ijl/orjson" pypi = "orjson/orjson-3.8.7.tar.gz" + license("Apache-2.0") + version("3.8.7", sha256="8460c8810652dba59c38c80d27c325b5092d189308d8d4f3e688dbd8d4f3b2dc") depends_on("py-maturin@0.13:0.14", type="build") diff --git a/var/spack/repos/builtin/packages/py-os-service-types/package.py b/var/spack/repos/builtin/packages/py-os-service-types/package.py index 445874526fdf83..ae22b8acc6679c 100644 --- a/var/spack/repos/builtin/packages/py-os-service-types/package.py +++ b/var/spack/repos/builtin/packages/py-os-service-types/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-oset/package.py b/var/spack/repos/builtin/packages/py-oset/package.py index 85bae6d468cee4..c2f9d3d13c2c04 100644 --- a/var/spack/repos/builtin/packages/py-oset/package.py +++ b/var/spack/repos/builtin/packages/py-oset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-oslo-config/package.py b/var/spack/repos/builtin/packages/py-oslo-config/package.py index 3331dabcc21cdf..7e451f38be7251 100644 --- a/var/spack/repos/builtin/packages/py-oslo-config/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py index d9159beaf06765..6b969903a91ae1 100644 --- a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py index 6c758e46911a76..9e3e59960aa839 100644 --- a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-oslo-utils/package.py b/var/spack/repos/builtin/packages/py-oslo-utils/package.py index ad60a172e01455..7931e8b6ee665b 100644 --- a/var/spack/repos/builtin/packages/py-oslo-utils/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-osqp/package.py b/var/spack/repos/builtin/packages/py-osqp/package.py index 8b011535931da1..e23c1a9cbe7a4d 100644 --- a/var/spack/repos/builtin/packages/py-osqp/package.py +++ b/var/spack/repos/builtin/packages/py-osqp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOsqp(PythonPackage): maintainers("meyersbs") + license("Apache-2.0") + version( "0.6.2.post8", sha256="23d6bae4a3612f60d5f652d0e5fa4b2ead507cabfff5d930d822057ae6ed6677" ) diff --git a/var/spack/repos/builtin/packages/py-outdated/package.py b/var/spack/repos/builtin/packages/py-outdated/package.py index 23d4b2508a5d30..f7137d0288336e 100644 --- a/var/spack/repos/builtin/packages/py-outdated/package.py +++ b/var/spack/repos/builtin/packages/py-outdated/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyOutdated(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.2.2", sha256="4b7fdec88e36711120d096d485fc4d5035e4e5ffbd907cf3a6ce2af43058b970") depends_on("py-setuptools@44:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-overpy/package.py b/var/spack/repos/builtin/packages/py-overpy/package.py index cea79f2f199ecc..069d2eeba83ed5 100644 --- a/var/spack/repos/builtin/packages/py-overpy/package.py +++ b/var/spack/repos/builtin/packages/py-overpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOverpy(PythonPackage): homepage = "https://github.com/DinoTools/python-overpy" pypi = "overpy/overpy-0.4.tar.gz" + license("MIT") + version("0.4", sha256="6e5bfcd9368f0c33a5d7615b18dbcac18444157f447639287c6743aa2de8964d") version("0.3.1", sha256="3c6f6afe262ccf50c983617fc4ec5f381c2e1f6391aa974fbcc39203802bc3ff") diff --git a/var/spack/repos/builtin/packages/py-overrides/package.py b/var/spack/repos/builtin/packages/py-overrides/package.py index 6a81c9979a6de1..db43b3bbd590a5 100644 --- a/var/spack/repos/builtin/packages/py-overrides/package.py +++ b/var/spack/repos/builtin/packages/py-overrides/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyOverrides(PythonPackage): homepage = "https://github.com/mkorpela/overrides" pypi = "overrides/overrides-7.3.1.tar.gz" + license("Apache-2.0") + version("7.3.1", sha256="8b97c6c1e1681b78cbc9424b138d880f0803c2254c5ebaabdde57bb6c62093f2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-owlrl/package.py b/var/spack/repos/builtin/packages/py-owlrl/package.py index 85ea22d11746f2..65b836c2bc26c1 100644 --- a/var/spack/repos/builtin/packages/py-owlrl/package.py +++ b/var/spack/repos/builtin/packages/py-owlrl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py index 1ef38263fbe885..47a9c79065a1f3 100644 --- a/var/spack/repos/builtin/packages/py-owslib/package.py +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyOwslib(PythonPackage): homepage = "http://http://geopython.github.io/OWSLib/#installation" pypi = "OWSLib/OWSLib-0.16.0.tar.gz" + license("BSD-3-Clause") + version("0.25.0", sha256="20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a") version("0.17.1", sha256="b2e7fd694d3cffcee79317bad492d60c0aa887aea6916517c051c3247b33b5a5") version("0.16.0", sha256="ec95a5e93c145a5d84b0074b9ea27570943486552a669151140debf08a100554") diff --git a/var/spack/repos/builtin/packages/py-oyaml/package.py b/var/spack/repos/builtin/packages/py-oyaml/package.py index a92fc3ce40c765..40d8596ae38ff4 100644 --- a/var/spack/repos/builtin/packages/py-oyaml/package.py +++ b/var/spack/repos/builtin/packages/py-oyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyOyaml(PythonPackage): homepage = "https://github.com/wimglenn/oyaml" pypi = "oyaml/oyaml-1.0.tar.gz" + license("MIT") + version("1.0", sha256="ed8fc096811f4763e1907dce29c35895d6d5936c4d0400fe843a91133d4744ed") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py b/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py index 0954b2b0808df8..5c3d9e811ab047 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-downloader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPacificaDownloader(PythonPackage): homepage = "https://github.com/pacifica/pacifica-python-downloader/" pypi = "pacifica-downloader/pacifica-downloader-0.4.1.tar.gz" + license("LGPL-3.0-or-later") + version("0.4.1", sha256="11da2032a07ca7bb06fed38dc8d7c4c57267ff98c5fd925271083e18dd85d9f4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py b/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py index b8bf0c83403c69..3729d52f330056 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-namespace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPacificaNamespace(PythonPackage): homepage = "https://github.com/pacifica/pacifica-namespace/" pypi = "pacifica-namespace/pacifica-namespace-0.0.2.tar.gz" + license("LGPL-3.0-only") + version("0.0.2", sha256="a8f59aea1203a1557f7f57887b61e92f8450c74a8522798c5ddecf8fffb0b224") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py b/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py index df17cf2eb84447..93785d1872b4ef 100644 --- a/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py +++ b/var/spack/repos/builtin/packages/py-pacifica-uploader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPacificaUploader(PythonPackage): homepage = "https://github.com/pacifica/pacifica-python-uploader/" pypi = "pacifica-uploader/pacifica-uploader-0.3.1.tar.gz" + license("LGPL-3.0-only") + version("0.3.1", sha256="adda18b28f01f0b1e6fbaf927fec9b8cf07c86f1b74185bed2a624e8a4597578") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 79a0a8e8fdafd5..240e8c489497da 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPackaging(PythonPackage): homepage = "https://github.com/pypa/packaging" pypi = "packaging/packaging-19.2.tar.gz" + license("BSD-2-Clause") + version("23.1", sha256="a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f") version("23.0", sha256="b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97") version("21.3", sha256="dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb") diff --git a/var/spack/repos/builtin/packages/py-pager/package.py b/var/spack/repos/builtin/packages/py-pager/package.py index 1bee14cb0a4c5f..b9a4e3a7e5ab5c 100644 --- a/var/spack/repos/builtin/packages/py-pager/package.py +++ b/var/spack/repos/builtin/packages/py-pager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPager(PythonPackage): pypi = "pager/pager-3.3.tar.gz" + license("MIT") + version("3.3", sha256="18aa45ec877dca732e599531c7b3b0b22ed6a4445febdf1bdf7da2761cca340d") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-palettable/package.py b/var/spack/repos/builtin/packages/py-palettable/package.py index 3d7f911bcb5abe..597a067ecec127 100644 --- a/var/spack/repos/builtin/packages/py-palettable/package.py +++ b/var/spack/repos/builtin/packages/py-palettable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPalettable(PythonPackage): homepage = "https://jiffyclub.github.io/palettable/" pypi = "palettable/palettable-3.0.0.tar.gz" + license("MIT") + version("3.3.3", sha256="094dd7d9a5fc1cca4854773e5c1fc6a315b33bd5b3a8f47064928facaf0490a8") version("3.3.0", sha256="72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd") version("3.0.0", sha256="eed9eb0399386ff42f90ca61d4fa38a1819a93d5adfc2d546e3e2869d9972c31") diff --git a/var/spack/repos/builtin/packages/py-pamela/package.py b/var/spack/repos/builtin/packages/py-pamela/package.py index 36f647d5dfed4d..5b4d1b319aecb4 100644 --- a/var/spack/repos/builtin/packages/py-pamela/package.py +++ b/var/spack/repos/builtin/packages/py-pamela/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPamela(PythonPackage): pypi = "pamela/pamela-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="65c9389bef7d1bb0b168813b6be21964df32016923aac7515bdf05366acbab6c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-panaroo/package.py b/var/spack/repos/builtin/packages/py-panaroo/package.py index c7ae773cb22788..648d013a81dbc3 100644 --- a/var/spack/repos/builtin/packages/py-panaroo/package.py +++ b/var/spack/repos/builtin/packages/py-panaroo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPanaroo(PythonPackage): homepage = "https://gtonkinhill.github.io/panaroo" url = "https://github.com/gtonkinhill/panaroo/archive/refs/tags/v1.2.10.tar.gz" + license("MIT") + version("1.2.10", sha256="066e5cd96b59918fa4fcd2dc12c92a273457ee17e2fe55576657c793566e948e") depends_on("python@3.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pandas-stubs/package.py b/var/spack/repos/builtin/packages/py-pandas-stubs/package.py index 8a11e327041dd4..fa232e7829d470 100644 --- a/var/spack/repos/builtin/packages/py-pandas-stubs/package.py +++ b/var/spack/repos/builtin/packages/py-pandas-stubs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPandasStubs(PythonPackage): homepage = "https://pandas.pydata.org/" pypi = "pandas_stubs/pandas_stubs-2.0.2.230605.tar.gz" + license("BSD-3-Clause") + version( "2.0.2.230605", sha256="624c7bb06d38145a44b61be459ccd19b038e0bf20364a025ecaab78fea65e858" ) diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py index 3dea26ff2c4111..8c3441805cde0b 100644 --- a/var/spack/repos/builtin/packages/py-pandas/package.py +++ b/var/spack/repos/builtin/packages/py-pandas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,10 @@ class PyPandas(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + + version("2.1.4", sha256="fcb68203c833cc735321512e13861358079a96c174a61f5116a1de89c58c0ef7") + version("2.1.3", sha256="22929f84bca106921917eb73c1521317ddd0a4c71b395bcf767a106e3494209f") version("2.1.2", sha256="52897edc2774d2779fbeb6880d2cfb305daa0b1a29c16b91f531a18918a6e0f3") version("2.1.1", sha256="fecb198dc389429be557cde50a2d46da8434a17fe37d7d41ff102e3987fd947b") version("2.1.0", sha256="62c24c7fc59e42b775ce0679cfa7b14a5f9bfb7643cfbe708c960699e05fb918") @@ -59,11 +63,6 @@ class PyPandas(PythonPackage): version("1.0.0", sha256="3ea6cc86931f57f18b1240572216f09922d91b19ab8a01cf24734394a3db3bec") version("0.25.3", sha256="52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4") version("0.25.2", sha256="ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be") - version("0.25.1", sha256="cb2e197b7b0687becb026b84d3c242482f20cbb29a9981e43604eb67576da9f6") - version("0.25.0", sha256="914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995") - version("0.24.2", sha256="4f919f409c433577a501e023943e582c57355d50a724c589e78bc1d551a535a2") - version("0.24.1", sha256="435821cb2501eabbcee7e83614bd710940dc0cf28b5afbc4bdb816c31cec71af") - version("0.23.4", sha256="5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4") variant("excel", when="@1.4:", default=False, description="Build with support for Excel") @@ -76,7 +75,6 @@ class PyPandas(PythonPackage): depends_on("python@:3.10", when="@1.3.3:1.3", type=("build", "run")) depends_on("python@:3.9", when="@1.1.3:1.3.2", type=("build", "run")) depends_on("python@:3.8", when="@0.25.2:1.1.2", type=("build", "run")) - depends_on("python@:3.7", when="@:0.25.1", type=("build", "run")) # pyproject.toml depends_on("py-meson-python@0.13.1", when="@2.1:", type="build") @@ -100,7 +98,6 @@ class PyPandas(PythonPackage): depends_on("py-numpy@1.16.5:", when="@1.2:", type=("build", "run")) depends_on("py-numpy@1.15.4:", when="@1.1:", type=("build", "run")) depends_on("py-numpy@1.13.3:", when="@0.25:", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) # 'NUMPY_IMPORT_ARRAY_RETVAL' was removed in numpy@1.19 depends_on("py-numpy@:1.18", when="@:0.25", type=("build", "run")) depends_on("py-python-dateutil@2.8.2:", when="@2:", type=("build", "run")) @@ -121,12 +118,10 @@ class PyPandas(PythonPackage): depends_on("py-numexpr@2.7.0:", when="@1.3:", type=("build", "run")) depends_on("py-numexpr@2.6.8:", when="@1.2:", type=("build", "run")) depends_on("py-numexpr@2.6.2:", when="@0.25:", type=("build", "run")) - depends_on("py-numexpr", type=("build", "run")) depends_on("py-bottleneck@1.3.4:", when="@2.1:", type=("build", "run")) depends_on("py-bottleneck@1.3.2:", when="@1.5:", type=("build", "run")) depends_on("py-bottleneck@1.3.1:", when="@1.4:", type=("build", "run")) depends_on("py-bottleneck@1.2.1:", when="@0.25:", type=("build", "run")) - depends_on("py-bottleneck", type=("build", "run")) depends_on("py-numba@0.55.2:", when="@2.1:", type=("build", "run")) depends_on("py-numba@0.53.1:", when="@2.0:", type=("build", "run")) @@ -154,9 +149,3 @@ class PyPandas(PythonPackage): depends_on("py-setuptools@24.2:", when="@:1.2", type="build") skip_modules = ["pandas.tests", "pandas.plotting._matplotlib", "pandas.core._numba.kernels"] - - def flag_handler(self, name, flags): - if name == "cflags": - if self.spec.satisfies("@0.24.2 %oneapi"): - flags.append("-Wno-error=implicit-function-declaration") - return (flags, None, None) diff --git a/var/spack/repos/builtin/packages/py-pandocfilters/package.py b/var/spack/repos/builtin/packages/py-pandocfilters/package.py index 4d7aecd04e46fe..fa41114181e150 100644 --- a/var/spack/repos/builtin/packages/py-pandocfilters/package.py +++ b/var/spack/repos/builtin/packages/py-pandocfilters/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPandocfilters(PythonPackage): homepage = "https://github.com/jgm/pandocfilters" pypi = "pandocfilters/pandocfilters-1.4.2.tar.gz" + license("BSD-3-Clause") + version("1.5.0", sha256="0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38") version("1.4.2", sha256="b3dd70e169bb5449e6bc6ff96aea89c5eea8c5f6ab5e207fc2f521a2cf4a0da9") diff --git a/var/spack/repos/builtin/packages/py-panedr/package.py b/var/spack/repos/builtin/packages/py-panedr/package.py index f1304ea809db56..54eae2f1a5fb2d 100644 --- a/var/spack/repos/builtin/packages/py-panedr/package.py +++ b/var/spack/repos/builtin/packages/py-panedr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPanedr(PythonPackage): maintainers("RMeli") + license("LGPL-2.1-or-later") + version("0.7.2", sha256="2181009a962dc35745348d1146608c64fb1ba3ef5ae74043416fef739d1409e4") version("0.7.1", sha256="64c74863f72d51729ac5cb1e2dbb18747f7137588990c308ef8ca120fbf2ddd4") diff --git a/var/spack/repos/builtin/packages/py-panel/package.py b/var/spack/repos/builtin/packages/py-panel/package.py index 084feff5aae752..52bff696fcc7de 100644 --- a/var/spack/repos/builtin/packages/py-panel/package.py +++ b/var/spack/repos/builtin/packages/py-panel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPanel(PythonPackage): homepage = "http://panel.holoviz.org/" pypi = "panel/panel-0.14.4.tar.gz" + license("BSD-3-Clause") + version("0.14.4", sha256="b853d2f53d7738ec6372525360c5bf9427a71ed990685ccac703bc9b442e9951") depends_on("py-param@1.12:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-papermill/package.py b/var/spack/repos/builtin/packages/py-papermill/package.py index 2433a5158f9648..97e900acae38ff 100644 --- a/var/spack/repos/builtin/packages/py-papermill/package.py +++ b/var/spack/repos/builtin/packages/py-papermill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPapermill(PythonPackage): homepage = "https://github.com/nteract/papermill" pypi = "papermill/papermill-2.4.0.tar.gz" + license("BSD-3-Clause") + version("2.4.0", sha256="6f8f8a9b06b39677f207c09100c8d386bcf592f0cbbdda9f0f50e81445697627") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-paralleltask/package.py b/var/spack/repos/builtin/packages/py-paralleltask/package.py index 53ce9066e92436..5f60464618ee5d 100644 --- a/var/spack/repos/builtin/packages/py-paralleltask/package.py +++ b/var/spack/repos/builtin/packages/py-paralleltask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyParalleltask(PythonPackage): homepage = "https://github.com/moold/ParallelTask" pypi = "Paralleltask/Paralleltask-0.2.2.tar.gz" + license("GPL-3.0-only") + version("0.2.2", sha256="f00945e2bd5b6aff9cdc48fbd92aa7b48d23bb530d7f6643ac966fea11a7a9d5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-param/package.py b/var/spack/repos/builtin/packages/py-param/package.py index d6ea624d353c6c..840c2279cfa60f 100644 --- a/var/spack/repos/builtin/packages/py-param/package.py +++ b/var/spack/repos/builtin/packages/py-param/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyParam(PythonPackage): maintainers("haralmha") + license("BSD-3-Clause") + version("1.12.0", sha256="35d0281c8e3beb6dd469f46ff0b917752a54bed94d1b0c567346c76d0ff59c4a") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-parameterized/package.py b/var/spack/repos/builtin/packages/py-parameterized/package.py index 1ff53f8eec28b4..b5c68b42c6bd3f 100644 --- a/var/spack/repos/builtin/packages/py-parameterized/package.py +++ b/var/spack/repos/builtin/packages/py-parameterized/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-paramiko/package.py b/var/spack/repos/builtin/packages/py-paramiko/package.py index dd637971d8e1d4..2f2675656f60e1 100644 --- a/var/spack/repos/builtin/packages/py-paramiko/package.py +++ b/var/spack/repos/builtin/packages/py-paramiko/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyParamiko(PythonPackage): homepage = "https://www.paramiko.org/" pypi = "paramiko/paramiko-2.7.1.tar.gz" + license("LGPL-2.1-or-later") + version("2.12.0", sha256="376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49") version("2.9.2", sha256="944a9e5dbdd413ab6c7951ea46b0ab40713235a9c4c5ca81cfe45c6f14fa677b") version("2.7.1", sha256="920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f") diff --git a/var/spack/repos/builtin/packages/py-paramz/package.py b/var/spack/repos/builtin/packages/py-paramz/package.py index 744061102470bc..1dea4db65f65a7 100644 --- a/var/spack/repos/builtin/packages/py-paramz/package.py +++ b/var/spack/repos/builtin/packages/py-paramz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyParamz(PythonPackage): homepage = "https://github.com/sods/paramz" pypi = "paramz/paramz-0.9.5.tar.gz" + license("BSD-3-Clause") + version("0.9.5", sha256="0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-parasail/package.py b/var/spack/repos/builtin/packages/py-parasail/package.py index 8323f8fb37f42c..8bb4eabf0165d5 100644 --- a/var/spack/repos/builtin/packages/py-parasail/package.py +++ b/var/spack/repos/builtin/packages/py-parasail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyParasail(PythonPackage): homepage = "https://github.com/jeffdaily/parasail-python" pypi = "parasail/parasail-1.3.3.tar.gz" + license("LiLiQ-R-1.1") + version("1.3.3", sha256="06f05066d9cf624c0b043f51a1e9d2964154e1edd0f9843e0838f32073e576f8") depends_on("perl", type="build") diff --git a/var/spack/repos/builtin/packages/py-parmed/package.py b/var/spack/repos/builtin/packages/py-parmed/package.py index cff17eaae8a442..d7d281012fefd5 100644 --- a/var/spack/repos/builtin/packages/py-parmed/package.py +++ b/var/spack/repos/builtin/packages/py-parmed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyParmed(PythonPackage): homepage = "https://parmed.github.io/ParmEd/html/index.html" pypi = "ParmEd/ParmEd-3.4.3.tar.gz" + license("MIT") + version("3.4.3", sha256="90afb155e3ffe69230a002922b28968464126d4450059f0bd97ceca679c6627c") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-parse-type/package.py b/var/spack/repos/builtin/packages/py-parse-type/package.py index 5a48037ba7edc5..d7449703e37188 100644 --- a/var/spack/repos/builtin/packages/py-parse-type/package.py +++ b/var/spack/repos/builtin/packages/py-parse-type/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyParseType(PythonPackage): homepage = "https://github.com/jenisys/parse_type" pypi = "parse-type/parse_type-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="20b43c660e48ed47f433bce5873a2a3d4b9b6a7ba47bd7f7d2a7cec4bec5551f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-parse/package.py b/var/spack/repos/builtin/packages/py-parse/package.py index 7638c834d53184..96a9715eef2cf9 100644 --- a/var/spack/repos/builtin/packages/py-parse/package.py +++ b/var/spack/repos/builtin/packages/py-parse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyParse(PythonPackage): pypi = "parse/parse-1.11.1.tar.gz" + license("MIT") + version("1.18.0", sha256="91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4") version("1.12.1", sha256="a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717") version("1.11.1", sha256="870dd675c1ee8951db3e29b81ebe44fd131e3eb8c03a79483a58ea574f3145c2") diff --git a/var/spack/repos/builtin/packages/py-parsedatetime/package.py b/var/spack/repos/builtin/packages/py-parsedatetime/package.py index 1014d602bdeef0..b7719bd00bbb48 100644 --- a/var/spack/repos/builtin/packages/py-parsedatetime/package.py +++ b/var/spack/repos/builtin/packages/py-parsedatetime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-parsimonious/package.py b/var/spack/repos/builtin/packages/py-parsimonious/package.py index 729788c2a77c36..2b352947ec1042 100644 --- a/var/spack/repos/builtin/packages/py-parsimonious/package.py +++ b/var/spack/repos/builtin/packages/py-parsimonious/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyParsimonious(PythonPackage): homepage = "https://github.com/erikrose/parsimonious" pypi = "parsimonious/parsimonious-0.8.1.tar.gz" + license("MIT") + version("0.10.0", sha256="8281600da180ec8ae35427a4ab4f7b82bfec1e3d1e52f80cb60ea82b9512501c") version("0.8.1", sha256="3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b") diff --git a/var/spack/repos/builtin/packages/py-parsl/package.py b/var/spack/repos/builtin/packages/py-parsl/package.py index 3b7b4771a21f33..edc2b4b0554901 100644 --- a/var/spack/repos/builtin/packages/py-parsl/package.py +++ b/var/spack/repos/builtin/packages/py-parsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyParsl(PythonPackage): maintainers("hategan") + license("Apache-2.0") + version( "2023.08.21", sha256="d7d6145ad5ab63baf9c9f9441a0a6ea5be6f896ef8094d47bf64d949a56b1782" ) diff --git a/var/spack/repos/builtin/packages/py-parsley/package.py b/var/spack/repos/builtin/packages/py-parsley/package.py index a55727eabdfe9d..5d5a358491fe24 100644 --- a/var/spack/repos/builtin/packages/py-parsley/package.py +++ b/var/spack/repos/builtin/packages/py-parsley/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyParsley(PythonPackage): homepage = "https://launchpad.net/parsley" pypi = "Parsley/Parsley-1.3.tar.gz" + license("MIT") + version("1.3", sha256="9444278d47161d5f2be76a767809a3cbe6db4db822f46a4fd7481d4057208d41") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-parso/package.py b/var/spack/repos/builtin/packages/py-parso/package.py index a4a40901560f5c..aea20abad21a73 100644 --- a/var/spack/repos/builtin/packages/py-parso/package.py +++ b/var/spack/repos/builtin/packages/py-parso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyParso(PythonPackage): pypi = "parso/parso-0.6.1.tar.gz" + license("MIT") + version("0.8.3", sha256="8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0") version("0.8.2", sha256="12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398") version("0.8.1", sha256="8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e") diff --git a/var/spack/repos/builtin/packages/py-partd/package.py b/var/spack/repos/builtin/packages/py-partd/package.py index eabd00084e2b24..13fdca33dba3f3 100644 --- a/var/spack/repos/builtin/packages/py-partd/package.py +++ b/var/spack/repos/builtin/packages/py-partd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPartd(PythonPackage): homepage = "https://github.com/dask/partd/" pypi = "partd/partd-0.3.8.tar.gz" + license("BSD-3-Clause") + version("1.4.0", sha256="aa0ff35dbbcc807ae374db56332f4c1b39b46f67bf2975f5151e0b4186aed0d5") version("1.1.0", sha256="6e258bf0810701407ad1410d63d1a15cfd7b773fd9efe555dac6bb82cc8832b0") version("0.3.10", sha256="33722a228ebcd1fa6f44b1631bdd4cff056376f89eb826d7d880b35b637bcfba") diff --git a/var/spack/repos/builtin/packages/py-particle/package.py b/var/spack/repos/builtin/packages/py-particle/package.py index 843e4c0e02e994..ab4aedaa66ec52 100644 --- a/var/spack/repos/builtin/packages/py-particle/package.py +++ b/var/spack/repos/builtin/packages/py-particle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyParticle(PythonPackage): tags = ["hep"] + license("BSD-3-Clause") + version("master", branch="master") version("0.23.0", sha256="d810f8fc27deb8e7fd64174017d9607d50522249c0973a0008e580f93db11750") version("0.22.1", sha256="dcb45025cf7cff901e2c94922d150e1103245c46f2671eae4193c5fa767cc56c") diff --git a/var/spack/repos/builtin/packages/py-paste/package.py b/var/spack/repos/builtin/packages/py-paste/package.py index df2556d1da0b3b..e6ba6554ff24c1 100644 --- a/var/spack/repos/builtin/packages/py-paste/package.py +++ b/var/spack/repos/builtin/packages/py-paste/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPaste(PythonPackage): homepage = "https://pythonpaste.readthedocs.io" pypi = "Paste/Paste-3.5.2.tar.gz" + license("MIT") + version("3.5.2", sha256="d5a7340c30bcdf3023dd0106c8a5c430dd8fe84aeb8113bc7b93f8dd729f4af6") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pastedeploy/package.py b/var/spack/repos/builtin/packages/py-pastedeploy/package.py index ada1b50e184245..3c3633299a81f5 100644 --- a/var/spack/repos/builtin/packages/py-pastedeploy/package.py +++ b/var/spack/repos/builtin/packages/py-pastedeploy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPastedeploy(PythonPackage): homepage = "https://docs.pylonsproject.org/projects/pastedeploy" pypi = "PasteDeploy/PasteDeploy-3.0.1.tar.gz" + license("MIT") + version("3.0.1", sha256="5f4b4d5fddd39b8947ea727161e366bf55b90efc60a4d1dd7976b9031d0b4e5f") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pastel/package.py b/var/spack/repos/builtin/packages/py-pastel/package.py index 73916a30214711..9ed5479cdb6862 100644 --- a/var/spack/repos/builtin/packages/py-pastel/package.py +++ b/var/spack/repos/builtin/packages/py-pastel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPastel(PythonPackage): homepage = "https://github.com/sdispater/pastel" pypi = "pastel/pastel-0.2.1.tar.gz" + license("MIT") + version("0.2.1", sha256="e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d") depends_on("python@2.7,3.4:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pastml/package.py b/var/spack/repos/builtin/packages/py-pastml/package.py index a9585483cec93c..e33649daa2ee38 100644 --- a/var/spack/repos/builtin/packages/py-pastml/package.py +++ b/var/spack/repos/builtin/packages/py-pastml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPastml(PythonPackage): maintainers("snehring") + license("GPL-3.0-or-later") + version("1.9.40", sha256="5334bc8de70a968117240b90d90878ac935be18de6e6e485fb1a8f90cd539fea") version("1.9.38", sha256="43bf7d2a3a9b9b67da7c5881ecdeb2ee9cccd1585b8f65700e53761609945cc6") diff --git a/var/spack/repos/builtin/packages/py-patch-ng/package.py b/var/spack/repos/builtin/packages/py-patch-ng/package.py index 8fa161a808f38e..81832d92052411 100644 --- a/var/spack/repos/builtin/packages/py-patch-ng/package.py +++ b/var/spack/repos/builtin/packages/py-patch-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPatchNg(PythonPackage): homepage = "https://github.com/conan-io/python-patch" pypi = "patch-ng/patch-ng-1.17.4.tar.gz" + license("MIT") + version("1.17.4", sha256="627abc5bd723c8b481e96849b9734b10065426224d4d22cd44137004ac0d4ace") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-patch/package.py b/var/spack/repos/builtin/packages/py-patch/package.py index 379eb390b0c92d..7c0e78f641c5af 100644 --- a/var/spack/repos/builtin/packages/py-patch/package.py +++ b/var/spack/repos/builtin/packages/py-patch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-path-py/package.py b/var/spack/repos/builtin/packages/py-path-py/package.py index 78b174570ac3d9..91197a138d4539 100644 --- a/var/spack/repos/builtin/packages/py-path-py/package.py +++ b/var/spack/repos/builtin/packages/py-path-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPathPy(PythonPackage): homepage = "https://github.com/jaraco/path.py" pypi = "path.py/path.py-12.0.1.tar.gz" + license("MIT") + version("12.0.1", sha256="9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f") version("5.2", sha256="9916ae9aa603ce7e131e4ac76c25bcdbf6208f8fe5cc565a5022b85dc9d7022c") diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index e9c4f58067065e..4b4bcb17d7dafd 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPathlib2(PythonPackage): pypi = "pathlib2/pathlib2-2.3.2.tar.gz" + license("MIT") + version( "2.3.7.post1", sha256="9fe0edad898b83c0c3e199c842b27ed216645d2e177757b2dd67384d4113c641" ) diff --git a/var/spack/repos/builtin/packages/py-pathml/package.py b/var/spack/repos/builtin/packages/py-pathml/package.py index bd263866caa6a7..cf3069529b4720 100644 --- a/var/spack/repos/builtin/packages/py-pathml/package.py +++ b/var/spack/repos/builtin/packages/py-pathml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPathml(PythonPackage): homepage = "https://github.com/Dana-Farber-AIOS/pathml" pypi = "pathml/pathml-2.1.0.tar.gz" + license("GPL-2.0-or-later") + version("2.1.0", sha256="462bb2f16452dddad310c30f62678a1336ce492263355fd6722c07ee4840ea6a") depends_on("py-setuptools@42:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pathos/package.py b/var/spack/repos/builtin/packages/py-pathos/package.py index dc556aafa722dd..16c7195cedd397 100644 --- a/var/spack/repos/builtin/packages/py-pathos/package.py +++ b/var/spack/repos/builtin/packages/py-pathos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPathos(PythonPackage): homepage = "https://github.com/uqfoundation/pathos" pypi = "pathos/pathos-0.2.3.tar.gz" + license("BSD-3-Clause") + version("0.2.8", sha256="1f0f27a90f7ab66c423ba796529000fde9360d17b2d8e50097641ff405fc6f15") version("0.2.3", sha256="954c5b0a8b257c375e35d311c65fa62a210a3d65269195557de38418ac9f61f9") version("0.2.0", sha256="2f4e67e7914c95fb0cce766bab173eb2c5860ee420108fa183099557ac2e50e9") diff --git a/var/spack/repos/builtin/packages/py-pathspec/package.py b/var/spack/repos/builtin/packages/py-pathspec/package.py index d2eda8ab9fa5f8..3921b4770fd46c 100644 --- a/var/spack/repos/builtin/packages/py-pathspec/package.py +++ b/var/spack/repos/builtin/packages/py-pathspec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPathspec(PythonPackage): homepage = "https://github.com/cpburnz/python-pathspec" pypi = "pathspec/pathspec-0.8.1.tar.gz" + license("MPL-2.0") + version("0.11.1", sha256="2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687") version("0.11.0", sha256="64d338d4e0914e91c1792321e6907b5a593f1ab1851de7fc269557a21b30ebbc") version("0.10.3", sha256="56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6") diff --git a/var/spack/repos/builtin/packages/py-pathtools/package.py b/var/spack/repos/builtin/packages/py-pathtools/package.py index 9b8c5e6a7cc390..b7e481c88a1151 100644 --- a/var/spack/repos/builtin/packages/py-pathtools/package.py +++ b/var/spack/repos/builtin/packages/py-pathtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPathtools(PythonPackage): maintainers("dorton21") + license("MIT") + version("0.1.2", sha256="7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pathy/package.py b/var/spack/repos/builtin/packages/py-pathy/package.py index 93c7b8be5a52bc..79e5ae3e55201b 100644 --- a/var/spack/repos/builtin/packages/py-pathy/package.py +++ b/var/spack/repos/builtin/packages/py-pathy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPathy(PythonPackage): homepage = "https://github.com/justindujardin/pathy" pypi = "pathy/pathy-0.10.1.tar.gz" + license("Apache-2.0") + version("0.10.1", sha256="4cd6e71b4cd5ff875cfbb949ad9fa5519d8d1dbe69d5fc1d1b23aa3cb049618b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-patool/package.py b/var/spack/repos/builtin/packages/py-patool/package.py index e8d2f6052a4a4f..7edde54cabf176 100644 --- a/var/spack/repos/builtin/packages/py-patool/package.py +++ b/var/spack/repos/builtin/packages/py-patool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPatool(PythonPackage): homepage = "https://wummel.github.io/patool/" pypi = "patool/patool-1.12.tar.gz" + license("GPL-3.0-or-later") + version("1.12", sha256="e3180cf8bfe13bedbcf6f5628452fca0c2c84a3b5ae8c2d3f55720ea04cb1097") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-patsy/package.py b/var/spack/repos/builtin/packages/py-patsy/package.py index e008b9b31aa802..b3ab8d9b5d332e 100644 --- a/var/spack/repos/builtin/packages/py-patsy/package.py +++ b/var/spack/repos/builtin/packages/py-patsy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPatsy(PythonPackage): homepage = "https://github.com/pydata/patsy" pypi = "patsy/patsy-0.5.2.tar.gz" + license("PSF-2.0") + version("0.5.3", sha256="bdc18001875e319bc91c812c1eb6a10be4bb13cb81eb763f466179dca3b67277") version("0.5.2", sha256="5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d") version("0.5.1", sha256="f115cec4201e1465cd58b9866b0b0e7b941caafec129869057405bfe5b5e3991") diff --git a/var/spack/repos/builtin/packages/py-pauvre/package.py b/var/spack/repos/builtin/packages/py-pauvre/package.py index 380d334efb25bd..178c089fe19136 100644 --- a/var/spack/repos/builtin/packages/py-pauvre/package.py +++ b/var/spack/repos/builtin/packages/py-pauvre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pbr/package.py b/var/spack/repos/builtin/packages/py-pbr/package.py index 851f32f6963704..41621f4a025e49 100644 --- a/var/spack/repos/builtin/packages/py-pbr/package.py +++ b/var/spack/repos/builtin/packages/py-pbr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,4 +25,4 @@ class PyPbr(PythonPackage): version("1.8.1", sha256="e2127626a91e6c885db89668976db31020f0af2da728924b56480fc7ccf09649") depends_on("python@2.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") + depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pdbfixer/package.py b/var/spack/repos/builtin/packages/py-pdbfixer/package.py index 2dbd4aa3eec7bf..feb667c0267244 100644 --- a/var/spack/repos/builtin/packages/py-pdbfixer/package.py +++ b/var/spack/repos/builtin/packages/py-pdbfixer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pdf2image/package.py b/var/spack/repos/builtin/packages/py-pdf2image/package.py index fd06c6cfe81438..39fb83740ef911 100644 --- a/var/spack/repos/builtin/packages/py-pdf2image/package.py +++ b/var/spack/repos/builtin/packages/py-pdf2image/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPdf2image(PythonPackage): homepage = "https://pypi.org/project/pdf2image/" pypi = "pdf2image/pdf2image-1.12.1.tar.gz" + license("MIT") + version("1.16.3", sha256="74208810c2cef4d9e347769b8e62a52303982ddb4f2dfd744c7ab4b940ae287e") version("1.12.1", sha256="a0d9906f5507192210a8d5d7ead63145e9dec4bccc4564b1fb644e923913c31c") diff --git a/var/spack/repos/builtin/packages/py-pdm-pep517/package.py b/var/spack/repos/builtin/packages/py-pdm-pep517/package.py index 29e453577483e2..488972ed509b20 100644 --- a/var/spack/repos/builtin/packages/py-pdm-pep517/package.py +++ b/var/spack/repos/builtin/packages/py-pdm-pep517/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPdmPep517(PythonPackage): homepage = "https://pdm.fming.dev/latest/" pypi = "pdm-pep517/pdm-pep517-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="392f8c2b47c6ec20550cb8e19e24b9dbd27373413f067b56ecd75f9767f93015") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pdoc3/package.py b/var/spack/repos/builtin/packages/py-pdoc3/package.py index a486e3f944629f..56f81eeffb8eec 100644 --- a/var/spack/repos/builtin/packages/py-pdoc3/package.py +++ b/var/spack/repos/builtin/packages/py-pdoc3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPdoc3(PythonPackage): homepage = "https://pdoc3.github.io/pdoc/" pypi = "pdoc3/pdoc3-0.10.0.tar.gz" + license("AGPL-3.0") + version("0.10.0", sha256="5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-peachpy/package.py b/var/spack/repos/builtin/packages/py-peachpy/package.py index c5c881e61bfeb9..c2026641b628ae 100644 --- a/var/spack/repos/builtin/packages/py-peachpy/package.py +++ b/var/spack/repos/builtin/packages/py-peachpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPeachpy(PythonPackage): homepage = "https://github.com/Maratyszcza/PeachPy" git = "https://github.com/Maratyszcza/PeachPy.git" + license("BSD-2-Clause") + version("master", branch="master") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pebble/package.py b/var/spack/repos/builtin/packages/py-pebble/package.py index 7be1b968158742..391bf2a4582fda 100644 --- a/var/spack/repos/builtin/packages/py-pebble/package.py +++ b/var/spack/repos/builtin/packages/py-pebble/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPebble(PythonPackage): homepage = "https://github.com/noxdafox/pebble" pypi = "Pebble/Pebble-5.0.3.tar.gz" + license("LGPL-3.0-only") + version("5.0.3", sha256="bdcfd9ea7e0aedb895b204177c19e6d6543d9962f4e3402ebab2175004863da8") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pem/package.py b/var/spack/repos/builtin/packages/py-pem/package.py index 4e44ab1ee13db7..622d9faa56ca8c 100644 --- a/var/spack/repos/builtin/packages/py-pem/package.py +++ b/var/spack/repos/builtin/packages/py-pem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPem(PythonPackage): homepage = "https://pem.readthedocs.io/en/stable/" url = "https://github.com/hynek/pem/archive/20.1.0.tar.gz" + license("MIT") + version("20.1.0", sha256="140df7388f72bdf95d5a40e152cfda4fd62856b8320a9a808ffdc2bee37d5c36") version("19.3.0", sha256="22c526314db05559d5a6b0661aa6a21f26a1ad9f6f10a6ba2d386534ad12b175") version("19.2.0", sha256="93772e1574c8ff3442e553025fe42ed66cea3abff7ce75363baffa8eb606e596") diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py index 8871ac3027338a..22a0d776bfa703 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning-kokkos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPennylaneLightningKokkos(CMakePackage, PythonExtension, CudaPackage, ROC maintainers("AmintorDusko", "vincentmr") + license("Apache-2.0") + version("main", branch="main") version("0.32.0", sha256="06f19dfb1073387ef9ee30c38ea44884844a771373256b694a0e1ceb87195bb2") diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py index 5e931b9ac57628..d2cf5c0d4e055c 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPennylaneLightning(CMakePackage, PythonExtension): maintainers("mlxd", "AmintorDusko") + license("Apache-2.0") + version("master", branch="master") version("0.32.0", sha256="124edae1828c7e72e7b3bfbb0e75e98a07a490d7f1eab19eebb3311bfa8a23d4") version("0.31.0", sha256="b177243625b6fdac0699d163bbc330c92ca87fb9f427643785069273d2a255f6") diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py index e3bc536ae98a75..0464309adb107d 100644 --- a/var/spack/repos/builtin/packages/py-pennylane/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPennylane(PythonPackage): maintainers("mlxd", "AmintorDusko", "marcodelapierre") + license("Apache-2.0") + version("master", branch="master") version("0.32.0", sha256="8a2206268d7cae0a59f9067b6075175eec93f4843519b371f02716c49a22e750") version("0.31.0", sha256="f3b68700825c120e44434ed2b2ab71d0be9d3111f3043077ec0598661ec33477") diff --git a/var/spack/repos/builtin/packages/py-pep517/package.py b/var/spack/repos/builtin/packages/py-pep517/package.py index 74a1e394a05114..8a2b14b3646129 100644 --- a/var/spack/repos/builtin/packages/py-pep517/package.py +++ b/var/spack/repos/builtin/packages/py-pep517/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPep517(PythonPackage): homepage = "https://github.com/pypa/pep517" pypi = "pep517/pep517-0.12.0.tar.gz" + license("MIT") + version("0.12.0", sha256="931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0") depends_on("py-flit-core@2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py index d1dbb138ff399f..64b7acf5f9db8d 100644 --- a/var/spack/repos/builtin/packages/py-pep8-naming/package.py +++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPep8Naming(PythonPackage): homepage = "https://github.com/PyCQA/pep8-naming" pypi = "pep8-naming/pep8-naming-0.10.0.tar.gz" + license("MIT") + version("0.10.0", sha256="f3b4a5f9dd72b991bf7d8e2a341d2e1aa3a884a769b5aaac4f56825c1763bf3a") version("0.7.0", sha256="624258e0dd06ef32a9daf3c36cc925ff7314da7233209c5b01f7e5cdd3c34826") diff --git a/var/spack/repos/builtin/packages/py-pep8/package.py b/var/spack/repos/builtin/packages/py-pep8/package.py index 734bc28210558f..c5897c301717d5 100644 --- a/var/spack/repos/builtin/packages/py-pep8/package.py +++ b/var/spack/repos/builtin/packages/py-pep8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-performance/package.py b/var/spack/repos/builtin/packages/py-performance/package.py index 7669c5dfd3e414..7c43baf82049e6 100644 --- a/var/spack/repos/builtin/packages/py-performance/package.py +++ b/var/spack/repos/builtin/packages/py-performance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPerformance(PythonPackage): homepage = "http://pyperformance.readthedocs.io/" url = "https://github.com/python/performance/archive/0.6.1.tar.gz" + license("MIT") + version("0.6.1", sha256="cc48dd7579da2f4b0e4cff0c8220811f5ba7019493bb408819c1532acf53d13a") version("0.6.0", sha256="4636e276445e96563f628e071cacd5df31dc587d83899e7d03fa8b31760f2cd2") diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py index c2fa6707fb7901..73ed0f5b6699bc 100644 --- a/var/spack/repos/builtin/packages/py-periodictable/package.py +++ b/var/spack/repos/builtin/packages/py-periodictable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-petastorm/package.py b/var/spack/repos/builtin/packages/py-petastorm/package.py index d99acf1e0bdcfc..b4abc03dd6a720 100644 --- a/var/spack/repos/builtin/packages/py-petastorm/package.py +++ b/var/spack/repos/builtin/packages/py-petastorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPetastorm(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.12.0", sha256="79b98b87a619f34ca96a3dd42670506ce9439d321b3aab356cdf7edac8ff5c5c") version("0.11.4", sha256="7090dfc86f110e641d95798bcc75f8b1ca14cd56ed3feef491baaa6849629e51") version("0.9.8", sha256="571855224411b88b759ba5d48b288ad2ba09997ebd259292f72b9246144b8101") diff --git a/var/spack/repos/builtin/packages/py-petname/package.py b/var/spack/repos/builtin/packages/py-petname/package.py index 97144019ca0d7d..ba382579fa8e92 100644 --- a/var/spack/repos/builtin/packages/py-petname/package.py +++ b/var/spack/repos/builtin/packages/py-petname/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 06c551b9f4a1a1..ede2ff11b55f90 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,7 +17,10 @@ class PyPetsc4py(PythonPackage): maintainers("balay") + license("BSD-2-Clause") + version("main", branch="main") + version("3.20.2", sha256="d3f24aa6612ded3e9b9ae11d5533f319d1df1705bea6d81385fea023d01175c9") version("3.20.1", sha256="dcc9092040d13130496f1961b79c36468f383b6ede398080e004f1966c06ad38") version("3.20.0", sha256="c2461eef3977ae5c214ad252520adbb92ec3a31d00e79391dd92535077bbf03e") version("3.19.6", sha256="bd7891b651eb83504c744e70706818cf63ecbabee3206c1fed7c3013873802b9") diff --git a/var/spack/repos/builtin/packages/py-pexpect/package.py b/var/spack/repos/builtin/packages/py-pexpect/package.py index cd65ac488db270..5a6346338ab527 100644 --- a/var/spack/repos/builtin/packages/py-pexpect/package.py +++ b/var/spack/repos/builtin/packages/py-pexpect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pfzy/package.py b/var/spack/repos/builtin/packages/py-pfzy/package.py index a3e5a1dfeccec4..6a38534eccbc1d 100644 --- a/var/spack/repos/builtin/packages/py-pfzy/package.py +++ b/var/spack/repos/builtin/packages/py-pfzy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPfzy(PythonPackage): homepage = "https://github.com/kazhala/pfzy" pypi = "pfzy/pfzy-0.3.4.tar.gz" + license("MIT") + version("0.3.4", sha256="717ea765dd10b63618e7298b2d98efd819e0b30cd5905c9707223dceeb94b3f1") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pgzip/package.py b/var/spack/repos/builtin/packages/py-pgzip/package.py index 62452ba417a5cb..75395fcf2481bc 100644 --- a/var/spack/repos/builtin/packages/py-pgzip/package.py +++ b/var/spack/repos/builtin/packages/py-pgzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPgzip(PythonPackage): homepage = "https://github.com/pgzip/pgzip" pypi = "pgzip/pgzip-0.3.4.tar.gz" + license("MIT") + version("0.3.4", sha256="ef56449039bc6e88558e46fe6bb11e3faaeef445d3985a9fb286795ff842c480") version("0.3.1", sha256="a9c2df369311473ec3c239f26bf01638bdc6b6094d89ff4c81c6ef5c84eb24b7") diff --git a/var/spack/repos/builtin/packages/py-phanotate/package.py b/var/spack/repos/builtin/packages/py-phanotate/package.py index 6fe7d75a793bf5..3f88711942b9ab 100644 --- a/var/spack/repos/builtin/packages/py-phanotate/package.py +++ b/var/spack/repos/builtin/packages/py-phanotate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPhanotate(PythonPackage): homepage = "https://github.com/deprekate/phanotate" pypi = "phanotate/phanotate-1.5.0.tar.gz" + license("GPL-3.0-or-later") + version("1.5.0", sha256="589e441d2369e5550aef98b8d99fd079d130363bf881a70ac862fc7a8e0d2c88") depends_on("python@3.5.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-phonenumbers/package.py b/var/spack/repos/builtin/packages/py-phonenumbers/package.py index 65ef62c64a772b..c357b2696e092f 100644 --- a/var/spack/repos/builtin/packages/py-phonenumbers/package.py +++ b/var/spack/repos/builtin/packages/py-phonenumbers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-phonopy/package.py b/var/spack/repos/builtin/packages/py-phonopy/package.py index 23116cdfc431b9..a92e563e6102d9 100644 --- a/var/spack/repos/builtin/packages/py-phonopy/package.py +++ b/var/spack/repos/builtin/packages/py-phonopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-photutils/package.py b/var/spack/repos/builtin/packages/py-photutils/package.py index 1cf674d9e146e7..c0b56c9ba434bb 100644 --- a/var/spack/repos/builtin/packages/py-photutils/package.py +++ b/var/spack/repos/builtin/packages/py-photutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPhotutils(PythonPackage): homepage = "https://github.com/astropy/photutils" pypi = "photutils/photutils-1.5.0.tar.gz" + license("BSD-3-Clause") + version("1.5.0", sha256="014f7aa5a571401094d5cf9ffb57803b48869233feb80476ce377ecb91113689") maintainers("meyersbs") diff --git a/var/spack/repos/builtin/packages/py-phydms/package.py b/var/spack/repos/builtin/packages/py-phydms/package.py index cdeb81b0e375ac..bd8e1826cc3640 100644 --- a/var/spack/repos/builtin/packages/py-phydms/package.py +++ b/var/spack/repos/builtin/packages/py-phydms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPhydms(PythonPackage): homepage = "http://jbloomlab.github.io/phydms" pypi = "phydms/phydms-2.4.1.tar.gz" + license("GPL-3.0-or-later") + version("2.4.1", sha256="04eb50bdb07907214050d19214d9bc8cf2002e24ca30fbe6e0f23f013d584d5c") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-phylophlan/package.py b/var/spack/repos/builtin/packages/py-phylophlan/package.py index 3ac00cb485121d..648f4924a3afc3 100644 --- a/var/spack/repos/builtin/packages/py-phylophlan/package.py +++ b/var/spack/repos/builtin/packages/py-phylophlan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPhylophlan(PythonPackage): homepage = "https://github.com/biobakery/phylophlan" url = "https://github.com/biobakery/phylophlan/archive/refs/tags/3.0.3.tar.gz" + license("MIT") + version("3.0.3", sha256="d8d0082c95d58d7b11a60c1e2214b35c1a23a65675005f1393e7647d76c6a054") version("3.0.2", sha256="c342116662bbfbb49f0665291fc7c0be5a0d04a02a7be2da81de0322eb2256b4") diff --git a/var/spack/repos/builtin/packages/py-pickle5/package.py b/var/spack/repos/builtin/packages/py-pickle5/package.py index 904f5587ffc820..e5b6372aa7a929 100644 --- a/var/spack/repos/builtin/packages/py-pickle5/package.py +++ b/var/spack/repos/builtin/packages/py-pickle5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPickle5(PythonPackage): homepage = "https://github.com/pitrou/pickle5-backport" pypi = "pickle5/pickle5-0.0.11.tar.gz" + license("PSF-2.0") + version("0.0.11", sha256="7e013be68ba7dde1de5a8dbcc241f201dab1126e326715916ce4a26c27919ffc") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py index 378685bf2c6be5..2271aa198af466 100644 --- a/var/spack/repos/builtin/packages/py-pickleshare/package.py +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPickleshare(PythonPackage): pypi = "pickleshare/pickleshare-0.7.4.tar.gz" + license("MIT") + version("0.7.5", sha256="87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca") version("0.7.4", sha256="84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b") diff --git a/var/spack/repos/builtin/packages/py-picmistandard/package.py b/var/spack/repos/builtin/packages/py-picmistandard/package.py index bbc6b56212075f..bdcf00d81cd63a 100644 --- a/var/spack/repos/builtin/packages/py-picmistandard/package.py +++ b/var/spack/repos/builtin/packages/py-picmistandard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-picrust2/package.py b/var/spack/repos/builtin/packages/py-picrust2/package.py index ec0bea28390f09..a8db807889806f 100644 --- a/var/spack/repos/builtin/packages/py-picrust2/package.py +++ b/var/spack/repos/builtin/packages/py-picrust2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPicrust2(PythonPackage): maintainers("dorton21") + license("GPL-3.0-only") + version("2.3.0-b", sha256="ac12c372bc263e750d9101eca0cd0e57de37089b661fa1a13caf5a544d293737") version("2.2.0-b", sha256="c41e1f487b33179f4aecede50cfd8b652aa3cef2ea1ae5fd022f531c7d549097") version("2.1.4-b", sha256="f781eb323914979b6d3bca088a5152f085f53e6e38f1c3be94b35f99fc1db2d8") diff --git a/var/spack/repos/builtin/packages/py-pid/package.py b/var/spack/repos/builtin/packages/py-pid/package.py index dac352a284955b..73142ff7d4494d 100644 --- a/var/spack/repos/builtin/packages/py-pid/package.py +++ b/var/spack/repos/builtin/packages/py-pid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPid(PythonPackage): homepage = "https://github.com/trbs/pid/" url = "https://github.com/trbs/pid/archive/3.0.3.tar.gz" + license("Apache-2.0") + version("3.0.3", sha256="082281e2f6b99b4aaa02a24ae4796c604ac17f19cdd0327b8c1ba9c2e73aadc8") version("3.0.2", sha256="0be7dc260e35788163b3171a5f0e1a8b9888bc2b77232c053c042a65496b8396") version("3.0.1", sha256="2f51b61210f8e1f009b09a2034717003ca22dcd86995537ecb857863bddca89a") diff --git a/var/spack/repos/builtin/packages/py-pika/package.py b/var/spack/repos/builtin/packages/py-pika/package.py index 0d16ae4071ebbe..927311e1aadd84 100644 --- a/var/spack/repos/builtin/packages/py-pika/package.py +++ b/var/spack/repos/builtin/packages/py-pika/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPika(PythonPackage): git = "https://github.com/pika/pika.git" pypi = "pika/pika-1.3.2.tar.gz" + license("BSD-3-Clause") + version("1.3.2", sha256="b2a327ddddf8570b4965b3576ac77091b850262d34ce8c1d8cb4e4146aa4145f") version("1.3.1", sha256="beb19ff6dd1547f99a29acc2c6987ebb2ba7c44bf44a3f8e305877c5ef7d2fdc") version("1.3.0", sha256="15357ddc47a5c28f0b07d80e93d504cbbf7a1ad5e1cd129ecd27afe76472c529") diff --git a/var/spack/repos/builtin/packages/py-pillow-simd/package.py b/var/spack/repos/builtin/packages/py-pillow-simd/package.py index 5f5b9bbcf765d1..cdcdc09364ca9c 100644 --- a/var/spack/repos/builtin/packages/py-pillow-simd/package.py +++ b/var/spack/repos/builtin/packages/py-pillow-simd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPillowSimd(PyPillowBase): homepage = "https://github.com/uploadcare/pillow-simd" pypi = "Pillow-SIMD/Pillow-SIMD-7.0.0.post3.tar.gz" + license("HPND") + version( "9.0.0.post1", sha256="918541cfaa90ba3c0e1bae5da31ba1b1f52b09c0009bd90183b787af4e018263" ) diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 5a6007e9e3ed11..eb380ea75aa6fc 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -48,8 +48,6 @@ class PyPillowBase(PythonPackage): depends_on("python@3.6:3.9", when="@8:8.3.1", type=("build", "link", "run")) depends_on("python@3.5:3.8", when="@7.0:7.2", type=("build", "link", "run")) depends_on("python@2.7:2.8,3.5:3.8", when="@6.2.1:6.2.2", type=("build", "link", "run")) - depends_on("python@2.7:2.8,3.5:3.7", when="@6.0:6.2.0", type=("build", "link", "run")) - depends_on("python@2.7:2.8,3.4:3.7", when="@5.2:5.4", type=("build", "link", "run")) depends_on("py-setuptools", type="build") # Optional dependencies @@ -109,6 +107,8 @@ class PyPillow(PyPillowBase): homepage = "https://python-pillow.org/" pypi = "Pillow/Pillow-7.2.0.tar.gz" + license("HPND") + version("10.0.0", sha256="9c82b5b3e043c7af0d95792d0d20ccf68f61a1fec6b3530e718b688422727396") version("9.5.0", sha256="bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1") version("9.4.0", sha256="a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e") @@ -124,9 +124,6 @@ class PyPillow(PyPillowBase): version("7.0.0", sha256="4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946") version("6.2.2", sha256="db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950") version("6.2.1", sha256="bf4e972a88f8841d8fdc6db1a75e0f8d763e66e3754b03006cbc3854d89f1cb1") - version("6.2.0", sha256="4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df") - version("6.0.0", sha256="809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5") - version("5.4.1", sha256="5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f") for ver in [ "10.0.0", @@ -144,8 +141,5 @@ class PyPillow(PyPillowBase): "7.0.0", "6.2.2", "6.2.1", - "6.2.0", - "6.0.0", - "5.4.1", ]: provides("pil@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/py-pint-xarray/package.py b/var/spack/repos/builtin/packages/py-pint-xarray/package.py index 61fe26f6e6dc21..87e25f749c5202 100644 --- a/var/spack/repos/builtin/packages/py-pint-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-pint-xarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPintXarray(PythonPackage): homepage = "https://github.com/xarray-contrib/pint-xarray" pypi = "pint-xarray/pint-xarray-0.2.1.tar.gz" + license("Apache-2.0") + version("0.3", sha256="3545dfa78bee3f98eba29b8bd17500e3b5cb7c7b03a2c2781c4d4d59b6a82841") version("0.2.1", sha256="1ee6bf74ee7b52b946f226a96469276fa4f5c68f7381c1b2aae66852562cb275") diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py index 83cb92af0d6d67..cbd8f48575fbdc 100644 --- a/var/spack/repos/builtin/packages/py-pint/package.py +++ b/var/spack/repos/builtin/packages/py-pint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pip/package.py b/var/spack/repos/builtin/packages/py-pip/package.py index d92a53671ed8b8..de4bff43cccd38 100644 --- a/var/spack/repos/builtin/packages/py-pip/package.py +++ b/var/spack/repos/builtin/packages/py-pip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,10 +15,15 @@ class PyPip(Package, PythonExtension): url = "https://files.pythonhosted.org/packages/py3/p/pip/pip-20.2-py3-none-any.whl" list_url = "https://pypi.org/simple/pip/" + # Requires railroad + skip_modules = ["pip._vendor"] + tags = ["build-tools"] maintainers("adamjstewart", "pradyunsg") + license("MIT") + version( "23.1.2", sha256="3ef6ac33239e4027d9a5598a381b9d30880a1477e50039db2eac6e8a8f6d1b18", diff --git a/var/spack/repos/builtin/packages/py-pipdeptree/package.py b/var/spack/repos/builtin/packages/py-pipdeptree/package.py index 92600763ede13c..5b91b8c2d83dc8 100644 --- a/var/spack/repos/builtin/packages/py-pipdeptree/package.py +++ b/var/spack/repos/builtin/packages/py-pipdeptree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPipdeptree(PythonPackage): homepage = "https://github.com/tox-dev/pipdeptree" pypi = "pipdeptree/pipdeptree-2.13.0.tar.gz" + license("MIT") + version("2.13.0", sha256="ff71a48abd0b1ab810c23734b47de6ebd93270857d6665e21ed5ef6136fcba6e") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-piper/package.py b/var/spack/repos/builtin/packages/py-piper/package.py index 5991b8ed9538af..00da46196254e3 100644 --- a/var/spack/repos/builtin/packages/py-piper/package.py +++ b/var/spack/repos/builtin/packages/py-piper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPiper(PythonPackage): homepage = "https://github.com/databio/pypiper" pypi = "piper/piper-0.12.3.tar.gz" + license("BSD-2-Clause") + version("0.12.3", sha256="0ec7d4c4fd9cd1142e87193483c4f92022adbe2cd0f4678f2a1ea8227cdcd9fd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pipits/package.py b/var/spack/repos/builtin/packages/py-pipits/package.py index e484a75d484c6f..4ea055dde62753 100644 --- a/var/spack/repos/builtin/packages/py-pipits/package.py +++ b/var/spack/repos/builtin/packages/py-pipits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pispino/package.py b/var/spack/repos/builtin/packages/py-pispino/package.py index 19f294927e7efd..14449fd3469ba7 100644 --- a/var/spack/repos/builtin/packages/py-pispino/package.py +++ b/var/spack/repos/builtin/packages/py-pispino/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pivy/package.py b/var/spack/repos/builtin/packages/py-pivy/package.py index 9d220f513d7830..1df73c9419fbfa 100644 --- a/var/spack/repos/builtin/packages/py-pivy/package.py +++ b/var/spack/repos/builtin/packages/py-pivy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPivy(PythonPackage): homepage = "https://github.com/coin3d/pivy" url = "https://github.com/coin3d/pivy/archive/refs/tags/0.6.8.tar.gz" + license("0BSD") + version("0.6.8", sha256="c443dd7dd724b0bfa06427478b9d24d31e0c3b5138ac5741a2917a443b28f346") depends_on("coin3d") diff --git a/var/spack/repos/builtin/packages/py-pkgconfig/package.py b/var/spack/repos/builtin/packages/py-pkgconfig/package.py index 2835b7ce6c058a..477fa891c559a4 100644 --- a/var/spack/repos/builtin/packages/py-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/py-pkgconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPkgconfig(PythonPackage): homepage = "https://github.com/matze/pkgconfig" pypi = "pkgconfig/pkgconfig-1.2.2.tar.gz" + license("MIT") + version("1.5.5", sha256="deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899") version("1.5.1", sha256="97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f") version("1.4.0", sha256="048c3b457da7b6f686b647ab10bf09e2250e4c50acfe6f215398a8b5e6fcdb52") diff --git a/var/spack/repos/builtin/packages/py-pkginfo/package.py b/var/spack/repos/builtin/packages/py-pkginfo/package.py index 8b2cadea4733f3..6f5be4c3feb7b9 100644 --- a/var/spack/repos/builtin/packages/py-pkginfo/package.py +++ b/var/spack/repos/builtin/packages/py-pkginfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPkginfo(PythonPackage): homepage = "https://code.launchpad.net/~tseaver/pkginfo/trunk" pypi = "pkginfo/pkginfo-1.5.0.1.tar.gz" + license("MIT") + version("1.9.6", sha256="8fd5896e8718a4372f0ea9cc9d96f6417c9b986e23a4d116dda26b62cc29d046") version("1.8.3", sha256="a84da4318dd86f870a9447a8c98340aa06216bfc6f2b7bdc4b8766984ae1867c") version("1.7.1", sha256="e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd") diff --git a/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py b/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py index 09206c8a79983c..6719ec57f846aa 100644 --- a/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py +++ b/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-plac/package.py b/var/spack/repos/builtin/packages/py-plac/package.py index 007c31d445c811..7b0c7957b2ab96 100644 --- a/var/spack/repos/builtin/packages/py-plac/package.py +++ b/var/spack/repos/builtin/packages/py-plac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPlac(PythonPackage): # Skip 'plac_tk' imports import_modules = ["plac", "plac_ext", "plac_core"] + license("BSD-2-Clause") + version("1.3.5", sha256="38bdd864d0450fb748193aa817b9c458a8f5319fbf97b2261151cfc0a5812090") version("1.3.3", sha256="51e332dabc2aed2cd1f038be637d557d116175101535f53eaa7ae854a00f2a74") version("1.1.3", sha256="398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f") diff --git a/var/spack/repos/builtin/packages/py-planar/package.py b/var/spack/repos/builtin/packages/py-planar/package.py index 57607003cb5cc8..de2b62938a45f9 100644 --- a/var/spack/repos/builtin/packages/py-planar/package.py +++ b/var/spack/repos/builtin/packages/py-planar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPlanar(PythonPackage): homepage = "https://bitbucket.org/caseman/planar/src/default/" pypi = "planar/planar-0.4.zip" + license("BSD-3-Clause") + version("0.4", sha256="cbfb9cbae8b0e296e6e7e3552b7d685c7ed5cae295b7a61f2b2b096b231dad76") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-planet/package.py b/var/spack/repos/builtin/packages/py-planet/package.py index 2f5521d1a4e9d7..1c8ffe1fdb49ff 100644 --- a/var/spack/repos/builtin/packages/py-planet/package.py +++ b/var/spack/repos/builtin/packages/py-planet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,9 @@ class PyPlanet(PythonPackage): homepage = "https://github.com/planetlabs/planet-client-python" pypi = "planet/planet-1.4.6.tar.gz" + + license("Apache-2.0") + version("1.4.6", sha256="43ff6a765f465302f500aaf65b81a46ac6aad7bb42899e4a7543bdc293d4ca0d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-planetary-computer/package.py b/var/spack/repos/builtin/packages/py-planetary-computer/package.py index f48af5f574263e..2f48c71eb1970b 100644 --- a/var/spack/repos/builtin/packages/py-planetary-computer/package.py +++ b/var/spack/repos/builtin/packages/py-planetary-computer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPlanetaryComputer(PythonPackage): homepage = "https://github.com/microsoft/PlanetaryComputer" pypi = "planetary-computer/planetary-computer-0.4.9.tar.gz" + license("MIT") + version("0.4.9", sha256="f25030aa5b1fc3e44bd0d48300325ffbdbbabbed4a837dfcea55764359249720") depends_on("py-setuptools@42:", type="build") diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py index 82929c5c8e8da8..c7e9fb7a34e7b5 100644 --- a/var/spack/repos/builtin/packages/py-platformdirs/package.py +++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPlatformdirs(PythonPackage): homepage = "https://github.com/platformdirs/platformdirs" pypi = "platformdirs/platformdirs-2.4.0.tar.gz" + license("MIT") + version("3.10.0", sha256="b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d") version("3.5.3", sha256="e48fabd87db8f3a7df7150a4a5ea22c546ee8bc39bc2473244730d4b56d2cc4e") version("3.5.0", sha256="7954a68d0ba23558d753f73437c55f89027cf8f5108c19844d4b82e5af396335") diff --git a/var/spack/repos/builtin/packages/py-plotext/package.py b/var/spack/repos/builtin/packages/py-plotext/package.py index 0d38a81d898fa7..315c5c725c9bbf 100644 --- a/var/spack/repos/builtin/packages/py-plotext/package.py +++ b/var/spack/repos/builtin/packages/py-plotext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPlotext(PythonPackage): pypi = "plotext/plotext-5.2.8.tar.gz" git = "https://github.com/piccolomo/plotext.git" + license("MIT") + version("master", branch="master") version("5.2.8", sha256="319a287baabeb8576a711995f973a2eba631c887aa6b0f33ab016f12c50ffebe") diff --git a/var/spack/repos/builtin/packages/py-plotly/package.py b/var/spack/repos/builtin/packages/py-plotly/package.py index 8fad0ca14f72ad..2b2a02adb13086 100644 --- a/var/spack/repos/builtin/packages/py-plotly/package.py +++ b/var/spack/repos/builtin/packages/py-plotly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPlotly(PythonPackage): maintainers("meyersbs") + license("MIT") + version("5.14.1", sha256="bcac86d7fcba3eff7260c1eddc36ca34dae2aded10a0709808446565e0e53b93") version("5.2.2", sha256="809f0674a7991daaf4f287964d617d24e9fa44463acd5a5352ebd874cfd98b07") version("2.2.0", sha256="ca668911ffb4d11fed6d7fbb12236f8ecc6a7209db192326bcb64bdb41451a58") diff --git a/var/spack/repos/builtin/packages/py-plotnine/package.py b/var/spack/repos/builtin/packages/py-plotnine/package.py index 3b530e06ef79a5..f0e2eb75f25e60 100644 --- a/var/spack/repos/builtin/packages/py-plotnine/package.py +++ b/var/spack/repos/builtin/packages/py-plotnine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPlotnine(PythonPackage): homepage = "https://plotnine.readthedocs.io/en/stable" pypi = "plotnine/plotnine-0.8.0.tar.gz" + license("BSD-3-Clause") + version("0.9.0", sha256="0e89a93015f3c71d6844ac7aa9fb0da09b908f5f7dfa7dd5d68a5ca32b2ebcea") version("0.8.0", sha256="39de59edcc28106761b65238647d0b1f6212ea7f3a78f8be0b846616db969276") version("0.7.1", sha256="02f2b0435dae2e917198c5367fd97b010445d64d9888c6b7e755d3cdfe7ad057") diff --git a/var/spack/repos/builtin/packages/py-pluggy/package.py b/var/spack/repos/builtin/packages/py-pluggy/package.py index ed96eb7546fabb..0308e22d2d0fd6 100644 --- a/var/spack/repos/builtin/packages/py-pluggy/package.py +++ b/var/spack/repos/builtin/packages/py-pluggy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPluggy(PythonPackage): homepage = "https://github.com/pytest-dev/pluggy" pypi = "pluggy/pluggy-0.13.0.tar.gz" + license("MIT") + version("1.0.0", sha256="4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159") version("0.13.0", sha256="fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34") version("0.12.0", sha256="0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc") diff --git a/var/spack/repos/builtin/packages/py-plum-dispatch/package.py b/var/spack/repos/builtin/packages/py-plum-dispatch/package.py new file mode 100644 index 00000000000000..6656c2e89b1edc --- /dev/null +++ b/var/spack/repos/builtin/packages/py-plum-dispatch/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPlumDispatch(PythonPackage): + """Multiple dispatch in Python.""" + + homepage = "https://github.com/beartype/plum" + pypi = "plum_dispatch/plum_dispatch-2.2.2.tar.gz" + + license("MIT") + + version("2.2.2", sha256="d5d180225c9fbf0277375bb558b649d97d0b651a91037bb7155cedbe9f52764b") + + depends_on("python@3.8:", type=("build", "run")) + depends_on("py-hatchling@1.8.0:", type="build") + depends_on("py-hatch-vcs", type="build") + depends_on("py-beartype@0.16.2:", type=("build", "run")) + depends_on("py-typing-extensions", when="^python@:3.10", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ply/package.py b/var/spack/repos/builtin/packages/py-ply/package.py index 632ae998732e9c..71ca4b05313848 100644 --- a/var/spack/repos/builtin/packages/py-ply/package.py +++ b/var/spack/repos/builtin/packages/py-ply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPly(PythonPackage): homepage = "http://www.dabeaz.com/ply" pypi = "ply/ply-3.11.tar.gz" + license("Unlicense") + version("3.11", sha256="00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3") version("3.8", sha256="e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8") diff --git a/var/spack/repos/builtin/packages/py-pmw-patched/package.py b/var/spack/repos/builtin/packages/py-pmw-patched/package.py index 132666d1c81f40..06348516c55468 100644 --- a/var/spack/repos/builtin/packages/py-pmw-patched/package.py +++ b/var/spack/repos/builtin/packages/py-pmw-patched/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPmwPatched(PythonPackage): homepage = "https://github.com/schrodinger/pmw-patched" git = "https://github.com/schrodinger/pmw-patched" + license("MIT") + version("02-10-2020", commit="8bedfc8747e7757c1048bc5e11899d1163717a43") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-pmw/package.py b/var/spack/repos/builtin/packages/py-pmw/package.py index 8b56c5fbe8ecd7..58bd2d979f1938 100644 --- a/var/spack/repos/builtin/packages/py-pmw/package.py +++ b/var/spack/repos/builtin/packages/py-pmw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pockets/package.py b/var/spack/repos/builtin/packages/py-pockets/package.py index fe59fd7461ca33..5793788a695f6f 100644 --- a/var/spack/repos/builtin/packages/py-pockets/package.py +++ b/var/spack/repos/builtin/packages/py-pockets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPockets(PythonPackage): homepage = "http://pockets.readthedocs.org/" pypi = "pockets/pockets-0.9.1.tar.gz" + license("BSD-3-Clause") + version("0.9.1", sha256="9320f1a3c6f7a9133fe3b571f283bcf3353cd70249025ae8d618e40e9f7e92b3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-poetry-core/package.py b/var/spack/repos/builtin/packages/py-poetry-core/package.py index b49a291be9e5d3..0362efcbc3de0c 100644 --- a/var/spack/repos/builtin/packages/py-poetry-core/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,15 +12,19 @@ class PyPoetryCore(PythonPackage): homepage = "https://github.com/python-poetry/poetry-core" pypi = "poetry-core/poetry_core-1.6.1.tar.gz" + license("MIT") + + version("1.7.0", sha256="8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74") version("1.6.1", sha256="0f9b0de39665f36d6594657e7d57b6f463cc10f30c28e6d1c3b9ff54c26c9ac3") version("1.2.0", sha256="ceccec95487e46c63a41761fbac5211b809bca22658e25a049f4c7da96269f71") version("1.1.0", sha256="d145ae121cf79118a8901b60f2c951c4edcc16f55eb8aaefc156aa33aa921f07") version("1.0.8", sha256="951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118") version("1.0.7", sha256="98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206") + depends_on("python@3.8:3", when="@1.7.0:", type=("build", "run")) depends_on("python@3.7:3", when="@1.1.0:", type=("build", "run")) depends_on("python@:3", type=("build", "run")) - depends_on("py-importlib-metadata@1.7:", when="@1.1: ^python@:3.7", type=("build", "run")) + depends_on("py-importlib-metadata@1.7:", when="@1.1:1.6 ^python@:3.7", type=("build", "run")) depends_on("py-importlib-metadata@1.7:1", when="@:1.0 ^python@:3.7", type=("build", "run")) def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py b/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py index 901593036c4ccb..1386413016a2e2 100644 --- a/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPoetryDynamicVersioning(PythonPackage): homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning" pypi = "poetry-dynamic-versioning/poetry-dynamic-versioning-0.19.0.tar.gz" + license("MIT") + version("0.19.0", sha256="a11a7eba6e7be167c55a1dddec78f52b61a1832275c95519ad119c7a89a7f821") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py b/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py index 1f4f74e47691c1..e24c95f2481794 100644 --- a/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,11 +10,26 @@ class PyPoetryPluginExport(PythonPackage): """Poetry plugin to export the dependencies to various formats""" homepage = "https://python-poetry.org/" - pypi = "poetry-plugin-export/poetry-plugin-export-1.0.7.tar.gz" + pypi = "poetry-plugin-export/poetry_plugin_export-1.6.0.tar.gz" + license("MIT") + + version("1.6.0", sha256="091939434984267a91abf2f916a26b00cff4eee8da63ec2a24ba4b17cf969a59") version("1.0.7", sha256="f6ac707ae227b06b2481249ed2678ff6b810b3487cac0fbb66eb0dc2bfd6ecf1") + depends_on("python@3.8:3", when="@1.6:", type=("build", "run")) depends_on("python@3.7:3", type=("build", "run")) - depends_on("py-poetry-core@1.1:1", type=("build", "run")) - + depends_on("py-poetry-core@1.7:1", when="@1.6", type=("build", "run")) + depends_on("py-poetry-core@1.1:1", when="@1.0", type=("build", "run")) + # depends_on("py-poetry@1.6:1", when="@1.6", type=("build", "run")) # circular dependency # depends_on("py-poetry@1.2:1", type="run") # circular dependency + + def url_for_version(self, version): + url = ( + "https://files.pythonhosted.org/packages/source/p/poetry-plugin-export/{0}-{1}.tar.gz" + ) + if version >= Version("1.6"): + letter = "poetry_plugin_export" + else: + letter = "poetry-plugin-export" + return url.format(letter, version) diff --git a/var/spack/repos/builtin/packages/py-poetry-plugin-tweak-dependencies-version/package.py b/var/spack/repos/builtin/packages/py-poetry-plugin-tweak-dependencies-version/package.py new file mode 100644 index 00000000000000..3b8cc706a4a7d1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-poetry-plugin-tweak-dependencies-version/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 PyPoetryPluginTweakDependenciesVersion(PythonPackage): + """Poetry plugin used to tweak dependency versions.""" + + homepage = "https://github.com/sbrunner/poetry-plugin-tweak-dependencies-version" + pypi = "poetry_plugin_tweak_dependencies_version/" + pypi += "poetry_plugin_tweak_dependencies_version-1.5.1.tar.gz" + + maintainers("LydDeb") + + version("1.5.1", sha256="4e0be2b8e23a04e542c5090deb5b6e191750ec45bace98ea8b55150844c6026b") + + depends_on("python@3.9:3.11", type=("build", "run")) + depends_on("py-poetry-core@1.0.0:", type="build") + depends_on("py-poetry-dynamic-versioning", type="build") + depends_on("py-poetry@1.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-poetry/package.py b/var/spack/repos/builtin/packages/py-poetry/package.py index f8064f17c3efa0..68b2ae95e47715 100644 --- a/var/spack/repos/builtin/packages/py-poetry/package.py +++ b/var/spack/repos/builtin/packages/py-poetry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,52 +12,72 @@ class PyPoetry(PythonPackage): homepage = "https://python-poetry.org/" pypi = "poetry/poetry-1.1.12.tar.gz" + license("MIT") + + version("1.6.1", sha256="0ab9b1a592731cc8b252b8d6aaeea19c72cc0a109d7468b829ad57e6c48039d2") version("1.2.1", sha256="2750bb2b636ef435d8beac51dde0b13d06199017a1d9b96cba899863d1e81024") version("1.2.0", sha256="17c527d5d5505a5a7c5c14348d87f077d643cf1f186321530cde68e530bba59f") version("1.1.13", sha256="b905ed610085f568aa61574e0e09260c02bff9eae12ff672af39e9f399357ac4") version("1.1.12", sha256="5c66e2357fe37b552462a88b7d31bfa2ed8e84172208becd666933c776252567") - depends_on("python@2.7,3.5:3", type=("build", "run")) + depends_on("python@3.8:3", when="@1.6.0:", type=("build", "run")) depends_on("python@3.7:3", when="@1.2.0:", type=("build", "run")) - depends_on("py-poetry-core@1.0.7:1.0", when="@:1.1", type=("build", "run")) + depends_on("python@2.7,3.5:3", type=("build", "run")) + depends_on("py-poetry-core@1.7.0", when="@1.6.1", type=("build", "run")) + depends_on("py-poetry-core@1.2.0", when="@1.2.1", type=("build", "run")) depends_on("py-poetry-core@1.1.0", when="@1.2.0", type=("build", "run")) - depends_on("py-poetry-core@1.2.0", when="@1.2.1:", type=("build", "run")) - depends_on("py-poetry-plugin-export@1.0.6:1", when="@1.2.0:", type=("build", "run")) + depends_on("py-poetry-core@1.0.7:1.0", when="@:1.1", type=("build", "run")) + depends_on("py-poetry-plugin-export@1.5.0:1", when="@1.6.1", type=("build", "run")) depends_on("py-poetry-plugin-export@1.0.7:1", when="@1.2.1:", type=("build", "run")) + depends_on("py-poetry-plugin-export@1.0.6:1", when="@1.2.0:", type=("build", "run")) depends_on( - "py-backports-cached-property@1.0.2:1", when="@1.2.1: ^python@:3.7", type=("build", "run") - ) - depends_on("py-cachecontrol@0.12.9:0.12+filecache", when="@1.2.1:", type=("build", "run")) - depends_on( - "py-cachecontrol@0.12.9:0.12+filecache", when="^python@3.6:3", type=("build", "run") + "py-backports-cached-property@1.0.2:1", when="@1.2.1:^python@:3.7", type=("build", "run") ) - depends_on("py-cachy@0.3.0:0.3", type=("build", "run")) + depends_on("py-cachecontrol@0.13+filecache", when="@1.6.1", type=("build", "run")) + depends_on("py-cachecontrol@0.12.9:0.12+filecache", when="@1.2.1:1.2", type=("build", "run")) + depends_on("py-cachy@0.3.0:0.3", when="@:1.2", type=("build", "run")) + depends_on("py-cleo@2", when="@1.6.1", type=("build", "run")) + depends_on("py-cleo@1", when="@1.2", type=("build", "run")) depends_on("py-cleo@0.8.1:0.8", when="@:1.1", type=("build", "run")) - depends_on("py-cleo@1", type=("build", "run"), when="@1.2.0:") depends_on("py-clikit@0.6.2:0.6", when="@:1.1", type=("build", "run")) - depends_on("py-crashtest@0.3.0:0.3", when="^python@3.6:3", type=("build", "run")) - depends_on("py-html5lib@1.0:1", type=("build", "run")) + depends_on("py-crashtest@0.4.1:0.4", when="@1.6.1", type=("build", "run")) + depends_on("py-crashtest@0.3", when="@:1.2", type=("build", "run")) + depends_on("py-html5lib@1.0:1", when="@:1.2", type=("build", "run")) + depends_on("py-importlib-metadata@4.4:", when="@1.2: ^python@:3.9", type=("build", "run")) depends_on("py-importlib-metadata@1.6:1", when="@:1.1 ^python@:3.7", type=("build", "run")) - depends_on("py-importlib-metadata@4.4:", when="@1.2.0 ^python@:3.9", type=("build", "run")) - depends_on("py-importlib-metadata@4.4:4", when="@1.2.1: ^python@:3.9", type=("build", "run")) + depends_on("py-jsonschema@4.10.0:4.17", when="@1.6.1", type=("build", "run")) depends_on("py-jsonschema@4.10.0:4", when="@1.2:", type=("build", "run")) - depends_on("py-keyring@21.2.0:21", when="@1.1.12 ^python@3.6:3", type=("build", "run")) + depends_on("py-keyring@24", when="@1.6.1", type=("build", "run")) depends_on("py-keyring@21.2.0:", when="@1.1.13:", type=("build", "run")) - depends_on("py-packaging@20.4:20", when="@:1.1", type=("build", "run")) + depends_on("py-keyring@21.2.0:21", when="@1.1.12 ^python@3.6:3", type=("build", "run")) depends_on("py-packaging@20.4:", when="@1.2:", type=("build", "run")) + depends_on("py-packaging@20.4:20", when="@:1.1", type=("build", "run")) depends_on("py-pexpect@4.7:4", type=("build", "run")) - depends_on("py-pkginfo@1.4:1", when="@:1.1", type=("build", "run")) + depends_on("py-pkginfo@1.9.4:1", when="@1.6.1", type=("build", "run")) depends_on("py-pkginfo@1.5:1", when="@1.2:", type=("build", "run")) - depends_on("py-platformdirs@2.5.2:2", when="@1.2:", type=("build", "run")) + depends_on("py-pkginfo@1.4:1", when="@:1.1", type=("build", "run")) + depends_on("py-platformdirs@3", when="@1.6.1", type=("build", "run")) + depends_on("py-platformdirs@2.5.2:2", when="@1.2", type=("build", "run")) + depends_on("py-requests@2.26:2", when="@1.6.1", type=("build", "run")) depends_on("py-requests@2.18:2", type=("build", "run")) - depends_on("py-requests-toolbelt@0.9.1:0.9", type=("build", "run")) - depends_on("py-shellingham@1.1:1", when="@:1.1", type=("build", "run")) + depends_on("py-requests-toolbelt@0.9.1:1", when="@1.6.1", type=("build", "run")) + depends_on("py-requests-toolbelt@0.9.1:0.9", when="@:1.2", type=("build", "run")) depends_on("py-shellingham@1.5:1", when="@1.2:", type=("build", "run")) + depends_on("py-shellingham@1.1:1", when="@:1.1", type=("build", "run")) + depends_on("py-tomlkit@0.11.4:0", when="@1.6.1", type=("build", "run")) + depends_on("py-tomlkit@0.11.1,0.11.4:0", when="@1.2", type=("build", "run")) depends_on("py-tomlkit@0.7:0", when="@:1.1", type=("build", "run")) - depends_on("py-tomlkit@0.11.1,0.11.4:0", when="@1.2:", type=("build", "run")) + depends_on("py-virtualenv@20.22.0:20", when="@1.6.1", type=("build", "run")) + depends_on("py-virtualenv@20.4.3:20.4.4,20.4.7:", when="@1.2", type=("build", "run")) depends_on("py-virtualenv@20.0.26:20", when="@:1.1", type=("build", "run")) - depends_on("py-virtualenv@20.4.3:20.4.4,20.4.7:", when="@1.2:", type=("build", "run")) + depends_on("py-xattr@0.10", when="platform=darwin @1.6.1", type=("build", "run")) depends_on("py-xattr@0.9.7:0.9", when="platform=darwin @1.2:") - depends_on("py-urllib3@1.26.0:1", when="@1.2:") + depends_on("py-urllib3@1.26.0:1", when="@1.2") + depends_on("py-dulwich@0.21.2:0.21", when="@1.6.1", type=("build", "run")) + depends_on("py-dulwich@0.20.46:0.20", when="@1.2.1") depends_on("py-dulwich@0.20.44:0.20", when="@1.2.0") - depends_on("py-dulwich@0.20.46:0.20", when="@1.2.1:") + depends_on("py-build@0.10", when="@1.6.1", type=("build", "run")) + depends_on("py-installer@0.7.0:0.7", when="@1.6.1", type=("build", "run")) + depends_on("py-pyproject-hooks@1", when="@1.6.1", type=("build", "run")) + depends_on("py-tomli@2.0.1:2", when="@1.6.1^python@:3.10", type=("build", "run")) + depends_on("py-trove-classifiers@2022.5.19:", when="@1.6.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-polars/package.py b/var/spack/repos/builtin/packages/py-polars/package.py new file mode 100644 index 00000000000000..422f07c0487968 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-polars/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPolars(PythonPackage): + """Blazingly fast DataFrame library.""" + + homepage = "https://www.pola.rs/" + pypi = "polars/polars-0.20.5.tar.gz" + + license("MIT") + + version("0.20.5", sha256="fa4abc22cee024b5872961ddcd8a13a0a76150df345e21ce4308c2b1a36b47aa") + + # pyproject.toml + depends_on("py-maturin@1.3.2:", type="build") + + # README.md + depends_on("rust@1.71:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pomegranate/package.py b/var/spack/repos/builtin/packages/py-pomegranate/package.py index 0bf0de52bd5ccb..00055adcd24ad7 100644 --- a/var/spack/repos/builtin/packages/py-pomegranate/package.py +++ b/var/spack/repos/builtin/packages/py-pomegranate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPomegranate(PythonPackage): homepage = "https://github.com/jmschrei/pomegranate" pypi = "pomegranate/pomegranate-0.12.0.tar.gz" + license("MIT") + version("0.12.0", sha256="8b00c88f7cf9cad8d38ea00ea5274821376fefb217a1128afe6b1fcac54c975a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pooch/package.py b/var/spack/repos/builtin/packages/py-pooch/package.py index 0339126abacaad..c3760d30c9e885 100644 --- a/var/spack/repos/builtin/packages/py-pooch/package.py +++ b/var/spack/repos/builtin/packages/py-pooch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPooch(PythonPackage): homepage = "https://github.com/fatiando/pooch" pypi = "pooch/pooch-1.3.0.tar.gz" + license("BSD-3-Clause") + version("1.7.0", sha256="f174a1041b6447f0eef8860f76d17f60ed2f857dc0efa387a7f08228af05d998") version("1.5.2", sha256="5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581") version("1.3.0", sha256="30d448e825904e2d763bbbe418831a788813c32f636b21c8d60ee5f474532898") diff --git a/var/spack/repos/builtin/packages/py-portalocker/package.py b/var/spack/repos/builtin/packages/py-portalocker/package.py index f44ef867de1ab3..ad3c26449a1021 100644 --- a/var/spack/repos/builtin/packages/py-portalocker/package.py +++ b/var/spack/repos/builtin/packages/py-portalocker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPortalocker(PythonPackage): homepage = "https://github.com/WoLpH/portalocker" pypi = "portalocker/portalocker-2.5.1.tar.gz" + license("BSD-3-Clause") + version("2.5.1", sha256="ae8e9cc2660da04bf41fa1a0eef7e300bb5e4a5869adfb1a6d8551632b559b2b") version("1.6.0", sha256="4013e6d17123560178a5ba28cb6fdf13fd3079dee18571ff824e05b7abc97b94") diff --git a/var/spack/repos/builtin/packages/py-portend/package.py b/var/spack/repos/builtin/packages/py-portend/package.py index bcb6f62bffa897..0ee2489f299852 100644 --- a/var/spack/repos/builtin/packages/py-portend/package.py +++ b/var/spack/repos/builtin/packages/py-portend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPortend(PythonPackage): homepage = "https://github.com/jaraco/portend" pypi = "portend/portend-2.5.tar.gz" + license("MIT") + version("2.5", sha256="19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-portpicker/package.py b/var/spack/repos/builtin/packages/py-portpicker/package.py index 710f7c4bbc2a97..58df0e09003fd1 100644 --- a/var/spack/repos/builtin/packages/py-portpicker/package.py +++ b/var/spack/repos/builtin/packages/py-portpicker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPortpicker(PythonPackage): homepage = "https://github.com/google/python_portpicker" pypi = "portpicker/portpicker-1.5.2.tar.gz" + license("Apache-2.0") + version("1.5.2", sha256="c55683ad725f5c00a41bc7db0225223e8be024b1fa564d039ed3390e4fd48fb3") depends_on("py-setuptools@40.9:", type="build") diff --git a/var/spack/repos/builtin/packages/py-poster/package.py b/var/spack/repos/builtin/packages/py-poster/package.py index 5740f648b76370..2d4657ba905fc1 100644 --- a/var/spack/repos/builtin/packages/py-poster/package.py +++ b/var/spack/repos/builtin/packages/py-poster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPoster(PythonPackage): homepage = "https://atlee.ca/software/poster" url = "https://atlee.ca/software/poster/dist/0.8.1/poster-0.8.1.tar.gz" + license("MIT") + version("0.8.1", sha256="af5bf45da4a916db2b638cffd9e9d6668b33020e2b8ca9f864db79b49331c6ff") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pot/package.py b/var/spack/repos/builtin/packages/py-pot/package.py index 5fb91bb31ebbb4..4f7c63b602c2fa 100644 --- a/var/spack/repos/builtin/packages/py-pot/package.py +++ b/var/spack/repos/builtin/packages/py-pot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPot(PythonPackage): homepage = "https://github.com/PythonOT/POT" pypi = "POT/POT-0.7.0.tar.gz" + license("MIT") + version("0.7.0", sha256="d4ac2bc8791f049a3166820d51e218d6c299885449b735eafef8d18c76d4ad06") # Avoid that CC and CXX are overridden with g++ in setup.py. diff --git a/var/spack/repos/builtin/packages/py-pox/package.py b/var/spack/repos/builtin/packages/py-pox/package.py index 3d69737434f1f3..06be0195db7b1d 100644 --- a/var/spack/repos/builtin/packages/py-pox/package.py +++ b/var/spack/repos/builtin/packages/py-pox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPox(PythonPackage): homepage = "https://github.com/uqfoundation/pox" pypi = "pox/pox-0.2.5.tar.gz" + license("BSD-3-Clause") + version("0.3.0", sha256="cb968350b186466bb4905a21084587ec3aa6fd7aa0ef55d416ee0d523e2abe31") version("0.2.5", sha256="2b53fbdf02596240483dc2cb94f94cc21252ad1b1858c7b1c151afeec9022cc8") version("0.2.3", sha256="d3e8167a1ebe08ae56262a0b9359118d90bc4648cd284b5d10ae240343100a75") diff --git a/var/spack/repos/builtin/packages/py-poyo/package.py b/var/spack/repos/builtin/packages/py-poyo/package.py index e1ef37848f1283..d6011ec5cec698 100644 --- a/var/spack/repos/builtin/packages/py-poyo/package.py +++ b/var/spack/repos/builtin/packages/py-poyo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPoyo(PythonPackage): homepage = "https://github.com/hackebrot/poyo" url = "https://github.com/hackebrot/poyo/archive/0.4.1.tar.gz" + license("MIT") + version("0.4.1", sha256="9f069dc9c8ee359abc8ef9e7304cb1b1c23556d1f4ae64f4247c1e45de43c1f1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ppft/package.py b/var/spack/repos/builtin/packages/py-ppft/package.py index 877cd96d8f5724..4a9f7cc1c76248 100644 --- a/var/spack/repos/builtin/packages/py-ppft/package.py +++ b/var/spack/repos/builtin/packages/py-ppft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPpft(PythonPackage): homepage = "https://github.com/uqfoundation/ppft" pypi = "ppft/ppft-1.6.4.9.tar.gz" + license("BSD-3-Clause") + version("1.6.6.4", sha256="473442cc6731856990bd25bd6b454bb98720007de4523a73c560bdd0060463d2") version("1.6.4.9", sha256="5537b00afb7b247da0f59cc57ee5680178be61c8b2e21b5a0672b70a3d247791") version("1.6.4.7.1", sha256="f94b26491b4a36adc975fc51dba7568089a24756007a3a4ef3414a98d7337651") diff --git a/var/spack/repos/builtin/packages/py-pprintpp/package.py b/var/spack/repos/builtin/packages/py-pprintpp/package.py index f24a70c3918a6b..b1f70efd9c827b 100644 --- a/var/spack/repos/builtin/packages/py-pprintpp/package.py +++ b/var/spack/repos/builtin/packages/py-pprintpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pre-commit/package.py b/var/spack/repos/builtin/packages/py-pre-commit/package.py index 480a12a75e6722..4b288178bc5f9e 100644 --- a/var/spack/repos/builtin/packages/py-pre-commit/package.py +++ b/var/spack/repos/builtin/packages/py-pre-commit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class PyPreCommit(PythonPackage): homepage = "https://github.com/pre-commit/pre-commit" pypi = "pre_commit/pre_commit-1.20.0.tar.gz" + license("MIT") + + version("3.5.0", sha256="5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32") version("3.3.3", sha256="a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023") version("2.20.0", sha256="a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959") version("2.17.0", sha256="c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a") diff --git a/var/spack/repos/builtin/packages/py-preshed/package.py b/var/spack/repos/builtin/packages/py-preshed/package.py index e6c8a175485b97..53e479acaabda1 100644 --- a/var/spack/repos/builtin/packages/py-preshed/package.py +++ b/var/spack/repos/builtin/packages/py-preshed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPreshed(PythonPackage): homepage = "https://github.com/explosion/preshed" pypi = "preshed/preshed-3.0.2.tar.gz" + license("MIT") + version("3.0.8", sha256="6c74c70078809bfddda17be96483c41d06d717934b07cab7921011d81758b357") version("3.0.2", sha256="61d73468c97c1d6d5a048de0b01d5a6fd052123358aca4823cdb277e436436cb") diff --git a/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py b/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py index d927f7eed23953..e0ed4bf4218509 100644 --- a/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py +++ b/var/spack/repos/builtin/packages/py-pretrainedmodels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py index a3ed847832e03c..d3b7561c49bbbb 100644 --- a/var/spack/repos/builtin/packages/py-prettytable/package.py +++ b/var/spack/repos/builtin/packages/py-prettytable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-priority/package.py b/var/spack/repos/builtin/packages/py-priority/package.py index 54053642373368..2737bd9a1d3e7f 100644 --- a/var/spack/repos/builtin/packages/py-priority/package.py +++ b/var/spack/repos/builtin/packages/py-priority/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPriority(PythonPackage): homepage = "https://github.com/python-hyper/priority/" pypi = "priority/priority-2.0.0.tar.gz" + license("MIT") + version("2.0.0", sha256="c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0") depends_on("python@3.6.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-profilehooks/package.py b/var/spack/repos/builtin/packages/py-profilehooks/package.py index 53647f69095c74..d66361ecfb197f 100644 --- a/var/spack/repos/builtin/packages/py-profilehooks/package.py +++ b/var/spack/repos/builtin/packages/py-profilehooks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyProfilehooks(PythonPackage): git = "https://github.com/mgedmin/profilehooks.git" + license("MIT") + version("1.11.2", sha256="41a74c1abdc5eeaf7dec024e9e89627f70e158374d263a3098bef31a06d38ab2") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-proglog/package.py b/var/spack/repos/builtin/packages/py-proglog/package.py index 2271cd642fbfa1..5c1d7fffc6e1a5 100644 --- a/var/spack/repos/builtin/packages/py-proglog/package.py +++ b/var/spack/repos/builtin/packages/py-proglog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyProglog(PythonPackage): homepage = "https://pypi.org/project/proglog/" pypi = "proglog/proglog-0.1.9.tar.gz" + license("MIT") + version("0.1.9", sha256="d8c4ccbf2138e0c5e3f3fc0d80dc51d7e69dcfe8bfde4cacb566725092a5b18d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-progress/package.py b/var/spack/repos/builtin/packages/py-progress/package.py index 0bf5c10c6ee615..7381b5bfeae099 100644 --- a/var/spack/repos/builtin/packages/py-progress/package.py +++ b/var/spack/repos/builtin/packages/py-progress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyProgress(PythonPackage): homepage = "https://github.com/verigak/progress/" pypi = "progress/progress-1.4.tar.gz" + license("ISC") + version("1.4", sha256="5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-progressbar2/package.py b/var/spack/repos/builtin/packages/py-progressbar2/package.py index 68a9d0730dada9..985034e32d85e0 100644 --- a/var/spack/repos/builtin/packages/py-progressbar2/package.py +++ b/var/spack/repos/builtin/packages/py-progressbar2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,8 +13,11 @@ class PyProgressbar2(PythonPackage): homepage = "https://github.com/WoLpH/python-progressbar" pypi = "progressbar2/progressbar2-3.50.1.tar.gz" + license("BSD-3-Clause") + version("3.55.0", sha256="86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04") version("3.50.1", sha256="2c21c14482016162852c8265da03886c2b4dea6f84e5a817ad9b39f6bd82a772") + version("3.43.1", sha256="87a403d2f80f6e48b7b55559feae5c75b903941f55189b22207b574fe5e62276") version("3.39.3", sha256="8e5b5419e04193bb7c3fea71579937bbbcd64c26472b929718c2fe7ec420fe39") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-progressbar33/package.py b/var/spack/repos/builtin/packages/py-progressbar33/package.py index e2b9bc1783f160..75307f7b6a67f0 100644 --- a/var/spack/repos/builtin/packages/py-progressbar33/package.py +++ b/var/spack/repos/builtin/packages/py-progressbar33/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyProgressbar33(PythonPackage): homepage = "https://github.com/germangh/python-progressbar" pypi = "progressbar33/progressbar33-2.4.tar.gz" + license("BSD-3-Clause") + version("2.4", sha256="51fe0d9b3b4023db2f983eeccdfc8c9846b84db8443b9bee002c7f58f4376eff") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-projectq/package.py b/var/spack/repos/builtin/packages/py-projectq/package.py index ee0c43d388cfb2..eac6aec7f09bbf 100644 --- a/var/spack/repos/builtin/packages/py-projectq/package.py +++ b/var/spack/repos/builtin/packages/py-projectq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyProjectq(PythonPackage): homepage = "https://projectq.ch" git = "https://github.com/projectq-framework/projectq.git" + license("Apache-2.0") + # Versions version("develop", branch="develop") version("0.3.6", commit="fa484fe037a3a1772127bbd00fe4628ddba34611") diff --git a/var/spack/repos/builtin/packages/py-prometheus-client/package.py b/var/spack/repos/builtin/packages/py-prometheus-client/package.py index ff6d4cc02784e8..09f6efc4fcf12b 100644 --- a/var/spack/repos/builtin/packages/py-prometheus-client/package.py +++ b/var/spack/repos/builtin/packages/py-prometheus-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPrometheusClient(PythonPackage): homepage = "https://github.com/prometheus/client_python" pypi = "prometheus_client/prometheus_client-0.7.1.tar.gz" + license("Apache-2.0") + version("0.17.0", sha256="9c3b26f1535945e85b8934fb374678d263137b78ef85f305b1156c7c881cd11b") version("0.14.1", sha256="5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a") version("0.12.0", sha256="1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5") diff --git a/var/spack/repos/builtin/packages/py-prometheus-flask-exporter/package.py b/var/spack/repos/builtin/packages/py-prometheus-flask-exporter/package.py index b026dd3859fd20..fc21ac132a5eab 100644 --- a/var/spack/repos/builtin/packages/py-prometheus-flask-exporter/package.py +++ b/var/spack/repos/builtin/packages/py-prometheus-flask-exporter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPrometheusFlaskExporter(PythonPackage): homepage = "https://pypi.org/project/prometheus-flask-exporter/" pypi = "prometheus-flask-exporter/prometheus_flask_exporter-0.21.0.tar.gz" + license("MIT") + version("0.21.0", sha256="ebbc016c1e3d16e7cd39fe651a6c52ac68779858b2d5d1be6ddbc9e66f7fc29f") version("0.18.2", sha256="fc487e385d95cb5efd045d6a315c4ecf68c42661e7bfde0526af75ed3c4f8c1b") diff --git a/var/spack/repos/builtin/packages/py-promise/package.py b/var/spack/repos/builtin/packages/py-promise/package.py index 40cb0bb4b2568f..88ae2b31eba359 100644 --- a/var/spack/repos/builtin/packages/py-promise/package.py +++ b/var/spack/repos/builtin/packages/py-promise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPromise(PythonPackage): maintainers("dorton21") + license("MIT") + version("2.3", sha256="dfd18337c523ba4b6a58801c164c1904a9d4d1b1747c7d5dbf45b693a49d93d0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index 7320e38a28f323..70146e632ac177 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPromptToolkit(PythonPackage): # dependency. Leave out of 'import_modules' to avoid unnecessary dependency. skip_modules = ["prompt_toolkit.contrib.ssh"] + license("BSD-3-Clause") + version("3.0.38", sha256="23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b") version("3.0.31", sha256="9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148") version("3.0.29", sha256="bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7") diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index 41ee1b3f41cf7d..b5f0171d010a95 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-protoc-gen-swagger/package.py b/var/spack/repos/builtin/packages/py-protoc-gen-swagger/package.py index 5087da703faa48..f3ddfbceece797 100644 --- a/var/spack/repos/builtin/packages/py-protoc-gen-swagger/package.py +++ b/var/spack/repos/builtin/packages/py-protoc-gen-swagger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyProtocGenSwagger(PythonPackage): homepage = "https://github.com/universe-proton/protoc-gen-swagger" url = "https://github.com/universe-proton/protoc-gen-swagger/archive/refs/tags/v0.1.0.tar.gz" + license("Apache-2.0") + version("0.1.0", sha256="bf9593eec8e0cac31fef10bd558f2a69babbb2475c67291c1c2ca84763c73067") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-prov/package.py b/var/spack/repos/builtin/packages/py-prov/package.py index 290b99dc69cf3f..fa68b56dae151f 100644 --- a/var/spack/repos/builtin/packages/py-prov/package.py +++ b/var/spack/repos/builtin/packages/py-prov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyProv(PythonPackage): homepage = "prov.readthedocs.io/" pypi = "prov/prov-2.0.0.tar.gz" + license("MIT") + version("2.0.0", sha256="b6438f2195ecb9f6e8279b58971e02bc51814599b5d5383366eef91d867422ee") version("1.5.1", sha256="7a2d72b0df43cd9c6e374d815c8ce3cd5ca371d54f98f837853ac9fcc98aee4c") diff --git a/var/spack/repos/builtin/packages/py-prwlock/package.py b/var/spack/repos/builtin/packages/py-prwlock/package.py index 3a8c6c8d02629f..dcec07b6b11a25 100644 --- a/var/spack/repos/builtin/packages/py-prwlock/package.py +++ b/var/spack/repos/builtin/packages/py-prwlock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPrwlock(PythonPackage): homepage = "https://github.com/renatolfc/prwlock" pypi = "prwlock/prwlock-0.4.1.tar.gz" + license("MIT") + version("0.4.1", sha256="a2fa773cb877207ae5b54c7cf5d224b0215c9f7b9ef16a88d33eadc5c9e1466e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-psalg/package.py b/var/spack/repos/builtin/packages/py-psalg/package.py index 0308276c30dcd9..9302655371795f 100644 --- a/var/spack/repos/builtin/packages/py-psalg/package.py +++ b/var/spack/repos/builtin/packages/py-psalg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-psana/package.py b/var/spack/repos/builtin/packages/py-psana/package.py index 055ef02d2cc340..a35d1e08a38203 100644 --- a/var/spack/repos/builtin/packages/py-psana/package.py +++ b/var/spack/repos/builtin/packages/py-psana/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-psij-python/package.py b/var/spack/repos/builtin/packages/py-psij-python/package.py index 657d0ec6ad8a77..40fef282f4a6c0 100644 --- a/var/spack/repos/builtin/packages/py-psij-python/package.py +++ b/var/spack/repos/builtin/packages/py-psij-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPsijPython(PythonPackage): maintainers("andre-merzky") + license("MIT") + version( "0.1.0.post2", sha256="78f4fb147248be479aa6128b583dff9052698c49f36c6e9811b4c3f9db326043" ) diff --git a/var/spack/repos/builtin/packages/py-psmon/package.py b/var/spack/repos/builtin/packages/py-psmon/package.py index e9e756f80ff67f..fd07803f9734e7 100644 --- a/var/spack/repos/builtin/packages/py-psmon/package.py +++ b/var/spack/repos/builtin/packages/py-psmon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPsmon(PythonPackage): maintainers("valmar") + license("MIT") + version("1.1.1", sha256="ecbd4e3a34b5f20ac5c62e4cd1e19f7384c6d72f2dd7d66c7b4bc36b529b8385") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pspamm/package.py b/var/spack/repos/builtin/packages/py-pspamm/package.py index 8b73946e144864..c99027fc2b4206 100644 --- a/var/spack/repos/builtin/packages/py-pspamm/package.py +++ b/var/spack/repos/builtin/packages/py-pspamm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPspamm(PythonPackage): maintainers("ravil-mobile") + license("BSD-3-Clause") + version("develop", branch="master") variant("numpy", default=False, description="installs numpy") diff --git a/var/spack/repos/builtin/packages/py-psutil/package.py b/var/spack/repos/builtin/packages/py-psutil/package.py index 4dbf26ae95de50..4441e530034f11 100644 --- a/var/spack/repos/builtin/packages/py-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-psutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPsutil(PythonPackage): homepage = "https://github.com/giampaolo/psutil" pypi = "psutil/psutil-5.6.3.tar.gz" + license("BSD-3-Clause") + version("5.9.5", sha256="5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c") version("5.9.4", sha256="3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62") version("5.9.2", sha256="feb861a10b6c3bb00701063b37e4afc754f8217f0f09c42280586bd6ac712b5c") diff --git a/var/spack/repos/builtin/packages/py-psyclone/package.py b/var/spack/repos/builtin/packages/py-psyclone/package.py index 39a0a85ad60ebe..e8965d43b0a942 100644 --- a/var/spack/repos/builtin/packages/py-psyclone/package.py +++ b/var/spack/repos/builtin/packages/py-psyclone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-psycopg2/package.py b/var/spack/repos/builtin/packages/py-psycopg2/package.py index 47e163c956f3bb..cc6e805592912e 100644 --- a/var/spack/repos/builtin/packages/py-psycopg2/package.py +++ b/var/spack/repos/builtin/packages/py-psycopg2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,6 @@ class PyPsycopg2(PythonPackage): version("2.9.6", sha256="f15158418fd826831b28585e2ab48ed8df2d0d98f502a2b4fe619e7d5ca29011") version("2.9.1", sha256="de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c") version("2.8.6", sha256="fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543") - version("2.7.5", sha256="eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e") # https://www.psycopg.org/docs/install.html#prerequisites # https://github.com/psycopg/psycopg2/blob/master/doc/src/install.rst @@ -24,8 +23,6 @@ class PyPsycopg2(PythonPackage): depends_on("python@:3.11", when="@2.9.5:", type=("build", "link", "run")) depends_on("python@:3.10", when="@2.9.1:2.9.4", type=("build", "link", "run")) depends_on("python@:3.9", when="@2.8.6:2.9.0", type=("build", "link", "run")) - depends_on("python@:3.8", when="@2.8.4:2.8.5", type=("build", "link", "run")) - depends_on("python@:3.7", when="@:2.8.3", type=("build", "link", "run")) depends_on("py-setuptools", type="build") @@ -34,4 +31,3 @@ class PyPsycopg2(PythonPackage): depends_on("postgresql@9.1:13", when="@2.9:2.9.1", type=("build", "link", "run")) depends_on("postgresql@9.1:12", when="@2.8.4:2.8", type=("build", "link", "run")) depends_on("postgresql@9.1:11", when="@2.8:2.8.3", type=("build", "link", "run")) - depends_on("postgresql@9.1:10", when="@:2.7", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-ptyprocess/package.py b/var/spack/repos/builtin/packages/py-ptyprocess/package.py index bdca18e5d4d896..3c81d976b348fc 100644 --- a/var/spack/repos/builtin/packages/py-ptyprocess/package.py +++ b/var/spack/repos/builtin/packages/py-ptyprocess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPtyprocess(PythonPackage): pypi = "ptyprocess/ptyprocess-0.5.1.tar.gz" + license("ISC") + version("0.7.0", sha256="5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220") version("0.6.0", sha256="923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0") version("0.5.1", sha256="0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6") diff --git a/var/spack/repos/builtin/packages/py-pubchempy/package.py b/var/spack/repos/builtin/packages/py-pubchempy/package.py index bccd280993ea8e..a93caac66b7466 100644 --- a/var/spack/repos/builtin/packages/py-pubchempy/package.py +++ b/var/spack/repos/builtin/packages/py-pubchempy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPubchempy(PythonPackage): maintainers("meyersbs") + license("MIT") + version("1.0.4", sha256="24e9dc2fc90ab153b2764bf805e510b1410700884faf0510a9e7cf0d61d8ed0e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pudb/package.py b/var/spack/repos/builtin/packages/py-pudb/package.py index 84b5c43a39142f..fae1e43bbc69be 100644 --- a/var/spack/repos/builtin/packages/py-pudb/package.py +++ b/var/spack/repos/builtin/packages/py-pudb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPudb(PythonPackage): homepage = "https://mathema.tician.de/software/pudb" pypi = "pudb/pudb-2017.1.1.tar.gz" + license("MIT") + version("2017.1.1", sha256="87117640902c5f602c8517d0167eb5c953a5bdede97975ba29ff17e3d570442c") version("2016.2", sha256="e958d7f7b1771cf297714e95054075df3b2a47455d7a740be4abbbd41289505a") diff --git a/var/spack/repos/builtin/packages/py-pulp/package.py b/var/spack/repos/builtin/packages/py-pulp/package.py index bc80b0a22d5cfc..442b3362b171b7 100644 --- a/var/spack/repos/builtin/packages/py-pulp/package.py +++ b/var/spack/repos/builtin/packages/py-pulp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPulp(PythonPackage): maintainers("marcusboden") + license("MIT") + version("2.6.0", sha256="4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pulsar-galaxy-lib/package.py b/var/spack/repos/builtin/packages/py-pulsar-galaxy-lib/package.py index bb1f833cfe3541..ce713ac8c47e66 100644 --- a/var/spack/repos/builtin/packages/py-pulsar-galaxy-lib/package.py +++ b/var/spack/repos/builtin/packages/py-pulsar-galaxy-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPulsarGalaxyLib(PythonPackage): homepage = "https://github.com/galaxyproject/pulsar" pypi = "pulsar-galaxy-lib/pulsar-galaxy-lib-0.14.16.tar.gz" + license("Apache-2.0") + version("0.14.16", sha256="f3330350d2e85c7228cebf83f74fc4c0cc5e8e7557bb6e5ae55f5556d7e6fbff") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pure-eval/package.py b/var/spack/repos/builtin/packages/py-pure-eval/package.py index 0961690fd8a314..306ce185c5f54c 100644 --- a/var/spack/repos/builtin/packages/py-pure-eval/package.py +++ b/var/spack/repos/builtin/packages/py-pure-eval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPureEval(PythonPackage): git = "https://github.com/alexmojaki/pure_eval.git" pypi = "pure_eval/pure_eval-0.2.2.tar.gz" + license("MIT") + version("master", branch="master") version("0.2.2", sha256="2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3") diff --git a/var/spack/repos/builtin/packages/py-pure-sasl/package.py b/var/spack/repos/builtin/packages/py-pure-sasl/package.py index 3f886ca69984ac..c4182441ba2648 100644 --- a/var/spack/repos/builtin/packages/py-pure-sasl/package.py +++ b/var/spack/repos/builtin/packages/py-pure-sasl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPureSasl(PythonPackage): homepage = "https://github.com/thobbs/pure-sasl" pypi = "pure-sasl/pure-sasl-0.6.2.tar.gz" + license("MIT") + version("0.6.2", sha256="53c1355f5da95e2b85b2cc9a6af435518edc20c81193faa0eea65fdc835138f4") variant("gssapi", default=True, description="build with kerberos/gssapi support") diff --git a/var/spack/repos/builtin/packages/py-puremagic/package.py b/var/spack/repos/builtin/packages/py-puremagic/package.py index d1c0866a597020..54906cc7a00bab 100644 --- a/var/spack/repos/builtin/packages/py-puremagic/package.py +++ b/var/spack/repos/builtin/packages/py-puremagic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPuremagic(PythonPackage): homepage = "https://github.com/cdgriffith/puremagic" pypi = "puremagic/puremagic-1.10.tar.gz" + license("MIT") + version("1.14", sha256="3d5df26cc7ec9aebbf842a09115a2fa85dc59ea6414fa568572c44775d796cbc") version("1.10", sha256="6ffea02b80ceec1381f9df513e0120b701a74b6efad92311ea80281c7081b108") diff --git a/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py b/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py index b98a15f82872f8..bff155c92cace9 100644 --- a/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py +++ b/var/spack/repos/builtin/packages/py-py-cpuinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyCpuinfo(PythonPackage): homepage = "https://github.com/workhorsy/py-cpuinfo" pypi = "py-cpuinfo/py-cpuinfo-0.2.3.tar.gz" + license("MIT") + version("9.0.0", sha256="3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690") version("8.0.0", sha256="5f269be0e08e33fd959de96b34cd4aeeeacac014dd8305f70eb28d06de2345c5") version("6.0.0", sha256="7ffb31dea845b9f359b99bd5f7eea72dc70f852e0e34547d261a630f2b8c9c61") diff --git a/var/spack/repos/builtin/packages/py-py-spy/package.py b/var/spack/repos/builtin/packages/py-py-spy/package.py index 8d3c3f635e48cc..4c588a79bfc65c 100644 --- a/var/spack/repos/builtin/packages/py-py-spy/package.py +++ b/var/spack/repos/builtin/packages/py-py-spy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPySpy(Package): homepage = "https://github.com/benfred/py-spy" url = "https://github.com/benfred/py-spy/archive/v0.3.8.tar.gz" + license("MIT") + version("0.3.8", sha256="9dbfd0ea79ef31a2966891e86cf6238ed3831938cf562e71848e07b7009cf57d") version("0.3.3", sha256="41454d3d9132da45c72f7574faaff65f40c757720293a277ffa5ec5a4b44f902") diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py index 480097a10d4207..7260513924d118 100644 --- a/var/spack/repos/builtin/packages/py-py/package.py +++ b/var/spack/repos/builtin/packages/py-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPy(PythonPackage): homepage = "https://py.readthedocs.io/en/latest/" pypi = "py/py-1.8.0.tar.gz" + license("MIT") + version("1.11.0", sha256="51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719") version("1.9.0", sha256="9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342") version("1.8.2", sha256="f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b") diff --git a/var/spack/repos/builtin/packages/py-py2bit/package.py b/var/spack/repos/builtin/packages/py-py2bit/package.py index d7040dadca3536..ea15abb9e10417 100644 --- a/var/spack/repos/builtin/packages/py-py2bit/package.py +++ b/var/spack/repos/builtin/packages/py-py2bit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPy2bit(PythonPackage): pypi = "py2bit/py2bit-0.2.1.tar.gz" + license("MIT") + version("0.2.1", sha256="34f7ac22be0eb4b5493063826bcc2016a78eb216bb7130890b50f3572926aeb1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py index e6eeb3e654623f..bcd145bc2bc1f4 100644 --- a/var/spack/repos/builtin/packages/py-py2neo/package.py +++ b/var/spack/repos/builtin/packages/py-py2neo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPy2neo(PythonPackage): homepage = "https://py2neo.org/" pypi = "py2neo/py2neo-2.0.8.tar.gz" + license("Apache-2.0") + version("4.3.0", sha256="a218ccb4b636e3850faa6b74ebad80f00600217172a57f745cf223d38a219222") version("2.0.8", sha256="06167f5a91a0d9b9b73431baacd876f2d507650a681fdce1fcf3b383a9b991c1") version("2.0.7", sha256="9b154053eb93c7f5fb3ebd48b6a5b99df450d3f2e9c6682153c6f8d59369378c") diff --git a/var/spack/repos/builtin/packages/py-py4j/package.py b/var/spack/repos/builtin/packages/py-py4j/package.py index 414affc65d9500..17a251913bbe3f 100644 --- a/var/spack/repos/builtin/packages/py-py4j/package.py +++ b/var/spack/repos/builtin/packages/py-py4j/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPy4j(PythonPackage): homepage = "https://www.py4j.org/" pypi = "py4j/py4j-0.10.4.zip" + license("BSD-3-Clause") + version("0.10.9.5", sha256="276a4a3c5a2154df1860ef3303a927460e02e97b047dc0a47c1c3fb8cce34db6") version("0.10.9.3", sha256="0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd") version("0.10.9", sha256="36ec57f43ff8ced260a18aa9a4e46c3500a730cac8860e259cbaa546c2b9db2f") diff --git a/var/spack/repos/builtin/packages/py-py6s/package.py b/var/spack/repos/builtin/packages/py-py6s/package.py index cde0a66ad4b24e..d7089ed16374c0 100644 --- a/var/spack/repos/builtin/packages/py-py6s/package.py +++ b/var/spack/repos/builtin/packages/py-py6s/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyabel/package.py b/var/spack/repos/builtin/packages/py-pyabel/package.py index f3dba077187b84..05243cd0464e31 100644 --- a/var/spack/repos/builtin/packages/py-pyabel/package.py +++ b/var/spack/repos/builtin/packages/py-pyabel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyabel(PythonPackage): maintainers("valmar") + license("MIT") + version("0.9.0", sha256="4052143de9da19be13bb321fb0524090ffc8cdc56e0e990e5d6f557f18109f08") depends_on("py-setuptools@44.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyaestro/package.py b/var/spack/repos/builtin/packages/py-pyaestro/package.py index c7b8e1971c825f..eb993b4334f7d8 100644 --- a/var/spack/repos/builtin/packages/py-pyaestro/package.py +++ b/var/spack/repos/builtin/packages/py-pyaestro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyaestro(PythonPackage): maintainers("FrankD412") + license("MIT") + # git branches version("main", branch="main") version("0.0.1a2", sha256="1f6a5068ff8dd9fe4838aba43850e51a5b622f379819ae62103617bf9c8aaa31") diff --git a/var/spack/repos/builtin/packages/py-pyamg/package.py b/var/spack/repos/builtin/packages/py-pyamg/package.py index 0b6898d63d6113..7a3731880f21d0 100644 --- a/var/spack/repos/builtin/packages/py-pyamg/package.py +++ b/var/spack/repos/builtin/packages/py-pyamg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,16 +13,16 @@ class PyPyamg(PythonPackage): homepage = "https://github.com/pyamg/pyamg" url = "https://github.com/pyamg/pyamg/archive/refs/tags/v4.0.0.zip" - # A list of GitHub accounts to notify when the package is updated. maintainers("benc303") + license("MIT") + version("5.0.0", sha256="088be4b38203e708905fa45295593c1336b127a28391486d4f5917cf0b96f5f2") version("4.2.3", sha256="dcf23808e0e8edf177fc4f71a6b36e0823ffb117137a33a9eee14b391ddbb733") version("4.1.0", sha256="9e340aef5da11280a1e28f28deeaac390f408e38ee0357d0fdbb77503747bbc4") version("4.0.0", sha256="015d5e706e6e54d3de82e05fdb173c30d8b27cb8a117ab584cd62ad41d9ea042") - # Dependencies. A generic python dependency is added implicity by the - # PythonPackage class. + depends_on("python", type=("build", "link", "run")) depends_on("py-numpy@1.7:", type=("build", "run")) depends_on("py-scipy@0.12:", type=("build", "run")) depends_on("py-setuptools@42:", type="build", when="@4.2.0:") @@ -30,4 +30,4 @@ class PyPyamg(PythonPackage): # https://github.com/pypa/setuptools_scm/issues/758 depends_on("py-setuptools-scm@7.1:+toml", type="build", when="@5.0.0:") depends_on("py-setuptools-scm@5:+toml", type="build", when="@4.2.0:") - depends_on("py-pybind11@2.8.0:", type=("build"), when="@4.2.0:") + depends_on("py-pybind11@2.8.0:", type=("build", "link"), when="@4.2.0:") diff --git a/var/spack/repos/builtin/packages/py-pyaml/package.py b/var/spack/repos/builtin/packages/py-pyaml/package.py index 540472454f4227..9a147d2ec9b50a 100644 --- a/var/spack/repos/builtin/packages/py-pyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyaml(PythonPackage): homepage = "https://github.com/mk-fg/pretty-yaml" pypi = "pyaml/pyaml-21.8.3.tar.gz" + license("WTFPL") + version("21.8.3", sha256="a1636d63c476328a07213d0b7111bb63570f1ab8a3eddf60522630250c23d975") depends_on("python@2.7:2,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyani/package.py b/var/spack/repos/builtin/packages/py-pyani/package.py index 9bfc7c2940abca..2f98da5f4e82cf 100644 --- a/var/spack/repos/builtin/packages/py-pyani/package.py +++ b/var/spack/repos/builtin/packages/py-pyani/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyani(PythonPackage): homepage = "https://widdowquinn.github.io/pyani" pypi = "pyani/pyani-0.2.7.tar.gz" + license("MIT") + version("0.2.7", sha256="dbc6c71c46fbbfeced3f8237b84474221268b51170caf044bec8559987a7deb9") version("0.2.6", sha256="e9d899bccfefaabe7bfa17d48eef9c713d321d2d15465f7328c8984807c3dd8d") diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py index b20e7bfad83332..99d7c8adc8fe34 100644 --- a/var/spack/repos/builtin/packages/py-pyarrow/package.py +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,14 @@ class PyPyarrow(PythonPackage, CudaPackage): pypi = "pyarrow/pyarrow-0.17.1.tar.gz" git = "https://github.com/apache/arrow" + maintainers("thomas-bouvier") + + license("Apache-2.0") + + version("14.0.2", sha256="36cef6ba12b499d864d1def3e990f97949e0b79400d08b7cf74504ffbd3eb025") + version("13.0.0", sha256="83333726e83ed44b0ac94d8d7a21bbdee4a05029c3b1e8db58a863eec8fd8a33") + version("12.0.1", sha256="cce317fc96e5b71107bf1f9f184d5e54e2bd14bbf3f9a3d62819961f0af86fec") + version("11.0.0", sha256="5461c57dbdb211a632a48facb9b39bbeb8a7905ec95d768078525283caef5f6d") version("10.0.1", sha256="1a14f57a5f472ce8234f2964cd5184cccaa8df7e04568c64edc33b23eb285dd5") version("8.0.0", sha256="4a18a211ed888f1ac0b0ebcb99e2d9a3e913a481120ee9b1fe33d3fedb945d4e") version("7.0.0", sha256="da656cad3c23a2ebb6a307ab01d35fce22f7850059cffafcb90d12590f8f4f38") @@ -35,21 +43,25 @@ class PyPyarrow(PythonPackage, CudaPackage): depends_on("cmake@3.0.0:", type="build") depends_on("pkgconfig", type="build") + depends_on("python@3.8:", type=("build", "run"), when="@13:") + depends_on("python@3.7:", type=("build", "run"), when="@7:") + depends_on("python@3.6:", type=("build", "run"), when="@3:") depends_on("python@3.5:", type=("build", "run"), when="@0.17:") - depends_on("python@3.6:", type=("build", "run"), when="@3.0.0:") - depends_on("python@3.7:", type=("build", "run"), when="@7.0.0:") depends_on("py-setuptools", type="build") - depends_on("py-setuptools@38.6.0:", type="build", when="@7.0.0:") depends_on("py-setuptools@40.1.0:", type="build", when="@10.0.1:") - depends_on("py-setuptools-scm", type="build", when="@0.15.0:") + depends_on("py-setuptools@38.6.0:", type="build", when="@7:") + depends_on("py-setuptools-scm@:7", type="build", when="@0.15:") depends_on("py-cython", type="build") - depends_on("py-cython@0.29:", type="build", when="@0.15.0:") - depends_on("py-cython@0.29.22:", type="build", when="@8.0.0:") + depends_on("py-cython@0.29.31:", type="build", when="@14:") + depends_on("py-cython@0.29.31:2", type="build", when="@12:13") + depends_on("py-cython@0.29.22:2", type="build", when="@8:11") + depends_on("py-cython@0.29:2", type="build", when="@0.15:7") + depends_on("py-cython@:2", type="build", when="@:0.14") # in newer pip versions --install-option does not exist depends_on("py-pip@:23.0", type="build") - depends_on("py-numpy@1.14:", type=("build", "run"), when="@0.15.0:") - depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@3.0.0:") + depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@3:") + depends_on("py-numpy@1.14:", type=("build", "run"), when="@0.15:") arrow_versions = ( "@0.9.0", @@ -62,6 +74,10 @@ class PyPyarrow(PythonPackage, CudaPackage): "@7.0.0", "@8.0.0", "@10.0.1", + "@11.0.0", + "@12.0.1", + "@13.0.0", + "@14.0.2", ) for v in arrow_versions: depends_on("arrow+python" + v, when=v) diff --git a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py index 65de0a0e554afa..003b6eee41696c 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyasn1Modules(PythonPackage): homepage = "https://github.com/etingof/pyasn1-modules" pypi = "pyasn1-modules/pyasn1-modules-0.2.6.tar.gz" + license("BSD-2-Clause") + version("0.2.8", sha256="905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e") version("0.2.6", sha256="43c17a83c155229839cc5c6b868e8d0c6041dba149789b6d6e28801c64821722") version("0.2.5", sha256="ef721f68f7951fab9b0404d42590f479e30d9005daccb1699b0a51bb4177db96") diff --git a/var/spack/repos/builtin/packages/py-pyasn1/package.py b/var/spack/repos/builtin/packages/py-pyasn1/package.py index 9f6560adb639d1..790e442f3027b7 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,12 @@ class PyPyasn1(PythonPackage): homepage = "https://github.com/etingof/pyasn1" pypi = "pyasn1/pyasn1-0.4.6.tar.gz" + license("BSD-2-Clause") + version("0.4.8", sha256="aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba") version("0.4.6", sha256="b773d5c9196ffbc3a1e13bdf909d446cad80a039aa3340bcad72f395b76ebc86") version("0.4.5", sha256="da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7") + version("0.4.3", sha256="fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc") version("0.2.3", sha256="738c4ebd88a718e700ee35c8d129acce2286542daa80a82823a7073644f706ad") depends_on("python@2.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyassimp/package.py b/var/spack/repos/builtin/packages/py-pyassimp/package.py index 6be386d40c4f83..b24b223857a627 100644 --- a/var/spack/repos/builtin/packages/py-pyassimp/package.py +++ b/var/spack/repos/builtin/packages/py-pyassimp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyassimp(PythonPackage): homepage = "https://github.com/mikedh/pyassimp" pypi = "pyassimp/pyassimp-4.1.4.tar.gz" + license("ISC") + version("4.1.4", sha256="266bd4be170d46065b8c2ad0f5396dad10938a6bbf9a566c4e4d56456e33aa6a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyautogui/package.py b/var/spack/repos/builtin/packages/py-pyautogui/package.py index 596606f8034078..ffd0c38bd991ab 100644 --- a/var/spack/repos/builtin/packages/py-pyautogui/package.py +++ b/var/spack/repos/builtin/packages/py-pyautogui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyautogui(PythonPackage): homepage = "https://pyautogui.readthedocs.io/en/latest/" pypi = "PyAutoGUI/PyAutoGUI-0.9.52.tar.gz" + license("BSD-3-Clause") + version("0.9.53", sha256="d31de8f712218d90be7fc98091fce1a12a3e9196e0c814eb9afd73bb2ec97035") version("0.9.52", sha256="a486cb6b818bcbcdf98b48d010c7cee964134fa394b756e8ce6e50d43b58ecc8") diff --git a/var/spack/repos/builtin/packages/py-pybedtools/package.py b/var/spack/repos/builtin/packages/py-pybedtools/package.py index e97de3a91487e1..5b15211bece085 100644 --- a/var/spack/repos/builtin/packages/py-pybedtools/package.py +++ b/var/spack/repos/builtin/packages/py-pybedtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPybedtools(PythonPackage): homepage = "https://daler.github.io/pybedtools" pypi = "pybedtools/pybedtools-0.9.0.tar.gz" + license("MIT") + version("0.9.0", sha256="9267c92cd764173449d9c31baedac0659b4eccc3d7c05e22ec378f86c0fc30a3") version("0.8.0", sha256="4eebd2cd1764ee1c604fd881703c3e329195485350b987b7fb8db42d232984f6") version("0.7.10", sha256="518a2311bd33f29cf2ee8fc1a028dda8c8e380c9fc83fcb0fbaa206933174b50") diff --git a/var/spack/repos/builtin/packages/py-pybids/package.py b/var/spack/repos/builtin/packages/py-pybids/package.py index 8a77813ad6a05d..0878ce575de359 100644 --- a/var/spack/repos/builtin/packages/py-pybids/package.py +++ b/var/spack/repos/builtin/packages/py-pybids/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPybids(PythonPackage): homepage = "https://github.com/bids-standard/pybids" pypi = "pybids/pybids-0.13.1.tar.gz" + license("MIT") + version("0.16.3", sha256="10e279350c8d14ca602c0d4469a5e4bf7ff393e8643c831a546ae735b6b82cc3") version("0.16.1", sha256="1a6ab06d375f3b783e738826e6d220b2f4145419b4b02f4edbcc8cb7c9b2208a") version("0.15.3", sha256="4d99c979bc4bc209cff70a02d1da309c9bf8c6b0338e2a0b66ebea77c7f3c461") diff --git a/var/spack/repos/builtin/packages/py-pybigwig/package.py b/var/spack/repos/builtin/packages/py-pybigwig/package.py index 3e75804f78c2a8..814fa8d37fefee 100644 --- a/var/spack/repos/builtin/packages/py-pybigwig/package.py +++ b/var/spack/repos/builtin/packages/py-pybigwig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPybigwig(PythonPackage): pypi = "pyBigWig/pyBigWig-0.3.4.tar.gz" + license("MIT") + version("0.3.12", sha256="e01991790ece496bf6d3f00778dcfb136dd9ca0fd28acc1b3fb43051ad9b8403") version("0.3.4", sha256="8c97a19218023190041c0e426f1544f7a4944a7bb4568faca1d85f1975af9ee2") diff --git a/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py b/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py index f3183a046f8e95..8f04cae03bcc07 100644 --- a/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11-stubgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 63625651bcd964..b4baeeb0355e37 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -84,10 +84,7 @@ def patch(self): class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder): def cmake_args(self): - return [ - self.define("PYTHON_EXECUTABLE:FILEPATH", self.spec["python"].command.path), - self.define("PYBIND11_TEST", self.pkg.run_tests), - ] + return [self.define("PYBIND11_TEST", self.pkg.run_tests)] def install(self, pkg, spec, prefix): super().install(pkg, spec, prefix) diff --git a/var/spack/repos/builtin/packages/py-pybktree/package.py b/var/spack/repos/builtin/packages/py-pybktree/package.py index c23fb2aabd8e45..18844e75372008 100644 --- a/var/spack/repos/builtin/packages/py-pybktree/package.py +++ b/var/spack/repos/builtin/packages/py-pybktree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPybktree(PythonPackage): homepage = "https://github.com/benhoyt/pybktree" pypi = "pybktree/pybktree-1.1.tar.gz" + license("MIT") + version("1.1", sha256="eec0037cdd3d7553e6d72435a4379bede64be17c6712f149e485169638154d2b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pybobyqa/package.py b/var/spack/repos/builtin/packages/py-pybobyqa/package.py index f86c30ae320b2e..54392005b71cf0 100644 --- a/var/spack/repos/builtin/packages/py-pybobyqa/package.py +++ b/var/spack/repos/builtin/packages/py-pybobyqa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pybrain/package.py b/var/spack/repos/builtin/packages/py-pybrain/package.py index 758737efaf0a59..17d34438a0e995 100644 --- a/var/spack/repos/builtin/packages/py-pybrain/package.py +++ b/var/spack/repos/builtin/packages/py-pybrain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPybrain(PythonPackage): url = "https://github.com/pybrain/pybrain/archive/refs/tags/0.3.3.tar.gz" git = "https://github.com/pybrain/pybrain.git" + license("BSD-3-Clause") + version("0.3.3.post", commit="dcdf32ba1805490cefbc0bdeb227260d304fdb42") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py index e4ab1b788f137a..6d35f85c3e2f8d 100644 --- a/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex-docutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPybtexDocutils(PythonPackage): pypi = "pybtex-docutils/pybtex-docutils-0.2.1.tar.gz" + license("MIT") + version("1.0.0", sha256="cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e") version("0.2.2", sha256="ea90935da188a0f4de2fe6b32930e185c33a0e306154322ccc12e519ebb5fa7d") version("0.2.1", sha256="e4b075641c1d68a3e98a6d73ad3d029293fcf9e0773512315ef9c8482f251337") diff --git a/var/spack/repos/builtin/packages/py-pybtex/package.py b/var/spack/repos/builtin/packages/py-pybtex/package.py index 82e0e4c528b763..819ae8a711302c 100644 --- a/var/spack/repos/builtin/packages/py-pybtex/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPybtex(PythonPackage): homepage = "https://pybtex.org" pypi = "pybtex/pybtex-0.24.0.tar.gz" + license("MIT") + version("0.24.0", sha256="818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755") version("0.21", sha256="af8a6c7c74954ad305553b118d2757f68bc77c5dd5d5de2cc1fd16db90046000") diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py index 0021915fac2ddf..c9eccce8077566 100644 --- a/var/spack/repos/builtin/packages/py-pycairo/package.py +++ b/var/spack/repos/builtin/packages/py-pycairo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,20 +15,18 @@ class PyPycairo(PythonPackage): pypi = "pycairo/pycairo-1.17.1.tar.gz" git = "https://github.com/pygobject/pycairo.git" + license("MPL-1.1") + version("1.24.0", sha256="1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6") version("1.20.0", sha256="5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c") - version("1.18.1", sha256="70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786") - version("1.17.1", sha256="0f0a35ec923d87bc495f6753b1e540fd046d95db56a35250c44089fbce03b698") depends_on("python@3.8:", when="@1.23:", type=("build", "run")) depends_on("python@3.6:3", when="@1.20:1.22", type=("build", "run")) - depends_on("python@2.7:2.8,3.4:3.7", when="@1.18.1:1.19", type=("build", "run")) depends_on("py-setuptools", type="build") # https://github.com/pygobject/pycairo/blob/main/docs/getting_started.rst depends_on("pkgconfig", type="build") # version requirements from setup.py - depends_on("cairo@1.15.10: +pdf", when="@1.20:") - depends_on("cairo@1.13.1: +pdf", when="@:1.18.1") + depends_on("cairo@1.15.10: +pdf") @run_after("install") def post_install(self): diff --git a/var/spack/repos/builtin/packages/py-pycares/package.py b/var/spack/repos/builtin/packages/py-pycares/package.py index 168c93ed781e46..e8dba26fb7d74b 100644 --- a/var/spack/repos/builtin/packages/py-pycares/package.py +++ b/var/spack/repos/builtin/packages/py-pycares/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPycares(PythonPackage): homepage = "https://github.com/saghul/pycares" url = "https://github.com/saghul/pycares/archive/pycares-3.0.0.tar.gz" + license("MIT") + version("3.0.0", sha256="28dc2bd59cf20399a6af4383cc8f57970cfca8b808ca05d6493812862ef0ca9c") depends_on("python@2.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pycbc/package.py b/var/spack/repos/builtin/packages/py-pycbc/package.py index 809573d57f71ca..8faf56000dbdad 100644 --- a/var/spack/repos/builtin/packages/py-pycbc/package.py +++ b/var/spack/repos/builtin/packages/py-pycbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPycbc(PythonPackage): homepage = "https://pycbc.org/" pypi = "PyCBC/PyCBC-1.14.1.tar.gz" + license("GPL-3.0-or-later") + version("1.14.1", sha256="4b0a309cb6209837aaebbd691413a286dd7200ccf4b977ffed1462a65ac35dc0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pychecker/package.py b/var/spack/repos/builtin/packages/py-pychecker/package.py index 468607ffed2f33..4deba1e1491330 100644 --- a/var/spack/repos/builtin/packages/py-pychecker/package.py +++ b/var/spack/repos/builtin/packages/py-pychecker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPychecker(PythonPackage): "http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz" ) + license("BSD-3-Clause") + version("0.8.19", sha256="44fb26668f74aca3738f02d072813762a37ce1242f50dbff573720fa2e953279") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-pycifrw/package.py b/var/spack/repos/builtin/packages/py-pycifrw/package.py index 90467ef0e74e1b..9d9474cf7b7a6c 100644 --- a/var/spack/repos/builtin/packages/py-pycifrw/package.py +++ b/var/spack/repos/builtin/packages/py-pycifrw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPycifrw(PythonPackage): homepage = "https://bitbucket.org/jamesrhester/pycifrw/src/development/" pypi = "PyCifRW/PyCifRW-4.4.1.tar.gz" + license("Python-2.0") + version("4.4.1", sha256="cef7662f475e0eb78a55c2d55774d474e888c96b0539e5f08550afa902cdc4e1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pycmd/package.py b/var/spack/repos/builtin/packages/py-pycmd/package.py index 47121554e0fb1a..30dd30744ab4cd 100644 --- a/var/spack/repos/builtin/packages/py-pycmd/package.py +++ b/var/spack/repos/builtin/packages/py-pycmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPycmd(PythonPackage): pypi = "pycmd/pycmd-1.2.tar.gz" + license("MIT") + version("1.2", sha256="adc1976c0106919e9338db20102b91009256dcfec924a66928d7297026f72477") depends_on("py-py@1.4.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pycocotools/package.py b/var/spack/repos/builtin/packages/py-pycocotools/package.py index 8c892b58f5c5a2..a751e5e935e42f 100644 --- a/var/spack/repos/builtin/packages/py-pycocotools/package.py +++ b/var/spack/repos/builtin/packages/py-pycocotools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index 326d79a58cc8e8..0d6d90d0c111aa 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPycodestyle(PythonPackage): homepage = "https://github.com/PyCQA/pycodestyle" pypi = "pycodestyle/pycodestyle-2.8.0.tar.gz" + license("MIT") + version("2.11.0", sha256="259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0") version("2.10.0", sha256="347187bdb476329d98f695c213d7295a846d1152ff4fe9bacb8a9590b8ee7053") version("2.9.1", sha256="2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785") diff --git a/var/spack/repos/builtin/packages/py-pycollada/package.py b/var/spack/repos/builtin/packages/py-pycollada/package.py index fdf0f82c4856f9..a78b753134ecae 100644 --- a/var/spack/repos/builtin/packages/py-pycollada/package.py +++ b/var/spack/repos/builtin/packages/py-pycollada/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pycompadre/package.py b/var/spack/repos/builtin/packages/py-pycompadre/package.py index e205b8ef923dc7..b749b164c58e61 100644 --- a/var/spack/repos/builtin/packages/py-pycompadre/package.py +++ b/var/spack/repos/builtin/packages/py-pycompadre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pycorenlp/package.py b/var/spack/repos/builtin/packages/py-pycorenlp/package.py index 87f3e98ea8736c..c74d3f602645d9 100644 --- a/var/spack/repos/builtin/packages/py-pycorenlp/package.py +++ b/var/spack/repos/builtin/packages/py-pycorenlp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pycortex/package.py b/var/spack/repos/builtin/packages/py-pycortex/package.py index 7dc4907ab4ae71..9817e95d5de6c2 100644 --- a/var/spack/repos/builtin/packages/py-pycortex/package.py +++ b/var/spack/repos/builtin/packages/py-pycortex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPycortex(PythonPackage): homepage = "https://github.com/gallantlab/pycortex" pypi = "pycortex/pycortex-1.2.2.tar.gz" + license("BSD-2-Clause") + version("1.2.2", sha256="ac46ed6a1dc727c3126c2b5d7916fc0ac21a6510c32a5edcd3b8cfb7b2128414") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pycosat/package.py b/var/spack/repos/builtin/packages/py-pycosat/package.py index 5aed963c68cea7..8ca2e18fa6463c 100644 --- a/var/spack/repos/builtin/packages/py-pycosat/package.py +++ b/var/spack/repos/builtin/packages/py-pycosat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPycosat(PythonPackage): homepage = "https://github.com/ContinuumIO/pycosat" pypi = "pycosat/pycosat-0.6.3.zip" + license("MIT") + version("0.6.3", sha256="4c99874946a7e939bb941bbb019dd2c20e6068e3107c91366e7779c69d70e0ed") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-pycparser/package.py b/var/spack/repos/builtin/packages/py-pycparser/package.py index 24edccb19f8fd1..e5f085dee1b069 100644 --- a/var/spack/repos/builtin/packages/py-pycparser/package.py +++ b/var/spack/repos/builtin/packages/py-pycparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPycparser(PythonPackage): homepage = "https://github.com/eliben/pycparser" pypi = "pycparser/pycparser-2.19.tar.gz" + license("BSD-3-Clause") + version("2.21", sha256="e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206") version("2.20", sha256="2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0") version("2.19", sha256="a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3") diff --git a/var/spack/repos/builtin/packages/py-pycrypto/package.py b/var/spack/repos/builtin/packages/py-pycrypto/package.py index b54da537b2fb61..acfd315a041660 100644 --- a/var/spack/repos/builtin/packages/py-pycrypto/package.py +++ b/var/spack/repos/builtin/packages/py-pycrypto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pycryptodome/package.py b/var/spack/repos/builtin/packages/py-pycryptodome/package.py index 1a4b8d4ad2cbdb..73298b196d199d 100644 --- a/var/spack/repos/builtin/packages/py-pycryptodome/package.py +++ b/var/spack/repos/builtin/packages/py-pycryptodome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyct/package.py b/var/spack/repos/builtin/packages/py-pyct/package.py index e83383cf1ba8e8..cbd3463fd53887 100644 --- a/var/spack/repos/builtin/packages/py-pyct/package.py +++ b/var/spack/repos/builtin/packages/py-pyct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyct(PythonPackage): maintainers("vvolkl") + license("BSD-3-Clause") + version("0.4.8", sha256="23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pycuda/package.py b/var/spack/repos/builtin/packages/py-pycuda/package.py index b7aea6399078a9..3cb89290b84d74 100644 --- a/var/spack/repos/builtin/packages/py-pycuda/package.py +++ b/var/spack/repos/builtin/packages/py-pycuda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPycuda(PythonPackage): homepage = "https://mathema.tician.de/software/pycuda/" pypi = "pycuda/pycuda-2019.1.2.tar.gz" + license("MIT") + version("2021.1", sha256="ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed") version("2020.1", sha256="effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5") version("2019.1.2", sha256="ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a") diff --git a/var/spack/repos/builtin/packages/py-pycurl/package.py b/var/spack/repos/builtin/packages/py-pycurl/package.py index 8dadfe136c59e9..79a95c85735425 100644 --- a/var/spack/repos/builtin/packages/py-pycurl/package.py +++ b/var/spack/repos/builtin/packages/py-pycurl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPycurl(PythonPackage): homepage = "http://pycurl.io/" pypi = "pycurl/pycurl-7.43.0.tar.gz" + license("curl") + version("7.45.1", sha256="a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a") version("7.44.1", sha256="5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8") version("7.43.0", sha256="aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c") diff --git a/var/spack/repos/builtin/packages/py-pydantic-tes/package.py b/var/spack/repos/builtin/packages/py-pydantic-tes/package.py index 431538f9c22f12..d4984b3d790e19 100644 --- a/var/spack/repos/builtin/packages/py-pydantic-tes/package.py +++ b/var/spack/repos/builtin/packages/py-pydantic-tes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPydanticTes(PythonPackage): homepage = "https://github.com/jmchilton/pydantic-tes" pypi = "pydantic-tes/pydantic-tes-0.1.5.tar.gz" + license("MIT") + version("0.1.5", sha256="557cc77bdbeae86a6bd155af2d0aeaa5050cd9e3f7d9b17b817f14dd814a7423") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydantic/package.py b/var/spack/repos/builtin/packages/py-pydantic/package.py index 8dd6c336b5ae0b..1819998e46486c 100644 --- a/var/spack/repos/builtin/packages/py-pydantic/package.py +++ b/var/spack/repos/builtin/packages/py-pydantic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydantic(PythonPackage): homepage = "https://github.com/samuelcolvin/pydantic" pypi = "pydantic/pydantic-1.8.2.tar.gz" + license("MIT") + version("1.10.9", sha256="95c70da2cd3b6ddf3b9645ecaa8d98f3d80c606624b6d245558d202cd23ea3be") version("1.10.2", sha256="91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410") version("1.9.2", sha256="8cb0bc509bfb71305d7a59d00163d5f9fc4530f0881ea32c74ff4f74c85f3d3d") diff --git a/var/spack/repos/builtin/packages/py-pydap/package.py b/var/spack/repos/builtin/packages/py-pydap/package.py index db7a4ddcecce7e..eceb60675237a8 100644 --- a/var/spack/repos/builtin/packages/py-pydap/package.py +++ b/var/spack/repos/builtin/packages/py-pydap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydap(PythonPackage): homepage = "https://www.pydap.org/en/latest/" pypi = "Pydap/Pydap-3.2.2.tar.gz" + license("MIT") + version("3.2.2", sha256="86326642e24f421595a74b0f9986da76d7932b277768f501fe214d72592bdc40") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pydata-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-pydata-sphinx-theme/package.py index d1dfd45dab65b7..e9825f8dce97b8 100644 --- a/var/spack/repos/builtin/packages/py-pydata-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-pydata-sphinx-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydataSphinxTheme(PythonPackage): homepage = "https://pydata-sphinx-theme.readthedocs.io/en/stable" pypi = "pydata_sphinx_theme/pydata_sphinx_theme-0.14.1.tar.gz" + license("BSD-3-Clause") + version("0.14.1", sha256="d8d4ac81252c16a002e835d21f0fea6d04cf3608e95045c816e8cc823e79b053") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydatalog/package.py b/var/spack/repos/builtin/packages/py-pydatalog/package.py index 9af1a2333ba7af..81f75c9bc79f81 100644 --- a/var/spack/repos/builtin/packages/py-pydatalog/package.py +++ b/var/spack/repos/builtin/packages/py-pydatalog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPydatalog(PythonPackage): pypi = "pyDatalog/pyDatalog-0.17.1.zip" + license("LGPL-2.1-or-later") + version("0.17.1", sha256="b3d9cff0b9431e0fd0b2d5eefe4414c3d3c20bd18fdd7d1b42b2f01f25bac808") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-pydeface/package.py b/var/spack/repos/builtin/packages/py-pydeface/package.py index 0727c5978c8219..71b9622a39defd 100644 --- a/var/spack/repos/builtin/packages/py-pydeface/package.py +++ b/var/spack/repos/builtin/packages/py-pydeface/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPydeface(PythonPackage): pypi = "pydeface/pydeface-2.0.2.tar.gz" git = "https://github.com/poldracklab/pydeface" + license("MIT") + version("2.0.2", sha256="662263072ccccff9929432568caf5c183075f7fbf8f9d5c170767c3202c78f36") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydeprecate/package.py b/var/spack/repos/builtin/packages/py-pydeprecate/package.py index 4eba2cf420456a..6778f96a60a25c 100644 --- a/var/spack/repos/builtin/packages/py-pydeprecate/package.py +++ b/var/spack/repos/builtin/packages/py-pydeprecate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPydeprecate(PythonPackage): homepage = "https://borda.github.io/pyDeprecate/" pypi = "pyDeprecate/pyDeprecate-0.3.0.tar.gz" + license("MIT") + version("0.3.1", sha256="fa26870924d3475621c344045c2c01a16ba034113a902600c78e75b3fac5f72c") version("0.3.0", sha256="335742ec53b9d22a0a9ff4f3470300c94935f6e169c74b08aee14d871ca40e00") diff --git a/var/spack/repos/builtin/packages/py-pydeps/package.py b/var/spack/repos/builtin/packages/py-pydeps/package.py index d4e698b50f3f3a..ba7bf205427f4b 100644 --- a/var/spack/repos/builtin/packages/py-pydeps/package.py +++ b/var/spack/repos/builtin/packages/py-pydeps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pydevtool/package.py b/var/spack/repos/builtin/packages/py-pydevtool/package.py index ec9b69445fd66e..cdca1e004c7bcd 100644 --- a/var/spack/repos/builtin/packages/py-pydevtool/package.py +++ b/var/spack/repos/builtin/packages/py-pydevtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydevtool(PythonPackage): homepage = "https://github.com/pydoit/pydevtool" pypi = "pydevtool/pydevtool-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="25e3ba4f3d33ccac33ee2b9775995848d49e9b318b7a146477fb5d52f786fc8a") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydicom/package.py b/var/spack/repos/builtin/packages/py-pydicom/package.py index e2d1fadcecb614..8efc93140a9613 100644 --- a/var/spack/repos/builtin/packages/py-pydicom/package.py +++ b/var/spack/repos/builtin/packages/py-pydicom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pydispatcher/package.py b/var/spack/repos/builtin/packages/py-pydispatcher/package.py index d137a5edbd249f..9822d78d68bb0b 100644 --- a/var/spack/repos/builtin/packages/py-pydispatcher/package.py +++ b/var/spack/repos/builtin/packages/py-pydispatcher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pydmd/package.py b/var/spack/repos/builtin/packages/py-pydmd/package.py index 47bc4e541e1edb..12b5f2f19b2619 100644 --- a/var/spack/repos/builtin/packages/py-pydmd/package.py +++ b/var/spack/repos/builtin/packages/py-pydmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPydmd(PythonPackage): homepage = "https://mathlab.github.io/PyDMD/" url = "https://github.com/mathLab/PyDMD/archive/v0.3.tar.gz" + license("MIT") + version("0.3", sha256="f490fc139677e4d9fc1240636a2c5992d22879517c9574d13164dc5179b0f785") variant("docs", default=False, description="Build HTML documentation") diff --git a/var/spack/repos/builtin/packages/py-pydocstyle/package.py b/var/spack/repos/builtin/packages/py-pydocstyle/package.py index 30d19db3f04a43..ba641d01575790 100644 --- a/var/spack/repos/builtin/packages/py-pydocstyle/package.py +++ b/var/spack/repos/builtin/packages/py-pydocstyle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPydocstyle(PythonPackage): maintainers("adamjstewart") + license("MIT") + version("6.2.1", sha256="5ddccabe3c9555d4afaabdba909ca2de4fa24ac31e2eede4ab3d528a4bcadd52") version("6.2.0", sha256="b2d280501a4c0d9feeb96e9171dc3f6f7d0064c55270f4c7b1baa18452019fd9") version("6.1.1", sha256="1d41b7c459ba0ee6c345f2eb9ae827cab14a7533a88c5c6f7e94923f72df92dc") diff --git a/var/spack/repos/builtin/packages/py-pydoe/package.py b/var/spack/repos/builtin/packages/py-pydoe/package.py index 26555a8dede250..6c2a53e4a9b51c 100644 --- a/var/spack/repos/builtin/packages/py-pydoe/package.py +++ b/var/spack/repos/builtin/packages/py-pydoe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pydoe2/package.py b/var/spack/repos/builtin/packages/py-pydoe2/package.py index 816cbf14ade5ac..839bbdd13d0a5a 100644 --- a/var/spack/repos/builtin/packages/py-pydoe2/package.py +++ b/var/spack/repos/builtin/packages/py-pydoe2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPydoe2(PythonPackage): homepage = "https://github.com/clicumu/pyDOE2" pypi = "pyDOE2/pyDOE2-1.3.0.tar.gz" + license("BSD-3-Clause") + version("1.3.0", sha256="5492b0f984af52da3af20b1cd61deb21b067c858e65243ec3ba573375f0d6720") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pydot/package.py b/var/spack/repos/builtin/packages/py-pydot/package.py index 1f6e5c541a799a..97b9f3e212e7cc 100644 --- a/var/spack/repos/builtin/packages/py-pydot/package.py +++ b/var/spack/repos/builtin/packages/py-pydot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydot(PythonPackage): homepage = "https://github.com/erocarrera/pydot/" pypi = "pydot/pydot-1.2.3.tar.gz" + license("MIT") + version("1.4.2", sha256="248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d") version("1.4.1", sha256="d49c9d4dd1913beec2a997f831543c8cbd53e535b1a739e921642fe416235f01") version("1.2.3", sha256="edb5d3f249f97fbd9c4bb16959e61bc32ecf40eee1a9f6d27abe8d01c0a73502") diff --git a/var/spack/repos/builtin/packages/py-pydot2/package.py b/var/spack/repos/builtin/packages/py-pydot2/package.py index abe1c842726bae..1dbd6e648b1467 100644 --- a/var/spack/repos/builtin/packages/py-pydot2/package.py +++ b/var/spack/repos/builtin/packages/py-pydot2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPydot2(PythonPackage): pypi = "pydot2/pydot2-1.0.33.tar.gz" + license("MIT") + version("1.0.33", sha256="02c0e681a1c437077e2bb2522fb81fa322e53ba7002cfda8b894db0392a1bc9b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pydotplus/package.py b/var/spack/repos/builtin/packages/py-pydotplus/package.py index 387e26ac06d5c7..4cac3bfb036675 100644 --- a/var/spack/repos/builtin/packages/py-pydotplus/package.py +++ b/var/spack/repos/builtin/packages/py-pydotplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydotplus(PythonPackage): homepage = "https://pydotplus.readthedocs.io/" pypi = "pydotplus/pydotplus-2.0.2.tar.gz" + license("MIT") + version("2.0.2", sha256="91e85e9ee9b85d2391ead7d635e3d9c7f5f44fd60a60e59b13e2403fa66505c4") variant("docs", default=False, description="Build docs") diff --git a/var/spack/repos/builtin/packages/py-pydub/package.py b/var/spack/repos/builtin/packages/py-pydub/package.py index 0facdffc40b387..c02b387dee2472 100644 --- a/var/spack/repos/builtin/packages/py-pydub/package.py +++ b/var/spack/repos/builtin/packages/py-pydub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPydub(PythonPackage): homepage = "http://pydub.com/" pypi = "pydub/pydub-0.25.1.tar.gz" + license("MIT") + version("0.25.1", sha256="980a33ce9949cab2a569606b65674d748ecbca4f0796887fd6f46173a7b0d30f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pydv/package.py b/var/spack/repos/builtin/packages/py-pydv/package.py index 772a124d0fe8c0..608e4712d7fe0b 100644 --- a/var/spack/repos/builtin/packages/py-pydv/package.py +++ b/var/spack/repos/builtin/packages/py-pydv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPydv(PythonPackage): homepage = "https://github.com/griffin28/PyDV" url = "https://github.com/griffin28/PyDV/archive/pydv-2.4.2.tar.gz" + license("BSD-3-Clause") + version("2.4.2", sha256="46bda76e27e85beaad446455d0cc279388d455f05912a8ff8e4fb66de983992c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyeda/package.py b/var/spack/repos/builtin/packages/py-pyeda/package.py index 83da1adf20af98..83f9bc1a6f63e1 100644 --- a/var/spack/repos/builtin/packages/py-pyeda/package.py +++ b/var/spack/repos/builtin/packages/py-pyeda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyeda(PythonPackage): homepage = "https://github.com/cjdrake/pyeda" pypi = "pyeda/pyeda-0.28.0.tar.gz" + license("BSD-2-Clause") + version("0.28.0", sha256="07185f458d5d0b2ba5058da8b95dad6ab7684ceaf41237a25bcd3f005490f59d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyedr/package.py b/var/spack/repos/builtin/packages/py-pyedr/package.py index 880ffe339af712..c5c8f91ab87367 100644 --- a/var/spack/repos/builtin/packages/py-pyedr/package.py +++ b/var/spack/repos/builtin/packages/py-pyedr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyedr(PythonPackage): maintainers("RMeli") + license("LGPL-2.1-or-later") + version("0.7.2", sha256="8a02b7d94f97f99083c489568f7816ee8ed37e2efca0c1ba3a2e4b83e932d5b9") version("0.7.1", sha256="ad7ccdeb739399acd11a25f2d2413ebb46a54223059a2b902ac604d29fabd767") diff --git a/var/spack/repos/builtin/packages/py-pyelftools/package.py b/var/spack/repos/builtin/packages/py-pyelftools/package.py index 6e8a02581a60bf..5699b1b14ecd8f 100644 --- a/var/spack/repos/builtin/packages/py-pyelftools/package.py +++ b/var/spack/repos/builtin/packages/py-pyelftools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyelftools(PythonPackage): homepage = "https://github.com/eliben/pyelftools" pypi = "pyelftools/pyelftools-0.26.tar.gz" + license("Unlicense") + version("0.29", sha256="ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff") version("0.28", sha256="53e5609cac016471d40bd88dc410cd90755942c25e58a61021cfdf7abdfeacff") version("0.27", sha256="cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b") diff --git a/var/spack/repos/builtin/packages/py-pyem/package.py b/var/spack/repos/builtin/packages/py-pyem/package.py index a565261a79097f..11a5481b748f00 100644 --- a/var/spack/repos/builtin/packages/py-pyem/package.py +++ b/var/spack/repos/builtin/packages/py-pyem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyem(PythonPackage): pypi = "pyem/pyem-2.1.0.tar.gz" + license("ISC") + version("2.1.0", sha256="5234a20427ab2813a8a0bf1e9112d4d854b1b0502b3e63d17c1b1a3c4be9340e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyepsg/package.py b/var/spack/repos/builtin/packages/py-pyepsg/package.py index b6987a41130be8..8776d031c4f91f 100644 --- a/var/spack/repos/builtin/packages/py-pyepsg/package.py +++ b/var/spack/repos/builtin/packages/py-pyepsg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyepsg(PythonPackage): homepage = "https://pyepsg.readthedocs.io/en/latest/" pypi = "pyepsg/pyepsg-0.3.2.tar.gz" + license("LGPL-3.0-or-later") + version("0.4.0", sha256="2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7") version("0.3.2", sha256="597ef8c0e8c1be3db8f68c5985bcfbbc32e22f087e93e81ceb03ff094898e059") diff --git a/var/spack/repos/builtin/packages/py-pyerfa/package.py b/var/spack/repos/builtin/packages/py-pyerfa/package.py index 8da80c514237cd..6b7e51ed2e4022 100644 --- a/var/spack/repos/builtin/packages/py-pyerfa/package.py +++ b/var/spack/repos/builtin/packages/py-pyerfa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyPyerfa(PythonPackage): maintainers("meyersbs") + license("BSD-3-Clause") + version("2.0.0.1", sha256="2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30") # From setup.cfg diff --git a/var/spack/repos/builtin/packages/py-pyeventsystem/package.py b/var/spack/repos/builtin/packages/py-pyeventsystem/package.py index 8680251a919b34..e8685a2904f79f 100644 --- a/var/spack/repos/builtin/packages/py-pyeventsystem/package.py +++ b/var/spack/repos/builtin/packages/py-pyeventsystem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyeventsystem(PythonPackage): homepage = "https://github.com/cloudve/pyeventsystem" pypi = "pyeventsystem/pyeventsystem-0.1.0.tar.gz" + license("MIT") + version("0.1.0", sha256="4a3d199759a040d2cd17f8b4293cc1c3f3c2ae50ae531fb5f9f955a895fca8b9") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyface/package.py b/var/spack/repos/builtin/packages/py-pyface/package.py index 7b4e89c176c962..7137f1692c8f17 100644 --- a/var/spack/repos/builtin/packages/py-pyface/package.py +++ b/var/spack/repos/builtin/packages/py-pyface/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyface(PythonPackage): homepage = "https://docs.enthought.com/pyface" pypi = "pyface/pyface-6.1.2.tar.gz" + license("EPL-1.0") + version("7.3.0", sha256="a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322") version("6.1.2", sha256="7c2ac3d5cbec85e8504b3b0b63e9307be12c6d710b46bae372ce6562d41f4fbc") diff --git a/var/spack/repos/builtin/packages/py-pyfaidx/package.py b/var/spack/repos/builtin/packages/py-pyfaidx/package.py index 7dd54985505d8b..205f4e6a7f5619 100644 --- a/var/spack/repos/builtin/packages/py-pyfaidx/package.py +++ b/var/spack/repos/builtin/packages/py-pyfaidx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPyfaidx(PythonPackage): pypi = "pyfaidx/pyfaidx-0.5.5.2.tar.gz" + license("BSD-3-Clause") + version("0.5.5.2", sha256="9ac22bdc7b9c5d995d32eb9dc278af9ba970481636ec75c0d687d38c26446caa") depends_on("py-setuptools@0.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyfasta/package.py b/var/spack/repos/builtin/packages/py-pyfasta/package.py index 0934ea1530f8ab..38b79b80f14b2e 100644 --- a/var/spack/repos/builtin/packages/py-pyfasta/package.py +++ b/var/spack/repos/builtin/packages/py-pyfasta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyfasta(PythonPackage): pypi = "pyfasta/pyfasta-0.5.2.tar.gz" + license("MIT") + version("0.5.2", sha256="ab08d75fa90253bc91933d10567d5d9cca2718f4796ef3bdc36b68df0e45b258") depends_on("python@2.6:") diff --git a/var/spack/repos/builtin/packages/py-pyfftw/package.py b/var/spack/repos/builtin/packages/py-pyfftw/package.py index f74bffa82a8be4..6e89e8886ee1f2 100644 --- a/var/spack/repos/builtin/packages/py-pyfftw/package.py +++ b/var/spack/repos/builtin/packages/py-pyfftw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyfftw(PythonPackage): homepage = "http://hgomersall.github.com/pyFFTW" pypi = "pyFFTW/pyFFTW-0.10.4.tar.gz" + license("BSD-3-Clause") + version("0.12.0", sha256="60988e823ca75808a26fd79d88dbae1de3699e72a293f812aa4534f8a0a58cb0") version("0.11.1", sha256="05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926") version("0.10.4", sha256="739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a") diff --git a/var/spack/repos/builtin/packages/py-pyfiglet/package.py b/var/spack/repos/builtin/packages/py-pyfiglet/package.py index 94b706559006b0..54639b70235bf6 100644 --- a/var/spack/repos/builtin/packages/py-pyfiglet/package.py +++ b/var/spack/repos/builtin/packages/py-pyfiglet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyfiglet(PythonPackage): homepage = "https://github.com/pwaller/pyfiglet" pypi = "pyfiglet/pyfiglet-0.7.tar.gz" + license("MIT") + version("0.8.post1", sha256="c6c2321755d09267b438ec7b936825a4910fec696292139e664ca8670e103639") version("0.8.post0", sha256="2994451ea67c77cd97f81f52087ccae6921d78d9402920995419893a979b5ace") version("0.7.6", sha256="97d59651b40da6ddf7e961157c480a7a04b48214d8c7231adc8c15e43aa5d722") diff --git a/var/spack/repos/builtin/packages/py-pyfits/package.py b/var/spack/repos/builtin/packages/py-pyfits/package.py index 5fb3189eafa1ad..8abe148fdb72df 100644 --- a/var/spack/repos/builtin/packages/py-pyfits/package.py +++ b/var/spack/repos/builtin/packages/py-pyfits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py index 2619199ad20d00..e3035d98f55985 100644 --- a/var/spack/repos/builtin/packages/py-pyflakes/package.py +++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyflakes(PythonPackage): homepage = "https://github.com/PyCQA/pyflakes" pypi = "pyflakes/pyflakes-2.4.0.tar.gz" + license("MIT") + version("3.1.0", sha256="a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc") version("3.0.1", sha256="ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd") version("2.5.0", sha256="491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3") diff --git a/var/spack/repos/builtin/packages/py-pyfr/package.py b/var/spack/repos/builtin/packages/py-pyfr/package.py index 9f81ef7597fa51..48c328be64184e 100644 --- a/var/spack/repos/builtin/packages/py-pyfr/package.py +++ b/var/spack/repos/builtin/packages/py-pyfr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyfr(PythonPackage, CudaPackage, ROCmPackage): git = "https://github.com/PyFR/PyFR/" maintainers("MichaelLaufer") + license("BSD-3-Clause") + # git branches version("develop", branch="develop") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/py-pygame/package.py b/var/spack/repos/builtin/packages/py-pygame/package.py new file mode 100644 index 00000000000000..82a0cfd3c75856 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pygame/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPygame(PythonPackage): + """Pygame is a free and open-source cross-platform library for the development + of multimedia applications like video games using Python. It uses the Simple + DirectMedia Layer library and several other popular libraries to abstract + the most common functions, making writing these programs a more intuitive task.""" + + homepage = "https://www.pygame.org/" + url = "https://pypi.org/project/pygame/2.5.2/" + + license("LGPL-2.1-only") + + version("2.5.2", sha256="c1b89eb5d539e7ac5cf75513125fb5f2f0a2d918b1fd6e981f23bf0ac1b1c24a") + + depends_on("py-setuptools", type="build") + depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pygdal/package.py b/var/spack/repos/builtin/packages/py-pygdal/package.py index 1d99b1b1e0d2d0..2e995e8bbeaf8d 100644 --- a/var/spack/repos/builtin/packages/py-pygdal/package.py +++ b/var/spack/repos/builtin/packages/py-pygdal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyPygdal(PythonPackage): homepage = "https://github.com/nextgis/pygdal" pypi = "pygdal/pygdal-3.0.1.5.tar.gz" + license("MIT") + version("3.3.2.10", sha256="7fb9eec8aeb36b94389ff9f2b40cdceffefc8c290d813f4908b4acd208ca3a84") version("3.3.0.10", sha256="ea0c20bee67fac94fe0b1cb604a4fd0dc600aa8aa15cf9a7b6dc76adeb48670e") version("3.0.4.6", sha256="8e39b58cd9465bb5f41786a7cf6a62df93334c104db05a5bfb8181a0be276b86") diff --git a/var/spack/repos/builtin/packages/py-pygdbmi/package.py b/var/spack/repos/builtin/packages/py-pygdbmi/package.py index f84ca58ef3dee7..f0b352f1a44ac6 100644 --- a/var/spack/repos/builtin/packages/py-pygdbmi/package.py +++ b/var/spack/repos/builtin/packages/py-pygdbmi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPygdbmi(PythonPackage): homepage = "https://github.com/cs01/pygdbmi" pypi = "pygdbmi/pygdbmi-0.8.2.0.tar.gz" + license("MIT") + version("0.9.0.3", sha256="5bdf2f072e8f2f6471f19f8dcd87d6425c5d8069d47c0a5ffe8d0eff48cb171e") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pygelf/package.py b/var/spack/repos/builtin/packages/py-pygelf/package.py index 2d99373a68f2db..6f9806014b41ed 100644 --- a/var/spack/repos/builtin/packages/py-pygelf/package.py +++ b/var/spack/repos/builtin/packages/py-pygelf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPygelf(PythonPackage): # notify when the package is updated. maintainers("victorusu", "vkarak") + license("MIT") + version("0.4.0", sha256="3693da38794561d42b0556a78af7dcb22d92ea450125577e58089ab89a890ee5") version("0.3.6", sha256="3e5bc59e3b5a754556a76ff2c69fcf2003218ad7b5ff8417482fa1f6a7eba5f9") diff --git a/var/spack/repos/builtin/packages/py-pygeos/package.py b/var/spack/repos/builtin/packages/py-pygeos/package.py index 3c867e3d1190ca..773d42c94d67f9 100644 --- a/var/spack/repos/builtin/packages/py-pygeos/package.py +++ b/var/spack/repos/builtin/packages/py-pygeos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,14 +18,18 @@ class PyPygeos(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + + version("0.14", sha256="30fbc17f64844200b85133b885fcfb65541b8779531f6ef4f8fe467d3fba7623") version("0.10", sha256="8ad4703cf8f983a6878a885765be975709a2fe300e54bc6c8623ddbca4903b6c") version("0.9", sha256="c0584b20e95f80ee57277a6eb1e5d7f86600f8b1ef3c627d238e243afdcc0cc7") version("0.8", sha256="45b7e1aaa5fc9ff53565ef089fb75c53c419ace8cee18385ec1d7c1515c17cbc") - depends_on("python@3.6:", when="@0.10:", type=("build", "link", "run")) - depends_on("python@3:", type=("build", "link", "run")) - depends_on("py-setuptools", type="build") + depends_on("python", type=("build", "link", "run")) + depends_on("py-cython@0.29:0", when="@0.14:", type="build") depends_on("py-cython", type="build") + depends_on("py-setuptools@61:", when="@0.14:", type="build") + depends_on("py-setuptools", type="build") depends_on("py-numpy@1.13:", when="@0.9:", type=("build", "link", "run")) depends_on("py-numpy@1.10:", type=("build", "link", "run")) depends_on("geos@3.5:") diff --git a/var/spack/repos/builtin/packages/py-pygetwindow/package.py b/var/spack/repos/builtin/packages/py-pygetwindow/package.py index 5a2d8a512fca83..258b2c3ac06c19 100644 --- a/var/spack/repos/builtin/packages/py-pygetwindow/package.py +++ b/var/spack/repos/builtin/packages/py-pygetwindow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pygit2/package.py b/var/spack/repos/builtin/packages/py-pygit2/package.py index 78d9664c942284..f5cf5c4e3fffca 100644 --- a/var/spack/repos/builtin/packages/py-pygit2/package.py +++ b/var/spack/repos/builtin/packages/py-pygit2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,7 +19,6 @@ class PyPygit2(PythonPackage): version("1.6.0", sha256="7aacea4e57011777f4774421228e5d0ddb9a6ddb87ac4b542346d17ab12a4d62") version("1.4.0", sha256="cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8") version("1.3.0", sha256="0be93f6a8d7cbf0cc79ae2f0afb1993fc055fc0018c27e2bd01ba143e51d4452") - version("0.28.2", sha256="4d8c3fbbf2e5793a9984681a94e6ac2f1bc91a92cbac762dbdfbea296b917f86") depends_on("py-setuptools", type="build") # https://www.pygit2.org/install.html#version-numbers @@ -29,14 +28,10 @@ class PyPygit2(PythonPackage): depends_on("libgit2@1.3", when="@1.7:1.8") depends_on("libgit2@1.1", when="@1.4:1.6") depends_on("libgit2@1.0", when="@1.2:1.3") - depends_on("libgit2@0.99:1.0", when="@1.1") - depends_on("libgit2@0.28", when="@0.28:1.0") depends_on("python@3.8:3.11", when="@1.11:1.12.1") depends_on("python@:3.10", when="@1.7:1.10") depends_on("python@:3.9", when="@1.4:1.6") depends_on("python@:3.8", when="@1.0:1.3") - depends_on("python@:3.7", when="@0.28") - depends_on("py-six", type=("build", "run"), when="@:0.28.2") depends_on("py-cffi@1.4.0:", when="@:1.5", type=("build", "run")) depends_on("py-cffi@1.6.0:", when="@1.6:1.7", type=("build", "run")) depends_on("py-cffi@1.9.1:", when="@1.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pygithub/package.py b/var/spack/repos/builtin/packages/py-pygithub/package.py index 24885aa333d76b..acc93b3e495d74 100644 --- a/var/spack/repos/builtin/packages/py-pygithub/package.py +++ b/var/spack/repos/builtin/packages/py-pygithub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,16 +7,27 @@ 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" + license("LGPL-3.0-only") + + 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")) diff --git a/var/spack/repos/builtin/packages/py-pyglet/package.py b/var/spack/repos/builtin/packages/py-pyglet/package.py index 1f874c4bb1c021..490246f6f613d8 100644 --- a/var/spack/repos/builtin/packages/py-pyglet/package.py +++ b/var/spack/repos/builtin/packages/py-pyglet/package.py @@ -1,8 +1,10 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os + from spack.package import * @@ -11,12 +13,32 @@ class PyPyglet(PythonPackage): for developing games and other visually rich applications. """ - homepage = "https://github.com/pyglet/pygle://github.com/pyglet/pyglet" - pypi = "pyglet/pyglet-1.4.2.tar.gz" + homepage = "https://github.com/pyglet/pyglet" + pypi = "pyglet/pyglet-2.0.9.zip" + + license("BSD-3-Clause") + version("2.0.10", sha256="242beb1b3bd67c5bebdfe5ba11ec56b696ad86b50c6e7f2a317f8d783256b9c9") + version("2.0.9", sha256="a0922e42f2d258505678e2f4a355c5476c1a6352c3f3a37754042ddb7e7cf72f") version("1.4.2", sha256="fda25ae5e99057f05bd339ea7972196d2f44e6fe8fb210951ab01f6609cdbdb7") version("1.2.1", sha256="d1afb253d6de230e73698377566da333ef42e1c82190216aa7a0c1b729d6ff4d") depends_on("py-setuptools", type="build") - depends_on("py-future", type=("build", "run")) - depends_on("python@2.7:2.8,3.4:", type=("build", "run")) + depends_on("py-future", type=("build", "run"), when="@:1") + depends_on("python@2.7:2.8,3.4:", type=("build", "run"), when="@:1") + depends_on("python@3.8:", type=("build", "run"), when="@2.0:") + depends_on("gl", type=("build", "run"), when="@2.0: platform=linux") + depends_on("pil", type=("build", "run"), when="@2.0: platform=linux") + depends_on("pulseaudio", type=("build", "run"), when="@2.0: platform=linux") + + def url_for_version(self, version): + if version <= Version("1.4.2"): + return ( + f"https://files.pythonhosted.org/packages/source/p/pyglet/pyglet-{version}.tar.gz" + ) + + @when("@2.0.9:2.0.10") + def patch(self): + # 2.0.9 and 2.0.10 had a broken pyproject.toml in their PyPI zipfile + if os.path.exists("pyproject.toml"): + os.remove("pyproject.toml") diff --git a/var/spack/repos/builtin/packages/py-pygments-pytest/package.py b/var/spack/repos/builtin/packages/py-pygments-pytest/package.py index 6fcd5c47b09c59..574211d7f7c443 100644 --- a/var/spack/repos/builtin/packages/py-pygments-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pygments-pytest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPygmentsPytest(PythonPackage): homepage = "https://github.com/asottile/pygments-pytest" pypi = "pygments-pytest/pygments_pytest-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="fc48e2fffd6d3c047a61c1db8b88ab069983f50e733fe70a7846098eb28bc955") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py index 9c0cfbf90602e5..3b661527f1ac8b 100644 --- a/var/spack/repos/builtin/packages/py-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-pygments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPygments(PythonPackage): pypi = "Pygments/Pygments-2.4.2.tar.gz" git = "https://github.com/pygments/pygments.git" + license("BSD-2-Clause") + version("2.16.1", sha256="1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29") version("2.16.0", sha256="4f6df32f21dca07a54a0a130bda9a25d2241e9e0a206841d061c85a60cc96145") version("2.15.1", sha256="8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c") diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 3a3ba8ad72ff8d..80886aeccb0f2f 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPygobject(PythonPackage): homepage = "https://pypi.python.org/pypi/pygobject" + license("LGPL-2.1-or-later") + version("3.38.0", sha256="0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5") version("3.28.3", sha256="3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0") version("2.28.6", sha256="fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8") diff --git a/var/spack/repos/builtin/packages/py-pygps/package.py b/var/spack/repos/builtin/packages/py-pygps/package.py index 237d4912964077..4e13dc4f9bdae4 100644 --- a/var/spack/repos/builtin/packages/py-pygps/package.py +++ b/var/spack/repos/builtin/packages/py-pygps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPygps(PythonPackage): homepage = "https://github.com/marionmari/pyGPs" pypi = "pygps/pyGPs-1.3.5.tar.gz" + license("DOC") + version("1.3.5", sha256="5af668415a7bf1666c7c6da3bb09d29e48c395862c6feb23964b476972a015d4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pygpu/package.py b/var/spack/repos/builtin/packages/py-pygpu/package.py index e7f63020222756..f0457335956f04 100644 --- a/var/spack/repos/builtin/packages/py-pygpu/package.py +++ b/var/spack/repos/builtin/packages/py-pygpu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pygraphviz/package.py b/var/spack/repos/builtin/packages/py-pygraphviz/package.py index 979fdd3f71a5b4..b55f1567f1406a 100644 --- a/var/spack/repos/builtin/packages/py-pygraphviz/package.py +++ b/var/spack/repos/builtin/packages/py-pygraphviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPygraphviz(PythonPackage): maintainers("haralmha") + license("BSD-3-Clause") + version("1.10", sha256="457e093a888128903251a266a8cc16b4ba93f3f6334b3ebfed92c7471a74d867") version("1.7", sha256="a7bec6609f37cf1e64898c59f075afd659106cf9356c5f387cecaa2e0cdb2304") diff --git a/var/spack/repos/builtin/packages/py-pygresql/package.py b/var/spack/repos/builtin/packages/py-pygresql/package.py index 863970b5303a12..ef723799c38ba0 100644 --- a/var/spack/repos/builtin/packages/py-pygresql/package.py +++ b/var/spack/repos/builtin/packages/py-pygresql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pygtrie/package.py b/var/spack/repos/builtin/packages/py-pygtrie/package.py index 80682ee24c067a..4452dabbc98679 100644 --- a/var/spack/repos/builtin/packages/py-pygtrie/package.py +++ b/var/spack/repos/builtin/packages/py-pygtrie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPygtrie(PythonPackage): homepage = "https://github.com/mina86/pygtrie" pypi = "pygtrie/pygtrie-2.4.2.tar.gz" + license("Apache-2.0") + version("2.4.2", sha256="43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692") version("2.4.0", sha256="77700d2fcaab321ac65e86c2969fb4b64c116796baf52ab12d07de2e1f6cfc5d") version("2.3.2", sha256="6299cdedd2cbdfda0895c2dbc43efe8828e698c62b574f3ef7e14b3253f80e23") diff --git a/var/spack/repos/builtin/packages/py-pyh5md/package.py b/var/spack/repos/builtin/packages/py-pyh5md/package.py index 5d8a0a6ac41cb0..7464399a9816ca 100644 --- a/var/spack/repos/builtin/packages/py-pyh5md/package.py +++ b/var/spack/repos/builtin/packages/py-pyh5md/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyhdf/package.py b/var/spack/repos/builtin/packages/py-pyhdf/package.py index 984081adc0e32e..0cdb79ef0fc3a1 100644 --- a/var/spack/repos/builtin/packages/py-pyhdf/package.py +++ b/var/spack/repos/builtin/packages/py-pyhdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,10 @@ class PyPyhdf(PythonPackage): homepage = "https://github.com/fhs/pyhdf" pypi = "pyhdf/pyhdf-0.10.4.tar.gz" git = "https://github.com/fhs/pyhdf.git" - maintainers("kgerheiser", "climbfuji") + + maintainers("climbfuji") + + license("MIT") version("master", branch="master") version("0.10.4", sha256="ea09b2bdafc9be0f7f43d72ff122d8efbde61881f4da3a659b33be5e29215f93") diff --git a/var/spack/repos/builtin/packages/py-pyheadtail/package.py b/var/spack/repos/builtin/packages/py-pyheadtail/package.py index 6389981d99aba0..a64d591b242656 100644 --- a/var/spack/repos/builtin/packages/py-pyheadtail/package.py +++ b/var/spack/repos/builtin/packages/py-pyheadtail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,7 @@ class PyPyheadtail(PythonPackage): homepage = "https://github.com/PyCOMPLETE/PyHEADTAIL" pypi = "PyHEADTAIL/PyHEADTAIL-1.14.1.tar.gz" + version("1.16.1", sha256="bbe69eeb2f57fffee455a35dc14cca95a9c650ba334982fa9ba62a1ebd5b5606") version("1.14.1", sha256="bf90ac7e8764176c55e82c363cad7ab43543863b6ef482760ced23b78e917bb4") version("1.13.1", sha256="29c742573a918126b5a9c21806ee0ec6a34ec642a0e6ad200f6d4551bf1bb310") @@ -20,6 +21,8 @@ class PyPyheadtail(PythonPackage): depends_on("python@3:", when="@1.13.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-cython", type="build") + # cython@3: support was added in 1.16.1 + depends_on("py-cython@:2", when="@:1.16.0", type="build") depends_on("py-numpy", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) depends_on("py-h5py", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyhull/package.py b/var/spack/repos/builtin/packages/py-pyhull/package.py index ede4130091adb5..3db784d4d89047 100644 --- a/var/spack/repos/builtin/packages/py-pyhull/package.py +++ b/var/spack/repos/builtin/packages/py-pyhull/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyhull(PythonPackage): maintainers("meyersbs") + license("MIT") + version("2015.2.1", sha256="d2ff0aa3298b548287587609a24f4e2aae7f7b8b1df152a90cd313260abc3a24") # From setup.py: diff --git a/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py b/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py index 39356506adf213..83bbdedd5bf89e 100644 --- a/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py +++ b/var/spack/repos/builtin/packages/py-pyinstrument-cext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyinstrumentCext(PythonPackage): homepage = "https://github.com/joerick/pyinstrument_cext" pypi = "pyinstrument_cext/pyinstrument_cext-0.2.2.tar.gz" + license("BSD-3-Clause") + version("0.2.2", sha256="f29e25f71d74c0415ca9310e5567fff0f5d29f4240a09a885abf8b0eed71cc5b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyinstrument/package.py b/var/spack/repos/builtin/packages/py-pyinstrument/package.py index 7fbba50ff0aae7..39a2048a4e86f7 100644 --- a/var/spack/repos/builtin/packages/py-pyinstrument/package.py +++ b/var/spack/repos/builtin/packages/py-pyinstrument/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyinstrument(PythonPackage): homepage = "https://github.com/joerick/pyinstrument" pypi = "pyinstrument/pyinstrument-4.0.3.tar.gz" + license("BSD-3-Clause") + version("4.4.0", sha256="be34a2e8118c14a616a64538e02430d9099d5d67d8a370f2888e4ac71e52bbb7") version("4.0.3", sha256="08caf41d21ae8f24afe79c664a34af1ed1e17aa5d4441cd9b1dc15f87bbbac95") version("3.1.3", sha256="353c7000a6563b16c0be0c6a04104d42b3154c5cd7c1979ab66efa5fdc5f5571") diff --git a/var/spack/repos/builtin/packages/py-pyisemail/package.py b/var/spack/repos/builtin/packages/py-pyisemail/package.py index fc86cdd2d0d434..3e1b524f8ce02f 100644 --- a/var/spack/repos/builtin/packages/py-pyisemail/package.py +++ b/var/spack/repos/builtin/packages/py-pyisemail/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyisemail(PythonPackage): maintainers("meyersbs") + license("MIT") + version("2.0.1", sha256="daf4b3fb2150a38f406b0aaba729e19fcd638a6d1c0549c25ff54c7b804618f8") depends_on("py-hatchling", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyjnius/package.py b/var/spack/repos/builtin/packages/py-pyjnius/package.py index de9ffec0bfd650..0dd19a53c7eb9f 100644 --- a/var/spack/repos/builtin/packages/py-pyjnius/package.py +++ b/var/spack/repos/builtin/packages/py-pyjnius/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyjnius(PythonPackage): homepage = "https://pyjnius.readthedocs.io/en/stable" pypi = "pyjnius/pyjnius-1.3.0.0.tar.gz" + license("MIT") + version("1.3.0.0", sha256="d20845e75a2d18224e661d0e2bc2ce9141f17472e685cd6579847b0a7b5da6ad") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyjwt/package.py b/var/spack/repos/builtin/packages/py-pyjwt/package.py index 67ef09feb0ca47..1b2dffcb8a2536 100644 --- a/var/spack/repos/builtin/packages/py-pyjwt/package.py +++ b/var/spack/repos/builtin/packages/py-pyjwt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyjwt(PythonPackage): homepage = "https://github.com/jpadilla/pyjwt" pypi = "PyJWT/PyJWT-1.7.1.tar.gz" + license("MIT") + version("2.4.0", sha256="d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba") version("2.1.0", sha256="fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130") version("1.7.1", sha256="8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96") diff --git a/var/spack/repos/builtin/packages/py-pyke/package.py b/var/spack/repos/builtin/packages/py-pyke/package.py index fa463d9a3b791f..1368dd718573c6 100644 --- a/var/spack/repos/builtin/packages/py-pyke/package.py +++ b/var/spack/repos/builtin/packages/py-pyke/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyke(PythonPackage): homepage = "https://sourceforge.net/projects/pyke" url = "https://sourceforge.net/projects/pyke/files/pyke/1.1.1/pyke-1.1.1.zip" + license("MIT") + version("1.1.1", sha256="b0b294f435c6e6d2d4a80badf57d92cb66814dfe21e644a521901209e6a3f8ae") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pykerberos/package.py b/var/spack/repos/builtin/packages/py-pykerberos/package.py index 36c54a91bcf080..729216c85c0cec 100644 --- a/var/spack/repos/builtin/packages/py-pykerberos/package.py +++ b/var/spack/repos/builtin/packages/py-pykerberos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPykerberos(PythonPackage): homepage = "https://github.com/02strich/pykerberos" pypi = "pykerberos/pykerberos-1.2.4.tar.gz" + license("Apache-2.0") + version("1.2.4", sha256="9d701ebd8fc596c99d3155d5ba45813bd5908d26ef83ba0add250edb622abed4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pykml/package.py b/var/spack/repos/builtin/packages/py-pykml/package.py index 9e177e9f4ce017..c130caa4fccfe6 100644 --- a/var/spack/repos/builtin/packages/py-pykml/package.py +++ b/var/spack/repos/builtin/packages/py-pykml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPykml(PythonPackage): pypi = "pykml/pykml-0.1.3.tar.gz" + license("BSD-3-Clause") + version("0.2.0", sha256="44a1892e7c2a649c8ae9f8e2899ff76cae79ec6749ffb64d11140b4e87d0f957") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py index 6ad164bfc041d7..6bf307a58eee00 100644 --- a/var/spack/repos/builtin/packages/py-pykokkos-base/package.py +++ b/var/spack/repos/builtin/packages/py-pykokkos-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -44,13 +44,9 @@ class PyPykokkosBase(CMakePackage, PythonExtension): depends_on("python@3:", type=("build", "run")) def cmake_args(self): - spec = self.spec - args = [ self.define("ENABLE_INTERNAL_KOKKOS", False), self.define("ENABLE_INTERNAL_PYBIND11", False), - self.define("PYTHON_EXECUTABLE", spec["python"].command.path), - self.define("Python3_EXECUTABLE", spec["python"].command.path), self.define_from_variant("ENABLE_VIEW_RANKS", "view_ranks"), ] diff --git a/var/spack/repos/builtin/packages/py-pykwalify/package.py b/var/spack/repos/builtin/packages/py-pykwalify/package.py index 73747d0dfe8a24..f21d63baeb2eaa 100644 --- a/var/spack/repos/builtin/packages/py-pykwalify/package.py +++ b/var/spack/repos/builtin/packages/py-pykwalify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPykwalify(PythonPackage): homepage = "https://github.com/grokzen/pykwalify" pypi = "pykwalify/pykwalify-1.7.0.tar.gz" + license("MIT") + version("1.7.0", sha256="7e8b39c5a3a10bc176682b3bd9a7422c39ca247482df198b402e8015defcceb2") version("1.6.1", sha256="191fd3f457f23c0aa8538c3a5c0249f70eeb1046e88d0eaaef928e09c44dff8d") diff --git a/var/spack/repos/builtin/packages/py-pylab-sdk/package.py b/var/spack/repos/builtin/packages/py-pylab-sdk/package.py index a163b6289f4539..e473314b84b77c 100644 --- a/var/spack/repos/builtin/packages/py-pylab-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-pylab-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPylabSdk(PythonPackage): homepage = "https://github.com/PyLabCo/pylab-sdk" pypi = "pylab-sdk/pylab-sdk-1.3.2.tar.gz" + license("MIT") + version("1.3.2", sha256="ea53e97fec45ea15f65bd53da6b25dc16a9accf3a7f5decbaa970592d760148d") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pylatex/package.py b/var/spack/repos/builtin/packages/py-pylatex/package.py index 5fb3157f0bba8d..ccc99b4538cd50 100644 --- a/var/spack/repos/builtin/packages/py-pylatex/package.py +++ b/var/spack/repos/builtin/packages/py-pylatex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPylatex(PythonPackage): homepage = "https://github.com/JelteF/PyLaTeX" pypi = "PyLaTeX/PyLaTeX-1.4.1.tar.gz" + license("MIT") + version("1.4.1", sha256="d3c12efb8b260771260443dce78d1e9089c09f9d0b92e6273dfca0bf5e7302fb") variant("docs", default=False, description="Build with Sphinx support for documentation") diff --git a/var/spack/repos/builtin/packages/py-pyld/package.py b/var/spack/repos/builtin/packages/py-pyld/package.py index d80179c31cabe8..7caddc9196c3af 100644 --- a/var/spack/repos/builtin/packages/py-pyld/package.py +++ b/var/spack/repos/builtin/packages/py-pyld/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyld(PythonPackage): homepage = "https://github.com/digitalbazaar/pyld" pypi = "PyLD/PyLD-2.0.3.tar.gz" + license("BSD-3-Clause") + version("2.0.3", sha256="287445f888c3a332ccbd20a14844c66c2fcbaeab3c99acd506a0788e2ebb2f82") depends_on("py-cachetools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pylev/package.py b/var/spack/repos/builtin/packages/py-pylev/package.py index f39004a2338612..5eebc9e1094c5c 100644 --- a/var/spack/repos/builtin/packages/py-pylev/package.py +++ b/var/spack/repos/builtin/packages/py-pylev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPylev(PythonPackage): homepage = "http://github.com/toastdriven/pylev" pypi = "pylev/pylev-1.4.0.tar.gz" + license("BSD-3-Clause") + version("1.4.0", sha256="9e77e941042ad3a4cc305dcdf2b2dec1aec2fbe3dd9015d2698ad02b173006d1") depends_on("python@2.7,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pylibmagic/package.py b/var/spack/repos/builtin/packages/py-pylibmagic/package.py index 1482de4c2edf21..e2ec60dfb6e72f 100644 --- a/var/spack/repos/builtin/packages/py-pylibmagic/package.py +++ b/var/spack/repos/builtin/packages/py-pylibmagic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pylikwid/package.py b/var/spack/repos/builtin/packages/py-pylikwid/package.py index cdd106ae7edb4d..b76aa855fa758a 100644 --- a/var/spack/repos/builtin/packages/py-pylikwid/package.py +++ b/var/spack/repos/builtin/packages/py-pylikwid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyPylikwid(PythonPackage): maintainers("TomTheBear") + license("GPL-2.0-only") + version("0.4.0", sha256="f7894a6d7ebcea7da133ef639599a314f850f55cd6c5ffdd630bb879bd2aa0b8") variant("cuda", default=False, description="with Nvidia GPU profiling support") diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index e6e5d3ca70a6b8..57d1e145879d66 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class PyPylint(PythonPackage): "pylint.reporters.ureports", ] + license("GPL-2.0-or-later") + version("2.16.2", sha256="13b2c805a404a9bf57d002cd5f054ca4d40b0b87542bdaba5e05321ae8262c84") version("2.15.0", sha256="4f3f7e869646b0bd63b3dfb79f3c0f28fc3d2d923ea220d52620fd625aed92b0") version("2.14.4", sha256="47705453aa9dce520e123a7d51843d5f0032cbfa06870f89f00927aa1f735a4a") diff --git a/var/spack/repos/builtin/packages/py-pylops/package.py b/var/spack/repos/builtin/packages/py-pylops/package.py index b541eb40b121b5..8e0193f48cffde 100644 --- a/var/spack/repos/builtin/packages/py-pylops/package.py +++ b/var/spack/repos/builtin/packages/py-pylops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyPylops(PythonPackage): maintainers("archxlith") + license("LGPL-3.0-or-later") + version("master", branch="master") version("1.12.0", sha256="0e9caef46bbef9691acd133cb9b6d13e19510e8682aaa8f4eb15d9bd9ff9ebb6") version("1.11.1", sha256="87010358b1119ebe1f8a601b2768d16d7bd26d55bd0c91a6e83db763e5715f7c") diff --git a/var/spack/repos/builtin/packages/py-pymatgen/package.py b/var/spack/repos/builtin/packages/py-pymatgen/package.py index 7966cf238a380c..083724ddb3ac81 100644 --- a/var/spack/repos/builtin/packages/py-pymatgen/package.py +++ b/var/spack/repos/builtin/packages/py-pymatgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPymatgen(PythonPackage): homepage = "http://www.pymatgen.org/" pypi = "pymatgen/pymatgen-4.7.2.tar.gz" + license("MIT") + version("2022.9.8", sha256="2250e05b81af3313bc0fc70cb558c2f528ed4eefb32d943ed9bd7a9756f03652") version("2021.3.9", sha256="a6f22d69133a48b7801bfd5e6a2878b47b4b4b2ef1a377b87c6c573be14cbf16") version( diff --git a/var/spack/repos/builtin/packages/py-pymatreader/package.py b/var/spack/repos/builtin/packages/py-pymatreader/package.py index 2d1465a1671579..dd8984964410e1 100644 --- a/var/spack/repos/builtin/packages/py-pymatreader/package.py +++ b/var/spack/repos/builtin/packages/py-pymatreader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPymatreader(PythonPackage): homepage = "https://gitlab.com/obob/pymatreader" pypi = "pymatreader/pymatreader-0.0.30.tar.gz" + license("BSD-2-Clause") + version("0.0.30", sha256="c8187b6ee77a9b1ec0d8ccae9b22c9031d01104a412737cc4a71e6d993a1a12b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pymbolic/package.py b/var/spack/repos/builtin/packages/py-pymbolic/package.py index a6714abe3f842e..b0c5dd4da65ca9 100644 --- a/var/spack/repos/builtin/packages/py-pymbolic/package.py +++ b/var/spack/repos/builtin/packages/py-pymbolic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPymbolic(PythonPackage): maintainers("cgcgcg") + license("MIT") + version("2022.2", sha256="f82776942bb3cb72329fa1f1aa2b68ec09f237db9178c95cfdc92a6aea7cec89") depends_on("python@3.8:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pymc3/package.py b/var/spack/repos/builtin/packages/py-pymc3/package.py index fc07a39856ae26..e0230afeeab934 100644 --- a/var/spack/repos/builtin/packages/py-pymc3/package.py +++ b/var/spack/repos/builtin/packages/py-pymc3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPymc3(PythonPackage): homepage = "https://github.com/pymc-devs/pymc3" pypi = "pymc3/pymc3-3.8.tar.gz" + license("Apache-2.0") + version("3.8", sha256="1bb2915e4a29877c681ead13932b0b7d276f7f496e9c3f09ba96b977c99caf00") depends_on("python@3.5.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pymdown-extensions/package.py b/var/spack/repos/builtin/packages/py-pymdown-extensions/package.py index 0e74817194d1e3..c2f358aae225d9 100644 --- a/var/spack/repos/builtin/packages/py-pymdown-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-pymdown-extensions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPymdownExtensions(PythonPackage): homepage = "https://github.com/facelessuser/pymdown-extensions" pypi = "pymdown_extensions/pymdown_extensions-9.5.tar.gz" + license("MIT") + version("9.5", sha256="3ef2d998c0d5fa7eb09291926d90d69391283561cf6306f85cd588a5eb5befa0") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pymeeus/package.py b/var/spack/repos/builtin/packages/py-pymeeus/package.py index d01177ad56bbc2..9b545348a21084 100644 --- a/var/spack/repos/builtin/packages/py-pymeeus/package.py +++ b/var/spack/repos/builtin/packages/py-pymeeus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPymeeus(PythonPackage): homepage = "https://github.com/architest/pymeeus" pypi = "PyMeeus/PyMeeus-0.3.6.tar.gz" + license("LGPL-3.0-only") + version("0.3.6", sha256="1f1ba0682e1b5c6b0cd6432c966e8bc8acc31737ea6f0ae79917a2189a98bb87") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyminifier/package.py b/var/spack/repos/builtin/packages/py-pyminifier/package.py index 68f5a56d41b423..68a658d98fc1a1 100644 --- a/var/spack/repos/builtin/packages/py-pyminifier/package.py +++ b/var/spack/repos/builtin/packages/py-pyminifier/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyminifier(PythonPackage): homepage = "https://liftoff.github.io/pyminifier/" pypi = "pyminifier/pyminifier-2.1.tar.gz" + license("GPL-3.0-or-later") + version("2.1", sha256="e192618fe901830e9298825b32828bc9555ae8649e05af37bfab2db328546777") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py index 4d3b007eabb1ae..fe9bcce3a8d6ee 100644 --- a/var/spack/repos/builtin/packages/py-pymol/package.py +++ b/var/spack/repos/builtin/packages/py-pymol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pymongo/package.py b/var/spack/repos/builtin/packages/py-pymongo/package.py index 201c9ba3aa0625..7c7469e628f576 100644 --- a/var/spack/repos/builtin/packages/py-pymongo/package.py +++ b/var/spack/repos/builtin/packages/py-pymongo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPymongo(PythonPackage): pypi = "pymongo/pymongo-3.9.0.tar.gz" + license("Apache-2.0") + version("4.2.0", sha256="72f338f6aabd37d343bd9d1fdd3de921104d395766bcc5cdc4039e4c2dd97766") version("3.12.1", sha256="704879b6a54c45ad76cea7c6789c1ae7185050acea7afd15b58318fa1932ed45") version("3.9.0", sha256="4249c6ba45587b959292a727532826c5032d59171f923f7f823788f413c2a5a3") diff --git a/var/spack/repos/builtin/packages/py-pymoo/package.py b/var/spack/repos/builtin/packages/py-pymoo/package.py index 44f4cb8602bff4..023f81d859b25e 100644 --- a/var/spack/repos/builtin/packages/py-pymoo/package.py +++ b/var/spack/repos/builtin/packages/py-pymoo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPymoo(PythonPackage): pypi = "pymoo/pymoo-0.5.0.tar.gz" maintainers("liuyangzhuan") + license("Apache-2.0") + version("0.5.0", sha256="2fbca1716f6b45e430197ce4ce2210070fd3b6b9ec6b17bb25d98486115272c2") version("0.4.2", sha256="6ec382a7d29c8775088eec7f245a30fd384b42c40f230018dea0e3bcd9aabdf1") diff --git a/var/spack/repos/builtin/packages/py-pymorph/package.py b/var/spack/repos/builtin/packages/py-pymorph/package.py index 3732e3c61875ab..3931bab4953d5c 100644 --- a/var/spack/repos/builtin/packages/py-pymorph/package.py +++ b/var/spack/repos/builtin/packages/py-pymorph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pympler/package.py b/var/spack/repos/builtin/packages/py-pympler/package.py index cc6ca77b4f6def..a954d5b5d24748 100644 --- a/var/spack/repos/builtin/packages/py-pympler/package.py +++ b/var/spack/repos/builtin/packages/py-pympler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPympler(PythonPackage): homepage = "https://github.com/pympler/pympler" pypi = "Pympler/Pympler-0.4.3.tar.gz" + license("Apache-2.0") + version("1.0.1", sha256="993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa") depends_on("python@3.6:3.10", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pymsgbox/package.py b/var/spack/repos/builtin/packages/py-pymsgbox/package.py index 2907051bf53aef..67ee75d1849c2f 100644 --- a/var/spack/repos/builtin/packages/py-pymsgbox/package.py +++ b/var/spack/repos/builtin/packages/py-pymsgbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pymumps/package.py b/var/spack/repos/builtin/packages/py-pymumps/package.py index b2fa437e8994c2..f6dab4bced4fe7 100644 --- a/var/spack/repos/builtin/packages/py-pymumps/package.py +++ b/var/spack/repos/builtin/packages/py-pymumps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPymumps(PythonPackage): # package is updated maintainers("payerle") + license("BSD-3-Clause") + version("0.3.2", sha256="f290ec4850098f108fb91cb9e7fa07302ebf5076e4329f8e6ea4924de8ba35df") depends_on("py-cython", type="build") diff --git a/var/spack/repos/builtin/packages/py-pymysql/package.py b/var/spack/repos/builtin/packages/py-pymysql/package.py index 8770c361b26232..e88ddd0db033c7 100644 --- a/var/spack/repos/builtin/packages/py-pymysql/package.py +++ b/var/spack/repos/builtin/packages/py-pymysql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPymysql(PythonPackage): homepage = "https://github.com/PyMySQL/PyMySQL/" pypi = "pymysql/PyMySQL-0.9.2.tar.gz" + license("MIT") + version("0.9.2", sha256="9ec760cbb251c158c19d6c88c17ca00a8632bac713890e465b2be01fdc30713f") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pynacl/package.py b/var/spack/repos/builtin/packages/py-pynacl/package.py index 205ad8bf2038af..8c564b421c77a2 100644 --- a/var/spack/repos/builtin/packages/py-pynacl/package.py +++ b/var/spack/repos/builtin/packages/py-pynacl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pynio/package.py b/var/spack/repos/builtin/packages/py-pynio/package.py index ba757b68d4bcf5..59ea20288f45c0 100644 --- a/var/spack/repos/builtin/packages/py-pynio/package.py +++ b/var/spack/repos/builtin/packages/py-pynio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPynio(PythonPackage): homepage = "https://www.pyngl.ucar.edu/Nio.shtml" url = "https://github.com/NCAR/pynio/archive/1.5.4.tar.gz" + license("Apache-2.0") + version("1.5.4", sha256="e5bb57d902740d25e4781a9f89e888149f55f2ffe60f9a5ad71069f017c89e1a") variant("hdf5", default=False, description="Include HDF5 support") diff --git a/var/spack/repos/builtin/packages/py-pynisher/package.py b/var/spack/repos/builtin/packages/py-pynisher/package.py index 0dec1b600a2043..e538e573f12e6a 100644 --- a/var/spack/repos/builtin/packages/py-pynisher/package.py +++ b/var/spack/repos/builtin/packages/py-pynisher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPynisher(PythonPackage): homepage = "https://github.com/automl/pynisher" pypi = "pynisher/pynisher-0.6.4.tar.gz" + license("MIT") + version("0.6.4", sha256="111d91aad471375c0509a912415ff90053ef909100facf412511383af107c124") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index b401e6bfebc8f1..8b7e40fed7e749 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPynn(PythonPackage): pypi = "PyNN/PyNN-0.8.3.tar.gz" git = "https://github.com/NeuralEnsemble/PyNN.git" + license("CECILL-2.0") + version("0.10.0", sha256="04120fe0e03260d664b337e0ac29d985c3fb3684ef35b1add93a66739891c98f") version("0.9.1", sha256="bbc60fea3235427191feb2daa0e2fa07eb1c3946104c068ac8a2a0501263b0b1") version("0.8.3", sha256="9d59e6cffa4714f0c892ec6b32d1f5f8f75ba3a20d8635bac50c047aa6f2537e") diff --git a/var/spack/repos/builtin/packages/py-pynndescent/package.py b/var/spack/repos/builtin/packages/py-pynndescent/package.py index b7df7b1d62f9c9..14e21070aa5be4 100644 --- a/var/spack/repos/builtin/packages/py-pynndescent/package.py +++ b/var/spack/repos/builtin/packages/py-pynndescent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPynndescent(PythonPackage): homepage = "https://github.com/lmcinnes/pynndescent" pypi = "pynndescent/pynndescent-0.5.7.tar.gz" + license("BSD-2-Clause") + version("0.5.7", sha256="ecb395255fa36a748b5870b4ba0300ea0f7da8b1964864b8edd62577a84dfd7d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pynrrd/package.py b/var/spack/repos/builtin/packages/py-pynrrd/package.py index e6a5858153cd80..8372b1a6ce19b7 100644 --- a/var/spack/repos/builtin/packages/py-pynrrd/package.py +++ b/var/spack/repos/builtin/packages/py-pynrrd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPynrrd(PythonPackage): homepage = "https://github.com/mhe/pynrrd" pypi = "pynrrd/pynrrd-0.4.0.tar.gz" + license("MIT") + version("1.0.0", sha256="4eb4caba03fbca1b832114515e748336cb67bce70c7f3ae36bfa2e135fc990d2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pynucleus/package.py b/var/spack/repos/builtin/packages/py-pynucleus/package.py index c4f2f82b7a24ef..9664e7ce9f37bd 100644 --- a/var/spack/repos/builtin/packages/py-pynucleus/package.py +++ b/var/spack/repos/builtin/packages/py-pynucleus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,9 +16,14 @@ class PyPynucleus(PythonPackage): refs = ["master", "develop"] + license("MIT") + for ref in refs: version(ref, branch=ref) + variant("examples", default=True, description="Install examples") + variant("tests", default=True, description="Install tests") + depends_on("python@3.10:", type=("build", "run")) depends_on("py-mpi4py@2.0.0:", type=("build", "link", "run")) depends_on("py-cython@0.29.32:", type=("build", "run")) @@ -30,14 +35,14 @@ class PyPynucleus(PythonPackage): depends_on("py-h5py", type=("build", "run")) depends_on("py-tabulate", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-matplotlib+latex", type=("build", "run")) + depends_on("py-matplotlib", type=("build", "run")) depends_on("py-scikit-sparse", type=("build", "run")) depends_on("py-modepy", type=("build", "run")) depends_on("py-meshpy", type=("build", "run")) depends_on("py-pytools", type=("build", "run")) depends_on("py-psutil", type="run") - - variant("examples", default=True, description="Install examples") + depends_on("py-pytest", when="+tests", type="run") + depends_on("py-pytest-html", when="+tests", type="run") import_modules = [ "PyNucleus", @@ -64,5 +69,9 @@ def install_python(self): def install_additional_files(self): spec = self.spec prefix = self.prefix - if "+examples" in spec: + if "+examples" in spec or "+tests" in spec: install_tree("drivers", prefix.drivers) + if "+examples" in spec: + install_tree("examples", prefix.examples) + if "+tests" in spec: + install_tree("tests", prefix.tests) diff --git a/var/spack/repos/builtin/packages/py-pynvim/package.py b/var/spack/repos/builtin/packages/py-pynvim/package.py index 1d43dae6bb82c5..473a452a21a89b 100644 --- a/var/spack/repos/builtin/packages/py-pynvim/package.py +++ b/var/spack/repos/builtin/packages/py-pynvim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPynvim(PythonPackage): maintainers("trws") + license("Apache-2.0") + version("0.4.3", sha256="3a795378bde5e8092fbeb3a1a99be9c613d2685542f1db0e5c6fd467eed56dff") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pynvml/package.py b/var/spack/repos/builtin/packages/py-pynvml/package.py index e5d357a2661095..6f9472b545055d 100644 --- a/var/spack/repos/builtin/packages/py-pynvml/package.py +++ b/var/spack/repos/builtin/packages/py-pynvml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPynvml(PythonPackage): homepage = "https://www.nvidia.com/" pypi = "pynvml/pynvml-8.0.4.tar.gz" + license("Unlicense") + version("8.0.4", sha256="c8d4eadc648c7e12a3c9182a9750afd8481b76412f83747bcc01e2aa829cde5d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pynvtx/package.py b/var/spack/repos/builtin/packages/py-pynvtx/package.py index 2f1cf5e7814f82..86065133e703c4 100644 --- a/var/spack/repos/builtin/packages/py-pynvtx/package.py +++ b/var/spack/repos/builtin/packages/py-pynvtx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyodbc/package.py b/var/spack/repos/builtin/packages/py-pyodbc/package.py index 59d01977537a79..05cc05cf01b7e6 100644 --- a/var/spack/repos/builtin/packages/py-pyodbc/package.py +++ b/var/spack/repos/builtin/packages/py-pyodbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyodbc(PythonPackage): homepage = "https://github.com/mkleehammer/pyodbc" pypi = "pyodbc/pyodbc-4.0.26.tar.gz" + license("MIT-0") + version("4.0.26", sha256="e52700b5d24a846483b5ab80acd9153f8e593999c9184ffea11596288fb33de3") depends_on("python@2.7:2.8,3.4:", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyomo/package.py b/var/spack/repos/builtin/packages/py-pyomo/package.py index 2c688e9d07b4c7..25a9de064cb292 100644 --- a/var/spack/repos/builtin/packages/py-pyomo/package.py +++ b/var/spack/repos/builtin/packages/py-pyomo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,17 +11,106 @@ class PyPyomo(PythonPackage): diverse set of optimization capabilities for formulating and analyzing optimization models.""" - homepage = "https://github.com/Pyomo/pyomo" - url = "https://github.com/Pyomo/pyomo/archive/5.6.6.tar.gz" + homepage = "https://www.pyomo.org/" + pypi = "Pyomo/Pyomo-5.6.6.tar.gz" + git = "https://github.com/Pyomo/pyomo.git" - version("5.6.6", sha256="9330956b9fb244351ce76aaaf88688b5bdd03eebb122020cbee7b46e198a4110") + # Maintainer accurate as of 11/21/2023 + maintainers("mrmundt") - depends_on("python@2.7:2.9,3.4:", type=("build", "run")) + version("6.7.0", sha256="a245ec609ef2fd907269f0b8e0923f74d5bf868b2ec0e62bf2a30b3f253bd17b") + version("6.6.2", sha256="c8ad55213ff8b1a2c4e469110db8079722d5a6f364c6c46a42e2f750fc9e4d26") + version("6.6.1", sha256="3fb0aba7b0f4120e6ce0f242502c0e61478d61e326bc90b7dc392bbefd114b34") + version("6.6.0", sha256="8766c08041b8d91fbc5166d220c9e723fed6057d18be1178bae3b6583376c65e") + version("6.5.0", sha256="5a23e775bba9fdbad22698fa1a841e662482edc979f2dea41cc6c54b1bb4b968") + version("6.4.4", sha256="922dd8e6e3e421550acf884bd27f74cab2fe6552cdde36715d116b0c8345c367") + version("6.4.3", sha256="7f3f67f61a6e5c2dd9c4dd930356d3176bad1572f1abee780592e725d6445288") + version("6.4.2", sha256="6f5a867e77bdd6ac2ba0da5d4a251e38543ae05eba5a0c5cf8ab39e7fa8e1ea9") + version("6.4.1", sha256="a636a3a1c8314b8be85899cb6fac5d6a9a78fc75c6d58b74d3ec106ae5ed8f59") + version("6.4.0", sha256="b548825301b6bd4073a0620a8265d956153d53c12fca37cc7184fa54fce96222") + version("6.3.0", sha256="b4df6305438a2b6ec75bd2e1588b919feb97089ed179a944b334432723781f81") + version("6.2", sha256="89bc69a9a0afe10f5d229abe508b04ebbd3d2e213aa6c8ec2db2562798fa0400") + version("6.1.2", sha256="f2a58977c3c72e706aef7ab7d016bdf66df85df8ea5b25cc0ba387e2cef880bb") + version("6.1.1", sha256="32f378fda748ff299b4492b12b04ed1d8b11c857117fa0e5e6b609aa322fcade") + version("6.1", sha256="7d087b186a43b2ffd032bc4db87cdbcf2fdc187607211f3e6cdc0f54b6f516f4") + version("6.0.1", sha256="4b27bc917b12a6011e7eb3442a54619f0f42f1087d4defa14b903dd985fdbe7c") + version("6.0", sha256="3dbfb1c7a8ef76dfd99d82c211845cdba9bf31a179269b57b6b28ad635ae34f9") + version("5.7.3", sha256="2c4697107477a1b9cc9dad534d8f9c2dc6ee397c47ad44113e257732b83cfc8f") + version("5.7.2", sha256="f10ada18ade84b16225dc519ef1788dd6d5f22cb22d0ea44db64c96d14cb7bb0") + version("5.7.1", sha256="1228204d7eb4cdd217fed6323a7434de68e89a2aaa74085ea47f1b42fb64d8cd") + version("5.7", sha256="27e3a3c8411de9bc52e5e6aa88e9a0de0dd7369126bc905996e23057775905d7") + version("5.6.9", sha256="17bc3c15b405e3ba3a3b7cf9bf3867f6b8e57b611c8ecfdd43fd802587ee8bc6") + version("5.6.8", sha256="28cbe034b06a477053616a3ce5ef43149bfd7d025cac490c2a3dd006c388b60d") + version("5.6.7", sha256="fc97cc9d5a55c5185358ba65c1f9530c9af17e67a9aae7b36c3414f159030ae0") + version("5.6.6", sha256="813e14a604b9d3ac63bdd0880c07f5f4e1b8f0a8a10345f1b42bee762219c001") - depends_on("py-setuptools", type="build") - depends_on("py-cython", type="build") + variant("cython", default=False, description="Enable cythonization of Pyomo.") + variant("tests", default=False, description="Install testing dependencies.", when="@6.1:") + variant( + "docs", default=False, description="Install docs generation dependencies.", when="@6.1:" + ) + variant("optional", default=False, description="Install optional dependencies.", when="@6.1:") - depends_on("py-appdirs", type=("build", "run")) - depends_on("py-pyutilib@5.7.1:", type=("build", "run")) + # python_requires + depends_on("python@3.8:3.12", when="@6.7:", type=("build", "run")) + depends_on("python@3.7:3.11", when="@6.4:6.6", type=("build", "run")) + depends_on("python@3.6:3.10", when="@6.3", type=("build", "run")) + depends_on("python@3.6:3.9", when="@6.0:6.2", type=("build", "run")) + depends_on("python@2.7:2.8,3.4:3.9", when="@5.7", type=("build", "run")) + depends_on("python@2.7:2.8,3.4:3.8", when="@5.6", type=("build", "run")) + + # universally required + depends_on("py-setuptools@39.2:", type="build") depends_on("py-ply", type=("build", "run")) - depends_on("py-six@1.4:", type=("build", "run")) + + # required for pre-6 series + depends_on("py-pyutilib@6.0.0", when="@5", type=("build", "run")) + depends_on("py-six@1.4:", when="@5", type=("build", "run")) + depends_on("py-appdirs", when="@5.6:5.7.0", type=("build", "run")) + + # when cython is requested + depends_on("py-cython", when="+cython", type="build") + + # when tests is requested + depends_on("py-coverage", when="@6.1:+tests", type=("run")) + depends_on("py-nose", when="@6.1:6.2+tests", type=("run")) + depends_on("py-pytest", when="@6.3:+tests", type=("run")) + depends_on("py-pytest-parallel", when="@6.3:+tests", type=("run")) + depends_on("py-parameterized", when="@6.1:+tests", type=("run")) + depends_on("py-pybind11", when="@6.1:+tests", type=("run")) + + # when docs is requested + depends_on("py-sphinx@4:", when="@6.1:+docs", type=("run")) + depends_on("py-sphinx-copybutton", when="@6.1:+docs", type=("run")) + depends_on("py-sphinx-rtd-theme@0.5:", when="@6.1:+docs", type=("run")) + depends_on("py-sphinxcontrib-jsmath", when="@6.1:+docs", type=("run")) + depends_on("py-sphinxcontrib-napoleon", when="@6.1:+docs", type=("run")) + depends_on("py-numpy", when="@6.1:+docs", type=("run")) + depends_on("py-scipy", when="@6.4.2:+docs", type=("run")) + + # when optional is requested + depends_on("py-dill", when="@6.1:+optional", type=("run")) + depends_on("py-ipython", when="@6.1:+optional", type=("run")) + depends_on("py-matplotlib@3.6.2:", when="@6.1:+optional", type=("run")) + depends_on("py-networkx", when="@6.1:+optional", type=("run")) + depends_on("py-numpy", when="@6.1:+optional", type=("run")) + depends_on("py-openpyxl", when="@6.1:+optional", type=("run")) + depends_on("py-pint", when="@6.1:+optional", type=("run")) + depends_on("py-plotly", when="@6.6:+optional", type=("run")) + depends_on("py-python-louvain", when="@6.1:+optional", type=("run")) + depends_on("py-pyyaml", when="@6.1:+optional", type=("run")) + depends_on("py-scipy", when="@6.1:+optional", type=("run")) + depends_on("py-sympy", when="@6.1:+optional", type=("run")) + depends_on("py-xlrd", when="@6.1:+optional", type=("run")) + depends_on("py-z3-solver", when="@6.1:+optional", type=("run")) + depends_on("py-pywin32", when="@6.1:+optional platform=windows", type=("run")) + depends_on("py-casadi", when="@6.1:+optional", type=("run")) + depends_on("py-numdifftools", when="@6.1:+optional", type=("run")) + depends_on("py-pandas", when="@6.1:+optional", type=("run")) + depends_on("py-seaborn", when="@6.1:+optional", type=("run")) + + def global_options(self, spec, prefix): + options = [] + if "+cython" in self.spec: + options.append("--with-cython") + return options diff --git a/var/spack/repos/builtin/packages/py-pyopencl/package.py b/var/spack/repos/builtin/packages/py-pyopencl/package.py index ffa4156879f468..48cf56912e1001 100644 --- a/var/spack/repos/builtin/packages/py-pyopencl/package.py +++ b/var/spack/repos/builtin/packages/py-pyopencl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyopencl(PythonPackage): maintainers("matthiasdiener") + license("MIT") + version("2020.2.2", sha256="31fcc79fb6862998e98d91a624c0bd4f0ab4c5d418d199912d4d312c64e437ec") depends_on("ocl-icd", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyopenssl/package.py b/var/spack/repos/builtin/packages/py-pyopenssl/package.py index beed23675fa7e1..0a4c9a2253a20a 100644 --- a/var/spack/repos/builtin/packages/py-pyopenssl/package.py +++ b/var/spack/repos/builtin/packages/py-pyopenssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,15 +17,19 @@ class PyPyopenssl(PythonPackage): homepage = "https://pyopenssl.org/" pypi = "pyOpenSSL/pyOpenSSL-19.0.0.tar.gz" + license("Apache-2.0") + version("23.2.0", sha256="276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac") version("22.1.0", sha256="7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968") version("19.0.0", sha256="aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200") + version("18.0.0", sha256="6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580") depends_on("py-setuptools", type="build") depends_on("py-cryptography@38:41", when="@23.2:", type=("build", "run")) depends_on("py-cryptography@38", when="@22", type=("build", "run")) - depends_on("py-cryptography@2.3:", type=("build", "run")) + depends_on("py-cryptography@2.3:", when="@19", type=("build", "run")) + depends_on("py-cryptography@2.2.1:", when="@18", type=("build", "run")) conflicts("^py-cryptography@40:40.0.1", when="@23.2:") diff --git a/var/spack/repos/builtin/packages/py-pypar/package.py b/var/spack/repos/builtin/packages/py-pypar/package.py index 60b557a80802b9..49d9d4fba555d9 100644 --- a/var/spack/repos/builtin/packages/py-pypar/package.py +++ b/var/spack/repos/builtin/packages/py-pypar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPypar(PythonPackage): homepage = "https://github.com/daleroberts/pypar" url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pypar/pypar-2.1.5_108.tgz" + license("MIT") + version("2.1.5_108", sha256="6076c47d32d48424a07c7b7b29ac16e12cc4b2d28b681b895f94fa76cd82fa12") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py index da1b3cacb578af..4210a17aee91c5 100644 --- a/var/spack/repos/builtin/packages/py-pyparsing/package.py +++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyparsing(PythonPackage): homepage = "https://pyparsing-docs.readthedocs.io/en/latest/" pypi = "pyparsing/pyparsing-2.4.2.tar.gz" + license("MIT") + version("3.0.9", sha256="2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb") version("3.0.6", sha256="d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81") version("2.4.7", sha256="c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1") diff --git a/var/spack/repos/builtin/packages/py-pypdf2/package.py b/var/spack/repos/builtin/packages/py-pypdf2/package.py index 8074502554ea7a..a01b1052b3f26a 100644 --- a/var/spack/repos/builtin/packages/py-pypdf2/package.py +++ b/var/spack/repos/builtin/packages/py-pypdf2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pypeflow/package.py b/var/spack/repos/builtin/packages/py-pypeflow/package.py index 83bf7cad66ce9b..c1e324aae25abb 100644 --- a/var/spack/repos/builtin/packages/py-pypeflow/package.py +++ b/var/spack/repos/builtin/packages/py-pypeflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPypeflow(PythonPackage): homepage = "https://github.com/PacificBiosciences/pypeFLOW" git = "https://github.com/PacificBiosciences/pypeFLOW.git" + license("BSD-3-Clause-Clear") + version("2017-05-04", commit="f23a1b290876bbdf130611000934ae4247158073") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pypeg2/package.py b/var/spack/repos/builtin/packages/py-pypeg2/package.py index 4fbf114080c810..38fd29e70247d6 100644 --- a/var/spack/repos/builtin/packages/py-pypeg2/package.py +++ b/var/spack/repos/builtin/packages/py-pypeg2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPypeg2(PythonPackage): homepage = "https://fdik.org/pyPEG2/" pypi = "pypeg2/pyPEG2-2.15.2.tar.gz" + license("GPL-2.0-or-later") + version("2.15.2", sha256="2b2d4f80d8e1a9370b2a91f4a25f4abf7f69b85c8da84cd23ec36451958a1f6d") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-pyperclip/package.py b/var/spack/repos/builtin/packages/py-pyperclip/package.py index 57b5f01533cc77..95b0d58ccd98bb 100644 --- a/var/spack/repos/builtin/packages/py-pyperclip/package.py +++ b/var/spack/repos/builtin/packages/py-pyperclip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyperclip(PythonPackage): homepage = "https://github.com/asweigart/pyperclip" pypi = "pyperclip/pyperclip-1.7.0.tar.gz" + license("BSD-3-Clause") + version("1.8.2", sha256="105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57") version("1.7.0", sha256="979325468ccf682104d5dcaf753f869868100631301d3e72f47babdea5700d1c") diff --git a/var/spack/repos/builtin/packages/py-pyperf/package.py b/var/spack/repos/builtin/packages/py-pyperf/package.py index 6bbc74a4c75ec3..ef21253c21f4f0 100644 --- a/var/spack/repos/builtin/packages/py-pyperf/package.py +++ b/var/spack/repos/builtin/packages/py-pyperf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyperf(PythonPackage): homepage = "https://github.com/vstinner/pyperf" url = "https://github.com/vstinner/pyperf/archive/1.5.1.tar.gz" + license("MIT") + version("1.6.1", sha256="fbe793f6f2e036ab4dcca105b5c5aa34fd331dd881e7a3e158e5e218c63cfc32") version("1.6.0", sha256="7af7b9cfd9d26548ab7127f8e51791357ecd78cda46aad5b2d9664a70fc58878") version("1.5.1", sha256="9c271862bc2911be8eb01031a4a86cbc3f5bb615971514383802d3dcf46f18ed") diff --git a/var/spack/repos/builtin/packages/py-pypinyin/package.py b/var/spack/repos/builtin/packages/py-pypinyin/package.py index f3aeb6696e5a5e..5912ccdf53d1fe 100644 --- a/var/spack/repos/builtin/packages/py-pypinyin/package.py +++ b/var/spack/repos/builtin/packages/py-pypinyin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPypinyin(PythonPackage): homepage = "https://github.com/mozillazg/python-pinyin" pypi = "pypinyin/pypinyin-0.46.0.tar.gz" + license("MIT") + version("0.46.0", sha256="0d2e41e95dbc20a232c0f5d3850654eebbfcba303d96358d2c46592725bb989c") depends_on("python@2.6:2,3.3:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pypng/package.py b/var/spack/repos/builtin/packages/py-pypng/package.py index b23a7c44439567..b0f7092fe56062 100644 --- a/var/spack/repos/builtin/packages/py-pypng/package.py +++ b/var/spack/repos/builtin/packages/py-pypng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPypng(PythonPackage): maintainers("snehring") + license("MIT") + version( "0.20220715.0", sha256="739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1" ) diff --git a/var/spack/repos/builtin/packages/py-pyprecice/package.py b/var/spack/repos/builtin/packages/py-pyprecice/package.py index 56a744f988698d..19b81e062801b6 100644 --- a/var/spack/repos/builtin/packages/py-pyprecice/package.py +++ b/var/spack/repos/builtin/packages/py-pyprecice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyprecice(PythonPackage): url = "https://github.com/precice/python-bindings/archive/v2.4.0.0.tar.gz" maintainers("ajaust", "BenjaminRodenberg", "IshaanDesai") + license("LGPL-3.0") + # Always prefer final version of release candidate version("develop", branch="develop") version("2.5.0.2", sha256="6d7b78da830db6c5133b44617196ee90be8c7d6c8e14c8994a4800b3d4856416") diff --git a/var/spack/repos/builtin/packages/py-pyprof2html/package.py b/var/spack/repos/builtin/packages/py-pyprof2html/package.py index eb57515e95b7c5..68112cdfecc97b 100644 --- a/var/spack/repos/builtin/packages/py-pyprof2html/package.py +++ b/var/spack/repos/builtin/packages/py-pyprof2html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPyprof2html(PythonPackage): pypi = "pyprof2html/pyprof2html-0.3.1.tar.gz" + license("BSD-3-Clause") + version("0.3.1", sha256="db2d37e21d8c76f2fd25fb1ba9273c9b3ff4a98a327e37d943fed1ea225a6720") patch("version_0.3.1.patch", when="@0.3.1") diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py index 16b561dc688f82..60839d2733481a 100644 --- a/var/spack/repos/builtin/packages/py-pyproj/package.py +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyproj(PythonPackage): maintainers("citibeth", "adamjstewart") + license("MIT") + version("3.6.1", sha256="44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf") version("3.6.0", sha256="a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062") version("3.5.0", sha256="9859d1591c1863414d875ae0759e72c2cffc01ab989dc64137fbac572cc81bf6") diff --git a/var/spack/repos/builtin/packages/py-pyproject-hooks/package.py b/var/spack/repos/builtin/packages/py-pyproject-hooks/package.py index efb5eaec494957..10ee2fea373685 100644 --- a/var/spack/repos/builtin/packages/py-pyproject-hooks/package.py +++ b/var/spack/repos/builtin/packages/py-pyproject-hooks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyprojectHooks(PythonPackage): homepage = "https://github.com/pypa/pyproject-hooks" pypi = "pyproject_hooks/pyproject_hooks-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py b/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py index f901c46eaee922..c0631b9b08ac0d 100644 --- a/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-pyproject-metadata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyprojectMetadata(PythonPackage): homepage = "https://github.com/FFY00/python-pyproject-metadata" pypi = "pyproject-metadata/pyproject-metadata-0.6.1.tar.gz" + license("MIT") + version("0.7.1", sha256="0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67") version("0.6.1", sha256="b5fb09543a64a91165dfe85796759f9e415edc296beb4db33d1ecf7866a862bd") diff --git a/var/spack/repos/builtin/packages/py-pyproject-parser/package.py b/var/spack/repos/builtin/packages/py-pyproject-parser/package.py index 63a164ce50aed7..70b97cf7409b65 100644 --- a/var/spack/repos/builtin/packages/py-pyproject-parser/package.py +++ b/var/spack/repos/builtin/packages/py-pyproject-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyprojectParser(PythonPackage): homepage = "https://github.com/repo-helper/pyproject-parser" pypi = "pyproject_parser/pyproject-parser-0.9.1.tar.gz" + license("MIT") + version("0.9.1", sha256="fa0b2ff78bc95788b08d00e1aafa66d3f7f3ab693f19d9c2e23e20000a69fd9b") depends_on("py-wheel@0.34.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pypulse/package.py b/var/spack/repos/builtin/packages/py-pypulse/package.py index 2eb1f05b46a91e..442d994e677615 100644 --- a/var/spack/repos/builtin/packages/py-pypulse/package.py +++ b/var/spack/repos/builtin/packages/py-pypulse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPypulse(PythonPackage): homepage = "https://github.com/mtlam/PyPulse" pypi = "PyPulse/PyPulse-0.0.1.tar.gz" + license("BSD-3-Clause") + version("0.1.1", sha256="89cb362d2108215784f5b0df8e79311f7856f0da705ce4d77d4e884ca6c651b4") version("0.0.1", sha256="239823737644bdf1e09e23e81b3fc439db096aa589581d9fa2b5717f1572e75b") diff --git a/var/spack/repos/builtin/packages/py-pyqi/package.py b/var/spack/repos/builtin/packages/py-pyqi/package.py index cad61f8dec2870..7fa6188338cf74 100644 --- a/var/spack/repos/builtin/packages/py-pyqi/package.py +++ b/var/spack/repos/builtin/packages/py-pyqi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyqt-builder/package.py b/var/spack/repos/builtin/packages/py-pyqt-builder/package.py index 74f31161d3d16b..77708e84ec9289 100644 --- a/var/spack/repos/builtin/packages/py-pyqt-builder/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt-builder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyqtBuilder(PythonPackage): homepage = "https://www.riverbankcomputing.com/hg/PyQt-builder/" pypi = "PyQt-builder/PyQt-builder-1.12.2.tar.gz" + license("GPL-2.0-or-later") + version("1.15.1", sha256="a2bd3cfbf952e959141dfe55b44b451aa945ca8916d1b773850bb2f9c0fa2985") version("1.12.2", sha256="f62bb688d70e0afd88c413a8d994bda824e6cebd12b612902d1945c5a67edcd7") diff --git a/var/spack/repos/builtin/packages/py-pyqt4/package.py b/var/spack/repos/builtin/packages/py-pyqt4/package.py index 4ce26a78290b24..31e481d3052fc9 100644 --- a/var/spack/repos/builtin/packages/py-pyqt4/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,13 +15,9 @@ class PyPyqt4(SIPPackage): homepage = "https://www.riverbankcomputing.com/software/pyqt/intro" url = "https://www.riverbankcomputing.com/static/Downloads/PyQt4/4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz" + license("GPL-3.0-or-later") + version("4.12.3", sha256="a00f5abef240a7b5852b7924fa5fdf5174569525dc076cd368a566619e56d472") - version( - "4.11.3", - sha256="853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686", - url="http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/PyQt-x11-gpl-4.11.3.tar.gz", - deprecated=True, - ) # API files can be installed regardless if QScintilla is installed or not variant("qsci_api", default=False, description="Install PyQt API file for QScintilla") diff --git a/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py b/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py index 04f46ccd0ab191..e93543146b0d52 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5-sip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyqt5Sip(PythonPackage): homepage = "https://www.riverbankcomputing.com/software/sip/" pypi = "PyQt5-sip/PyQt5_sip-12.9.0.tar.gz" + license("GPL-2.0-only") + version("12.12.1", sha256="8fdc6e0148abd12d977a1d3828e7b79aae958e83c6cb5adae614916d888a6b10") version("12.9.0", sha256="d3e4489d7c2b0ece9d203ae66e573939f7f60d4d29e089c9f11daa17cfeaae32") diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py index 55a63dce74a0ba..1f74582a44b271 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,22 +15,9 @@ class PyPyqt5(SIPPackage): url = "https://files.pythonhosted.org/packages/source/P/PyQt5/PyQt5-5.15.9.tar.gz" list_url = "https://pypi.org/simple/PyQt5/" + license("GPL-3.0-only") + version("5.15.9", sha256="dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0") - version( - "5.13.1", - sha256="54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af", - deprecated=True, - ) - version( - "5.13.0", - sha256="0cdbffe5135926527b61cc3692dd301cd0328dd87eeaf1313e610787c46faff9", - deprecated=True, - ) - version( - "5.12.3", - sha256="0db0fa37debab147450f9e052286f7a530404e2aaddc438e97a7dcdf56292110", - deprecated=True, - ) # pyproject.toml depends_on("py-sip@6.6.2:6", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py b/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py index 63d711eb92f18f..36a42e13170e50 100644 --- a/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt6-sip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyqt6Sip(PythonPackage): homepage = "https://www.riverbankcomputing.com/software/sip/" pypi = "PyQt6-sip/PyQt6_sip-13.5.1.tar.gz" + license("GPL-2.0-or-later") + version("13.5.1", sha256="d1e9141752966669576d04b37ba0b122abbc41cc9c35493751028d7d91c4dd49") depends_on("py-setuptools@30.3:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyqt6/package.py b/var/spack/repos/builtin/packages/py-pyqt6/package.py index 6791b50ff0e1ea..6e6de0ead7c89a 100644 --- a/var/spack/repos/builtin/packages/py-pyqt6/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt6/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyqt6(SIPPackage): url = "https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.5.1.tar.gz" list_url = "https://pypi.org/simple/PyQt6/" + license("GPL-3.0-or-later") + version("6.5.2", sha256="1487ee7350f9ffb66d60ab4176519252c2b371762cbe8f8340fd951f63801280") version("6.5.1", sha256="e166a0568c27bcc8db00271a5043936226690b6a4a74ce0a5caeb408040a97c3") diff --git a/var/spack/repos/builtin/packages/py-pyquaternion/package.py b/var/spack/repos/builtin/packages/py-pyquaternion/package.py index 0c0fc05bfe52f9..d5762d8dbf20e7 100644 --- a/var/spack/repos/builtin/packages/py-pyquaternion/package.py +++ b/var/spack/repos/builtin/packages/py-pyquaternion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyquaternion(PythonPackage): homepage = "https://kieranwynn.github.io/pyquaternion/" pypi = "pyquaternion/pyquaternion-0.9.5.tar.gz" + license("MIT") + version("0.9.5", sha256="2d89d19259d62a8fbd25219eee7dacc1f6bb570becb70e1e883f622597c7d81d") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyreadline/package.py b/var/spack/repos/builtin/packages/py-pyreadline/package.py new file mode 100644 index 00000000000000..f0b1f1dfe5d9c7 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyreadline/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPyreadline(PythonPackage): + """A Python implementation of GNU readline functionality.""" + + homepage = "https://github.com/pyreadline/pyreadline" + git = "https://github.com/pyreadline/pyreadline.git" + pypi = "pyreadline/pyreadline-2.1.zip" + + version("master", branch="master") + version("2.1", sha256="4530592fc2e85b25b1a9f79664433da09237c1a270e4d78ea5aa3a2c7229e2d1") + + depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyrect/package.py b/var/spack/repos/builtin/packages/py-pyrect/package.py index be928b381b6cc6..5c3551104e6d24 100644 --- a/var/spack/repos/builtin/packages/py-pyrect/package.py +++ b/var/spack/repos/builtin/packages/py-pyrect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyrevolve/package.py b/var/spack/repos/builtin/packages/py-pyrevolve/package.py index c7b7a7280ec263..12c053a1577f9c 100644 --- a/var/spack/repos/builtin/packages/py-pyrevolve/package.py +++ b/var/spack/repos/builtin/packages/py-pyrevolve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyrevolve(PythonPackage): homepage = "https://github.com/devitocodes/pyrevolve" pypi = "pyrevolve/pyrevolve-2.2.tar.gz" + license("MIT") + version("2.2", sha256="b49aea5cd6c520ac5fcd1d25fa23fe2c5502741d2965f3eee10be067e7b0efb4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyrfr/package.py b/var/spack/repos/builtin/packages/py-pyrfr/package.py index 582d2a8b3230d7..7d1c1e992a64d4 100644 --- a/var/spack/repos/builtin/packages/py-pyrfr/package.py +++ b/var/spack/repos/builtin/packages/py-pyrfr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyrfr(PythonPackage): homepage = "https://automl.github.io/random_forest_run/installation.html" pypi = "pyrfr/pyrfr-0.8.2.tar.gz" + license("BSD-3-Clause") + version("0.8.2", sha256="c18a6e8f0bd971c1ea449b6dd0997a6ec1fe9a031883400bdcc95fa5ddd65975") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyro-api/package.py b/var/spack/repos/builtin/packages/py-pyro-api/package.py index f2aa55ada41947..03ee6d501060c6 100644 --- a/var/spack/repos/builtin/packages/py-pyro-api/package.py +++ b/var/spack/repos/builtin/packages/py-pyro-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyro-ppl/package.py b/var/spack/repos/builtin/packages/py-pyro-ppl/package.py index 50852ef7c49e34..9ba34d0ecab521 100644 --- a/var/spack/repos/builtin/packages/py-pyro-ppl/package.py +++ b/var/spack/repos/builtin/packages/py-pyro-ppl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyroPpl(PythonPackage): maintainers("adamjstewart", "meyersbs") + license("Apache-2.0") + version("1.8.4", sha256="766fad61e52df48885de96d41213da1f8e8c1b79ecf308ad53189fcd15c1cb41") version("1.8.1", sha256="d7c049eb2e7485a612b4dd99c24c309cc860c7cbc6b1973387034f5436d1c8d6") version("1.8.0", sha256="68e4ea30f219227dd88e55de2550d3f8c20a20adbdb67ad1e13b50868bb2ac0c") diff --git a/var/spack/repos/builtin/packages/py-pyro4/package.py b/var/spack/repos/builtin/packages/py-pyro4/package.py index 11c7489f14e274..b3dbdb2ba79826 100644 --- a/var/spack/repos/builtin/packages/py-pyro4/package.py +++ b/var/spack/repos/builtin/packages/py-pyro4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyro4(PythonPackage): pypi = "Pyro4/Pyro4-4.81.tar.gz" maintainers("liuyangzhuan") + license("MIT") + version("4.81", sha256="e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f") version("4.80", sha256="46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220") version("4.79", sha256="b1eb34c9a1e63f731ca480f3e2c48169341a25a7504397badbaaab07e0f3241e") diff --git a/var/spack/repos/builtin/packages/py-pyrosar/package.py b/var/spack/repos/builtin/packages/py-pyrosar/package.py deleted file mode 100644 index 4e18df99117685..00000000000000 --- a/var/spack/repos/builtin/packages/py-pyrosar/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PyPyrosar(PythonPackage): - """A framework for large-scale SAR satellite data processing""" - - homepage = "https://github.com/johntruckenbrodt/pyroSAR" - url = "https://github.com/johntruckenbrodt/pyroSAR/archive/v0.8.tar.gz" - - version("0.8", sha256="03f6d846afde85807a63f84b1fd25fe61e9a4cda93e9af7d44a67fd4b0b7dbc8") - - # python - depends_on("py-setuptools", type="build") - depends_on("py-progressbar2", type=("build", "run")) - depends_on("py-pathos@0.2.0:", type=("build", "run")) - depends_on("py-numpy@1.16.3", type=("build", "run")) - depends_on("py-scoop", type=("build", "run")) - depends_on("py-spatialist@0.2.8", type=("build", "run")) - depends_on("py-pyyaml", type=("build", "run")) - # other - depends_on("gdal+python", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyrr/package.py b/var/spack/repos/builtin/packages/py-pyrr/package.py index 60ea918eab658d..242f80340fab4d 100644 --- a/var/spack/repos/builtin/packages/py-pyrr/package.py +++ b/var/spack/repos/builtin/packages/py-pyrr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyrr(PythonPackage): pypi = "pyrr/pyrr-0.10.3.tar.gz" maintainers("JeromeDuboisPro") + license("Unlicense") + version("0.10.3", sha256="3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyrsistent/package.py b/var/spack/repos/builtin/packages/py-pyrsistent/package.py index 0eafffe5c51d36..9ef98a0f4dc5da 100644 --- a/var/spack/repos/builtin/packages/py-pyrsistent/package.py +++ b/var/spack/repos/builtin/packages/py-pyrsistent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPyrsistent(PythonPackage): homepage = "https://github.com/tobgu/pyrsistent/" pypi = "pyrsistent/pyrsistent-0.15.7.tar.gz" + license("MIT") + version("0.19.3", sha256="1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440") version("0.18.1", sha256="d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96") version("0.18.0", sha256="773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b") diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py index 6ebee2408aa7f9..42993ca040a23e 100644 --- a/var/spack/repos/builtin/packages/py-pysam/package.py +++ b/var/spack/repos/builtin/packages/py-pysam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPysam(PythonPackage): homepage = "https://github.com/pysam-developers/pysam" pypi = "pysam/pysam-0.14.1.tar.gz" + license("MIT") + version("0.21.0", sha256="5c9645ddd87668e36ff0a1966391e26f9c403bf85b1bc06c53fe2fcd592da2ce") version("0.19.1", sha256="dee403cbdf232170c1e11cc24c76e7dd748fc672ad38eb0414f3b9d569b1448f") version("0.18.0", sha256="1d6d49a0b3c626fae410a93d4c80583a8b5ddaacc9b46a080b250dbcebd30a59") diff --git a/var/spack/repos/builtin/packages/py-pyscaf/package.py b/var/spack/repos/builtin/packages/py-pyscaf/package.py index 1c480491ebe431..78470e04b6086a 100644 --- a/var/spack/repos/builtin/packages/py-pyscaf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscaf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyscaf(PythonPackage): pypi = "pyScaf/pyScaf-0.12a4.tar.gz" + license("GPL-3.0-only") + version("0.12a4", sha256="3ce3f6fe80bd058831b6a38a56d464ef10f3ebbdd6bc3dcb0d7f127c0b2c1b36") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyscf/package.py b/var/spack/repos/builtin/packages/py-pyscf/package.py index df56a139bafa64..311193bc6f1684 100644 --- a/var/spack/repos/builtin/packages/py-pyscf/package.py +++ b/var/spack/repos/builtin/packages/py-pyscf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,11 @@ class PyPyscf(PythonPackage): maintainers("naromero77") + license("Apache-2.0") + + version("2.4.0", sha256="af0597c481851b5448e7055c3160aef28dc12a1e0b35dda8279555c0780c0d45") + version("2.3.0", sha256="71781de62c25924fd4e93ffeb0451ec0d0b3646fe426c75023f4f519f0f35d85") + version("2.2.1", sha256="4ff6851351caadc5dfa543b6b2c5fbd926ded87e3cc39faa0054e1e5090ed69a") version("2.2.0", sha256="8f65042cf7e86aa5088756988eb90418befcd18f07a6b8c597229a5f2ba4f644") version("2.1.1", sha256="608442171f5db106b02a95c878c65798fbbd87dc0ce50551a2e081e7d206adb0") version("2.1.0", sha256="45feecc9c9a0ce18dee73c5b178fb0faa3f0c0d3dd5f98b48dc2370c9e13d05b") @@ -34,7 +39,6 @@ class PyPyscf(PythonPackage): conflicts("^py-numpy@1.16:1.17", when="@2:") depends_on("py-scipy@0.12:", type=("build", "run")) depends_on("py-scipy@0.19:", type=("build", "run"), when="@2.1:") - depends_on("py-scipy@:1.1.0", when="^python@:3.7 platform=darwin", type=("build", "run")) conflicts("^py-scipy@1.5.0:1.5.1", when="@2:") depends_on("py-h5py@2.3.0:", type=("build", "run")) depends_on("py-h5py@2.7.0:", type=("build", "run"), when="@2:") diff --git a/var/spack/repos/builtin/packages/py-pyscipopt/package.py b/var/spack/repos/builtin/packages/py-pyscipopt/package.py index 7ea87bd5969ee1..a7a23dd147757a 100644 --- a/var/spack/repos/builtin/packages/py-pyscipopt/package.py +++ b/var/spack/repos/builtin/packages/py-pyscipopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyscipopt(PythonPackage): homepage = "https://github.com/scipopt/PySCIPOpt" pypi = "PySCIPOpt/PySCIPOpt-3.4.0.tar.gz" + license("MIT") + version("3.4.0", sha256="8da4db57b21010e0d5a863292dd455c88dd71ecec12a8439171c213a8092f88a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyscreeze/package.py b/var/spack/repos/builtin/packages/py-pyscreeze/package.py index de97e96dc54add..20c6a3e240e8f3 100644 --- a/var/spack/repos/builtin/packages/py-pyscreeze/package.py +++ b/var/spack/repos/builtin/packages/py-pyscreeze/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyscreeze(PythonPackage): homepage = "https://github.com/asweigart/pyscreeze" pypi = "PyScreeze/PyScreeze-0.1.27.tar.gz" + license("MIT") + version("0.1.27", sha256="cba2f264fe4b6c70510061cb2ba6e1da0e3bfecfdbe8a3b2cd6305a2afda9e6b") depends_on("python@2.7:2,3.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyserial/package.py b/var/spack/repos/builtin/packages/py-pyserial/package.py index dd21120d372cdb..4266deca9e8482 100644 --- a/var/spack/repos/builtin/packages/py-pyserial/package.py +++ b/var/spack/repos/builtin/packages/py-pyserial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyserial(PythonPackage): homepage = "https://github.com/pyserial/pyserial" pypi = "pyserial/pyserial-3.1.1.tar.gz" + license("BSD-3-Clause") + version("3.1.1", sha256="d657051249ce3cbd0446bcfb2be07a435e1029da4d63f53ed9b4cdde7373364c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyshacl/package.py b/var/spack/repos/builtin/packages/py-pyshacl/package.py index aad6b182a015ac..e76d43fd3aae2f 100644 --- a/var/spack/repos/builtin/packages/py-pyshacl/package.py +++ b/var/spack/repos/builtin/packages/py-pyshacl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPyshacl(PythonPackage): homepage = "https://github.com/RDFLib/pySHACL" pypi = "pyshacl/pyshacl-0.17.2.tar.gz" + license("Apache-2.0") + version("0.20.0", sha256="47f014c52cc69167b902c89b3940dd400f7f5d2169a62f97f837f3419b4a737d") version("0.17.2", sha256="46f31c7a7f7298aa5b483d92dbc850ff79a144d26f1f41e83267ed84b4d6ae23") diff --git a/var/spack/repos/builtin/packages/py-pyshp/package.py b/var/spack/repos/builtin/packages/py-pyshp/package.py index 8df780981d26d7..02591e12510c79 100644 --- a/var/spack/repos/builtin/packages/py-pyshp/package.py +++ b/var/spack/repos/builtin/packages/py-pyshp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyshp(PythonPackage): homepage = "https://github.com/GeospatialPython/pyshp" pypi = "pyshp/pyshp-1.2.12.tar.gz" + license("MIT") + version("2.1.0", sha256="e65c7f24d372b97d0920b864bbeb78322bb37b83f2606e2a2212631d5d51e5c0") version("1.2.12", sha256="8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179") diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py index a7101518351111..16e95b4f7197b6 100644 --- a/var/spack/repos/builtin/packages/py-pyside/package.py +++ b/var/spack/repos/builtin/packages/py-pyside/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyside2/package.py b/var/spack/repos/builtin/packages/py-pyside2/package.py index b13f0c1aac4220..a1bbd619aef878 100644 --- a/var/spack/repos/builtin/packages/py-pyside2/package.py +++ b/var/spack/repos/builtin/packages/py-pyside2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyside2(PythonPackage): # the offical Qt umbrella. For more information, see: # https://wiki.qt.io/Qt_for_Python_Development_Getting_Started + license("LGPL-3.0-or-later") + version("develop", tag="dev") version( "5.15.2.1", diff --git a/var/spack/repos/builtin/packages/py-pysimdjson/package.py b/var/spack/repos/builtin/packages/py-pysimdjson/package.py index d932aa3fcb08f0..48685e6dc9fcd1 100644 --- a/var/spack/repos/builtin/packages/py-pysimdjson/package.py +++ b/var/spack/repos/builtin/packages/py-pysimdjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPysimdjson(PythonPackage): maintainers("haralmha") + license("MIT") + version("4.0.3", sha256="61900992d7f992b073a8c5f93cafa4af9bfd3209624baa775699b0fdd6f67517") version("3.2.0", sha256="643baa0941752367761dbc091bf552bf4ca196cf67bf41ef89c90c2db2ec1477") diff --git a/var/spack/repos/builtin/packages/py-pysmartdl/package.py b/var/spack/repos/builtin/packages/py-pysmartdl/package.py index 49aa1526cbb578..089e4e45c38ef9 100644 --- a/var/spack/repos/builtin/packages/py-pysmartdl/package.py +++ b/var/spack/repos/builtin/packages/py-pysmartdl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPysmartdl(PythonPackage): pypi = "pySmartDL/pySmartDL-1.3.2.tar.gz" + license("Unlicense") + version("1.3.2", sha256="9a96deb3ee4f4ab2279b22eb908d506f57215e1fbad290d540adcebff187a52c") version("1.2.5", sha256="d3968ce59412f99d8e17ca532a1d949d2aa770a914e3f5eb2c0385579dc2b6b8") diff --git a/var/spack/repos/builtin/packages/py-pysocks/package.py b/var/spack/repos/builtin/packages/py-pysocks/package.py index 049d56c0c5b075..a145d56ba965d0 100644 --- a/var/spack/repos/builtin/packages/py-pysocks/package.py +++ b/var/spack/repos/builtin/packages/py-pysocks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPysocks(PythonPackage): homepage = "https://github.com/Anorov/PySocks" pypi = "PySocks/PySocks-1.7.1.tar.gz" + license("BSD-3-Clause") + version("1.7.1", sha256="3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0") version("1.6.6", sha256="02419a225ff5dcfc3c9695ef8fc9b4d8cc99658e650c6d4718d4c8f451e63f41") version("1.5.7", sha256="e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88") diff --git a/var/spack/repos/builtin/packages/py-pysolar/package.py b/var/spack/repos/builtin/packages/py-pysolar/package.py index 3c6758f3947cf4..202ddcd728d378 100644 --- a/var/spack/repos/builtin/packages/py-pysolar/package.py +++ b/var/spack/repos/builtin/packages/py-pysolar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py index 541852cbbd7300..087378d753d9eb 100644 --- a/var/spack/repos/builtin/packages/py-pyspark/package.py +++ b/var/spack/repos/builtin/packages/py-pyspark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,20 +18,11 @@ class PyPyspark(PythonPackage): version("3.1.3", sha256="39ac641ef5559a3d1286154779fc990316e9934520853615ae4785c1af52d14b") version("3.1.2", sha256="5e25ebb18756e9715f4d26848cc7e558035025da74b4fc325a0ebc05ff538e65") version("3.0.1", sha256="38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479") - version("2.4.4", sha256="13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694") - version("2.3.2", sha256="7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8") - version("2.3.0", sha256="0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e") - depends_on("python@3.7:", when="@3.3.0:", type=("build", "run")) - depends_on("python@3.6:", when="@3:3.2.3", type=("build", "run")) - depends_on("python@2.7:3.7", when="@:2", type=("build", "run")) - depends_on("python@2.7:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-py4j@0.10.9.5", when="@3.3.0:", type=("build", "run")) depends_on("py-py4j@0.10.9.3", when="@3.2.1", type=("build", "run")) depends_on("py-py4j@0.10.9", when="@3.0.1:3.1.3", type=("build", "run")) - depends_on("py-py4j@0.10.7", when="@2.3.2:2.4.4", type=("build", "run")) - depends_on("py-py4j@0.10.6", when="@2.3.0", type=("build", "run")) def setup_run_environment(self, env): env.set("PYSPARK_PYTHON", self.spec["python"].command.path) diff --git a/var/spack/repos/builtin/packages/py-pyspellchecker/package.py b/var/spack/repos/builtin/packages/py-pyspellchecker/package.py index 3af4c3d9b9ffe5..edbc164f14510c 100644 --- a/var/spack/repos/builtin/packages/py-pyspellchecker/package.py +++ b/var/spack/repos/builtin/packages/py-pyspellchecker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyspellchecker(PythonPackage): homepage = "https://github.com/barrust/pyspellchecker" pypi = "pyspellchecker/pyspellchecker-0.6.2.tar.gz" + license("MIT") + version("0.6.2", sha256="af6a1d0393a175499475a873f31e52135f1efd5fc912c979101b795b3c2ee77f") depends_on("python@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyspoa/package.py b/var/spack/repos/builtin/packages/py-pyspoa/package.py index d44390f54e866f..8a8d218743c094 100644 --- a/var/spack/repos/builtin/packages/py-pyspoa/package.py +++ b/var/spack/repos/builtin/packages/py-pyspoa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyspoa(PythonPackage): homepage = "https://github.com/nanoporetech/pyspoa" pypi = "pyspoa/pyspoa-0.0.8.tar.gz" + license("MIT") + version("0.0.8", sha256="8299d18066b498a6ef294c5a33a99266ded06eeb022f67488d2caecba974b0a4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pysqlite3/package.py b/var/spack/repos/builtin/packages/py-pysqlite3/package.py index fb92fe307ec596..c7d57dd2e35d41 100644 --- a/var/spack/repos/builtin/packages/py-pysqlite3/package.py +++ b/var/spack/repos/builtin/packages/py-pysqlite3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPysqlite3(PythonPackage): homepage = "https://github.com/coleifer/pysqlite3" pypi = "pysqlite3/pysqlite3-0.4.6.tar.gz" + license("Zlib") + version("0.4.7", sha256="0352864898aa406beb762f4a620594c950a9a4430caab679bce574065698c8ac") version("0.4.6", sha256="7ec4d4c477fa96609c1517afbc33bf02747588e528e79c695de95907cea7bf30") diff --git a/var/spack/repos/builtin/packages/py-pystac-client/package.py b/var/spack/repos/builtin/packages/py-pystac-client/package.py index 65eeda697a5475..7d657fd2217c10 100644 --- a/var/spack/repos/builtin/packages/py-pystac-client/package.py +++ b/var/spack/repos/builtin/packages/py-pystac-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPystacClient(PythonPackage): homepage = "https://github.com/stac-utils/pystac-client.git" pypi = "pystac-client/pystac-client-0.5.1.tar.gz" + license("Apache-2.0") + version("0.5.1", sha256="f585bd9bcd52ee399c8a292dbb7e0405c0da359a73bc07c1ef82a65c17124d94") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pystac/package.py b/var/spack/repos/builtin/packages/py-pystac/package.py index 6f42b57375462c..6ddba4bca1cc4a 100644 --- a/var/spack/repos/builtin/packages/py-pystac/package.py +++ b/var/spack/repos/builtin/packages/py-pystac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPystac(PythonPackage): homepage = "https://github.com/azavea/pystac.git" pypi = "pystac/pystac-0.5.4.tar.gz" + license("Apache-2.0") + version("1.4.0", sha256="6ec43e1c6bec50fbfbdede49c3ccb83ecd112072a938001b5c9c581fc2945e83") version("1.3.0", sha256="b0244641ef2a29a7b7929266b0d1eda2b0a0ef826dadb1aed93404a14e6e313b") version("1.2.0", sha256="8a60be2a30e1e28f8617a88f9f8fddc00c519be494a02ec111dc8fba62bf26e7") diff --git a/var/spack/repos/builtin/packages/py-pystache/package.py b/var/spack/repos/builtin/packages/py-pystache/package.py index 8ef58a78035f0c..5674563fecee17 100644 --- a/var/spack/repos/builtin/packages/py-pystache/package.py +++ b/var/spack/repos/builtin/packages/py-pystache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPystache(PythonPackage): git = "https://github.com/sarnold/pystache" pypi = "pystache/pystache-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="93bf92b2149a4c4b58d12142e2c4c6dd5c08d89e4c95afccd4b6efe2ee1d470d") depends_on("py-setuptools@40.8:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pystan/package.py b/var/spack/repos/builtin/packages/py-pystan/package.py index 9d7300ec7286b6..fa1f69b3079bf9 100644 --- a/var/spack/repos/builtin/packages/py-pystan/package.py +++ b/var/spack/repos/builtin/packages/py-pystan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPystan(PythonPackage): maintainers("haralmha") + license("ISC") + version("3.5.0", sha256="078571d071a5b7c0af59206d4994a0979f4ac4b61f4a720b640c44fe35514929") version("3.4.0", sha256="325e2fb0ab804555c05a603e0c9152ab11fcc3af01f3e9a9ff9fe9954b93184f") version("2.19.1.1", sha256="fa8bad8dbc0da22bbe6f36af56c9abbfcf10f92df8ce627d59a36bd8d25eb038") diff --git a/var/spack/repos/builtin/packages/py-pysurfer/package.py b/var/spack/repos/builtin/packages/py-pysurfer/package.py index df6936833ca325..32bb33da150668 100644 --- a/var/spack/repos/builtin/packages/py-pysurfer/package.py +++ b/var/spack/repos/builtin/packages/py-pysurfer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPysurfer(PythonPackage): homepage = "https://github.com/nipy/PySurfer" pypi = "pysurfer/pysurfer-0.11.0.tar.gz" + license("BSD-3-Clause") + version("0.11.0", sha256="ae709b6f933694f1810eb3c8f517bdb76c13576d74a7a5a1704e05239df0a179") variant("save_movie", default=False, description="Enable save_movie support") diff --git a/var/spack/repos/builtin/packages/py-pytailf/package.py b/var/spack/repos/builtin/packages/py-pytailf/package.py index dad239927d6d2b..16c49034a71ec2 100644 --- a/var/spack/repos/builtin/packages/py-pytailf/package.py +++ b/var/spack/repos/builtin/packages/py-pytailf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pytaridx/package.py b/var/spack/repos/builtin/packages/py-pytaridx/package.py index 032b9194080ac7..3341dae01a8e73 100644 --- a/var/spack/repos/builtin/packages/py-pytaridx/package.py +++ b/var/spack/repos/builtin/packages/py-pytaridx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPytaridx(PythonPackage): maintainers("bhatiaharsh") + license("MIT") + version("1.0.2", sha256="702c42ade13ae8688a56a8edfcd7e0e7512a489a22796c6cfdbcef677010ee47") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/py-pytecplot/package.py b/var/spack/repos/builtin/packages/py-pytecplot/package.py index 9a755a87432e2e..aec3053b56eb11 100644 --- a/var/spack/repos/builtin/packages/py-pytecplot/package.py +++ b/var/spack/repos/builtin/packages/py-pytecplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPytecplot(PythonPackage): homepage = "https://www.tecplot.com/docs/pytecplot/" pypi = "pytecplot/pytecplot-1.4.2.zip" + license("Frameworx-1.0") + version("1.4.2", sha256="586a2ee947314ddd2f28be5523911dd298465b8f6a9145ba351866d5d695ef0d") variant("extras", default=False, description="Enable extra functionality.") diff --git a/var/spack/repos/builtin/packages/py-pytesseract/package.py b/var/spack/repos/builtin/packages/py-pytesseract/package.py index 158425f4f1d496..387c6ae12214f2 100644 --- a/var/spack/repos/builtin/packages/py-pytesseract/package.py +++ b/var/spack/repos/builtin/packages/py-pytesseract/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytesseract(PythonPackage): homepage = "https://github.com/madmaze/pytesseract" pypi = "pytesseract/pytesseract-0.3.8.tar.gz" + license("Apache-2.0") + version("0.3.8", sha256="6148a01e4375760862e8f56ea718e22b5d13b281454df46ea8dac9807793fc5a") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py b/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py index e3a5b3e7fadfa8..a7de48a30e2b74 100644 --- a/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-arraydiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pytest-astropy-header/package.py b/var/spack/repos/builtin/packages/py-pytest-astropy-header/package.py index 28417e4469f02c..19aaef6edf0bdb 100644 --- a/var/spack/repos/builtin/packages/py-pytest-astropy-header/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-astropy-header/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestAstropyHeader(PythonPackage): homepage = "https://github.com/astropy/pytest-astropy-header" pypi = "pytest-astropy-header/pytest-astropy-header-0.2.2.tar.gz" + license("BSD-3-Clause") + version("0.2.2", sha256="77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10") depends_on("py-setuptools@30.3.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-astropy/package.py b/var/spack/repos/builtin/packages/py-pytest-astropy/package.py index 0b0aa69332df88..17fe676ad9196b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-astropy/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-astropy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestAstropy(PythonPackage): homepage = "https://github.com/astropy/pytest-astropy" pypi = "pytest-astropy/pytest-astropy-0.10.0.tar.gz" + license("BSD-3-Clause") + version("0.10.0", sha256="85e3c66ceede4ce668f473b3cf377fcb2aa3c48e24f28aaa377ae86004cce211") depends_on("py-setuptools@30.3:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-asyncio/package.py b/var/spack/repos/builtin/packages/py-pytest-asyncio/package.py index 779e399460d56a..2275fdf11ff736 100644 --- a/var/spack/repos/builtin/packages/py-pytest-asyncio/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-asyncio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestAsyncio(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-asyncio" pypi = "pytest-asyncio/pytest-asyncio-0.18.3.tar.gz" + license("Apache-2.0") + version("0.18.3", sha256="7659bdb0a9eb9c6e3ef992eef11a2b3e69697800ad02fb06374a210d85b29f91") version("0.9.0", sha256="fbd92c067c16111174a1286bfb253660f1e564e5146b39eeed1133315cf2c2cf") diff --git a/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py b/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py index ebcc367425df5e..5271a7bad4ba80 100644 --- a/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-benchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestBenchmark(PythonPackage): homepage = "https://github.com/ionelmc/pytest-benchmark" pypi = "pytest-benchmark/pytest-benchmark-3.2.3.tar.gz" + license("BSD-2-Clause") + version("3.2.3", sha256="ad4314d093a3089701b24c80a05121994c7765ce373478c8f4ba8d23c9ba9528") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-cache/package.py b/var/spack/repos/builtin/packages/py-pytest-cache/package.py index 2698f431125b9a..a3ad2706769460 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cache/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytestCache(PythonPackage): homepage = "https://bitbucket.org/hpk42/pytest-cache/src/default/" pypi = "pytest-cache/pytest-cache-1.0.tar.gz" + license("MIT") + version("1.0", sha256="be7468edd4d3d83f1e844959fd6e3fd28e77a481440a7118d430130ea31b07a9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-check-links/package.py b/var/spack/repos/builtin/packages/py-pytest-check-links/package.py index dd5d07d106d798..c3396c1210ffbd 100644 --- a/var/spack/repos/builtin/packages/py-pytest-check-links/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-check-links/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestCheckLinks(PythonPackage): homepage = "https://github.com/jupyterlab/pytest-check-links" pypi = "pytest-check-links/pytest_check_links-0.3.4.tar.gz" + license("BSD-3-Clause") + version("0.3.4", sha256="4b3216548431bf9796557e8ee8fd8e5e77a69a4690b3b2f9bcf6fb5af16a502b") depends_on("py-setuptools@17.1:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-cov/package.py b/var/spack/repos/builtin/packages/py-pytest-cov/package.py index 486e425a18225a..735102ebf3f27b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cov/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestCov(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-cov" pypi = "pytest-cov/pytest-cov-2.8.1.tar.gz" + license("MIT") + version("4.0.0", sha256="996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470") version("3.0.0", sha256="e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470") version("2.8.1", sha256="cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b") diff --git a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py index 45e05c5c40b2aa..a277ffc310caed 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestCpp(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-cpp" pypi = "pytest-cpp/pytest-cpp-1.4.0.tar.gz" + license("MIT") + version("1.5.0", sha256="efb7eaac30f9f61515be181d04b70d80d60ce8871426f726ef1844e2db4f3353") version("1.4.0", sha256="aa3a04fe7906e50094d1a9b8d38bc10eb59d0a8330a11a0f7a660405228b48ca") diff --git a/var/spack/repos/builtin/packages/py-pytest-datadir/package.py b/var/spack/repos/builtin/packages/py-pytest-datadir/package.py index b44a5063d5a0b4..17c3300b188a0f 100644 --- a/var/spack/repos/builtin/packages/py-pytest-datadir/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-datadir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestDatadir(PythonPackage): pypi = "pytest-datadir/pytest-datadir-1.4.1.tar.gz" maintainers("HaoZeke") + license("MIT") + version("1.4.1", sha256="9f7a3c4def6ac4cac3cc8181139ab53bd2667231052bd40cb07081748d4420f0") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py b/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py index 1ee6cb3f1b37fc..b9cfc75d89e984 100644 --- a/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-doctestplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestDoctestplus(PythonPackage): homepage = "https://github.com/astropy/pytest-doctestplus" pypi = "pytest-doctestplus/pytest-doctestplus-0.8.0.tar.gz" + license("BSD-3-Clause") + version("0.13.0", sha256="f884e2231fe5378cc8e5d1a272d19b01ebd352df0591a5add55ff50adac2d2d0") version("0.9.0", sha256="6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a") diff --git a/var/spack/repos/builtin/packages/py-pytest-fail-slow/package.py b/var/spack/repos/builtin/packages/py-pytest-fail-slow/package.py index 0e69f372e8505e..298228d7b44430 100644 --- a/var/spack/repos/builtin/packages/py-pytest-fail-slow/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-fail-slow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestFailSlow(PythonPackage): homepage = "https://github.com/jwodder/pytest-fail-slow" pypi = "pytest-fail-slow/pytest-fail-slow-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="bc022f3f4f170b7e3e7d4dff45bd9e7855e4935ae396bb40b4521ce1ef8ea41c") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-filter-subpackage/package.py b/var/spack/repos/builtin/packages/py-pytest-filter-subpackage/package.py index 6a15892dc41eee..d34d57a96f7cb8 100644 --- a/var/spack/repos/builtin/packages/py-pytest-filter-subpackage/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-filter-subpackage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestFilterSubpackage(PythonPackage): homepage = "https://github.com/astropy/pytest-filter-subpackage" pypi = "pytest-filter-subpackage/pytest-filter-subpackage-0.1.2.tar.gz" + license("BSD-3-Clause") + version("0.1.2", sha256="1faea36717803e524588d6c109d26d20d3b34422e8d6a96812758977dca01782") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py index 5cd8da9584f639..a14e37a7040860 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flake8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestFlake8(PythonPackage): homepage = "https://github.com/tholo/pytest-flake8" pypi = "pytest-flake8/pytest-flake8-0.8.1.tar.gz" + license("BSD-2-Clause") + version("0.8.1", sha256="aa10a6db147485d71dad391d4149388904c3072194d51755f64784ff128845fd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-flakes/package.py b/var/spack/repos/builtin/packages/py-pytest-flakes/package.py index f21bc5d7fdbabb..97f887cc601bfe 100644 --- a/var/spack/repos/builtin/packages/py-pytest-flakes/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-flakes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytestFlakes(PythonPackage): homepage = "https://github.com/asmeurer/pytest-flakes" pypi = "pytest-flakes/pytest-flakes-4.0.2.tar.gz" + license("MIT") + version("4.0.3", sha256="bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754") version("4.0.2", sha256="6733db47937d9689032876359e5ee0ee6926e3638546c09220e2f86b3581d4c1") diff --git a/var/spack/repos/builtin/packages/py-pytest-forked/package.py b/var/spack/repos/builtin/packages/py-pytest-forked/package.py index 214c1de9bdd8af..84f7ee9aefbb48 100644 --- a/var/spack/repos/builtin/packages/py-pytest-forked/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-forked/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestForked(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-forked" pypi = "pytest-forked/pytest-forked-1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="e2d46f319c8063a3a0536b18f9cdea6eea3bc9fe2cb16c94e1d6fad3abc37300") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-html/package.py b/var/spack/repos/builtin/packages/py-pytest-html/package.py index 3809558543ac44..afcaecf30a2c95 100644 --- a/var/spack/repos/builtin/packages/py-pytest-html/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-html/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py index dfba9dfbe37479..bbe6a5689679b4 100644 --- a/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-httpbin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestHttpbin(PythonPackage): homepage = "https://github.com/kevin1024/pytest-httpbin" pypi = "pytest-httpbin/pytest-httpbin-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="d8ce547f42423026550ed7765f6c6d50c033b43025e8592270a7abf970e19b72") version("0.2.3", sha256="c5b698dfa474ffc9caebcb35e34346b753eb226aea5c2e1b69fefedbcf161bf8") version("0.0.7", sha256="03af8a7055c8bbcb68b14d9a14c103c82c97aeb86a8f1b29cd63d83644c2f021") diff --git a/var/spack/repos/builtin/packages/py-pytest-isort/package.py b/var/spack/repos/builtin/packages/py-pytest-isort/package.py index 188d3b474161dd..f68a865384b9bc 100644 --- a/var/spack/repos/builtin/packages/py-pytest-isort/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-isort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestIsort(PythonPackage): homepage = "https://github.com/moccu/pytest-isort/" pypi = "pytest-isort/pytest-isort-0.3.1.tar.gz" + license("MIT") + version("0.3.1", sha256="4bfee60dad1870b51700d55a85f5ceda766bd9d3d2878c1bbabee80e61b1be1a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-metadata/package.py b/var/spack/repos/builtin/packages/py-pytest-metadata/package.py index ad2f8eb13e5f40..315c4e69f0b3f4 100644 --- a/var/spack/repos/builtin/packages/py-pytest-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-metadata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pytest-mock/package.py b/var/spack/repos/builtin/packages/py-pytest-mock/package.py index 667e8c20b655e1..4cf53635e2a2d9 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mock/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytestMock(PythonPackage): maintainers("thomas-bouvier") + license("MIT") + version("3.10.0", sha256="fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f") version("1.11.1", sha256="f1ab8aefe795204efe7a015900296d1719e7bf0f4a0558d71e8599da1d1309d0") version( diff --git a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py index a4ef29405ef06b..cc617297f17278 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestMypy(PythonPackage): homepage = "https://github.com/dbader/pytest-mypy" pypi = "pytest-mypy/pytest-mypy-0.4.2.tar.gz" + license("MIT") + version("0.4.2", sha256="5a5338cecff17f005b181546a13e282761754b481225df37f33d37f86ac5b304") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py b/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py index 5af5f8a1b54829..ac228ce510838d 100644 --- a/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-openfiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPytestOpenfiles(PythonPackage): homepage = "https://github.com/astropy/pytest-openfiles" pypi = "pytest-openfiles/pytest-openfiles-0.5.0.tar.gz" + license("BSD-3-Clause") + version("0.5.0", sha256="179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-parallel/package.py b/var/spack/repos/builtin/packages/py-pytest-parallel/package.py index bcba7168948b68..f5aeb9c207a53d 100644 --- a/var/spack/repos/builtin/packages/py-pytest-parallel/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-parallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestParallel(PythonPackage): homepage = "https://github.com/browsertron/pytest-parallel" pypi = "pytest-parallel/pytest-parallel-0.1.1.tar.gz" + license("MIT") + version("0.1.1", sha256="9aac3fc199a168c0a8559b60249d9eb254de7af58c12cee0310b54d4affdbfab") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-pep8/package.py b/var/spack/repos/builtin/packages/py-pytest-pep8/package.py index 68f398c6161494..c643c05b4b77ea 100644 --- a/var/spack/repos/builtin/packages/py-pytest-pep8/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-pep8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPytestPep8(PythonPackage): pypi = "pytest-pep8/pytest-pep8-1.0.6.tar.gz" + license("MIT") + version("1.0.6", sha256="032ef7e5fa3ac30f4458c73e05bb67b0f036a8a5cb418a534b3170f89f120318") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-qt/package.py b/var/spack/repos/builtin/packages/py-pytest-qt/package.py index c1d7cb721a7a27..caa3a8b2f10a75 100644 --- a/var/spack/repos/builtin/packages/py-pytest-qt/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-qt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytestQt(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-qt" pypi = "pytest-qt/pytest-qt-3.3.0.tar.gz" + license("MIT") + version("3.3.0", sha256="714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-random-order/package.py b/var/spack/repos/builtin/packages/py-pytest-random-order/package.py index 1dd5b8892aae06..6126bb837c45e9 100644 --- a/var/spack/repos/builtin/packages/py-pytest-random-order/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-random-order/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPytestRandomOrder(PythonPackage): homepage = "https://github.com/jbasko/pytest-random-order" pypi = "pytest-random-order/pytest-random-order-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="6b2159342a4c8c10855bc4fc6d65ee890fc614cb2b4ff688979b008a82a0ff52") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-remotedata/package.py b/var/spack/repos/builtin/packages/py-pytest-remotedata/package.py index dfc08e2428b6e0..25be290451851a 100644 --- a/var/spack/repos/builtin/packages/py-pytest-remotedata/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-remotedata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestRemotedata(PythonPackage): homepage = "https://github.com/astropy/pytest-remotedata" pypi = "pytest-remotedata/pytest-remotedata-0.4.0.tar.gz" + license("BSD-3-Clause") + version("0.4.0", sha256="be21c558e34d7c11b0f6aeb50956c09520bffcd02b7fce9c6f8e8531a401a1c8") depends_on("py-setuptools@30.3:", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-runner/package.py b/var/spack/repos/builtin/packages/py-pytest-runner/package.py index 6771021e993358..a33b5fcc9992ef 100644 --- a/var/spack/repos/builtin/packages/py-pytest-runner/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-runner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestRunner(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-runner" pypi = "pytest-runner/pytest-runner-5.1.tar.gz" + license("MIT") + version("6.0.0", sha256="b4d85362ed29b4c348678de797df438f0f0509497ddb8c647096c02a6d87b685") version("5.3.1", sha256="0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91") version("5.1", sha256="25a013c8d84f0ca60bb01bd11913a3bcab420f601f0f236de4423074af656e7a") diff --git a/var/spack/repos/builtin/packages/py-pytest-subprocess/package.py b/var/spack/repos/builtin/packages/py-pytest-subprocess/package.py index f825c1f8fb0b07..0752c66e536254 100644 --- a/var/spack/repos/builtin/packages/py-pytest-subprocess/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-subprocess/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPytestSubprocess(PythonPackage): maintainers("wdconinc") + license("MIT") + version("1.5.0", sha256="d7693b96f588f39b84c7b2b5c04287459246dfae6be1dd4098937a728ad4fbe3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytest-timeout/package.py b/var/spack/repos/builtin/packages/py-pytest-timeout/package.py index c352bc86ea08a1..65810daefb36a8 100644 --- a/var/spack/repos/builtin/packages/py-pytest-timeout/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-timeout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytestTimeout(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-timeout/" pypi = "pytest-timeout/pytest-timeout-1.4.2.tar.gz" + license("MIT") + version("1.4.2", sha256="20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-workflow/package.py b/var/spack/repos/builtin/packages/py-pytest-workflow/package.py index 31b0650db65fc9..8433aae3dc698b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-workflow/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-workflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPytestWorkflow(PythonPackage): homepage = "https://github.com/LUMC/pytest-workflow" pypi = "pytest-workflow/pytest-workflow-1.6.0.tar.gz" + license("AGPL-3.0-or-later") + version("1.6.0", sha256="8fb9fb31a6132c783231afbbbb92941297a42713dcd459694b5efe4a13b8cba7") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py index 3c65b2da41f5b5..ab8d175c19efff 100644 --- a/var/spack/repos/builtin/packages/py-pytest-xdist/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-xdist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytestXdist(PythonPackage): homepage = "https://github.com/pytest-dev/pytest-xdist" pypi = "pytest-xdist/pytest-xdist-3.2.0.tar.gz" + license("MIT") + version("3.2.0", sha256="fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9") version("1.30.0", sha256="5d1b1d4461518a6023d56dab62fb63670d6f7537f23e2708459a557329accf48") version("1.29.0", sha256="3489d91516d7847db5eaecff7a2e623dba68984835dbe6cedb05ae126c4fb17f") diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 5197401b4529d6..c1cee93543f96d 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytest(PythonPackage): pypi = "pytest/pytest-5.2.1.tar.gz" git = "https://github.com/pytest-dev/pytest" + license("MIT") + version("7.3.2", sha256="ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b") version("7.2.1", sha256="d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42") version("7.1.3", sha256="4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39") diff --git a/var/spack/repos/builtin/packages/py-python-benedict/package.py b/var/spack/repos/builtin/packages/py-python-benedict/package.py index 0ed5594ce27015..35dca7955dc656 100644 --- a/var/spack/repos/builtin/packages/py-python-benedict/package.py +++ b/var/spack/repos/builtin/packages/py-python-benedict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonBenedict(PythonPackage): homepage = "https://github.com/fabiocaccamo/python-benedict" pypi = "python-benedict/python-benedict-0.22.2.tar.gz" + license("MIT") + version("0.23.2", sha256="b7bdffd92ba1c9b9e044bda08ed545a48a45bd7a5207f93b4b2a8eb2660d1b4c") depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-bioformats/package.py b/var/spack/repos/builtin/packages/py-python-bioformats/package.py index 5f61cc1ef43a58..0139a94ea7fa79 100644 --- a/var/spack/repos/builtin/packages/py-python-bioformats/package.py +++ b/var/spack/repos/builtin/packages/py-python-bioformats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPythonBioformats(PythonPackage): homepage = "https://github.com/CellProfiler/python-bioformats/" pypi = "python-bioformats/python-bioformats-4.0.5.tar.gz" + license("GPL-2.0-only") + version("4.0.5", sha256="f9fa3a2b3c0f1eac6070dff6c513444e9fde9a1f794ec4c21fca85833dbb5192") version("4.0.0", sha256="9a952de4d326d961af0a497753a4b71b2f7844605023d170c931d3624e036506") diff --git a/var/spack/repos/builtin/packages/py-python-box/package.py b/var/spack/repos/builtin/packages/py-python-box/package.py index 064bc678bc8a8b..948ea2a2ebc1df 100644 --- a/var/spack/repos/builtin/packages/py-python-box/package.py +++ b/var/spack/repos/builtin/packages/py-python-box/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPythonBox(PythonPackage): homepage = "https://github.com/cdgriffith/Box" pypi = "python-box/python-box-5.3.0.tar.gz" + license("MIT") + version("5.3.0", sha256="4ed4ef5d34de505a65c01e3f1911de8cdb29484fcae0c035141dce535c6c194a") variant("extras", default=False, description='install the "extras" packages') diff --git a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py index 76897d76cda768..42240715f7001c 100644 --- a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py +++ b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonCertifiWin32(PythonPackage): homepage = "https://gitlab.com/alelec/python-certifi-win32" git = "https://gitlab.com/alelec/python-certifi-win32.git" + license("BSD-2-Clause") + # Tarball missing version information, need to use git checkout version("1.6", tag="v1.6", commit="8ef45c73e203024ed2e1df5151a23e27faff5b60") diff --git a/var/spack/repos/builtin/packages/py-python-constraint/package.py b/var/spack/repos/builtin/packages/py-python-constraint/package.py index 12b36b3e003656..c979aa516deb8d 100644 --- a/var/spack/repos/builtin/packages/py-python-constraint/package.py +++ b/var/spack/repos/builtin/packages/py-python-constraint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-crfsuite/package.py b/var/spack/repos/builtin/packages/py-python-crfsuite/package.py index d58a3c4773ff52..6c8fd4fd69ac18 100644 --- a/var/spack/repos/builtin/packages/py-python-crfsuite/package.py +++ b/var/spack/repos/builtin/packages/py-python-crfsuite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonCrfsuite(PythonPackage): homepage = "https://github.com/scrapinghub/python-crfsuite" pypi = "python-crfsuite/python-crfsuite-0.9.7.tar.gz" + license("MIT") + version("0.9.7", sha256="3b4538d2ce5007e4e42005818247bf43ade89ef08a66d158462e2f7c5d63cee7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py index 9ceb6eda306d3f..32b058f0940064 100644 --- a/var/spack/repos/builtin/packages/py-python-daemon/package.py +++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyPythonDaemon(PythonPackage): pypi = "python-daemon/python-daemon-2.0.5.tar.gz" + license("GPL-3.0-or-later") + version("2.3.1", sha256="15c2c5e2cef563e0a5f98d542b77ba59337380b472975d2b2fd6b8c4d5cf46ca") version("2.3.0", sha256="bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf") version("2.0.5", sha256="afde4fa433d94d007206ee31a0941d55b5eb232a5422b670aad628547b46bf68") diff --git a/var/spack/repos/builtin/packages/py-python-dateutil/package.py b/var/spack/repos/builtin/packages/py-python-dateutil/package.py index ca5f5cd690cab6..40e43177a77650 100644 --- a/var/spack/repos/builtin/packages/py-python-dateutil/package.py +++ b/var/spack/repos/builtin/packages/py-python-dateutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonDateutil(PythonPackage): homepage = "https://dateutil.readthedocs.io/" pypi = "python-dateutil/python-dateutil-2.8.0.tar.gz" + license("Apache-2.0") + version("2.8.2", sha256="0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86") version("2.8.1", sha256="73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c") version("2.8.0", sha256="c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e") diff --git a/var/spack/repos/builtin/packages/py-python-deprecated/package.py b/var/spack/repos/builtin/packages/py-python-deprecated/package.py new file mode 100644 index 00000000000000..3af97f84c139d1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-python-deprecated/package.py @@ -0,0 +1,19 @@ +# 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 PyPythonDeprecated(PythonPackage): + """Python @deprecated decorator to deprecate old python classes, functions or methods.""" + + homepage = "https://github.com/vrcmarcos/python-deprecated" + pypi = "Python-Deprecated/Python-Deprecated-1.1.0.tar.gz" + + maintainers("Pandapip1") + + version("1.1.0", sha256="a242b3c1721f97912330b12cd5529abfa5b3876084a6c60a2c683a87d4b0dd6f") + + depends_on("py-setuptools", type=("build",)) diff --git a/var/spack/repos/builtin/packages/py-python-docs-theme/package.py b/var/spack/repos/builtin/packages/py-python-docs-theme/package.py index 9c26674e183376..57c196616f58fc 100644 --- a/var/spack/repos/builtin/packages/py-python-docs-theme/package.py +++ b/var/spack/repos/builtin/packages/py-python-docs-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonDocsTheme(PythonPackage): homepage = "https://docs.python.org/3/" pypi = "python-docs-theme/python-docs-theme-2018.7.tar.gz" + license("PSF-2.0") + version("2020.1", sha256="29c33ba393bdb9377910116a0c1cc329573a4e040227c58a3293d27928d8262a") version("2018.7", sha256="018a5bf2a7318c9c9a8346303dac8afc6bc212d92e86561c9b95a3372714155a") diff --git a/var/spack/repos/builtin/packages/py-python-dotenv/package.py b/var/spack/repos/builtin/packages/py-python-dotenv/package.py index 1bf589ac4fd5cf..a9e8d5e8cbbf1d 100644 --- a/var/spack/repos/builtin/packages/py-python-dotenv/package.py +++ b/var/spack/repos/builtin/packages/py-python-dotenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPythonDotenv(PythonPackage): maintainers("jcpunk") + license("BSD-3-Clause") + version("0.19.2", sha256="a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f") variant("cli", default=False, description="Add commandline tools") diff --git a/var/spack/repos/builtin/packages/py-python-editor/package.py b/var/spack/repos/builtin/packages/py-python-editor/package.py index d624a1ecde58fb..a525dc430580a8 100644 --- a/var/spack/repos/builtin/packages/py-python-editor/package.py +++ b/var/spack/repos/builtin/packages/py-python-editor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonEditor(PythonPackage): pypi = "python-editor/python-editor-1.0.4.tar.gz" + license("Apache-2.0") + version("1.0.4", sha256="51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b") depends_on("python@2.7.0:2.7,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-engineio/package.py b/var/spack/repos/builtin/packages/py-python-engineio/package.py index 2bed1db7211afb..c893f0a077b421 100644 --- a/var/spack/repos/builtin/packages/py-python-engineio/package.py +++ b/var/spack/repos/builtin/packages/py-python-engineio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-fmask/package.py b/var/spack/repos/builtin/packages/py-python-fmask/package.py index 08a32be346a532..d2a931c858d583 100644 --- a/var/spack/repos/builtin/packages/py-python-fmask/package.py +++ b/var/spack/repos/builtin/packages/py-python-fmask/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonFmask(PythonPackage): homepage = "https://www.pythonfmask.org/en/latest/" url = "https://github.com/ubarsc/python-fmask/releases/download/pythonfmask-0.5.8/python-fmask-0.5.8.tar.gz" + license("GPL-3.0-only") + version("0.5.8", sha256="d55f54d3fecde818374017fdbe0ad173c893ef74c79ba2a7bc1890b7ec416c2f") version("0.5.7", sha256="da9dad1b977a50599d068dedaed007100b20322a79ca5d78f702712647c2c3f3") version("0.5.6", sha256="a63abd12d36fb4ec010e618bcabd5e2f782a0479ebcbf40aec1bcef943c00c5c") diff --git a/var/spack/repos/builtin/packages/py-python-fsutil/package.py b/var/spack/repos/builtin/packages/py-python-fsutil/package.py index 65a649ac7556f7..e14767fd4d01e3 100644 --- a/var/spack/repos/builtin/packages/py-python-fsutil/package.py +++ b/var/spack/repos/builtin/packages/py-python-fsutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonFsutil(PythonPackage): homepage = "https://github.com/fabiocaccamo/python-fsutil" pypi = "python-fsutil/python-fsutil-0.4.0.tar.gz" + license("MIT") + version("0.4.0", sha256="873eceb11fb488fc2d7675cd1bc74a743502f674f0be88f5e7b920c7baeefed6") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-gitlab/package.py b/var/spack/repos/builtin/packages/py-python-gitlab/package.py index ecd1de015ce8fd..15e24bb9a3568e 100644 --- a/var/spack/repos/builtin/packages/py-python-gitlab/package.py +++ b/var/spack/repos/builtin/packages/py-python-gitlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonGitlab(PythonPackage): homepage = "https://github.com/gpocentek/python-gitlab" pypi = "python-gitlab/python-gitlab-0.19.tar.gz" + license("LGPL-3.0-or-later") + version("3.15.0", sha256="c9e65eb7612a9fbb8abf0339972eca7fd7a73d4da66c9b446ffe528930aff534") version("3.9.0", sha256="5fc5e88f81f366e11851cb8b4b9a5b827491ce20ba7585446b74c9b097726ba3") version("2.10.1", sha256="7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f") diff --git a/var/spack/repos/builtin/packages/py-python-hostlist/package.py b/var/spack/repos/builtin/packages/py-python-hostlist/package.py index 3cd58dd7810a6d..7c58d4932d2e14 100644 --- a/var/spack/repos/builtin/packages/py-python-hostlist/package.py +++ b/var/spack/repos/builtin/packages/py-python-hostlist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonHostlist(PythonPackage): pypi = "python-hostlist/python-hostlist-1.23.0.tar.gz" git = "git://www.nsc.liu.se/~kent/python-hostlist.git" + license("GPL-2.0-only") + version("master", branch="master") version("1.23.0", sha256="56e0156b501f792c078114f07324f34f37827041581ee5d1ffdce89cca533219") diff --git a/var/spack/repos/builtin/packages/py-python-igraph/package.py b/var/spack/repos/builtin/packages/py-python-igraph/package.py index 71180cc46caf66..8a99a90dc3c170 100644 --- a/var/spack/repos/builtin/packages/py-python-igraph/package.py +++ b/var/spack/repos/builtin/packages/py-python-igraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonIgraph(PythonPackage): homepage = "https://igraph.org/" url = "https://igraph.org/nightly/get/python/python-igraph-0.7.0.tar.gz" + license("GPL-2.0-or-later") + version("0.7.0", sha256="64ac270e80a92066d489407be1900a329df8e26844430f941ecc88771188c471") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-javabridge/package.py b/var/spack/repos/builtin/packages/py-python-javabridge/package.py index 7b1b965ed17d2a..172ceb9eb5ef55 100644 --- a/var/spack/repos/builtin/packages/py-python-javabridge/package.py +++ b/var/spack/repos/builtin/packages/py-python-javabridge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-jenkins/package.py b/var/spack/repos/builtin/packages/py-python-jenkins/package.py index f9b02921ea4385..599f056f0f1d09 100644 --- a/var/spack/repos/builtin/packages/py-python-jenkins/package.py +++ b/var/spack/repos/builtin/packages/py-python-jenkins/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-jose/package.py b/var/spack/repos/builtin/packages/py-python-jose/package.py index 2a3905ae54d42f..f418761f49532a 100644 --- a/var/spack/repos/builtin/packages/py-python-jose/package.py +++ b/var/spack/repos/builtin/packages/py-python-jose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonJose(PythonPackage): homepage = "http://github.com/mpdavis/python-jose" pypi = "python-jose/python-jose-3.3.0.tar.gz" + license("MIT") + version("3.3.0", sha256="55779b5e6ad599c6336191246e95eb2293a9ddebd555f796a65f838f07e5d78a") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-json-logger/package.py b/var/spack/repos/builtin/packages/py-python-json-logger/package.py index 98227b1fddd016..e5ce437c83c225 100644 --- a/var/spack/repos/builtin/packages/py-python-json-logger/package.py +++ b/var/spack/repos/builtin/packages/py-python-json-logger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonJsonLogger(PythonPackage): homepage = "https://github.com/madzak/python-json-logger" pypi = "python-json-logger/python-json-logger-0.1.11.tar.gz" + license("BSD-2-Clause") + version("2.0.7", sha256="23e7ec02d34237c5aa1e29a070193a4ea87583bb4e7f8fd06d3de8264c4b2e1c") version("0.1.11", sha256="b7a31162f2a01965a5efb94453ce69230ed208468b0bbc7fdfc56e6d8df2e281") diff --git a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py index f5f602d58acfc4..975b1ef4519e71 100644 --- a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-ldap/package.py b/var/spack/repos/builtin/packages/py-python-ldap/package.py index 3573433a8ffe2f..a5e675e069f396 100644 --- a/var/spack/repos/builtin/packages/py-python-ldap/package.py +++ b/var/spack/repos/builtin/packages/py-python-ldap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPythonLdap(PythonPackage): homepage = "https://www.python-ldap.org/en/python-ldap-3.2.0/" pypi = "python-ldap/python-ldap-3.2.0.tar.gz" + license("MIT") + version("3.4.2", sha256="b16470a0983aaf09a00ffb8f40b69a2446f3d0be639a229256bce381fcb268f7") version("3.4.0", sha256="60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12") version("3.3.1", sha256="4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5") diff --git a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py index 348e669b743cbb..db5641154d863c 100644 --- a/var/spack/repos/builtin/packages/py-python-levenshtein/package.py +++ b/var/spack/repos/builtin/packages/py-python-levenshtein/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonLevenshtein(PythonPackage): homepage = "https://github.com/ztane/python-Levenshtein" pypi = "python-Levenshtein/python-Levenshtein-0.12.0.tar.gz" + license("GPL-2.0-or-later") + version("0.12.0", sha256="033a11de5e3d19ea25c9302d11224e1a1898fe5abd23c61c7c360c25195e3eb1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-libsbml/package.py b/var/spack/repos/builtin/packages/py-python-libsbml/package.py index 0c30d1632f8bb9..44ccf7db162904 100644 --- a/var/spack/repos/builtin/packages/py-python-libsbml/package.py +++ b/var/spack/repos/builtin/packages/py-python-libsbml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-logstash/package.py b/var/spack/repos/builtin/packages/py-python-logstash/package.py index c28dd75b8b10cc..b74af66b736f04 100644 --- a/var/spack/repos/builtin/packages/py-python-logstash/package.py +++ b/var/spack/repos/builtin/packages/py-python-logstash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonLogstash(PythonPackage): homepage = "https://github.com/vklochan/python-logstash" pypi = "python-logstash/python-logstash-0.4.6.tar.gz" + license("MIT") + version("0.4.6", sha256="10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-python-louvain/package.py b/var/spack/repos/builtin/packages/py-python-louvain/package.py index 602fb7fd6dca65..7fad9a06439c77 100644 --- a/var/spack/repos/builtin/packages/py-python-louvain/package.py +++ b/var/spack/repos/builtin/packages/py-python-louvain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPythonLouvain(PythonPackage): homepage = "https://github.com/taynaud/python-louvain" pypi = "python-louvain/python-louvain-0.14.tar.gz" + license("BSD-3-Clause") + version("0.15", sha256="2a856edfbe29952a60a5538a84bb78cca18f6884a88b9325e85a11c8dd4917eb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py b/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py index 144ae6b687dab3..9c507d367d5050 100644 --- a/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py +++ b/var/spack/repos/builtin/packages/py-python-lsp-jsonrpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPythonLspJsonrpc(PythonPackage): maintainers("alecbcs") + license("MIT") + version("1.0.0", sha256="7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-lsp-server/package.py b/var/spack/repos/builtin/packages/py-python-lsp-server/package.py index 40b942f357ff3f..1292ae77fe944a 100644 --- a/var/spack/repos/builtin/packages/py-python-lsp-server/package.py +++ b/var/spack/repos/builtin/packages/py-python-lsp-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPythonLspServer(PythonPackage): maintainers("alecbcs") + license("MIT") + version("1.7.1", sha256="67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6") version("1.7.0", sha256="401ce78ea2e98cadd02d94962eb32c92879caabc8055b9a2f36d7ef44acc5435") version("1.6.0", sha256="d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b") diff --git a/var/spack/repos/builtin/packages/py-python-lzo/package.py b/var/spack/repos/builtin/packages/py-python-lzo/package.py index 6c35665abd2bd3..4b0c83fa670e34 100644 --- a/var/spack/repos/builtin/packages/py-python-lzo/package.py +++ b/var/spack/repos/builtin/packages/py-python-lzo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonLzo(PythonPackage): homepage = "https://github.com/jd-boyd/python-lzo" pypi = "python-lzo/python-lzo-1.12.tar.gz" + license("GPL-2.0-only") + version("1.15", sha256="a57aaa00c5c3a0515dd9f7426ba2cf601767dc19dc023d8b99d4a13b0a327b49") version("1.12", sha256="97a8e46825e8f1abd84c2a3372bc09adae9745a5be5d3af2692cd850dac35345") diff --git a/var/spack/repos/builtin/packages/py-python-magic/package.py b/var/spack/repos/builtin/packages/py-python-magic/package.py index 08ef9df38fbaad..71a6fb25f238b5 100644 --- a/var/spack/repos/builtin/packages/py-python-magic/package.py +++ b/var/spack/repos/builtin/packages/py-python-magic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPythonMagic(PythonPackage): homepage = "https://github.com/ahupp/python-magic" pypi = "python-magic/python-magic-0.4.15.tar.gz" + license("MIT") + version("0.4.24", sha256="de800df9fb50f8ec5974761054a708af6e4246b03b4bdaee993f948947b0ebcf") version("0.4.15", sha256="f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5") diff --git a/var/spack/repos/builtin/packages/py-python-mapnik/package.py b/var/spack/repos/builtin/packages/py-python-mapnik/package.py index e7e4cec77c2817..199f20295bae34 100644 --- a/var/spack/repos/builtin/packages/py-python-mapnik/package.py +++ b/var/spack/repos/builtin/packages/py-python-mapnik/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPythonMapnik(PythonPackage): homepage = "https://github.com/mapnik/python-mapnik" url = "https://github.com/mapnik/python-mapnik/archive/v3.0.16.tar.gz" + license("LGPL-2.1-or-later") + version("3.0.16", sha256="643117752fa09668a1e26a360d13cd137329ae2013eb14ad92ab72fbc479fc70") version("3.0.13", sha256="ced684745e778c0cac0edba89c09c6f9b9f1db18fc12744ed4710a88b78a3389") diff --git a/var/spack/repos/builtin/packages/py-python-markdown-math/package.py b/var/spack/repos/builtin/packages/py-python-markdown-math/package.py index a63be65341ff66..4de5345694e7b8 100644 --- a/var/spack/repos/builtin/packages/py-python-markdown-math/package.py +++ b/var/spack/repos/builtin/packages/py-python-markdown-math/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonMarkdownMath(PythonPackage): maintainers("wscullin") + license("BSD-3-Clause") + version("0.8", sha256="8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-memcached/package.py b/var/spack/repos/builtin/packages/py-python-memcached/package.py index 71d7f61b265b41..cae4e2d80069ca 100644 --- a/var/spack/repos/builtin/packages/py-python-memcached/package.py +++ b/var/spack/repos/builtin/packages/py-python-memcached/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-multipart/package.py b/var/spack/repos/builtin/packages/py-python-multipart/package.py index 9feae780ab159f..0af95b14b7f1af 100644 --- a/var/spack/repos/builtin/packages/py-python-multipart/package.py +++ b/var/spack/repos/builtin/packages/py-python-multipart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPythonMultipart(PythonPackage): homepage = "https://github.com/andrew-d/python-multipart" pypi = "python-multipart/python-multipart-0.0.5.tar.gz" + license("Apache-2.0") + version("0.0.5", sha256="f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-oauth2/package.py b/var/spack/repos/builtin/packages/py-python-oauth2/package.py index 68ef7e6f48cafb..c06675aa341a26 100644 --- a/var/spack/repos/builtin/packages/py-python-oauth2/package.py +++ b/var/spack/repos/builtin/packages/py-python-oauth2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-picard/package.py b/var/spack/repos/builtin/packages/py-python-picard/package.py index c7b1516374148d..9f181a80b23901 100644 --- a/var/spack/repos/builtin/packages/py-python-picard/package.py +++ b/var/spack/repos/builtin/packages/py-python-picard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonPicard(PythonPackage): homepage = "https://pierreablin.github.io/picard/" pypi = "python-picard/python-picard-0.6.tar.gz" + license("BSD-3-Clause") + version("0.6", sha256="dad377c9a50f9850f85841eba0ffb58ad557885ca93364bb73153f33210b52e2") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-pptx/package.py b/var/spack/repos/builtin/packages/py-python-pptx/package.py new file mode 100644 index 00000000000000..fa83144501b468 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-python-pptx/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPythonPptx(PythonPackage): + """Generate and manipulate Open XML PowerPoint (.pptx) files.""" + + homepage = "http://github.com/scanny/python-pptx" + pypi = "python-pptx/python-pptx-0.6.21.tar.gz" + + maintainers("LydDeb") + + license("MIT") + + version("0.6.23", sha256="587497ff28e779ab18dbb074f6d4052893c85dedc95ed75df319364f331fedee") + version("0.6.21", sha256="7798a2aaf89563565b3c7120c0acfe9aff775db0db3580544e3bf4840c2e378f") + + depends_on("py-setuptools", type="build") + depends_on("py-lxml@3.1.0:", type=("build", "run")) + depends_on("pil@3.3.2:", type=("build", "run")) + depends_on("py-xlsxwriter@0.5.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-ptrace/package.py b/var/spack/repos/builtin/packages/py-python-ptrace/package.py index 5f7311fce6fb4c..5f9260bb27fcb3 100644 --- a/var/spack/repos/builtin/packages/py-python-ptrace/package.py +++ b/var/spack/repos/builtin/packages/py-python-ptrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonPtrace(PythonPackage): pypi = "python-ptrace/python-ptrace-0.9.8.tar.gz" + license("GPL-2.0-only") + version("0.9.8", sha256="1e3bc6223f626aaacde8a7979732691c11b13012e702fee9ae16c87f71633eaa") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-rapidjson/package.py b/var/spack/repos/builtin/packages/py-python-rapidjson/package.py index ea2a0ae3209ec7..0925652e6032e3 100644 --- a/var/spack/repos/builtin/packages/py-python-rapidjson/package.py +++ b/var/spack/repos/builtin/packages/py-python-rapidjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonRapidjson(PythonPackage): homepage = "https://github.com/python-rapidjson/python-rapidjson" pypi = "python-rapidjson/python-rapidjson-0.9.1.tar.gz" + license("MIT") + version("1.10", sha256="acfecbf5edb91ec72a20a125de7f56b8c2f6161eff4c65382c8ee6a2484d3540") version("1.9", sha256="be7d351c7112dac608133a23f60e95395668d0981a07f4037f63e0e88afcf01a") version("1.8", sha256="170c2ff97d01735f67afd0e1cb0aaa690cb69ae6016e020c6afd5e0ab9b39899") diff --git a/var/spack/repos/builtin/packages/py-python-slugify/package.py b/var/spack/repos/builtin/packages/py-python-slugify/package.py index a61f879b40d254..442d918a6da43a 100644 --- a/var/spack/repos/builtin/packages/py-python-slugify/package.py +++ b/var/spack/repos/builtin/packages/py-python-slugify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonSlugify(PythonPackage): homepage = "https://github.com/un33k/python-slugify" pypi = "python-slugify/python-slugify-4.0.0.tar.gz" + license("MIT") + version("4.0.0", sha256="a8fc3433821140e8f409a9831d13ae5deccd0b033d4744d94b31fea141bdd84c") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-socketio/package.py b/var/spack/repos/builtin/packages/py-python-socketio/package.py index 8e55b49378b97e..0fe8ab95162096 100644 --- a/var/spack/repos/builtin/packages/py-python-socketio/package.py +++ b/var/spack/repos/builtin/packages/py-python-socketio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-sotools/package.py b/var/spack/repos/builtin/packages/py-python-sotools/package.py index 3dac633affdfb3..1ac4b3f548b94a 100644 --- a/var/spack/repos/builtin/packages/py-python-sotools/package.py +++ b/var/spack/repos/builtin/packages/py-python-sotools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyPythonSotools(PythonPackage): pypi = "python-sotools/python-sotools-0.1.0.tar.gz" + license("BSD-3-Clause") + version("0.1.0", sha256="39a088f2ca384294e19a96a82d883feb729f0f2e5ae21d9785be357124ec61f2") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-subunit/package.py b/var/spack/repos/builtin/packages/py-python-subunit/package.py index 7c81ba1624f61d..9bcfcf58b0d54a 100644 --- a/var/spack/repos/builtin/packages/py-python-subunit/package.py +++ b/var/spack/repos/builtin/packages/py-python-subunit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonSubunit(PythonPackage): homepage = "https://launchpad.net/subunit" pypi = "python-subunit/python-subunit-1.3.0.tar.gz" + license("MIT") + version("1.3.0", sha256="9607edbee4c1e5a30ff88549ce8d9feb0b9bcbcb5e55033a9d76e86075465cbb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py index ae4f445ee062a0..f596a79460fa2e 100644 --- a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-python-utils/package.py b/var/spack/repos/builtin/packages/py-python-utils/package.py index cc4331040ca924..08643f5f23a0ad 100644 --- a/var/spack/repos/builtin/packages/py-python-utils/package.py +++ b/var/spack/repos/builtin/packages/py-python-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,11 +14,14 @@ class PyPythonUtils(PythonPackage): homepage = "https://github.com/WoLpH/python-utils" pypi = "python-utils/python-utils-2.4.0.tar.gz" + license("BSD-3-Clause") + version("3.5.2", sha256="68198854fc276bc4b2403b261703c218e01ef564dcb072a7096ed9ea7aa5130c") + version("2.7.1", sha256="88595bfa054975534a2f813b6c8deb96b44f3b6fad00a927fd062fe65550fadf") version("2.4.0", sha256="f21fc09ff58ea5ebd1fd2e8ef7f63e39d456336900f26bdc9334a03a3f7d8089") version("2.3.0", sha256="34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3") depends_on("py-setuptools", type="build") - depends_on("py-six", when="@:2.4.0", type=("build", "run")) + depends_on("py-six", when="@:2.7.1", type=("build", "run")) depends_on("py-typing-extensions", when="@3.5.2 ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-xlib/package.py b/var/spack/repos/builtin/packages/py-python-xlib/package.py index e8fa77da8e1db4..4e836d14db4b4c 100644 --- a/var/spack/repos/builtin/packages/py-python-xlib/package.py +++ b/var/spack/repos/builtin/packages/py-python-xlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPythonXlib(PythonPackage): homepage = "https://github.com/python-xlib/python-xlib" pypi = "python-xlib/python-xlib-0.30.tar.gz" + license("LGPL-2.1-or-later") + version("0.30", sha256="74131418faf9e7b83178c71d9d80297fbbd678abe99ae9258f5a20cd027acb5f") depends_on("python@2.7,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py b/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py index 1c0eaff662422c..2c98a71fa40313 100644 --- a/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-python-xmp-toolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonXmpToolkit(PythonPackage): homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit" pypi = "python-xmp-toolkit/python-xmp-toolkit-2.0.1.tar.gz" + license("BSD-3-Clause") + version("2.0.1", sha256="f8d912946ff9fd46ed5c7c355aa5d4ea193328b3f200909ef32d9a28a1419a38") depends_on("python@2.6:2.7,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python3-openid/package.py b/var/spack/repos/builtin/packages/py-python3-openid/package.py index fb4587099a39d6..b3e676ac3ec1a5 100644 --- a/var/spack/repos/builtin/packages/py-python3-openid/package.py +++ b/var/spack/repos/builtin/packages/py-python3-openid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPython3Openid(PythonPackage): homepage = "https://github.com/necaris/python3-openid" pypi = "python3-openid/python3-openid-3.2.0.tar.gz" + license("Apache-2.0") + version("3.2.0", sha256="33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-python3-xlib/package.py b/var/spack/repos/builtin/packages/py-python3-xlib/package.py index 7e6f67ba0b7b6c..b69dff34ce1914 100644 --- a/var/spack/repos/builtin/packages/py-python3-xlib/package.py +++ b/var/spack/repos/builtin/packages/py-python3-xlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pythonqwt/package.py b/var/spack/repos/builtin/packages/py-pythonqwt/package.py index 794eeec1a5b0ef..bdabaaf2bb8b2a 100644 --- a/var/spack/repos/builtin/packages/py-pythonqwt/package.py +++ b/var/spack/repos/builtin/packages/py-pythonqwt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonqwt(PythonPackage): homepage = "https://github.com/PierreRaybaut/PythonQwt" pypi = "PythonQwt/PythonQwt-0.5.5.zip" + license("LGPL-2.1-or-later") + version("0.5.5", sha256="1f13cc8b555a57f8fe0f806d6c2f6d847050e4d837649503932b81316d12788a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pythonsollya/package.py b/var/spack/repos/builtin/packages/py-pythonsollya/package.py index f55e61e26c95b3..84a715c8d106f9 100644 --- a/var/spack/repos/builtin/packages/py-pythonsollya/package.py +++ b/var/spack/repos/builtin/packages/py-pythonsollya/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPythonsollya(PythonPackage): homepage = "Python wrapper for the Sollya library" url = "https://gitlab.com/metalibm-dev/pythonsollya/-/archive/release-0.4.0-alpha0/pythonsollya-release-0.4.0-alpha0.tar.gz" + license("CECILL-2.1") + version( "0.4.0-alpha0", sha256="faac899744c92b1d20980cadef309cd5610d79722322e97940ff142c207c41b5" ) diff --git a/var/spack/repos/builtin/packages/py-pythran/package.py b/var/spack/repos/builtin/packages/py-pythran/package.py index 31a62f41171c43..12e40a2406d120 100644 --- a/var/spack/repos/builtin/packages/py-pythran/package.py +++ b/var/spack/repos/builtin/packages/py-pythran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPythran(PythonPackage): homepage = "https://github.com/serge-sans-paille/pythran" pypi = "pythran/pythran-0.9.11.tar.gz" + license("BSD-3-Clause") + version("0.12.2", sha256="2344c7ad76255f31f79d87877cc6bb8bddc5e5593015dae29b3f821c6c06a627") version("0.12.1", sha256="702c2701187cfb38f66c0c20cc85d04d0e156d260a8d92892da65947faa5360e") version("0.12.0", sha256="eff3dd0d3eebe57372f0d14f82985525e9bcdfb5b1d1010e1932cf9207060f9f") diff --git a/var/spack/repos/builtin/packages/py-pytimeparse/package.py b/var/spack/repos/builtin/packages/py-pytimeparse/package.py index fd633cd6f5254d..aa9f92587f1326 100644 --- a/var/spack/repos/builtin/packages/py-pytimeparse/package.py +++ b/var/spack/repos/builtin/packages/py-pytimeparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytimeparse(PythonPackage): homepage = "https://github.com/wroberts/pytimeparse" pypi = "pytimeparse/pytimeparse-1.1.8.tar.gz" + license("MIT") + version("1.1.8", sha256="e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytng/package.py b/var/spack/repos/builtin/packages/py-pytng/package.py index f7108cacef5e16..d499861c064691 100644 --- a/var/spack/repos/builtin/packages/py-pytng/package.py +++ b/var/spack/repos/builtin/packages/py-pytng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPytng(PythonPackage): maintainers("RMeli") + license("BSD-3-Clause") + version("0.3.0", sha256="f563f9ea260ca8c8e17b3bcf9458bae35aedd5c58e1c5ac4dfff77a1e036506e") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytoml/package.py b/var/spack/repos/builtin/packages/py-pytoml/package.py index 5bff2c23245615..1fc1c7f166a81e 100644 --- a/var/spack/repos/builtin/packages/py-pytoml/package.py +++ b/var/spack/repos/builtin/packages/py-pytoml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytoml(PythonPackage): homepage = "https://github.com/avakar/pytoml" pypi = "pytoml/pytoml-0.1.21.tar.gz" + license("MIT") + version("0.1.21", sha256="8eecf7c8d0adcff3b375b09fe403407aa9b645c499e5ab8cac670ac4a35f61e7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytools/package.py b/var/spack/repos/builtin/packages/py-pytools/package.py index 3373708ea5f8b1..cb81e055f7b7a2 100644 --- a/var/spack/repos/builtin/packages/py-pytools/package.py +++ b/var/spack/repos/builtin/packages/py-pytools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytools(PythonPackage): homepage = "https://github.com/inducer/pytools" pypi = "pytools/pytools-2019.1.1.tar.gz" + license("MIT") + version("2022.1.14", sha256="41017371610bb2a03685597c5285205e6597c7f177383d95c8b871244b12c14e") version("2022.1.12", sha256="4d62875e9a2ab2a24e393a9a8b799492f1a721bffa840af3807bfd42871dd1f4") version("2021.2.9", sha256="db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755") diff --git a/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py b/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py index 89992431d27d39..2ce75baa2a6b1a 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-gradual-warmup-lr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPytorchGradualWarmupLr(PythonPackage): homepage = "https://github.com/ildoonet/pytorch-gradual-warmup-lr" url = "https://github.com/ildoonet/pytorch-gradual-warmup-lr/archive/v0.3.2.tar.gz" + license("MIT") + version("0.3.2", sha256="3ff3ccd0f5130a3c2ffe3bf7e43e7f85d599e0de3ccb42a1704809222e069a18") version("0.3.1", sha256="3070c7999dc8b6322089ed6a7fc375e1ef2661524097bf461016013b21177819") version("0.3", sha256="a4a6066461ec5a00e49bb3afa956f9135684b46006f0dcb46f39a19b57d49acb") diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py index e997b324a6af05..de9c0bcb190748 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPytorchLightning(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("2.0.0", sha256="632dec9af8036f726904e691c505d7650658ef0f4054a062c9e6a940ca09dfd8") version("1.9.4", sha256="188a7f4468acf23512e7f4903253d86fc7929a49f0c09d699872e364162001e8") version("1.9.3", sha256="479164caea190d49ee2a218eef7e001888be56db912b417639b047e8f9ca8a07") diff --git a/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py index 1d56df208983e1..4c592d8c9d84f6 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-sphinx-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyts/package.py b/var/spack/repos/builtin/packages/py-pyts/package.py index c3dfe54ed5f918..f76fde9597045b 100644 --- a/var/spack/repos/builtin/packages/py-pyts/package.py +++ b/var/spack/repos/builtin/packages/py-pyts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyPyts(PythonPackage): homepage = "https://github.com/johannfaouzi/pyts" pypi = "pyts/pyts-0.12.0.tar.gz" + license("BSD-3-Clause") + version("0.12.0", sha256="af85e09a14334cbe384318de6ca4379e9a30bf5bbd1aaf3a1c4a94872e9765b1") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytweening/package.py b/var/spack/repos/builtin/packages/py-pytweening/package.py index 962ba93d096d7f..da2d6b77d54838 100644 --- a/var/spack/repos/builtin/packages/py-pytweening/package.py +++ b/var/spack/repos/builtin/packages/py-pytweening/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytweening(PythonPackage): homepage = "https://github.com/asweigart/pytweening" pypi = "PyTweening/PyTweening-1.0.3.zip" + license("MIT") + version("1.0.3", sha256="4b608a570f4dccf2201e898f643c2a12372eb1d71a3dbc7e778771b603ca248b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pytz/package.py b/var/spack/repos/builtin/packages/py-pytz/package.py index 5820ee00307a51..952e8347f00475 100644 --- a/var/spack/repos/builtin/packages/py-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-pytz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPytz(PythonPackage): pypi = "pytz/pytz-2019.3.tar.gz" git = "https://github.com/stub42/pytz.git" + license("MIT") + version("2023.3", sha256="1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588") version("2022.2.1", sha256="cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5") version("2021.3", sha256="acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326") diff --git a/var/spack/repos/builtin/packages/py-pyu2f/package.py b/var/spack/repos/builtin/packages/py-pyu2f/package.py index 84006032fef55d..c51388c2572982 100644 --- a/var/spack/repos/builtin/packages/py-pyu2f/package.py +++ b/var/spack/repos/builtin/packages/py-pyu2f/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyu2f(PythonPackage): homepage = "https://github.com/google/pyu2f" pypi = "pyu2f/pyu2f-0.1.5.tar.gz" + license("Apache-2.0") + version("0.1.5", sha256="a3caa3a11842fc7d5746376f37195e6af5f17c0a15737538bb1cebf656fb306b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyudev/package.py b/var/spack/repos/builtin/packages/py-pyudev/package.py index 3df5c541c51a81..d9c9a9804b519e 100644 --- a/var/spack/repos/builtin/packages/py-pyudev/package.py +++ b/var/spack/repos/builtin/packages/py-pyudev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyudev(PythonPackage): homepage = "https://pyudev.readthedocs.io/en/latest/" pypi = "pyudev/pyudev-0.9.tar.gz" + license("LGPL-2.1+") + version("0.21.0", sha256="094b7a100150114748aaa3b70663485dd360457a709bfaaafe5a977371033f2b") version("0.15", sha256="12f462b777388c447edaac9e4b423a38a76eeb43f36b1a42288e771309d663c2") version("0.9", sha256="5282ff7178942cfe0cb56316b7743ad6d0189e2749d80f452bf2e04740b81eb2") diff --git a/var/spack/repos/builtin/packages/py-pyugrid/package.py b/var/spack/repos/builtin/packages/py-pyugrid/package.py index cda5affeec5d88..22e40ccdf280ce 100644 --- a/var/spack/repos/builtin/packages/py-pyugrid/package.py +++ b/var/spack/repos/builtin/packages/py-pyugrid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyupgrade/package.py b/var/spack/repos/builtin/packages/py-pyupgrade/package.py index 50681b33ebd471..bb13dc8bd9bda1 100644 --- a/var/spack/repos/builtin/packages/py-pyupgrade/package.py +++ b/var/spack/repos/builtin/packages/py-pyupgrade/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyupgrade(PythonPackage): homepage = "https://github.com/asottile/pyupgrade" pypi = "pyupgrade/pyupgrade-2.31.1.tar.gz" + license("MIT") + version("3.3.1", sha256="f88bce38b0ba92c2a9a5063c8629e456e8d919b67d2d42c7ecab82ff196f9813") version("2.31.1", sha256="22e0ad6dd39c4381805cb059f1e691b6315c62c0ebcec98a5f29d22cd186a72a") diff --git a/var/spack/repos/builtin/packages/py-pyusb/package.py b/var/spack/repos/builtin/packages/py-pyusb/package.py index 20830979549626..19cfa6475742f3 100644 --- a/var/spack/repos/builtin/packages/py-pyusb/package.py +++ b/var/spack/repos/builtin/packages/py-pyusb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyusb(PythonPackage): homepage = "https://github.com/pyusb/pyusb" pypi = "pyusb/pyusb-1.0.2.tar.gz" + license("BSD-3-Clause") + version("1.0.2", sha256="4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py index 45be5ec8f0ff9f..646654f27db721 100644 --- a/var/spack/repos/builtin/packages/py-pyutilib/package.py +++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyPyutilib(PythonPackage): homepage = "https://github.com/PyUtilib/pyutilib" url = "https://github.com/PyUtilib/pyutilib/archive/5.5.1.tar.gz" + license("BSD-3-Clause") + version("6.0.0", sha256="b758419b42f9f512330644ebf05d54a1d3c5671268c344204e02f32713342de5") version("5.6.2", sha256="3f9f500cf1f15a92e7eb0b3c3ca2af537a2a9e61fe70ad6be4d2d08d9e47764f") version("5.6.1", sha256="0d0d57921877dc292dd9de39596fabc83b5d072adf10a90c979f678662ddb752") diff --git a/var/spack/repos/builtin/packages/py-pyuwsgi/package.py b/var/spack/repos/builtin/packages/py-pyuwsgi/package.py index 3e6f8cf7cd9ae0..17ddbb007534bf 100644 --- a/var/spack/repos/builtin/packages/py-pyuwsgi/package.py +++ b/var/spack/repos/builtin/packages/py-pyuwsgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyuwsgi(PythonPackage): homepage = "https://uwsgi-docs.readthedocs.io" pypi = "pyuwsgi/pyuwsgi-2.0.21.tar.gz" + license("GPL-2.0-or-later") + version("2.0.21", sha256="211e8877f5191e347ba905232d04ab30e05ce31ba7a6dac4bfcb48de9845bb52") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py index 8e814e4e6caed3..7df3d3e0b410c1 100644 --- a/var/spack/repos/builtin/packages/py-pyvcf/package.py +++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pyvista/package.py b/var/spack/repos/builtin/packages/py-pyvista/package.py index a055904275c412..a8bd256f0db3ab 100644 --- a/var/spack/repos/builtin/packages/py-pyvista/package.py +++ b/var/spack/repos/builtin/packages/py-pyvista/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,14 +12,20 @@ class PyPyvista(PythonPackage): homepage = "https://github.com/pyvista/pyvista" pypi = "pyvista/pyvista-0.32.1.tar.gz" + # Requires optional trame dependency + skip_modules = ["pyvista.ext", "pyvista.jupyter", "pyvista.trame"] + maintainers("banesullivan") + license("MIT") + + version("0.42.3", sha256="00159cf0dea05c1ecfd1695c8c6ccfcfff71b0744c9997fc0276e661dc052351") version("0.37.0", sha256="d36a2c6d5f53f473ab6a9241669693acee7a5179394dc97595da14cc1de23141") version("0.32.1", sha256="585ac79524e351924730aff9b7207d6c5ac4175dbb5d33f7a9a2de22ae53dbf9") depends_on("py-setuptools", type="build") + depends_on("py-matplotlib@3.0.1:", when="@0.39:", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) - depends_on("py-imageio", type=("build", "run")) depends_on("pil", type=("build", "run")) depends_on("py-pooch", when="@0.37:", type=("build", "run")) depends_on("py-scooby@0.5.1:", type=("build", "run")) @@ -28,4 +34,8 @@ class PyPyvista(PythonPackage): # Historical dependencies depends_on("py-appdirs", when="@:0.36", type=("build", "run")) + depends_on("py-imageio", when="@:0.38", type=("build", "run")) depends_on("py-meshio@4.0.3:4", when="@:0.32", type=("build", "run")) + + # '>=3.7.*' in python_requires: setuptools parser changed in v60 and errors. + depends_on("py-setuptools@:59", when="@:0.37", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyvistaqt/package.py b/var/spack/repos/builtin/packages/py-pyvistaqt/package.py index 6d93cff7a73499..066174f7f9aafb 100644 --- a/var/spack/repos/builtin/packages/py-pyvistaqt/package.py +++ b/var/spack/repos/builtin/packages/py-pyvistaqt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyvistaqt(PythonPackage): homepage = "https://github.com/pyvista/pyvistaqt" pypi = "pyvistaqt/pyvistaqt-0.5.0.tar.gz" + license("MIT") + version("0.5.0", sha256="f2358825d3c5f434760c13fdff5d3681b3cf36898e6e909c8a7934a8e6448f71") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyviz-comms/package.py b/var/spack/repos/builtin/packages/py-pyviz-comms/package.py index bd5bac7db2dc46..e0ecb7e375f087 100644 --- a/var/spack/repos/builtin/packages/py-pyviz-comms/package.py +++ b/var/spack/repos/builtin/packages/py-pyviz-comms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyvizComms(PythonPackage): homepage = "https://holoviz.org/" pypi = "pyviz_comms/pyviz_comms-2.2.1.tar.gz" + license("BSD-3-Clause") + version("2.2.1", sha256="a26145b8ce43d2d934b3c6826d77b913ce105c528eb2e494c890b3e3525ddf33") depends_on("py-setuptools@40.8:60", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyvolve/package.py b/var/spack/repos/builtin/packages/py-pyvolve/package.py index 86ed20a5a79a7f..2997557eed7f96 100644 --- a/var/spack/repos/builtin/packages/py-pyvolve/package.py +++ b/var/spack/repos/builtin/packages/py-pyvolve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pywavelets/package.py b/var/spack/repos/builtin/packages/py-pywavelets/package.py index fc2a49c9060f0f..88fb7879391185 100644 --- a/var/spack/repos/builtin/packages/py-pywavelets/package.py +++ b/var/spack/repos/builtin/packages/py-pywavelets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyPywavelets(PythonPackage): homepage = "https://github.com/PyWavelets/pywt" pypi = "PyWavelets/PyWavelets-0.5.2.tar.gz" + license("MIT") + version("1.4.1", sha256="6437af3ddf083118c26d8f97ab43b0724b956c9f958e9ea788659f6a2834ba93") version("1.1.1", sha256="1a64b40f6acb4ffbaccce0545d7fc641744f95351f62e4c6aaa40549326008c9") version("0.5.2", sha256="ce36e2f0648ea1781490b09515363f1f64446b0eac524603e5db5e180113bed9") diff --git a/var/spack/repos/builtin/packages/py-pywcs/package.py b/var/spack/repos/builtin/packages/py-pywcs/package.py index 3b1f74eb8698a9..8b4ca6624aef0a 100644 --- a/var/spack/repos/builtin/packages/py-pywcs/package.py +++ b/var/spack/repos/builtin/packages/py-pywcs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-pywin32/package.py b/var/spack/repos/builtin/packages/py-pywin32/package.py new file mode 100644 index 00000000000000..da6f0d74399c42 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pywin32/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyPywin32(PythonPackage): + """Python for Window Extensions.""" + + homepage = "https://github.com/mhammond/pywin32" + url = "https://github.com/mhammond/pywin32/archive/refs/tags/b306.tar.gz" + + license("PSF-2.0") + + version("306", sha256="16e5ad3efbbf997080f67c3010bd4eb0067d499bbade9be1b240b7e85325c167") + + depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyworld/package.py b/var/spack/repos/builtin/packages/py-pyworld/package.py index 7d8364bf5bafda..5f6f6562523bf0 100644 --- a/var/spack/repos/builtin/packages/py-pyworld/package.py +++ b/var/spack/repos/builtin/packages/py-pyworld/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyPyworld(PythonPackage): homepage = "https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder" pypi = "pyworld/pyworld-0.3.0.tar.gz" + license("MIT") + version("0.3.0", sha256="e19b5d8445e0c4fc45ded71863aeaaf2680064b4626b0e7c90f72e9ace9f6b5b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyxlsb/package.py b/var/spack/repos/builtin/packages/py-pyxlsb/package.py index d873e0b68b0533..de6d5885dff470 100644 --- a/var/spack/repos/builtin/packages/py-pyxlsb/package.py +++ b/var/spack/repos/builtin/packages/py-pyxlsb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyPyxlsb(PythonPackage): pypi = "pyxlsb/pyxlsb-1.0.10.tar.gz" + license("LGPL-3.0-only") + version("1.0.10", sha256="8062d1ea8626d3f1980e8b1cfe91a4483747449242ecb61013bc2df85435f685") version("1.0.8", sha256="dcf26d6494b45d8852d68571f828c2361b74711a2e19ba03eee77f96b9210464") version("1.0.6", sha256="47e8230582de15ad9824a456d1d4cb36a6535f4ad5e5eb2464d31f0445b9db46") diff --git a/var/spack/repos/builtin/packages/py-pyyaml-env-tag/package.py b/var/spack/repos/builtin/packages/py-pyyaml-env-tag/package.py index 71ac23dad9d4df..2f051770debc2d 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml-env-tag/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml-env-tag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyyamlEnvTag(PythonPackage): homepage = "https://github.com/waylan/pyyaml-env-tag" pypi = "pyyaml_env_tag/pyyaml_env_tag-0.1.tar.gz" + license("MIT") + version("0.1", sha256="70092675bda14fdec33b31ba77e7543de9ddc88f2e5b99160396572d11525bdb") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index 47138e1faf7dfa..048b3e7d9f6686 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyPyyaml(PythonPackage): pypi = "PyYAML/PyYAML-5.3.1.tar.gz" git = "https://github.com/yaml/pyyaml.git" + license("MIT") + version("6.0", sha256="68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2") version("5.4.1", sha256="607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e") version("5.3.1", sha256="b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d") diff --git a/var/spack/repos/builtin/packages/py-pyzmq/package.py b/var/spack/repos/builtin/packages/py-pyzmq/package.py index bf60b4be57d91b..63956fb6e99b1b 100644 --- a/var/spack/repos/builtin/packages/py-pyzmq/package.py +++ b/var/spack/repos/builtin/packages/py-pyzmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,26 +12,18 @@ class PyPyzmq(PythonPackage): homepage = "https://github.com/zeromq/pyzmq" pypi = "pyzmq/pyzmq-22.3.0.tar.gz" - import_modules = [ - "zmq", - "zmq.green", - "zmq.green.eventloop", - "zmq.sugar", - "zmq.auth", - "zmq.auth.asyncio", - "zmq.utils", - "zmq.backend", + skip_modules = [ + # Requires zmq.backend.cffi._cffi "zmq.backend.cffi", - "zmq.backend.cython", - "zmq.ssh", + # Requires tornado "zmq.eventloop", - "zmq.eventloop.minitornado", - "zmq.eventloop.minitornado.platform", - "zmq.log", - "zmq.asyncio", - "zmq.devices", + "zmq.green.eventloop", + # Requires pytest + "zmq.tests", ] + license("BSD-3-Clause") + version("25.0.2", sha256="6b8c1bbb70e868dc88801aa532cae6bd4e3b5233784692b786f17ad2962e5149") version("24.0.1", sha256="216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77") version("22.3.0", sha256="8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c") diff --git a/var/spack/repos/builtin/packages/py-qdldl/package.py b/var/spack/repos/builtin/packages/py-qdldl/package.py index 0512763ece437a..acd5cc9b99816b 100644 --- a/var/spack/repos/builtin/packages/py-qdldl/package.py +++ b/var/spack/repos/builtin/packages/py-qdldl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyQdldl(PythonPackage): maintainers("meyersbs") + license("Apache-2.0") + version( "0.1.5.post3", sha256="69c092f6e1fc23fb779a80a62e6fcdfe2eba05c925860248c4d6754f4736938f" ) diff --git a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py index a3e38d6524df02..0d5d5a0d9a796f 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-aer/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-aer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyQiskitAer(PythonPackage, CudaPackage): homepage = "https://github.com/Qiskit/qiskit-aer" pypi = "qiskit-aer/qiskit-aer-0.9.1.tar.gz" + license("Apache-2.0") + version("0.11.1", sha256="ff136a086d0473346e5f5309ae34cc78b103dcd8a898344c6e5f86de91af41a1") version("0.9.1", sha256="3bf5f615aaae7cc5f816c39a4e9108aabaed0cc894fb6f841e48ffd56574e7eb") diff --git a/var/spack/repos/builtin/packages/py-qiskit-ibm-provider/package.py b/var/spack/repos/builtin/packages/py-qiskit-ibm-provider/package.py index e095f7ae7fe70f..d7de8f7b3752bb 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-ibm-provider/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-ibm-provider/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyQiskitIbmProvider(PythonPackage): homepage = "https://github.com/Qiskit/qiskit-ibm-provider" pypi = "qiskit-ibm-provider/qiskit-ibm-provider-0.5.1.tar.gz" + license("Apache-2.0") + version("0.5.1", sha256="0135d455d5fc4238efe1b852767c243fb995f003fbcac0bb836608426a0c0597") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qiskit-nature/package.py b/var/spack/repos/builtin/packages/py-qiskit-nature/package.py index 1dae95d6d5d39c..566edca7d4fae1 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-nature/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-nature/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyQiskitNature(PythonPackage): homepage = "https://github.com/Qiskit/qiskit-nature" pypi = "qiskit-nature/qiskit-nature-0.2.2.tar.gz" + license("Apache-2.0") + version("0.2.2", sha256="ce3558d4acf2511111cc398361146af36391d67e5a9fe9c4bd0f727cb56022bf") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py index d7d225f7cfe92d..ac171d5d537da8 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyQiskitTerra(PythonPackage): homepage = "https://github.com/Qiskit/qiskit-terra" pypi = "qiskit-terra/qiskit-terra-0.18.3.tar.gz" + license("Apache-2.0") + version("0.23.3", sha256="8f2f61622c28ad38db95d9bbacb03b9743923581545df08eb5047fa86f4de198") version("0.22.2", sha256="efd212cd98479ebedc8cc1f93d4eb8039f21c07bd39a62065b584e02d72e632d") version("0.18.3", sha256="8737c8f1f4c6f29ec2fb02d73023f4854a396c33f78f4629a861a3e48fc789cc") @@ -45,10 +47,7 @@ class PyQiskitTerra(PythonPackage): depends_on("py-retworkx@0.11.0:", type=("build", "run")) depends_on("py-scipy@1.5:", type=("build", "run")) depends_on("py-symengine@0.9:", type=("build", "run")) - depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run")) - depends_on("py-shared-memory38", when="^python@:3.7", type=("build", "run")) depends_on("py-tweedledum@1.1:1", type=("build", "run"), when="^python@:3.11") - depends_on("py-importlib-metadata@:4", when="^python@:3.7", type=("build", "run")) with when("@0.23.3"): depends_on("python@3.7:", type=("build", "run")) @@ -56,7 +55,3 @@ class PyQiskitTerra(PythonPackage): depends_on("py-rustworkx@0.12.0:", type=("build", "run")) depends_on("py-scipy@1.5:", type=("build", "run")) depends_on("py-symengine@0.9:", type=("build", "run")) - depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run")) - depends_on("py-shared-memory38", when="^python@:3.7", type=("build", "run")) - depends_on("py-importlib-metadata@:4", when="^python@:3.7", type=("build", "run")) - depends_on("py-singledispatchmethod", when="^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qmtest/package.py b/var/spack/repos/builtin/packages/py-qmtest/package.py index 1b9e6c98ce36a0..01bad9ce4c5792 100644 --- a/var/spack/repos/builtin/packages/py-qmtest/package.py +++ b/var/spack/repos/builtin/packages/py-qmtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyQmtest(PythonPackage): maintainers("haralmha") + license("GPL-2.0-only") + version("2.4.1", sha256="098f705aea9c8f7f5b6b5fe131974cee33b50cad3e13977e39708f306ce9ac91") # Patch to fix python 3.10 and above compatibility diff --git a/var/spack/repos/builtin/packages/py-qpsolvers/package.py b/var/spack/repos/builtin/packages/py-qpsolvers/package.py index 29142b7e47d9fa..39d7fb77758ebf 100644 --- a/var/spack/repos/builtin/packages/py-qpsolvers/package.py +++ b/var/spack/repos/builtin/packages/py-qpsolvers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyQpsolvers(PythonPackage): maintainers("meyersbs") + license("LGPL-3.0-only") + version("3.2.0", sha256="770a2b40ff827e251a30df97e9d518fd4859621fc02a323c3b6407cf2fbf4f34") version("3.1.0", sha256="f6becafc4667236a67276fa0baee1697c904c37498c5161fa40c605209269b4d") diff --git a/var/spack/repos/builtin/packages/py-qpth/package.py b/var/spack/repos/builtin/packages/py-qpth/package.py index e547abe86c7d49..c99ecd0cd4b42b 100644 --- a/var/spack/repos/builtin/packages/py-qpth/package.py +++ b/var/spack/repos/builtin/packages/py-qpth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyQpth(PythonPackage): homepage = "https://github.com/locuslab/qpth" pypi = "qpth/qpth-0.0.15.tar.gz" + license("Apache-2.0") + version("0.0.15", sha256="99d8ec5a35877c18543875a7d5b7fc9af1fa9a4d4b0888011c1ecf42ad9d521c") depends_on("python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qrcode/package.py b/var/spack/repos/builtin/packages/py-qrcode/package.py index df7e05b139bb89..3fc90ef8056bea 100644 --- a/var/spack/repos/builtin/packages/py-qrcode/package.py +++ b/var/spack/repos/builtin/packages/py-qrcode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyQrcode(PythonPackage): maintainers("sethrj") + license("BSD-3-Clause") + version("7.3.1", sha256="375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qsymm/package.py b/var/spack/repos/builtin/packages/py-qsymm/package.py index 640ffc3d885862..dfe096339f7ae1 100644 --- a/var/spack/repos/builtin/packages/py-qsymm/package.py +++ b/var/spack/repos/builtin/packages/py-qsymm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyQsymm(PythonPackage): # package is updated maintainers("payerle") + license("BSD-2-Clause") + version("1.2.7", sha256="9af92a30c3f72883c744d4717e4ec30c8b48121e208c10553e8e0e428fe43bbc") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qtawesome/package.py b/var/spack/repos/builtin/packages/py-qtawesome/package.py index 280fe79355dea9..cbd7cc95bfdaef 100644 --- a/var/spack/repos/builtin/packages/py-qtawesome/package.py +++ b/var/spack/repos/builtin/packages/py-qtawesome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyQtawesome(PythonPackage): homepage = "https://github.com/spyder-ide/qtawesome" pypi = "QtAwesome/QtAwesome-0.4.1.tar.gz" + license("MIT") + version("0.4.1", sha256="9ea91efeb83e8b73f814aeca898c29cade0c087acec58e91b4f384595aeb4cfd") version("0.3.3", sha256="c3c98ee4df0133ae42d202fea20253f8746266b4541c5df4269ca4131792ce0f") diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index e200236f65b442..949e32cbd4a028 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyQtconsole(PythonPackage): homepage = "https://ipython.org" pypi = "qtconsole/qtconsole-4.2.1.tar.gz" + license("BSD-3-Clause") + version("5.2.0", sha256="6bb4df839609f240194213407872076f871e3a3884cf8e785068e8c7f39344c6") version("4.5.1", sha256="4af84facdd6f00a6b9b2927255f717bb23ae4b7a20ba1d9ef0a5a5a8dbe01ae2") version("4.2.1", sha256="25ec7d345528b3e8f3c91be349dd3c699755f206dc4b6ec668e2e5dd60ea18ef") diff --git a/var/spack/repos/builtin/packages/py-qtpy/package.py b/var/spack/repos/builtin/packages/py-qtpy/package.py index f99d236e28f4b5..9009af2b67bd36 100644 --- a/var/spack/repos/builtin/packages/py-qtpy/package.py +++ b/var/spack/repos/builtin/packages/py-qtpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyQtpy(PythonPackage): homepage = "https://github.com/spyder-ide/qtpy" pypi = "QtPy/QtPy-1.2.1.tar.gz" + license("MIT") + version("1.11.2", sha256="d6e4ae3a41f1fcb19762b58f35ad6dd443b4bdc867a4cb81ef10ccd85403c92b") version("1.7.1", sha256="e97275750934b3a1f4d8e263f5b889ae817ed36f26867ab0ce52be731ab1ed9e") version("1.2.1", sha256="5803ce31f50b24295e8e600b76cc91d7f2a3140a5a0d526d40226f9ec5e9097d") diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py index 024901ab674b08..1f83b06fc5b750 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,18 +13,19 @@ class PyQuantities(PythonPackage): pypi = "quantities/quantities-0.12.1.tar.gz" maintainers("apdavison") + license("DOC") + + 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:") diff --git a/var/spack/repos/builtin/packages/py-quantum-blackbird/package.py b/var/spack/repos/builtin/packages/py-quantum-blackbird/package.py index 60da3c76d5e665..adf5ab6dbdcdf9 100644 --- a/var/spack/repos/builtin/packages/py-quantum-blackbird/package.py +++ b/var/spack/repos/builtin/packages/py-quantum-blackbird/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyQuantumBlackbird(PythonPackage): homepage = "https://github.com/XanaduAI/blackbird" pypi = "quantum-blackbird/quantum-blackbird-0.5.0.tar.gz" + license("Apache-2.0") + version("0.5.0", sha256="065c73bf5263ce8f9b72dcd2b434f3bfbb471f0a6907c97a617ec0c8bde01db3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-quantum-xir/package.py b/var/spack/repos/builtin/packages/py-quantum-xir/package.py index e226f414c0d26a..d1d5115e8dd4dd 100644 --- a/var/spack/repos/builtin/packages/py-quantum-xir/package.py +++ b/var/spack/repos/builtin/packages/py-quantum-xir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyQuantumXir(PythonPackage): homepage = "https://github.com/XanaduAI/xir" pypi = "quantum-xir/quantum-xir-0.2.2.tar.gz" + license("Apache-2.0") + version("0.2.2", sha256="4b6a60bd3dcddb455e33b036b320cf634c5bd772ecea031b110fc5fb2fcf8a51") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-quart/package.py b/var/spack/repos/builtin/packages/py-quart/package.py index 6a0e046e2330a7..60ac08264cd1c9 100644 --- a/var/spack/repos/builtin/packages/py-quart/package.py +++ b/var/spack/repos/builtin/packages/py-quart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyQuart(PythonPackage): homepage = "https://gitlab.com/pgjones/quart/" pypi = "Quart/Quart-0.16.3.tar.gz" + license("MIT") + version("0.16.3", sha256="16521d8cf062461b158433d820fff509f98fb997ae6c28740eda061d9cba7d5e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-quast/package.py b/var/spack/repos/builtin/packages/py-quast/package.py index 7ba99767b69434..46032d7dd1fcf9 100644 --- a/var/spack/repos/builtin/packages/py-quast/package.py +++ b/var/spack/repos/builtin/packages/py-quast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,11 +11,17 @@ class PyQuast(PythonPackage): """Quality Assessment Tool for Genome Assemblies""" homepage = "https://cab.spbu.ru/software/quast" - url = "https://github.com/ablab/quast/archive/quast_4.6.1.tar.gz" + pypi = "quast/quast-5.2.0.tar.gz" - version("4.6.3", sha256="d7f5e670563d17d683f6df057086f7b816b6a088266c6270f7114a1406aaab63") - version("4.6.1", sha256="a8071188545710e5c0806eac612daaabde9f730819df2c44be3ffa9317b76a58") - version("4.6.0", sha256="6bee86654b457a981718a19acacffca6a3e74f30997ad06162a70fd2a181ca2e") + license("GPL-2.0-only") + + version("5.2.0", sha256="23649fbd93253c6da982c0b67d719f9262461deecdc6dffbd690b75dfd790ad7") + version("5.0.2", sha256="cdb8f83e20cc38f218ff7172b454280fcb1c7e2dff74e1f8618cacc53d46b48e") + version("5.0.1", sha256="b1e4443b6598b01faaefddfc0f06fb270414ed4bdaffd0ad9aa420bc0d07d8ad") + version("5.0.0", sha256="46bba247c7f92c2ccaca8c0abeab2a8d40a257a0cbe2fa0a4ffa981ca0267526") + version("4.6.3", sha256="f9267e5deadf20cfe67731a42e775e7ef1d0850927a2a76c4b3d49bc77b1fab5") + version("4.6.1", sha256="7ace5bebebe9d2a70ad45e5339f998bd651c1c6b9025f7a3b51f44c87ea5bae0") + version("4.6.0", sha256="3a7ee7a2abfeb0541b299b67f263ba95f9743f8809ddf5dfaca9c3c8f9b6a215") depends_on("boost@1.56.0") @@ -23,10 +29,12 @@ class PyQuast(PythonPackage): # for instance depends_on('boost +filesystem') # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants) - depends_on("perl@5.6.0:") - depends_on("python@2.5:,3.3:") + depends_on("perl@5.6.0:", type=("build", "run")) + depends_on("python@2.5:,3.3:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-matplotlib", type=("build", "run")) + depends_on("py-joblib", type=("build", "run")) + depends_on("py-simplejson", type=("build", "run")) depends_on("java", type=("build", "run")) depends_on("perl-time-hires", type=("build", "run")) depends_on("gnuplot", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-quaternionic/package.py b/var/spack/repos/builtin/packages/py-quaternionic/package.py index 385ae8f7ab339e..a26809093e4603 100644 --- a/var/spack/repos/builtin/packages/py-quaternionic/package.py +++ b/var/spack/repos/builtin/packages/py-quaternionic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyQuaternionic(PythonPackage): maintainers("nilsvu", "moble") + license("MIT") + version("1.0.1", sha256="ea69733d7311784963922bf08cc0c9c938b62fee2f91219f56544ff30658c10e") depends_on("python@3.6:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qudida/package.py b/var/spack/repos/builtin/packages/py-qudida/package.py index 88894340ef5dd1..52bc598118c703 100644 --- a/var/spack/repos/builtin/packages/py-qudida/package.py +++ b/var/spack/repos/builtin/packages/py-qudida/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-queryablelist/package.py b/var/spack/repos/builtin/packages/py-queryablelist/package.py index 874d3366dc15bc..bae4a4c91c8fc8 100644 --- a/var/spack/repos/builtin/packages/py-queryablelist/package.py +++ b/var/spack/repos/builtin/packages/py-queryablelist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyQueryablelist(PythonPackage): homepage = "https://github.com/kata198/QueryableList" pypi = "queryablelist/QueryableList-3.1.0.tar.gz" + license("LGPL-2.1-or-later") + version("3.1.0", sha256="8891dccbadc69a35f5944e1826d8f8db224522aa3af913e301a7a448f5b411e9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-querystring-parser/package.py b/var/spack/repos/builtin/packages/py-querystring-parser/package.py index d441e6c9c78acc..122a0728f0736b 100644 --- a/var/spack/repos/builtin/packages/py-querystring-parser/package.py +++ b/var/spack/repos/builtin/packages/py-querystring-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-questionary/package.py b/var/spack/repos/builtin/packages/py-questionary/package.py index 530c7dc8103abd..ab3ebb32693d3c 100644 --- a/var/spack/repos/builtin/packages/py-questionary/package.py +++ b/var/spack/repos/builtin/packages/py-questionary/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyQuestionary(PythonPackage): homepage = "https://github.com/tmbo/questionary" pypi = "questionary/questionary-1.9.0.tar.gz" + license("MIT") + version("1.9.0", sha256="a050fdbb81406cddca679a6f492c6272da90cb09988963817828f697cf091c55") depends_on("python@3.6:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qutip-qip/package.py b/var/spack/repos/builtin/packages/py-qutip-qip/package.py index 71c58507d970dc..e916462639d4bd 100644 --- a/var/spack/repos/builtin/packages/py-qutip-qip/package.py +++ b/var/spack/repos/builtin/packages/py-qutip-qip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyQutipQip(PythonPackage): # using github for now, because pypi tarball is missing the VERSION file # pypi = "qutip-qip/qutip-qip-0.2.2.tar.gz" + license("BSD-3-Clause") + version("0.2.3", sha256="a6a3a549cf6983e3ecef2cf07d00be83c146321fb588e250a49d020788a4e590") version("0.2.2", sha256="4a9c79bb31c2fb2c72428764b2a5f6d8b1c667cebc8257cce1395c7e87d11217") diff --git a/var/spack/repos/builtin/packages/py-qutip/package.py b/var/spack/repos/builtin/packages/py-qutip/package.py index 1447515df225a8..2b3237341d3d85 100644 --- a/var/spack/repos/builtin/packages/py-qutip/package.py +++ b/var/spack/repos/builtin/packages/py-qutip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyQutip(PythonPackage): homepage = "https://qutip.org/" pypi = "qutip/qutip-4.7.0.tar.gz" + license("BSD-3-Clause") + version("4.7.1", sha256="9a87178e68b145c2145b526caa943ccc8400a111325ced45bd17f9b893663af2") version("4.7.0", sha256="a9dde64457991ef1c5a7d4186b5348a16a71480a610f1c0902e4d656ddc12e31") diff --git a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py index b4ae5fc0b13403..8666b111f51ed5 100644 --- a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py +++ b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRadiantMlhub(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.5.5", sha256="93cabc3c8e9ba343cdb3b0bfaec01bf7a36aae75704fabfe96c8bf5cab9fa899") version("0.5.3", sha256="f111983910e41f2ce40bf401ccf9e33b393e52cc1989f8f8b74c6b4e2bdd0127") version("0.5.2", sha256="d310afce962508a44c60f5738fef164c50e78f76c3e85813653824b39a189ca3") @@ -52,4 +54,4 @@ class PyRadiantMlhub(PythonPackage): depends_on("py-urllib3@1.26.11:1.26", when="@0.5.5:", type=("build", "run")) # Historical dependencies - depends_on("py-typing-extensions@3.7:", when="@0.4.1:0.4 ^python@:3.7", type=("build", "run")) + depends_on("py-typing-extensions@3.7:", when="@0.3:0.4 ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-radical-entk/package.py b/var/spack/repos/builtin/packages/py-radical-entk/package.py index 22305dc26be59a..845a86e5c86330 100644 --- a/var/spack/repos/builtin/packages/py-radical-entk/package.py +++ b/var/spack/repos/builtin/packages/py-radical-entk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyRadicalEntk(PythonPackage): maintainers("andre-merzky") + license("MIT") + version("develop", branch="devel") version("1.20.0", sha256="1b9fc470b926a93528fd2a898636bdcd1c565bd58ba47608f9bead811d8a46d7") version("1.18.0", sha256="049f70ec7e95819ec0ea706ee6275db04799ceff119dd7b675ef0d36d814de6f") diff --git a/var/spack/repos/builtin/packages/py-radical-gtod/package.py b/var/spack/repos/builtin/packages/py-radical-gtod/package.py index 708239fd8d51f3..d67b6561bd76aa 100644 --- a/var/spack/repos/builtin/packages/py-radical-gtod/package.py +++ b/var/spack/repos/builtin/packages/py-radical-gtod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyRadicalGtod(PythonPackage): maintainers("andre-merzky") + license("LGPL-3.0-or-later") + version("develop", branch="devel") version("1.20.0", sha256="8d0846de7a5d094146c01fbb7c137f343e4da06af51efafeba79dd3fdfe421dc") version("1.16.0", sha256="1fe9da598a965c7194ed9c7df49d5b30632a11a7f9ece12152bea9aaa91bd4b8") diff --git a/var/spack/repos/builtin/packages/py-radical-pilot/package.py b/var/spack/repos/builtin/packages/py-radical-pilot/package.py index 6863c1453a184e..1af0f33a703677 100644 --- a/var/spack/repos/builtin/packages/py-radical-pilot/package.py +++ b/var/spack/repos/builtin/packages/py-radical-pilot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyRadicalPilot(PythonPackage): maintainers("andre-merzky") + license("MIT") + version("develop", branch="devel") version("1.20.0", sha256="a0747e573a01a856dc330797dbee158f7e1cf8652001dc26f06a1d6c5e553bc6") version("1.18.1", sha256="fd6a0ffaa727b6b9bab35d8f2dc300bf4d9c4ff3541136d83560aa7b853d6100") diff --git a/var/spack/repos/builtin/packages/py-radical-saga/package.py b/var/spack/repos/builtin/packages/py-radical-saga/package.py index 771ae53cfefe5b..0b0944e489840c 100644 --- a/var/spack/repos/builtin/packages/py-radical-saga/package.py +++ b/var/spack/repos/builtin/packages/py-radical-saga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyRadicalSaga(PythonPackage): maintainers("andre-merzky") + license("MIT") + version("develop", branch="devel") version("1.20.0", sha256="d85f3ed564d9eaf3ead2aa349c854e944ca459492ebf88542404106fce4204ab") version("1.18.0", sha256="544d4ffafc0b311151724db371ee11e27744103068748962866351ce31ccb810") diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index 5d8e04f3daab1b..4ac4290792b5ff 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyRadicalUtils(PythonPackage): maintainers("andre-merzky") + license("MIT") + version("develop", branch="devel") version("1.20.0", sha256="9b39dd616d70c387fb3f97d3510a506bac92c159b6482c3aebd3d11eeaeebcc9") version("1.18.1", sha256="5b3ab15417a1ef82f63f8a77763a177d6bc59b61a80823be0df8c0f7502d9b3e") diff --git a/var/spack/repos/builtin/packages/py-ranger-fm/package.py b/var/spack/repos/builtin/packages/py-ranger-fm/package.py index 83e77dad553559..cb843f5d7e2961 100644 --- a/var/spack/repos/builtin/packages/py-ranger-fm/package.py +++ b/var/spack/repos/builtin/packages/py-ranger-fm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py b/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py new file mode 100644 index 00000000000000..1312feb68bc85a --- /dev/null +++ b/var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class 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") + + license("MIT") + + version("1.0.5", sha256="b3af179874b28364ba1b7850e37d0d353de9cf5b844e3569c023b74da3a9c68e") + + depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py index 5bfd1563b5bb78..37c7925f8d8871 100644 --- a/var/spack/repos/builtin/packages/py-rapidfuzz/package.py +++ b/var/spack/repos/builtin/packages/py-rapidfuzz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,19 @@ class PyRapidfuzz(PythonPackage): homepage = "https://github.com/maxbachmann/rapidfuzz" pypi = "rapidfuzz/rapidfuzz-1.8.2.tar.gz" + license("MIT") + 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") diff --git a/var/spack/repos/builtin/packages/py-rarfile/package.py b/var/spack/repos/builtin/packages/py-rarfile/package.py index f7b2ff60f36f0f..34f09c3e66c25c 100644 --- a/var/spack/repos/builtin/packages/py-rarfile/package.py +++ b/var/spack/repos/builtin/packages/py-rarfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRarfile(PythonPackage): homepage = "https://github.com/markokr/rarfile" pypi = "rarfile/rarfile-4.0.tar.gz" + license("ISC") + version("4.1", sha256="db60b3b5bc1c4bdeb941427d50b606d51df677353385255583847639473eda48") version("4.0", sha256="67548769229c5bda0827c1663dce3f54644f9dbfba4ae86d4da2b2afd3e602a1") diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index 83db363c9814c3..db5a1ec0e6a69a 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyRasterio(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("master", branch="master") version("1.3.9", sha256="fc6d0d290492fa1a5068711cfebb21cc936968891b7ed9da0690c8a7388885c5") version("1.3.8", sha256="ffdd18e78efdf8ad5861065fd812a66dd34264293317ff6540a078ea891cdef8") @@ -34,8 +36,6 @@ class PyRasterio(PythonPackage): version("1.2.3", sha256="d8c345e01052b70ac3bbbe100c83def813c0ab19f7412c2c98e553d03720c1c5") version("1.1.8", sha256="f7cac7e2ecf65b4b1eb78c994c63bd429b67dc679b0bc0ecfe487d3d5bf88fd5") version("1.1.5", sha256="ebe75c71f9257c780615caaec8ef81fa4602702cf9290a65c213e1639284acc9") - version("1.0.24", sha256="4839479621045211f66868ec49625979693450bc2e476f23e7e8ac4804eaf452") - version("1.0a12", sha256="47d460326e04c64590ff56952271a184a6307f814efc34fb319c12e690585f3c") # From pyproject.toml depends_on("py-setuptools@67.8:", when="@1.3.9:", type="build") @@ -46,7 +46,6 @@ class PyRasterio(PythonPackage): depends_on("python@3.8:", when="@1.3:", type=("build", "link", "run")) depends_on("python@3.6:3.9", when="@1.2", type=("build", "link", "run")) depends_on("python@2.7:2.8,3.5:3.8", when="@1.1", type=("build", "link", "run")) - depends_on("python@2.7:2.8,3.5:3.7", when="@:1.0", type=("build", "link", "run")) depends_on("py-affine", type=("build", "run")) depends_on("py-attrs", type=("build", "run")) depends_on("py-certifi", when="@1.2:", type=("build", "run")) @@ -65,5 +64,3 @@ class PyRasterio(PythonPackage): depends_on("gdal@2.4:3.3", when="@1.2.7:1.2") depends_on("gdal@2.3:3.2", when="@1.2.0:1.2.6") depends_on("gdal@1.11:3.2", when="@1.1.0:1.1") - depends_on("gdal@1.11:3.0", when="@1.0.25:1.0") - depends_on("gdal@1.11:2", when="@:1.0.24") diff --git a/var/spack/repos/builtin/packages/py-rasterstats/package.py b/var/spack/repos/builtin/packages/py-rasterstats/package.py index d80d718de2b942..ca20dd410a118f 100644 --- a/var/spack/repos/builtin/packages/py-rasterstats/package.py +++ b/var/spack/repos/builtin/packages/py-rasterstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyRasterstats(PythonPackage): homepage = "https://github.com/perrygeo/python-rasterstats" pypi = "rasterstats/rasterstats-0.17.0.tar.gz" + license("BSD-3-Clause") + version("0.17.0", sha256="27975ebc0a402865dd9e92ad4ecf0dd62678e320735cc81e104c730e6d001298") depends_on("py-affine@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ratelim/package.py b/var/spack/repos/builtin/packages/py-ratelim/package.py index 9282bb2c96885c..03a5dd097bd341 100644 --- a/var/spack/repos/builtin/packages/py-ratelim/package.py +++ b/var/spack/repos/builtin/packages/py-ratelim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRatelim(PythonPackage): homepage = "https://github.com/themiurgo/ratelim" pypi = "ratelim/ratelim-0.1.6.tar.gz" + license("MIT") + version("0.1.6", sha256="826d32177e11f9a12831901c9fda6679fd5bbea3605910820167088f5acbb11d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ratelimiter/package.py b/var/spack/repos/builtin/packages/py-ratelimiter/package.py index 80baf906b5eb61..20a6ad6cddfdaf 100644 --- a/var/spack/repos/builtin/packages/py-ratelimiter/package.py +++ b/var/spack/repos/builtin/packages/py-ratelimiter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRatelimiter(PythonPackage): maintainers("marcusboden") + license("Apache-2.0") + version( "1.2.0.post0", sha256="5c395dcabdbbde2e5178ef3f89b568a3066454a6ddc223b76473dac22f89b4f7" ) diff --git a/var/spack/repos/builtin/packages/py-raven/package.py b/var/spack/repos/builtin/packages/py-raven/package.py index c643053cfc75dc..eb3880a1f24379 100644 --- a/var/spack/repos/builtin/packages/py-raven/package.py +++ b/var/spack/repos/builtin/packages/py-raven/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRaven(PythonPackage): homepage = "https://github.com/getsentry/raven-python" pypi = "raven/raven-6.10.0.tar.gz" + license("BSD-3-Clause") + version("6.10.0", sha256="3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54") variant("flask", default=False, description="Build flask backend") diff --git a/var/spack/repos/builtin/packages/py-ray/package.py b/var/spack/repos/builtin/packages/py-ray/package.py index 8cbfad66f9cade..b434096c4388d6 100644 --- a/var/spack/repos/builtin/packages/py-ray/package.py +++ b/var/spack/repos/builtin/packages/py-ray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRay(PythonPackage): homepage = "https://github.com/ray-project/ray" url = "https://github.com/ray-project/ray/archive/ray-0.8.7.tar.gz" + license("Apache-2.0") + version("2.0.1", sha256="b8b2f0a99d2ac4c001ff11c78b4521b217e2a02df95fb6270fd621412143f28b") version("0.8.7", sha256="2df328f1bcd3eeb4fa33119142ea0d669396f4ab2a3e78db90178757aa61534b") diff --git a/var/spack/repos/builtin/packages/py-rbtools/package.py b/var/spack/repos/builtin/packages/py-rbtools/package.py index 8af9a33768a76c..6b1ee503f32eff 100644 --- a/var/spack/repos/builtin/packages/py-rbtools/package.py +++ b/var/spack/repos/builtin/packages/py-rbtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRbtools(PythonPackage): homepage = "https://github.com/reviewboard/rbtools" url = "https://github.com/reviewboard/rbtools/archive/release-1.0.2.tar.gz" + license("MIT") + version("1.0.2", sha256="dd7aa95691be91f394d085120e44bcec3dc440b01a8f7e2742e09a8d756c831c") version("1.0.1", sha256="bc5e3c511a2273ec61c43a82f56b4cef0b23beae81e277cecbb37ce6761edf29") version("1.0", sha256="dbab2cc89d798462c7e74952d43ba1ff1c97eb9c8f92876e600c6520f72454c9") diff --git a/var/spack/repos/builtin/packages/py-rdflib-jsonld/package.py b/var/spack/repos/builtin/packages/py-rdflib-jsonld/package.py index e7a4b0b674e1eb..4af9bf2219583f 100644 --- a/var/spack/repos/builtin/packages/py-rdflib-jsonld/package.py +++ b/var/spack/repos/builtin/packages/py-rdflib-jsonld/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRdflibJsonld(PythonPackage): homepage = "https://github.com/RDFLib/rdflib-jsonld" pypi = "rdflib-jsonld/rdflib-jsonld-0.6.2.tar.gz" + license("BSD-3-Clause") + version("0.6.2", sha256="107cd3019d41354c31687e64af5e3fd3c3e3fa5052ce635f5ce595fd31853a63") version("0.6.0", sha256="03af8b5540a8e7bb0dae0d9ba1a3bd7f6435abd82cfb4b3ad5e0cdb1bf45a2a6") diff --git a/var/spack/repos/builtin/packages/py-rdflib/package.py b/var/spack/repos/builtin/packages/py-rdflib/package.py index e595319971489b..4d603f27f0a941 100644 --- a/var/spack/repos/builtin/packages/py-rdflib/package.py +++ b/var/spack/repos/builtin/packages/py-rdflib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyRdflib(PythonPackage): homepage = "https://github.com/RDFLib/rdflib" pypi = "rdflib/rdflib-5.0.0.tar.gz" + license("BSD-3-Clause") + version("6.3.2", sha256="72af591ff704f4caacea7ecc0c5a9056b8553e0489dd4f35a9bc52dbd41522e0") version("6.2.0", sha256="62dc3c86d1712db0f55785baf8047f63731fa59b2682be03219cb89262065942") version("6.0.2", sha256="6136ae056001474ee2aff5fc5b956e62a11c3a9c66bb0f3d9c0aaa5fbb56854e") diff --git a/var/spack/repos/builtin/packages/py-rdt/package.py b/var/spack/repos/builtin/packages/py-rdt/package.py index 5b1157dd440e1a..5d6ca9fcb11009 100644 --- a/var/spack/repos/builtin/packages/py-rdt/package.py +++ b/var/spack/repos/builtin/packages/py-rdt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRdt(PythonPackage): homepage = "https://github.com/sdv-dev/RDT" pypi = "rdt/rdt-0.6.1.tar.gz" + license("MIT") + version("0.6.1", sha256="ee2ac0d3479b254f99f35a709a24ffd5f2c899de6ea71f1ee844c6113febba71") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-readchar/package.py b/var/spack/repos/builtin/packages/py-readchar/package.py index 20f532d3bd1e24..ce6b2a9ae9f113 100644 --- a/var/spack/repos/builtin/packages/py-readchar/package.py +++ b/var/spack/repos/builtin/packages/py-readchar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyReadchar(PythonPackage): homepage = "https://github.com/magmax/python-readchar" pypi = "readchar/readchar-4.0.5.tar.gz" + license("MIT") + version("4.0.5", sha256="08a456c2d7c1888cde3f4688b542621b676eb38cd6cfed7eb6cb2e2905ddc826") depends_on("py-setuptools@41:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-readme-renderer/package.py b/var/spack/repos/builtin/packages/py-readme-renderer/package.py index 0d7264294fe001..aa6b33124086f9 100644 --- a/var/spack/repos/builtin/packages/py-readme-renderer/package.py +++ b/var/spack/repos/builtin/packages/py-readme-renderer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-recommonmark/package.py b/var/spack/repos/builtin/packages/py-recommonmark/package.py index cc5b5437ed513d..128385a0007d61 100644 --- a/var/spack/repos/builtin/packages/py-recommonmark/package.py +++ b/var/spack/repos/builtin/packages/py-recommonmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyRecommonmark(PythonPackage): homepage = "https://github.com/readthedocs/recommonmark" pypi = "recommonmark/recommonmark-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="29cd4faeb6c5268c633634f2d69aef9431e0f4d347f90659fd0aab20e541efeb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-redis/package.py b/var/spack/repos/builtin/packages/py-redis/package.py index b4a06811001989..8767e74b2770bb 100644 --- a/var/spack/repos/builtin/packages/py-redis/package.py +++ b/var/spack/repos/builtin/packages/py-redis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRedis(PythonPackage): homepage = "https://github.com/redis/redis-py" pypi = "redis/redis-3.3.8.tar.gz" + license("MIT") + version("4.5.1", sha256="1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864") version("3.5.3", sha256="0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2") version("3.5.0", sha256="7378105cd8ea20c4edc49f028581e830c01ad5f00be851def0f4bc616a83cd89") diff --git a/var/spack/repos/builtin/packages/py-refgenconf/package.py b/var/spack/repos/builtin/packages/py-refgenconf/package.py index 0ae420f60ae5a7..13e62d23730117 100644 --- a/var/spack/repos/builtin/packages/py-refgenconf/package.py +++ b/var/spack/repos/builtin/packages/py-refgenconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRefgenconf(PythonPackage): homepage = "https://github.com/refgenie/refgenconf" pypi = "refgenconf/refgenconf-0.12.2.tar.gz" + license("BSD-2-Clause") + version("0.12.2", sha256="6c9f9ecd8b91b4f75a535cfbdbdfb136f2dc9e9864142d07aa0352c61cf0cf78") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-refgenie/package.py b/var/spack/repos/builtin/packages/py-refgenie/package.py index 102d87f2272491..94a05a94b73df7 100644 --- a/var/spack/repos/builtin/packages/py-refgenie/package.py +++ b/var/spack/repos/builtin/packages/py-refgenie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRefgenie(PythonPackage): homepage = "http://refgenie.databio.org" pypi = "refgenie/refgenie-0.12.1.tar.gz" + license("BSD-2-Clause") + version("0.12.1", sha256="cfd007ed0981e00d019deb49aaea896952341096494165cb8378488850eec451") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-regex/package.py b/var/spack/repos/builtin/packages/py-regex/package.py index da74459cb540d4..57d7619b240f44 100644 --- a/var/spack/repos/builtin/packages/py-regex/package.py +++ b/var/spack/repos/builtin/packages/py-regex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRegex(PythonPackage): homepage = "https://github.com/mrabarnett/mrab-regex" pypi = "regex/regex-2020.11.13.tar.gz" + license("Apache-2.0") + version("2022.8.17", sha256="5c77eab46f3a2b2cd8bbe06467df783543bf7396df431eb4a144cc4b89e9fb3c") version( "2020.11.13", sha256="83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562" diff --git a/var/spack/repos/builtin/packages/py-reindent/package.py b/var/spack/repos/builtin/packages/py-reindent/package.py index 4e7c41d317dbe1..4d80b1f5d928a8 100644 --- a/var/spack/repos/builtin/packages/py-reindent/package.py +++ b/var/spack/repos/builtin/packages/py-reindent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-reportlab/package.py b/var/spack/repos/builtin/packages/py-reportlab/package.py index 322b0763272a4c..163ea56a1ba6ad 100644 --- a/var/spack/repos/builtin/packages/py-reportlab/package.py +++ b/var/spack/repos/builtin/packages/py-reportlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-reportseff/package.py b/var/spack/repos/builtin/packages/py-reportseff/package.py index 0303264e2a6d39..e19ac2d01a5a67 100644 --- a/var/spack/repos/builtin/packages/py-reportseff/package.py +++ b/var/spack/repos/builtin/packages/py-reportseff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyReportseff(PythonPackage): homepage = "https://github.com/troycomi/reportseff" pypi = "reportseff/reportseff-2.7.2.tar.gz" + license("MIT") + version("2.7.2", sha256="63cf99ceb0111de511636b214ade937c6c1b8444531e8026dbc34ddf92049c41") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-repoze-lru/package.py b/var/spack/repos/builtin/packages/py-repoze-lru/package.py index 10cb6325aae93e..c862513564ead1 100644 --- a/var/spack/repos/builtin/packages/py-repoze-lru/package.py +++ b/var/spack/repos/builtin/packages/py-repoze-lru/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-reproject/package.py b/var/spack/repos/builtin/packages/py-reproject/package.py index 01acf032331861..b4595518ce7b8d 100644 --- a/var/spack/repos/builtin/packages/py-reproject/package.py +++ b/var/spack/repos/builtin/packages/py-reproject/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyReproject(PythonPackage): homepage = "https://reproject.readthedocs.io/" pypi = "reproject/reproject-0.7.1.tar.gz" + license("BSD-3-Clause") + version("0.7.1", sha256="95c0fa49e6b4e36455b91fa09ad1b71b230c990ad91d948af67ea3509a1a4ccb") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-requests-cache/package.py b/var/spack/repos/builtin/packages/py-requests-cache/package.py index 128230b98a3ae5..64926c113582d1 100644 --- a/var/spack/repos/builtin/packages/py-requests-cache/package.py +++ b/var/spack/repos/builtin/packages/py-requests-cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyRequestsCache(PythonPackage): homepage = "https://github.com/requests-cache/requests-cache" pypi = "requests-cache/requests_cache-0.9.7.tar.gz" + license("BSD-2-Clause") + version("0.9.7", sha256="b7c26ea98143bac7058fad6e773d56c3442eabc0da9ea7480af5edfc134ff515") depends_on("python@3.7:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-requests-file/package.py b/var/spack/repos/builtin/packages/py-requests-file/package.py new file mode 100644 index 00000000000000..3c35eb0e0f22a8 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-requests-file/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyRequestsFile(PythonPackage): + """File transport adapter for Requests.""" + + homepage = "http://github.com/dashea/requests-file" + pypi = "requests-file/requests-file-1.5.1.tar.gz" + + maintainers("LydDeb") + + license("Apache-2.0") + + version("1.5.1", sha256="07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e") + + depends_on("py-setuptools", type="build") + depends_on("py-requests@1.0.0:", type=("build", "run")) + depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-requests-ftp/package.py b/var/spack/repos/builtin/packages/py-requests-ftp/package.py index f8b27883de3855..3b4081d5d80c63 100644 --- a/var/spack/repos/builtin/packages/py-requests-ftp/package.py +++ b/var/spack/repos/builtin/packages/py-requests-ftp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRequestsFtp(PythonPackage): homepage = "https://github.com/Lukasa/requests-ftp" pypi = "requests-ftp/requests-ftp-0.3.1.tar.gz" + license("Apache-2.0") + version("0.3.1", sha256="7504ceb5cba8a5c0135ed738596820a78c5f2be92d79b29f96ba99b183d8057a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-requests-futures/package.py b/var/spack/repos/builtin/packages/py-requests-futures/package.py index 7827fbc963329e..78336d439576af 100644 --- a/var/spack/repos/builtin/packages/py-requests-futures/package.py +++ b/var/spack/repos/builtin/packages/py-requests-futures/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRequestsFutures(PythonPackage): homepage = "https://github.com/ross/requests-futures" pypi = "requests-futures/requests-futures-1.0.0.tar.gz" + license("Apache-2.0") + version("1.0.0", sha256="35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148") version("0.9.7", sha256="a9ca2c3480b6fac29ec5de59c146742e2ab2b60f8c68581766094edb52ea7bad") diff --git a/var/spack/repos/builtin/packages/py-requests-mock/package.py b/var/spack/repos/builtin/packages/py-requests-mock/package.py index b7b36b3ed1dc5c..5101bdfa64d24e 100644 --- a/var/spack/repos/builtin/packages/py-requests-mock/package.py +++ b/var/spack/repos/builtin/packages/py-requests-mock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-requests-ntlm/package.py b/var/spack/repos/builtin/packages/py-requests-ntlm/package.py index 32d9a2e1836b65..f5c5371ec93879 100644 --- a/var/spack/repos/builtin/packages/py-requests-ntlm/package.py +++ b/var/spack/repos/builtin/packages/py-requests-ntlm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRequestsNtlm(PythonPackage): homepage = "https://github.com/requests/requests-ntlm" pypi = "requests_ntlm/requests_ntlm-1.1.0.tar.gz" + license("ISC") + version("1.1.0", sha256="9189c92e8c61ae91402a64b972c4802b2457ce6a799d658256ebf084d5c7eb71") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py b/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py index 700332f89f98a1..eb89c2c22f2001 100644 --- a/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py +++ b/var/spack/repos/builtin/packages/py-requests-oauthlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRequestsOauthlib(PythonPackage): homepage = "https://github.com/requests/requests-oauthlib" pypi = "requests-oauthlib/requests-oauthlib-1.2.0.tar.gz" + license("ISC") + version("1.3.1", sha256="75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a") version("1.3.0", sha256="b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a") version("1.2.0", sha256="bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57") diff --git a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py index f735cc14502070..cfc69eeaea5e35 100644 --- a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py +++ b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRequestsToolbelt(PythonPackage): pypi = "requests-toolbelt/requests-toolbelt-0.9.1.tar.gz" git = "https://github.com/requests/toolbelt.git" + license("Apache-2.0") + version("1.0.0", sha256="7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6") version("0.9.1", sha256="968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0") version("0.8.0", sha256="f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5") diff --git a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py index e08a809256da82..d2d4ce956fe5b6 100644 --- a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py +++ b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRequestsUnixsocket(PythonPackage): homepage = "https://github.com/msabramo/requests-unixsocket" pypi = "requests-unixsocket/requests-unixsocket-0.2.0.tar.gz" + license("Apache-2.0") + version("0.3.0", sha256="28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e") version("0.2.0", sha256="9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea") diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index 891e3b6ecd40bf..4b88746a5358c8 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRequests(PythonPackage): pypi = "requests/requests-2.24.0.tar.gz" git = "https://github.com/psf/requests" + license("Apache-2.0") + version("2.31.0", sha256="942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1") version("2.28.2", sha256="98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf") version("2.28.1", sha256="7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983") diff --git a/var/spack/repos/builtin/packages/py-requirements-parser/package.py b/var/spack/repos/builtin/packages/py-requirements-parser/package.py index d0a0cbb614e1a2..cd5bc105ebb8d1 100644 --- a/var/spack/repos/builtin/packages/py-requirements-parser/package.py +++ b/var/spack/repos/builtin/packages/py-requirements-parser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyRequirementsParser(PythonPackage): maintainers("DaxLynch", "eugeneswalker") + license("Apache-2.0") + version("0.5.0", sha256="3336f3a3ae23e06d3f0f88595e4052396e3adf91688787f637e5d2ca1a904069") depends_on("python@3.6:3.99", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-reretry/package.py b/var/spack/repos/builtin/packages/py-reretry/package.py index 82327576eb53e8..cd3b566d3eac3b 100644 --- a/var/spack/repos/builtin/packages/py-reretry/package.py +++ b/var/spack/repos/builtin/packages/py-reretry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,10 +10,14 @@ class PyReretry(PythonPackage): """Easy to use retry decorator.""" homepage = "https://github.com/leshchenko1979/reretry" - pypi = "reretry/reretry-0.11.1.tar.gz" + pypi = "reretry/reretry-0.11.8.tar.gz" maintainers("charmoniumQ") + license("Apache-2.0") + + version("0.11.8", sha256="f2791fcebe512ea2f1d153a2874778523a8064860b591cd90afc21a8bed432e3") version("0.11.1", sha256="4ae1840ae9e443822bb70543c485bb9c45d1d009e32bd6809f2a9f2839149f5d") + depends_on("python@3.7:", type=("build", "run"), when="@0.11.4:") depends_on("py-setuptools", type="build") - depends_on("py-pbr", type="build") + depends_on("py-pbr", type="build", when="@:0.11.7") diff --git a/var/spack/repos/builtin/packages/py-resampy/package.py b/var/spack/repos/builtin/packages/py-resampy/package.py index 7da8fbc21b9a62..b97ef62f1b5d23 100644 --- a/var/spack/repos/builtin/packages/py-resampy/package.py +++ b/var/spack/repos/builtin/packages/py-resampy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyResampy(PythonPackage): homepage = "https://github.com/bmcfee/resampy" pypi = "resampy/resampy-0.2.2.tar.gz" + license("ISC") + version("0.2.2", sha256="62af020d8a6674d8117f62320ce9470437bb1d738a5d06cd55591b69b463929e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-responses/package.py b/var/spack/repos/builtin/packages/py-responses/package.py index a734245ab1ecfb..0681ee7ff4eefb 100644 --- a/var/spack/repos/builtin/packages/py-responses/package.py +++ b/var/spack/repos/builtin/packages/py-responses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyResponses(PythonPackage): maintainers("dorton21") + license("Apache-2.0") + version("0.13.3", sha256="18a5b88eb24143adbf2b4100f328a2f5bfa72fbdacf12d97d41f07c26c45553d") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-resultsfile/package.py b/var/spack/repos/builtin/packages/py-resultsfile/package.py index a14091c6c49b10..64a885994c4087 100644 --- a/var/spack/repos/builtin/packages/py-resultsfile/package.py +++ b/var/spack/repos/builtin/packages/py-resultsfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyResultsfile(PythonPackage): maintainers("scemama") + license("GPL-2.0-only") + version("2.0", sha256="2a34208254e4bea155695690437f6a59bf5f7b0ddb421d6c1a2d377510f018f7") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-retry-decorator/package.py b/var/spack/repos/builtin/packages/py-retry-decorator/package.py index 7c951a2024b8a6..94357931bda3df 100644 --- a/var/spack/repos/builtin/packages/py-retry-decorator/package.py +++ b/var/spack/repos/builtin/packages/py-retry-decorator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRetryDecorator(PythonPackage): maintainers("dorton21") + license("MIT") + version("1.1.1", sha256="e1e8ad02e518fe11073f2ea7d80b6b8be19daa27a60a1838aff7c731ddcf2ebe") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-retry/package.py b/var/spack/repos/builtin/packages/py-retry/package.py index b901cc5081c1d9..baa62fc5fbaf07 100644 --- a/var/spack/repos/builtin/packages/py-retry/package.py +++ b/var/spack/repos/builtin/packages/py-retry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRetry(PythonPackage): homepage = "https://github.com/invl/retry" pypi = "retry/retry-0.9.2.tar.gz" + license("Apache-2.0") + version("0.9.2", sha256="f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4") depends_on("python@2.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-retrying/package.py b/var/spack/repos/builtin/packages/py-retrying/package.py index 7b370bfa911143..ea6156409f2cfc 100644 --- a/var/spack/repos/builtin/packages/py-retrying/package.py +++ b/var/spack/repos/builtin/packages/py-retrying/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRetrying(PythonPackage): homepage = "https://github.com/rholder/retrying" pypi = "retrying/retrying-1.3.3.tar.gz" + license("Apache-2.0") + version("1.3.3", sha256="08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-retworkx/package.py b/var/spack/repos/builtin/packages/py-retworkx/package.py index 4bea7cc440b9e0..8201d054ac9520 100644 --- a/var/spack/repos/builtin/packages/py-retworkx/package.py +++ b/var/spack/repos/builtin/packages/py-retworkx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRetworkx(PythonPackage): homepage = "https://github.com/Qiskit/retworkx" pypi = "retworkx/retworkx-0.5.0.tar.gz" + license("Apache-2.0") + version("0.11.0", sha256="a4c2a5ad3f8402493d41ad20ad91a03777ea214a3636c290272bbfaf36161161") version("0.10.2", sha256="ba81cb527de7ff338575905bb6fcbebdf2ab18ae800169a77ab863f855bf0951") diff --git a/var/spack/repos/builtin/packages/py-rfc3339-validator/package.py b/var/spack/repos/builtin/packages/py-rfc3339-validator/package.py index 5dd2a984d27edf..2aa63284580c67 100644 --- a/var/spack/repos/builtin/packages/py-rfc3339-validator/package.py +++ b/var/spack/repos/builtin/packages/py-rfc3339-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRfc3339Validator(PythonPackage): homepage = "https://github.com/naimetti/rfc3339-validator" pypi = "rfc3339_validator/rfc3339_validator-0.1.4.tar.gz" + license("MIT") + version("0.1.4", sha256="138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rfc3986-validator/package.py b/var/spack/repos/builtin/packages/py-rfc3986-validator/package.py index 1e360986eaa1a9..8957abddd8a890 100644 --- a/var/spack/repos/builtin/packages/py-rfc3986-validator/package.py +++ b/var/spack/repos/builtin/packages/py-rfc3986-validator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRfc3986Validator(PythonPackage): homepage = "https://github.com/naimetti/rfc3986-validator" pypi = "rfc3986_validator/rfc3986_validator-0.1.1.tar.gz" + license("MIT") + version("0.1.1", sha256="3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rfc3986/package.py b/var/spack/repos/builtin/packages/py-rfc3986/package.py index 8b09a972c19b16..d57752389d18a0 100644 --- a/var/spack/repos/builtin/packages/py-rfc3986/package.py +++ b/var/spack/repos/builtin/packages/py-rfc3986/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRfc3986(PythonPackage): pypi = "rfc3986/rfc3986-1.4.0.tar.gz" git = "https://github.com/python-hyper/rfc3986.git" + license("Apache-2.0") + version("2.0.0", sha256="97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c") version("1.4.0", sha256="112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d") diff --git a/var/spack/repos/builtin/packages/py-rich-click/package.py b/var/spack/repos/builtin/packages/py-rich-click/package.py index 732a8719e1f82d..4433f1a4c4ac83 100644 --- a/var/spack/repos/builtin/packages/py-rich-click/package.py +++ b/var/spack/repos/builtin/packages/py-rich-click/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRichClick(PythonPackage): homepage = "https://github.com/ewels/rich-click" pypi = "rich-click/rich-click-1.5.2.tar.gz" + license("MIT") + version("1.5.2", sha256="a57ca70242cb8b372a670eaa0b0be48f2440b66656deb4a56e6aadc1bbb79670") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rich/package.py b/var/spack/repos/builtin/packages/py-rich/package.py index 1f7cb0a6370f1a..51ef332d7f19bb 100644 --- a/var/spack/repos/builtin/packages/py-rich/package.py +++ b/var/spack/repos/builtin/packages/py-rich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRich(PythonPackage): homepage = "https://github.com/willmcgugan/rich" pypi = "rich/rich-9.4.0.tar.gz" + license("MIT") + version("13.4.2", sha256="d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898") version("12.5.1", sha256="63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca") version("10.14.0", sha256="8bfe4546d56b4131298d3a9e571a0742de342f1593770bd0d4707299f772a0af") diff --git a/var/spack/repos/builtin/packages/py-rios/package.py b/var/spack/repos/builtin/packages/py-rios/package.py index a2716f648e703e..a91712e25e586a 100644 --- a/var/spack/repos/builtin/packages/py-rios/package.py +++ b/var/spack/repos/builtin/packages/py-rios/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyRios(PythonPackage): homepage = "https://www.rioshome.org/en/latest/" url = "https://github.com/ubarsc/rios/releases/download/rios-1.4.16/rios-1.4.16.tar.gz" + license("GPL-3.0-only") + version("1.4.16", sha256="2f553d85ff4ff26bfda2a8c6bd3d9dcce5ace847f7d9bd2f072c8943f3758ded") version("1.4.15", sha256="71670508dbffcd8f5d24fbb25e6a2b7e1d23b5e899ddc78c90d403bd65981cf4") version("1.4.14", sha256="ea22fde3fe70004aa1ad46bd36fad58f3346e9c161ca44ac913518a6e4fcad82") diff --git a/var/spack/repos/builtin/packages/py-rioxarray/package.py b/var/spack/repos/builtin/packages/py-rioxarray/package.py index 4e5f41fb149b98..0eba71e8a70f57 100644 --- a/var/spack/repos/builtin/packages/py-rioxarray/package.py +++ b/var/spack/repos/builtin/packages/py-rioxarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRioxarray(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version( "0.4.1.post0", sha256="f043f846724a58518f87dd3fa84acbe39e15a1fac7e64244be3d5dacac7fe62b" ) diff --git a/var/spack/repos/builtin/packages/py-rise/package.py b/var/spack/repos/builtin/packages/py-rise/package.py index e8ae39beb47eba..b490e48e65b1b8 100644 --- a/var/spack/repos/builtin/packages/py-rise/package.py +++ b/var/spack/repos/builtin/packages/py-rise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRise(PythonPackage): homepage = "https://rise.readthedocs.io/" pypi = "rise/rise-5.6.1.tar.gz" + license("BSD-3-Clause") + version("5.6.1", sha256="1343f068d01adc4dd0226d9b278ce93fc92f365d827431a57e8d5679eb39f4d6") depends_on("python@2.7.0:2.7,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-river/package.py b/var/spack/repos/builtin/packages/py-river/package.py index e4a2fdd8a3ac2b..02550c3dd32a37 100644 --- a/var/spack/repos/builtin/packages/py-river/package.py +++ b/var/spack/repos/builtin/packages/py-river/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRiver(PythonPackage): homepage = "https://riverml.xyz/0.13.0/" pypi = "river/river-0.13.0.tar.gz" + license("BSD-3-Clause") + version("0.13.0", sha256="9d068b7a9db32302fbd581af81315681dfe61774a5d777fb3d5982d3c3061340") # pyproject.toml diff --git a/var/spack/repos/builtin/packages/py-rmm/package.py b/var/spack/repos/builtin/packages/py-rmm/package.py index 0f64c03825be0d..f5f7df552d9070 100644 --- a/var/spack/repos/builtin/packages/py-rmm/package.py +++ b/var/spack/repos/builtin/packages/py-rmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRmm(PythonPackage): homepage = "https://github.com/rapidsai/rmm" url = "https://github.com/rapidsai/rmm/archive/v0.15.0.tar.gz" + license("Apache-2.0") + version("0.15.0", sha256="599f97b95d169a90d11296814763f7e151a8a1e060ba10bc6c8f4684a5cd7972") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rnc2rng/package.py b/var/spack/repos/builtin/packages/py-rnc2rng/package.py index 845656a6204805..b4bc97d8b4978c 100644 --- a/var/spack/repos/builtin/packages/py-rnc2rng/package.py +++ b/var/spack/repos/builtin/packages/py-rnc2rng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRnc2rng(PythonPackage): homepage = "https://github.com/djc/rnc2rng" pypi = "rnc2rng/rnc2rng-2.6.5.tar.gz" + license("MIT") + version("2.6.6", sha256="5a01d157857b5f010a94167e7092cc49efe2531d58e013f12c4e60b8c4df78f1") version("2.6.5", sha256="d354afcf0bf8e3b1e8f8d37d71a8fe5b1c0cf75cbd4b71364a9d90b5108a16e5") diff --git a/var/spack/repos/builtin/packages/py-robocrys/package.py b/var/spack/repos/builtin/packages/py-robocrys/package.py index d953c54475daca..d7ad95bf3acdaf 100644 --- a/var/spack/repos/builtin/packages/py-robocrys/package.py +++ b/var/spack/repos/builtin/packages/py-robocrys/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-robotframework/package.py b/var/spack/repos/builtin/packages/py-robotframework/package.py index 2dd859574001b0..311b9110663b14 100644 --- a/var/spack/repos/builtin/packages/py-robotframework/package.py +++ b/var/spack/repos/builtin/packages/py-robotframework/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRobotframework(PythonPackage): homepage = "https://opencollective.com/psutil" url = "https://github.com/robotframework/robotframework/archive/v3.2.2.tar.gz" + license("Apache-2.0") + version("3.2.2", sha256="6b2bddcecb5d1c6198999e38aeaf4c0366542a5e7b5bd788c6a3a36b055d5ea2") version("3.2.1", sha256="9805faa0990125ff2c9689b673448d5f47e78470e7a8e95af1606a775fa8379f") diff --git a/var/spack/repos/builtin/packages/py-rocrate/package.py b/var/spack/repos/builtin/packages/py-rocrate/package.py index 89c68c21cac52d..3206fb37153299 100644 --- a/var/spack/repos/builtin/packages/py-rocrate/package.py +++ b/var/spack/repos/builtin/packages/py-rocrate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRocrate(PythonPackage): homepage = "https://github.com/ResearchObject/ro-crate-py/" pypi = "rocrate/rocrate-0.7.0.tar.gz" + license("Apache-2.0") + version("0.7.0", sha256="f7537132f45b724bfa6a212b2ed3daa0aaee1d602a773f0f049b8ca9a14958e1") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rope/package.py b/var/spack/repos/builtin/packages/py-rope/package.py index 128286eb33ec35..c282e3016c390f 100644 --- a/var/spack/repos/builtin/packages/py-rope/package.py +++ b/var/spack/repos/builtin/packages/py-rope/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRope(PythonPackage): homepage = "https://github.com/python-rope/rope" pypi = "rope/rope-0.10.5.tar.gz" + license("LGPL-3.0-or-later") + version("0.11.0", sha256="a108c445e1cd897fe19272ab7877d172e7faf3d4148c80e7d20faba42ea8f7b2") version("0.10.7", sha256="a09edfd2034fd50099a67822f9bd851fbd0f4e98d3b87519f6267b60e50d80d1") version("0.10.6", sha256="9700e163f3b05ef4c68133a39d436c253a84b35baf662c2d63407da7bfa08edf") diff --git a/var/spack/repos/builtin/packages/py-rosdep/package.py b/var/spack/repos/builtin/packages/py-rosdep/package.py index c47cb21066ebc7..3d9a74cf10ae5d 100644 --- a/var/spack/repos/builtin/packages/py-rosdep/package.py +++ b/var/spack/repos/builtin/packages/py-rosdep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rosdistro/package.py b/var/spack/repos/builtin/packages/py-rosdistro/package.py index ae89d45a71632e..22cff420ecb7b3 100644 --- a/var/spack/repos/builtin/packages/py-rosdistro/package.py +++ b/var/spack/repos/builtin/packages/py-rosdistro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py b/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py index 160adc784cb616..ddc28351f60ef4 100644 --- a/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py +++ b/var/spack/repos/builtin/packages/py-rosinstall-generator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rosinstall/package.py b/var/spack/repos/builtin/packages/py-rosinstall/package.py index 61fe42d0d69ab4..733a983e1c46f2 100644 --- a/var/spack/repos/builtin/packages/py-rosinstall/package.py +++ b/var/spack/repos/builtin/packages/py-rosinstall/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rospkg/package.py b/var/spack/repos/builtin/packages/py-rospkg/package.py index 9f9ba669e56fb9..e32ad2d94f043c 100644 --- a/var/spack/repos/builtin/packages/py-rospkg/package.py +++ b/var/spack/repos/builtin/packages/py-rospkg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-routes/package.py b/var/spack/repos/builtin/packages/py-routes/package.py index 8dd7de3049b5af..ca2e9a9cd6e74a 100644 --- a/var/spack/repos/builtin/packages/py-routes/package.py +++ b/var/spack/repos/builtin/packages/py-routes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRoutes(PythonPackage): homepage = "https://routes.readthedocs.io/" pypi = "routes/Routes-2.5.1.tar.gz" + license("MIT") + version("2.5.1", sha256="b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rply/package.py b/var/spack/repos/builtin/packages/py-rply/package.py index 7a441826639970..124d4879605c2d 100644 --- a/var/spack/repos/builtin/packages/py-rply/package.py +++ b/var/spack/repos/builtin/packages/py-rply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRply(PythonPackage): homepage = "https://github.com/alex/rply/" pypi = "rply/rply-0.7.8.tar.gz" + license("BSD-3-Clause") + version("0.7.8", sha256="2a808ac25a4580a9991fc304d64434e299a8fc75760574492f242cbb5bb301c9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index 1129c79ea1c662..7cb71fa27dae3a 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyRpy2(PythonPackage): pypi = "rpy2/rpy2-2.5.4.tar.gz" + license("GPL-2.0-or-later") + version("3.0.4", sha256="2af5158a5d56af7f7bf5e54d8d7e87b6f115ff40f056d82f93cad0cbf6acc0cb") version("3.0.0", sha256="34efc2935d9015527837d6b1de29641863d184b19d39ad415d5384be8a015bce") version("2.9.4", sha256="be57f741d0c284b5d8785ab03dff0e829303e5ac30e548d5ceb46e05b168812e") diff --git a/var/spack/repos/builtin/packages/py-rq/package.py b/var/spack/repos/builtin/packages/py-rq/package.py index c14198bfdea101..644fdd2c7c76cf 100644 --- a/var/spack/repos/builtin/packages/py-rq/package.py +++ b/var/spack/repos/builtin/packages/py-rq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRq(PythonPackage): homepage = "https://github.com/rq/rq" url = "https://github.com/rq/rq/archive/v1.5.2.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("1.5.2", sha256="e8e7b6ffc4a962837eaff8eb0137514346e629633bf08550a1649771cdc4ace6") version("1.5.1", sha256="36ca5cd2762b5b15bb176943f77da933fac6c2f4e5b5d47a0475f918c167fd4c") version("1.5.0", sha256="97443acd8aab1c273710f74db197838f68a0678f9cabb64c3598dfb816d35e13") diff --git a/var/spack/repos/builtin/packages/py-rsa/package.py b/var/spack/repos/builtin/packages/py-rsa/package.py index ccbb8a057fc592..86569f1dfb4840 100644 --- a/var/spack/repos/builtin/packages/py-rsa/package.py +++ b/var/spack/repos/builtin/packages/py-rsa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRsa(PythonPackage): homepage = "https://stuvel.eu/rsa" pypi = "rsa/rsa-3.4.2.tar.gz" + license("Apache-2.0") + version("4.9", sha256="e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21") version("4.7.2", sha256="9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9") version("4.0", sha256="1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") diff --git a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py index 2f25895d5786a6..9c84fb749f05fc 100644 --- a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py +++ b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyRsatoolbox(PythonPackage): pypi = "rsatoolbox/rsatoolbox-0.0.3.tar.gz" git = "https://github.com/rsagroup/rsatoolbox.git" + license("MIT") + version("main", branch="main") version("0.1.2", sha256="2d091cbaa33373bf9da4df5ca8d127f0e427431a3db726076090ab2d54fe1213") version("0.1.0", sha256="245f909d31909ba896b765fa51ea019510dd690c6bb8d04b178a9c76ec36dce9") diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py index 231d663fb5b4e8..ef3939311363f6 100644 --- a/var/spack/repos/builtin/packages/py-rseqc/package.py +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-rst2pdf/package.py b/var/spack/repos/builtin/packages/py-rst2pdf/package.py index e35da7d6364bae..3b21428a078fa8 100644 --- a/var/spack/repos/builtin/packages/py-rst2pdf/package.py +++ b/var/spack/repos/builtin/packages/py-rst2pdf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyRst2pdf(PythonPackage): pypi = "rst2pdf/rst2pdf-0.99.tar.gz" git = "https://github.com/rst2pdf/rst2pdf.git" + license("MIT") + version("0.100", sha256="664c3c16e6d3dea274e840a436eac4dba6cb50ab6af3162fc9d5716be3cb7b42") version("0.99", sha256="8fa23fa93bddd1f52d058ceaeab6582c145546d80f2f8a95974f3703bd6c8152") diff --git a/var/spack/repos/builtin/packages/py-rtoml/package.py b/var/spack/repos/builtin/packages/py-rtoml/package.py index 7d03a5eacd22ca..cf05de1e7ef2ae 100644 --- a/var/spack/repos/builtin/packages/py-rtoml/package.py +++ b/var/spack/repos/builtin/packages/py-rtoml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRtoml(PythonPackage): homepage = "https://github.com/samuelcolvin/rtoml" pypi = "rtoml/rtoml-0.9.0.tar.gz" + license("MIT") + version("0.9.0", sha256="113f2e133d152d9424269c475b4a7d0679987078b543e88fcb16c870dc2c460d") depends_on("rust", type="build") diff --git a/var/spack/repos/builtin/packages/py-rtree/package.py b/var/spack/repos/builtin/packages/py-rtree/package.py index 7caa6d4f78bb82..51f0a1420a40cf 100644 --- a/var/spack/repos/builtin/packages/py-rtree/package.py +++ b/var/spack/repos/builtin/packages/py-rtree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyRtree(PythonPackage): maintainers("adamjstewart", "hobu") + license("MIT") + + version("1.2.0", sha256="f5145f7852bf7f95c126fb16bf1a4c2ca9300ae151b07f8a0f7083ea47912675") version("1.1.0", sha256="6f8ee504dde5d005b25b08aaf5be0b3404af3ad5fece6e1ddcde35908a798a95") version("1.0.1", sha256="222121699c303a64065d849bf7038b1ecabc37b65c7fa340bedb38ef0e805429") version("1.0.0", sha256="d0483482121346b093b9a42518d40f921adf445915b7aea307eb26768c839682") diff --git a/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py index ff5db61f43bc79..b29f6a1441a09d 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-ordereddict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyRuamelOrdereddict(PythonPackage): homepage = "https://sourceforge.net/projects/ruamel-ordereddict/" pypi = "ruamel.ordereddict/ruamel.ordereddict-0.4.14.tar.gz" + license("MIT") + version("0.4.14", sha256="281051d26eb2b18ef3d920e1e260716a52bd058a6b1a2f324102fc6a15cb8d4a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py index 409208c2c1cb9e..bd9d97f49bd23b 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml-clib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyRuamelYamlClib(PythonPackage): homepage = "https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/" pypi = "ruamel.yaml.clib/ruamel.yaml.clib-0.2.0.tar.gz" + license("MIT") + version("0.2.7", sha256="1f08fd5a2bea9c4180db71678e850b995d2a5f4537be0e94557668cf0f5f9497") version("0.2.4", sha256="f997f13fd94e37e8b7d7dbe759088bb428adc6570da06b64a913d932d891ac8d") version("0.2.0", sha256="b66832ea8077d9b3f6e311c4a53d06273db5dc2db6e8a908550f3c14d67e718c") diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml-jinja2/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml-jinja2/package.py index 0958c65b9ddbcc..a64e61097a7394 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml-jinja2/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml-jinja2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyRuamelYamlJinja2(PythonPackage): homepage = "https://sourceforge.net/p/ruamel-yaml-jinja2/code/ci/default/tree" pypi = "ruamel.yaml.jinja2/ruamel.yaml.jinja2-0.2.7.tar.gz" + license("MIT") + version("0.2.7", sha256="8449be29d9a157fa92d1648adc161d718e469f0d38a6b21e0eabb76fd5b3e663") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py index 907ca086a0d491..752d5a86cea8bf 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyRuamelYaml(PythonPackage): homepage = "https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree" pypi = "ruamel.yaml/ruamel.yaml-0.16.10.tar.gz" + license("MIT") + version("0.17.32", sha256="ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2") version("0.17.16", sha256="1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33") version("0.16.10", sha256="099c644a778bf72ffa00524f78dd0b6476bca94a1da344130f4bf3381ce5b954") diff --git a/var/spack/repos/builtin/packages/py-ruff/package.py b/var/spack/repos/builtin/packages/py-ruff/package.py index 667e7935d329e9..223711145260a9 100644 --- a/var/spack/repos/builtin/packages/py-ruff/package.py +++ b/var/spack/repos/builtin/packages/py-ruff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,13 @@ class PyRuff(PythonPackage): pypi = "ruff/ruff-0.0.276.tar.gz" git = "https://github.com/astral-sh/ruff.git" + license("MIT") + + version("0.1.6", sha256="1b09f29b16c6ead5ea6b097ef2764b42372aebe363722f1605ecbcd2b9207184") version("0.0.276", sha256="d456c86eb6ce9225507f24fcc7bf72fa031bb7cc750023310e62889bf4ad4b6a") depends_on("py-maturin@1", type="build") + + # Found in Cargo.toml + depends_on("rust@1.71:", when="@0.1.6:", type="build") + depends_on("rust@1.70:", when="@0.0.276:", type="build") diff --git a/var/spack/repos/builtin/packages/py-rustworkx/package.py b/var/spack/repos/builtin/packages/py-rustworkx/package.py index 2b22f701386620..314e7a153a9d03 100644 --- a/var/spack/repos/builtin/packages/py-rustworkx/package.py +++ b/var/spack/repos/builtin/packages/py-rustworkx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyRustworkx(PythonPackage): homepage = "https://github.com/Qiskit/rustworkx" pypi = "rustworkx/rustworkx-0.12.1.tar.gz" + license("Apache-2.0") + version("0.12.1", sha256="13a19a2f64dff086b3bffffb294c4630100ecbc13634b4995d9d36a481ae130e") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rx/package.py b/var/spack/repos/builtin/packages/py-rx/package.py index 282981cf16d261..206b2387cfd077 100644 --- a/var/spack/repos/builtin/packages/py-rx/package.py +++ b/var/spack/repos/builtin/packages/py-rx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-s3cmd/package.py b/var/spack/repos/builtin/packages/py-s3cmd/package.py index 532df1438219b5..f79b6d0bcae587 100644 --- a/var/spack/repos/builtin/packages/py-s3cmd/package.py +++ b/var/spack/repos/builtin/packages/py-s3cmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-s3fs/package.py b/var/spack/repos/builtin/packages/py-s3fs/package.py index 0545ce78441cd6..12a5c3d78476da 100644 --- a/var/spack/repos/builtin/packages/py-s3fs/package.py +++ b/var/spack/repos/builtin/packages/py-s3fs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyS3fs(PythonPackage): homepage = "https://s3fs.readthedocs.io/en/latest/" pypi = "s3fs/s3fs-0.5.2.tar.gz" + license("BSD-3-Clause") + version("2022.11.0", sha256="10c5ac283a4f5b67ffad6d1f25ff7ee026142750c5c5dc868746cd904f617c33") version("0.5.2", sha256="87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1") diff --git a/var/spack/repos/builtin/packages/py-s3transfer/package.py b/var/spack/repos/builtin/packages/py-s3transfer/package.py index ec2409298ad52e..742340122a153e 100644 --- a/var/spack/repos/builtin/packages/py-s3transfer/package.py +++ b/var/spack/repos/builtin/packages/py-s3transfer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyS3transfer(PythonPackage): depends_on("python@2.7:2.8,3.6:", when="@0.4.2", type=("build", "run")) depends_on("python@2.7:2.8,3.4:", when="@0.3.4", type=("build", "run")) + license("Apache-2.0") + version("0.6.0", sha256="2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947") version("0.5.0", sha256="50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c") version("0.4.2", sha256="cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2") diff --git a/var/spack/repos/builtin/packages/py-sacrebleu/package.py b/var/spack/repos/builtin/packages/py-sacrebleu/package.py index 998faf14a82cc5..e5c4abb51f1417 100644 --- a/var/spack/repos/builtin/packages/py-sacrebleu/package.py +++ b/var/spack/repos/builtin/packages/py-sacrebleu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySacrebleu(PythonPackage): homepage = "https://github.com/mjpost/sacrebleu" pypi = "sacrebleu/sacrebleu-2.0.0.tar.gz" + license("Apache-2.0") + version("2.0.0", sha256="51fb69b6683f1b9999cd180143bb6b21d7841744537c9aab235cfe676550f0cf") depends_on("python@3.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sacremoses/package.py b/var/spack/repos/builtin/packages/py-sacremoses/package.py index 21d65301e07905..eb906cc2f32545 100644 --- a/var/spack/repos/builtin/packages/py-sacremoses/package.py +++ b/var/spack/repos/builtin/packages/py-sacremoses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-safetensors/package.py b/var/spack/repos/builtin/packages/py-safetensors/package.py index 66234365fac571..70df04ceccd773 100644 --- a/var/spack/repos/builtin/packages/py-safetensors/package.py +++ b/var/spack/repos/builtin/packages/py-safetensors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-salib/package.py b/var/spack/repos/builtin/packages/py-salib/package.py index a780605ddc9381..eb8aaf0f01adb6 100644 --- a/var/spack/repos/builtin/packages/py-salib/package.py +++ b/var/spack/repos/builtin/packages/py-salib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySalib(PythonPackage): maintainers("schmitts") + license("MIT") + version("1.4.4", sha256="50a6459088700f55261a683752818530d14ede30cece2c324ac94d4b9e288b6d") version("1.4.0.1", sha256="dbf6e865af9f3be82a79cf64889ed66d6d3b6803f0c22a242a112876789d49e7") diff --git a/var/spack/repos/builtin/packages/py-sanic/package.py b/var/spack/repos/builtin/packages/py-sanic/package.py index d2a656cb78fd2d..08792ecb8d6aa4 100644 --- a/var/spack/repos/builtin/packages/py-sanic/package.py +++ b/var/spack/repos/builtin/packages/py-sanic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySanic(PythonPackage): homepage = "https://github.com/huge-success/sanic" pypi = "sanic/sanic-20.6.3.tar.gz" + license("MIT") + version("20.6.3", sha256="30e83d9f677b609d6b8ccab7c9551ca7e9a5f19ac0579f5aa10199ab6d4138ed") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-scandir/package.py b/var/spack/repos/builtin/packages/py-scandir/package.py index 7ec3e8ee6801fa..fe1b75317bb043 100644 --- a/var/spack/repos/builtin/packages/py-scandir/package.py +++ b/var/spack/repos/builtin/packages/py-scandir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyScandir(PythonPackage): homepage = "https://github.com/benhoyt/scandir" pypi = "scandir/scandir-1.9.0.tar.gz" + license("BSD-3-Clause") + version("1.10.0", sha256="4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae") version("1.9.0", sha256="44975e209c4827fc18a3486f257154d34ec6eaec0f90fef0cca1caa482db7064") version("1.6", sha256="e0278a2d4bc6c0569aedbe66bf26c8ab5b2b08378b3289de49257f23ac624338") diff --git a/var/spack/repos/builtin/packages/py-scanpy/package.py b/var/spack/repos/builtin/packages/py-scanpy/package.py index e431e2405e772a..094489a6269d89 100644 --- a/var/spack/repos/builtin/packages/py-scanpy/package.py +++ b/var/spack/repos/builtin/packages/py-scanpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyScanpy(PythonPackage): homepage = "https://scanpy.readthedocs.io/en/stable/" pypi = "scanpy/scanpy-1.9.1.tar.gz" + license("BSD-3-Clause") + version("1.9.1", sha256="00c9a83b649da7e0171c91e9a08cff632102faa760614fd05cd4d1dbba4eb541") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-schema-salad/package.py b/var/spack/repos/builtin/packages/py-schema-salad/package.py index f40b1601f849ed..a6b9472cded2f4 100644 --- a/var/spack/repos/builtin/packages/py-schema-salad/package.py +++ b/var/spack/repos/builtin/packages/py-schema-salad/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySchemaSalad(PythonPackage): homepage = "https://github.com/common-workflow-language/schema_salad" pypi = "schema-salad/schema-salad-8.3.20221209165047.tar.gz" + license("Apache-2.0") + version( "8.3.20221209165047", sha256="d97cc9a4d7c4255eb8000bcebaa8ac0d1d31801c921fd4113ab3051c1e326c7c", diff --git a/var/spack/repos/builtin/packages/py-schema/package.py b/var/spack/repos/builtin/packages/py-schema/package.py index 0e027879211ed3..cce05b7730ceb9 100644 --- a/var/spack/repos/builtin/packages/py-schema/package.py +++ b/var/spack/repos/builtin/packages/py-schema/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySchema(PythonPackage): homepage = "https://github.com/keleshev/schema" pypi = "schema/schema-0.7.5.tar.gz" + license("MIT") + version("0.7.5", sha256="f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-scientificpython/package.py b/var/spack/repos/builtin/packages/py-scientificpython/package.py index 5354c00c11be33..14e3de34e34bbe 100644 --- a/var/spack/repos/builtin/packages/py-scientificpython/package.py +++ b/var/spack/repos/builtin/packages/py-scientificpython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class PyScientificpython(PythonPackage): homepage = "https://sourcesup.renater.fr/projects/scientific-py/" url = "https://sourcesup.renater.fr/frs/download.php/file/4411/ScientificPython-2.8.1.tar.gz" + + license("CECILL-C") + version("2.8.1", sha256="d9ef354736410bbb2e8be33cb7433cf62114307a44e3a96baaa793b58b4b518b") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-scikit-build-core/package.py b/var/spack/repos/builtin/packages/py-scikit-build-core/package.py index 1733dc770631e5..fbe3ed171299e4 100644 --- a/var/spack/repos/builtin/packages/py-scikit-build-core/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-build-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,10 @@ class PyScikitBuildCore(PythonPackage): maintainers("wdconinc") + license("Apache-2.0") + + version("0.6.1", sha256="392254a4ca7235c27a4be98cc24cd708f563171961ce37cff66120ebfda20b7a") + version("0.6.0", sha256="1bea5ed83610b367f3446badd996f2356690548188d6d38e5b93152df311a7ae") version("0.2.0", sha256="d2a76d9447a412038dc5e25dd259b03c25278661a0c7c3da766bb971c1a9acd2") variant("pyproject", default=False, description="Enable pyproject.toml support") @@ -29,6 +33,7 @@ class PyScikitBuildCore(PythonPackage): # Dependencies depends_on("py-exceptiongroup", when="^python@:3.10", type=("build", "run")) + depends_on("py-importlib-metadata", when="@0.3.0: ^python@:3.7") depends_on("py-importlib-resources@1.3:", when="^python@:3.8", type=("build", "run")) depends_on("py-packaging@20.9:", type=("build", "run")) depends_on("py-tomli@1.1:", when="^python@:3.10", type=("build", "run")) @@ -49,6 +54,7 @@ class PyScikitBuildCore(PythonPackage): depends_on("py-pytest@7:", type="test") depends_on("py-pytest-subprocess@1.5:", type="test") depends_on("py-setuptools", type="test") + depends_on("py-virtualenv", when="@0.6:", type="test") depends_on("py-wheel", type="test") @run_after("install") diff --git a/var/spack/repos/builtin/packages/py-scikit-build/package.py b/var/spack/repos/builtin/packages/py-scikit-build/package.py index a83a084fc179b9..e1396d17e9f402 100644 --- a/var/spack/repos/builtin/packages/py-scikit-build/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyScikitBuild(PythonPackage): maintainers("coreyjadams") + license("MIT") + version("0.17.6", sha256="b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d") version("0.15.0", sha256="e723cd0f3489a042370b9ea988bbb9cfd7725e8b25b20ca1c7981821fcf65fb9") version("0.12.0", sha256="f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe") diff --git a/var/spack/repos/builtin/packages/py-scikit-fmm/package.py b/var/spack/repos/builtin/packages/py-scikit-fmm/package.py index eb175811769251..e97e8d4489ec11 100644 --- a/var/spack/repos/builtin/packages/py-scikit-fmm/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-fmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyScikitFmm(PythonPackage): maintainers("archxlith") + license("BSD-3-Clause") + version("master", branch="master") version("2019.1.30", sha256="eb64b6d8e30b8df8f8636d5fc4fd7ca6a9b05938ccd62518c80c1d9e823069dd") diff --git a/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py b/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py index bf5f0d5b5661ed..660d1c1e054a98 100644 --- a/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-fuzzy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyScikitFuzzy(PythonPackage): homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy" pypi = "scikit-fuzzy/scikit-fuzzy-0.4.2.tar.gz" + license("BSD-3-Clause") + version("0.4.2", sha256="1ab12424d847ede1bc79670d8058167be7c8dd660b00756e9b844817ceb1e12e") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index 1e09993711b92f..038b62b85bbd67 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,13 @@ class PyScikitImage(PythonPackage): pypi = "scikit-image/scikit_image-0.17.2.tar.gz" git = "https://github.com/scikit-image/scikit-image.git" + skip_modules = [ + # Requires pytest + "skimage.filters.rank.tests", + # skimage.future.graph moved to skimage.graph + "skimage.future.graph", + ] + version("0.20.0", sha256="2cd784fce18bd31d71ade62c6221440199ead03acf7544086261ee032264cf61") version("0.19.3", sha256="24b5367de1762da6ee126dd8f30cc4e7efda474e0d7d70685433f0e3aa2ec450") version("0.18.3", sha256="ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca") diff --git a/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py b/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py index 41843ed30201ce..2aab648a082929 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn-extra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyScikitLearnExtra(PythonPackage): homepage = "https://github.com/scikit-learn-contrib/scikit-learn-extra" pypi = "scikit-learn-extra/scikit-learn-extra-0.2.0.tar.gz" + license("BSD-3-Clause") + version("0.2.0", sha256="3b1bb5fedde47920eb4b3fa0a0c18f80cc7359d9d0496720178788c6153b8019") # For upperbound see https://github.com/scikit-learn-contrib/scikit-learn-extra/issues/164 diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 05f6d09b53952b..aab35fc6bbbab5 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,10 @@ class PyScikitLearn(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("master", branch="master") + version("1.4.0", sha256="d4373c984eba20e393216edd51a3e3eede56cbe93d4247516d205643c3b93121") version("1.3.2", sha256="a2f54c76accc15a34bfb9066e6c7a56c1e7235dda5762b990792330b52ccfb05") version("1.3.1", sha256="1a231cced3ee3fa04756b4a7ab532dc9417acd581a330adff5f2c01ac2831fcf") version("1.3.0", sha256="8be549886f5eda46436b6e555b0e4873b4f10aa21c07df45c4bc1735afbccd7a") @@ -41,60 +44,54 @@ class PyScikitLearn(PythonPackage): ) version("0.22.1", sha256="51ee25330fc244107588545c70e2f3570cfc4017cff09eed69d6e1d82a212b7d") version("0.22", sha256="314abf60c073c48a1e95feaae9f3ca47a2139bd77cebb5b877c23a45c9e03012") - version("0.21.3", sha256="eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003") - version("0.21.2", sha256="0aafc312a55ebf58073151b9308761a5fcfa45b7f7730cea4b1f066f824c72db") - version("0.21.1", sha256="228d0611e69e5250946f8cd7bbefec75347950f0ca426d0c518db8f06583f660") - version("0.20.3", sha256="c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41") - version("0.20.2", sha256="bc5bc7c7ee2572a1edcb51698a6caf11fae554194aaab9a38105d9ec419f29e6") - version("0.20.0", sha256="97d1d971f8ec257011e64b7d655df68081dd3097322690afa1a71a1d755f8c18") - version("0.19.2", sha256="b276739a5f863ccacb61999a3067d0895ee291c95502929b2ae56ea1f882e888") variant("openmp", default=True, description="Build with OpenMP support") # Based on PyPI wheel availability - depends_on("python@3.8:3.12", when="@1.3.1:", type=("build", "run")) - depends_on("python@3.8:3.11", when="@1.1.3:1.3.0", type=("build", "run")) - depends_on("python@3.8:3.10", when="@1.1.0:1.1.2", type=("build", "run")) - depends_on("python@:3.10", when="@1.0.2", type=("build", "run")) - depends_on("python@:3.9", when="@0.24:1.0.1", type=("build", "run")) - depends_on("python@:3.8", when="@0.22:0.23", type=("build", "run")) - depends_on("python@:3.7", when="@:0.21", type=("build", "run")) + depends_on("python@3.9:3.12", when="@1.4:", type=("build", "link", "run")) + depends_on("python@3.8:3.12", when="@1.3.1:1.3", type=("build", "link", "run")) + depends_on("python@3.8:3.11", when="@1.1.3:1.3.0", type=("build", "link", "run")) + depends_on("python@3.8:3.10", when="@1.1.0:1.1.2", type=("build", "link", "run")) + depends_on("python@:3.10", when="@1.0.2", type=("build", "link", "run")) + depends_on("python@:3.9", when="@0.24:1.0.1", type=("build", "link", "run")) + depends_on("python@:3.8", when="@0.22:0.23", type=("build", "link", "run")) # pyproject.toml depends_on("py-setuptools", type="build") depends_on("py-setuptools@:59", when="@:1.2.1", type="build") - depends_on("py-cython@0.29.33:2", when="@1.3:", type="build") + depends_on("py-cython@0.29.33:", when="@1.4:", type="build") + depends_on("py-cython@0.29.33:2", when="@1.3", type="build") depends_on("py-cython@0.29.24:2", when="@1.0.2:", type="build") depends_on("py-cython@0.28.5:2", when="@0.21:", type="build") - depends_on("py-cython@0.23:2", type="build") # sklearn/_min_dependencies.py - depends_on("py-numpy@1.17.3:", when="@1.1:", type=("build", "run")) - depends_on("py-numpy@1.14.6:", when="@1.0:", type=("build", "run")) - depends_on("py-numpy@1.13.3:", when="@0.23:", type=("build", "run")) - depends_on("py-numpy@1.11.0:", when="@0.21:", type=("build", "run")) - depends_on("py-numpy@1.8.2:", when="@0.20", type=("build", "run")) - depends_on("py-numpy@1.6.1:", when="@:0.19", type=("build", "run")) + depends_on("py-numpy@1.19.5:", when="@1.4:", type=("build", "link", "run")) + depends_on("py-numpy@1.17.3:", when="@1.1:", type=("build", "link", "run")) + depends_on("py-numpy@1.14.6:", when="@1.0:", type=("build", "link", "run")) + depends_on("py-numpy@1.13.3:", when="@0.23:", type=("build", "link", "run")) + depends_on("py-numpy@1.11.0:", when="@0.21:", type=("build", "link", "run")) + depends_on("py-scipy@1.6:", when="@1.4:", type=("build", "run")) depends_on("py-scipy@1.5:", when="@1.3:", type=("build", "run")) depends_on("py-scipy@1.3.2:", when="@1.1:", type=("build", "run")) depends_on("py-scipy@1.1.0:", when="@1.0:", type=("build", "run")) depends_on("py-scipy@0.19.1:", when="@0.23:", type=("build", "run")) depends_on("py-scipy@0.17.0:", when="@0.21:", type=("build", "run")) - depends_on("py-scipy@0.13.3:", when="@0.20", type=("build", "run")) - depends_on("py-scipy@0.9:", when="@:0.19", type=("build", "run")) + depends_on("py-joblib@1.2:", when="@1.4:", type=("build", "run")) depends_on("py-joblib@1.1.1:", when="@1.2:", type=("build", "run")) depends_on("py-joblib@1:", when="@1.1:", type=("build", "run")) depends_on("py-joblib@0.11:", type=("build", "run")) depends_on("py-threadpoolctl@2.0.0:", when="@0.23:", type=("build", "run")) - depends_on("llvm-openmp", when="@0.21: %apple-clang +openmp") + depends_on("llvm-openmp", when="%apple-clang +openmp") # Test dependencies - depends_on("py-matplotlib@3.1.3:", type="test") - depends_on("py-scikit-image@0.16.2:", type="test") - depends_on("py-pandas@1.0.5:", type="test") + depends_on("py-matplotlib@3.3.4:", type="test") + depends_on("py-scikit-image@0.17.2:", type="test") + depends_on("py-pandas@1.1.5:", type="test") depends_on("py-pytest@7.1.2:", type="test") depends_on("py-pyamg@4:", type="test") - depends_on("py-pooch@1.6:", type="test") + depends_on("py-polars@0.19.12:", when="@1.4:", type="test") + depends_on("py-pyarrow@12:", when="@1.4:", type="test") + depends_on("py-pooch@1.6:", when="@1.2:", type="test") # Release tarballs are already cythonized. If you wanted to build a release # version without OpenMP support, you would need to delete all .c files diff --git a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py index 1bf5da83e1c043..65d4eeaf8f83af 100644 --- a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PyScikitOptimize(PythonPackage): maintainers("liuyangzhuan") + license("BSD-3-Clause") + version("master", branch="master") version("0.9.0", sha256="77d8c9e64947fc9f5cc05bbc6aed7b8a9907871ae26fe11997fd67be90f26008") version("0.5.2", sha256="1d7657a4b8ef9aa6d81e49b369c677c584e83269f11710557741d3b3f8fa0a75") diff --git a/var/spack/repos/builtin/packages/py-scikit-sparse/package.py b/var/spack/repos/builtin/packages/py-scikit-sparse/package.py index 3f7533c6504821..a348d9407328c1 100644 --- a/var/spack/repos/builtin/packages/py-scikit-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyScikitSparse(PythonPackage): maintainers("cgcgcg") + license("BSD-2-Clause") + version("0.4.12", sha256="e6502fea9ba561cfa5491eb222ed2c81c16263d8182a293950db20509c941166") version("0.4.11", sha256="64c61a8777b7c7ba8e1f2bf76bc767f740e6426f1cce2d90f1324b177618e1ca") version("0.4.8", sha256="2a224c60da3ef951975242ea777478583d3265efc72db5cfb7861686521a4009") diff --git a/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py b/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py deleted file mode 100644 index 24811637c0c51f..00000000000000 --- a/var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyScikitTensorPy3(PythonPackage): - """A python module for multilinear algebra and tensor factorizations.""" - - homepage = "http://github.com/evertrol/scikit-tensor-py3" - pypi = "scikit-tensor-py3/scikit-tensor-py3-0.4.1.tar.gz" - - maintainers("meyersbs") - - version("0.4.1", sha256="b45de97ebd57e0213f54e891bf9a0549957eb2387f4df9f3dc3f7a50f8818b0a") - - depends_on("python@3.5:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.16:1.16", type=("build", "run")) - depends_on("py-scipy@1.3:1.3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-scikits-odes/package.py b/var/spack/repos/builtin/packages/py-scikits-odes/package.py index e70f5a671b3281..73643d80318050 100644 --- a/var/spack/repos/builtin/packages/py-scikits-odes/package.py +++ b/var/spack/repos/builtin/packages/py-scikits-odes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-scine-chemoton/package.py b/var/spack/repos/builtin/packages/py-scine-chemoton/package.py index 990611031b5102..5b60e7fcd1a97c 100644 --- a/var/spack/repos/builtin/packages/py-scine-chemoton/package.py +++ b/var/spack/repos/builtin/packages/py-scine-chemoton/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyScineChemoton(PythonPackage): pypi = "scine_chemoton/scine_chemoton-2.2.0.tar.gz" git = "https://github.com/qcscine/puffin.git" + license("BSD-3-Clause") + version("master", branch="master") version("2.2.0", sha256="cda4f9de1e1c00ecc5e0b2d9c17a5edb56b468d454022e3f4045ec116ba2ec45") diff --git a/var/spack/repos/builtin/packages/py-scine-puffin/package.py b/var/spack/repos/builtin/packages/py-scine-puffin/package.py index 2381847185e3cb..2a85da9bc91ef0 100644 --- a/var/spack/repos/builtin/packages/py-scine-puffin/package.py +++ b/var/spack/repos/builtin/packages/py-scine-puffin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-scinum/package.py b/var/spack/repos/builtin/packages/py-scinum/package.py index 0bf64ceea387ae..4a6bd9d19cb8a0 100644 --- a/var/spack/repos/builtin/packages/py-scinum/package.py +++ b/var/spack/repos/builtin/packages/py-scinum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyScinum(PythonPackage): homepage = "https://github.com/riga/scinum" pypi = "scinum/scinum-1.2.0.tar.gz" + license("BSD-3-Clause") + version("1.4.3", sha256="c8144b6a2ed5cb58b2c26a8151752b6f5f5ea460678a9e092015b91da926c443") version("1.2.0", sha256="31802d9b580f3a89c0876f34432851bc4def9cb2844d6f3c8e044480f2dd2f91") diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 6bcbac79122bda..59718a0e65bb58 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,8 +15,10 @@ class PyScipy(PythonPackage): maintainers("adamjstewart", "rgommers") + license("BSD-3-Clause") + 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") @@ -46,12 +48,6 @@ class PyScipy(PythonPackage): version("1.4.0", sha256="31f7cfa93b01507c935c12b535e24812594002a02a56803d7cd063e9920d25e8") version("1.3.3", sha256="64bf4e8ae0db2d42b58477817f648d81e77f0b381d0ea4427385bba3f959380a") version("1.3.2", sha256="a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4") - version("1.3.1", sha256="2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5") - version("1.3.0", sha256="c3bb4bd2aca82fb498247deeac12265921fe231502a6bc6edea3ee7fe6c40a7a") - version("1.2.3", sha256="ecbe6413ca90b8e19f8475bfa303ac001e81b04ec600d17fa7f816271f7cca57") - version("1.2.2", sha256="a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1") - version("1.2.1", sha256="e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c") - version("1.1.0", sha256="878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1") # Based on wheel availability on PyPI depends_on("python@3.9:3.12", when="@1.11:", type=("build", "link", "run")) @@ -60,7 +56,6 @@ class PyScipy(PythonPackage): depends_on("python@:3.10", when="@1.7.2:1.7", type=("build", "link", "run")) depends_on("python@:3.9", when="@1.5.4:1.7.1", type=("build", "link", "run")) depends_on("python@:3.8", when="@1.3.2:1.5.3", type=("build", "link", "run")) - depends_on("python@:3.7", when="@1.1:1.3.1", type=("build", "link", "run")) depends_on("py-meson-python@0.12.1:", when="@1.11:", type="build") depends_on("py-meson-python@0.11:", when="@1.10:", type="build") @@ -102,7 +97,6 @@ class PyScipy(PythonPackage): depends_on("py-numpy@1.16.5:1.22", when="@1.6:1.7", type=("build", "link", "run")) depends_on("py-numpy@1.14.5:1.21", when="@1.5", type=("build", "link", "run")) depends_on("py-numpy@1.13.3:1.21", when="@1.3:1.4", type=("build", "link", "run")) - depends_on("py-numpy@1.8.2:1.20", when="@:1.2", type=("build", "link", "run")) depends_on("py-pytest", type="test") # Required to use --config-settings @@ -110,7 +104,7 @@ class PyScipy(PythonPackage): # https://docs.scipy.org/doc/scipy/dev/toolchain.html#other-libraries depends_on("lapack@3.7.1:", when="@1.9:") - depends_on("lapack@3.4.1:", when="@1.2:") + depends_on("lapack@3.4.1:") depends_on("lapack") depends_on("blas") @@ -146,7 +140,7 @@ class PyScipy(PythonPackage): patch( "https://git.sagemath.org/sage.git/plain/build/pkgs/scipy/patches/extern_decls.patch?id=711fe05025795e44b84233e065d240859ccae5bd", sha256="5433f60831cb554101520a8f8871ac5a32c95f7a971ccd68b69049535b106780", - when="@1.2:1.5.3", + when="@:1.5.3", ) patch("scipy-clang.patch", when="@1.5.0:1.6.3 %clang") diff --git a/var/spack/repos/builtin/packages/py-scooby/package.py b/var/spack/repos/builtin/packages/py-scooby/package.py index 19e8b082221d2b..282153cbec62ee 100644 --- a/var/spack/repos/builtin/packages/py-scooby/package.py +++ b/var/spack/repos/builtin/packages/py-scooby/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyScooby(PythonPackage): homepage = "https://github.com/banesullivan/scooby" pypi = "scooby/scooby-0.5.7.tar.gz" + license("MIT") + version("0.5.7", sha256="ae2c2b6f5f5d10adf7aaab32409028f1e28d3ce833664bdd1e8c2072e8da169a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-scoop/package.py b/var/spack/repos/builtin/packages/py-scoop/package.py index 315dfab348c99f..266f90168ef3fe 100644 --- a/var/spack/repos/builtin/packages/py-scoop/package.py +++ b/var/spack/repos/builtin/packages/py-scoop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyScoop(PythonPackage): homepage = "https://github.com/soravux/scoop" pypi = "scoop/scoop-0.7.1.1.tar.gz" + license("LGPL-3.0-only") + version("0.7.1.1", sha256="d8b6444c7bac901171e3327a97e241dde63f060354e162a65551fd8083ca62b4") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-scp/package.py b/var/spack/repos/builtin/packages/py-scp/package.py index f63de427b78ba6..a7e503f9ac2856 100644 --- a/var/spack/repos/builtin/packages/py-scp/package.py +++ b/var/spack/repos/builtin/packages/py-scp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyScp(PythonPackage): homepage = "https://github.com/jbardin/scp.py" pypi = "scp/scp-0.13.2.tar.gz" + license("LGPL-2.1-or-later") + version("0.13.2", sha256="ef9d6e67c0331485d3db146bf9ee9baff8a48f3eb0e6c08276a8584b13bf34b3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-screed/package.py b/var/spack/repos/builtin/packages/py-screed/package.py index 3e31d87ea1f9ee..db98a99ca14754 100644 --- a/var/spack/repos/builtin/packages/py-screed/package.py +++ b/var/spack/repos/builtin/packages/py-screed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-scs/package.py b/var/spack/repos/builtin/packages/py-scs/package.py index d0067c02185c65..e5f2f5e4facda9 100644 --- a/var/spack/repos/builtin/packages/py-scs/package.py +++ b/var/spack/repos/builtin/packages/py-scs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyScs(PythonPackage, CudaPackage): maintainers("meyersbs") + license("MIT") + version("3.2.2", sha256="7206a2ad27ca031d693d65cbcbcfc661498f3983838079a66579bcc784b25293") version("2.1.1-2", sha256="f816cfe3d4b4cff3ac2b8b96588c5960ddd2a3dc946bda6b09db04e7bc6577f2") diff --git a/var/spack/repos/builtin/packages/py-sdmetrics/package.py b/var/spack/repos/builtin/packages/py-sdmetrics/package.py index a814555969e64c..f6889ff0558c77 100644 --- a/var/spack/repos/builtin/packages/py-sdmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-sdmetrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PySdmetrics(PythonPackage): homepage = "https://github.com/sdv-dev/SDMetrics" pypi = "sdmetrics/sdmetrics-0.4.1.tar.gz" + license("MIT") + version("0.4.1", sha256="28df1cdd6988b3464306c1d189da19ee13a49023c53ca8b3db399fc9fd45fae8") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sdv/package.py b/var/spack/repos/builtin/packages/py-sdv/package.py index 08fcca79da2406..753f3547717a58 100644 --- a/var/spack/repos/builtin/packages/py-sdv/package.py +++ b/var/spack/repos/builtin/packages/py-sdv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PySdv(PythonPackage): homepage = "https://github.com/sdv-dev/SDV" pypi = "sdv/sdv-0.13.1.tar.gz" + license("MIT") + version("0.14.0", sha256="a62714b73a7e14b95ffbda0920a3a5a6fe891a17d8611380af5f9ca1ff8fc234") version("0.13.1", sha256="c0a0dbc4a64e5f60cabd123a8c19b3f99594f5a0911de83e08d172b810222c93") diff --git a/var/spack/repos/builtin/packages/py-seaborn/package.py b/var/spack/repos/builtin/packages/py-seaborn/package.py index 511798ac851508..5fbc1cbff38265 100644 --- a/var/spack/repos/builtin/packages/py-seaborn/package.py +++ b/var/spack/repos/builtin/packages/py-seaborn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PySeaborn(PythonPackage): homepage = "https://seaborn.pydata.org/" pypi = "seaborn/seaborn-0.7.1.tar.gz" + license("BSD-2-Clause") + version("0.12.2", sha256="374645f36509d0dcab895cba5b47daf0586f77bfe3b36c97c607db7da5be0139") version("0.12.0", sha256="893f17292d8baca616c1578ddb58eb25c72d622f54fc5ee329c8207dc9b57b23") version("0.11.2", sha256="cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6") diff --git a/var/spack/repos/builtin/packages/py-secretstorage/package.py b/var/spack/repos/builtin/packages/py-secretstorage/package.py index eb6948b651abcb..8421575675982d 100644 --- a/var/spack/repos/builtin/packages/py-secretstorage/package.py +++ b/var/spack/repos/builtin/packages/py-secretstorage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySecretstorage(PythonPackage): homepage = "https://github.com/mitya57/secretstorage" pypi = "SecretStorage/SecretStorage-3.1.2.tar.gz" + license("BSD-3-Clause") + version("3.3.3", sha256="2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77") version("3.3.1", sha256="fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195") version("3.1.2", sha256="15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6") diff --git a/var/spack/repos/builtin/packages/py-seekpath/package.py b/var/spack/repos/builtin/packages/py-seekpath/package.py index 552914f086448f..b001a1960cee97 100644 --- a/var/spack/repos/builtin/packages/py-seekpath/package.py +++ b/var/spack/repos/builtin/packages/py-seekpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySeekpath(PythonPackage): maintainers("meyersbs") + license("MIT") + version("2.0.1", sha256="188513ee187fbbace49066a29ecea9bbd351f23da3bea33d507d0f590856b082") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py index f80ae6921e5f38..ec9668422dd297 100644 --- a/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-segmentation-models-pytorch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySegmentationModelsPytorch(PythonPackage): homepage = "https://github.com/qubvel/segmentation_models.pytorch" pypi = "segmentation_models_pytorch/segmentation_models_pytorch-0.2.0.tar.gz" + license("MIT") + version("0.3.3", sha256="b3b21ab4cd26a6b2b9e7a6ed466ace6452eb26ed3c31ae491ea2d7cbb01e384b") version("0.3.2", sha256="8372733e57a10cb8f6b9e18a20577fbb3fb83549b6945664dc774a9b6d3ecd13") version("0.3.1", sha256="d4a4817cf48872c3461bb7d22864c00f9d491719a6460adb252c035f9b0e8d51") diff --git a/var/spack/repos/builtin/packages/py-selenium/package.py b/var/spack/repos/builtin/packages/py-selenium/package.py index 13e7afe7629273..e33b64a65efd94 100644 --- a/var/spack/repos/builtin/packages/py-selenium/package.py +++ b/var/spack/repos/builtin/packages/py-selenium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySelenium(PythonPackage): homepage = "https://github.com/SeleniumHQ/selenium/" pypi = "selenium/selenium-3.141.0.tar.gz" + license("Apache-2.0") + version("3.141.0", sha256="deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-semantic-version/package.py b/var/spack/repos/builtin/packages/py-semantic-version/package.py index 4b94859c0f47c2..70706511a77998 100644 --- a/var/spack/repos/builtin/packages/py-semantic-version/package.py +++ b/var/spack/repos/builtin/packages/py-semantic-version/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySemanticVersion(PythonPackage): homepage = "https://github.com/rbarrois/python-semanticversion" pypi = "semantic_version/semantic_version-2.8.2.tar.gz" + license("BSD-2-Clause") + version("2.10.0", sha256="bdabb6d336998cbb378d4b9db3a4b56a1e3235701dc05ea2690d9a997ed5041c") version("2.9.0", sha256="abf54873553e5e07a6fd4d5f653b781f5ae41297a493666b59dcf214006a12b2") version("2.8.5", sha256="d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54") diff --git a/var/spack/repos/builtin/packages/py-semver/package.py b/var/spack/repos/builtin/packages/py-semver/package.py index 59b05d9b64cca6..1349d2e40455a2 100644 --- a/var/spack/repos/builtin/packages/py-semver/package.py +++ b/var/spack/repos/builtin/packages/py-semver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySemver(PythonPackage): homepage = "https://semver.org/" pypi = "semver/semver-2.8.1.tar.gz" + license("BSD-3-Clause") + version("3.0.1", sha256="9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1") version("2.8.1", sha256="5b09010a66d9a3837211bb7ae5a20d10ba88f8cb49e92cb139a69ef90d5060d8") diff --git a/var/spack/repos/builtin/packages/py-send2trash/package.py b/var/spack/repos/builtin/packages/py-send2trash/package.py index 4b802421ba1735..6c90fecee8bad4 100644 --- a/var/spack/repos/builtin/packages/py-send2trash/package.py +++ b/var/spack/repos/builtin/packages/py-send2trash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySend2trash(PythonPackage): homepage = "https://github.com/hsoft/send2trash" url = "https://github.com/hsoft/send2trash/archive/1.5.0.tar.gz" + license("BSD-3-Clause") + version("1.8.0", sha256="937b038abd9f1e7b8c5d7a116be5dc4663beb71df74dcccffe56cacf992c7a9c") version("1.5.0", sha256="7cebc0ffc8b6d6e553bce9c6bb915614610ba2dec17c2f0643b1b97251da2a41") diff --git a/var/spack/repos/builtin/packages/py-sentencepiece/package.py b/var/spack/repos/builtin/packages/py-sentencepiece/package.py index 60c91d38c5fb8f..f955d19ccd49bc 100644 --- a/var/spack/repos/builtin/packages/py-sentencepiece/package.py +++ b/var/spack/repos/builtin/packages/py-sentencepiece/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PySentencepiece(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.1.91", sha256="acbc7ea12713cd2a8d64892f8d2033c7fd2bb4faecab39452496120ace9a4b1b") version("0.1.85", sha256="dd4956287a1b6af3cbdbbd499b7227a859a4e3f41c9882de5e6bdd929e219ae6") diff --git a/var/spack/repos/builtin/packages/py-sentry-sdk/package.py b/var/spack/repos/builtin/packages/py-sentry-sdk/package.py index 0c1e667b74eba7..3a25cfd103980d 100644 --- a/var/spack/repos/builtin/packages/py-sentry-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-sentry-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySentrySdk(PythonPackage): homepage = "https://github.com/getsentry/sentry-python" pypi = "sentry-sdk/sentry-sdk-0.17.6.tar.gz" + license("MIT") + version("1.5.5", sha256="98fd155fa5d5fec1dbabed32a1a4ae2705f1edaa5dae4e7f7b62a384ba30e759") version("0.17.6", sha256="1a086486ff9da15791f294f6e9915eb3747d161ef64dee2d038a4d0b4a369b24") diff --git a/var/spack/repos/builtin/packages/py-seqeval/package.py b/var/spack/repos/builtin/packages/py-seqeval/package.py index dba9e83b083fa4..397813f400739a 100644 --- a/var/spack/repos/builtin/packages/py-seqeval/package.py +++ b/var/spack/repos/builtin/packages/py-seqeval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySeqeval(PythonPackage): homepage = "https://github.com/chakki-works/seqeval" pypi = "seqeval/seqeval-1.2.2.tar.gz" + license("MIT") + version("1.2.2", sha256="f28e97c3ab96d6fcd32b648f6438ff2e09cfba87f05939da9b3970713ec56e6f") depends_on("python@2.6:2,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-seriate/package.py b/var/spack/repos/builtin/packages/py-seriate/package.py index 044e97ede75700..2824e9b6ec4373 100644 --- a/var/spack/repos/builtin/packages/py-seriate/package.py +++ b/var/spack/repos/builtin/packages/py-seriate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PySeriate(PythonPackage): homepage = "https://github.com/src-d/seriate" url = "https://github.com/src-d/seriate/archive/1.1.2.tar.gz" + license("Apache-2.0") + version("1.1.2", sha256="5e031e865398fbe24aebdbb4a2e0015447aec50478830850f29d38660fd266e3") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-serpent/package.py b/var/spack/repos/builtin/packages/py-serpent/package.py index ded493904aad16..5e922c8901fd79 100644 --- a/var/spack/repos/builtin/packages/py-serpent/package.py +++ b/var/spack/repos/builtin/packages/py-serpent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PySerpent(PythonPackage): pypi = "serpent/serpent-1.40.tar.gz" maintainers("liuyangzhuan") + license("MIT") + version("1.40", sha256="10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-session-info/package.py b/var/spack/repos/builtin/packages/py-session-info/package.py index 47f35605a94c6b..db5e6f56e6cad2 100644 --- a/var/spack/repos/builtin/packages/py-session-info/package.py +++ b/var/spack/repos/builtin/packages/py-session-info/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-setproctitle/package.py b/var/spack/repos/builtin/packages/py-setproctitle/package.py index 2f0a8814e2ab13..5d5ffa01d14bda 100644 --- a/var/spack/repos/builtin/packages/py-setproctitle/package.py +++ b/var/spack/repos/builtin/packages/py-setproctitle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySetproctitle(PythonPackage): homepage = "https://github.com/dvarrazzo/py-setproctitle" pypi = "setproctitle/setproctitle-1.1.10.tar.gz" + license("BSD-3-Clause") + version("1.1.10", sha256="6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-setupmeta/package.py b/var/spack/repos/builtin/packages/py-setupmeta/package.py index dcb6b50bf0bf70..f6e04e2eb43e5e 100644 --- a/var/spack/repos/builtin/packages/py-setupmeta/package.py +++ b/var/spack/repos/builtin/packages/py-setupmeta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySetupmeta(PythonPackage): homepage = "https://github.com/codrsquad/setupmeta" pypi = "setupmeta/setupmeta-3.3.0.tar.gz" + license("MIT") + version("3.4.0", sha256="f986a1d9c5b595a840d71d888950c7cc6bbb586b4145d04e7992501e280e07c3") version("3.3.2", sha256="221463a64d2528ba558f14b087410e05a7ef0dab17d19004f124a262d6e007f5") version("3.3.0", sha256="32914af4eeffb8bf1bd45057254d9dff4d16cb7ae857141e07698f7ac19dc960") diff --git a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py index cef294b2b8409c..f09fc9702ea86e 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySetuptoolsCpp(PythonPackage): maintainers("dorton") + license("MIT") + version("0.1.0", sha256="4fd5e08603237578d06d28efd592d9847b523ede3e502f660be44b1e6254674d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-setuptools-git-versioning/package.py b/var/spack/repos/builtin/packages/py-setuptools-git-versioning/package.py index 7e463b510e3d81..406c4e54d251ce 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-git-versioning/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-git-versioning/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySetuptoolsGitVersioning(PythonPackage): maintainers("angus-g") + license("MIT") + version("1.13.3", sha256="9dfc59a31dcadcae04bcddc50534ccfc07a25a3180ab5cc1b1e3730217971c63") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-setuptools-git/package.py b/var/spack/repos/builtin/packages/py-setuptools-git/package.py index bf65e2563165f8..c9393ffdd90dfe 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-git/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-git/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PySetuptoolsGit(PythonPackage): pypi = "setuptools-git/setuptools-git-1.2.tar.gz" + license("BSD-3-Clause") + version("1.2", sha256="ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py index 4a2663a59373f3..485fe170e2a39c 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySetuptoolsRust(PythonPackage): homepage = "https://github.com/PyO3/setuptools-rust" pypi = "setuptools-rust/setuptools-rust-0.12.1.tar.gz" + license("MIT") + version("1.6.0", sha256="c86e734deac330597998bfbc08da45187e6b27837e23bd91eadb320732392262") version("1.5.1", sha256="0e05e456645d59429cb1021370aede73c0760e9360bbfdaaefb5bced530eb9d7") version("1.4.1", sha256="18ff850831f58ee21d5783825c99fad632da21e47645e9427fd7dec048029e76") diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py index 90110add0ff13c..460fd1079a6b75 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm-git-archive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySetuptoolsScmGitArchive(PythonPackage): maintainers("marcmengel") + license("MIT") + version("1.4", sha256="b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0") version("1.1", sha256="6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062") version("1.0", sha256="52425f905518247c685fc64c5fdba6e1e74443c8562e141c8de56059be0e31da") diff --git a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py index 6b5412cf9b6a8c..b1f5910a4f17aa 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-scm/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-scm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySetuptoolsScm(PythonPackage): homepage = "https://github.com/pypa/setuptools_scm" pypi = "setuptools_scm/setuptools_scm-4.1.2.tar.gz" + license("MIT") + version("7.1.0", sha256="6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27") version("7.0.5", sha256="031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844") version("7.0.3", sha256="cf8ab8e235bed840cd4559b658af0d8e8a70896a191bbc510ee914ec5325332d") diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 36cc6de4ee38b7..c5d5f7bfef2b02 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class PySetuptools(Package, PythonExtension): tags = ["build-tools"] + # Requires railroad + skip_modules = ["setuptools._vendor", "pkg_resources._vendor"] + version( "68.0.0", sha256="11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f", diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index 699ce1450958d5..93d2812d70ed16 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PySfepy(PythonPackage): url = "https://github.com/sfepy/sfepy/archive/release_2021.3.tar.gz" git = "https://github.com/sfepy/sfepy.git" + license("BSD-3-Clause") + version("2021.3", sha256="b2a760b0f3277ac223ff25821a4156b48d06b3769e6a9a3bd0bffef5a43cbe17") variant("petsc", default=False, description="Enable PETSc support") diff --git a/var/spack/repos/builtin/packages/py-sgp4/package.py b/var/spack/repos/builtin/packages/py-sgp4/package.py index c0492bc09c97f3..9c7dc0a176aa1e 100644 --- a/var/spack/repos/builtin/packages/py-sgp4/package.py +++ b/var/spack/repos/builtin/packages/py-sgp4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySgp4(PythonPackage): homepage = "https://github.com/brandon-rhodes/python-sgp4" pypi = "sgp4/sgp4-1.4.tar.gz" + license("MIT") + version("1.4", sha256="1fb3cdbc11981a9ff34a032169f83c1f4a2877d1b6c295aed044e1d890b73892") depends_on("python@2.6:2.8,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sh/package.py b/var/spack/repos/builtin/packages/py-sh/package.py index c5f739bff1790d..66dae1d852d9c8 100644 --- a/var/spack/repos/builtin/packages/py-sh/package.py +++ b/var/spack/repos/builtin/packages/py-sh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySh(PythonPackage): homepage = "https://github.com/amoffat/sh" pypi = "sh/sh-1.12.9.tar.gz" + license("MIT") + version("1.14.3", sha256="e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7") version("1.13.1", sha256="97a3d2205e3c6a842d87ebbc9ae93acae5a352b1bc4609b428d0fd5bb9e286a3") version("1.12.9", sha256="579aa19bae7fe86b607df1afaf4e8537c453d2ce3d84e1d3957e099359a51677") diff --git a/var/spack/repos/builtin/packages/py-shap/package.py b/var/spack/repos/builtin/packages/py-shap/package.py index 3ed5a9e4b49bf1..6c6bf451103f47 100644 --- a/var/spack/repos/builtin/packages/py-shap/package.py +++ b/var/spack/repos/builtin/packages/py-shap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyShap(PythonPackage): homepage = "https://github.com/slundberg/shap/" pypi = "shap/shap-0.41.0.tar.gz" + license("MIT") + version("0.41.0", sha256="a49ea4d65aadbc845a695fa3d7ea0bdfc8c928b8e213b0feedf5868ade4b3ca5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index a6282fc25e1a87..2a0614fce5f88a 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyShapely(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("main", branch="main") version("2.0.2", sha256="1713cc04c171baffc5b259ba8531c58acc2a301707b7f021d88a15ed090649e7") version("2.0.1", sha256="66a6b1a3e72ece97fc85536a281476f9b7794de2e646ca8a4517e2e3c1446893") diff --git a/var/spack/repos/builtin/packages/py-shared-memory38/package.py b/var/spack/repos/builtin/packages/py-shared-memory38/package.py deleted file mode 100644 index 61a012a50d789a..00000000000000 --- a/var/spack/repos/builtin/packages/py-shared-memory38/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PySharedMemory38(PythonPackage): - """Backport of multiprocessing.shared_memory for Python 3.6 and - 3.7. Simply import all things from shared_memory to make your code - work. Note that multiprocessing.managers.SharedMemoryManager is also - included under shared_memory package.""" - - homepage = "https://github.com/mars-project/shared_memory38" - pypi = "shared_memory38/shared_memory38-0.1.2.tar.gz" - - version("0.1.2", sha256="9d4f11fcb08cce059cc31fc8c70292b786a4cf9e411555b37077b7020f5d97e5") - - depends_on("python@3.6:3.7", type=("build", "run")) - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-shellescape/package.py b/var/spack/repos/builtin/packages/py-shellescape/package.py index 1d48430bc4b792..1845f9442858bd 100644 --- a/var/spack/repos/builtin/packages/py-shellescape/package.py +++ b/var/spack/repos/builtin/packages/py-shellescape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-shellingham/package.py b/var/spack/repos/builtin/packages/py-shellingham/package.py index 2047a1c18f44c8..5a6a35cd2a176f 100644 --- a/var/spack/repos/builtin/packages/py-shellingham/package.py +++ b/var/spack/repos/builtin/packages/py-shellingham/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyShellingham(PythonPackage): homepage = "https://github.com/sarugaku/shellingham" pypi = "shellingham/shellingham-1.4.0.tar.gz" + license("0BSD") + version("1.5.0", sha256="72fb7f5c63103ca2cb91b23dee0c71fe8ad6fbfd46418ef17dbe40db51592dad") version("1.4.0", sha256="4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e") diff --git a/var/spack/repos/builtin/packages/py-shiboken/package.py b/var/spack/repos/builtin/packages/py-shiboken/package.py index 0baaa1d89b4161..d8faeac4b76648 100644 --- a/var/spack/repos/builtin/packages/py-shiboken/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-shiboken2/package.py b/var/spack/repos/builtin/packages/py-shiboken2/package.py index fd5af62295750c..c29d1dc8497440 100644 --- a/var/spack/repos/builtin/packages/py-shiboken2/package.py +++ b/var/spack/repos/builtin/packages/py-shiboken2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-shippinglabel/package.py b/var/spack/repos/builtin/packages/py-shippinglabel/package.py index db9466c9d7064f..f0597414dbcb34 100644 --- a/var/spack/repos/builtin/packages/py-shippinglabel/package.py +++ b/var/spack/repos/builtin/packages/py-shippinglabel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyShippinglabel(PythonPackage): homepage = "https://github.com/domdfcoding/shippinglabel" pypi = "shippinglabel/shippinglabel-1.5.0.tar.gz" + license("MIT") + version("1.5.0", sha256="b2332bf29853e29f877dab21f17f2a8632fd2b48f5f32a6fa0b254a6fdd0a451") depends_on("py-wheel@0.34.2:", type="build") diff --git a/var/spack/repos/builtin/packages/py-shortbred/package.py b/var/spack/repos/builtin/packages/py-shortbred/package.py index 0d192c5ee550f3..8248a01575ea79 100644 --- a/var/spack/repos/builtin/packages/py-shortbred/package.py +++ b/var/spack/repos/builtin/packages/py-shortbred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyShortbred(PythonPackage): homepage = "https://huttenhower.sph.harvard.edu/shortbred/" pypi = "shortbred/shortbred-0.9.5.tar.gz" + license("MIT") + version("0.9.5", sha256="a6ac09b858f14e2c0b8622b122ec91e5d02d32c12429cad66626d7ef26df10d5") depends_on("python@2.7.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-shortuuid/package.py b/var/spack/repos/builtin/packages/py-shortuuid/package.py index 1dda2ae214cfa9..263f2dadd76857 100644 --- a/var/spack/repos/builtin/packages/py-shortuuid/package.py +++ b/var/spack/repos/builtin/packages/py-shortuuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyShortuuid(PythonPackage): homepage = "https://github.com/skorokithakis/shortuuid" url = "https://github.com/skorokithakis/shortuuid/archive/v1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.0.11", sha256="6ba28eece88d23389684585d73f3d883be3a76d6ab0c5d18ef34e5de2d500d0f") version("1.0.1", sha256="1253bdddf0d866e0bd8ea70989702772e09a78d5072b0490dfb6b3489750c157") version("1.0.0", sha256="cc2539aaed1b4de34853ee4aaf8331176b768a2d3a87d5a790453e082ce36850") diff --git a/var/spack/repos/builtin/packages/py-shroud/package.py b/var/spack/repos/builtin/packages/py-shroud/package.py index de73dbeb00d73d..1a6c64d9627f75 100644 --- a/var/spack/repos/builtin/packages/py-shroud/package.py +++ b/var/spack/repos/builtin/packages/py-shroud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyShroud(PythonPackage): git = "https://github.com/LLNL/shroud.git" tags = ["radiuss"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") version("0.12.2", tag="v0.12.2", commit="939ba0a3e8b5a885da3ddaebb92bf93cb12b0401") diff --git a/var/spack/repos/builtin/packages/py-shtab/package.py b/var/spack/repos/builtin/packages/py-shtab/package.py index 0dcc361688c7d4..52afbd30d7ffcc 100644 --- a/var/spack/repos/builtin/packages/py-shtab/package.py +++ b/var/spack/repos/builtin/packages/py-shtab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyShtab(PythonPackage): homepage = "https://github.com/iterative/shtab" pypi = "shtab/shtab-1.3.3.tar.gz" + license("Apache-2.0") + version("1.3.4", sha256="353f2a3a5178cd2df8eb746e7ab26a5039a9989e4386de8fd239d8c1653a8887") version("1.3.3", sha256="1f7f263631acdf0a9e685bbf7126a0fa711c2d663db12441670b1cea3fa431d4") diff --git a/var/spack/repos/builtin/packages/py-sierrapy/package.py b/var/spack/repos/builtin/packages/py-sierrapy/package.py index c8b2915cf7f954..f8481701cb8cbb 100644 --- a/var/spack/repos/builtin/packages/py-sierrapy/package.py +++ b/var/spack/repos/builtin/packages/py-sierrapy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-simpervisor/package.py b/var/spack/repos/builtin/packages/py-simpervisor/package.py index 9f108b76920453..9079f35a6d68ea 100644 --- a/var/spack/repos/builtin/packages/py-simpervisor/package.py +++ b/var/spack/repos/builtin/packages/py-simpervisor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySimpervisor(PythonPackage): homepage = "https://github.com/jupyterhub/simpervisor" pypi = "simpervisor/simpervisor-0.4.tar.gz" + license("BSD-3-Clause") + version("0.4", sha256="cec79e13cdbd6edb04a5c98c1ff8d4bd9713e706c069226909a1ef0e89d393c5") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-simpleeval/package.py b/var/spack/repos/builtin/packages/py-simpleeval/package.py index ae9637308b9ae4..2d9a46e35c8f03 100644 --- a/var/spack/repos/builtin/packages/py-simpleeval/package.py +++ b/var/spack/repos/builtin/packages/py-simpleeval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySimpleeval(PythonPackage): homepage = "https://github.com/danthedeckie/simpleeval" pypi = "simpleeval/simpleeval-0.9.12.tar.gz" + license("MIT") + version("0.9.12", sha256="3e0be507486d4e21cf9d08847c7e57dd61a1603950399985f7c5a0be7fd33e36") depends_on("py-setuptools@30.3.0:", type="build") diff --git a/var/spack/repos/builtin/packages/py-simplegeneric/package.py b/var/spack/repos/builtin/packages/py-simplegeneric/package.py index 86d1ca99e449a6..9c7f77a00a0af3 100644 --- a/var/spack/repos/builtin/packages/py-simplegeneric/package.py +++ b/var/spack/repos/builtin/packages/py-simplegeneric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySimplegeneric(PythonPackage): pypi = "simplegeneric/simplegeneric-0.8.zip" + license("ZPL-2.1") + version("0.8.1", sha256="dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173") version("0.8", sha256="8c0c4963da2695ba7c0f953f2cdac31d2c41d619fe9419e9d75432f8a231f966") diff --git a/var/spack/repos/builtin/packages/py-simplejson/package.py b/var/spack/repos/builtin/packages/py-simplejson/package.py index a5c52fc3bdcb5d..dcac15ee93f8bf 100644 --- a/var/spack/repos/builtin/packages/py-simplejson/package.py +++ b/var/spack/repos/builtin/packages/py-simplejson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySimplejson(PythonPackage): homepage = "https://github.com/simplejson/simplejson" pypi = "simplejson/simplejson-3.10.0.tar.gz" + license("AFL-2.1") + version("3.19.1", sha256="6277f60848a7d8319d27d2be767a7546bc965535b28070e310b3a9af90604a4c") version("3.18.0", sha256="58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31") version("3.17.2", sha256="75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841") diff --git a/var/spack/repos/builtin/packages/py-simplekml/package.py b/var/spack/repos/builtin/packages/py-simplekml/package.py index 660f66843f1ef0..ba5022fa7b973f 100644 --- a/var/spack/repos/builtin/packages/py-simplekml/package.py +++ b/var/spack/repos/builtin/packages/py-simplekml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySimplekml(PythonPackage): homepage = "https://readthedocs.org/projects/simplekml/" pypi = "simplekml/simplekml-1.3.1.tar.gz" + license("GPL-3.0-only") + version("1.3.6", sha256="cda687be2754395fcab664e908ebf589facd41e8436d233d2be37a69efb1c536") version("1.3.5", sha256="657b4e20177299a4e80bacfafff1f91102010bc23dc0ce7a7ae43bdd4246049e") version("1.3.1", sha256="30c121368ce1d73405721730bf766721e580cae6fbb7424884c734c89ec62ad7") diff --git a/var/spack/repos/builtin/packages/py-singledispatchmethod/package.py b/var/spack/repos/builtin/packages/py-singledispatchmethod/package.py index 55313924e47afa..13fdd59a925697 100644 --- a/var/spack/repos/builtin/packages/py-singledispatchmethod/package.py +++ b/var/spack/repos/builtin/packages/py-singledispatchmethod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySingledispatchmethod(PythonPackage): homepage = "https://github.com/ikalnytskyi/singledispatchmethod" pypi = "singledispatchmethod/singledispatchmethod-1.0.tar.gz" + license("MIT") + version("1.0", sha256="183a7fbeab53b9c9d182f8b8f9c2d7e109a7d40afaa30261d81dd8de68cd73bf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index e85f442127ec4d..966f8766fbcd68 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySip(PythonPackage): homepage = "https://www.riverbankcomputing.com/software/sip" pypi = "sip/sip-6.4.0.tar.gz" + license("GPL-2.0-or-later") + version("6.7.9", sha256="35d51fc10f599d3696abb50f29d068ad04763df7b77808c76b74597660f99b17") version("6.6.2", sha256="0e3efac1c5dfd8e525ae57140927df26993e13f58b89d1577c314f4105bfd90d") version("6.4.0", sha256="42ec368520b8da4a0987218510b1b520b4981e4405086c1be384733affc2bcb0") diff --git a/var/spack/repos/builtin/packages/py-six/package.py b/var/spack/repos/builtin/packages/py-six/package.py index 45ab78857c1707..5ed5870702b0a6 100644 --- a/var/spack/repos/builtin/packages/py-six/package.py +++ b/var/spack/repos/builtin/packages/py-six/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PySix(PythonPackage): pypi = "six/six-1.11.0.tar.gz" + license("MIT") + version("1.16.0", sha256="1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926") version("1.15.0", sha256="30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259") version("1.14.0", sha256="236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a") diff --git a/var/spack/repos/builtin/packages/py-skl2onnx/package.py b/var/spack/repos/builtin/packages/py-skl2onnx/package.py index 28c79e98750b08..3586b2755938e3 100644 --- a/var/spack/repos/builtin/packages/py-skl2onnx/package.py +++ b/var/spack/repos/builtin/packages/py-skl2onnx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySkl2onnx(PythonPackage): homepage = "https://github.com/onnx/sklearn-onnx" pypi = "skl2onnx/skl2onnx-1.10.3.tar.gz" + license("Apache-2.0") + version("1.12", sha256="15f4a07b97f7c5bf11b7353b8cb75c9f8c161485deb198cb49cc61a9d507c29c") version("1.10.3", sha256="798933378145412b9876ab3ff2c1dd5f241a7296406d786262000afa8d329628") diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index 9bf3413fceba4e..d987cc3d4c9b9b 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class PySlepc4py(PythonPackage): maintainers("joseeroman", "balay") + license("BSD-2-Clause") + version("main", branch="main") + version("3.20.1", sha256="7e6d156f7b0891bfa0616b38a502460c62797f16ca146b321e16cce4cf139d07") version("3.20.0", sha256="56cbea1f56746136e5a934bf4a481e566f35e475cb950c0a5bce7d5c3cc7690a") version("3.19.2", sha256="da8b6a7aaaf5e4497b896b2e478c42dd9de4fb31da93eb294181bea3bb60c767") version("3.19.1", sha256="68303f4acef8efc0542ab288a19159d0e6cdf313726f573e0bea2edb3d2c9595") diff --git a/var/spack/repos/builtin/packages/py-slicer/package.py b/var/spack/repos/builtin/packages/py-slicer/package.py index 3479da03a79266..e6c7e0c4ca15a0 100644 --- a/var/spack/repos/builtin/packages/py-slicer/package.py +++ b/var/spack/repos/builtin/packages/py-slicer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py index 891776bcf082a0..e9f02e5ebe8eca 100644 --- a/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-slurm-pipeline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySlurmPipeline(PythonPackage): homepage = "https://github.com/acorg/slurm-pipeline" pypi = "slurm-pipeline/slurm-pipeline-1.1.13.tar.gz" + license("MIT") + version("4.0.4", sha256="5496e46edb890ef745231b4d05b8dfd194374b3fe2c6b33da43cda9685f145c8") version("3.0.2", sha256="28e07eb93e846b395a16e6778fd3fc8344a82d115a6a8420276ec68f67f7131c") version("2.0.9", sha256="2360e43965ecfa3701f287b7d597c99b4accd4dc8faf9d55cfdcc2228c4054cc") diff --git a/var/spack/repos/builtin/packages/py-smac/package.py b/var/spack/repos/builtin/packages/py-smac/package.py index 53eac33d702819..5f28a21e679519 100644 --- a/var/spack/repos/builtin/packages/py-smac/package.py +++ b/var/spack/repos/builtin/packages/py-smac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySmac(PythonPackage): homepage = "https://automl.github.io/SMAC3/master/" pypi = "smac/smac-1.1.1.tar.gz" + license("BSD-3-Clause") + version("1.1.1", sha256="7b8c14c53384b32feb357b9f918a9b023cb01cbda2033e69125dee69ec0bd5b1") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-smart-open/package.py b/var/spack/repos/builtin/packages/py-smart-open/package.py index 4ec3e32a27d2ea..ba4950024c09f1 100644 --- a/var/spack/repos/builtin/packages/py-smart-open/package.py +++ b/var/spack/repos/builtin/packages/py-smart-open/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PySmartOpen(PythonPackage): pypi = "smart_open/smart_open-5.2.1.tar.gz" maintainers("marcusboden") + license("MIT") + version("5.2.1", sha256="75abf758717a92a8f53aa96953f0c245c8cedf8e1e4184903db3659b419d4c17") version("1.10.0", sha256="bea5624c0c2e49987c227bdf3596573157eccd96fd1d53198856c8d53948fa2c") version("1.8.4", sha256="788e07f035defcbb62e3c1e313329a70b0976f4f65406ee767db73ad5d2d04f9") diff --git a/var/spack/repos/builtin/packages/py-smartredis/package.py b/var/spack/repos/builtin/packages/py-smartredis/package.py index 12969a04540551..f45b38572c4c88 100644 --- a/var/spack/repos/builtin/packages/py-smartredis/package.py +++ b/var/spack/repos/builtin/packages/py-smartredis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySmartredis(PythonPackage): maintainers("MattToast") + license("BSD-2-Clause") + version("0.4.1", sha256="fff16ed1eb09648ac3c3f845373beb37f3ffe7414d8745ae36af9daf585f8c5b") version("0.4.0", sha256="d12779aa8bb038e837c25eac41b178aab9e16b729d50ee360b5af8f813d9f1dd") diff --git a/var/spack/repos/builtin/packages/py-smartsim/package.py b/var/spack/repos/builtin/packages/py-smartsim/package.py index 4011e0c8dc521d..8014fe9da11b35 100644 --- a/var/spack/repos/builtin/packages/py-smartsim/package.py +++ b/var/spack/repos/builtin/packages/py-smartsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PySmartsim(PythonPackage): maintainers("MattToast") + license("BSD-2-Clause") + version("0.5.0", sha256="35b36243dc84af62261a7f772bae92f0b3502faf01401423899cb2a48339858c") variant("torch", default=True, description="Build with the pytorch backend") diff --git a/var/spack/repos/builtin/packages/py-smartypants/package.py b/var/spack/repos/builtin/packages/py-smartypants/package.py index 163e7ab84a31d2..e9866c088f7e06 100644 --- a/var/spack/repos/builtin/packages/py-smartypants/package.py +++ b/var/spack/repos/builtin/packages/py-smartypants/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySmartypants(PythonPackage): # PyPI only has the wheel url = "https://github.com/leohemsted/smartypants.py/archive/refs/tags/v2.0.1.tar.gz" + license("BSD-3-Clause") + version("2.0.1", sha256="b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-smmap/package.py b/var/spack/repos/builtin/packages/py-smmap/package.py index 4d1ed67606908c..7154f473f45b15 100644 --- a/var/spack/repos/builtin/packages/py-smmap/package.py +++ b/var/spack/repos/builtin/packages/py-smmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySmmap(PythonPackage): homepage = "https://github.com/gitpython-developers/smmap" pypi = "smmap/smmap-3.0.4.tar.gz" + license("BSD-3-Clause") + version("5.0.0", sha256="c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936") version("4.0.0", sha256="7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182") version("3.0.5", sha256="84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50") diff --git a/var/spack/repos/builtin/packages/py-snappy/package.py b/var/spack/repos/builtin/packages/py-snappy/package.py index 96eda5507dcda2..5a17df0dc4d071 100644 --- a/var/spack/repos/builtin/packages/py-snappy/package.py +++ b/var/spack/repos/builtin/packages/py-snappy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySnappy(PythonPackage): homepage = "https://github.com/ethereum/py-snappy" url = "https://github.com/ethereum/py-snappy/archive/v0.1.0-alpha.1.tar.gz" + license("MIT") + version( "0.1.0-alpha.1", sha256="f94c5bfc0b2bb42f7d442f0d84c9ffd9aa92876632d415612f25bafa61ddcfc4" ) diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py index 556baa9b0450b5..802be084b43807 100644 --- a/var/spack/repos/builtin/packages/py-sncosmo/package.py +++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySncosmo(PythonPackage): homepage = "https://sncosmo.readthedocs.io/" pypi = "sncosmo/sncosmo-1.2.0.tar.gz" + license("BSD-3-Clause") + version("1.2.0", sha256="f3969eec5b25f60c70418dbd64765a2b4735bb53c210c61d0aab68916daea588") # Required dependencies diff --git a/var/spack/repos/builtin/packages/py-sniffio/package.py b/var/spack/repos/builtin/packages/py-sniffio/package.py index 6d71606df43734..726a188bece836 100644 --- a/var/spack/repos/builtin/packages/py-sniffio/package.py +++ b/var/spack/repos/builtin/packages/py-sniffio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySniffio(PythonPackage): homepage = "https://github.com/python-trio/sniffio" pypi = "sniffio/sniffio-1.1.0.tar.gz" + license("Apache-2.0") + version("1.3.0", sha256="e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101") version("1.2.0", sha256="c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de") version("1.1.0", sha256="8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21") diff --git a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py index 593a1f8e2e0cf4..7cc879d5a5e3a6 100644 --- a/var/spack/repos/builtin/packages/py-snowballstemmer/package.py +++ b/var/spack/repos/builtin/packages/py-snowballstemmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySnowballstemmer(PythonPackage): homepage = "https://github.com/snowballstem/snowball" pypi = "snowballstemmer/snowballstemmer-2.0.0.tar.gz" + license("BSD-3-Clause") + version("2.2.0", sha256="09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1") version("2.0.0", sha256="df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52") version("1.2.1", sha256="919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128") diff --git a/var/spack/repos/builtin/packages/py-snuggs/package.py b/var/spack/repos/builtin/packages/py-snuggs/package.py index 1af692ae3f3e47..87b8ee19d7bba3 100644 --- a/var/spack/repos/builtin/packages/py-snuggs/package.py +++ b/var/spack/repos/builtin/packages/py-snuggs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySnuggs(PythonPackage): homepage = "https://github.com/mapbox/snuggs" url = "https://github.com/mapbox/snuggs/archive/1.4.1.zip" + license("MIT") + version("1.4.1", sha256="b37ed4e11c5f372695dc6fe66fce6cede124c90a920fe4726c970c9293b71233") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sobol-seq/package.py b/var/spack/repos/builtin/packages/py-sobol-seq/package.py index 9949b4275c9583..627b4513b93050 100644 --- a/var/spack/repos/builtin/packages/py-sobol-seq/package.py +++ b/var/spack/repos/builtin/packages/py-sobol-seq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySobolSeq(PythonPackage): homepage = "https://github.com/naught101/sobol_seq" pypi = "sobol_seq/sobol_seq-0.2.0.tar.gz" + license("MIT") + version("0.2.0", sha256="e16e701bd7b03ec6ce65b3a64c9205799f6a2d00c2054dd8c4ff4343f3981172") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-social-auth-core/package.py b/var/spack/repos/builtin/packages/py-social-auth-core/package.py index 1db319e0e38b99..1a4bc24ba9b370 100644 --- a/var/spack/repos/builtin/packages/py-social-auth-core/package.py +++ b/var/spack/repos/builtin/packages/py-social-auth-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySocialAuthCore(PythonPackage): homepage = "https://github.com/python-social-auth/social-core" pypi = "social-auth-core/social-auth-core-4.3.0.tar.gz" + license("BSD-3-Clause") + version("4.3.0", sha256="4686f0e43cf12954216875a32e944847bb1dc69e7cd9573d16a9003bb05ca477") version("4.0.3", sha256="694eb355825cd72d3346afb816dd899493be1a8ee7405945d2e989cabed10cf2") diff --git a/var/spack/repos/builtin/packages/py-sonlib/package.py b/var/spack/repos/builtin/packages/py-sonlib/package.py index 3985a99b05ddbd..73c2457b61f1f1 100644 --- a/var/spack/repos/builtin/packages/py-sonlib/package.py +++ b/var/spack/repos/builtin/packages/py-sonlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PySonlib(PythonPackage): url = "https://github.com/ComparativeGenomicsToolkit/sonLib" git = "https://github.com/ComparativeGenomicsToolkit/sonLib.git" + license("MIT") + version("devel", branch="master") version("20200401", commit="7ebe2ede05a6ee366d93a7a993db69a99943a68f") diff --git a/var/spack/repos/builtin/packages/py-sortedcollections/package.py b/var/spack/repos/builtin/packages/py-sortedcollections/package.py index ce29801739dce3..59f6792d0eae2f 100644 --- a/var/spack/repos/builtin/packages/py-sortedcollections/package.py +++ b/var/spack/repos/builtin/packages/py-sortedcollections/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySortedcollections(PythonPackage): homepage = "http://www.grantjenks.com/docs/sortedcollections/" pypi = "sortedcollections/sortedcollections-1.2.1.tar.gz" + license("Apache-2.0") + version("1.2.1", sha256="58c31f35e3d052ada6a1fbfc235a408e9ec5e2cfc64a02731cf97cac4afd306a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sortedcontainers/package.py b/var/spack/repos/builtin/packages/py-sortedcontainers/package.py index cccdc10fc54fd9..fd4facbd14e488 100644 --- a/var/spack/repos/builtin/packages/py-sortedcontainers/package.py +++ b/var/spack/repos/builtin/packages/py-sortedcontainers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class PySortedcontainers(PythonPackage): homepage = "http://www.grantjenks.com/docs/sortedcontainers/" pypi = "sortedcontainers/sortedcontainers-2.1.0.tar.gz" + license("Apache-2.0") + + version("2.4.0", sha256="25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88") version("2.1.0", sha256="974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-soundfile/package.py b/var/spack/repos/builtin/packages/py-soundfile/package.py index 66f0a132c97189..139629e2dfb3af 100644 --- a/var/spack/repos/builtin/packages/py-soundfile/package.py +++ b/var/spack/repos/builtin/packages/py-soundfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySoundfile(PythonPackage): homepage = "https://github.com/bastibe/PySoundFile" pypi = "SoundFile/SoundFile-0.10.3.post1.tar.gz" + license("BSD-3-Clause") + version( "0.10.3.post1", sha256="490cff42650733d1832728b937fe99fa1802896f5ef4d61bcf78cf7ebecb107b" ) diff --git a/var/spack/repos/builtin/packages/py-soupsieve/package.py b/var/spack/repos/builtin/packages/py-soupsieve/package.py index 03da213c5e6316..1e3cba5f061bd1 100644 --- a/var/spack/repos/builtin/packages/py-soupsieve/package.py +++ b/var/spack/repos/builtin/packages/py-soupsieve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,11 @@ class PySoupsieve(PythonPackage): homepage = "https://github.com/facelessuser/soupsieve" pypi = "soupsieve/soupsieve-1.9.3.tar.gz" + license("MIT") + + # Circular dependency on beautifulsoup4 + skip_modules = ["soupsieve"] + version("2.4.1", sha256="89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea") version( "2.3.2.post1", sha256="fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d" diff --git a/var/spack/repos/builtin/packages/py-soyclustering/package.py b/var/spack/repos/builtin/packages/py-soyclustering/package.py index f7b48d3e46e582..4d45baea550bc2 100644 --- a/var/spack/repos/builtin/packages/py-soyclustering/package.py +++ b/var/spack/repos/builtin/packages/py-soyclustering/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spacy-legacy/package.py b/var/spack/repos/builtin/packages/py-spacy-legacy/package.py index 407f197e54e5d9..0e93fb6c195779 100644 --- a/var/spack/repos/builtin/packages/py-spacy-legacy/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySpacyLegacy(PythonPackage): homepage = "https://spacy.io/" pypi = "spacy-legacy/spacy-legacy-3.0.12.tar.gz" + license("MIT") + version("3.0.12", sha256="b37d6e0c9b6e1d7ca1cf5bc7152ab64a4c4671f59c85adaf7a3fcb870357a774") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-spacy-loggers/package.py b/var/spack/repos/builtin/packages/py-spacy-loggers/package.py index 9792876105fa45..7f177d4e965861 100644 --- a/var/spack/repos/builtin/packages/py-spacy-loggers/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-loggers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySpacyLoggers(PythonPackage): homepage = "https://github.com/explosion/spacy-loggers" pypi = "spacy-loggers/spacy-loggers-1.0.4.tar.gz" + license("MIT") + version("1.0.4", sha256="e6f983bf71230091d5bb7b11bf64bd54415eca839108d5f83d9155d0ba93bf28") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py index d1a695e4c3337d..002aa6b26afbd0 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py index 5097d8fbfb6fc4..56e03e5d4a9e1a 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spacy/package.py b/var/spack/repos/builtin/packages/py-spacy/package.py index 99548308f7e6c0..d0c4badc8ba53c 100644 --- a/var/spack/repos/builtin/packages/py-spacy/package.py +++ b/var/spack/repos/builtin/packages/py-spacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySpacy(PythonPackage): homepage = "https://spacy.io/" pypi = "spacy/spacy-2.3.2.tar.gz" + license("MIT") + version("2.3.7", sha256="c0f2315fea23497662e28212f89af3a03667f97c867c597b599c37ab84092e22") version("2.3.2", sha256="818de26e0e383f64ccbe3db185574920de05923d8deac8bbb12113b9e33cee1f") version("2.2.4", sha256="f0f3a67c5841e6e35d62c98f40ebb3d132587d3aba4f4dccac5056c4e90ff5b9") diff --git a/var/spack/repos/builtin/packages/py-sparse/package.py b/var/spack/repos/builtin/packages/py-sparse/package.py index 417e9a79c8c495..d49404c458ff8f 100644 --- a/var/spack/repos/builtin/packages/py-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySparse(PythonPackage): homepage = "https://sparse.pydata.org" url = "https://github.com/pydata/sparse/archive/0.11.2.tar.gz" + license("BSD-3-Clause") + version("0.11.2", sha256="365b6f038c4d331b3913e5fb00f5bc5dc5eadc49ef2feef332214f9bf33dbc82") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-spatialist/package.py b/var/spack/repos/builtin/packages/py-spatialist/package.py index 5f40abdd3a592e..9e941420c8babb 100644 --- a/var/spack/repos/builtin/packages/py-spatialist/package.py +++ b/var/spack/repos/builtin/packages/py-spatialist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spatialite/package.py b/var/spack/repos/builtin/packages/py-spatialite/package.py index c517dca4558770..eb022c30849f55 100644 --- a/var/spack/repos/builtin/packages/py-spatialite/package.py +++ b/var/spack/repos/builtin/packages/py-spatialite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySpatialite(PythonPackage): homepage = "https://github.com/malexer/spatialite" pypi = "spatialite/spatialite-0.0.3.tar.gz" + license("MIT") + version("0.0.3", sha256="a0761f239a52f326b14ce41ba61b6614dfcc808b978a0bec4a37c1de9ad9071e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-spdlog/package.py b/var/spack/repos/builtin/packages/py-spdlog/package.py index c8430deb7310e3..ec4282228631b8 100644 --- a/var/spack/repos/builtin/packages/py-spdlog/package.py +++ b/var/spack/repos/builtin/packages/py-spdlog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PySpdlog(PythonPackage): # this package depend on it. There is an issue for that on the py-spdlog # github repository: https://github.com/bodgergely/spdlog-python/issues/19 + license("MIT") + version("master", branch="master", submodules=True) version("2.0.0", sha256="b8d3732839850da414a47e91547ee1246f0690cb83f43f11a1fbaec40b7b968c") diff --git a/var/spack/repos/builtin/packages/py-spectra/package.py b/var/spack/repos/builtin/packages/py-spectra/package.py index 3781d283582f37..c7d5c765d73860 100644 --- a/var/spack/repos/builtin/packages/py-spectra/package.py +++ b/var/spack/repos/builtin/packages/py-spectra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PySpectra(PythonPackage): pypi = "spectra/spectra-0.0.8.tar.gz" + license("MIT") + version("0.0.11", sha256="8eb362a5187cb63cee13cd01186799c0c791a3ad3bec57b279132e12521762b8") version("0.0.8", sha256="851b88c9c0bba84e0be1fce5b9c02a7b4ef139a2b3e590b0d082d679e19f0759") diff --git a/var/spack/repos/builtin/packages/py-spectral/package.py b/var/spack/repos/builtin/packages/py-spectral/package.py index 7d0b3dfe11f02b..10652489f6eaa8 100644 --- a/var/spack/repos/builtin/packages/py-spectral/package.py +++ b/var/spack/repos/builtin/packages/py-spectral/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PySpectral(PythonPackage): homepage = "http://www.spectralpython.net/" pypi = "spectral/spectral-0.22.4.tar.gz" + license("MIT") + version("0.22.4", sha256="b208ffd1042e32fd2276a35e098e3df26a5f6ff1310b829e97d222c66645a9af") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-speech-recognition/package.py b/var/spack/repos/builtin/packages/py-speech-recognition/package.py index 2b81ad2d5a682f..3ca7ca466af1ef 100644 --- a/var/spack/repos/builtin/packages/py-speech-recognition/package.py +++ b/var/spack/repos/builtin/packages/py-speech-recognition/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySpeechRecognition(PythonPackage): homepage = "https://github.com/Uberi/speech_recognition" url = "https://github.com/Uberi/speech_recognition/archive/refs/tags/3.8.1.tar.gz" + license("BSD-3-Clause") + version("3.8.1", sha256="82d3313db383409ddaf3e42625fb0c3518231a1feb5e2ed5473b10b3d5ece7bd") depends_on("python@2.6:2,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-spefile/package.py b/var/spack/repos/builtin/packages/py-spefile/package.py index c8a2831cccd0e4..855a0adbf777ed 100644 --- a/var/spack/repos/builtin/packages/py-spefile/package.py +++ b/var/spack/repos/builtin/packages/py-spefile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySpefile(PythonPackage): homepage = "https://github.com/conda-forge/spefile-feedstock" git = "https://github.com/conda-forge/spefile-feedstock.git" + license("BSD-3-Clause") + version("1.6", commit="24394e066da8dee5e7608f556ca0203c9db217f9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-spgl1/package.py b/var/spack/repos/builtin/packages/py-spgl1/package.py index 8d733114572758..a21169648f2264 100644 --- a/var/spack/repos/builtin/packages/py-spgl1/package.py +++ b/var/spack/repos/builtin/packages/py-spgl1/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PySpgl1(PythonPackage): maintainers("archxlith") + license("LGPL-2.1-or-later") + version("master", branch="master") version("0.0.2", sha256="a2a524724097bad18dd88a306dbcc99124c6c46ffcbb1a96d6ba6dd6fe2f7404") version("0.0.1", sha256="24ff37ab5be57f0ccf14c53090b171e019c3c12799c80f368e628e1cc9ac9a1f") diff --git a/var/spack/repos/builtin/packages/py-spglib/package.py b/var/spack/repos/builtin/packages/py-spglib/package.py index d8b5e9f9c085b3..eb65819c927b18 100644 --- a/var/spack/repos/builtin/packages/py-spglib/package.py +++ b/var/spack/repos/builtin/packages/py-spglib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySpglib(PythonPackage): pypi = "spglib/spglib-1.9.9.18.tar.gz" git = "https://github.com/spglib/spglib.git" + license("BSD-3-Clause") + version("2.0.2", sha256="1d081ec22da4ab4fc3198e9445ddad6dec2261c43927831151d93e39422610aa") version("1.16.1", sha256="9fd2fefbd83993b135877a69c498d8ddcf20a9980562b65b800cfb4cdadad003") version("1.9.9.18", sha256="cbbb8383320b500dc6100b83d5e914a26a97ef8fc97c82d8921b10220e4126cd") diff --git a/var/spack/repos/builtin/packages/py-spherical/package.py b/var/spack/repos/builtin/packages/py-spherical/package.py index ee562f077ac34a..a307abd81e58cc 100644 --- a/var/spack/repos/builtin/packages/py-spherical/package.py +++ b/var/spack/repos/builtin/packages/py-spherical/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySpherical(PythonPackage): maintainers("nilsvu", "moble") + license("MIT") + version("1.0.10", sha256="a7f1d902aa89fd51174a0c69b2379c352d229bf7e088907e8eb4461ad227d95f") depends_on("python@3.6:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py b/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py index f5c9ffdd3a7240..5938f9b782363a 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-argparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySphinxArgparse(PythonPackage): maintainers("sethrj") + license("MIT") + version("0.3.1", sha256="82151cbd43ccec94a1530155f4ad34f251aaca6a0ffd5516d7fadf952d32dc1e") depends_on("python@2.7.0:2.7,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py b/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py index e0018bfb7fe563..4837e217705473 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-autodoc-typehints/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySphinxAutodocTypehints(PythonPackage): homepage = "https://github.com/agronholm/sphinx-autodoc-typehints" pypi = "sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.tar.gz" + license("MIT") + version("1.12.0", sha256="193617d9dbe0847281b1399d369e74e34cd959c82e02c7efde077fca908a9f52") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-basic-ng/package.py b/var/spack/repos/builtin/packages/py-sphinx-basic-ng/package.py index 34909e4725a19f..95b513da00fcf4 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-basic-ng/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-basic-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxBasicNg(PythonPackage): homepage = "https://github.com/pradyunsg/sphinx-basic-ng" pypi = "sphinx_basic_ng/sphinx_basic_ng-1.0.0b2.tar.gz" + license("MIT") + version("1.0.0b2", sha256="9ec55a47c90c8c002b5960c57492ec3021f5193cb26cebc2dc4ea226848651c9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx-book-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-book-theme/package.py index d34efeb4aefc3f..3cea973db23003 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-book-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-book-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxBookTheme(PythonPackage): homepage = "https://sphinx-book-theme.readthedocs.io/en/latest" pypi = "sphinx_book_theme/sphinx_book_theme-1.0.1.tar.gz" + license("BSD-3-Clause") + version("1.0.1", sha256="927b399a6906be067e49c11ef1a87472f1b1964075c9eea30fb82c64b20aedee") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py index 70ae039261ba6d..f41048b5b10aaa 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-bootstrap-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PySphinxBootstrapTheme(PythonPackage): pypi = "sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.13.tar.gz" + license("MIT") + version("0.4.13", sha256="47f7719e56304026f285455bbb115525d227a6e23341d4b7f6f0b48b2eface82") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py b/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py index 80adb420539915..78dd3fb1d5af67 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-copybutton/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxCopybutton(PythonPackage): homepage = "https://github.com/choldgraf/sphinx-copybutton" pypi = "sphinx-copybutton/sphinx-copybutton-0.2.12.tar.gz" + license("MIT") + version("0.2.12", sha256="9492883786984b6179c92c07ab0410237b26efa826adfa792acfd17b91a63e5c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx-design/package.py b/var/spack/repos/builtin/packages/py-sphinx-design/package.py index 72538132bb9071..11853e7b495665 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-design/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-design/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySphinxDesign(PythonPackage): maintainers("ax3l", "adamjstewart") + license("MIT") + version("0.4.1", sha256="5b6418ba4a2dc3d83592ea0ff61a52a891fe72195a4c3a18b2fa1c7668ce4708") version("0.4.0", sha256="b92948614900967499617d99aadd38ce5975ede924a18c7478cc6b8ec188f76b") version("0.3.0", sha256="7183fa1fae55b37ef01bda5125a21ee841f5bbcbf59a35382be598180c4cefba") diff --git a/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py b/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py index 772dde480156f5..b155f6bcb748b4 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-gallery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySphinxGallery(PythonPackage): homepage = "https://sphinx-gallery.github.io" pypi = "sphinx-gallery/sphinx-gallery-0.7.0.tar.gz" + license("BSD-3-Clause") + version("0.7.0", sha256="05ead72c947718ab4183c33a598e29743e771dcf75aec84c53048423bd2f4580") version("0.4.0", sha256="a286cf2eea47ce838a0754ecef617616afb1f40e41e52fe765723464f52e0c2f") diff --git a/var/spack/repos/builtin/packages/py-sphinx-immaterial/package.py b/var/spack/repos/builtin/packages/py-sphinx-immaterial/package.py index e41aef8c453478..a198b6ada8d040 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-immaterial/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-immaterial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxImmaterial(PythonPackage): homepage = "https://github.com/jbms/sphinx-immaterial" pypi = "sphinx_immaterial/sphinx_immaterial-0.11.2.tar.gz" + license("MIT") + version("0.11.2", sha256="a1c8387ca8b4da282949e474647d06f3b2f7d12fe54e9e662b962771012bf257") depends_on("python@3.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-jinja2-compat/package.py b/var/spack/repos/builtin/packages/py-sphinx-jinja2-compat/package.py new file mode 100644 index 00000000000000..5ed63871e81d83 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinx-jinja2-compat/package.py @@ -0,0 +1,24 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PySphinxJinja2Compat(PythonPackage): + """Patches Jinja2 v3 to restore compatibility with earlier Sphinx versions.""" + + homepage = "https://github.com/sphinx-toolbox/sphinx-jinja2-compat" + pypi = "sphinx_jinja2_compat/sphinx_jinja2_compat-0.2.0.tar.gz" + + maintainers("LydDeb") + + license("MIT") + + version("0.2.0", sha256="c41346d859653e202b623f4236da8936243ed734abf5984adc3bef59d6f9a946") + + depends_on("py-whey", type="build") + depends_on("py-whey-pth", type="build") + depends_on("py-jinja2@2.10:", type=("build", "run")) + depends_on("py-markupsafe@1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py b/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py index 4665cc51a72356..f94339db2f4a1a 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-multiversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-sphinx-prompt/package.py b/var/spack/repos/builtin/packages/py-sphinx-prompt/package.py new file mode 100644 index 00000000000000..0e86fc32ef161f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinx-prompt/package.py @@ -0,0 +1,35 @@ +# 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 PySphinxPrompt(PythonPackage): + """Sphinx directive to add unselectable prompt.""" + + homepage = "https://github.com/sbrunner/sphinx-prompt" + pypi = "sphinx_prompt/sphinx_prompt-1.8.0.tar.gz" + + maintainers("LydDeb") + + version("1.8.0", sha256="47482f86fcec29662fdfd23e7c04ef03582714195d01f5d565403320084372ed") + version("1.1.0", sha256="3d9cf382b750291f73d1f6f1713c4af0557c30208af124cd3d8731e607a4febf") + + depends_on("python@3.9:3", when="@1.8.0", type=("build", "run")) + depends_on("py-poetry-core@1.0.0:", when="@1.8.0", type="build") + depends_on("py-poetry-plugin-tweak-dependencies-version", when="@1.8.0", type="build") + depends_on("py-poetry-dynamic-versioning", when="@1.8.0", type="build") + depends_on("py-sphinx@7.2.5", when="@1.8.0", type=("build", "run")) + depends_on("py-sphinx", when="@1.1.0", type=("build", "run")) + depends_on("py-pygments@2.16.1", when="@1.8.0", type=("build", "run")) + depends_on("py-pygments", when="@1.1.0", type=("build", "run")) + depends_on("py-docutils@0.20.1", when="@1.8.0", type=("build", "run")) + + def url_for_version(self, version): + if version >= Version("1.6"): + url = "https://files.pythonhosted.org/packages/source/s/sphinx_prompt/sphinx_prompt-{0}.tar.gz" + else: + url = "https://files.pythonhosted.org/packages/source/s/sphinx_prompt/sphinx-prompt-{0}.tar.gz" + return url.format(version) diff --git a/var/spack/repos/builtin/packages/py-sphinx-removed-in/package.py b/var/spack/repos/builtin/packages/py-sphinx-removed-in/package.py new file mode 100644 index 00000000000000..46969d8b210bdd --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinx-removed-in/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PySphinxRemovedIn(PythonPackage): + """versionremoved and removed-in directives for Sphinx.""" + + homepage = "https://github.com/MrSenko/sphinx-removed-in" + pypi = "sphinx-removed-in/sphinx-removed-in-0.2.1.tar.gz" + + maintainers("LydDeb") + + version("0.2.1", sha256="0588239cb534cd97b1d3900d0444311c119e45296a9f73f1ea81ea81a2cd3db1") + + depends_on("py-setuptools", type="build") + depends_on("py-sphinx", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-dark-mode/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-dark-mode/package.py index bbb3f6b2880ea8..051636808441aa 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-dark-mode/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-dark-mode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxRtdDarkMode(PythonPackage): homepage = "https://github.com/MrDogeBro/sphinx_rtd_dark_mode" pypi = "sphinx-rtd-dark-mode/sphinx_rtd_dark_mode-1.2.4.tar.gz" + license("MIT") + version("1.2.4", sha256="935bc1f3e62fc76eadd7d2760ac7f48bab907a97e44beda749a48a2706aeed63") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py index 0e3c468b046a4c..abb3fc6911a118 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxRtdTheme(PythonPackage): homepage = "https://github.com/readthedocs/sphinx_rtd_theme" pypi = "sphinx-rtd-theme/sphinx_rtd_theme-0.5.1.tar.gz" + license("MIT") + version("1.2.2", sha256="01c5c5a72e2d025bd23d1f06c59a4831b06e6ce6c01fdd5ebfe9986c0a880fc7") version("1.2.0", sha256="a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8") version("1.0.0", sha256="eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c") diff --git a/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py b/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py index fe81e4f61a8068..43450c75388f3a 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-tabs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PySphinxTabs(PythonPackage): maintainers("schmitts") + license("MIT") + version("3.2.0", sha256="33137914ed9b276e6a686d7a337310ee77b1dae316fdcbce60476913a152e0a4") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx-theme-builder/package.py b/var/spack/repos/builtin/packages/py-sphinx-theme-builder/package.py index ce873cac3f2f16..d24e5d54328963 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-theme-builder/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-theme-builder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySphinxThemeBuilder(PythonPackage): pypi = "sphinx-theme-builder/sphinx-theme-builder-0.2.0b2.tar.gz" git = "https://github.com/pradyunsg/sphinx-theme-builder" + license("MIT") + version("0.2.0b2", sha256="e9cd98c2bb35bf414fe721469a043cdcc10f0808d1ffcf606acb4a6282a6f288") depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx-toolbox/package.py b/var/spack/repos/builtin/packages/py-sphinx-toolbox/package.py new file mode 100644 index 00000000000000..d91cad45f59f42 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinx-toolbox/package.py @@ -0,0 +1,38 @@ +# 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 PySphinxToolbox(PythonPackage): + """Box of handy tools for Sphinx.""" + + homepage = "https://github.com/sphinx-toolbox/sphinx-toolbox" + pypi = "sphinx_toolbox/sphinx_toolbox-3.4.0.tar.gz" + + maintainers("LydDeb") + + version("3.4.0", sha256="e1cf2a3dea5ce80e175a6a9cee8b5b2792240ecf6c28993d87a63b6fcf606293") + + depends_on("py-whey", type="build") + + depends_on("py-apeye@0.4.0:", type=("build", "run")) + depends_on("py-autodocsumm@0.2.0:", type=("build", "run")) + depends_on("py-beautifulsoup4@4.9.1:", type=("build", "run")) + depends_on("py-cachecontrol@0.12.6:+filecache", type=("build", "run")) + depends_on("py-dict2css@0.2.3:", type=("build", "run")) + depends_on("py-docutils@0.16:0.18", type=("build", "run")) + depends_on("py-domdf-python-tools@2.9.0:", type=("build", "run")) + depends_on("py-html5lib@1.1:", type=("build", "run")) + depends_on("py-lockfile@0.12.2:", type=("build", "run")) + depends_on("py-ruamel-yaml@0.16.12:", type=("build", "run")) + depends_on("py-sphinx@3.2.0:", type=("build", "run")) + depends_on("py-sphinx-autodoc-typehints@1.11.1:", type=("build", "run")) + depends_on("py-sphinx-jinja2-compat@0.1.0:", type=("build", "run")) + depends_on("py-sphinx-prompt@1.1.0:", type=("build", "run")) + depends_on("py-sphinx-tabs@1.2.1:3.4", type=("build", "run")) + depends_on("py-tabulate@0.8.7:", type=("build", "run")) + depends_on("py-typing-extensions@3.7.4.3:3.10.0.0,3.10.0.2:", type=("build", "run")) + depends_on("py-typing-inspect@0.6.0:", when="^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 9b0e1eb323070a..2e5f84e0d4b116 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,11 @@ class PySphinx(PythonPackage): maintainers("adamjstewart") + license("BSD-2-Clause") + + version("7.2.6", sha256="9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5") + version("7.2.5", sha256="1a9290001b75c497fd087e92b0334f1bbfa1a1ae7fddc084990c4b7bd1130b88") + version("7.2.4", sha256="1aeec862bf1edff4374012ac38082e0d1daa066c9e327841a846401164797988") version("7.2.3", sha256="ece68bb4d77b7dc090573825db45a6f9183e74098d1c21573485de250b1d1e3f") version("7.2.2", sha256="1c0abe6d4de7a6b2c2b109a2e18387bf27b240742e1b34ea42ac3ed2ac99978c") version("7.2.1", sha256="dad5e865dcdeb1486f70d8963cc9140561836bb243c311868cf11eb0f741497a") diff --git a/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py b/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py index 7a73aa568477cf..fe970c35c7ca46 100644 --- a/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxautomodapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxautomodapi(PythonPackage): homepage = "https://sphinx-automodapi.readthedocs.io/en/latest/" pypi = "sphinx-automodapi/sphinx-automodapi-0.9.tar.gz" + license("BSD-3-Clause") + version("0.9", sha256="71a69e1a7ab8d849f416d7431db854d7b1925f749ba6345bc7d88f288892871d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py index 135ad47b86ee55..e84d9762baadb4 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PySphinxcontribApplehelp(PythonPackage): # import any modules for this package. import_modules: List[str] = [] + license("BSD-2-Clause") + version("1.0.4", sha256="828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e") version("1.0.2", sha256="a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58") version("1.0.1", sha256="edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py index 34217ecdde1dd6..492bf2b3175ff3 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py index 6239d1dbbb3fdd..5821a4002bb3dc 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PySphinxcontribDevhelp(PythonPackage): # import any modules. import_modules: List[str] = [] + license("BSD-2-Clause") + version("1.0.2", sha256="ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4") version("1.0.1", sha256="6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py index 9dd8b950813881..036c046c8270d9 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PySphinxcontribHtmlhelp(PythonPackage): # import any modules. import_modules: List[str] = [] + license("BSD-2-Clause") + version("2.0.1", sha256="0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff") version("2.0.0", sha256="f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2") version("1.0.2", sha256="4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py index 92f5e9444d22f1..e16c3a9d827765 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-issuetracker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxcontribIssuetracker(PythonPackage): homepage = "https://sphinxcontrib-issuetracker.readthedocs.org/" pypi = "sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz" + license("BSD-2-Clause") + version("0.11", sha256="843753d8b5e989116378ab45ecccb368fb78dc56eaa1554ed25e4fbf22745f4e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py index 6a11a319989596..596a54ce0b3a58 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py index 6072e2f81cfa13..bdc862fb1d4087 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-jsmath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PySphinxcontribJsmath(PythonPackage): # import any modules. import_modules: List[str] = [] + license("BSD-2-Clause") + version("1.0.1", sha256="a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py index f9b5e2e8311dfe..9a1ec4ce3f4838 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-mermaid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-moderncmakedomain/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-moderncmakedomain/package.py new file mode 100644 index 00000000000000..230f249781cd6d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-moderncmakedomain/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PySphinxcontribModerncmakedomain(PythonPackage): + """Sphinx Domain for Modern CMake.""" + + homepage = "https://github.com/scikit-build/moderncmakedomain" + pypi = "sphinxcontrib_moderncmakedomain/sphinxcontrib_moderncmakedomain-3.25.0.tar.gz" + + maintainers("LydDeb") + + license("BSD-3-Clause") + + version("3.27.0", sha256="51e259e91f58d17cc0fac9307fd40106aa59d5acaa741887903fc3660361d1a1") + version("3.26.4", sha256="c4a62d586ed1a9baf1790b816fcc04c249dd3ac239bc7c7b79663951a0a463b8") + version("3.25.0", sha256="4138e4d3f60e5c4b3982caa10033693bfc1009cdd851766754d5990d9d1e992a") + + depends_on("py-hatchling", type="build") + depends_on("py-sphinx@2:", when="@3.27:", type=("build", "run")) + depends_on("py-sphinx", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py index 92dbcd7d4f398f..fef98a3afd91e5 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-napoleon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySphinxcontribNapoleon(PythonPackage): homepage = "https://github.com/sphinx-contrib/napoleon" pypi = "sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.7.tar.gz" + license("BSD-2-Clause") + version("0.7", sha256="407382beed396e9f2d7f3043fad6afda95719204a1e1a231ac865f40abcbfcf8") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py index cd7ec64e5998b3..7e96b9219db684 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-programoutput/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySphinxcontribProgramoutput(PythonPackage): homepage = "https://sphinxcontrib-programoutput.readthedocs.org/" pypi = "sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.15.tar.gz" + license("BSD-2-Clause") + version("0.15", sha256="80dd5b4eab780a13ff2c23500cac3dbf0e04ef9976b409ef25a47c263ef8ab94") version("0.10", sha256="fdee94fcebb0d8fddfccac5c4fa560f6177d5340c4349ee447c890bea8857094") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py index 8aa6bd60f64112..d81e143c07664e 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class PySphinxcontribQthelp(PythonPackage): # import any modules. import_modules: List[str] = [] + license("BSD-2-Clause") + version("1.0.3", sha256="4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72") version("1.0.2", sha256="79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py index 520470fb1dac78..8ee80e07051ad5 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PySphinxcontribSerializinghtml(PythonPackage): # to import any modules. import_modules: List[str] = [] + license("BSD-2-Clause") + version("1.1.9", sha256="0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54") version("1.1.5", sha256="aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952") version("1.1.3", sha256="c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py index b75dc88c52458f..b1ebaef57a38fc 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySphinxcontribTrio(PythonPackage): homepage = "https://github.com/python-trio/sphinxcontrib-trio" pypi = "sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.tar.gz" + license("Apache-2.0") + version("1.1.2", sha256="9f1ba9c1d5965b534e85258d8b677dd94e9b1a9a2e918b85ccd42590596b47c0") version("1.1.0", sha256="d90f46d239ba0556e53d9a110989f98c9eb2cea76ab47937a1f39b62f63fe654") diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py index 4b54b735d79630..8f36169951b27d 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-websupport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySphinxcontribWebsupport(PythonPackage): homepage = "http://sphinx-doc.org/" pypi = "sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.2.tar.gz" + license("BSD-2-Clause") + version("1.1.2", sha256="1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc") version("1.1.0", sha256="9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9") version("1.0.1", sha256="7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9") diff --git a/var/spack/repos/builtin/packages/py-sphobjinv/package.py b/var/spack/repos/builtin/packages/py-sphobjinv/package.py index afbdbcd63f68a8..4fa1c327640300 100644 --- a/var/spack/repos/builtin/packages/py-sphobjinv/package.py +++ b/var/spack/repos/builtin/packages/py-sphobjinv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spykeutils/package.py b/var/spack/repos/builtin/packages/py-spykeutils/package.py index 612b56d5e1d504..636fe35c3feb0f 100644 --- a/var/spack/repos/builtin/packages/py-spykeutils/package.py +++ b/var/spack/repos/builtin/packages/py-spykeutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-spython/package.py b/var/spack/repos/builtin/packages/py-spython/package.py index 41c5375563edf8..65191211b3b600 100644 --- a/var/spack/repos/builtin/packages/py-spython/package.py +++ b/var/spack/repos/builtin/packages/py-spython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySpython(PythonPackage): homepage = "https://github.com/singularityhub/singularity-cli" pypi = "spython/spython-0.2.14.tar.gz" + license("MPL-2.0") + version("0.3.1", sha256="143557849d636697ddd80e0ba95920efe4668351f5becce6bdc73a7651aa128d") version("0.2.14", sha256="49e22fbbdebe456b27ca17d30061489db8e0f95e62be3623267a23b85e3ce0f0") diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy-migrate/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy-migrate/package.py index c059d4a56d22ef..1666f904ebcc37 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy-migrate/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy-migrate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySqlalchemyMigrate(PythonPackage): homepage = "http://www.openstack.org/" pypi = "sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.tar.gz" + license("MIT") + version("0.13.0", sha256="0bc02e292a040ade5e35a01d3ea744119e1309cdddb704fdb99bac13236614f8") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py index 29561257e2f686..27fa3cf6d710e5 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy-stubs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py index cfdd03d289b55d..8100658ffd93f1 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,8 +12,13 @@ class PySqlalchemyUtils(PythonPackage): homepage = "https://github.com/kvesteri/sqlalchemy-utils" pypi = "sqlalchemy-utils/SQLAlchemy-Utils-0.36.8.tar.gz" + license("BSD-3-Clause") + + version("0.41.1", sha256="a2181bff01eeb84479e38571d2c0718eb52042f9afd8c194d0d02877e84b7d74") version("0.36.8", sha256="fb66e9956e41340011b70b80f898fde6064ec1817af77199ee21ace71d7d6ab0") depends_on("py-setuptools", type="build") - depends_on("py-six", type=("build", "run")) - depends_on("py-sqlalchemy@1.0:", type=("build", "run")) + depends_on("py-six", type=("build", "run"), when="@0.36.8") + depends_on("py-sqlalchemy@1.0:", type=("build", "run"), when="@0.36.8") + depends_on("py-sqlalchemy@1.3:", type=("build", "run"), when="@0.41.1") + depends_on("py-importlib-metadata", type=("build", "run"), when="@0.41.1 ^python@:3.7") diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index de5d823e6d3755..0480bffcbf5ebd 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,10 @@ class PySqlalchemy(PythonPackage): pypi = "SQLAlchemy/SQLAlchemy-1.3.9.tar.gz" git = "https://github.com/sqlalchemy/sqlalchemy.git" + license("MIT") + version("2.0.19", sha256="77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f") + version("1.4.49", sha256="06ff25cbae30c396c4b7737464f2a7fc37a67b7da409993b182b024cec80aed9") version("1.4.45", sha256="fd69850860093a3f69fefe0ab56d041edfdfe18510b53d9a2eaecba2f15fa795") version("1.4.44", sha256="2dda5f96719ae89b3ec0f1b79698d86eb9aecb1d54e990abb3fdd92c04b46a90") version("1.4.25", sha256="1adf3d25e2e33afbcd48cfad8076f9378793be43e7fec3e4334306cac6bec138") diff --git a/var/spack/repos/builtin/packages/py-sqlitedict/package.py b/var/spack/repos/builtin/packages/py-sqlitedict/package.py index 6d614d1babf9ac..4fec064f93b06d 100644 --- a/var/spack/repos/builtin/packages/py-sqlitedict/package.py +++ b/var/spack/repos/builtin/packages/py-sqlitedict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySqlitedict(PythonPackage): homepage = "https://github.com/piskvorky/sqlitedict" pypi = "sqlitedict/sqlitedict-2.1.0.tar.gz" + license("Apache-2.0") + version("2.1.0", sha256="03d9cfb96d602996f1d4c2db2856f1224b96a9c431bdd16e78032a72940f9e8c") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sqlparse/package.py b/var/spack/repos/builtin/packages/py-sqlparse/package.py index 90abacf24fb5ea..2d52fdf57a31e8 100644 --- a/var/spack/repos/builtin/packages/py-sqlparse/package.py +++ b/var/spack/repos/builtin/packages/py-sqlparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySqlparse(PythonPackage): homepage = "https://github.com/andialbrecht/sqlparse" url = "https://github.com/andialbrecht/sqlparse/archive/0.3.1.tar.gz" + license("BSD-3-Clause") + version("0.4.1", sha256="f75cdec98a4cc8296890279d744e1ae8618bb14dbad77e3d0637f0d7bb5d6535") version("0.3.1", sha256="344b539482b75c244ac69fbb160d0f4d63a288a392475c8418ca692c594561f9") version("0.3.0", sha256="a75fddae009fba1d66786203c9dd3a842aa4415475c466d15484139117108474") diff --git a/var/spack/repos/builtin/packages/py-srsly/package.py b/var/spack/repos/builtin/packages/py-srsly/package.py index 63385405189c94..d545991b31fb6c 100644 --- a/var/spack/repos/builtin/packages/py-srsly/package.py +++ b/var/spack/repos/builtin/packages/py-srsly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySrsly(PythonPackage): homepage = "https://github.com/explosion/srsly" pypi = "srsly/srsly-2.0.1.tar.gz" + license("MIT") + version("2.4.6", sha256="47b41f323aba4c9c3311abf60e443c03a9efe9c69f65dc402d173c32f7744a6f") version("2.0.1", sha256="fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52") version("2.0.0", sha256="785b00e00406120dbef4ca82925051e6b60fe870c5f84f0d22b3632d574eb870") diff --git a/var/spack/repos/builtin/packages/py-sseclient/package.py b/var/spack/repos/builtin/packages/py-sseclient/package.py index 97223c725e52f6..1b540460ec632d 100644 --- a/var/spack/repos/builtin/packages/py-sseclient/package.py +++ b/var/spack/repos/builtin/packages/py-sseclient/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySseclient(PythonPackage): homepage = "https://github.com/btubbs/sseclient" pypi = "sseclient/sseclient-0.0.27.tar.gz" + license("MIT") + version("0.0.27", sha256="b2fe534dcb33b1d3faad13d60c5a7c718e28f85987f2a034ecf5ec279918c11c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-sshtunnel/package.py b/var/spack/repos/builtin/packages/py-sshtunnel/package.py index 6f492a55859a4d..682f43771d84eb 100644 --- a/var/spack/repos/builtin/packages/py-sshtunnel/package.py +++ b/var/spack/repos/builtin/packages/py-sshtunnel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySshtunnel(PythonPackage): homepage = "https://github.com/pahaz/sshtunnel" pypi = "sshtunnel/sshtunnel-0.1.5.tar.gz" + license("MIT") + version("0.1.5", sha256="c813fdcda8e81c3936ffeac47cb69cfb2d1f5e77ad0de656c6dab56aeebd9249") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-stack-data/package.py b/var/spack/repos/builtin/packages/py-stack-data/package.py index 82be5afd92028e..def3f0f10dd2f0 100644 --- a/var/spack/repos/builtin/packages/py-stack-data/package.py +++ b/var/spack/repos/builtin/packages/py-stack-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyStackData(PythonPackage): homepage = "http://github.com/alexmojaki/stack_data" pypi = "stack_data/stack_data-0.2.0.tar.gz" + license("MIT") + version("0.6.2", sha256="32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815") version("0.5.0", sha256="715c8855fbf5c43587b141e46cc9d9339cc0d1f8d6e0f98ed0d01c6cb974e29f") version("0.2.0", sha256="45692d41bd633a9503a5195552df22b583caf16f0b27c4e58c98d88c8b648e12") diff --git a/var/spack/repos/builtin/packages/py-starlette-context/package.py b/var/spack/repos/builtin/packages/py-starlette-context/package.py index c63f47538e2cfd..d03729c4eddf9b 100644 --- a/var/spack/repos/builtin/packages/py-starlette-context/package.py +++ b/var/spack/repos/builtin/packages/py-starlette-context/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyStarletteContext(PythonPackage): homepage = "https://github.com/tomwojcik/starlette-context" pypi = "starlette-context/starlette_context-0.3.5.tar.gz" + license("MIT") + version("0.3.5", sha256="e6b9f905823860e9e36c013dbfcf770562f3b88bec21cb861fef2e0bd0615697") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-starlette/package.py b/var/spack/repos/builtin/packages/py-starlette/package.py index 6ee9f29526fb62..7f51b279732eeb 100644 --- a/var/spack/repos/builtin/packages/py-starlette/package.py +++ b/var/spack/repos/builtin/packages/py-starlette/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyStarlette(PythonPackage): homepage = "https://github.com/encode/starlette" pypi = "starlette/starlette-0.23.1.tar.gz" + license("BSD-3-Clause") + version("0.27.0", sha256="6a6b0d042acb8d469a01eba54e9cda6cbd24ac602c4cd016723117d6a7e73b75") version("0.23.1", sha256="8510e5b3d670326326c5c1d4cb657cc66832193fe5d5b7015a51c7b1e1b1bf42") version("0.22.0", sha256="b092cbc365bea34dd6840b42861bdabb2f507f8671e642e8272d2442e08ea4ff") diff --git a/var/spack/repos/builtin/packages/py-starsessions/package.py b/var/spack/repos/builtin/packages/py-starsessions/package.py index f52e039c06720f..44292fe3b13b96 100644 --- a/var/spack/repos/builtin/packages/py-starsessions/package.py +++ b/var/spack/repos/builtin/packages/py-starsessions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyStarsessions(PythonPackage): homepage = "https://github.com/alex-oleshkevich/starsessions" pypi = "starsessions/starsessions-2.1.1.tar.gz" + license("MIT") + version("2.1.1", sha256="cb250de84ebc6159ad187cab69e6fe60eab11684b40349457e74dcfb7656c805") version("1.3.0", sha256="8d3b509d4e6d235655f7dd495fcf0afc1bd86da84de3a8d434e6f82137ebcde8") diff --git a/var/spack/repos/builtin/packages/py-stashcp/package.py b/var/spack/repos/builtin/packages/py-stashcp/package.py new file mode 100644 index 00000000000000..d66dc86d2c4d6f --- /dev/null +++ b/var/spack/repos/builtin/packages/py-stashcp/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyStashcp(PythonPackage): + """Stashcp uses geo located nearby caches in order to copy from the OSG + Connect's stash storage service to a job's workspace on a cluster.""" + + homepage = "https://github.com/opensciencegrid/StashCache" + pypi = "stashcp/stashcp-6.1.0.tar.gz" + + maintainers("wdconinc") + + version("6.1.0", sha256="40484b40aeb853eb6a5f5472daf533a176d61fa6ab839cd265ea0baa3fe63068") + + depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-statmorph/package.py b/var/spack/repos/builtin/packages/py-statmorph/package.py index b71654885dee47..52de3585a83a66 100644 --- a/var/spack/repos/builtin/packages/py-statmorph/package.py +++ b/var/spack/repos/builtin/packages/py-statmorph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyStatmorph(PythonPackage): maintainers("meyersbs") + license("BSD-3-Clause") + version("0.4.0", sha256="7d1bb802baf3e203ac44c630a58c5049da5eb4d85091ac35e3f5c6ee4af8b05a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-statsmodels/package.py b/var/spack/repos/builtin/packages/py-statsmodels/package.py index 2fe227de4532cf..d4ea3153fc2223 100644 --- a/var/spack/repos/builtin/packages/py-statsmodels/package.py +++ b/var/spack/repos/builtin/packages/py-statsmodels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyStatsmodels(PythonPackage): pypi = "statsmodels/statsmodels-0.8.0.tar.gz" git = "https://github.com/statsmodels/statsmodels.git" + license("BSD-3-Clause") + version("0.14.0", sha256="6875c7d689e966d948f15eb816ab5616f4928706b180cf470fd5907ab6f647a4") version("0.13.5", sha256="593526acae1c0fda0ea6c48439f67c3943094c542fe769f8b90fe9e6c6cc4871") version("0.13.2", sha256="77dc292c9939c036a476f1770f9d08976b05437daa229928da73231147cde7d4") diff --git a/var/spack/repos/builtin/packages/py-stdlib-list/package.py b/var/spack/repos/builtin/packages/py-stdlib-list/package.py index e6075b159c765e..162ce31c7c6883 100644 --- a/var/spack/repos/builtin/packages/py-stdlib-list/package.py +++ b/var/spack/repos/builtin/packages/py-stdlib-list/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyStdlibList(PythonPackage): pypi = "stdlib-list/stdlib-list-0.6.0.tar.gz" + license("MIT") + version("0.6.0", sha256="133cc99104f5a4e1604dc88ebb393529bd4c2b99ae7e10d46c0b596f3c67c3f0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-stestr/package.py b/var/spack/repos/builtin/packages/py-stestr/package.py index ac4a35665ded42..811148c62b4e49 100644 --- a/var/spack/repos/builtin/packages/py-stestr/package.py +++ b/var/spack/repos/builtin/packages/py-stestr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyStestr(PythonPackage): homepage = "https://stestr.readthedocs.io/en/latest/" pypi = "stestr/stestr-2.5.1.tar.gz" + license("Apache-2.0") + version("2.5.1", sha256="151479fdf2db9f5f492b5285f4696f2d38960639054835dbdcd4c0687122c0fd") depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-stevedore/package.py b/var/spack/repos/builtin/packages/py-stevedore/package.py index e1b3bcb8ac5f2a..7e82a277dd2fdd 100644 --- a/var/spack/repos/builtin/packages/py-stevedore/package.py +++ b/var/spack/repos/builtin/packages/py-stevedore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyStevedore(PythonPackage): homepage = "https://docs.openstack.org/stevedore/latest/" pypi = "stevedore/stevedore-1.28.0.tar.gz" + license("Apache-2.0") + version("4.0.0", sha256="f82cc99a1ff552310d19c379827c2c64dd9f85a38bcd5559db2470161867b786") version("3.5.0", sha256="f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335") version("1.28.0", sha256="f1c7518e7b160336040fee272174f1f7b29a46febb3632502a8f2055f973d60b") diff --git a/var/spack/repos/builtin/packages/py-stomp-py/package.py b/var/spack/repos/builtin/packages/py-stomp-py/package.py index 2b299ddf9e7835..842c4f84a84a0f 100644 --- a/var/spack/repos/builtin/packages/py-stomp-py/package.py +++ b/var/spack/repos/builtin/packages/py-stomp-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyStompPy(PythonPackage): maintainers("haralmha") + license("Apache-2.0") + version("8.0.0", sha256="7085935293bfcc4a112a9830513275b2e0f3b040c5aad5ff8907e78f285b8b57") depends_on("python@3.6.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-stopit/package.py b/var/spack/repos/builtin/packages/py-stopit/package.py index bbd3f6e4c1ec57..66ccfbc0ddb693 100644 --- a/var/spack/repos/builtin/packages/py-stopit/package.py +++ b/var/spack/repos/builtin/packages/py-stopit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyStopit(PythonPackage): pypi = "stopit/stopit-1.1.2.tar.gz" + license("MIT") + version("1.1.2", sha256="f7f39c583fd92027bd9d06127b259aee7a5b7945c1f1fa56263811e1e766996d") depends_on("python@2.6:2.8,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index 5e0b6c9a85efb2..1f344b74ace03a 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyStorm(PythonPackage): homepage = "https://storm.canonical.com/" pypi = "storm/storm-0.25.tar.gz" + license("LGPL-2.1-or-later") + version("0.25", sha256="ec7cc8897638f94f6b75c6a2af74aa9b31f5492d7a2f9482c08a8dd7b46adb14") version( "0.23", diff --git a/var/spack/repos/builtin/packages/py-stratify/package.py b/var/spack/repos/builtin/packages/py-stratify/package.py index 1cd86c6c46da3c..05fbe674c8eea1 100644 --- a/var/spack/repos/builtin/packages/py-stratify/package.py +++ b/var/spack/repos/builtin/packages/py-stratify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyStratify(PythonPackage): homepage = "https://github.com/SciTools-incubator/python-stratify" pypi = "stratify/stratify-0.1.tar.gz" + license("BSD-3-Clause") + version("0.1", sha256="5426f3b66e45e1010952d426e5a7be42cd45fe65f1cd73a98fee1eb7c110c6ee") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-strawberryfields/package.py b/var/spack/repos/builtin/packages/py-strawberryfields/package.py index 94cde69424a166..a3c1df7638f0f8 100644 --- a/var/spack/repos/builtin/packages/py-strawberryfields/package.py +++ b/var/spack/repos/builtin/packages/py-strawberryfields/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyStrawberryfields(PythonPackage): maintainers("marcodelapierre") + license("Apache-2.0") + version("0.23.0", sha256="bfe94867cdee8e2904752573f1ff46b78d9f373da16a1cfa31e1bd6cdf2e3cb0") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-streamlit/package.py b/var/spack/repos/builtin/packages/py-streamlit/package.py index 4e562c85221f8d..20017f656aaffa 100644 --- a/var/spack/repos/builtin/packages/py-streamlit/package.py +++ b/var/spack/repos/builtin/packages/py-streamlit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-stsci-distutils/package.py b/var/spack/repos/builtin/packages/py-stsci-distutils/package.py index 457510fdfba44d..a8d3eab8fa1aec 100644 --- a/var/spack/repos/builtin/packages/py-stsci-distutils/package.py +++ b/var/spack/repos/builtin/packages/py-stsci-distutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-stui/package.py b/var/spack/repos/builtin/packages/py-stui/package.py index d5a524e4a70eaf..be9fa8bb04538c 100644 --- a/var/spack/repos/builtin/packages/py-stui/package.py +++ b/var/spack/repos/builtin/packages/py-stui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyStui(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.3.6", sha256="b7f4f9ff537977af0d37a3218217f2b882a30709fcd2773a07df09050c700102") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-submitit/package.py b/var/spack/repos/builtin/packages/py-submitit/package.py index 376d84c89bf67a..9363822bb14d0e 100644 --- a/var/spack/repos/builtin/packages/py-submitit/package.py +++ b/var/spack/repos/builtin/packages/py-submitit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySubmitit(PythonPackage): homepage = "https://github.com/facebookincubator/submitit" pypi = "submitit/submitit-1.3.3.tar.gz" + license("MIT") + version("1.4.5", sha256="d12cbbfc98a8c1777c4f6e87f73f063dafdba15653bca2984223b038d41f8223") version("1.3.3", sha256="efaa77b2df9ea9ee02545478cbfc377853ddf8016bff59df6988bebcf51ffa7e") diff --git a/var/spack/repos/builtin/packages/py-subrosa/package.py b/var/spack/repos/builtin/packages/py-subrosa/package.py index 28c6c51df3f879..21307d30a1c333 100644 --- a/var/spack/repos/builtin/packages/py-subrosa/package.py +++ b/var/spack/repos/builtin/packages/py-subrosa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-subword-nmt/package.py b/var/spack/repos/builtin/packages/py-subword-nmt/package.py index 47341d5283822d..ff57c1ffbc64e3 100644 --- a/var/spack/repos/builtin/packages/py-subword-nmt/package.py +++ b/var/spack/repos/builtin/packages/py-subword-nmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySubwordNmt(PythonPackage): homepage = "https://github.com/joeynmt/joeynmt" url = "https://github.com/rsennrich/subword-nmt/archive/refs/tags/v0.3.7.zip" + license("MIT") + version("0.3.7", sha256="5c3eafe8d85d872a3bbde722b130fb25db19cc7942561936bfae26b6daf51ba0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-supervisor/package.py b/var/spack/repos/builtin/packages/py-supervisor/package.py index 7e09b0b543c3e1..e33981b9187535 100644 --- a/var/spack/repos/builtin/packages/py-supervisor/package.py +++ b/var/spack/repos/builtin/packages/py-supervisor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-svgpath/package.py b/var/spack/repos/builtin/packages/py-svgpath/package.py index 313f4001591190..6cabea9c34ba80 100644 --- a/var/spack/repos/builtin/packages/py-svgpath/package.py +++ b/var/spack/repos/builtin/packages/py-svgpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PySvgpath(PythonPackage): pypi = "svg.path/svg.path-4.1.tar.gz" git = "https://github.com/regebro/svg.path.git" + license("MIT") + version("6.2", sha256="1a2159f9db898df93c4637cfd3ccaf7da1fd073f59fa9a5950c73e46d4aa1aca") version("4.1", sha256="7e6847ba690ff620e20f152818d52e1685b993aacbc41b321f8fee3d1cb427db") diff --git a/var/spack/repos/builtin/packages/py-svgpathtools/package.py b/var/spack/repos/builtin/packages/py-svgpathtools/package.py index c5ab0937d4392d..7a9af2965d0dd3 100644 --- a/var/spack/repos/builtin/packages/py-svgpathtools/package.py +++ b/var/spack/repos/builtin/packages/py-svgpathtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySvgpathtools(PythonPackage): pypi = "svgpathtools/svgpathtools-1.3.3.tar.gz" + license("MIT") + version("1.3.3", sha256="e4b3784ae41b725fbce6a33a8981210967b16d0b557cb5d98c0ed0c81f0f89b9") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-svgutils/package.py b/var/spack/repos/builtin/packages/py-svgutils/package.py index f7d258e69a9981..d23453fb837493 100644 --- a/var/spack/repos/builtin/packages/py-svgutils/package.py +++ b/var/spack/repos/builtin/packages/py-svgutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySvgutils(PythonPackage): homepage = "https://github.com/btel/svg_utils" pypi = "svgutils/svgutils-0.3.4.tar.gz" + license("MIT") + version("0.3.4", sha256="9ef48f44cb1d460a7747dd02694200fda25eb9faf6dea392118def2695e0e053") version("0.3.1", sha256="cd52474765fd460ad2389947f77589de96142f6f0ce3f61e08ccfabeac2ff8af") diff --git a/var/spack/repos/builtin/packages/py-svgwrite/package.py b/var/spack/repos/builtin/packages/py-svgwrite/package.py index 88baa51f13cf95..e7f8e2aeef6aed 100644 --- a/var/spack/repos/builtin/packages/py-svgwrite/package.py +++ b/var/spack/repos/builtin/packages/py-svgwrite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-symengine/package.py b/var/spack/repos/builtin/packages/py-symengine/package.py index f6ba43866999a1..771264075042e4 100644 --- a/var/spack/repos/builtin/packages/py-symengine/package.py +++ b/var/spack/repos/builtin/packages/py-symengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PySymengine(PythonPackage): pypi = "symengine/symengine-0.2.0.tar.gz" git = "https://github.com/symengine/symengine.py.git" + license("MIT") + version("master", branch="master") version("0.9.2", sha256="0f7e45f5bba3fa844f7de7aa8d6640faaacb1075df76d8e4996e82b0ec6a4f62") # pypi source doesn't have necessary files in cmake directory diff --git a/var/spack/repos/builtin/packages/py-symfit/package.py b/var/spack/repos/builtin/packages/py-symfit/package.py index 37670841e6a226..a7bb417be4c836 100644 --- a/var/spack/repos/builtin/packages/py-symfit/package.py +++ b/var/spack/repos/builtin/packages/py-symfit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySymfit(PythonPackage): homepage = "https://symfit.readthedocs.org" pypi = "symfit/symfit-0.3.5.tar.gz" + license("MIT") + version("0.3.5", sha256="24c66305895c590249da7e61f62f128ee1c0c43c0a8c8e33b8abd3e0931f0881") depends_on("py-setuptools@17.1:", type="build") diff --git a/var/spack/repos/builtin/packages/py-sympy/package.py b/var/spack/repos/builtin/packages/py-sympy/package.py index f486f080e46c31..339ee0027a7975 100644 --- a/var/spack/repos/builtin/packages/py-sympy/package.py +++ b/var/spack/repos/builtin/packages/py-sympy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PySympy(PythonPackage): pypi = "sympy/sympy-0.7.6.tar.gz" + license("BSD-3-Clause") + version("1.11.1", sha256="e32380dce63cb7c0108ed525570092fd45168bdae2faa17e528221ef72e88658") version("1.8", sha256="1ca588a9f6ce6a323c5592f9635159c2093572826668a1022c75c75bdf0297cb") version("1.7.1", sha256="a3de9261e97535b83bb8607b0da2c7d03126650fafea2b2789657b229c246b2e") diff --git a/var/spack/repos/builtin/packages/py-syned/package.py b/var/spack/repos/builtin/packages/py-syned/package.py index a497e22cd2a835..94ac19c279e494 100644 --- a/var/spack/repos/builtin/packages/py-syned/package.py +++ b/var/spack/repos/builtin/packages/py-syned/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-systemd-python/package.py b/var/spack/repos/builtin/packages/py-systemd-python/package.py index 9982c70593fbc8..5b023362ca93f0 100644 --- a/var/spack/repos/builtin/packages/py-systemd-python/package.py +++ b/var/spack/repos/builtin/packages/py-systemd-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PySystemdPython(PythonPackage): homepage = "https://github.com/systemd/python-systemd" pypi = "systemd-python/systemd-python-234.tar.gz" + license("LGPL-2.1-or-later") + version("234", sha256="fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py index 84cd48bc5843d3..262e7e4b82f3b2 100644 --- a/var/spack/repos/builtin/packages/py-tables/package.py +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTables(PythonPackage): pypi = "tables/tables-3.6.1.tar.gz" git = "https://github.com/PyTables/PyTables.git" + license("BSD-3-Clause") + version("master", branch="master") version("3.9.0", sha256="27c9ca14c359d875caf945a6a527c12690e017650402dd17d8eb8b6caf6687d5") version("3.8.0", sha256="34f3fa2366ce20b18f1df573a77c1d27306ce1f2a41d9f9eff621b5192ea8788") diff --git a/var/spack/repos/builtin/packages/py-tabulate/package.py b/var/spack/repos/builtin/packages/py-tabulate/package.py index 9ec9c3c070060e..07ed086d6401a6 100644 --- a/var/spack/repos/builtin/packages/py-tabulate/package.py +++ b/var/spack/repos/builtin/packages/py-tabulate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTabulate(PythonPackage): homepage = "https://bitbucket.org/astanin/python-tabulate" pypi = "tabulate/tabulate-0.8.6.tar.gz" + license("MIT") + version("0.8.9", sha256="eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7") version("0.8.7", sha256="db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007") version("0.8.6", sha256="5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8") diff --git a/var/spack/repos/builtin/packages/py-tap-py/package.py b/var/spack/repos/builtin/packages/py-tap-py/package.py deleted file mode 100644 index 6ab4ba352aec8d..00000000000000 --- a/var/spack/repos/builtin/packages/py-tap-py/package.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyTapPy(PythonPackage): - """Python TAP interface module for unit tests""" - - homepage = "https://github.com/python-tap/tappy" - pypi = "tap.py/tap.py-3.0.tar.gz" - - version("3.0", sha256="f5eeeeebfd64e53d32661752bb4c288589a3babbb96db3f391a4ec29f1359c70") - version("2.6.2", sha256="5f219d92dbad5e378f8f7549cdfe655b0d5fd2a778f9c83bee51b61c6ca40efb") - - depends_on("python@3.5:3.7", when="@3.0:", type=("build", "run")) - depends_on("python@2.7:2.8,3.5:3.7", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tatsu/package.py b/var/spack/repos/builtin/packages/py-tatsu/package.py index 9dd5c6e3948e27..f1a612b2942293 100644 --- a/var/spack/repos/builtin/packages/py-tatsu/package.py +++ b/var/spack/repos/builtin/packages/py-tatsu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTatsu(PythonPackage): homepage = "https://github.com/neogeny/tatsu" pypi = "TatSu/TatSu-4.4.0.zip" + license("BSD-2-Clause") + version("4.4.0", sha256="80713413473a009f2081148d0f494884cabaf9d6866b71f2a68a92b6442f343d") variant("future_regex", default=True, description="Use regex implementation") diff --git a/var/spack/repos/builtin/packages/py-tblib/package.py b/var/spack/repos/builtin/packages/py-tblib/package.py index d44d5434d05d8b..b76e9b849b0db4 100644 --- a/var/spack/repos/builtin/packages/py-tblib/package.py +++ b/var/spack/repos/builtin/packages/py-tblib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTblib(PythonPackage): homepage = "https://github.com/ionelmc/python-tblib" pypi = "tblib/tblib-1.6.0.tar.gz" + license("BSD-2-Clause") + version("1.6.0", sha256="229bee3754cb5d98b4837dd5c4405e80cfab57cb9f93220410ad367f8b352344") version("1.4.0", sha256="bd1ad564564a158ff62c290687f3db446038f9ac11a0bf6892712e3601af3bcd") diff --git a/var/spack/repos/builtin/packages/py-tbparse/package.py b/var/spack/repos/builtin/packages/py-tbparse/package.py index f3beb9fe82c460..657f53d344b250 100644 --- a/var/spack/repos/builtin/packages/py-tbparse/package.py +++ b/var/spack/repos/builtin/packages/py-tbparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTbparse(PythonPackage): homepage = "https://github.com/j3soon/tbparse" pypi = "tbparse/tbparse-0.0.7.tar.gz" + license("Apache-2.0") + version("0.0.7", sha256="0ddd3c764ceb1859bc0cb69ca355bff4fd5936c4bfe885e252e481564b2371a9") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tempita/package.py b/var/spack/repos/builtin/packages/py-tempita/package.py index 5df1af2de25449..7f51a815749c66 100644 --- a/var/spack/repos/builtin/packages/py-tempita/package.py +++ b/var/spack/repos/builtin/packages/py-tempita/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTempita(PythonPackage): homepage = "https://pypi.org/project/Tempita" pypi = "tempita/Tempita-0.5.2.tar.gz" + license("MIT") + version("0.5.2", sha256="cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-templateflow/package.py b/var/spack/repos/builtin/packages/py-templateflow/package.py index 217e6fb762f5a7..aa60d8f0214841 100644 --- a/var/spack/repos/builtin/packages/py-templateflow/package.py +++ b/var/spack/repos/builtin/packages/py-templateflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTemplateflow(PythonPackage): homepage = "https://github.com/templateflow/python-client" pypi = "templateflow/templateflow-0.7.1.tar.gz" + license("Apache-2.0") + version("0.7.1", sha256="c6e8282d1ffbb5dca7bd704a12e02bd00021860b71a043c35716861910c7187f") version("0.4.2", sha256="5585f3e7ccaa756f811aafb526ed6b2c79aabfd012477129af9c6038d7686f84") diff --git a/var/spack/repos/builtin/packages/py-tempora/package.py b/var/spack/repos/builtin/packages/py-tempora/package.py index 6a30bf0611c086..d0c9a8d339eb0e 100644 --- a/var/spack/repos/builtin/packages/py-tempora/package.py +++ b/var/spack/repos/builtin/packages/py-tempora/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTempora(PythonPackage): homepage = "https://github.com/jaraco/tempora" pypi = "tempora/tempora-1.14.1.tar.gz" + license("MIT") + version("1.14.1", sha256="cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tenacity/package.py b/var/spack/repos/builtin/packages/py-tenacity/package.py index a88d2721500e62..e9b87b24d08568 100644 --- a/var/spack/repos/builtin/packages/py-tenacity/package.py +++ b/var/spack/repos/builtin/packages/py-tenacity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTenacity(PythonPackage): homepage = "https://github.com/jd/tenacity" pypi = "tenacity/tenacity-6.3.1.tar.gz" + license("Apache-2.0") + version("8.2.2", sha256="43af037822bd0029025877f3b2d97cc4d7bb0c2991000a3d59d71517c5c969e0") version("8.0.1", sha256="43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f") version("6.3.1", sha256="e14d191fb0a309b563904bbc336582efe2037de437e543b38da749769b544d7f") diff --git a/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py b/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py index 76da263c3be632..e778ecf5e13f9e 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard-data-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,11 +14,13 @@ class PyTensorboardDataServer(PythonPackage): homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server" git = "https://github.com/tensorflow/tensorboard" + license("Apache-2.0") + version("0.7.0", commit="f1cb31c86d871e0258250248ab9488575410e784") version("0.6.1", commit="6acf0be88b5727e546dd64a8b9b12d790601d561") depends_on("py-setuptools", type="build") - depends_on("rust+rustfmt", type="build") + depends_on("rust+dev", type="build") # https://github.com/tensorflow/tensorboard/issues/5713 patch( diff --git a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py index e8eba168342271..cb0fd3de571bd8 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class PyTensorboardPluginWit(PythonPackage): maintainers("aweits") + license("Apache-2.0") + version( "1.8.1", sha256="ff26bdd583d155aa951ee3b152b3d0cffae8005dc697f72b44a8e8c2a77a8cbe", diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py index f1a9b03bc16ee9..0f3322f49b98b6 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,13 @@ class PyTensorboard(PythonPackage): url = "https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-2.9.1-py3-none-any.whl" list_url = "https://pypi.org/simple/tensorboard/" + # Requires tensorflow + skip_modules = ["tensorboard.summary._tf"] + maintainers("aweits") + license("Apache-2.0") + version( "2.14.1", sha256="3db108fb58f023b6439880e177743c5f1e703e9eeb5fb7d597871f949f85fd58", @@ -135,8 +140,8 @@ class PyTensorboard(PythonPackage): depends_on("py-grpcio@1.23.3:", type=("build", "run"), when="@2.2") depends_on("py-google-auth@1.6.3:2", type=("build", "run"), when="@2.7:") depends_on("py-google-auth@1.6.3:1", type=("build", "run"), when="@:2.6") - depends_on("py-google-auth-oauthlib@0.5:1.0", type=("build", "run"), when="@2.13:") - depends_on("py-google-auth-oauthlib@0.4.1:0.4", type=("build", "run"), when="@:2.12") + depends_on("py-google-auth-oauthlib@0.5:1.0", type=("build", "run"), when="@2.12.1:") + depends_on("py-google-auth-oauthlib@0.4.1:0.4", type=("build", "run"), when="@:2.12.0") depends_on("py-markdown@2.6.8:", type=("build", "run")) depends_on("py-numpy@1.12.0:", type=("build", "run")) depends_on("py-protobuf@3.19.6:", type=("build", "run"), when="@2.12:") diff --git a/var/spack/repos/builtin/packages/py-tensorboardx/package.py b/var/spack/repos/builtin/packages/py-tensorboardx/package.py index 3bcd5f17545fee..16b785527fe652 100644 --- a/var/spack/repos/builtin/packages/py-tensorboardx/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboardx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyTensorboardx(PythonPackage): homepage = "https://github.com/lanpa/tensorboardX" pypi = "tensorboardx/tensorboardX-1.8.tar.gz" + license("MIT") + version("2.6.2.2", sha256="c6476d7cd0d529b0b72f4acadb1269f9ed8b22f441e87a84f2a3b940bb87b666") version("2.5.1", sha256="ea85a3446f22ce8a917fe4fa4d8a7a96222ef84ac835267d038c34bb99f6d61b") version("2.1", sha256="9e8907cf2ab900542d6cb72bf91aa87b43005a7f0aa43126268697e3727872f9") diff --git a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py index 8189fa0c49cff8..4354263a4d0be5 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTensorflowDatasets(PythonPackage): homepage = "https://github.com/tensorflow/datasets" pypi = "tensorflow-datasets/tensorflow-datasets-4.4.0.tar.gz" + license("Apache-2.0") + version("4.4.0", sha256="3e95a61dec1fdb7b05dabc0dbed1b531e13d6c6fd362411423d0a775e5e9b960") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py index f0bde513db7259..eba0f1dbe98481 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,12 @@ class PyTensorflowEstimator(Package): maintainers("aweits") + license("Apache-2.0") + + version("2.14.0", sha256="622797bf5311f239c2b123364fa360868ae97d16b678413e5e0633241f7d7d5c") + version("2.13.0", sha256="4175e9276a1eb8b5e4e876d228e4605871832e7bd8517965d6a47f1481af2c3e") + version("2.12.0", sha256="86c75e830c6ba762d0e3cf04c160096930fb12a992e69b3f24674b9f58902063") + version("2.11.0", sha256="922f9187de79e8e7f7d7a5b2d6d3aabc81bbbd6ba5f12a4f52967dd302214a43") version("2.10", sha256="60df309377cf4e584ca20198f9639beb685d50616395f50770fc0999092d6d85") version("2.9.0", sha256="62d7b5a574d9c995542f6cb485ff1c18ad115afd9ec6d63437b2aab227c35ef6") version("2.8.0", sha256="58a2c3562ca6491c257e9a4d9bd8825667883257edcdb452181efa691c586b17") @@ -26,18 +32,20 @@ class PyTensorflowEstimator(Package): version("2.4.0", sha256="e6ea12014c3d8c89a81ace95f8f8b7c39ffcd3e4e4626709e4aee0010eefd962") version("2.3.0", sha256="75403e7de7e8ec30ec0781ede56ed84cbe5e90daad64a9c242cd489c8fe63a17") version("2.2.0", sha256="2d68cb6e6442e7dcbfa2e092aa25bdcb0eda420536a829b85d732854a4c85d46") - version("2.1", sha256="1d74c8181b981748976fa33ad97d3434c3cf2b7e29a0b00861365fe8329dbc4e") - version("2.0.0", sha256="6f4bdf1ab219e1f1cba25d2af097dc820f56479f12a839853d97422fe4d8b465") - version("1.13.0", sha256="a787b150ff436636df723e507019c72a5d6486cfe506886279d380166953f12f") extends("python") + # tensorflow_estimator/tools/pip_package/setup.py depends_on("python@3.7:", when="@2.9:", type=("build", "run")) - for ver in ["2.10", "2.9", "2.8", "2.7", "2.6"]: + for ver in ["2.14", "2.13", "2.12", "2.11", "2.10", "2.9", "2.8", "2.7", "2.6"]: depends_on("py-keras@" + ver, when="@" + ver, type=("build", "run")) for ver in [ + "2.14", + "2.13", + "2.12", + "2.11", "2.10", "2.9", "2.8", @@ -47,9 +55,6 @@ class PyTensorflowEstimator(Package): "2.4", "2.3", "2.2", - "2.1", - "2.0", - "1.13", ]: depends_on("py-tensorflow@" + ver, when="@" + ver, type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py index 6c59391a54210b..7e13114b6b5a5a 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-hub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyTensorflowHub(Package): maintainers("aweits") + license("Apache-2.0") + version("0.12.0", sha256="b192ef3a9a6cbeaee46142d64b47b979828dbf41fc56d48c6587e08f6b596446") version("0.11.0", sha256="4715a4212b45531a7c25ada7207d850467d1b5480f1940f16623f8770ad64df4") diff --git a/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py b/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py index 3a2b44c66e31ea..8bb117582b2c20 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-metadata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class PyTensorflowMetadata(PythonPackage): # Only available as a wheel on PyPI url = "https://github.com/tensorflow/metadata/archive/refs/tags/v1.5.0.tar.gz" + license("Apache-2.0") + version("1.10.0", sha256="e7aa81aa01433e2a75c11425affd55125b64f384baf96b71eeb3a88dca8cf2ae") version("1.5.0", sha256="f0ec8aaf62fd772ef908efe4ee5ea3bc0d67dcbf10ae118415b7b206a1d61745") diff --git a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py index 553fe250b36767..e73f4cc4c2768b 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyTensorflowProbability(Package): maintainers("aweits") + license("Apache-2.0") + version("0.18.0", sha256="f4852c0fea9117333ccb868f7a2ca75aecf5dd765dc39fd4ee5f8ab6fe87e909") version("0.12.1", sha256="1fe89e85fd053bf36e8645a5a1a53b729bc254cf1516bc224fcbd1e4ff50083a") version( diff --git a/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch b/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch deleted file mode 100644 index bb742ff1b4254c..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/tensorflow/core/BUILD.orig 2020-01-22 18:43:57.000000000 -0500 -+++ b/tensorflow/core/BUILD 2020-03-26 16:33:17.318229701 -0400 -@@ -107,8 +107,6 @@ - load( - "//tensorflow/core/platform:default/build_config.bzl", - "tf_additional_all_protos", -- "tf_additional_cloud_kernel_deps", -- "tf_additional_cloud_op_deps", - "tf_additional_core_deps", - "tf_additional_cupti_wrapper_deps", - "tf_additional_device_tracer_cuda_deps", -@@ -1427,7 +1425,7 @@ - ]) + if_tensorrt([ - "//tensorflow/compiler/tf2tensorrt:trt_engine_resource_ops_op_lib", - "//tensorflow/compiler/tf2tensorrt:trt_op_libs", -- ]) + tf_additional_cloud_op_deps(), -+ ]), - alwayslink = 1, - ) - -@@ -1590,7 +1588,7 @@ - "//tensorflow/core/kernels:summary_kernels", - "//tensorflow/core/kernels:training_ops", - "//tensorflow/core/kernels:word2vec_kernels", -- ] + tf_additional_cloud_kernel_deps() + if_not_windows([ -+ ] + if_not_windows([ - "//tensorflow/core/kernels:fact_op", - "//tensorflow/core/kernels:array_not_windows", - "//tensorflow/core/kernels:math_not_windows", - -diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl -index b822effa14e5..61a19bdf128f 100644 ---- a/tensorflow/core/platform/default/build_config.bzl -+++ b/tensorflow/core/platform/default/build_config.bzl -@@ -682,38 +682,6 @@ def tf_additional_core_deps(): - ], - }) - --# TODO(jart, jhseu): Delete when GCP is default on. --def tf_additional_cloud_op_deps(): -- return select({ -- "//tensorflow:android": [], -- "//tensorflow:ios": [], -- "//tensorflow:linux_s390x": [], -- "//tensorflow:windows": [], -- "//tensorflow:api_version_2": [], -- "//tensorflow:windows_and_api_version_2": [], -- "//tensorflow:no_gcp_support": [], -- "//conditions:default": [ -- "//tensorflow/contrib/cloud:bigquery_reader_ops_op_lib", -- "//tensorflow/contrib/cloud:gcs_config_ops_op_lib", -- ], -- }) -- --# TODO(jhseu): Delete when GCP is default on. --def tf_additional_cloud_kernel_deps(): -- return select({ -- "//tensorflow:android": [], -- "//tensorflow:ios": [], -- "//tensorflow:linux_s390x": [], -- "//tensorflow:windows": [], -- "//tensorflow:api_version_2": [], -- "//tensorflow:windows_and_api_version_2": [], -- "//tensorflow:no_gcp_support": [], -- "//conditions:default": [ -- "//tensorflow/contrib/cloud/kernels:bigquery_reader_ops", -- "//tensorflow/contrib/cloud/kernels:gcs_config_ops", -- ], -- }) -- - def tf_lib_proto_parsing_deps(): - return [ - ":protos_all_cc", --- -2.19.1 - diff --git a/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch b/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch deleted file mode 100644 index 281cd63b143a95..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/1-1_fcc_tf_patch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl -index 740f24ec4a..7b8300f678 100644 ---- a/tensorflow/tensorflow.bzl -+++ b/tensorflow/tensorflow.bzl -@@ -1604,6 +1604,7 @@ def _py_wrap_cc_impl(ctx): - outputs = outputs, - mnemonic = "PythonSwig", - progress_message = "SWIGing " + src.path, -+ use_default_shell_env = True, - ) - return struct(files = depset(outputs)) - diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch deleted file mode 100644 index 8813edf3659c94..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/tensorflow/contrib/__init__.py 2020-05-05 17:52:57.716350118 -0500 -+++ b/tensorflow/contrib/__init__.py 2020-05-05 17:56:55.665192882 -0500 -@@ -20,7 +20,10 @@ - - # Add projects here, they will show up under tf.contrib. - from tensorflow.contrib import bayesflow --from tensorflow.contrib import cloud -+try: -+ from tensorflow.contrib import cloud -+except ImportError: -+ pass - from tensorflow.contrib import compiler - from tensorflow.contrib import copy_graph - from tensorflow.contrib import crf diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch deleted file mode 100644 index e76defff499bbb..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.10.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/tensorflow/contrib/__init__.py 2020-05-05 18:14:30.701463150 -0500 -+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:15:12.392435370 -0500 -@@ -26,7 +26,10 @@ - from tensorflow.contrib import bayesflow - from tensorflow.contrib import checkpoint - if os.name != "nt": -- from tensorflow.contrib import cloud -+ try: -+ from tensorflow.contrib import cloud -+ except ImportError: -+ pass - from tensorflow.contrib import cluster_resolver - from tensorflow.contrib import coder - from tensorflow.contrib import compiler diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch deleted file mode 100644 index a65417233edeb5..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/tensorflow/contrib/__init__.py 2020-05-05 18:08:09.361724827 -0500 -+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:08:46.345699058 -0500 -@@ -20,7 +20,10 @@ - - # Add projects here, they will show up under tf.contrib. - from tensorflow.contrib import bayesflow --from tensorflow.contrib import cloud -+try: -+ from tensorflow.contrib import cloud -+except ImportError: -+ pass - from tensorflow.contrib import cluster_resolver - from tensorflow.contrib import compiler - from tensorflow.contrib import copy_graph diff --git a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch b/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch deleted file mode 100644 index 2a0ac1f71371b6..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/contrib_cloud_1.9.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/tensorflow/contrib/__init__.py 2020-05-05 18:11:33.660582455 -0500 -+++ b/tensorflow/contrib/__init__.py 2020-05-05 18:12:32.570541708 -0500 -@@ -25,7 +25,10 @@ - from tensorflow.contrib import batching - from tensorflow.contrib import bayesflow - from tensorflow.contrib import checkpoint --from tensorflow.contrib import cloud -+try: -+ from tensorflow.contrib import cloud -+except ImportError: -+ pass - from tensorflow.contrib import cluster_resolver - from tensorflow.contrib import coder - from tensorflow.contrib import compiler diff --git a/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch b/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch deleted file mode 100644 index ea919567c1219d..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/http_archive.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 1796182..84b5eab 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -1,5 +1,7 @@ - workspace(name = "org_tensorflow") - -+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") -+ - http_archive( - name = "io_bazel_rules_closure", - sha256 = "a38539c5b5c358548e75b44141b4ab637bba7c4dc02b46b1f62a96d6433f56ae", -@@ -30,7 +32,7 @@ android_workspace() - # Please add all new TensorFlow dependencies in workspace.bzl. - tf_workspace() - --new_http_archive( -+http_archive( - name = "inception_v1", - build_file = "models.BUILD", - sha256 = "7efe12a8363f09bc24d7b7a450304a15655a57a7751929b2c1593a71183bb105", -@@ -40,7 +42,7 @@ new_http_archive( - ], - ) - --new_http_archive( -+http_archive( - name = "mobile_ssd", - build_file = "models.BUILD", - sha256 = "bddd81ea5c80a97adfac1c9f770e6f55cbafd7cce4d3bbe15fbeb041e6b8f3e8", -@@ -50,7 +52,7 @@ new_http_archive( - ], - ) - --new_http_archive( -+http_archive( - name = "mobile_multibox", - build_file = "models.BUILD", - sha256 = "859edcddf84dddb974c36c36cfc1f74555148e9c9213dedacf1d6b613ad52b96", -@@ -60,7 +62,7 @@ new_http_archive( - ], - ) - --new_http_archive( -+http_archive( - name = "stylize", - build_file = "models.BUILD", - sha256 = "3d374a730aef330424a356a8d4f04d8a54277c425e274ecb7d9c83aa912c6bfa", -@@ -70,7 +72,7 @@ new_http_archive( - ], - ) - --new_http_archive( -+http_archive( - name = "speech_commands", - build_file = "models.BUILD", - sha256 = "c3ec4fea3158eb111f1d932336351edfe8bd515bb6e87aad4f25dbad0a600d0c", diff --git a/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch b/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch deleted file mode 100644 index 5b341e69f1f613..00000000000000 --- a/var/spack/repos/builtin/packages/py-tensorflow/io_bazel_rules_docker2.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/WORKSPACE b/WORKSPACE -index 74ea14d..0b09a6e 100644 ---- a/WORKSPACE -+++ b/WORKSPACE -@@ -34,6 +34,13 @@ load( - - bazel_toolchains_repositories() - -+http_archive( -+ name = "io_bazel_rules_docker", -+ sha256 = "413bb1ec0895a8d3249a01edf24b82fd06af3c8633c9fb833a0cb1d4b234d46d", -+ strip_prefix = "rules_docker-0.12.0", -+ urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.0/rules_docker-v0.12.0.tar.gz"], -+) -+ - load( - "@io_bazel_rules_docker//repositories:repositories.bzl", - container_repositories = "repositories", diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index c85f078689fe7d..5551a15b4a006c 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): maintainers("adamjstewart", "aweits") import_modules = ["tensorflow"] + license("Apache-2.0") + version("2.14.0", sha256="ce357fd0728f0d1b0831d1653f475591662ec5bca736a94ff789e6b1944df19f") version("2.13.1", sha256="89c07aebd4f41fbe0d08cc88aef00305542134f2f16d3b62918dc3c1182f33e2") version("2.13.0", sha256="e58c939079588623e6fa1d054aec2f90f95018266e0a970fd353a5244f5173dc") @@ -71,56 +73,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): version("2.2.2", sha256="fb4b5d26c5b983350f7ce8297b71176a86a69e91faf66e6ebb1e58538ad3bb51") version("2.2.1", sha256="e6a28e64236d729e598dbeaa02152219e67d0ac94d6ed22438606026a02e0f88") version("2.2.0", sha256="69cd836f87b8c53506c4f706f655d423270f5a563b76dc1cfa60fbc3184185a3") - version("2.1.4", sha256="f5bd53802b616cc5b4fe5e57a5d3b0f090500a87790020d5fccb0773be7c4b47") - version("2.1.3", sha256="cfa66cce372f486e95a42beb1aacfefdaf0092c5efaaaa92459b381fde931fb8") - version("2.1.2", sha256="3f941cda0ed12dfef5472e46f1d0238ea85da7583d73f1132d2ef050fda6e8ad") - version("2.1.1", sha256="a200bc16e4b630db3ac7225bcb6f239a76841967b0aec1d7d7bbe44dc5661318") - version("2.1.0", sha256="638e541a4981f52c69da4a311815f1e7989bf1d67a41d204511966e1daed14f7") - version("2.0.4", sha256="6ca3ce1255da8d655080a89db10da03f72c361d7faecc9a35e6af26ff12c06e6") - version("2.0.3", sha256="6314299a723441bd9892e5c2af182c2be7d2256e20e71026e1cb1264cb497f33") - version("2.0.2", sha256="a548742bbafd302eec51e2794d7687674a64f6b10ce1414073858cb83c0cefc2") - version("2.0.1", sha256="29197d30923b9670992ee4b9c6161f50c7452e9a4158c720746e846080ac245a") - version("2.0.0", sha256="49b5f0495cd681cbcb5296a4476853d4aea19a43bdd9f179c928a977308a0617") - version("1.15.5", sha256="4c4d23e311093ded2d2e287b18d7c45b07b5984ab88a1d2f91f8f13c886123db") - version("1.15.4", sha256="e18c55e771ad136f9bf3a70ea8f0e2d36662b2ba7c890f9eaf7950554557c7fa") - version("1.15.3", sha256="9ab1d92e58eb813922b040acc7622b32d73c2d8d971fe6491a06f9df4c778151") - version("1.15.2", sha256="d95d75d26a298211b5e802842e87fda5b8b14f6ad83719377b391e5fb71b8746") - version("1.15.1", sha256="19b6e72bc8675937f618cede364d7228a71c2eeaffc42801bcefd98dda7ca056") - version("1.15.0", sha256="a5d49c00a175a61da7431a9b289747d62339be9cf37600330ad63b611f7f5dc9") - version("1.14.0", sha256="aa2a6a1daafa3af66807cfe0bc77bfe1144a9a53df9a96bab52e3e575b3047ed") - version("1.13.2", sha256="abe3bf0c47845a628b7df4c57646f41a10ee70f914f1b018a5c761be75e1f1a9") - version("1.13.1", sha256="7cd19978e6bc7edc2c847bce19f95515a742b34ea5e28e4389dade35348f58ed") - version("1.12.3", sha256="b9e5488e84f4a133ed20b18605f0cd6301f11d356bd959712db4e7b9301d0462") - version("1.12.2", sha256="90ffc7cf1df5e4b8385c9108db18d5d5034ec423547c0e167d44f5746a20d06b") - version("1.12.1", sha256="7b559a3ae56322b7a7e4307f45f9fce96022c533a98b32c18bfdff8c5838271d") - version("1.12.0", sha256="3c87b81e37d4ed7f3da6200474fa5e656ffd20d8811068572f43610cae97ca92") - version("1.11.0", sha256="f49ce3f1d04cee854bc9f74fa9696991140b34a2e2447f35f01391b72c8bfa9f") - version("1.10.1", sha256="83092d709800e2d93d4d4b1bcacaeb74f2f328962ed764cb35bbee20402879c6") - version("1.10.0", sha256="ee9cb98d9e0d8106f2f4ed52a38fe89399324af303e1401567e5b64a9f86744b") - version("1.9.0", sha256="ffc3151b06823d57b4a408261ba8efe53601563dfe93af0866751d4f6ca5068c") - version("1.8.0", sha256="47646952590fd213b747247e6870d89bb4a368a95ae3561513d6c76e44f92a75") - version("1.7.1", sha256="3147f8c60d1f30da23a831bcf732e74b935dcee7c62e4b8b85f0f093030b52c8") - version("1.7.0", sha256="c676a96fc8700722816b2b98c85578b2f99fac7a7b2484c9c7f0641484f8d50d") - version("1.6.0", sha256="03cf1423446abbead6bd8c3cf6e6affa7d99746cd119691b012aac9a1795f4fb") - version("1.5.1", sha256="cab2157783905e12a7a3baae3264edfb739dd92d5658019a131fff4b14190240") - version("1.5.0", sha256="0642781c3a3a8c2c4834b91b86aec385f0b2ada7d721571458079478cc5b29c8") - version("1.4.1", sha256="1f75e463318419a1b3ae076d5a92697c1d3a85e8377c946a5510b651ff5c0d60") - version("1.4.0", sha256="8a0ad8d61f8f6c0282c548661994a5ab83ac531bac496c3041dedc1ab021107b") - version("1.3.1", sha256="ded509c209f8a1d390df8a2f44be5b5c29963172b0e0f095304efb59765d0523") - version("1.3.0", sha256="e1af1bb767b57c3416de0d43a5f74d174c42b85231dffd36f3630173534d4307") - version("1.2.1", sha256="f2baf09b1a9a0500907b4d5cb5473070b3ecede06ed6e8d1096873c91922fb9e") - version("1.2.0", sha256="03dbf7548d1fc1c11ed58da5fa68616f795c819f868f43478cbcaa26abed374f") - version("1.1.0", sha256="aad4470f52fa59f54de7b9a2da727429e6755d91d756f245f952698c42a60027") - version("1.0.1", sha256="deea3c65e0703da96d9c3f1162e464c51d37659dd129396af134e9e8f1ea8c05") - version("1.0.0", sha256="db8b3b8f4134b7c9c1b4165492ad5d5bb78889fcd99ffdffc325e97da3e8c677") variant("mkl", default=False, description="Build with MKL support") variant("jemalloc", default=False, description="Build with jemalloc as malloc support") variant("gcp", default=False, description="Build with Google Cloud Platform support") variant("hdfs", default=False, description="Build with Hadoop File System support") variant("aws", default=False, description="Build with Amazon AWS Platform support") - variant("kafka", default=False, description="Build with Apache Kafka Platform support") - variant("ignite", default=False, description="Build with Apache Ignite support") variant("xla", default=sys.platform != "darwin", description="Build with XLA JIT support") variant("gdr", default=False, description="Build with GDR support") variant("verbs", default=False, description="Build with libverbs support") @@ -153,7 +111,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("python@:3.10", when="@2.8:2.11", type=("build", "run")) depends_on("python@:3.9", when="@2.5:2.7", type=("build", "run")) depends_on("python@:3.8", when="@2.2:2.4", type=("build", "run")) - depends_on("python@:3.7", when="@:2.1", type=("build", "run")) # See .bazelversion depends_on("bazel@6.1.0", type="build", when="@2.14:") @@ -166,20 +123,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("bazel@3.7.2:3.99.0", type="build", when="@2.5:2.6") depends_on("bazel@3.1.0:3.99.0", type="build", when="@2.3:2.4") depends_on("bazel@2.0.0", type="build", when="@2.2") - depends_on("bazel@0.27.1:0.29.1", type="build", when="@2.1") - depends_on("bazel@0.24.1:0.26.1", type="build", when="@1.15:2.0") - # See call to check_bazel_version in configure.py - depends_on("bazel@0.24.1:0.25.2", type="build", when="@1.14") - depends_on("bazel@0.19.0:0.21.0", type="build", when="@1.13") - depends_on("bazel@0.24.1:0.25.0", type="build", when="@1.12.1") - depends_on("bazel@0.15.0", type="build", when="@1.10:1.12.0,1.12.2:1.12.3") - depends_on("bazel@0.10.0", type="build", when="@1.7:1.9") - # See call to check_version in tensorflow/workspace.bzl - depends_on("bazel@0.5.4", type="build", when="@1.4:1.6") - # See MIN_BAZEL_VERSION in configure - depends_on("bazel@0.4.5", type="build", when="@1.2:1.3") - # See call to check_version in WORKSPACE - depends_on("bazel@0.4.2", type="build", when="@1.0:1.1") depends_on("swig", type="build") depends_on("py-pip", type="build") @@ -189,8 +132,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("py-absl-py@1:", type=("build", "run"), when="@2.9:") depends_on("py-absl-py@0.4:", type=("build", "run"), when="@2.7:2.8") depends_on("py-absl-py@0.10:0", type=("build", "run"), when="@2.4:2.6") - depends_on("py-absl-py@0.7:", type=("build", "run"), when="@1.12.1,1.14:2.3") - depends_on("py-absl-py@0.1.6:", type=("build", "run"), when="@1.5:1.12.0,1.12.2:1.13.2") + depends_on("py-absl-py@0.7:", type=("build", "run"), when="@:2.3") depends_on("py-astunparse@1.6:", type=("build", "run"), when="@2.7:") depends_on("py-astunparse@1.6.3:1.6", type=("build", "run"), when="@2.4:2.6") depends_on("py-astunparse@1.6.3", type=("build", "run"), when="@2.2:2.3") @@ -207,22 +149,20 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("py-gast@0.2.1:0.4", type=("build", "run"), when="@2.7") depends_on("py-gast@0.4.0", type=("build", "run"), when="@2.5:2.6") depends_on("py-gast@0.3.3", type=("build", "run"), when="@2.2:2.4") - depends_on("py-gast@0.2.2", type=("build", "run"), when="@1.15:2.1") - depends_on("py-gast@0.2:", type=("build", "run"), when="@1.6:1.14") + depends_on("py-gast@0.2.2", type=("build", "run"), when="@:2.1") depends_on("py-google-pasta@0.1.1:", type=("build", "run"), when="@2.7:") depends_on("py-google-pasta@0.2:0", type=("build", "run"), when="@2.4:2.6") depends_on("py-google-pasta@0.1.8:", type=("build", "run"), when="@2.2:2.3") - depends_on("py-google-pasta@0.1.6:", type=("build", "run"), when="@1.14:2.1") - depends_on("py-google-pasta@0.1.2:", type=("build", "run"), when="@1.12.1") + depends_on("py-google-pasta@0.1.6:", type=("build", "run"), when="@:2.1") depends_on("py-h5py@2.9:", type=("build", "run"), when="@2.7:") depends_on("py-h5py@3.1", type=("build", "run"), when="@2.5:2.6") depends_on("py-h5py@2.10", type=("build", "run"), when="@2.2:2.4") - depends_on("py-h5py@:2.10.0", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:2.1") + depends_on("py-h5py@:2.10.0", type=("build", "run"), when="@2.1.3:2.1") # propagate the mpi variant setting for h5py/hdf5 to avoid unexpected crashes - depends_on("py-h5py+mpi", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:+mpi") - depends_on("py-h5py~mpi", type=("build", "run"), when="@1.15.5,2.0.4,2.1.3:~mpi") - depends_on("hdf5+mpi", type="build", when="@1.15.5,2.0.4,2.1.3:+mpi") - depends_on("hdf5~mpi", type="build", when="@1.15.5,2.0.4,2.1.3:~mpi") + depends_on("py-h5py+mpi", type=("build", "run"), when="@2.1.3:+mpi") + depends_on("py-h5py~mpi", type=("build", "run"), when="@2.1.3:~mpi") + depends_on("hdf5+mpi", type="build", when="@2.1.3:+mpi") + depends_on("hdf5~mpi", type="build", when="@2.1.3:~mpi") depends_on("py-libclang@13:", type=("build", "run"), when="@2.9:") depends_on("py-libclang@9.0.1:", type=("build", "run"), when="@2.7:2.8") depends_on("py-ml-dtypes@0.2.0", type=("build", "run"), when="@2.14:") @@ -233,36 +173,22 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("py-numpy@1.14.5:", type=("build", "run"), when="@2.7") depends_on("py-numpy@1.19.2:1.19", type=("build", "run"), when="@2.4:2.6") # https://github.com/tensorflow/tensorflow/issues/40688 - depends_on("py-numpy@1.16.0:1.18", type=("build", "run"), when="@1.13.2,1.15:2.3") - depends_on("py-numpy@1.14.5:1.18", type=("build", "run"), when="@1.12.1,1.14") - depends_on( - "py-numpy@1.13.3:1.18", type=("build", "run"), when="@1.6:1.9,1.11:1.12.0,1.12.2:1.13.1" - ) - depends_on("py-numpy@1.13.3:1.14.5", type=("build", "run"), when="@1.10") - depends_on("py-numpy@1.12.1:1.14.5", type=("build", "run"), when="@1.4:1.5") - depends_on("py-numpy@1.11.0:1.14.5", type=("build", "run"), when="@:1.3") - depends_on("py-opt-einsum@2.3.2:", type=("build", "run"), when="@1.15:2.3,2.7:") + depends_on("py-numpy@1.16.0:1.18", type=("build", "run"), when="@:2.3") + depends_on("py-opt-einsum@2.3.2:", type=("build", "run"), when="@:2.3,2.7:") depends_on("py-opt-einsum@3.3", type=("build", "run"), when="@2.4:2.6") depends_on("py-packaging", type=("build", "run"), when="@2.9:") depends_on("py-protobuf@3.20.3:4.20,4.21.6:4", type=("build", "run"), when="@2.12:") depends_on("py-protobuf@3.9.2:", type=("build", "run"), when="@2.3:2.11") - depends_on("py-protobuf@3.8.0:", type=("build", "run"), when="@2.1:2.2") - depends_on("py-protobuf@3.6.1:", type=("build", "run"), when="@1.12:2.0") - depends_on("py-protobuf@3.6.0:", type=("build", "run"), when="@1.10:1.11") - depends_on("py-protobuf@3.4.0:", type=("build", "run"), when="@1.5:1.9") - depends_on("py-protobuf@3.3.0:", type=("build", "run"), when="@1.3:1.4") - depends_on("py-protobuf@3.2.0:", type=("build", "run"), when="@1.1:1.2") - depends_on("py-protobuf@3.1.0:", type=("build", "run"), when="@:1.0") + depends_on("py-protobuf@3.8.0:", type=("build", "run"), when="@:2.2") # https://github.com/protocolbuffers/protobuf/issues/10051 # https://github.com/tensorflow/tensorflow/issues/56266 depends_on("py-protobuf@:3.19", type=("build", "run"), when="@:2.11") # Must be matching versions of py-protobuf and protobuf conflicts("^py-protobuf~cpp") depends_on("py-setuptools", type=("build", "run")) - depends_on("py-six@1.12:", type=("build", "run"), when="@2.1:2.3,2.7:") + depends_on("py-six@1.12:", type=("build", "run"), when="@:2.3,2.7:") depends_on("py-six@1.15", type=("build", "run"), when="@2.4:2.6") - depends_on("py-six@1.10:", type=("build", "run"), when="@:2.0") - depends_on("py-termcolor@1.1:", type=("build", "run"), when="@1.6:2.3,2.7:") + depends_on("py-termcolor@1.1:", type=("build", "run"), when="@:2.3,2.7:") depends_on("py-termcolor@1.1", type=("build", "run"), when="@2.4:2.6") depends_on("py-typing-extensions@3.6.6:", type=("build", "run"), when="@2.7:2.12,2.14:") depends_on("py-typing-extensions@3.6.6:4.5", type=("build", "run"), when="@2.13") @@ -270,7 +196,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("py-wrapt@1.11:1.14", type=("build", "run"), when="@2.12,2.14:") depends_on("py-wrapt@1.11:", type=("build", "run"), when="@2.7:2.11,2.13") depends_on("py-wrapt@1.12.1:1.12", type=("build", "run"), when="@2.4:2.6") - depends_on("py-wrapt@1.11.1:", type=("build", "run"), when="@1.12.1,1.14:2.3") + depends_on("py-wrapt@1.11.1:", type=("build", "run"), when="@:2.3") # TODO: add packages for these dependencies # depends_on('py-tensorflow-io-gcs-filesystem@0.23.1:', type=('build', 'run'), when='@2.8:') @@ -282,7 +208,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("py-grpcio@1.37.0:1", type=("build", "run"), when="@2.6") depends_on("py-grpcio@1.34", type=("build", "run"), when="@2.5") depends_on("py-grpcio@1.32", type=("build", "run"), when="@2.4") - depends_on("py-grpcio@1.8.6:", type=("build", "run"), when="@1.6:2.3") + depends_on("py-grpcio@1.8.6:", type=("build", "run"), when="@:2.3") for minor_ver in range(5, 15): depends_on( @@ -301,20 +227,12 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("coreutils", when="@2.13: platform=darwin", type="build") # No longer a dependency in latest versions - depends_on("py-astor@0.6:", type=("build", "run"), when="@1.6:2.1") - depends_on("py-backports-weakref@1.0rc1", type=("build", "run"), when="@1.2") depends_on("py-jax@0.3.15:", type=("build", "run"), when="@2.12") - depends_on("py-keras-applications@1.0.8:", type=("build", "run"), when="@1.15:2.1") - depends_on("py-keras-applications@1.0.6:", type=("build", "run"), when="@1.12:1.14") - depends_on("py-keras-applications@1.0.5:", type=("build", "run"), when="@1.11") depends_on("py-keras-preprocessing@1.1.1:", type=("build", "run"), when="@2.7:2.10") depends_on("py-keras-preprocessing@1.1.2:1.1", type=("build", "run"), when="@2.4:2.6") depends_on("py-keras-preprocessing@1.1.1:1.1", type=("build", "run"), when="@2.3") - depends_on("py-keras-preprocessing@1.1:", type=("build", "run"), when="@2.1.0,2.2") - depends_on("py-keras-preprocessing@1.1.0", type=("build", "run"), when="@2.1.1:2.1") - depends_on("py-keras-preprocessing@1.0.5:", type=("build", "run"), when="@1.12:2.0") - depends_on("py-keras-preprocessing@1.0.3:", type=("build", "run"), when="@1.11") - depends_on("py-scipy@1.4.1", type=("build", "run"), when="@2.1.0:2.1.1,2.2.0,2.3.0") + depends_on("py-keras-preprocessing@1.1:", type=("build", "run"), when="@2.2") + depends_on("py-scipy@1.4.1", type=("build", "run"), when="@2.2.0,2.3.0") depends_on("py-wheel@0.32:0", type=("build", "run"), when="@2.7") depends_on("py-wheel@0.35:0", type=("build", "run"), when="@2.4:2.6") depends_on("py-wheel@0.26:", type=("build", "run"), when="@:2.3") @@ -353,7 +271,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): depends_on("rocminfo") # Check configure and configure.py to see when these variants are supported - conflicts("+mkl", when="@:1.0") conflicts("+mkl", when="platform=darwin", msg="Darwin is not yet supported") conflicts( "+jemalloc", @@ -365,12 +282,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): when="platform=cray", msg="Currently jemalloc is only support on Linux platform", ) - conflicts("+aws", when="@:1.3") - conflicts("+kafka", when="@:1.5,2.1:") - conflicts("+ignite", when="@:1.11,2.1:") - conflicts("+gdr", when="@:1.3") - conflicts("+verbs", when="@:1.1") - conflicts("+ngraph", when="@:1.10") conflicts("+opencl", when="platform=windows") conflicts("+computecpp", when="~opencl") conflicts( @@ -384,27 +295,9 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): when="+cuda", msg="Must specify CUDA compute capabilities of your GPU, see https://developer.nvidia.com/cuda-gpus", ) - conflicts( - "cuda_arch=20", - when="@1.12.1,1.14:", - msg="TensorFlow only supports compute capabilities >= 3.5", - ) - conflicts( - "cuda_arch=30", - when="@1.12.1,1.14:", - msg="TensorFlow only supports compute capabilities >= 3.5", - ) - conflicts( - "cuda_arch=32", - when="@1.12.1,1.14:", - msg="TensorFlow only supports compute capabilities >= 3.5", - ) - conflicts( - "cuda_arch=20", - when="@1.4:1.12.0,1.12.2:1.12.3", - msg="Only compute capabilities 3.0 or higher are supported", - ) - conflicts("+tensorrt", when="@:1.5") + conflicts("cuda_arch=20", msg="TensorFlow only supports compute capabilities >= 3.5") + conflicts("cuda_arch=30", msg="TensorFlow only supports compute capabilities >= 3.5") + conflicts("cuda_arch=32", msg="TensorFlow only supports compute capabilities >= 3.5") conflicts("+tensorrt", when="~cuda") conflicts( "+tensorrt", @@ -416,7 +309,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): when="platform=cray", msg="Currently TensorRT is only supported on Linux platform", ) - conflicts("+nccl", when="@:1.7") conflicts("+nccl", when="~cuda~rocm") conflicts( "+nccl", when="platform=darwin", msg="Currently NCCL is only supported on Linux platform" @@ -425,14 +317,8 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): "+nccl", when="platform=cray", msg="Currently NCCL is only supported on Linux platform" ) conflicts("+mpi", when="platform=windows") - conflicts("+mpi", when="@:1.2") - conflicts("+android", when="@:1.4") - conflicts("+ios", when="@:1.12.0,1.12.2:1.13") conflicts("+ios", when="platform=linux", msg="iOS support only available on macOS") conflicts("+ios", when="platform=cray", msg="iOS support only available on macOS") - conflicts("+monolithic", when="@:1.3") - conflicts("+numa", when="@:1.12.0,1.12.2:1.13") - conflicts("+dynamic_kernels", when="@:1.12.0,1.12.2:1.12.3") # https://github.com/tensorflow/tensorflow/pull/45404 conflicts("platform=darwin target=aarch64:", when="@:2.4") # https://github.com/tensorflow/tensorflow/pull/39225 @@ -445,8 +331,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): # https://www.tensorflow.org/install/source#tested_build_configurations conflicts("%gcc@:9.3.0", when="@2.9:") - conflicts("%gcc@:7.3.0", when="@1.15:") - conflicts("%gcc@:4.7") + conflicts("%gcc@:7.3.0") # zlib is vendored and downloaded directly from zlib.org (or mirrors), but # old downloads are removed from that site immediately after a new release. @@ -469,30 +354,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension): when="@2.10", ) - # Avoid build error: "no such package '@io_bazel_rules_docker..." - patch("io_bazel_rules_docker2.patch", when="@1.15:2.0") - # Avoide build error: "name 'new_http_archive' is not defined" - patch("http_archive.patch", when="@1.12.3") - # Backport of 837c8b6b upstream - # "Remove contrib cloud bigtable and storage ops/kernels." - # Allows 2.0.* releases to build with '--config=nogcp' - patch("0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch", when="@2.0.0:2.0") - - # for fcc - patch("1-1_fcc_tf_patch.patch", when="@2.1.0:2.1%fj") - - # do not import contrib.cloud if not available - patch( - "https://github.com/tensorflow/tensorflow/commit/ed62ac8203999513dfae03498e871ea35eb60cc4.patch?full_index=1", - sha256="ff02e249532a5661b123108734a39534992d81da90f0c8187bf4e151a865effc", - when="@1.14.0", - ) - # import_contrib_cloud patch for older versions - patch("contrib_cloud_1.10.patch", when="@1.10:1.13") - patch("contrib_cloud_1.9.patch", when="@1.9") - patch("contrib_cloud_1.4.patch", when="@1.4:1.8") - patch("contrib_cloud_1.1.patch", when="@1.1:1.3") - # needed for protobuf 3.16+ patch("example_parsing.patch", when="@:2.7 ^protobuf@3.16:") @@ -561,18 +422,6 @@ def setup_build_environment(self, env): env.set("TF_NEED_AWS", "0") env.set("TF_NEED_S3", "0") - # Do you wish to build TensorFlow with Apache Kafka Platform support? - if "+kafka" in spec: - env.set("TF_NEED_KAFKA", "1") - else: - env.set("TF_NEED_KAFKA", "0") - - # Do you wish to build TensorFlow with Apache Ignite support? - if "+ignite" in spec: - env.set("TF_NEED_IGNITE", "1") - else: - env.set("TF_NEED_IGNITE", "0") - # Do you wish to build TensorFlow with XLA JIT support? if "+xla" in spec: env.set("TF_ENABLE_XLA", "1") @@ -785,21 +634,12 @@ def post_configure_fixes(self): ".tf_configure.bazelrc", ) - if spec.satisfies("@1.5.0: ~android"): + if spec.satisfies("~android"): # env variable is somehow ignored -> brute force # TODO: find a better solution filter_file(r"if workspace_has_any_android_rule\(\)", r"if True", "configure.py") - # version dependent fixes - if spec.satisfies("@1.3.0:1.5.0"): - # checksum for protobuf that bazel downloads (@github) changed - filter_file( - r'sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93"', - r'sha256 = "e5fdeee6b28cf6c38d61243adff06628baa434a22b5ebb7432d2a7fbabbdb13d"', - "tensorflow/workspace.bzl", - ) - - if spec.satisfies("@1.5.0: ~gcp"): + if spec.satisfies("~gcp"): # google cloud support seems to be installed on default, leading # to boringssl error manually set the flag to false to avoid # installing gcp support @@ -810,7 +650,7 @@ def post_configure_fixes(self): ".tf_configure.bazelrc", ) - if spec.satisfies("@1.8.0: ~opencl"): + if spec.satisfies("~opencl"): # 1.8.0 and 1.9.0 aborts with numpy import error during python_api # generation somehow the wrong PYTHONPATH is used... # set --distinct_host_configuration=false as a workaround @@ -819,26 +659,6 @@ def post_configure_fixes(self): f.write("build --distinct_host_configuration=false\n") f.write('build --action_env PYTHONPATH="{0}"\n'.format(env["PYTHONPATH"])) - if spec.satisfies("@1.13.1 +nccl"): - filter_file( - r"^build --action_env NCCL_INSTALL_PATH=.*", - r'build --action_env NCCL_INSTALL_PATH="' + spec["nccl"].libs.directories[0] + '"', - ".tf_configure.bazelrc", - ) - filter_file( - r"^build --action_env NCCL_HDR_PATH=.*", - r'build --action_env NCCL_HDR_PATH="' + spec["nccl"].prefix.include + '"', - ".tf_configure.bazelrc", - ) - - # see tensorflow issue #31187 on github - if spec.satisfies("@2.0.0:2.0"): - filter_file( - r"\#define RUY_DONOTUSEDIRECTLY_AVX512 1", - "#define RUY_DONOTUSEDIRECTLY_AVX512 0", - "tensorflow/lite/experimental/ruy/platform.h", - ) - if spec.satisfies("+cuda"): libs = spec["cuda"].libs.directories libs.extend(spec["cudnn"].libs.directories) @@ -856,6 +676,8 @@ def post_configure_fixes(self): filter_file("build:opt --host_copt=-march=native", "", ".tf_configure.bazelrc") def build(self, spec, prefix): + # Bazel needs the directory to exist on install + mkdirp(python_platlib) tmp_path = env["TEST_TMPDIR"] # https://docs.bazel.build/versions/master/command-line-reference.html @@ -879,56 +701,46 @@ def build(self, spec, prefix): args.append("--incompatible_no_support_tools_in_action_inputs=false") # See .bazelrc for when each config flag is supported - if spec.satisfies("@1.12.1:"): - if "+mkl" in spec: - args.append("--config=mkl") - - if "+monolithic" in spec: - args.append("--config=monolithic") - - if "+gdr" in spec: - args.append("--config=gdr") + if "+mkl" in spec: + args.append("--config=mkl") - if "+verbs" in spec: - args.append("--config=verbs") + if "+monolithic" in spec: + args.append("--config=monolithic") - if "+ngraph" in spec: - args.append("--config=ngraph") + if "+gdr" in spec: + args.append("--config=gdr") - if "+dynamic_kernels" in spec: - args.append("--config=dynamic_kernels") + if "+verbs" in spec: + args.append("--config=verbs") - if "+cuda" in spec: - args.append("--config=cuda") + if "+ngraph" in spec: + args.append("--config=ngraph") - if "+rocm" in spec: - args.append("--config=rocm") + if "+dynamic_kernels" in spec: + args.append("--config=dynamic_kernels") - if "~aws" in spec: - args.append("--config=noaws") + if "+cuda" in spec: + args.append("--config=cuda") - if "~gcp" in spec: - args.append("--config=nogcp") + if "+rocm" in spec: + args.append("--config=rocm") - if "~hdfs" in spec: - args.append("--config=nohdfs") + if "~aws" in spec: + args.append("--config=noaws") - if "~nccl" in spec: - args.append("--config=nonccl") + if "~gcp" in spec: + args.append("--config=nogcp") - if spec.satisfies("@1.12.1:2.0"): - if "~ignite" in spec: - args.append("--config=noignite") + if "~hdfs" in spec: + args.append("--config=nohdfs") - if "~kafka" in spec: - args.append("--config=nokafka") + if "~nccl" in spec: + args.append("--config=nonccl") - if spec.satisfies("@1.12.1,1.14:"): - if "+numa" in spec: - args.append("--config=numa") + if "+numa" in spec: + args.append("--config=numa") - if spec.satisfies("@2:"): - args.append("--config=v2") + args.append("--config=v2") args.append("//tensorflow/tools/pip_package:build_pip_package") diff --git a/var/spack/repos/builtin/packages/py-tensorly/package.py b/var/spack/repos/builtin/packages/py-tensorly/package.py index f390709bdb0728..4cd4f64184f10e 100644 --- a/var/spack/repos/builtin/packages/py-tensorly/package.py +++ b/var/spack/repos/builtin/packages/py-tensorly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-termcolor/package.py b/var/spack/repos/builtin/packages/py-termcolor/package.py index 6f50906d3db5ad..b86d1219bc16dd 100644 --- a/var/spack/repos/builtin/packages/py-termcolor/package.py +++ b/var/spack/repos/builtin/packages/py-termcolor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyTermcolor(PythonPackage): pypi = "termcolor/termcolor-1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b") # pip silently replaces distutils with setuptools diff --git a/var/spack/repos/builtin/packages/py-terminado/package.py b/var/spack/repos/builtin/packages/py-terminado/package.py index 826910a159b208..08edbdb548d308 100644 --- a/var/spack/repos/builtin/packages/py-terminado/package.py +++ b/var/spack/repos/builtin/packages/py-terminado/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-terminaltables/package.py b/var/spack/repos/builtin/packages/py-terminaltables/package.py index 6314b5b2f010bc..1d76a2b762e875 100644 --- a/var/spack/repos/builtin/packages/py-terminaltables/package.py +++ b/var/spack/repos/builtin/packages/py-terminaltables/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTerminaltables(PythonPackage): maintainers("dorton21") + license("MIT") + version("3.1.0", sha256="f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tern/package.py b/var/spack/repos/builtin/packages/py-tern/package.py index 1144995f9c2b06..81d00b70351c45 100644 --- a/var/spack/repos/builtin/packages/py-tern/package.py +++ b/var/spack/repos/builtin/packages/py-tern/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTern(PythonPackage): pypi = "tern/tern-2.8.0.tar.gz" git = "https://github.com/tern-tools/tern.git" + license("BSD-2-Clause") + version("main", branch="main") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tesorter/package.py b/var/spack/repos/builtin/packages/py-tesorter/package.py index d324cef55f81fe..feb1848bf5f2e8 100644 --- a/var/spack/repos/builtin/packages/py-tesorter/package.py +++ b/var/spack/repos/builtin/packages/py-tesorter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,8 +20,12 @@ class PyTesorter(PythonPackage): maintainers("snehring") + license("GPL-3.0-or-later") + version("1.4.6", sha256="c6952c98fa78d0084742fd6c7d2d1204d36db103c3cbeb19e52093cd9d311523") + depends_on("py-setuptools", type="build") + depends_on("py-biopython", type=("build", "run")) depends_on("py-xopen", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-testfixtures/package.py b/var/spack/repos/builtin/packages/py-testfixtures/package.py index 6be2697c1a29cd..23d8b9b215d70a 100644 --- a/var/spack/repos/builtin/packages/py-testfixtures/package.py +++ b/var/spack/repos/builtin/packages/py-testfixtures/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTestfixtures(PythonPackage): homepage = "https://github.com/Simplistix/testfixtures" url = "https://github.com/Simplistix/testfixtures/archive/6.16.0.zip" + license("MIT") + version("6.16.0", sha256="6b5bbca4f7d5692ca4566c60c0383b121d9f1cfecbc3de8442c499a63c264eb8") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index 495f97fc18d693..46ac980b58efca 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-testpath/package.py b/var/spack/repos/builtin/packages/py-testpath/package.py index 9c04e3346b2cac..24186e9aa94593 100644 --- a/var/spack/repos/builtin/packages/py-testpath/package.py +++ b/var/spack/repos/builtin/packages/py-testpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTestpath(PythonPackage): homepage = "https://github.com/jupyter/testpath" pypi = "testpath/testpath-0.4.2.tar.gz" + license("BSD-3-Clause") + version("0.6.0", sha256="2f1b97e6442c02681ebe01bd84f531028a7caea1af3825000f52345c30285e0f") version("0.5.0", sha256="1acf7a0bcd3004ae8357409fc33751e16d37ccc650921da1094a86581ad1e417") version("0.4.2", sha256="b694b3d9288dbd81685c5d2e7140b81365d46c29f5db4bc659de5aa6b98780f8") diff --git a/var/spack/repos/builtin/packages/py-testrepository/package.py b/var/spack/repos/builtin/packages/py-testrepository/package.py index 45d622a5e40b60..b86a8551293ed7 100644 --- a/var/spack/repos/builtin/packages/py-testrepository/package.py +++ b/var/spack/repos/builtin/packages/py-testrepository/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTestrepository(PythonPackage): homepage = "https://launchpad.net/testrepository" pypi = "testrepository/testrepository-0.0.20.tar.gz" + license("Apache-2.0") + version("0.0.20", sha256="752449bc98c20253ec4611c40564aea93d435a5bf3ff672208e01cc10e5858eb") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-testresources/package.py b/var/spack/repos/builtin/packages/py-testresources/package.py index e71585225ded49..dcdb17cc461cde 100644 --- a/var/spack/repos/builtin/packages/py-testresources/package.py +++ b/var/spack/repos/builtin/packages/py-testresources/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTestresources(PythonPackage): homepage = "https://launchpad.net/testresources" pypi = "testresources/testresources-2.0.1.tar.gz" + license("Apache-2.0") + version("2.0.1", sha256="ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-testscenarios/package.py b/var/spack/repos/builtin/packages/py-testscenarios/package.py index 49210655519a03..fe269ae3068621 100644 --- a/var/spack/repos/builtin/packages/py-testscenarios/package.py +++ b/var/spack/repos/builtin/packages/py-testscenarios/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTestscenarios(PythonPackage): homepage = "https://launchpad.net/testscenarios" pypi = "testscenarios/testscenarios-0.5.0.tar.gz" + license("Apache-2.0") + version("0.5.0", sha256="c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-testtools/package.py b/var/spack/repos/builtin/packages/py-testtools/package.py index add500a57d9e3c..b89d621270556c 100644 --- a/var/spack/repos/builtin/packages/py-testtools/package.py +++ b/var/spack/repos/builtin/packages/py-testtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTesttools(PythonPackage): homepage = "https://github.com/testing-cabal/testtools" pypi = "testtools/testtools-2.3.0.tar.gz" + license("MIT") + version("2.3.0", sha256="5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tetoolkit/package.py b/var/spack/repos/builtin/packages/py-tetoolkit/package.py index 9a58b3e3587c3b..a1ffd161d3b4b0 100644 --- a/var/spack/repos/builtin/packages/py-tetoolkit/package.py +++ b/var/spack/repos/builtin/packages/py-tetoolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTetoolkit(PythonPackage): homepage = "http://hammelllab.labsites.cshl.edu/software" pypi = "TEToolkit/TEToolkit-1.5.1.tar.gz" + license("GPL-3.0-only") + version("2.0.3", sha256="1d0f5928b30c6cd9dbef8e092ae0c11e9e707faf92a19af8eed3e360da7d4e46") version("1.5.1", sha256="22c13ca45bccc89e9d9bf48d59ae6db1fa4c634def64fc56ba9bffd23aa689ac") diff --git a/var/spack/repos/builtin/packages/py-text-unidecode/package.py b/var/spack/repos/builtin/packages/py-text-unidecode/package.py index d9e6c878caa640..faa55536439bb7 100644 --- a/var/spack/repos/builtin/packages/py-text-unidecode/package.py +++ b/var/spack/repos/builtin/packages/py-text-unidecode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTextUnidecode(PythonPackage): homepage = "https://github.com/kmike/text-unidecode/" pypi = "text-unidecode/text-unidecode-1.3.tar.gz" + license("Artistic-1.0-Perl") + version("1.3", sha256="bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-textblob/package.py b/var/spack/repos/builtin/packages/py-textblob/package.py index f59d7599832e4a..3f05c18c168a15 100644 --- a/var/spack/repos/builtin/packages/py-textblob/package.py +++ b/var/spack/repos/builtin/packages/py-textblob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyTextblob(PythonPackage): homepage = "https://textblob.readthedocs.io/" url = "https://github.com/sloria/TextBlob/archive/0.16.0.tar.gz" + license("MIT") + version("0.16.0", sha256="bf29369f3260cc779b22b2b86337bcce0c8e929d994b1c8f0d39545ec2fb33aa") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-texttable/package.py b/var/spack/repos/builtin/packages/py-texttable/package.py index ae3a7fe540329b..714547512d0b41 100644 --- a/var/spack/repos/builtin/packages/py-texttable/package.py +++ b/var/spack/repos/builtin/packages/py-texttable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTexttable(PythonPackage): homepage = "https://github.com/foutaise/texttable/" pypi = "texttable/texttable-1.6.1.tar.gz" + license("MIT") + version("1.6.7", sha256="290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2") version("1.6.6", sha256="e106b1204b788663283784fd6e5dfc23f1574b84e518e5d286c1a1e66dabd42c") version("1.6.5", sha256="fc3f763a89796ae03789a02343bd4e8fed9735935123b1bfb9537a5935852315") diff --git a/var/spack/repos/builtin/packages/py-textwrap3/package.py b/var/spack/repos/builtin/packages/py-textwrap3/package.py index a28350b2dbe03d..352fac9070c3cf 100644 --- a/var/spack/repos/builtin/packages/py-textwrap3/package.py +++ b/var/spack/repos/builtin/packages/py-textwrap3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-tfdlpack/package.py b/var/spack/repos/builtin/packages/py-tfdlpack/package.py index 96ab92df54dd65..ac747b3f36a82f 100644 --- a/var/spack/repos/builtin/packages/py-tfdlpack/package.py +++ b/var/spack/repos/builtin/packages/py-tfdlpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTfdlpack(CMakePackage, PythonExtension): maintainers("adamjstewart") + license("Apache-2.0") + version("master", branch="master", submodules=True) version( "0.1.1", tag="v0.1.1", commit="a1fdb53096158c2ec9189bb1ff46c92c6f571bbe", submodules=True @@ -31,14 +33,7 @@ class PyTfdlpack(CMakePackage, PythonExtension): depends_on("py-tensorflow", type=("build", "run")) def cmake_args(self): - args = ["-DPYTHON_EXECUTABLE=" + self.spec["python"].command.path] - - if "+cuda" in self.spec: - args.append("-DUSE_CUDA=ON") - else: - args.append("-DUSE_CUDA=OFF") - - return args + return [self.define_from_variant("USE_CUDA", "cuda")] def install(self, spec, prefix): with working_dir("python"): diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index f06ca0a43dcacd..a9ba9cc9e93eac 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTheano(PythonPackage, CudaPackage): pypi = "Theano/Theano-0.8.2.tar.gz" git = "https://github.com/Theano/Theano.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.0.5", sha256="6e9439dd53ba995fcae27bf20626074bfc2fff446899dc5c53cb28c1f9202e89") version("1.0.4", sha256="35c9bbef56b61ffa299265a42a4e8f8cb5a07b2997dabaef0f8830b397086913") diff --git a/var/spack/repos/builtin/packages/py-thewalrus/package.py b/var/spack/repos/builtin/packages/py-thewalrus/package.py index 1b7a902d35ed1d..972e6798a3c4db 100644 --- a/var/spack/repos/builtin/packages/py-thewalrus/package.py +++ b/var/spack/repos/builtin/packages/py-thewalrus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyThewalrus(PythonPackage): homepage = "https://github.com/XanaduAI/thewalrus" pypi = "thewalrus/thewalrus-0.19.0.tar.gz" + license("Apache-2.0") + version("0.19.0", sha256="06ff07a14cd8cd4650d9c82b8bb8301ef9a58dcdd4bafb14841768ccf80c98b9") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-thinc/package.py b/var/spack/repos/builtin/packages/py-thinc/package.py index 652c8b4a94951e..1dbfac1e074032 100644 --- a/var/spack/repos/builtin/packages/py-thinc/package.py +++ b/var/spack/repos/builtin/packages/py-thinc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyThinc(PythonPackage): homepage = "https://github.com/explosion/thinc" pypi = "thinc/thinc-7.4.1.tar.gz" + license("MIT") + version("7.4.1", sha256="0139fa84dc9b8d88af15e648fc4ae13d899b8b5e49cb26a8f4a0604ee9ad8a9e") version("7.4.0", sha256="523e9be1bfaa3ed1d03d406ce451b6b4793a9719d5b83d2ea6b3398b96bc58b8") diff --git a/var/spack/repos/builtin/packages/py-thop/package.py b/var/spack/repos/builtin/packages/py-thop/package.py index 349886a042e419..d45ef6b0152be2 100644 --- a/var/spack/repos/builtin/packages/py-thop/package.py +++ b/var/spack/repos/builtin/packages/py-thop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyThop(PythonPackage): homepage = "https://github.com/Lyken17/pytorch-OpCounter/" url = "https://pypi.io/packages/py3/t/thop/thop-0.1.1.post2209072238-py3-none-any.whl" + license("MIT") + version( "0.1.1.post2209072238", sha256="01473c225231927d2ad718351f78ebf7cffe6af3bed464c4f1ba1ef0f7cdda27", diff --git a/var/spack/repos/builtin/packages/py-threadpoolctl/package.py b/var/spack/repos/builtin/packages/py-threadpoolctl/package.py index 3d7bc4f96dcb7d..399f7dea249f36 100644 --- a/var/spack/repos/builtin/packages/py-threadpoolctl/package.py +++ b/var/spack/repos/builtin/packages/py-threadpoolctl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyThreadpoolctl(PythonPackage): homepage = "https://github.com/joblib/threadpoolctl" pypi = "threadpoolctl/threadpoolctl-2.0.0.tar.gz" + license("BSD-3-Clause") + version("3.1.0", sha256="a335baacfaa4400ae1f0d8e3a58d6674d2f8828e3716bb2802c44955ad391380") version("3.0.0", sha256="d03115321233d0be715f0d3a5ad1d6c065fe425ddc2d671ca8e45e9fd5d7a52a") version("2.0.0", sha256="48b3e3e9ee079d6b5295c65cbe255b36a3026afc6dde3fb49c085cd0c004bbcf") diff --git a/var/spack/repos/builtin/packages/py-throttler/package.py b/var/spack/repos/builtin/packages/py-throttler/package.py index cbd0c27c51fb9a..6caa67ec4acb17 100644 --- a/var/spack/repos/builtin/packages/py-throttler/package.py +++ b/var/spack/repos/builtin/packages/py-throttler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyThrottler(PythonPackage): maintainers("charmoniumQ") + license("MIT") + version("1.2.2", sha256="d54db406d98e1b54d18a9ba2b31ab9f093ac64a0a59d730c1cf7bb1cdfc94a58") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-tidynamics/package.py b/var/spack/repos/builtin/packages/py-tidynamics/package.py index 58571fc337356c..116260e0f8ab8c 100644 --- a/var/spack/repos/builtin/packages/py-tidynamics/package.py +++ b/var/spack/repos/builtin/packages/py-tidynamics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTidynamics(PythonPackage): maintainers("RMeli") + license("BSD-3-Clause") + version("1.1.2", sha256="103874edd79dc64a0c7b765f51200926822e74df63703acb6c630a8167dbcfa2") version("1.0.0", sha256="b7bd669d380b0f469f3a8aedfbc0e5fa967fe8dc44e196f54baf0edb59846976") diff --git a/var/spack/repos/builtin/packages/py-tifffile/package.py b/var/spack/repos/builtin/packages/py-tifffile/package.py index a82e64e259e7f1..ed0942d8dbdb15 100644 --- a/var/spack/repos/builtin/packages/py-tifffile/package.py +++ b/var/spack/repos/builtin/packages/py-tifffile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTifffile(PythonPackage): homepage = "https://github.com/cgohlke/tifffile" pypi = "tifffile/tifffile-0.12.1.tar.gz" + license("BSD-3-Clause") + version("2023.8.30", sha256="6a8c53b012a286b75d09a1498ab32f202f24cc6270a105b5d5911dc4426f162a") version( "2022.10.10", sha256="50b61ba943b866d191295bc38a00191c9fdab23ece063544c7f1a264e3f6aa8e" diff --git a/var/spack/repos/builtin/packages/py-tiktoken/package.py b/var/spack/repos/builtin/packages/py-tiktoken/package.py index cd5515ec06d7c5..361abb095ea758 100644 --- a/var/spack/repos/builtin/packages/py-tiktoken/package.py +++ b/var/spack/repos/builtin/packages/py-tiktoken/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTiktoken(PythonPackage): maintainers("meyersbs") + license("MIT") + version("0.4.0", sha256="59b20a819969735b48161ced9b92f05dc4519c17be4015cfb73b65270a243620") version("0.3.1", sha256="8295912429374f5f3c6c6bf053a091ce1de8c1792a62e3b30d4ad36f47fa8b52") diff --git a/var/spack/repos/builtin/packages/py-timm/package.py b/var/spack/repos/builtin/packages/py-timm/package.py index 2be19562d47329..c477f3cdb1e7fd 100644 --- a/var/spack/repos/builtin/packages/py-timm/package.py +++ b/var/spack/repos/builtin/packages/py-timm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTimm(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.9.5", sha256="669835f0030cfb2412c464b7b563bb240d4d41a141226afbbf1b457e4f18cff1") version("0.9.2", sha256="d0977cc5e02c69bda979fca8b52aa315a5f2cb64ebf8ad2c4631b1e452762c14") version("0.9.1", sha256="171420ac499e7999d38fb8b08fffa5ca3950b38db23bba84763cd92621ca80a2") diff --git a/var/spack/repos/builtin/packages/py-tinyarray/package.py b/var/spack/repos/builtin/packages/py-tinyarray/package.py index 61cb28763b2e3d..1267ff0b60a5bc 100644 --- a/var/spack/repos/builtin/packages/py-tinyarray/package.py +++ b/var/spack/repos/builtin/packages/py-tinyarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyTinyarray(PythonPackage): # package is updated maintainers("payerle") + license("BSD-2-Clause") + version("1.2.4", sha256="ecd3428fd8a48b61fc5f0a413ede03e27db3a1dd53fcd49e24a36d11a8a29aba") version("1.2.3", sha256="47a06f801ed4b3d438f4f7098e244cd0c6d7db09428b1bc5ee813e52234dee9f") version("1.2.2", sha256="660d6d8532e1db5efbebae2861e5733a7082486fbdeb47d57d84b8f477d697e4") diff --git a/var/spack/repos/builtin/packages/py-tinycss2/package.py b/var/spack/repos/builtin/packages/py-tinycss2/package.py index 823d7879aa50d8..687c7e9a9d7487 100644 --- a/var/spack/repos/builtin/packages/py-tinycss2/package.py +++ b/var/spack/repos/builtin/packages/py-tinycss2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTinycss2(PythonPackage): pypi = "tinycss2/tinycss2-1.1.1.tar.gz" git = "https://github.com/Kozea/tinycss2.git" + license("BSD-3-Clause") + version("1.2.1", sha256="8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627") version("1.1.1", sha256="b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf") diff --git a/var/spack/repos/builtin/packages/py-tinydb/package.py b/var/spack/repos/builtin/packages/py-tinydb/package.py index b9239e33a80923..98d9a4aca27218 100644 --- a/var/spack/repos/builtin/packages/py-tinydb/package.py +++ b/var/spack/repos/builtin/packages/py-tinydb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTinydb(PythonPackage): homepage = "https://tinydb.readthedocs.io" pypi = "tinydb/tinydb-4.7.0.tar.gz" + license("MIT") + version("4.7.1", sha256="8955c239a79b8a6c8f637900152e2de38690848199d71d870c33c16405433ca5") version("4.7.0", sha256="357eb7383dee6915f17b00596ec6dd2a890f3117bf52be28a4c516aeee581100") version("4.6.1", sha256="0d5400f5e5ae368a84d57cb234456f1cf70430fd39bcd77ccd568fea91ff2a4e") diff --git a/var/spack/repos/builtin/packages/py-tldextract/package.py b/var/spack/repos/builtin/packages/py-tldextract/package.py new file mode 100644 index 00000000000000..b36d39d476cde9 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-tldextract/package.py @@ -0,0 +1,34 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyTldextract(PythonPackage): + """ + Accurately separates a URL's subdomain, domain, and public suffix, + using the Public Suffix List (PSL). By default, this includes the + public ICANN TLDs and their exceptions. You can optionally support + the Public Suffix List's private domains as well. + """ + + homepage = "https://github.com/john-kurkowski/tldextract" + pypi = "tldextract/tldextract-3.4.1.tar.gz" + + maintainers("LydDeb") + + license("BSD-3-Clause") + + version("5.1.1", sha256="9b6dbf803cb5636397f0203d48541c0da8ba53babaf0e8a6feda2d88746813d4") + version("3.4.1", sha256="fa9e50c4a03bede2a1d95dca620d661678484626858ccf388cf9671a0dd497a4") + + depends_on("py-setuptools@61.2:", when="@5.1.1", type="build") + depends_on("py-setuptools", type="build") + depends_on("py-setuptools-scm@6.2:+toml", when="@5.1.1", type="build") + depends_on("py-setuptools-scm", type="build") + depends_on("py-idna", type=("build", "run")) + depends_on("py-requests@2.1.0:", type=("build", "run")) + depends_on("py-requests-file@1.4:", type=("build", "run")) + depends_on("py-filelock@3.0.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tokenize-rt/package.py b/var/spack/repos/builtin/packages/py-tokenize-rt/package.py index 35c872a53abab6..fbcf641445b55d 100644 --- a/var/spack/repos/builtin/packages/py-tokenize-rt/package.py +++ b/var/spack/repos/builtin/packages/py-tokenize-rt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTokenizeRt(PythonPackage): homepage = "https://github.com/asottile/tokenize-rt" pypi = "tokenize_rt/tokenize_rt-4.2.1.tar.gz" + license("MIT") + version("4.2.1", sha256="0d4f69026fed520f8a1e0103aa36c406ef4661417f20ca643f913e33531b3b94") depends_on("python@3.6.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py index 5555fcdb087e4c..8a5b4a88a9f6ca 100644 --- a/var/spack/repos/builtin/packages/py-tokenizers/package.py +++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,23 +13,35 @@ class PyTokenizers(PythonPackage): homepage = "https://github.com/huggingface/tokenizers" pypi = "tokenizers/tokenizers-0.6.0.tar.gz" + version("0.15.0", sha256="10c7e6e7b4cabd757da59e93f5f8d1126291d16f8b54f28510825ef56a3e5d0e") version("0.13.3", sha256="2e546dbb68b623008a5442353137fbb0123d311a6d7ba52f2667c8862a75af2e") version("0.13.1", sha256="3333d1cee5c8f47c96362ea0abc1f81c77c9b92c6c3d11cbf1d01985f0d5cf1d") version("0.10.3", sha256="1a5d3b596c6d3a237e1ad7f46c472d467b0246be7fd1a364f12576eb8db8f7e6") - version("0.6.0", sha256="1da11fbfb4f73be695bed0d655576097d09a137a16dceab2f66399716afaffac") - version("0.5.2", sha256="b5a235f9c71d04d4925df6c4fa13b13f1d03f9b7ac302b89f8120790c4f742bc") - - depends_on("py-setuptools", type="build") - depends_on("py-setuptools-rust", type="build") - - # A nightly or dev version of rust is required to build older versions. - # https://github.com/huggingface/tokenizers/issues/176 - # https://github.com/PyO3/pyo3/issues/5 - depends_on("rust@nightly", when="@:0.10", type="build") + version( + "0.6.0", + sha256="1da11fbfb4f73be695bed0d655576097d09a137a16dceab2f66399716afaffac", + deprecated=True, + ) + version( + "0.5.2", + sha256="b5a235f9c71d04d4925df6c4fa13b13f1d03f9b7ac302b89f8120790c4f742bc", + deprecated=True, + ) # TODO: This package currently requires internet access to install. + depends_on("py-maturin@1", when="@0.14:", type="build") + depends_on("py-huggingface-hub@0.16.4:0", when="@0.15:", type=("build", "run")) # cargo resolves dependencies, which includes openssl-sys somewhere, which needs # system pkgconfig and openssl. depends_on("pkgconfig", type="build") depends_on("openssl") + + # Historical dependencies + depends_on("py-setuptools", when="@:0.13", type="build") + depends_on("py-setuptools-rust", when="@:0.13", type="build") + + # A nightly or dev version of rust is required to build older versions. + # https://github.com/huggingface/tokenizers/issues/176 + # https://github.com/PyO3/pyo3/issues/5 + depends_on("rust@nightly", when="@:0.8", type="build") diff --git a/var/spack/repos/builtin/packages/py-toml/package.py b/var/spack/repos/builtin/packages/py-toml/package.py index 0e70adf5bfb862..f5dd573265e692 100644 --- a/var/spack/repos/builtin/packages/py-toml/package.py +++ b/var/spack/repos/builtin/packages/py-toml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyToml(PythonPackage): homepage = "https://github.com/uiri/toml.git" url = "https://github.com/uiri/toml/archive/0.10.2.tar.gz" + license("MIT") + version("0.10.2", sha256="71d4039bbdec91e3e7591ec5d6c943c58f9a2d17e5f6783acdc378f743fcdd2a") version("0.10.0", sha256="c3821b94be15da61d631bfff45b5c58074f01149792182e68f8690829cabfcf6") version("0.9.3", sha256="633a90ecb1f5665b58f0c94153fcf519313ef53e1de0eac90929cd6b6a014235") diff --git a/var/spack/repos/builtin/packages/py-tomli-w/package.py b/var/spack/repos/builtin/packages/py-tomli-w/package.py index 60d39f7d278dc5..147369a880b48b 100644 --- a/var/spack/repos/builtin/packages/py-tomli-w/package.py +++ b/var/spack/repos/builtin/packages/py-tomli-w/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTomliW(PythonPackage): homepage = "https://github.com/hukkin/tomli-w" pypi = "tomli_w/tomli_w-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tomli/package.py b/var/spack/repos/builtin/packages/py-tomli/package.py index ae213cc112a094..18a46e244d9fe4 100644 --- a/var/spack/repos/builtin/packages/py-tomli/package.py +++ b/var/spack/repos/builtin/packages/py-tomli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyTomli(PythonPackage): maintainers("charmoniumq") + license("MIT") + version("2.0.1", sha256="de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f") version("1.2.2", sha256="c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee") version("1.2.1", sha256="a5b75cb6f3968abb47af1b40c1819dc519ea82bcc065776a866e8d74c5ca9442") diff --git a/var/spack/repos/builtin/packages/py-tomlkit/package.py b/var/spack/repos/builtin/packages/py-tomlkit/package.py index 8e7486d36aaf39..40ad35b04ace69 100644 --- a/var/spack/repos/builtin/packages/py-tomlkit/package.py +++ b/var/spack/repos/builtin/packages/py-tomlkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTomlkit(PythonPackage): homepage = "https://github.com/sdispater/tomlkit" pypi = "tomlkit/tomlkit-0.7.0.tar.gz" + license("MIT") + version("0.12.1", sha256="38e1ff8edb991273ec9f6181244a6a391ac30e9f5098e7535640ea6be97a7c86") version("0.11.4", sha256="3235a9010fae54323e727c3ac06fb720752fe6635b3426e379daec60fbd44a83") version("0.11.0", sha256="71ceb10c0eefd8b8f11fe34e8a51ad07812cb1dc3de23247425fbc9ddc47b9dd") diff --git a/var/spack/repos/builtin/packages/py-tomopy/package.py b/var/spack/repos/builtin/packages/py-tomopy/package.py index 59a1c0f1b32d49..3940c9a9dbf349 100644 --- a/var/spack/repos/builtin/packages/py-tomopy/package.py +++ b/var/spack/repos/builtin/packages/py-tomopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTomopy(PythonPackage): url = "https://github.com/tomopy/tomopy/archive/1.0.0.tar.gz" git = "https://github.com/tomopy/tomopy.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.11.0", sha256="4e5691c2b083753692ba4376ce301578037071c83fc61a6ae9e5bc9e6fcd3d1f") version("1.0.0", sha256="ee45f7a062e5a66d6f18a904d2e204e48d85a1ce1464156f9e2f6353057dfe4c") diff --git a/var/spack/repos/builtin/packages/py-toolz/package.py b/var/spack/repos/builtin/packages/py-toolz/package.py index 1e1c781017718e..c83f49c6355ed5 100644 --- a/var/spack/repos/builtin/packages/py-toolz/package.py +++ b/var/spack/repos/builtin/packages/py-toolz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyToolz(PythonPackage): homepage = "https://github.com/pytoolz/toolz/" pypi = "toolz/toolz-0.9.0.tar.gz" + license("BSD-3-Clause") + version("0.12.0", sha256="88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194") version("0.9.0", sha256="929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9") diff --git a/var/spack/repos/builtin/packages/py-topiary-asr/package.py b/var/spack/repos/builtin/packages/py-topiary-asr/package.py index 6e5f14e11a5b9e..29181dd768f63d 100644 --- a/var/spack/repos/builtin/packages/py-topiary-asr/package.py +++ b/var/spack/repos/builtin/packages/py-topiary-asr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyTopiaryAsr(PythonPackage): maintainers("snehring") + license("MIT") + version("main", branch="main") version("0.9.9", sha256="5601fba92e7add33a3732482426b2c7ef46b0fccc4a4ea11357537e1b937903c") diff --git a/var/spack/repos/builtin/packages/py-toposort/package.py b/var/spack/repos/builtin/packages/py-toposort/package.py index f25352515530bf..ddddb77124ae98 100644 --- a/var/spack/repos/builtin/packages/py-toposort/package.py +++ b/var/spack/repos/builtin/packages/py-toposort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,11 +9,20 @@ class PyToposort(PythonPackage): """Implements a topological sort algorithm.""" - pypi = "toposort/toposort-1.6.tar.gz" + pypi = "toposort/toposort-1.10.tar.gz" maintainers("marcusboden") + license("Apache-2.0") + + version("1.10", sha256="bfbb479c53d0a696ea7402601f4e693c97b0367837c8898bc6471adfca37a6bd") + version("1.9", sha256="f41a34490d44934b533a7bdaff979ee8a47203fd2d8a746db83f2d5ab12458b9") + version("1.8", sha256="b1e89996c43daaf0e03805d33df22333c99c9d36715b188dea0e551ce2f1cd81") + version("1.7", sha256="ddc2182c42912a440511bd7ff5d3e6a1cabc3accbc674a3258c8c41cbfbb2125") version("1.6", sha256="a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac") - depends_on("python@2.7:2.8,3.3:", type=("build", "run")) + depends_on("python@3.8:", type=("build", "run"), when="@1.8:") + depends_on("python@2.7:2.8,3.3:", type=("build", "run"), when="@:1.8") + + depends_on("py-setuptools@42:", type="build", when="@1.7:") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-torch-cluster/package.py b/var/spack/repos/builtin/packages/py-torch-cluster/package.py index 13f59512b7faa7..feb225ff9a5945 100644 --- a/var/spack/repos/builtin/packages/py-torch-cluster/package.py +++ b/var/spack/repos/builtin/packages/py-torch-cluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -7,24 +7,31 @@ class PyTorchCluster(PythonPackage): - """This package consists of a small extension library of - highly optimized graph cluster algorithms for the use in - PyTorch.""" + """This package consists of a small extension library of highly optimized graph cluster + algorithms for the use in PyTorch. + """ homepage = "https://github.com/rusty1s/pytorch_cluster" url = "https://github.com/rusty1s/pytorch_cluster/archive/1.5.7.tar.gz" + license("MIT") + + version("1.6.3", sha256="0e2b08095e03cf87ce9b23b7a7352236a25d3ed92d92351dc020fd927ea8dbfe") version("1.5.8", sha256="95c6e81e9c4a6235e1b2152ab917021d2060ad995199f6bd7fb39986d37310f0") version("1.5.7", sha256="71701d2f7f3e458ebe5904c982951349fdb60e6f1654e19c7e102a226e2de72e") variant("cuda", default=False, description="Enables CUDA support") - depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-pytest-runner", type="build") depends_on("py-scipy", type=("build", "run")) - depends_on("py-torch+cuda", when="+cuda") - depends_on("py-torch~cuda", when="~cuda") + depends_on("py-torch+cuda", when="+cuda", type=("build", "link", "run")) + depends_on("py-torch~cuda", when="~cuda", type=("build", "link", "run")) + + # https://github.com/rusty1s/pytorch_cluster/issues/120 + depends_on("py-torch~openmp", when="@:1.5 %apple-clang", type=("build", "link", "run")) + + # Historical dependencies + depends_on("py-pytest-runner", when="@:1.5", type="build") def setup_build_environment(self, env): if "+cuda" in self.spec: diff --git a/var/spack/repos/builtin/packages/py-torch-geometric/package.py b/var/spack/repos/builtin/packages/py-torch-geometric/package.py index aaab9b24a9e18b..89b5ffe181cb78 100644 --- a/var/spack/repos/builtin/packages/py-torch-geometric/package.py +++ b/var/spack/repos/builtin/packages/py-torch-geometric/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class PyTorchGeometric(PythonPackage): homepage = "https://github.com/pyg-team/pytorch_geometric" pypi = "torch-geometric/torch_geometric-2.1.0.post1.tar.gz" + license("MIT") + version( "2.1.0.post1", sha256="32347402076ccf60fa50312825178f1e3e5ce5e7b3b3a8b2729ac699da24525d" ) diff --git a/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py b/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py index fbb696ee4595e1..45f9b279cb2b90 100644 --- a/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py +++ b/var/spack/repos/builtin/packages/py-torch-nvidia-apex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTorchNvidiaApex(PythonPackage, CudaPackage): homepage = "https://github.com/nvidia/apex/" git = "https://github.com/nvidia/apex/" + license("BSD-3-Clause") + version("master", branch="master") version("2020-10-19", commit="8a1ed9e8d35dfad26fb973996319965e4224dcdd") diff --git a/var/spack/repos/builtin/packages/py-torch-scatter/package.py b/var/spack/repos/builtin/packages/py-torch-scatter/package.py index 39345cd2b8f848..52804ef4b67feb 100644 --- a/var/spack/repos/builtin/packages/py-torch-scatter/package.py +++ b/var/spack/repos/builtin/packages/py-torch-scatter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTorchScatter(PythonPackage): homepage = "https://github.com/rusty1s/pytorch_scatter" url = "https://github.com/rusty1s/pytorch_scatter/archive/2.0.5.tar.gz" + license("MIT") + version("2.0.5", sha256="e29b364beaa9c84a99e0e236be89ed19d4452d89010ff736184ddcce488b47f6") variant("cuda", default=False, description="Enable CUDA support") diff --git a/var/spack/repos/builtin/packages/py-torch-sparse/package.py b/var/spack/repos/builtin/packages/py-torch-sparse/package.py index b74a7bed549f24..8a1ed1a57d02e1 100644 --- a/var/spack/repos/builtin/packages/py-torch-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-torch-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTorchSparse(PythonPackage): homepage = "https://github.com/rusty1s/pytorch_sparse/" url = "https://github.com/rusty1s/pytorch_sparse/archive/0.6.7.tar.gz" + license("MIT") + version("0.6.17", sha256="c964a70ed978bff65009250eb12fae96317c60c9a04d7d1b07f0beee8b4b9c22") version("0.6.8", sha256="98f7ff1f0f9cd5031bc81c70c11970c3864545ae33677025a6efd2466a97e6f9") version("0.6.7", sha256="0d038a1502548692972a085cd0496460b5d2050bb7328427add990f081d6c44d") diff --git a/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py b/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py index ef6592250b9919..e1bc630e543f64 100644 --- a/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py +++ b/var/spack/repos/builtin/packages/py-torch-spline-conv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTorchSplineConv(PythonPackage): homepage = "https://github.com/rusty1s/pytorch_spline_conv" url = "https://github.com/rusty1s/pytorch_spline_conv/archive/1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="ab8da41357c8a4785662366655bb6dc5e84fd0e938008194955409aefe535009") variant("cuda", default=False, description="Enable CUDA support") diff --git a/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch b/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch deleted file mode 100644 index 9cb136b3f88fae..00000000000000 --- a/var/spack/repos/builtin/packages/py-torch/cusparseGetErrorString.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu -index 1cee04c200..f46003d9a9 100644 ---- a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu -+++ b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu -@@ -10,48 +10,6 @@ - namespace at { namespace native { namespace sparse { namespace cuda { - - --std::string cusparseGetErrorString(cusparseStatus_t status) { -- switch(status) -- { -- case CUSPARSE_STATUS_SUCCESS: -- return "success"; -- -- case CUSPARSE_STATUS_NOT_INITIALIZED: -- return "library not initialized"; -- -- case CUSPARSE_STATUS_ALLOC_FAILED: -- return "resource allocation failed"; -- -- case CUSPARSE_STATUS_INVALID_VALUE: -- return "an invalid numeric value was used as an argument"; -- -- case CUSPARSE_STATUS_ARCH_MISMATCH: -- return "an absent device architectural feature is required"; -- -- case CUSPARSE_STATUS_MAPPING_ERROR: -- return "an access to GPU memory space failed"; -- -- case CUSPARSE_STATUS_EXECUTION_FAILED: -- return "the GPU program failed to execute"; -- -- case CUSPARSE_STATUS_INTERNAL_ERROR: -- return "an internal operation failed"; -- -- case CUSPARSE_STATUS_MATRIX_TYPE_NOT_SUPPORTED: -- return "the matrix type is not supported by this function"; -- -- case CUSPARSE_STATUS_ZERO_PIVOT: -- return "an entry of the matrix is either structural zero or numerical zero (singular block)"; -- -- default: -- { -- std::ostringstream oss; -- oss << "unknown error " << static_cast(status); -- return oss.str(); -- } -- } --} -- - inline void CUSPARSE_CHECK(cusparseStatus_t status) - { - if (status != CUSPARSE_STATUS_SUCCESS) { diff --git a/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch b/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch deleted file mode 100644 index 826c5c2b078de0..00000000000000 --- a/var/spack/repos/builtin/packages/py-torch/fj-ssl2_1.2.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 00dcabd131..bddd3716ca 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -107,7 +107,7 @@ else() - set(AT_MKLDNN_ENABLED 0) - set(AT_MKL_ENABLED 0) - endif() --set_property(CACHE BLAS PROPERTY STRINGS "Eigen;ATLAS;OpenBLAS;MKL;vecLib") -+set_property(CACHE BLAS PROPERTY STRINGS "Eigen;ATLAS;OpenBLAS;MKL;vecLib;SSL2") - message(STATUS "Trying to find preferred BLAS backend of choice: " ${BLAS}) - - if(BLAS STREQUAL "Eigen") -@@ -147,6 +147,20 @@ elseif(BLAS STREQUAL "vecLib") - find_package(vecLib REQUIRED) - include_directories(SYSTEM ${vecLib_INCLUDE_DIR}) - list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS ${vecLib_LINKER_LIBS}) -+elseif(BLAS STREQUAL "SSL2") -+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$" -+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$") -+ message(STATUS "SSL2 Selected BLAS library") -+ list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS "fjlapackexsve.so") -+ set(SSL2_FOUND ON) -+ message(STATUS "set CMAKE_SHARED_LINKER_FLAGS: -SSL2 --linkfortran") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran") -+ set(WITH_BLAS "ssl2") -+ else() -+ message(STATUS "Not built using fcc and FCC.") -+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}") -+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") -+ endif() - else() - message(FATAL_ERROR "Unrecognized BLAS option: " ${BLAS}) - endif() -@@ -156,7 +170,7 @@ if (NOT INTERN_BUILD_MOBILE) - set(AT_MKL_ENABLED 0) - set(AT_MKL_MT 0) - set(USE_BLAS 1) -- if(NOT (ATLAS_FOUND OR OpenBLAS_FOUND OR MKL_FOUND OR VECLIB_FOUND)) -+ if(NOT (ATLAS_FOUND OR OpenBLAS_FOUND OR MKL_FOUND OR VECLIB_FOUND OR SSL2_FOUND)) - message(WARNING "Preferred BLAS (" ${BLAS} ") cannot be found, now searching for a general BLAS library") - find_package(BLAS) - if (NOT BLAS_FOUND) -diff --git a/cmake/Modules/FindBLAS.cmake b/cmake/Modules/FindBLAS.cmake -index d6c0346739..72f4e18da2 100644 ---- a/cmake/Modules/FindBLAS.cmake -+++ b/cmake/Modules/FindBLAS.cmake -@@ -225,6 +225,28 @@ if((NOT BLAS_LIBRARIES) - endif (BLAS_LIBRARIES) - endif() - -+# BLAS in SSL2 library? -+if((NOT BLAS_LIBRARIES) -+ AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "ssl2"))) -+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$" -+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$") -+ check_fortran_libraries( -+ BLAS_LIBRARIES -+ BLAS -+ sgemm -+ "-SSL2;--linkfortran" -+ "fjlapackexsve") -+ if (BLAS_LIBRARIES) -+ set(BLAS_INFO "ssl2") -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran") -+ endif (BLAS_LIBRARIES) -+ else() -+ message(STATUS "Not built using fcc and FCC.") -+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}") -+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") -+ endif() -+endif() -+ - # Generic BLAS library? - if((NOT BLAS_LIBRARIES) - AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "generic"))) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index d2edd9453837bf..6126b33111face 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,8 +23,11 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): # core libraries to ensure that the package was successfully installed. import_modules = ["torch", "torch.autograd", "torch.nn", "torch.utils"] + license("Intel") + version("main", branch="main") - version("master", branch="main", deprecated=True) + version("2.1.2", tag="v2.1.2", commit="a8e7c98cb95ff97bb30a728c6b2a1ce6bff946eb") + version("2.1.1", tag="v2.1.1", commit="4c55dc50355d5e923642c59ad2a23d6ad54711e7") version("2.1.0", tag="v2.1.0", commit="7bcf7da3a268b435777fe87c7794c382f444e86d") version("2.0.1", tag="v2.0.1", commit="e9ebda29d87ce0916ab08c06ab26fd3766a870e5") version("2.0.0", tag="v2.0.0", commit="c263bd43e8e8502d4726643bc6fd046f0130ac0e") @@ -47,12 +50,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): version("1.5.1", tag="v1.5.1", commit="3c31d73c875d9a4a6ea8a843b9a0d1b19fbe36f3") version("1.5.0", tag="v1.5.0", commit="4ff3872a2099993bf7e8c588f7182f3df777205b") version("1.4.1", tag="v1.4.1", commit="74044638f755cd8667bedc73da4dbda4aa64c948") - version("1.3.1", tag="v1.3.1", commit="ee77ccbb6da4e2efd83673e798acf7081bc03564") - version("1.3.0", tag="v1.3.0", commit="de394b672d0346f2f387a8bb1a1280d5d2eaf9cb") - version("1.2.0", tag="v1.2.0", commit="8554416a199c4cec01c60c7015d8301d2bb39b64") - version("1.1.0", tag="v1.1.0", commit="142c973f4179e768164cd578951489e89021b29c") - version("1.0.1", tag="v1.0.1", commit="83221655a8237ca80f9673dad06a98d34c43e546") - version("1.0.0", tag="v1.0.0", commit="db5d3131d16f57abd4f13d3f4b885d5f67bf6644") is_darwin = sys.platform == "darwin" @@ -114,9 +111,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): # https://github.com/pytorch/pytorch/issues/77811 conflicts("+qnnpack", when="platform=darwin target=aarch64:") - # https://github.com/pytorch/pytorch/issues/80805 - conflicts("+openmp", when="platform=darwin target=aarch64:") - # https://github.com/pytorch/pytorch/issues/97397 conflicts( "~tensorpipe", @@ -141,7 +135,6 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("python@:3.10", when="@1.11:1", type=("build", "link", "run")) depends_on("python@:3.9", when="@1.7.1:1.10", type=("build", "link", "run")) depends_on("python@:3.8", when="@1.4:1.7.0", type=("build", "link", "run")) - depends_on("python@:3.7", when="@:1.3", type=("build", "link", "run")) # CMakelists.txt depends_on("cmake@3.18:", when="@2:", type="build") @@ -178,8 +171,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("py-pybind11@2.10.1", when="@2.0", type=("build", "link", "run")) depends_on("py-pybind11@2.10.0", when="@1.13:1", type=("build", "link", "run")) depends_on("py-pybind11@2.6.2", when="@1.8:1.12", type=("build", "link", "run")) - depends_on("py-pybind11@2.3.0", when="@1.1:1.7", type=("build", "link", "run")) - depends_on("py-pybind11@2.2.4", when="@:1.0", type=("build", "link", "run")) + depends_on("py-pybind11@2.3.0", when="@:1.7", type=("build", "link", "run")) depends_on("py-protobuf@3.12.2:", when="@1.10:", type=("build", "run")) depends_on("py-protobuf@:3.14", when="@:1.9", type=("build", "run")) depends_on("protobuf@3.12.2:", when="@1.10:") @@ -194,8 +186,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): # depends_on("cpuinfo@2022-08-19", when="@1.13:2.0") # depends_on("cpuinfo@2020-12-17", when="@1.8:1.12") # depends_on("cpuinfo@2020-06-11", when="@1.6:1.7") - depends_on("sleef@3.5.1_2020-12-22", when="@1.8:") - depends_on("sleef@3.4.0_2019-07-30", when="@1.6:1.7") + # https://github.com/shibatch/sleef/issues/474 + # depends_on("sleef@3.5.1_2020-12-22", when="@1.8:") + # depends_on("sleef@3.4.0_2019-07-30", when="@1.6:1.7") depends_on("fp16@2020-05-14", when="@1.6:") depends_on("pthreadpool@2021-04-13", when="@1.9:") depends_on("pthreadpool@2020-10-05", when="@1.8") @@ -211,11 +204,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): # https://discuss.pytorch.org/t/compiling-1-10-1-from-source-with-gcc-11-and-cuda-11-5/140971 depends_on("cuda@10.2:11.4", when="@1.10+cuda", type=("build", "link", "run")) depends_on("cuda@9.2:11.4", when="@1.6:1.9+cuda", type=("build", "link", "run")) - depends_on("cuda@9:11.4", when="@1.2:1.5+cuda", type=("build", "link", "run")) - depends_on("cuda@7.5:11.4", when="@:1.1+cuda", type=("build", "link", "run")) + depends_on("cuda@9:11.4", when="@:1.5+cuda", type=("build", "link", "run")) depends_on("cudnn@7:", when="@1.6:+cudnn") - depends_on("cudnn@7", when="@1.2:1.5+cudnn") - depends_on("cudnn@6.5:7", when="@:1.1+cudnn") + depends_on("cudnn@7", when="@:1.5+cudnn") depends_on("magma+cuda", when="+magma+cuda") depends_on("magma+rocm", when="+magma+rocm") depends_on("nccl", when="+nccl+cuda") @@ -280,14 +271,14 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): patch( "https://github.com/pytorch/pytorch/pull/59220.patch?full_index=1", sha256="6d5717267f901e8ee493dfacd08734d9bcc48ad29a76ca9ef702368e96bee675", - when="@1.2:1.11", + when="@:1.11", ) # Fixes build on older systems with glibc <2.12 patch( "https://github.com/pytorch/pytorch/pull/55063.patch?full_index=1", sha256="2229bcbf20fbe88aa9f7318f89c126ec7f527875ffe689a763c78abfa127a65c", - when="@1.1:1.8.1", + when="@:1.8.1", ) # https://github.com/pytorch/pytorch/issues/70297 @@ -311,13 +302,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): patch( "https://github.com/pytorch/pytorch/commit/e921cd222a8fbeabf5a3e74e83e0d8dfb01aa8b5.patch?full_index=1", sha256="0f3ad037a95af9d34b1d085050c1e7771fd00f0b89e5b3a276097b7c9f4fabf8", - when="@1.1:1.5", + when="@:1.5", ) - # Removes duplicate definition of getCusparseErrorString - # https://github.com/pytorch/pytorch/issues/32083 - patch("cusparseGetErrorString.patch", when="@:1.0^cuda@10.1.243:") - # Fixes 'FindOpenMP.cmake' # to detect openmp settings used by Fujitsu compiler. patch("detect_omp_of_fujitsu_compiler.patch", when="%fj") @@ -328,8 +315,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): patch("fj-ssl2_1.9.patch", when="@1.9^fujitsu-ssl2") patch("fj-ssl2_1.8.patch", when="@1.8^fujitsu-ssl2") patch("fj-ssl2_1.6-1.7.patch", when="@1.6:1.7^fujitsu-ssl2") - patch("fj-ssl2_1.3-1.5.patch", when="@1.3:1.5^fujitsu-ssl2") - patch("fj-ssl2_1.2.patch", when="@1.2^fujitsu-ssl2") + patch("fj-ssl2_1.3-1.5.patch", when="@:1.5^fujitsu-ssl2") # Fix compilation of +distributed~tensorpipe # https://github.com/pytorch/pytorch/issues/68002 @@ -433,6 +419,13 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): when="@2.0.0:2.0.1", ) + # Use correct OpenBLAS include path under prefix + patch( + "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/110063.patch?full_index=1", + sha256="23fb4009f7337051fc5303927ff977186a5af960245e7212895406477d8b2f66", + when="@:2.1", + ) + @when("@1.5.0:") def patch(self): # https://github.com/pytorch/pytorch/issues/52208 @@ -454,7 +447,7 @@ def setup_build_environment(self, env): environment variables. """ - def enable_or_disable(variant, keyword="USE", var=None, newer=False): + def enable_or_disable(variant, keyword="USE", var=None): """Set environment variable to enable or disable support for a particular variant. @@ -462,23 +455,14 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): variant (str): the variant to check keyword (str): the prefix to use for enabling/disabling var (str): CMake variable to set. Defaults to variant.upper() - newer (bool): newer variants that never used NO_* """ if var is None: var = variant.upper() - # Version 1.1.0 switched from NO_* to USE_* or BUILD_* - # But some newer variants have always used USE_* or BUILD_* - if self.spec.satisfies("@1.1:") or newer: - if "+" + variant in self.spec: - env.set(keyword + "_" + var, "ON") - elif "~" + variant in self.spec: - env.set(keyword + "_" + var, "OFF") - else: - if "+" + variant in self.spec: - env.unset("NO_" + var) - elif "~" + variant in self.spec: - env.set("NO_" + var, "ON") + if "+" + variant in self.spec: + env.set(keyword + "_" + var, "ON") + elif "~" + variant in self.spec: + env.set(keyword + "_" + var, "OFF") # Build in parallel to speed up build times env.set("MAX_JOBS", make_jobs) @@ -491,9 +475,8 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): enable_or_disable("cuda") if "+cuda" in self.spec: - # cmake/public/cuda.cmake - # cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake - env.unset("CUDA_ROOT") + env.set("CUDA_HOME", self.spec["cuda"].prefix) # Linux/macOS + env.set("CUDA_PATH", self.spec["cuda"].prefix) # Windows torch_cuda_arch = ";".join( "{0:.1f}".format(float(i) / 10.0) for i in self.spec.variants["cuda_arch"].value ) @@ -553,7 +536,7 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): # cmake/Modules/FindNumPy.cmake enable_or_disable("numpy") # cmake/Modules/FindOpenMP.cmake - enable_or_disable("openmp", newer=True) + enable_or_disable("openmp") enable_or_disable("qnnpack") enable_or_disable("qnnpack", var="PYTORCH_QNNPACK") enable_or_disable("valgrind") @@ -562,7 +545,7 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): enable_or_disable("distributed") enable_or_disable("mpi") # cmake/Modules/FindGloo.cmake - enable_or_disable("gloo", newer=True) + enable_or_disable("gloo") enable_or_disable("tensorpipe") if "+debug" in self.spec: @@ -575,7 +558,7 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): elif "~onnx_ml" in self.spec: env.set("ONNX_ML", "OFF") - if not self.spec.satisfies("@main,master"): + if not self.spec.satisfies("@main"): env.set("PYTORCH_BUILD_VERSION", self.version) env.set("PYTORCH_BUILD_NUMBER", 0) @@ -584,9 +567,11 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): if self.spec["blas"].name == "atlas": env.set("BLAS", "ATLAS") env.set("WITH_BLAS", "atlas") + env.set("Atlas_ROOT_DIR", self.spec["atlas"].prefix) elif self.spec["blas"].name in ["blis", "amdblis"]: env.set("BLAS", "BLIS") env.set("WITH_BLAS", "blis") + env.set("BLIS_HOME", self.spec["blas"].prefix) elif self.spec["blas"].name == "eigen": env.set("BLAS", "Eigen") elif self.spec["lapack"].name in ["libflame", "amdlibflame"]: @@ -603,6 +588,7 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): elif self.spec["blas"].name == "openblas": env.set("BLAS", "OpenBLAS") env.set("WITH_BLAS", "open") + env.set("OpenBLAS_HOME", self.spec["openblas"].prefix) elif self.spec["blas"].name == "veclibfort": env.set("BLAS", "vecLib") env.set("WITH_BLAS", "veclib") @@ -625,7 +611,8 @@ def enable_or_disable(variant, keyword="USE", var=None, newer=False): # env.set("USE_SYSTEM_LIBS", "ON") # https://github.com/pytorch/pytorch/issues/60329 # env.set("USE_SYSTEM_CPUINFO", "ON") - env.set("USE_SYSTEM_SLEEF", "ON") + # https://github.com/shibatch/sleef/issues/474 + # env.set("USE_SYSTEM_SLEEF", "ON") env.set("USE_SYSTEM_GLOO", "ON") env.set("USE_SYSTEM_FP16", "ON") env.set("USE_SYSTEM_PTHREADPOOL", "ON") diff --git a/var/spack/repos/builtin/packages/py-torchaudio/package.py b/var/spack/repos/builtin/packages/py-torchaudio/package.py index d07ce1de2182c7..9d0d39798b7e3f 100644 --- a/var/spack/repos/builtin/packages/py-torchaudio/package.py +++ b/var/spack/repos/builtin/packages/py-torchaudio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,7 +14,11 @@ class PyTorchaudio(PythonPackage): git = "https://github.com/pytorch/audio.git" submodules = True + license("BSD-2-Clause") + version("main", branch="main") + version("2.1.2", tag="v2.1.2", commit="c4c1957d24b423200fd83591d46066135979a5a8") + version("2.1.1", tag="v2.1.1", commit="db624844f5c95bb7618fe5a5f532bf9b68efeb45") version("2.1.0", tag="v2.1.0", commit="6ea1133706801ec6e81bb29142da2e21a8583a0a") version("2.0.2", tag="v2.0.2", commit="31de77dad5c89274451b3f5c4bcb630be12787c4") version("2.0.1", tag="v2.0.1", commit="3b40834aca41957002dfe074175e900cf8906237") @@ -56,6 +60,8 @@ class PyTorchaudio(PythonPackage): depends_on("sox") depends_on("py-torch@main", when="@main", type=("build", "link", "run")) + depends_on("py-torch@2.1.2", when="@2.1.2", type=("build", "link", "run")) + depends_on("py-torch@2.1.1", when="@2.1.1", type=("build", "link", "run")) depends_on("py-torch@2.1.0", when="@2.1.0", type=("build", "link", "run")) depends_on("py-torch@2.0.1", when="@2.0.2", type=("build", "link", "run")) depends_on("py-torch@2.0.0", when="@2.0.1", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchbenchmark/package.py b/var/spack/repos/builtin/packages/py-torchbenchmark/package.py index f7bc42f99b3661..52b2c75c7f1618 100644 --- a/var/spack/repos/builtin/packages/py-torchbenchmark/package.py +++ b/var/spack/repos/builtin/packages/py-torchbenchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTorchbenchmark(Package): maintainers("adamjstewart") + license("BSD-3-Clause") + version("main", branch="main") # README.md diff --git a/var/spack/repos/builtin/packages/py-torchdata/package.py b/var/spack/repos/builtin/packages/py-torchdata/package.py index fd9367f31d0179..244621dac61f61 100644 --- a/var/spack/repos/builtin/packages/py-torchdata/package.py +++ b/var/spack/repos/builtin/packages/py-torchdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class PyTorchdata(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("main", branch="main") + version("0.7.1", sha256="ef9bbdcee759b53c3c9d99e76eb0a66da33d36bfb7f859a25a9b5e737a51fa23") version("0.7.0", sha256="0b444719c3abc67201ed0fea92ea9c4100e7f36551ba0d19a09446cc11154eb3") version("0.6.1", sha256="c596db251c5e6550db3f00e4308ee7112585cca4d6a1c82a433478fd86693257") version("0.6.0", sha256="048dea12ee96c0ea1525097959fee811d7b38c2ed05f44a90f35f8961895fb5b") @@ -38,6 +41,7 @@ class PyTorchdata(PythonPackage): # https://github.com/pytorch/data#version-compatibility depends_on("py-torch@main", when="@main", type=("build", "run")) + depends_on("py-torch@2.1.1", when="@0.7.1", type=("build", "run")) depends_on("py-torch@2.1.0", when="@0.7.0", type=("build", "run")) depends_on("py-torch@2.0.1", when="@0.6.1", type=("build", "run")) depends_on("py-torch@2.0.0", when="@0.6.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchdiffeq/package.py b/var/spack/repos/builtin/packages/py-torchdiffeq/package.py index 9d6675850e6444..7dc81a4fc635f1 100644 --- a/var/spack/repos/builtin/packages/py-torchdiffeq/package.py +++ b/var/spack/repos/builtin/packages/py-torchdiffeq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTorchdiffeq(PythonPackage): homepage = "https://github.com/rtqichen/torchdiffeq" pypi = "torchdiffeq/torchdiffeq-0.2.3.tar.gz" + license("MIT") + version("0.2.3", sha256="fe75f434b9090ac0c27702e02bed21472b0f87035be6581f51edc5d4013ea31a") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchfile/package.py b/var/spack/repos/builtin/packages/py-torchfile/package.py index 66182d46696289..52e77c62ea5d25 100644 --- a/var/spack/repos/builtin/packages/py-torchfile/package.py +++ b/var/spack/repos/builtin/packages/py-torchfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py index f5ef2ddc4bc783..39a910afa394cf 100644 --- a/var/spack/repos/builtin/packages/py-torchgeo/package.py +++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class PyTorchgeo(PythonPackage): maintainers("adamjstewart", "calebrob6") + license("MIT") + version("main", branch="main") + version("0.5.1", sha256="5f86a34d18fe36eeb9146b057b21e5356252ef8ab6a9db33feebb120a01feff8") version("0.5.0", sha256="2bc2f9c4a19a569790cb3396499fdec17496632b0e52b86be390a2cc7a1a7033") version("0.4.1", sha256="a3692436bf63df8d2f9b76d16eea5ee309dd1bd74e0fde6e64456abfdb2a5b58") version("0.4.0", sha256="a0812487205aa2db7bc92119d896ae4bf4f1014e6fdc0ce0f75bcb24fada6613") @@ -64,7 +67,15 @@ class PyTorchgeo(PythonPackage): depends_on("pil@8:", when="@0.5:", type=("build", "run")) depends_on("pil@6.2:", type=("build", "run")) # JPEG, TIFF, and compressed PNG support required for file I/O in several datasets. - depends_on("pil+jpeg+tiff+zlib", type=("build", "run")) + depends_on( + "py-pillow +jpeg+tiff+zlib", type=("build", "run"), when="^[virtuals=pil] py-pillow" + ) + depends_on( + "py-pillow-simd +jpeg+tiff+zlib", + type=("build", "run"), + when="^[virtuals=pil] py-pillow-simd", + ) + depends_on("py-pyproj@3:", when="@0.5:", type=("build", "run")) depends_on("py-pyproj@2.2:", type=("build", "run")) depends_on("py-rasterio@1.2:", when="@0.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchmeta/package.py b/var/spack/repos/builtin/packages/py-torchmeta/package.py index b340aa5956b83f..764eb29315ebd3 100644 --- a/var/spack/repos/builtin/packages/py-torchmeta/package.py +++ b/var/spack/repos/builtin/packages/py-torchmeta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTorchmeta(PythonPackage): homepage = "https://github.com/tristandeleu/pytorch-meta" pypi = "torchmeta/torchmeta-1.7.0.tar.gz" + license("MIT") + version("1.7.0", sha256="148d42b6a1ec27970408f7bcb97cf1cb203f8699214e06424fe43d78faa848d9") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchmetrics/package.py b/var/spack/repos/builtin/packages/py-torchmetrics/package.py index 7b5d0672461fac..450dbed134408c 100644 --- a/var/spack/repos/builtin/packages/py-torchmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-torchmetrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,10 @@ class PyTorchmetrics(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + + version("1.3.0", sha256="e8ac3adcc61e7a847d0504b0a0e0a3b7f57796178b239c6fafb5d20c0c9460ac") + version("1.2.1", sha256="217387738f84939c39b534b20d4983e737cc448d27aaa5340e0327948d97ca3e") version("1.2.0", sha256="7eb28340bde45e13187a9ad54a4a7010a50417815d8181a5df6131f116ffe1b7") version("1.1.1", sha256="65ea34205c0506eecfd06b98f63f4d2a2c5c0e17367cf324e1747adc854c80a5") version("1.1.0", sha256="94b51aeb3d5ff55503fa47086bbc2af9e26efabb840e2d3c2381db9623dda5fd") @@ -38,13 +42,15 @@ class PyTorchmetrics(PythonPackage): version("0.2.0", sha256="481a28759acd2d77cc088acba6bc7dc4a356c7cb767da2e1495e91e612e2d548") # setup.py - depends_on("python@3.8:", when="@1:", type=("build", "run")) depends_on("py-setuptools", type="build") - # requirements.txt (upper bound is removed during processing) + # requirements/base.txt (upper bound is removed during processing) depends_on("py-numpy@1.20.1:", when="@1:", type=("build", "run")) depends_on("py-numpy@1.17.2:", when="@0.4:", type=("build", "run")) depends_on("py-numpy", when="@0.3:", type=("build", "run")) + depends_on("py-packaging@17.2:", when="@1.2.1:", type=("build", "run")) + depends_on("py-packaging", when="@0.3:1.1.0", type=("build", "run")) + depends_on("py-torch@1.10:", when="@1.3:", type=("build", "run")) depends_on("py-torch@1.8.1:", when="@0.11:", type=("build", "run")) depends_on("py-torch@1.3.1:", type=("build", "run")) depends_on("py-typing-extensions", when="@0.9: ^python@:3.8", type=("build", "run")) @@ -52,5 +58,4 @@ class PyTorchmetrics(PythonPackage): depends_on("py-lightning-utilities@0.7:", when="@1:", type=("build", "run")) # Historical dependencies - depends_on("py-packaging", when="@0.3:1.1", type=("build", "run")) depends_on("py-pydeprecate@0.3", when="@0.7:0.8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchsummary/package.py b/var/spack/repos/builtin/packages/py-torchsummary/package.py index fc8e09da5f2e88..e4fde5eb2a2e03 100644 --- a/var/spack/repos/builtin/packages/py-torchsummary/package.py +++ b/var/spack/repos/builtin/packages/py-torchsummary/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-torchtext/package.py b/var/spack/repos/builtin/packages/py-torchtext/package.py index 180b555069bc5e..4758d1a2f80065 100644 --- a/var/spack/repos/builtin/packages/py-torchtext/package.py +++ b/var/spack/repos/builtin/packages/py-torchtext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,11 @@ class PyTorchtext(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("main", branch="main") + version("0.16.2", tag="v0.16.2", commit="299b90e908c1b492139a4cf9da3912660e79a06b") + version("0.16.1", tag="v0.16.1", commit="66671007c84e07386da3c04e5ca403b8a417c8e5") version("0.16.0", tag="v0.16.0", commit="4e255c95c76b1ccde4f6650391c0bc30650d6dbe") version("0.15.2", tag="v0.15.2", commit="4571036cf66c539e50625218aeb99a288d79f3e1") version("0.15.1", tag="v0.15.1", commit="c696895e524c61fd2b8b26916dd006411c5f3ba5") @@ -58,6 +62,8 @@ class PyTorchtext(PythonPackage): # https://github.com/pytorch/text#installation depends_on("py-torch@main", when="@main", type=("build", "link", "run")) + depends_on("py-torch@2.1.2", when="@0.16.2", type=("build", "link", "run")) + depends_on("py-torch@2.1.1", when="@0.16.1", type=("build", "link", "run")) depends_on("py-torch@2.1.0", when="@0.16.0", type=("build", "link", "run")) depends_on("py-torch@2.0.1", when="@0.15.2", type=("build", "link", "run")) depends_on("py-torch@2.0.0", when="@0.15.1", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index 5aef4c6aef8a29..dfb063cd3534bd 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,11 @@ class PyTorchvision(PythonPackage): maintainers("adamjstewart") + license("BSD-3-Clause") + version("main", branch="main") + version("0.16.2", sha256="8c1f2951e98d8ada6e5a468f179af4be9f56d2ebc3ab057af873da61669806d7") + version("0.16.1", sha256="d31fe52e4540750c8d372b0f38f1bfa81d8261193f2c2c06577332831d203c50") version("0.16.0", sha256="79b30b082237e3ead21e74587cedf4a4d832f977cf7dfeccfb65f67988b12ceb") version("0.15.2", sha256="1efcb80e0a6e42c54f07ee16167839b4d302aeeecc12839cc47c74b06a2c20d4") version("0.15.1", sha256="689d23d4ebb0c7e54e8651c89b17155b64341c14ae4444a04ca7dc6f2b6a0a43") @@ -41,14 +45,10 @@ class PyTorchvision(PythonPackage): version("0.6.1", sha256="8173680a976c833640ecbd0d7e6f0a11047bf8833433e2147180efc905e48656") version("0.6.0", sha256="02de11b3abe6882de4032ce86dab9c7794cbc84369b44d04e667486580f0f1f7") version("0.5.0", sha256="eb9afc93df3d174d975ee0914057a9522f5272310b4d56c150b955c287a4d74d") - version("0.4.2", sha256="1184a27eab85c9e784bacc6f9d6fec99e168ab4eda6047ef9f709e7fdb22d8f9") - version("0.4.1", sha256="053689351272b3bd2ac3e6ba51efd284de0e4ca4a301f54674b949f1e62b7176") - version("0.4.0", sha256="c270d74e568bad4559fed4544f6dd1e22e2eb1c60b088e04a5bd5787c4150589") - version("0.3.0", sha256="c205f0618c268c6ed2f8abb869ef6eb83e5339c1336c243ad321a2f2a85195f0") desc = "Enable support for native encoding/decoding of {} formats in torchvision.io" - variant("png", default=False, description=desc.format("PNG")) - variant("jpeg", default=False, description=desc.format("JPEG")) + variant("png", default=True, description=desc.format("PNG")) + variant("jpeg", default=True, description=desc.format("JPEG")) variant("nvjpeg", default=False, description=desc.format("JPEG")) variant("ffmpeg", default=False, description=desc.format("FFMPEG")) variant("video_codec", default=False, description=desc.format("video_codec")) @@ -58,10 +58,11 @@ class PyTorchvision(PythonPackage): depends_on("python@:3.10", when="@0.12:0.14", type=("build", "link", "run")) depends_on("python@:3.9", when="@0.8.2:0.11", type=("build", "link", "run")) depends_on("python@:3.8", when="@0.5:0.8.1", type=("build", "link", "run")) - depends_on("python@:3.7", when="@:0.4", type=("build", "link", "run")) # https://github.com/pytorch/vision#installation depends_on("py-torch@main", when="@main", type=("build", "link", "run")) + depends_on("py-torch@2.1.2", when="@0.16.2", type=("build", "link", "run")) + depends_on("py-torch@2.1.1", when="@0.16.1", type=("build", "link", "run")) depends_on("py-torch@2.1.0", when="@0.16.0", type=("build", "link", "run")) depends_on("py-torch@2.0.1", when="@0.15.2", type=("build", "link", "run")) depends_on("py-torch@2.0.0", when="@0.15.1", type=("build", "link", "run")) @@ -86,11 +87,6 @@ class PyTorchvision(PythonPackage): depends_on("py-torch@1.5.1", when="@0.6.1", type=("build", "link", "run")) depends_on("py-torch@1.5.0", when="@0.6.0", type=("build", "link", "run")) depends_on("py-torch@1.4.1", when="@0.5.0", type=("build", "link", "run")) - depends_on("py-torch@1.3.1", when="@0.4.2", type=("build", "link", "run")) - depends_on("py-torch@1.3.0", when="@0.4.1", type=("build", "link", "run")) - depends_on("py-torch@1.2.0", when="@0.4.0", type=("build", "link", "run")) - depends_on("py-torch@1.1.0", when="@0.3.0", type=("build", "link", "run")) - depends_on("py-torch@:1.0.1", when="@0.2.2", type=("build", "link", "run")) depends_on("ninja", type="build") @@ -114,8 +110,6 @@ class PyTorchvision(PythonPackage): # https://github.com/pytorch/vision/pull/5898 conflicts("^pil@10:", when="@:0.12") - # https://github.com/pytorch/vision/issues/1712 - conflicts("^pil@7:", when="@:0.4") # https://github.com/pytorch/vision/issues/4146 # https://github.com/pytorch/vision/issues/4934 conflicts("^pil@8.3") diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index b93b2f03318e5b..61765112fed6f8 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTornado(PythonPackage): homepage = "https://github.com/tornadoweb/tornado" pypi = "tornado/tornado-6.1.tar.gz" + license("Apache-2.0") + version("6.3.3", sha256="e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe") version("6.2", sha256="9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13") version("6.1", sha256="33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791") diff --git a/var/spack/repos/builtin/packages/py-tox/package.py b/var/spack/repos/builtin/packages/py-tox/package.py index 3a8dbe65048f86..47aa381aab05ec 100644 --- a/var/spack/repos/builtin/packages/py-tox/package.py +++ b/var/spack/repos/builtin/packages/py-tox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTox(PythonPackage): homepage = "https://tox.readthedocs.org/" pypi = "tox/tox-3.14.2.tar.gz" + license("MIT") + version("3.14.2", sha256="7efd010a98339209f3a8292f02909b51c58417bfc6838ab7eca14cf90f96117a") depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-toyplot/package.py b/var/spack/repos/builtin/packages/py-toyplot/package.py index 78e5e636bba9cc..7396f5a693056f 100644 --- a/var/spack/repos/builtin/packages/py-toyplot/package.py +++ b/var/spack/repos/builtin/packages/py-toyplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyToyplot(PythonPackage): maintainers("snehring") + license("BSD-3-Clause") + version("1.0.3", sha256="7b7b2bc5784fd75e5c695300bffc80d568c83bebef543bb54e6e6c2229912edd") version("0.19.0", sha256="d199b4ac2d5ee454fec8be937bd9f1a313145545adc192bb0db2fd3defada484") diff --git a/var/spack/repos/builtin/packages/py-toytree/package.py b/var/spack/repos/builtin/packages/py-toytree/package.py index 80c08153eec057..8550075f7469e1 100644 --- a/var/spack/repos/builtin/packages/py-toytree/package.py +++ b/var/spack/repos/builtin/packages/py-toytree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-tpot/package.py b/var/spack/repos/builtin/packages/py-tpot/package.py index 5b3ca45d293163..3f60359ca2c717 100644 --- a/var/spack/repos/builtin/packages/py-tpot/package.py +++ b/var/spack/repos/builtin/packages/py-tpot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTpot(PythonPackage): homepage = "https://epistasislab.github.io/tpot/" pypi = "tpot/TPOT-0.11.5.tar.gz" + license("LGPL-3.0-only") + version("0.11.7", sha256="64ff1845efdec3d9c70b35587f719cc0821722f27d16f542f83bf81f448e3ff1") version("0.11.5", sha256="909be08b29165ce48de5e5d2e3fd73fee9aeeaf1030f2e0912ce0f0bd9c3d2f3") diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py index 61801b5d918940..dd379e923d8d06 100644 --- a/var/spack/repos/builtin/packages/py-tqdm/package.py +++ b/var/spack/repos/builtin/packages/py-tqdm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-traceback2/package.py b/var/spack/repos/builtin/packages/py-traceback2/package.py index 2859273c07b8a6..33ec2456b54489 100644 --- a/var/spack/repos/builtin/packages/py-traceback2/package.py +++ b/var/spack/repos/builtin/packages/py-traceback2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py index 5357109dddf5d1..77537822c6e475 100644 --- a/var/spack/repos/builtin/packages/py-traitlets/package.py +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-traits/package.py b/var/spack/repos/builtin/packages/py-traits/package.py index 665e7498568919..404c73b8e931db 100644 --- a/var/spack/repos/builtin/packages/py-traits/package.py +++ b/var/spack/repos/builtin/packages/py-traits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyTraits(PythonPackage): pypi = "traits/traits-6.0.0.tar.gz" git = "https://github.com/enthought/traits.git" + license("CC-BY-3.0") + version("6.4.2", sha256="5be7cc5fb7a99cba7e9014786373e3ad2f75efb445eeced094654bbaf3b0fa82") version("6.4.1", sha256="78bb2ccafd60aff606515aac46de64668a0a81cb5c54c650b9877a841aa9e812") version("6.3.1", sha256="ebdd9b067a262045840a85e3ff34e1567ce4e9b6548c716cdcc82b5884ed9100") diff --git a/var/spack/repos/builtin/packages/py-traitsui/package.py b/var/spack/repos/builtin/packages/py-traitsui/package.py index 65bda7adc5b696..2d99f62c36d198 100644 --- a/var/spack/repos/builtin/packages/py-traitsui/package.py +++ b/var/spack/repos/builtin/packages/py-traitsui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyTraitsui(PythonPackage): homepage = "https://docs.enthought.com/traitsui" pypi = "traitsui/traitsui-6.1.3.tar.gz" + license("EPL-1.0") + version("7.2.1", sha256="dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b") version("6.1.3", sha256="48381763b181efc58eaf288431d1d92d028d0d97dfdd33eba7809aae8aef814f") diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py index 5380f44a78684d..e1b34bb65deb2a 100644 --- a/var/spack/repos/builtin/packages/py-transformers/package.py +++ b/var/spack/repos/builtin/packages/py-transformers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,17 +16,17 @@ class PyTransformers(PythonPackage): maintainers("adamjstewart") + license("Apache-2.0") + + version("4.35.2", sha256="2d125e197d77b0cdb6c9201df9fa7e2101493272e448b9fba9341c695bee2f52") version("4.31.0", sha256="4302fba920a1c24d3a429a29efff6a63eac03f3f3cf55b55927fc795d01cb273") version("4.24.0", sha256="486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b") version("4.6.1", sha256="83dbff763b7e7dc57cbef1a6b849655d4fcab6bffdd955c5e8bea12a4f76dc10") version("2.8.0", sha256="b9f29cdfd39c28f29e0806c321270dea337d6174a7aa60daf9625bf83dbb12ee") - depends_on("python@3.8:", when="@4.31:", type=("build", "run")) - depends_on("python@3.7:", when="@4.24:", type=("build", "run")) - depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-importlib-metadata", when="@4.6: ^python@:3.7", type=("build", "run")) depends_on("py-filelock", type=("build", "run")) + depends_on("py-huggingface-hub@0.16.4:0", when="@4.34:", type=("build", "run")) depends_on("py-huggingface-hub@0.14.1:0", when="@4.26:", type=("build", "run")) depends_on("py-huggingface-hub@0.10:0", when="@4.24:", type=("build", "run")) depends_on("py-huggingface-hub@0.0.8", when="@4.6.1", type=("build", "run")) @@ -38,7 +38,8 @@ class PyTransformers(PythonPackage): depends_on("py-regex@:2019.12.16,2019.12.18:", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-safetensors@0.3.1:", when="@4.31:", type=("build", "run")) - depends_on("py-tokenizers@0.11.1:0.11.2,0.11.4:0.13", when="@4.24:", type=("build", "run")) + depends_on("py-tokenizers@0.14:0.18", when="@4.35:", type=("build", "run")) + depends_on("py-tokenizers@0.11.1:0.11.2,0.11.4:0.13", when="@4.24:4.33", type=("build", "run")) depends_on("py-tokenizers@0.10.1:0.10", when="@4.6.1", type=("build", "run")) depends_on("py-tokenizers@0.5.2", when="@2.8.0", type=("build", "run")) depends_on("py-tqdm@4.27:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-transforms3d/package.py b/var/spack/repos/builtin/packages/py-transforms3d/package.py index 3eb2938b91b7cf..a4854f8b8a6cf2 100644 --- a/var/spack/repos/builtin/packages/py-transforms3d/package.py +++ b/var/spack/repos/builtin/packages/py-transforms3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-treehash/package.py b/var/spack/repos/builtin/packages/py-treehash/package.py index d7f6a2616ef966..79389c81c70450 100644 --- a/var/spack/repos/builtin/packages/py-treehash/package.py +++ b/var/spack/repos/builtin/packages/py-treehash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-triangle/package.py b/var/spack/repos/builtin/packages/py-triangle/package.py index 1c7ac8750f5f35..f54aa8641c23f8 100644 --- a/var/spack/repos/builtin/packages/py-triangle/package.py +++ b/var/spack/repos/builtin/packages/py-triangle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTriangle(PythonPackage): homepage = "https://github.com/drufat/triangle" pypi = "triangle/triangle-20200424.tar.gz" + license("LGPL-3.0") + version("20200424", sha256="fc207641f8f39986f7d2bee1b91688a588cd235d2e67777422f94e61fece27e9") depends_on("python@:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-trimesh/package.py b/var/spack/repos/builtin/packages/py-trimesh/package.py index 13b5d2e268e15c..cbeabf2ae023f9 100644 --- a/var/spack/repos/builtin/packages/py-trimesh/package.py +++ b/var/spack/repos/builtin/packages/py-trimesh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTrimesh(PythonPackage): homepage = "https://github.com/mikedh/trimesh" pypi = "trimesh/trimesh-2.38.10.tar.gz" + license("MIT") + version("3.17.1", sha256="025bb2fa3a2e87bdd6873f11db45a7ca19216f2f8b6aed29140fca57e32c298e") version("2.38.10", sha256="866e73ea35641ff2af73867c891d7f9b90c75ccb8a3c1e8e06e16ff9af1f8c64") diff --git a/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py b/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py index 809d8e865faac3..394bd3846d770f 100644 --- a/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py +++ b/var/spack/repos/builtin/packages/py-trojanzoo-sphinx-theme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTrojanzooSphinxTheme(PythonPackage): homepage = "https://github.com/ain-soph/trojanzoo_sphinx_theme" pypi = "trojanzoo_sphinx_theme/trojanzoo_sphinx_theme-0.1.0.tar.gz" + license("GPL-3.0-or-later") + version("0.1.0", sha256="7b80d70ec84279156dcb9668d3a8a135be1d0d54e20f554fc03ad22d9ff5e7b3") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-trove-classifiers/package.py b/var/spack/repos/builtin/packages/py-trove-classifiers/package.py index 06fbfb7cda5bd3..605bf930a5fc9a 100644 --- a/var/spack/repos/builtin/packages/py-trove-classifiers/package.py +++ b/var/spack/repos/builtin/packages/py-trove-classifiers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTroveClassifiers(PythonPackage): homepage = "https://github.com/pypa/trove-classifiers" pypi = "trove-classifiers/trove-classifiers-2023.3.9.tar.gz" + license("Apache-2.0") + version("2023.8.7", sha256="c9f2a0a85d545e5362e967e4f069f56fddfd91215e22ffa48c66fb283521319a") version("2023.3.9", sha256="ee42f2f8c1d4bcfe35f746e472f07633570d485fab45407effc0379270a3bb03") diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py index 40c94a6fe1394e..91fd4b4b6e56ea 100644 --- a/var/spack/repos/builtin/packages/py-tuiview/package.py +++ b/var/spack/repos/builtin/packages/py-tuiview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,16 +24,9 @@ class PyTuiview(PythonPackage): version("1.2.8", sha256="e75950908a2d1f7c7216dfeead82483e1d3b0267fff9561549d85ca00725456b") version("1.2.7", sha256="35dfeb79b2bb57dfb5b8c90c3edf8c8a0a3f89cef85c33f9935e4a4add282aaf") version("1.2.6", sha256="61b136fa31c949d7a7a4dbf8562e6fc677d5b1845b152ec39e337f4eb2e91662") - version( - "1.1.7", - sha256="fbf0bf29cc775357dad4f8a2f0c2ffa98bbf69d603a96353e75b321adef67573", - deprecated=True, - ) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - depends_on("py-pyqt4", type=("build", "run"), when="@:1.1") - depends_on("py-pyqt5", type=("build", "run"), when="@1.2.0:") + depends_on("py-pyqt5", type=("build", "run")) depends_on("py-numpy", type=("build", "link", "run")) - depends_on("gdal+geos+python", type=("build", "run"), when="@1.2.0:") - depends_on("gdal@1.11.0:+python", when="@:1.1") + depends_on("gdal+geos+python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tuspy/package.py b/var/spack/repos/builtin/packages/py-tuspy/package.py index 850c1175603340..9b38e896687261 100644 --- a/var/spack/repos/builtin/packages/py-tuspy/package.py +++ b/var/spack/repos/builtin/packages/py-tuspy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTuspy(PythonPackage): homepage = "http://github.com/tus/tus-py-client/" pypi = "tuspy/tuspy-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="09a81eba7b0ce4da7870961721892c62f1d62570913bcef6727ef5599e3f4181") depends_on("python@3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tuswsgi/package.py b/var/spack/repos/builtin/packages/py-tuswsgi/package.py index 4edad8b1c0addd..5efbb80603270f 100644 --- a/var/spack/repos/builtin/packages/py-tuswsgi/package.py +++ b/var/spack/repos/builtin/packages/py-tuswsgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTuswsgi(PythonPackage): homepage = "https://github.com/mvdbeek/tusfilter" url = "https://pypi.io/packages/py2.py3/t/tuswsgi/tuswsgi-0.5.4-py2.py3-none-any.whl" + license("MIT") + version( "0.5.4", sha256="f681a386254a161a97301a67c01ee7da77419c007d9bc43dbd48d5a987491a5e", diff --git a/var/spack/repos/builtin/packages/py-tweedledum/package.py b/var/spack/repos/builtin/packages/py-tweedledum/package.py index 3736481a4d37f1..9e4be8b77cc45f 100644 --- a/var/spack/repos/builtin/packages/py-tweedledum/package.py +++ b/var/spack/repos/builtin/packages/py-tweedledum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyTweedledum(PythonPackage): homepage = "https://github.com/boschmitt/tweedledum" pypi = "tweedledum/tweedledum-1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="58d6f7a988b10c31be3faa1faf3e58288ef7e8159584bfa6ded45742f390309f") depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools@42:", type="build") diff --git a/var/spack/repos/builtin/packages/py-twine/package.py b/var/spack/repos/builtin/packages/py-twine/package.py index d08b4e8601ebb4..974dc34d269d71 100644 --- a/var/spack/repos/builtin/packages/py-twine/package.py +++ b/var/spack/repos/builtin/packages/py-twine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index fa40e1206f4d35..905983e2bdd302 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTwisted(PythonPackage): homepage = "https://twistedmatrix.com/" pypi = "Twisted/Twisted-21.7.0.tar.gz" + license("Unlicense") + version("21.7.0", sha256="2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006") version("15.4.0", sha256="78862662fa9ae29654bc2b9d349c3f1d887e6b2ed978512c4442d53ea861f05c") version("15.3.0", sha256="025729751cf898842262375a40f70ae1d246daea88369eab9f6bb96e528bf285") diff --git a/var/spack/repos/builtin/packages/py-typed-ast/package.py b/var/spack/repos/builtin/packages/py-typed-ast/package.py index e136fff0522b74..45f96fdddfd409 100644 --- a/var/spack/repos/builtin/packages/py-typed-ast/package.py +++ b/var/spack/repos/builtin/packages/py-typed-ast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTypedAst(PythonPackage): homepage = "https://github.com/python/typed_ast" pypi = "typed-ast/typed_ast-1.4.0.tar.gz" + license("Apache-2.0") + version("1.5.4", sha256="39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2") version("1.4.3", sha256="fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65") version("1.4.2", sha256="9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a") diff --git a/var/spack/repos/builtin/packages/py-typeguard/package.py b/var/spack/repos/builtin/packages/py-typeguard/package.py index 6a9af85603266f..0877c8f835b51d 100644 --- a/var/spack/repos/builtin/packages/py-typeguard/package.py +++ b/var/spack/repos/builtin/packages/py-typeguard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyTypeguard(PythonPackage): maintainers("meyersbs") + license("MIT") + version("3.0.2", sha256="fee5297fdb28f8e9efcb8142b5ee219e02375509cd77ea9d270b5af826358d5a") version("2.13.3", sha256="00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4") version("2.12.1", sha256="c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051") diff --git a/var/spack/repos/builtin/packages/py-typer/package.py b/var/spack/repos/builtin/packages/py-typer/package.py index b60b652ee70057..1816d22ac60b57 100644 --- a/var/spack/repos/builtin/packages/py-typer/package.py +++ b/var/spack/repos/builtin/packages/py-typer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTyper(PythonPackage): homepage = "https://github.com/tiangolo/typer" pypi = "typer/typer-0.9.0.tar.gz" + license("MIT") + version("0.9.0", sha256="50922fd79aea2f4751a8e0408ff10d2662bd0c8bbfa84755a699f3bada2978b2") version("0.7.0", sha256="ff797846578a9f2a201b53442aedeb543319466870fbe1c701eab66dd7681165") diff --git a/var/spack/repos/builtin/packages/py-types-dataclasses/package.py b/var/spack/repos/builtin/packages/py-types-dataclasses/package.py index 60c0f0273e422a..483002632c4b82 100644 --- a/var/spack/repos/builtin/packages/py-types-dataclasses/package.py +++ b/var/spack/repos/builtin/packages/py-types-dataclasses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-pkg-resources/package.py b/var/spack/repos/builtin/packages/py-types-pkg-resources/package.py index b3a1b03005272c..19bb726af5dba1 100644 --- a/var/spack/repos/builtin/packages/py-types-pkg-resources/package.py +++ b/var/spack/repos/builtin/packages/py-types-pkg-resources/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-psutil/package.py b/var/spack/repos/builtin/packages/py-types-psutil/package.py index f6b06254f926a4..2e86108ba60d78 100644 --- a/var/spack/repos/builtin/packages/py-types-psutil/package.py +++ b/var/spack/repos/builtin/packages/py-types-psutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-python-dateutil/package.py b/var/spack/repos/builtin/packages/py-types-python-dateutil/package.py index 62a878e4153b88..f4009465ceb936 100644 --- a/var/spack/repos/builtin/packages/py-types-python-dateutil/package.py +++ b/var/spack/repos/builtin/packages/py-types-python-dateutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-pytz/package.py b/var/spack/repos/builtin/packages/py-types-pytz/package.py index 58f0d9c37ee8df..5fe29c33ba2890 100644 --- a/var/spack/repos/builtin/packages/py-types-pytz/package.py +++ b/var/spack/repos/builtin/packages/py-types-pytz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-requests/package.py b/var/spack/repos/builtin/packages/py-types-requests/package.py index 17db94f04ed33f..0cdff9a02066a8 100644 --- a/var/spack/repos/builtin/packages/py-types-requests/package.py +++ b/var/spack/repos/builtin/packages/py-types-requests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-setuptools/package.py b/var/spack/repos/builtin/packages/py-types-setuptools/package.py index 60eef117873b92..020f008b563656 100644 --- a/var/spack/repos/builtin/packages/py-types-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-types-setuptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-typed-ast/package.py b/var/spack/repos/builtin/packages/py-types-typed-ast/package.py index f89a17599ae651..589a85fbf6a21c 100644 --- a/var/spack/repos/builtin/packages/py-types-typed-ast/package.py +++ b/var/spack/repos/builtin/packages/py-types-typed-ast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-types-urllib3/package.py b/var/spack/repos/builtin/packages/py-types-urllib3/package.py index 7d10082df5f3a2..990519e05685d6 100644 --- a/var/spack/repos/builtin/packages/py-types-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-types-urllib3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-typesentry/package.py b/var/spack/repos/builtin/packages/py-typesentry/package.py index 015323adba7d63..8c61bf9c5fe5d0 100644 --- a/var/spack/repos/builtin/packages/py-typesentry/package.py +++ b/var/spack/repos/builtin/packages/py-typesentry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyTypesentry(PythonPackage): homepage = "https://github.com/h2oai/typesentry" git = "https://github.com/h2oai/typesentry.git" + license("Apache-2.0") + # See the git history of __version__.py for versioning information version("0.2.7", commit="0ca8ed0e62d15ffe430545e7648c9a9b2547b49c") diff --git a/var/spack/repos/builtin/packages/py-typeshed-client/package.py b/var/spack/repos/builtin/packages/py-typeshed-client/package.py index 795c5c79b92a73..74e43a32df7e1b 100644 --- a/var/spack/repos/builtin/packages/py-typeshed-client/package.py +++ b/var/spack/repos/builtin/packages/py-typeshed-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTypeshedClient(PythonPackage): homepage = "https://github.com/JelleZijlstra/typeshed_client" pypi = "typeshed-client/typeshed_client-2.1.0.tar.gz" + license("MIT") + version("2.1.0", sha256="da1969ec48c342197ddec655c873100ece38fd93e6827a1e6377793a16526f28") depends_on("py-setuptools@42:", type="build") diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py index 189b97f7461b0c..aef21d66be91a0 100644 --- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyTypingExtensions(PythonPackage): homepage = "https://github.com/python/typing_extensions" pypi = "typing_extensions/typing_extensions-3.7.4.tar.gz" + license("0BSD") + version("4.8.0", sha256="df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef") version("4.6.3", sha256="d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5") version("4.5.0", sha256="5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb") diff --git a/var/spack/repos/builtin/packages/py-typing-inspect/package.py b/var/spack/repos/builtin/packages/py-typing-inspect/package.py index 921a3904770ed6..7c235d6f6eb88b 100644 --- a/var/spack/repos/builtin/packages/py-typing-inspect/package.py +++ b/var/spack/repos/builtin/packages/py-typing-inspect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTypingInspect(PythonPackage): homepage = "https://github.com/ilevkivskyi/typing_inspect" pypi = "typing_inspect/typing_inspect-0.8.0.tar.gz" + license("MIT") + version("0.8.0", sha256="8b1ff0c400943b6145df8119c41c244ca8207f1f10c9c057aeed1560e4806e3d") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-typish/package.py b/var/spack/repos/builtin/packages/py-typish/package.py index 00ecb2ac3213b6..678e0134424c4b 100644 --- a/var/spack/repos/builtin/packages/py-typish/package.py +++ b/var/spack/repos/builtin/packages/py-typish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTypish(PythonPackage): homepage = "https://github.com/ramonhagenaars/typish" url = "https://github.com/ramonhagenaars/typish/archive/v1.9.2.tar.gz" + license("MIT") + version("1.9.3", sha256="16f8ff022b7009a91529e363d0484465be57797b9cc34a193ca7e3c4c597e4bc") version("1.9.2", sha256="d0cd35aade6f974b2509771ac92aa1a5b4d9efe9c2c34127734539fd28e7145c") diff --git a/var/spack/repos/builtin/packages/py-tzdata/package.py b/var/spack/repos/builtin/packages/py-tzdata/package.py index b571a56f116c22..1146e2e5ab185a 100644 --- a/var/spack/repos/builtin/packages/py-tzdata/package.py +++ b/var/spack/repos/builtin/packages/py-tzdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTzdata(PythonPackage): homepage = "https://github.com/python/tzdata" pypi = "tzdata/tzdata-2023.3.tar.gz" + license("Apache-2.0") + version("2023.3", sha256="11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a") depends_on("py-setuptools@40.8:", type="build") diff --git a/var/spack/repos/builtin/packages/py-tzlocal/package.py b/var/spack/repos/builtin/packages/py-tzlocal/package.py index 4ae36f106503ec..b33612126c2534 100644 --- a/var/spack/repos/builtin/packages/py-tzlocal/package.py +++ b/var/spack/repos/builtin/packages/py-tzlocal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyTzlocal(PythonPackage): homepage = "https://github.com/regebro/tzlocal" pypi = "tzlocal/tzlocal-1.3.tar.gz" + license("MIT") + version("2.1", sha256="643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44") version("2.0.0", sha256="949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590") version("1.3", sha256="d160c2ce4f8b1831dabfe766bd844cf9012f766539cf84139c2faac5201882ce") diff --git a/var/spack/repos/builtin/packages/py-ubiquerg/package.py b/var/spack/repos/builtin/packages/py-ubiquerg/package.py index 59405676efa7df..85787877dba232 100644 --- a/var/spack/repos/builtin/packages/py-ubiquerg/package.py +++ b/var/spack/repos/builtin/packages/py-ubiquerg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyUbiquerg(PythonPackage): homepage = "https://github.com/pepkit/ubiquerg" pypi = "ubiquerg/ubiquerg-0.6.2.tar.gz" + license("BSD-2-Clause") + version("0.6.2", sha256="a9b1388799d4c366f956e0c912819099ad8f6cd0e5d890923cdde197f80d14cf") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-uc-micro-py/package.py b/var/spack/repos/builtin/packages/py-uc-micro-py/package.py index d6f601f71b35f1..30bc52ee533a56 100644 --- a/var/spack/repos/builtin/packages/py-uc-micro-py/package.py +++ b/var/spack/repos/builtin/packages/py-uc-micro-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUcMicroPy(PythonPackage): homepage = "https://github.com/tsutsu3/uc.micro-py" pypi = "uc-micro-py/uc-micro-py-1.0.2.tar.gz" + license("MIT") + version("1.0.2", sha256="30ae2ac9c49f39ac6dce743bd187fcd2b574b16ca095fa74cd9396795c954c54") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py b/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py index 0f5b143560eb49..7d8bf4cd25d22b 100644 --- a/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py +++ b/var/spack/repos/builtin/packages/py-ucsf-pyem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyUcsfPyem(PythonPackage): maintainers("dorton21") + license("GPL-3.0-or-later") + # Using commit since releases haven't been updated in 2 years version("2021-04-07", commit="ed0527f98657d21d887357426b74e5240d477fae") diff --git a/var/spack/repos/builtin/packages/py-ucx-py/package.py b/var/spack/repos/builtin/packages/py-ucx-py/package.py index fe60d95e9c79b3..d8bcd05a5fe744 100644 --- a/var/spack/repos/builtin/packages/py-ucx-py/package.py +++ b/var/spack/repos/builtin/packages/py-ucx-py/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyUcxPy(PythonPackage): homepage = "https://ucx-py.readthedocs.io/en/latest/" url = "https://github.com/rapidsai/ucx-py/archive/v0.16.0.tar.gz" + license("Apache-2.0") + version("0.16.0", sha256="12c1c982ee337b8dc026d3a6e8e63d96bf021c5c555fe173642908d3c3bec36e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-uhi/package.py b/var/spack/repos/builtin/packages/py-uhi/package.py index 7cf536c66046f7..ced9b7d3a8d01f 100644 --- a/var/spack/repos/builtin/packages/py-uhi/package.py +++ b/var/spack/repos/builtin/packages/py-uhi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyUhi(PythonPackage): homepage = "https://github.com/Scikit-HEP/uhi" pypi = "uhi/uhi-0.3.0.tar.gz" + license("BSD-3-Clause") + version("0.3.3", sha256="800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be") version("0.3.2", sha256="fd6ed2ae8ce68ba6be37b872de86e7775b45d54f858768c8fdaba162b6452ab2") version("0.3.1", sha256="6f1ebcadd1d0628337a30b012184325618047abc01c3539538b1655c69101d91") diff --git a/var/spack/repos/builtin/packages/py-ujson/package.py b/var/spack/repos/builtin/packages/py-ujson/package.py index c10c4c43dd8608..1b50fb9c2ebb6a 100644 --- a/var/spack/repos/builtin/packages/py-ujson/package.py +++ b/var/spack/repos/builtin/packages/py-ujson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-ultralytics/package.py b/var/spack/repos/builtin/packages/py-ultralytics/package.py index 3c97aa43cc3020..c3f0ab011142b5 100644 --- a/var/spack/repos/builtin/packages/py-ultralytics/package.py +++ b/var/spack/repos/builtin/packages/py-ultralytics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyUltralytics(PythonPackage): homepage = "https://github.com/ultralytics/ultralytics" pypi = "ultralytics/ultralytics-8.0.50.tar.gz" + license("AGPL-3.0") + version("8.0.50", sha256="fdcb22300b63b72aa52da1713c33c01741aca031a61f15327eb6f02615bb4b97") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-umalqurra/package.py b/var/spack/repos/builtin/packages/py-umalqurra/package.py index b1cbede42a500a..f8d61536372320 100644 --- a/var/spack/repos/builtin/packages/py-umalqurra/package.py +++ b/var/spack/repos/builtin/packages/py-umalqurra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-umap-learn/package.py b/var/spack/repos/builtin/packages/py-umap-learn/package.py index 7820cf338246ee..b8a01204d97f06 100644 --- a/var/spack/repos/builtin/packages/py-umap-learn/package.py +++ b/var/spack/repos/builtin/packages/py-umap-learn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyUmapLearn(PythonPackage): homepage = "https://github.com/lmcinnes/umap" pypi = "umap-learn/umap-learn-0.5.3.tar.gz" + license("BSD-3-Clause") + version("0.5.3", sha256="dbd57cb181c2b66d238acb5635697526bf24c798082daed0cf9b87f6a3a6c0c7") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-umi-tools/package.py b/var/spack/repos/builtin/packages/py-umi-tools/package.py index 18d84223d8cc25..bf737721f26f37 100644 --- a/var/spack/repos/builtin/packages/py-umi-tools/package.py +++ b/var/spack/repos/builtin/packages/py-umi-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUmiTools(PythonPackage): homepage = "https://github.com/CGATOxford/UMI-tools" url = "https://github.com/CGATOxford/UMI-tools/archive/0.5.3.tar.gz" + license("MIT") + version("1.1.4", sha256="945c4c98e2007369c301a7a009c6f9deb0fda74b0117cd14e14bd134164a4ff6") version("1.0.0", sha256="7f73ef29120134123351c19089e9b7b7c03a8f241a19f8cb0e43d17f0e2f9fc7") version("0.5.5", sha256="9834a4388dd1ea0b971071009db7ccdbd447c6019796a3c061b0bb383c9ad992") diff --git a/var/spack/repos/builtin/packages/py-uncertainties/package.py b/var/spack/repos/builtin/packages/py-uncertainties/package.py index 1e3cc9e6f6c847..931ddbe8d4d3d6 100644 --- a/var/spack/repos/builtin/packages/py-uncertainties/package.py +++ b/var/spack/repos/builtin/packages/py-uncertainties/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyUncertainties(PythonPackage): homepage = "https://uncertainties-python-package.readthedocs.io/en/latest/" pypi = "uncertainties/uncertainties-3.1.4.tar.gz" + license("BSD-3-Clause") + version("3.1.7", sha256="80111e0839f239c5b233cb4772017b483a0b7a1573a581b92ab7746a35e6faab") version("3.1.6", sha256="7c4db5aaafd227e95485b61fba5d235dc8133aeecd98f8fc1224c038ce063e2d") version("3.1.4", sha256="63548a94899f2a51eeb89b640f6ac311f481a8016b37dce157186e44619bc968") diff --git a/var/spack/repos/builtin/packages/py-unicycler/package.py b/var/spack/repos/builtin/packages/py-unicycler/package.py index f648c3e9de77e0..a0a521d84703bf 100644 --- a/var/spack/repos/builtin/packages/py-unicycler/package.py +++ b/var/spack/repos/builtin/packages/py-unicycler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyUnicycler(PythonPackage): homepage = "https://github.com/rrwick/Unicycler" url = "https://github.com/rrwick/Unicycler/archive/v0.4.5.tar.gz" + license("GPL-3.0-or-later") + version("0.5.0", sha256="84a8709c9f2e624225410af702d779ffb0cb06f7c22c20e1f01b989945e08a47") version("0.4.9", sha256="84bea8f3e8f99a1e63e5230ffe474a696db8caa67569c3a96ae12906d32a35eb") version("0.4.8", sha256="e948871e4de9db5964c9ca6f8f877c3cbe6a46f62052dfab52ffe0f45bbbd203") diff --git a/var/spack/repos/builtin/packages/py-unidecode/package.py b/var/spack/repos/builtin/packages/py-unidecode/package.py index 26eefe9aeafc7e..49117a58c35245 100644 --- a/var/spack/repos/builtin/packages/py-unidecode/package.py +++ b/var/spack/repos/builtin/packages/py-unidecode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyUnidecode(PythonPackage): pypi = "unidecode/Unidecode-1.1.1.tar.gz" + license("GPL-2.0-or-later") + version("1.1.1", sha256="2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8") version("0.04.21", sha256="280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") diff --git a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py index dc0c52078a3634..2b2fab62be1353 100644 --- a/var/spack/repos/builtin/packages/py-unittest2py3k/package.py +++ b/var/spack/repos/builtin/packages/py-unittest2py3k/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-unshare/package.py b/var/spack/repos/builtin/packages/py-unshare/package.py index e9276f99789b58..c80b6f8b2c25e6 100644 --- a/var/spack/repos/builtin/packages/py-unshare/package.py +++ b/var/spack/repos/builtin/packages/py-unshare/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-unyt/package.py b/var/spack/repos/builtin/packages/py-unyt/package.py index 1f53dd35f32865..ed4928272c11ca 100644 --- a/var/spack/repos/builtin/packages/py-unyt/package.py +++ b/var/spack/repos/builtin/packages/py-unyt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyUnyt(PythonPackage): maintainers("charmoniumq") + license("BSD-3-Clause") + version("main", branch="main") version("2.9.2", sha256="8d4bf3dd3f7b4c29580728c0359caa17d62239673eeab436448d0777adeee5e1") diff --git a/var/spack/repos/builtin/packages/py-update-checker/package.py b/var/spack/repos/builtin/packages/py-update-checker/package.py index a0c2001d877079..959c525e31014d 100644 --- a/var/spack/repos/builtin/packages/py-update-checker/package.py +++ b/var/spack/repos/builtin/packages/py-update-checker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUpdateChecker(PythonPackage): homepage = "https://github.com/bboe/update_checker" pypi = "update_checker/update_checker-0.18.0.tar.gz" + license("BSD-2-Clause") + version("0.18.0", sha256="6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13") version("0.17", sha256="2def8db7f63bd45c7d19df5df570f3f3dfeb1a1f050869d7036529295db10e62") diff --git a/var/spack/repos/builtin/packages/py-uproot/package.py b/var/spack/repos/builtin/packages/py-uproot/package.py index 9db0204669a530..761ac7b41a8d3f 100644 --- a/var/spack/repos/builtin/packages/py-uproot/package.py +++ b/var/spack/repos/builtin/packages/py-uproot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class PyUproot(PythonPackage): tags = ["hep"] + license("BSD-3-Clause") + version("5.0.5", sha256="1a2ac98d595bde7c83c7d5b716d33bb74abd44df6e8d84af62c638edb6c9abab") version("5.0.4", sha256="c4ea1af198e3292a4649e3fe789d11b038c1ed57c10f167fc3f52100300c2eea") version("5.0.3", sha256="a4ab3f2ea0b98746f601d43115a64b36f9c2145e9793da1e1cd9aaca72f311ab") diff --git a/var/spack/repos/builtin/packages/py-uproot3-methods/package.py b/var/spack/repos/builtin/packages/py-uproot3-methods/package.py index c42aaf01c6d5e6..8000a8567e2070 100644 --- a/var/spack/repos/builtin/packages/py-uproot3-methods/package.py +++ b/var/spack/repos/builtin/packages/py-uproot3-methods/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-uproot3/package.py b/var/spack/repos/builtin/packages/py-uproot3/package.py index e2ddadc5f80ebd..d6ddc6eb986d79 100644 --- a/var/spack/repos/builtin/packages/py-uproot3/package.py +++ b/var/spack/repos/builtin/packages/py-uproot3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-uri-template/package.py b/var/spack/repos/builtin/packages/py-uri-template/package.py index d2564f50036581..cc61459ab5a324 100644 --- a/var/spack/repos/builtin/packages/py-uri-template/package.py +++ b/var/spack/repos/builtin/packages/py-uri-template/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUriTemplate(PythonPackage): homepage = "https://github.com/plinss/uri_template" pypi = "uri_template/uri_template-1.2.0.tar.gz" + license("MIT") + version("1.2.0", sha256="934e4d09d108b70eb8a24410af8615294d09d279ce0e7cbcdaef1bd21f932b06") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-uritemplate/package.py b/var/spack/repos/builtin/packages/py-uritemplate/package.py index df33893a8d9f7c..7bf8dc48b52088 100644 --- a/var/spack/repos/builtin/packages/py-uritemplate/package.py +++ b/var/spack/repos/builtin/packages/py-uritemplate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUritemplate(PythonPackage): homepage = "https://uritemplate.readthedocs.org/" pypi = "uritemplate/uritemplate-3.0.0.tar.gz" + license("Apache-2.0") + version("4.1.1", sha256="4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0") version("3.0.0", sha256="c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d") diff --git a/var/spack/repos/builtin/packages/py-url-normalize/package.py b/var/spack/repos/builtin/packages/py-url-normalize/package.py index ac1b923fb97c7c..e29deec59a22ab 100644 --- a/var/spack/repos/builtin/packages/py-url-normalize/package.py +++ b/var/spack/repos/builtin/packages/py-url-normalize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyUrlNormalize(PythonPackage): homepage = "https://github.com/niksite/url-normalize" pypi = "url-normalize/url-normalize-1.4.3.tar.gz" + license("MIT") + version("1.4.3", sha256="d23d3a070ac52a67b83a1c59a0e68f8608d1cd538783b401bc9de2c0fac999b2") depends_on("python@3.6:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-urllib3-secure-extra/package.py b/var/spack/repos/builtin/packages/py-urllib3-secure-extra/package.py index 2a231e388e8078..15113044b793c2 100644 --- a/var/spack/repos/builtin/packages/py-urllib3-secure-extra/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3-secure-extra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py index d4b061fa0be8fa..4f9155b8e3d00d 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,10 +14,15 @@ class PyUrllib3(PythonPackage): pypi = "urllib3/urllib3-1.25.6.tar.gz" git = "https://github.com/urllib3/urllib3.git" + license("MIT") + + version("2.1.0", sha256="df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54") + version("2.0.7", sha256="c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84") version("2.0.6", sha256="b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564") version("2.0.5", sha256="13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594") version("1.26.12", sha256="3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e") version("1.26.6", sha256="f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f") + version("1.25.11", sha256="8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2") version("1.25.9", sha256="3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527") version("1.25.6", sha256="9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86") version("1.25.3", sha256="dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232") @@ -27,9 +32,11 @@ class PyUrllib3(PythonPackage): version("1.14", sha256="dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37") variant("brotli", default=False, when="@1.25:", description="Add Brotli support") - variant("secure", default=False, description="Add SSL/TLS support") variant("socks", default=False, when="@1.15:", description="SOCKS and HTTP proxy support") + # Historical variant + variant("secure", default=False, when="@:2.0", description="Add SSL/TLS support") + depends_on("python@3.8:", when="@2.1:", type=("build", "run")) depends_on("py-hatchling@1.6:1", when="@2:", type="build") with when("+brotli"): @@ -38,6 +45,9 @@ class PyUrllib3(PythonPackage): # Historical dependencies depends_on("py-brotlipy@0.6:", when="@:1.26.8", type=("build", "run")) + depends_on("py-pysocks@1.5.6,1.5.8:1", when="+socks", type=("build", "run")) + + # Historical dependencies with when("+secure"): depends_on("py-pyopenssl@17.1:", when="@2:", type=("build", "run")) depends_on("py-pyopenssl@0.14:", when="@1", type=("build", "run")) @@ -47,8 +57,5 @@ class PyUrllib3(PythonPackage): depends_on("py-certifi", type=("build", "run")) depends_on("py-urllib3-secure-extra", when="@1.26.12:", type=("build", "run")) - depends_on("py-pysocks@1.5.6,1.5.8:1", when="+socks", type=("build", "run")) - - # Historical dependencies depends_on("py-setuptools", when="@1", type="build") depends_on("python@3.6:3", when="@1.26.12:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-urwid/package.py b/var/spack/repos/builtin/packages/py-urwid/package.py index 263c8d4702e999..b2b98cb77701c7 100644 --- a/var/spack/repos/builtin/packages/py-urwid/package.py +++ b/var/spack/repos/builtin/packages/py-urwid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUrwid(PythonPackage): homepage = "https://urwid.org/" pypi = "urwid/urwid-1.3.0.tar.gz" + license("LGPL-2.1-only") + version("2.1.2", sha256="588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae") version("1.3.0", sha256="29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2") diff --git a/var/spack/repos/builtin/packages/py-us/package.py b/var/spack/repos/builtin/packages/py-us/package.py index cf89fd372a977b..6b7459f35a1bda 100644 --- a/var/spack/repos/builtin/packages/py-us/package.py +++ b/var/spack/repos/builtin/packages/py-us/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUs(PythonPackage): pypi = "us/us-1.0.0.tar.gz" + license("BSD-3-Clause") + version("1.0.0", sha256="09dc9ba763e2e4399e6a042104f3e415a7de6bfa4df6f557b4f19e3ba9a22fda") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-userpath/package.py b/var/spack/repos/builtin/packages/py-userpath/package.py index ac7225d7848824..f7d62a92bbbff0 100644 --- a/var/spack/repos/builtin/packages/py-userpath/package.py +++ b/var/spack/repos/builtin/packages/py-userpath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUserpath(PythonPackage): homepage = "https://github.com/ofek/userpath" pypi = "userpath/userpath-1.8.0.tar.gz" + license("MIT") + version("1.8.0", sha256="04233d2fcfe5cff911c1e4fb7189755640e1524ff87a4b82ab9d6b875fee5787") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-usgs/package.py b/var/spack/repos/builtin/packages/py-usgs/package.py index f348be2fa9ce83..f5993971b2bc97 100644 --- a/var/spack/repos/builtin/packages/py-usgs/package.py +++ b/var/spack/repos/builtin/packages/py-usgs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyUsgs(PythonPackage): maintainers("adamjstewart") + license("MIT") + version("0.2.7", sha256="484e569ea1baf9574e11ccf15219957364690dcf06ee3d09afef030df944e79b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-utils/package.py b/var/spack/repos/builtin/packages/py-utils/package.py index 89ceef9568de8e..e25e9ec28ed745 100644 --- a/var/spack/repos/builtin/packages/py-utils/package.py +++ b/var/spack/repos/builtin/packages/py-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUtils(PythonPackage): homepage = "https://github.com/haaksmash/pyutils" url = "https://github.com/haaksmash/pyutils/archive/1.0.1.tar.gz" + license("LGPL-3.0-or-later") + version("1.0.1", sha256="3a6552db1678e86a1b5e31107d20ae90dc5fb858ff7936b95367ee9d1b99e9ae") version("0.8.0", sha256="916672df4cf9647e44f0aa1b3b327eb361c3c0bac1b1e32a6cf723ca766a2d4b") diff --git a/var/spack/repos/builtin/packages/py-uvicorn/package.py b/var/spack/repos/builtin/packages/py-uvicorn/package.py index 74204a88841b0c..bc05d7e2207444 100644 --- a/var/spack/repos/builtin/packages/py-uvicorn/package.py +++ b/var/spack/repos/builtin/packages/py-uvicorn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyUvicorn(PythonPackage): homepage = "https://www.uvicorn.org/" pypi = "uvicorn/uvicorn-0.20.0.tar.gz" + license("BSD-3-Clause") + version("0.20.0", sha256="a4e12017b940247f836bc90b72e725d7dfd0c8ed1c51eb365f5ba30d9f5127d8") variant("standard", default=False, description="Build standard dependencies") diff --git a/var/spack/repos/builtin/packages/py-uvloop/package.py b/var/spack/repos/builtin/packages/py-uvloop/package.py index 8babdfd85e382a..10c875940c75f2 100644 --- a/var/spack/repos/builtin/packages/py-uvloop/package.py +++ b/var/spack/repos/builtin/packages/py-uvloop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyUvloop(PythonPackage): homepage = "https://github.com/MagicStack/uvloop" pypi = "uvloop/uvloop-0.14.0.tar.gz" + license("Apache-2.0") + version("0.16.0", sha256="f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228") version("0.14.0", sha256="123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e") diff --git a/var/spack/repos/builtin/packages/py-uvw/package.py b/var/spack/repos/builtin/packages/py-uvw/package.py index cc086f30140259..a9d172b1fc4444 100644 --- a/var/spack/repos/builtin/packages/py-uvw/package.py +++ b/var/spack/repos/builtin/packages/py-uvw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyUvw(PythonPackage): maintainers("prs513rosewood") + license("MIT") + version("master", branch="master") version("0.5.0", sha256="dd4501bc2f8c6080467f19d7537a282123a51d849c6b7ace18191ab751ec7621") version("0.4.0", sha256="688052832c96ac6ead93f15e577d4f1c2339376300e781520c43cf8652ed3dd8") diff --git a/var/spack/repos/builtin/packages/py-uwsgi/package.py b/var/spack/repos/builtin/packages/py-uwsgi/package.py index f0affff9c99568..2783c910071c58 100644 --- a/var/spack/repos/builtin/packages/py-uwsgi/package.py +++ b/var/spack/repos/builtin/packages/py-uwsgi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyUwsgi(PythonPackage): homepage = "https://github.com/unbit/uwsgi/" pypi = "uwsgi/uwsgi-2.0.18.tar.gz" + license("GPL-2.0-only") + version("2.0.18", sha256="4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-validators/package.py b/var/spack/repos/builtin/packages/py-validators/package.py index 41a69dd353b55d..b2baef6d013cd2 100644 --- a/var/spack/repos/builtin/packages/py-validators/package.py +++ b/var/spack/repos/builtin/packages/py-validators/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyValidators(PythonPackage): homepage = "https://github.com/kvesteri/validators" pypi = "validators/validators-0.20.0.tar.gz" + license("MIT") + version("0.20.0", sha256="24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-vcf-kit/package.py b/var/spack/repos/builtin/packages/py-vcf-kit/package.py index 5781ab9838d102..6321191cd46a79 100644 --- a/var/spack/repos/builtin/packages/py-vcf-kit/package.py +++ b/var/spack/repos/builtin/packages/py-vcf-kit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyVcfKit(PythonPackage): homepage = "https://github.com/AndersenLab/VCF-kit" url = "https://github.com/AndersenLab/VCF-kit/archive/0.1.6.tar.gz" + license("MIT") + version("0.1.6", sha256="4865414ac9dc6996c0baeefadf1d528c28e6d0c3cc3dbdc28a2cdc6e06212428") depends_on("python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-vcrpy/package.py b/var/spack/repos/builtin/packages/py-vcrpy/package.py index b11e67b91215b4..039cb865dcff52 100644 --- a/var/spack/repos/builtin/packages/py-vcrpy/package.py +++ b/var/spack/repos/builtin/packages/py-vcrpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVcrpy(PythonPackage): homepage = "https://github.com/kevin1024/vcrpy" pypi = "vcrpy/vcrpy-4.1.1.tar.gz" + license("MIT") + version("5.1.0", sha256="bbf1532f2618a04f11bce2a99af3a9647a32c880957293ff91e0a5f187b6b3d2") version("4.2.1", sha256="7cd3e81a2c492e01c281f180bcc2a86b520b173d2b656cb5d89d99475423e013") version("4.1.1", sha256="57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599") diff --git a/var/spack/repos/builtin/packages/py-vcstool/package.py b/var/spack/repos/builtin/packages/py-vcstool/package.py index a1566022493035..09aabe6ca7fef6 100644 --- a/var/spack/repos/builtin/packages/py-vcstool/package.py +++ b/var/spack/repos/builtin/packages/py-vcstool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-vcstools/package.py b/var/spack/repos/builtin/packages/py-vcstools/package.py index 2e6f74bec1d84c..e489e9df9f431d 100644 --- a/var/spack/repos/builtin/packages/py-vcstools/package.py +++ b/var/spack/repos/builtin/packages/py-vcstools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-vcversioner/package.py b/var/spack/repos/builtin/packages/py-vcversioner/package.py index 9d049ea08b7b8c..11c1bc2095c54a 100644 --- a/var/spack/repos/builtin/packages/py-vcversioner/package.py +++ b/var/spack/repos/builtin/packages/py-vcversioner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVcversioner(PythonPackage): homepage = "https://github.com/habnabit/vcversioner" pypi = "vcversioner/vcversioner-2.16.0.0.tar.gz" + license("ISC") + version("2.16.0.0", sha256="dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py b/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py index bb5bf19a63cec2..b54fa5e05532cd 100644 --- a/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py +++ b/var/spack/repos/builtin/packages/py-vector-quantize-pytorch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyVectorQuantizePytorch(PythonPackage): homepage = "https://github.com/lucidrains/vector-quantize-pytorch" pypi = "vector_quantize_pytorch/vector_quantize_pytorch-0.3.9.tar.gz" + license("MIT") + version("0.3.9", sha256="783ca76251299f0e3eb244062bc05c4416bb29157e57077e4a8969c5277f05ee") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-vector/package.py b/var/spack/repos/builtin/packages/py-vector/package.py index f623855265a9d1..7a5ec7749de26d 100644 --- a/var/spack/repos/builtin/packages/py-vector/package.py +++ b/var/spack/repos/builtin/packages/py-vector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVector(PythonPackage): homepage = "https://github.com/scikit-hep/vector" pypi = "vector/vector-0.8.4.tar.gz" + license("BSD-3-Clause") + version("0.8.5", sha256="2c7c8b228168b89da5d30d50dbd05452348920559ebe0eb94cfdafa15cdc8378") version("0.8.4", sha256="ef97bfec0263766edbb74c290401f89921f8d11ae9e4a0ffd904ae40674f1239") diff --git a/var/spack/repos/builtin/packages/py-vermin/package.py b/var/spack/repos/builtin/packages/py-vermin/package.py index 5fabf334b6b7da..8e054ad85666bd 100644 --- a/var/spack/repos/builtin/packages/py-vermin/package.py +++ b/var/spack/repos/builtin/packages/py-vermin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,10 +11,13 @@ class PyVermin(PythonPackage): """Concurrently detect the minimum Python versions needed to run code.""" homepage = "https://github.com/netromdk/vermin" - url = "https://github.com/netromdk/vermin/archive/v1.5.2.tar.gz" + url = "https://github.com/netromdk/vermin/archive/v1.6.0.tar.gz" maintainers("netromdk") + license("MIT") + + version("1.6.0", sha256="31200b1e674e064c7473484372db2743f5abbf1409d994880486bca5bcf05bec") version("1.5.2", sha256="e4b6ca6f3e71b0d83a179dc4a4ba50682f60474cf8c948ba9f82e330f219ff4a") version("1.5.1", sha256="2d1c7601d054da9fa5c5eb6c817c714235f9d484b74011f7f86c98f0a25e93ea") version("1.5.0", sha256="77207385c9cea1f02053a8f2e7f2e8c945394cf37c44c70ce217cada077a2d17") diff --git a/var/spack/repos/builtin/packages/py-versioneer-518/package.py b/var/spack/repos/builtin/packages/py-versioneer-518/package.py new file mode 100644 index 00000000000000..dec34deb97c456 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-versioneer-518/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyVersioneer518(PythonPackage): + """Versioneer is a tool to automatically update version strings by + asking your version-control system about the current tree.""" + + homepage = "https://github.com/python-versioneer/versioneer-518" + pypi = "versioneer-518/versioneer-518-0.19.tar.gz" + git = "https://github.com/python-versioneer/versioneer-518.git" + + version("0.19", sha256="a287608997415f45401849d1227a42bb41b80a6e4a7da5776666f85ce6faec41") + + depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-versioneer/package.py b/var/spack/repos/builtin/packages/py-versioneer/package.py index 915b40ff369374..5eb5ae59e5e7f2 100644 --- a/var/spack/repos/builtin/packages/py-versioneer/package.py +++ b/var/spack/repos/builtin/packages/py-versioneer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyVersioneer(PythonPackage): maintainers("scemama") + license("Unlicense") + version("0.29", sha256="5ab283b9857211d61b53318b7c792cf68e798e765ee17c27ade9f6c924235731") version("0.28", sha256="7175ca8e7bb4dd0e3c9779dd2745e5b4a6036304af3f5e50bd896f10196586d6") version("0.27", sha256="452e0130658e9d3f0ba3e8a70cf34ef23c0ff6cbf743555b3e73a6c11d0161a3") diff --git a/var/spack/repos/builtin/packages/py-verspec/package.py b/var/spack/repos/builtin/packages/py-verspec/package.py index d0807bdca90532..24e59209234a16 100644 --- a/var/spack/repos/builtin/packages/py-verspec/package.py +++ b/var/spack/repos/builtin/packages/py-verspec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyVerspec(PythonPackage): homepage = "https://github.com/jimporter/verspec" pypi = "verspec/verspec-0.1.0.tar.gz" + license("BSD-2-Clause") + version("0.1.0", sha256="c4504ca697b2056cdb4bfa7121461f5a0e81809255b41c03dda4ba823637c01e") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-vine/package.py b/var/spack/repos/builtin/packages/py-vine/package.py index 5b185563547e0b..7a89adde5a96f0 100644 --- a/var/spack/repos/builtin/packages/py-vine/package.py +++ b/var/spack/repos/builtin/packages/py-vine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyVine(PythonPackage): pypi = "vine/vine-1.2.0.tar.gz" + license("CC-BY-SA-4.0") + version("5.0.0", sha256="7d3b1624a953da82ef63462013bbd271d3eb75751489f9807598e8f340bd637e") version("1.3.0", sha256="133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87") version("1.2.0", sha256="ee4813e915d0e1a54e5c1963fde0855337f82655678540a6bc5996bca4165f76") diff --git a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py index afe7fb8530a472..050ab35a81c63b 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv-clone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVirtualenvClone(PythonPackage): homepage = "https://github.com/edwardgeorge/virtualenv-clone" pypi = "virtualenv-clone/virtualenv-clone-0.2.6.tar.gz" + license("MIT") + version("0.5.7", sha256="418ee935c36152f8f153c79824bb93eaf6f0f7984bae31d3f48f350b9183501a") version("0.2.6", sha256="6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405") diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index 4eec5ac359b883..4b720793a41cb4 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyVirtualenv(PythonPackage): pypi = "virtualenv/virtualenv-16.7.6.tar.gz" git = "https://github.com/pypa/virtualenv.git" + license("MIT") + version("20.24.5", sha256="e8361967f6da6fbdf1426483bfe9fca8287c242ac0bc30429905721cefbff752") version("20.22.0", sha256="278753c47aaef1a0f14e6db8a4c5e1e040e90aea654d0fc1dc7e0d8a42616cc3") version("20.17.1", sha256="f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058") diff --git a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py index 5da941e97a2873..56557996afec43 100644 --- a/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenvwrapper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyVirtualenvwrapper(PythonPackage): homepage = "https://bitbucket.org/virtualenvwrapper/virtualenvwrapper.git" pypi = "virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz" + license("MIT") + version("4.8.4", sha256="51a1a934e7ed0ff221bdd91bf9d3b604d875afbb3aa2367133503fee168f5bfa") version("4.8.2", sha256="18d8e4c500c4c4ee794f704e050cf2bbb492537532a4521d1047e7dd1ee4e374") diff --git a/var/spack/repos/builtin/packages/py-visdom/package.py b/var/spack/repos/builtin/packages/py-visdom/package.py index 9b7292f0bf6683..319b6a888cc724 100644 --- a/var/spack/repos/builtin/packages/py-visdom/package.py +++ b/var/spack/repos/builtin/packages/py-visdom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyVisdom(PythonPackage): homepage = "https://github.com/facebookresearch/visdom" pypi = "visdom/visdom-0.1.8.9.tar.gz" + license("Apache-2.0") + version("0.1.8.9", sha256="c73ad23723c24a48156899f78dd76bd4538eba3edf9120b6c65a9528fa677126") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-voluptuous/package.py b/var/spack/repos/builtin/packages/py-voluptuous/package.py index 0f490627849289..f1da133e3fbfca 100644 --- a/var/spack/repos/builtin/packages/py-voluptuous/package.py +++ b/var/spack/repos/builtin/packages/py-voluptuous/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVoluptuous(PythonPackage): homepage = "https://github.com/alecthomas/voluptuous" pypi = "voluptuous/voluptuous-0.11.5.tar.gz" + license("BSD-3-Clause") + version("0.11.7", sha256="2abc341dbc740c5e2302c7f9b8e2e243194fb4772585b991931cb5b22e9bf456") version("0.11.6", sha256="d2ca99ae1d1ed0313e8965720d1d75a780fc7f312fea4e3dbbb56ccfe5a8306d") version("0.11.5", sha256="567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") diff --git a/var/spack/repos/builtin/packages/py-vsc-base/package.py b/var/spack/repos/builtin/packages/py-vsc-base/package.py index acbfe77f06b636..5e15cdd4ebc634 100644 --- a/var/spack/repos/builtin/packages/py-vsc-base/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyVscBase(PythonPackage): homepage = "https://github.com/hpcugent/vsc-base/" pypi = "vsc-base/vsc-base-2.5.8.tar.gz" + license("LGPL-2.0-only") + version("2.5.8", sha256="7fcd300f842edf4baade7d0b7a3b462ca7dfb2a411a7532694a90127c6646ee2") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-vsc-install/package.py b/var/spack/repos/builtin/packages/py-vsc-install/package.py index d85e3da4cd1a35..fd39d8642973b8 100644 --- a/var/spack/repos/builtin/packages/py-vsc-install/package.py +++ b/var/spack/repos/builtin/packages/py-vsc-install/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyVscInstall(PythonPackage): homepage = "https://github.com/hpcugent/vsc-install/" pypi = "vsc-install/vsc-install-0.10.25.tar.gz" + license("LGPL-2.0-only") + version("0.10.25", sha256="744fa52b45577251d94e9298ecb115afd295f2530eba64c524f469b5e283f19c") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py b/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py index 55355c92e38214..c8849ad78658a4 100644 --- a/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py +++ b/var/spack/repos/builtin/packages/py-vsts-cd-manager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-vsts/package.py b/var/spack/repos/builtin/packages/py-vsts/package.py index 4ea765c1e36e96..47c7bd9bbeaf00 100644 --- a/var/spack/repos/builtin/packages/py-vsts/package.py +++ b/var/spack/repos/builtin/packages/py-vsts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyVsts(PythonPackage): homepage = "https://github.com/Microsoft/vsts-python-api" pypi = "vsts/vsts-0.1.25.tar.gz" + license("MIT") + version("0.1.25", sha256="da179160121f5b38be061dbff29cd2b60d5d029b2207102454d77a7114e64f97") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-waitress/package.py b/var/spack/repos/builtin/packages/py-waitress/package.py index d09d6b2d69c8bf..4a8f1034f48fb0 100644 --- a/var/spack/repos/builtin/packages/py-waitress/package.py +++ b/var/spack/repos/builtin/packages/py-waitress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWaitress(PythonPackage): homepage = "https://github.com/Pylons/waitress/" pypi = "waitress/waitress-2.1.2.tar.gz" + license("ZPL-2.1") + version("2.1.2", sha256="780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba") depends_on("py-setuptools@41:", type="build") diff --git a/var/spack/repos/builtin/packages/py-walinuxagent/package.py b/var/spack/repos/builtin/packages/py-walinuxagent/package.py index a8e8699aa9b2b7..0e8620655b62e8 100644 --- a/var/spack/repos/builtin/packages/py-walinuxagent/package.py +++ b/var/spack/repos/builtin/packages/py-walinuxagent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWalinuxagent(PythonPackage): homepage = "https://github.com/Azure/WALinuxAgent" url = "https://github.com/Azure/WALinuxAgent/archive/pre-v2.2.52.tar.gz" + license("Apache-2.0") + version("2.2.52", sha256="02c26af75827bd7042aa2285c78dee86ddb25a6a8f6bb0a85679a2df9ba56a3a") version("2.2.50", sha256="3b2b99552e3b35dfcbb4cabf476d0113d701eb23d2e0e61f35f0fa33cabde0a1") diff --git a/var/spack/repos/builtin/packages/py-wand/package.py b/var/spack/repos/builtin/packages/py-wand/package.py index 07ebb2247f3408..f9561813af2bbc 100644 --- a/var/spack/repos/builtin/packages/py-wand/package.py +++ b/var/spack/repos/builtin/packages/py-wand/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWand(PythonPackage): homepage = "https://docs.wand-py.org" pypi = "Wand/Wand-0.5.6.tar.gz" + license("MIT") + version("0.6.11", sha256="b661700da9f8f1e931e52726e4fc643a565b9514f5883d41b773e3c37c9fa995") version("0.5.6", sha256="d06b59f36454024ce952488956319eb542d5dc65f1e1b00fead71df94dbfcf88") version("0.4.2", sha256="a0ded99a9824ddd82617a4b449164e2c5c93853aaff96f9e0bab8b405d62ca7c") diff --git a/var/spack/repos/builtin/packages/py-wandb/package.py b/var/spack/repos/builtin/packages/py-wandb/package.py index 8036278d72a04e..6d0949338c04d3 100644 --- a/var/spack/repos/builtin/packages/py-wandb/package.py +++ b/var/spack/repos/builtin/packages/py-wandb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyWandb(PythonPackage): maintainers("thomas-bouvier") + license("MIT") + version("0.13.9", sha256="0a17365ce1f18306ce7a7f16b943094fac7284bb85f4e52c0685705602f9e307") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-warlock/package.py b/var/spack/repos/builtin/packages/py-warlock/package.py index 13943f17bde709..cb574aaa990728 100644 --- a/var/spack/repos/builtin/packages/py-warlock/package.py +++ b/var/spack/repos/builtin/packages/py-warlock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWarlock(PythonPackage): homepage = "https://github.com/bcwaldon/warlock" url = "https://github.com/bcwaldon/warlock/archive/1.3.3.tar.gz" + license("Apache-2.0") + version("1.3.3", sha256="b77e4977d5dc54d47f88cbcc9ab2d716f5f10171d123138785dad96aeb2858d0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-warpx/package.py b/var/spack/repos/builtin/packages/py-warpx/package.py index 1b3fb9f788eb62..17483e1c30c83c 100644 --- a/var/spack/repos/builtin/packages/py-warpx/package.py +++ b/var/spack/repos/builtin/packages/py-warpx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class PyWarpx(PythonPackage): tags = ["e4s", "ecp"] + license("BSD-3-Clause-LBNL") + # NOTE: if you update the versions here, also see warpx version("develop", branch="development") version("23.08", sha256="67695ff04b83d1823ea621c19488e54ebaf268532b0e5eb4ea8ad293d7ab3ddc") diff --git a/var/spack/repos/builtin/packages/py-wasabi/package.py b/var/spack/repos/builtin/packages/py-wasabi/package.py index ea2c5fd466242c..9780a0ba24de1a 100644 --- a/var/spack/repos/builtin/packages/py-wasabi/package.py +++ b/var/spack/repos/builtin/packages/py-wasabi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWasabi(PythonPackage): homepage = "https://github.com/explosion/wasabi" pypi = "wasabi/wasabi-0.6.0.tar.gz" + license("MIT") + version("1.1.2", sha256="1aaef3aceaa32edb9c91330d29d3936c0c39fdb965743549c173cb54b16c30b5") version("0.6.0", sha256="b8dd3e963cd693fde1eb6bfbecf51790171aa3534fa299faf35cf269f2fd6063") diff --git a/var/spack/repos/builtin/packages/py-watchdog/package.py b/var/spack/repos/builtin/packages/py-watchdog/package.py index 4b754768e1b6be..cb9bcfb44be7dd 100644 --- a/var/spack/repos/builtin/packages/py-watchdog/package.py +++ b/var/spack/repos/builtin/packages/py-watchdog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWatchdog(PythonPackage): homepage = "https://github.com/gorakhargosh/watchdog" pypi = "watchdog/watchdog-0.10.3.tar.gz" + license("Apache-2.0") + version("2.1.6", sha256="a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7") version("0.10.3", sha256="4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04") version("0.10.2", sha256="c560efb643faed5ef28784b2245cf8874f939569717a4a12826a173ac644456b") diff --git a/var/spack/repos/builtin/packages/py-watchfiles/package.py b/var/spack/repos/builtin/packages/py-watchfiles/package.py index 80fc72489c4b03..6e70fe918cf427 100644 --- a/var/spack/repos/builtin/packages/py-watchfiles/package.py +++ b/var/spack/repos/builtin/packages/py-watchfiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWatchfiles(PythonPackage): homepage = "https://github.com/samuelcolvin/watchfiles" pypi = "watchfiles/watchfiles-0.18.1.tar.gz" + license("MIT") + version("0.18.1", sha256="4ec0134a5e31797eb3c6c624dbe9354f2a8ee9c720e0b46fc5b7bab472b7c6d4") depends_on("py-maturin@0.13", type="build") diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py index cb667b5bbcb2e9..26a54033685b37 100644 --- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py +++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWcsaxes(PythonPackage): homepage = "https://wcsaxes.readthedocs.io/en/latest/index.html" url = "https://github.com/astrofrog/wcsaxes/archive/v0.8.tar.gz" + license("BSD-3-Clause") + version("0.8", sha256="9c6addc1ec04cc99617850354b2c03dbd4099d2e43b45a81f8bc3069de9c8e83") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py index 8120bab72bb568..1d615b5e76fce0 100644 --- a/var/spack/repos/builtin/packages/py-wcwidth/package.py +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWcwidth(PythonPackage): homepage = "https://github.com/jquast/wcwidth" pypi = "wcwidth/wcwidth-0.1.7.tar.gz" + license("MIT") + version("0.2.7", sha256="1b6d30a98ddd5ce9bbdb33658191fd2423fc9da203fe3ef1855407dcb7ee4e26") version("0.2.5", sha256="c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83") version("0.1.7", sha256="3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e") diff --git a/var/spack/repos/builtin/packages/py-webargs/package.py b/var/spack/repos/builtin/packages/py-webargs/package.py index 811de77ad38530..8b78635242e352 100644 --- a/var/spack/repos/builtin/packages/py-webargs/package.py +++ b/var/spack/repos/builtin/packages/py-webargs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyWebargs(PythonPackage): maintainers("haralmha") + license("MIT") + version("8.1.0", sha256="f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-webcolors/package.py b/var/spack/repos/builtin/packages/py-webcolors/package.py index 4cd4740675f8fd..834ba71967344f 100644 --- a/var/spack/repos/builtin/packages/py-webcolors/package.py +++ b/var/spack/repos/builtin/packages/py-webcolors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWebcolors(PythonPackage): homepage = "https://pypi.org/project/webcolors/" pypi = "webcolors/webcolors-1.11.1.tar.gz" + license("BSD-3-Clause") + version("1.11.1", sha256="76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6") depends_on("python@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-webencodings/package.py b/var/spack/repos/builtin/packages/py-webencodings/package.py index 80a042821b668b..3d393459564b4c 100644 --- a/var/spack/repos/builtin/packages/py-webencodings/package.py +++ b/var/spack/repos/builtin/packages/py-webencodings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWebencodings(PythonPackage): homepage = "https://github.com/gsnedders/python-webencodings" pypi = "webencodings/webencodings-0.5.1.tar.gz" + license("BSD-2-Clause") + version("0.5.1", sha256="b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-webkit-server/package.py b/var/spack/repos/builtin/packages/py-webkit-server/package.py index fb710b700ea16f..7302c5e2b9b4f9 100644 --- a/var/spack/repos/builtin/packages/py-webkit-server/package.py +++ b/var/spack/repos/builtin/packages/py-webkit-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWebkitServer(PythonPackage): pypi = "webkit-server/webkit-server-1.0.tar.gz" git = "https://github.com/niklasb/webkit-server.git" + license("MIT") + version("develop", branch="master") version("1.0", sha256="836dac18c823bf7737461a2d938c66c7b3601c858897e6c92c7ba0e33574a2bc") diff --git a/var/spack/repos/builtin/packages/py-weblogo/package.py b/var/spack/repos/builtin/packages/py-weblogo/package.py index 3869d64e4f657b..0a8bf4dc928b62 100644 --- a/var/spack/repos/builtin/packages/py-weblogo/package.py +++ b/var/spack/repos/builtin/packages/py-weblogo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWeblogo(PythonPackage): homepage = "http://weblogo.threeplusone.com" pypi = "weblogo/weblogo-3.6.0.tar.gz" + license("MIT") + version("3.6.0", sha256="af5a9f065581f18d71bd7c22b160c1e443932f22cab992d439d3dc8757c80a85") version("3.5.0", sha256="84e39ee7c4f70efea55d6a92b3efdc4d2602b3d32a793f98865bca35e6bd1133") version("3.4", sha256="1fb661df47252064dd6d59d3c340b24d87bebe9048ca9ada904ac1e95669e08f") diff --git a/var/spack/repos/builtin/packages/py-webob/package.py b/var/spack/repos/builtin/packages/py-webob/package.py index 8e9173bed8f475..410cfc90dfe11b 100644 --- a/var/spack/repos/builtin/packages/py-webob/package.py +++ b/var/spack/repos/builtin/packages/py-webob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWebob(PythonPackage): homepage = "https://webob.org/" pypi = "WebOb/WebOb-1.8.7.tar.gz" + license("MIT") + version("1.8.7", sha256="b64ef5141be559cfade448f044fa45c2260351edcb6a8ef6b7e00c7dcef0c323") depends_on("python@2.7:2.8,3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-websocket-client/package.py b/var/spack/repos/builtin/packages/py-websocket-client/package.py index 09a11e3f49289b..b82bc1572984d8 100644 --- a/var/spack/repos/builtin/packages/py-websocket-client/package.py +++ b/var/spack/repos/builtin/packages/py-websocket-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWebsocketClient(PythonPackage): homepage = "https://github.com/websocket-client/websocket-client.git" pypi = "websocket-client/websocket-client-0.57.0.tar.gz" + license("Apache-2.0") + version("1.6.3", sha256="3aad25d31284266bcfcfd1fd8a743f63282305a364b8d0948a43bd606acc652f") version("1.5.1", sha256="3f09e6d8230892547132177f575a4e3e73cfdf06526e20cc02aa1c3b47184d40") version("1.4.1", sha256="f9611eb65c8241a67fb373bef040b3cf8ad377a9f6546a12b620b6511e8ea9ef") diff --git a/var/spack/repos/builtin/packages/py-websockets/package.py b/var/spack/repos/builtin/packages/py-websockets/package.py index 9c091ae24b4bd3..c820112eb517a8 100644 --- a/var/spack/repos/builtin/packages/py-websockets/package.py +++ b/var/spack/repos/builtin/packages/py-websockets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyWebsockets(PythonPackage): homepage = "https://github.com/aaugustin/websockets" pypi = "websockets/websockets-10.4.tar.gz" + license("BSD-3-Clause") + version("10.4", sha256="eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3") version("10.3", sha256="fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4") version("10.1", sha256="181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d") diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py index e4099e015156c5..a454e8b6b5c6f4 100644 --- a/var/spack/repos/builtin/packages/py-werkzeug/package.py +++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWerkzeug(PythonPackage): pypi = "werkzeug/werkzeug-3.0.0.tar.gz" git = "https://github.com/pallets/werkzeug.git" + license("BSD-3-Clause") + version("3.0.0", sha256="3ffff4dcc32db52ef3cc94dff3000a3c2846890f3a5a51800a27b909c5e770f0") version("2.3.7", sha256="2b8c0e447b4b9dbcc85dd97b6eeb4dcbaf6c8b6c3be0bd654e25553e0a2157d8") version("2.3.4", sha256="1d5a58e0377d1fe39d061a5de4469e414e78ccb1e1e59c0f5ad6fa1c36c52b76") diff --git a/var/spack/repos/builtin/packages/py-wesanderson/package.py b/var/spack/repos/builtin/packages/py-wesanderson/package.py index f5b0a5b64abef0..5ec1fe79931451 100644 --- a/var/spack/repos/builtin/packages/py-wesanderson/package.py +++ b/var/spack/repos/builtin/packages/py-wesanderson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-wget/package.py b/var/spack/repos/builtin/packages/py-wget/package.py index 4e6467f710b294..125a72ccc45947 100644 --- a/var/spack/repos/builtin/packages/py-wget/package.py +++ b/var/spack/repos/builtin/packages/py-wget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-whatshap/package.py b/var/spack/repos/builtin/packages/py-whatshap/package.py index a8c4eba62fdbbb..d2141255b8e0bb 100644 --- a/var/spack/repos/builtin/packages/py-whatshap/package.py +++ b/var/spack/repos/builtin/packages/py-whatshap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyWhatshap(PythonPackage): homepage = "https://whatshap.readthedocs.io/en/latest/" url = "https://bitbucket.org/whatshap/whatshap/get/v0.17.tar.gz" + license("MIT") + version("0.17", sha256="5f342cbd28f5d3e79490754f067aa67e8bb059da1c042d944b9f75663ef6b055") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py index 66192db3298d57..07798585efdfe4 100644 --- a/var/spack/repos/builtin/packages/py-wheel/package.py +++ b/var/spack/repos/builtin/packages/py-wheel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-whey-pth/package.py b/var/spack/repos/builtin/packages/py-whey-pth/package.py new file mode 100644 index 00000000000000..e81d5e7048cd73 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-whey-pth/package.py @@ -0,0 +1,24 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyWheyPth(PythonPackage): + """Extension to whey to support .pth files.""" + + homepage = "https://github.com/repo-helper/whey-pth" + pypi = "whey-pth/whey-pth-0.0.5.tar.gz" + + maintainers("LydDeb") + + license("MIT") + + version("0.0.5", sha256="cbfcc723bc587ecde44c6b0c83270673d38d88c3fc8f8268a49b21db1fd60747") + + depends_on("py-wheel@0.34.2:", type="build") + depends_on("py-setuptools@40.6.0:60,62:", type="build") + depends_on("py-dom-toml@0.4.0:", type=("build", "run")) + depends_on("py-whey@0.0.15:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-whey/package.py b/var/spack/repos/builtin/packages/py-whey/package.py index ac97b551b5c967..6503dc48950a92 100644 --- a/var/spack/repos/builtin/packages/py-whey/package.py +++ b/var/spack/repos/builtin/packages/py-whey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWhey(PythonPackage): homepage = "https://github.com/repo-helper/whey" pypi = "whey/whey-0.0.24.tar.gz" + license("MIT") + version("0.0.24", sha256="411905d85aa8aa239733818894e08dc20b682f0a3614f942aa35b430db568aa2") depends_on("py-wheel@0.34.2", type="build") diff --git a/var/spack/repos/builtin/packages/py-whichcraft/package.py b/var/spack/repos/builtin/packages/py-whichcraft/package.py index e60e9e480cb2bf..b9d316cfa15e29 100644 --- a/var/spack/repos/builtin/packages/py-whichcraft/package.py +++ b/var/spack/repos/builtin/packages/py-whichcraft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWhichcraft(PythonPackage): homepage = "https://github.com/pydanny/whichcraft" url = "https://github.com/pydanny/whichcraft/archive/0.4.1.tar.gz" + license("BSD-3-Clause") + version("0.4.1", sha256="66875022b3b9da8ddf7ab236c15670a782094550d07daeb51ceba4bc61b6b4aa") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-whoosh/package.py b/var/spack/repos/builtin/packages/py-whoosh/package.py index f02f37690804b0..97885931fa02ba 100644 --- a/var/spack/repos/builtin/packages/py-whoosh/package.py +++ b/var/spack/repos/builtin/packages/py-whoosh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWhoosh(PythonPackage): homepage = "https://whoosh.readthedocs.io" pypi = "Whoosh/Whoosh-2.7.4.tar.gz" + license("BSD-2-Clause-FreeBSD") + version("2.7.4", sha256="7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py index ee53aac4e7b5ca..ceaf5ba197be05 100644 --- a/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py +++ b/var/spack/repos/builtin/packages/py-widgetsnbextension/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyWidgetsnbextension(PythonPackage): pypi = "widgetsnbextension/widgetsnbextension-1.2.6.tar.gz" + license("BSD-3-Clause") + version("4.0.3", sha256="34824864c062b0b3030ad78210db5ae6a3960dfb61d5b27562d6631774de0286") version("3.6.0", sha256="e84a7a9fcb9baf3d57106e184a7389a8f8eb935bf741a5eb9d60aa18cc029a80") version("3.5.1", sha256="079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7") diff --git a/var/spack/repos/builtin/packages/py-win-unicode-console/package.py b/var/spack/repos/builtin/packages/py-win-unicode-console/package.py index f11b2c8860f986..3ef77e0db2bebe 100644 --- a/var/spack/repos/builtin/packages/py-win-unicode-console/package.py +++ b/var/spack/repos/builtin/packages/py-win-unicode-console/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-wincertstore/package.py b/var/spack/repos/builtin/packages/py-wincertstore/package.py index 6e693929018643..bd2f31482ea75d 100644 --- a/var/spack/repos/builtin/packages/py-wincertstore/package.py +++ b/var/spack/repos/builtin/packages/py-wincertstore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWincertstore(PythonPackage): homepage = "https://github.com/tiran/wincertstore" pypi = "wincertstore/wincertstore-0.2.zip" + license("PSF-2.0") + version("0.2", sha256="780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-word2number/package.py b/var/spack/repos/builtin/packages/py-word2number/package.py index 9a189140ef6893..897279906ce33e 100644 --- a/var/spack/repos/builtin/packages/py-word2number/package.py +++ b/var/spack/repos/builtin/packages/py-word2number/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyWord2number(PythonPackage): homepage = "https://w2n.readthedocs.io" pypi = "word2number/word2number-1.1.zip" + license("MIT") + version("1.1", sha256="70e27a5d387f67b04c71fbb7621c05930b19bfd26efd6851e6e0f9969dcde7d0") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-wordcloud/package.py b/var/spack/repos/builtin/packages/py-wordcloud/package.py index e2e6022bd66998..aba30c805eb395 100644 --- a/var/spack/repos/builtin/packages/py-wordcloud/package.py +++ b/var/spack/repos/builtin/packages/py-wordcloud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWordcloud(PythonPackage): homepage = "https://github.com/amueller/word_cloud" pypi = "wordcloud/wordcloud-1.8.1.tar.gz" + license("MIT") + version("1.8.1", sha256="e6ef771aac17c1cf8558c8d5ef025796184066d7b78f8118aefe011fb0d22952") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-workload-automation/package.py b/var/spack/repos/builtin/packages/py-workload-automation/package.py index 9eedc55b2b01e1..05ee82d1bc21ce 100644 --- a/var/spack/repos/builtin/packages/py-workload-automation/package.py +++ b/var/spack/repos/builtin/packages/py-workload-automation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWorkloadAutomation(PythonPackage): homepage = "https://github.com/ARM-software/workload-automation" url = "https://github.com/ARM-software/workload-automation/archive/v3.2.tar.gz" + license("Apache-2.0") + version("3.2", sha256="a3db9df6a9e0394231560ebe6ba491a513f6309e096eaed3db6f4cb924c393ea") version("3.1.4", sha256="217fc33a3739d011a086315ef86b90cf332c16d1b03c9dcd60d58c9fd1f37f98") version("3.1.3", sha256="152470808cf8dad8a833fd7b2cb7d77cf8aa5d1af404e37fa0a4ff3b07b925b2") diff --git a/var/spack/repos/builtin/packages/py-wradlib/package.py b/var/spack/repos/builtin/packages/py-wradlib/package.py index bf6434104a416b..2d4aae174638db 100644 --- a/var/spack/repos/builtin/packages/py-wradlib/package.py +++ b/var/spack/repos/builtin/packages/py-wradlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PyWradlib(PythonPackage): homepage = "https://docs.wradlib.org" pypi = "wradlib/wradlib-1.5.0.tar.gz" + license("MIT") + version("1.5.0", sha256="9bf0742d7235ea830e83c2269f6b5d1afd83d92696efce0a7bcdb0c4f6604784") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-wrapt/package.py b/var/spack/repos/builtin/packages/py-wrapt/package.py index 8c6266dffe5f32..4c22c0676fe375 100644 --- a/var/spack/repos/builtin/packages/py-wrapt/package.py +++ b/var/spack/repos/builtin/packages/py-wrapt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWrapt(PythonPackage): homepage = "https://github.com/GrahamDumpleton/wrapt" pypi = "wrapt/wrapt-1.11.2.tar.gz" + license("BSD-2-Clause") + version("1.15.0", sha256="d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a") version("1.14.1", sha256="380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d") version("1.13.3", sha256="1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185") diff --git a/var/spack/repos/builtin/packages/py-wsproto/package.py b/var/spack/repos/builtin/packages/py-wsproto/package.py index 06ad1378b63999..9b6dc999ed17c5 100644 --- a/var/spack/repos/builtin/packages/py-wsproto/package.py +++ b/var/spack/repos/builtin/packages/py-wsproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class PyWsproto(PythonPackage): homepage = "https://github.com/python-hyper/wsproto/" pypi = "wsproto/wsproto-1.0.0.tar.gz" + license("MIT") + version("1.0.0", sha256="868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38") depends_on("python@3.6.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-wstool/package.py b/var/spack/repos/builtin/packages/py-wstool/package.py index fe7898184b414c..ae61a502b20e18 100644 --- a/var/spack/repos/builtin/packages/py-wstool/package.py +++ b/var/spack/repos/builtin/packages/py-wstool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-wub/package.py b/var/spack/repos/builtin/packages/py-wub/package.py index 7c1ccb32b23b37..a0670c31b28a88 100644 --- a/var/spack/repos/builtin/packages/py-wub/package.py +++ b/var/spack/repos/builtin/packages/py-wub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyWub(PythonPackage): homepage = "https://github.com/nanoporetech/wub" url = "https://github.com/nanoporetech/wub/archive/v0.4.0.tar.gz" + license("MPL-2.0") + version("0.4.0", sha256="1526aa392bccac71b872211c45f5b403ad3d55f5762e0ed34ff9086bc1dab6fd") depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-wurlitzer/package.py b/var/spack/repos/builtin/packages/py-wurlitzer/package.py index 76e2b839978e82..ff7e1bc3fc586e 100644 --- a/var/spack/repos/builtin/packages/py-wurlitzer/package.py +++ b/var/spack/repos/builtin/packages/py-wurlitzer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyWurlitzer(PythonPackage): maintainers("sethrj") + license("MIT") + version("3.0.2", sha256="36051ac530ddb461a86b6227c4b09d95f30a1d1043de2b4a592e97ae8a84fcdf") depends_on("python+ctypes@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ww/package.py b/var/spack/repos/builtin/packages/py-ww/package.py index feebd577452d51..c46b753130fb83 100644 --- a/var/spack/repos/builtin/packages/py-ww/package.py +++ b/var/spack/repos/builtin/packages/py-ww/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWw(PythonPackage): homepage = "https://github.com/tygs/ww/" pypi = "ww/ww-0.2.1.tar.gz" + license("MIT") + version("0.2.1", sha256="3664f1f91bf927fe597ab153e8df73c8954927258b3737220efd1cb9912ebd7e") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-wxmplot/package.py b/var/spack/repos/builtin/packages/py-wxmplot/package.py index 79424f2cdd202c..aa484beba01ae6 100644 --- a/var/spack/repos/builtin/packages/py-wxmplot/package.py +++ b/var/spack/repos/builtin/packages/py-wxmplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyWxmplot(PythonPackage): homepage = "https://newville.github.io/wxmplot/" pypi = "wxmplot/wxmplot-0.9.38.tar.gz" + license("MIT") + version("0.9.38", sha256="82dc64abb42bdd03ec7067a3aa2a475001f2bc8e4772149bae47facf460c0081") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-wxpython/package.py b/var/spack/repos/builtin/packages/py-wxpython/package.py index 20f1ae8f814f2a..87d1e314ebfe2b 100644 --- a/var/spack/repos/builtin/packages/py-wxpython/package.py +++ b/var/spack/repos/builtin/packages/py-wxpython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-x21/package.py b/var/spack/repos/builtin/packages/py-x21/package.py index 01b4093df426f4..c4ad8c9c097551 100644 --- a/var/spack/repos/builtin/packages/py-x21/package.py +++ b/var/spack/repos/builtin/packages/py-x21/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,7 @@ class PyX21(PythonPackage): list_url = "https://pypi.org/simple/x21/" def url_for_version(self, version): - url = "https://pypi.io/packages/cp{1}/x/x21/x21-{0}-cp{1}-cp{1}{2}-{3}.whl" + url = "https://pypi.io/packages/cp{1}/x/x21/x21-{0}-cp{1}-cp{1}-{2}.whl" if sys.platform == "darwin": platform_string = "macosx_10_9_x86_64" @@ -24,19 +24,9 @@ def url_for_version(self, version): py_ver = Version(version.string.split("y")[1]) - return url.format( - version.string.split("-")[0], - py_ver.joined, - "m" if py_ver == Version("3.7") else "", - platform_string, - ) + return url.format(version.string.split("-")[0], py_ver.joined, platform_string) if sys.platform == "darwin": - version( - "0.2.6-py3.7", - sha256="7367b7c93fba520e70cc29731baec5b95e7be32d7615dad4f1f034cd21c194bd", - expand=False, - ) version( "0.2.6-py3.8", sha256="bbbfdb6b56562ecc81f0dc39e009713157011fbb50d47353eb25f633acf77204", @@ -53,11 +43,6 @@ def url_for_version(self, version): expand=False, ) elif sys.platform.startswith("linux"): - version( - "0.2.6-py3.7", - sha256="8b35248d0b049dd09985d1a45c6fa36dd39db2c9d805a96028ec3bf9dc80e0dd", - expand=False, - ) version( "0.2.6-py3.8", sha256="64275052bcda784395bc613f750b8b5a6b1ddbfa4e7a590cb8e209543f0ca0c4", @@ -74,7 +59,6 @@ def url_for_version(self, version): expand=False, ) - depends_on("python@3.7.0:3.7", type=("build", "run"), when="@0.2.6-py3.7") depends_on("python@3.8.0:3.8", type=("build", "run"), when="@0.2.6-py3.8") depends_on("python@3.9.0:3.9", type=("build", "run"), when="@0.2.6-py3.9") depends_on("python@3.10.0:3.10", type=("build", "run"), when="@0.2.6-py3.10") diff --git a/var/spack/repos/builtin/packages/py-xanadu-cloud-client/package.py b/var/spack/repos/builtin/packages/py-xanadu-cloud-client/package.py index 18b8ea2b062690..129c44ea228c78 100644 --- a/var/spack/repos/builtin/packages/py-xanadu-cloud-client/package.py +++ b/var/spack/repos/builtin/packages/py-xanadu-cloud-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyXanaduCloudClient(PythonPackage): homepage = "https://github.com/XanaduAI/xanadu-cloud-client" pypi = "xanadu-cloud-client/xanadu-cloud-client-0.3.0.tar.gz" + license("Apache-2.0") + version("0.3.0", sha256="ef65ab7a629e7cd801b20bca8d300d278bf0136c6157c49e12d52c9108171edf") depends_on("python@3.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-xarray/package.py b/var/spack/repos/builtin/packages/py-xarray/package.py index ceebb19ea3d7a9..e8cdc8dec62f74 100644 --- a/var/spack/repos/builtin/packages/py-xarray/package.py +++ b/var/spack/repos/builtin/packages/py-xarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class PyXarray(PythonPackage): "xarray.coding", ] + license("Apache-2.0") + version("2023.7.0", sha256="dace2fdbf1b7ff185d9c1226a24bf83c2ae52f3253dbfe80e17d1162600d055c") version("2022.3.0", sha256="398344bf7d170477aaceff70210e11ebd69af6b156fe13978054d25c48729440") version("0.18.2", sha256="5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284") diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py index e0759f6cb4229f..1ef69e00b28675 100644 --- a/var/spack/repos/builtin/packages/py-xattr/package.py +++ b/var/spack/repos/builtin/packages/py-xattr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,7 +16,10 @@ class PyXattr(PythonPackage): pypi = "xattr/xattr-0.9.6.tar.gz" git = "https://github.com/xattr/xattr" + license("MIT") + version("master", branch="master") + version("0.10.1", sha256="c12e7d81ffaa0605b3ac8c22c2994a8e18a9cf1c59287a1b7722a2289c952ec5") version("0.9.9", sha256="09cb7e1efb3aa1b4991d6be4eb25b73dc518b4fe894f0915f5b0dcede972f346") version("0.9.8", sha256="bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7") version("0.9.7", sha256="b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44") diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index 24bb927dca466d..bf898a117e451a 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xenv/package.py b/var/spack/repos/builtin/packages/py-xenv/package.py index a0c91622b1c509..fe7d40f8eaf3c2 100644 --- a/var/spack/repos/builtin/packages/py-xenv/package.py +++ b/var/spack/repos/builtin/packages/py-xenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyXenv(PythonPackage): pypi = "xenv/xenv-1.0.0.tar.gz" git = "https://gitlab.cern.ch/gaudi/xenv.git" + license("GPL-3.0-or-later") + version("develop", branch="master") version("1.0.0", sha256="cea9547295f0bd07c87e68353bb9eb1c2f2d1c09a840e3196c19cbc807ee4558") diff --git a/var/spack/repos/builtin/packages/py-xgboost/package.py b/var/spack/repos/builtin/packages/py-xgboost/package.py index 94ba14349065d0..2fa4b187ed61ab 100644 --- a/var/spack/repos/builtin/packages/py-xgboost/package.py +++ b/var/spack/repos/builtin/packages/py-xgboost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class PyXgboost(PythonPackage): maintainers("adamjstewart") import_modules = ["xgboost"] + license("Apache-2.0") + version("1.6.2", sha256="e1f5c91ba88cf8edb409d7fd2ca150dcd80b6f2115587d87365f0c10b2d4f009") version("1.6.1", sha256="24072028656f3428e7b8aabf77340ece057f273e41f7f85d67ccaefb7454bb18") version("1.5.2", sha256="404dc09dca887ef5a9bc0268f882c54b33bfc16ac365a859a11e7b24d49da387") diff --git a/var/spack/repos/builtin/packages/py-xlrd/package.py b/var/spack/repos/builtin/packages/py-xlrd/package.py index 5b19858e4f6151..4c2327b230ddb0 100644 --- a/var/spack/repos/builtin/packages/py-xlrd/package.py +++ b/var/spack/repos/builtin/packages/py-xlrd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py index 09c2285311cd76..7f3040adb0e01d 100644 --- a/var/spack/repos/builtin/packages/py-xlsxwriter/package.py +++ b/var/spack/repos/builtin/packages/py-xlsxwriter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyXlsxwriter(PythonPackage): pypi = "XlsxWriter/XlsxWriter-1.0.2.tar.gz" + license("BSD-2-Clause") + version("3.1.7", sha256="353042efb0f8551ce72baa087e98228f3394fcb380e8b96313edf1eec8d50823") version("3.0.3", sha256="e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f") version("1.4.3", sha256="641db6e7b4f4982fd407a3f372f45b878766098250d26963e95e50121168cbe2") diff --git a/var/spack/repos/builtin/packages/py-xlwt/package.py b/var/spack/repos/builtin/packages/py-xlwt/package.py index 208a7a9eb7a4fb..1ec26ff8c91045 100644 --- a/var/spack/repos/builtin/packages/py-xlwt/package.py +++ b/var/spack/repos/builtin/packages/py-xlwt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xmlplain/package.py b/var/spack/repos/builtin/packages/py-xmlplain/package.py new file mode 100644 index 00000000000000..d89daba89ba441 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-xmlplain/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyXmlplain(PythonPackage): + """XML as plain object module.""" + + homepage = "https://github.com/guillon/xmlplain" + pypi = "xmlplain/xmlplain-1.6.0.tar.gz" + + maintainers("LydDeb") + + license("Unlicense") + + version("1.6.0", sha256="a9ccfa8ab36e4df1b0580458312501b7ae7625bad3c4fcc1b8c124aad775d8e3") + + depends_on("py-setuptools", type="build") + depends_on("py-pyyaml", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-xmlrunner/package.py b/var/spack/repos/builtin/packages/py-xmlrunner/package.py index b03e5eb3bff1b7..01943b2d049e56 100644 --- a/var/spack/repos/builtin/packages/py-xmlrunner/package.py +++ b/var/spack/repos/builtin/packages/py-xmlrunner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xmltodict/package.py b/var/spack/repos/builtin/packages/py-xmltodict/package.py index 814631010befae..b0192b4a192f54 100644 --- a/var/spack/repos/builtin/packages/py-xmltodict/package.py +++ b/var/spack/repos/builtin/packages/py-xmltodict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyXmltodict(PythonPackage): homepage = "https://github.com/martinblech/xmltodict" pypi = "xmltodict/xmltodict-0.12.0.tar.gz" + license("MIT") + version("0.12.0", sha256="50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-xonsh/package.py b/var/spack/repos/builtin/packages/py-xonsh/package.py index 911c3d3bc893d1..fbc2350c21fdf2 100644 --- a/var/spack/repos/builtin/packages/py-xonsh/package.py +++ b/var/spack/repos/builtin/packages/py-xonsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index 2339dcfd25e8d3..9dedafb3b43094 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyXopen(PythonPackage): homepage = "https://github.com/pycompression/xopen" pypi = "xopen/xopen-0.1.1.tar.gz" + license("MIT") + version("1.6.0", sha256="72219a4d690e9c90ad445c45d2119ae2a6d5d38912255631e227aceac6294353") version("1.1.0", sha256="38277eb96313b2e8822e19e793791801a1f41bf13ee5b48616a97afc65e9adb3") version("1.0.1", sha256="79d7e425fb0930b0153eb6beba9a540ca3e07ac254ca828577ad2e8fa24105dc") diff --git a/var/spack/repos/builtin/packages/py-xpyb/package.py b/var/spack/repos/builtin/packages/py-xpyb/package.py index cddb649e02ff8a..27afdad8d92387 100644 --- a/var/spack/repos/builtin/packages/py-xpyb/package.py +++ b/var/spack/repos/builtin/packages/py-xpyb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py b/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py index 5a9562aa5e1993..fe82333f2d02f1 100644 --- a/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py +++ b/var/spack/repos/builtin/packages/py-xrootdpyfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-xtb/package.py b/var/spack/repos/builtin/packages/py-xtb/package.py index d3487e96837085..589e45aa853450 100644 --- a/var/spack/repos/builtin/packages/py-xtb/package.py +++ b/var/spack/repos/builtin/packages/py-xtb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyXtb(PythonPackage): maintainers("awvwgk") + license("LGPL-3.0-or-later") + version("22.1", sha256="7a59e7b783fc6e8b7328f55211de681e535a83991b07c4bab73494063f5e9018") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py index 0a285d2524aeae..933d0cea96c710 100644 --- a/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py +++ b/var/spack/repos/builtin/packages/py-xvfbwrapper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyXvfbwrapper(PythonPackage): pypi = "xvfbwrapper/xvfbwrapper-0.2.9.tar.gz" + license("MIT") + version("0.2.9", sha256="bcf4ae571941b40254faf7a73432dfc119ad21ce688f1fdec533067037ecfc24") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-xxhash/package.py b/var/spack/repos/builtin/packages/py-xxhash/package.py index 27db10b63e994b..6b2110d85deed0 100644 --- a/var/spack/repos/builtin/packages/py-xxhash/package.py +++ b/var/spack/repos/builtin/packages/py-xxhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyXxhash(PythonPackage): homepage = "https://github.com/ifduyue/python-xxhash" pypi = "xxhash/xxhash-2.0.2.tar.gz" + license("BSD-2-Clause") + version("3.2.0", sha256="1afd47af8955c5db730f630ad53ae798cf7fae0acb64cebb3cf94d35c47dd088") version("2.0.2", sha256="b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49") diff --git a/var/spack/repos/builtin/packages/py-xyzservices/package.py b/var/spack/repos/builtin/packages/py-xyzservices/package.py new file mode 100644 index 00000000000000..87b59f4682299b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-xyzservices/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class 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") diff --git a/var/spack/repos/builtin/packages/py-yacman/package.py b/var/spack/repos/builtin/packages/py-yacman/package.py index 9787799f1c4aac..8777777f45a70d 100644 --- a/var/spack/repos/builtin/packages/py-yacman/package.py +++ b/var/spack/repos/builtin/packages/py-yacman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyYacman(PythonPackage): homepage = "https://github.com/databio/yacman" pypi = "yacman/yacman-0.8.4.tar.gz" + license("BSD-2-Clause") + version("0.8.4", sha256="807972d7f9251f71401fc4ff6c01734ccdad1f92cefd1fd251336a2a094608bd") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-yacs/package.py b/var/spack/repos/builtin/packages/py-yacs/package.py index eb947f79f7100b..ff61b9f1d7e617 100644 --- a/var/spack/repos/builtin/packages/py-yacs/package.py +++ b/var/spack/repos/builtin/packages/py-yacs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-yahmm/package.py b/var/spack/repos/builtin/packages/py-yahmm/package.py index cddec0b205a998..01eb435f18c6ab 100644 --- a/var/spack/repos/builtin/packages/py-yahmm/package.py +++ b/var/spack/repos/builtin/packages/py-yahmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyYahmm(PythonPackage): pypi = "yahmm/yahmm-1.1.3.zip" + license("MIT") + version("1.1.3", sha256="fe3614ef96da9410468976756fb93dc8235485242c05df01d8e5ed356a7dfb43") version("1.1.2", sha256="5e81077323dc6da9fb792169b639f29e5293b0c8272e4c22b204ca95ac0df90a") diff --git a/var/spack/repos/builtin/packages/py-yajl/package.py b/var/spack/repos/builtin/packages/py-yajl/package.py index 342927ac9600ab..6eae1130195731 100644 --- a/var/spack/repos/builtin/packages/py-yajl/package.py +++ b/var/spack/repos/builtin/packages/py-yajl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-yamlreader/package.py b/var/spack/repos/builtin/packages/py-yamlreader/package.py index 734c6ebf76c6ed..9d3957ab7a7a64 100644 --- a/var/spack/repos/builtin/packages/py-yamlreader/package.py +++ b/var/spack/repos/builtin/packages/py-yamlreader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-yapf/package.py b/var/spack/repos/builtin/packages/py-yapf/package.py index 62aae6f1168616..b6bed4a29dc58a 100644 --- a/var/spack/repos/builtin/packages/py-yapf/package.py +++ b/var/spack/repos/builtin/packages/py-yapf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyYapf(PythonPackage): # base https://pypi.python.org/pypi/cffi url = "https://github.com/google/yapf/archive/v0.2.1.tar.gz" + license("Apache-2.0") + version("0.30.0", sha256="9f561af26f8d27c3a334d3d2ee8947b8826a86691087e447ce483512d834682c") version("0.29.0", sha256="f4bc9924de51d30da0241503d56e9e26a1a583bc58b3a13b2c450c4d16c9920d") version("0.2.1", sha256="13158055acd8e3c2f3a577528051a1c5057237f699150211a86fb405c4ea3936") diff --git a/var/spack/repos/builtin/packages/py-yarl/package.py b/var/spack/repos/builtin/packages/py-yarl/package.py index bad47e340bfad6..27df06fa84bf97 100644 --- a/var/spack/repos/builtin/packages/py-yarl/package.py +++ b/var/spack/repos/builtin/packages/py-yarl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyYarl(PythonPackage): homepage = "https://github.com/aio-libs/yarl" pypi = "yarl/yarl-1.4.2.tar.gz" + license("Apache-2.0") + version("1.9.2", sha256="04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571") version("1.8.1", sha256="af887845b8c2e060eb5605ff72b6f2dd2aab7a761379373fd89d314f4752abbf") version("1.7.2", sha256="45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd") diff --git a/var/spack/repos/builtin/packages/py-yaspin/package.py b/var/spack/repos/builtin/packages/py-yaspin/package.py index b286e7d536b493..561db1cd0bb708 100644 --- a/var/spack/repos/builtin/packages/py-yaspin/package.py +++ b/var/spack/repos/builtin/packages/py-yaspin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyYaspin(PythonPackage): homepage = "https://github.com/pavdmyt/yaspin" pypi = "yaspin/yaspin-2.1.0.tar.gz" + license("MIT") + version("2.1.0", sha256="c8d34eca9fda3f4dfbe59f57f3cf0f3641af3eefbf1544fbeb9b3bacf82c580a") depends_on("python@3.6.2:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-yolk3k/package.py b/var/spack/repos/builtin/packages/py-yolk3k/package.py index a90d1504190b65..dc04496d8d2677 100644 --- a/var/spack/repos/builtin/packages/py-yolk3k/package.py +++ b/var/spack/repos/builtin/packages/py-yolk3k/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyYolk3k(PythonPackage): homepage = "https://github.com/myint/yolk" pypi = "yolk3k/yolk3k-0.9.tar.gz" + license("BSD-3-Clause") + version("0.9", sha256="cf8731dd0a9f7ef50b5dc253fe0174383e3fed295a653672aa918c059eef86ae") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-youtube-dl/package.py b/var/spack/repos/builtin/packages/py-youtube-dl/package.py index 98acd402ab37c7..a636319179a372 100644 --- a/var/spack/repos/builtin/packages/py-youtube-dl/package.py +++ b/var/spack/repos/builtin/packages/py-youtube-dl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyYoutubeDl(PythonPackage): homepage = "https://github.com/ytdl-org/youtube-dl" pypi = "youtube_dl/youtube_dl-2020.3.24.tar.gz" + license("Unlicense") + version( "2021.12.17", sha256="bc59e86c5d15d887ac590454511f08ce2c47698d5a82c27bfe27b5d814bbaed2" ) diff --git a/var/spack/repos/builtin/packages/py-yq/package.py b/var/spack/repos/builtin/packages/py-yq/package.py index 54b9a5c7df8f08..b4cec8b8f8649d 100644 --- a/var/spack/repos/builtin/packages/py-yq/package.py +++ b/var/spack/repos/builtin/packages/py-yq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyYq(PythonPackage): maintainers("qwertos") + license("Apache-2.0") + version("2.12.2", sha256="2f156d0724b61487ac8752ed4eaa702a5737b804d5afa46fa55866951cd106d2") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 12479dd4efe3fb..183362dfe365d2 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class PyYt(PythonPackage): maintainers("charmoniumq") + license("BSD-3-Clause") + version("4.1.2", sha256="0ae03288b067721baad14c016f253dc791cd444a1f2dd5d804cf91da622a0c76") version("3.6.1", sha256="be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0") version("3.6.0", sha256="effb00536f19fd2bdc18f67dacd5550b82066a6adce5b928f27a01d7505109ec") diff --git a/var/spack/repos/builtin/packages/py-yte/package.py b/var/spack/repos/builtin/packages/py-yte/package.py index cca5d151b84e28..119a90fbcf25b1 100644 --- a/var/spack/repos/builtin/packages/py-yte/package.py +++ b/var/spack/repos/builtin/packages/py-yte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class PyYte(PythonPackage): maintainers("charmoniumQ") + license("MIT") + version("1.5.1", sha256="6d0b315b78af83276d78f5f67c107c84238f772a76d74f4fc77905b46f3731f5") # https://github.com/yte-template-engine/yte/blob/v1.5.1/pyproject.toml#L12 diff --git a/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py b/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py index a0ac8d9c22a32a..eefccd11079ad6 100644 --- a/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py +++ b/var/spack/repos/builtin/packages/py-ytopt-autotune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyYtoptAutotune(PythonPackage): url = "https://github.com/ytopt-team/autotune/archive/refs/tags/v1.1.0.tar.gz" git = "https://github.com/ytopt-team/autotune.git" + license("BSD-2-Clause") + version("master", branch="master") version("1.1.0", sha256="5ee7fa6a1c83131c5ceba1537b25f00de84182e4d0e6ebd0fd6efa4e8aee1bc4") version("1.0.0", sha256="13f10594156a7a220561467fdbee52173238ea82c07e8188fdf6584d4524f46f") diff --git a/var/spack/repos/builtin/packages/py-ytopt/package.py b/var/spack/repos/builtin/packages/py-ytopt/package.py index f9ce2c090f4ad1..b4431367936271 100644 --- a/var/spack/repos/builtin/packages/py-ytopt/package.py +++ b/var/spack/repos/builtin/packages/py-ytopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyYtopt(PythonPackage): homepage = "https://github.com/ytopt-team/ytopt" url = "https://github.com/ytopt-team/ytopt/archive/refs/tags/v0.0.1.tar.gz" + license("BSD-2-Clause") + version("0.0.4", sha256="4e47315b658f1943f756816455ae491818c37b0f700dd895a97fb7792bb49e35") version("0.0.3", sha256="eac6ab87d4fd27517f136880016359c5b24836ec009e8cc9b4073a6c5edb17af") version("0.0.2", sha256="5a624aa678b976ff6ef867610bafcb0dfd5c8af0d880138ca5d56d3f776e6d71") diff --git a/var/spack/repos/builtin/packages/py-z3-solver/package.py b/var/spack/repos/builtin/packages/py-z3-solver/package.py new file mode 100644 index 00000000000000..bbd74462c35582 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-z3-solver/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class PyZ3Solver(PythonPackage): + """Z3 is a theorem prover from Microsoft Research. It is licensed under the MIT license.""" + + homepage = "https://github.com/Z3Prover/z3" + pypi = "z3-solver/z3-solver-4.12.3.0.tar.gz" + + license("MIT") + + version("4.12.3.0", sha256="b6719daf9676711a8f1c708af0ea185578b0f22a3cb9bf9a55735e21691dc38d") + + depends_on("py-setuptools@46.4:", type="build") + depends_on("cmake", type="build") diff --git a/var/spack/repos/builtin/packages/py-zarr/package.py b/var/spack/repos/builtin/packages/py-zarr/package.py index 35b57a2ce563ef..669a5b53c22d50 100644 --- a/var/spack/repos/builtin/packages/py-zarr/package.py +++ b/var/spack/repos/builtin/packages/py-zarr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class PyZarr(PythonPackage): homepage = "https://zarr.readthedocs.io" pypi = "zarr/zarr-2.3.2.tar.gz" + license("MIT") + version("2.10.2", sha256="5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2") version("2.6.1", sha256="fa7eac1e4ff47ff82d09c42bb4679e18e8a05a73ee81ce59cee6a441a210b2fd") version("2.5.0", sha256="d54f060739208392494c3dbcbfdf41c8df9fa23d9a32b91aea0549b4c5e2b77f") diff --git a/var/spack/repos/builtin/packages/py-zc-buildout/package.py b/var/spack/repos/builtin/packages/py-zc-buildout/package.py index 542c62a4c00bd8..89332bb752d63f 100644 --- a/var/spack/repos/builtin/packages/py-zc-buildout/package.py +++ b/var/spack/repos/builtin/packages/py-zc-buildout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyZcBuildout(PythonPackage): pypi = "zc.buildout/zc.buildout-2.13.1.tar.gz" + license("ZPL-2.1") + version("2.13.1", sha256="3d14d07226963a517295dfad5879d2799e2e3b65b2c61c71b53cb80f5ab11484") depends_on("py-setuptools@8.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-zc-lockfile/package.py b/var/spack/repos/builtin/packages/py-zc-lockfile/package.py index 24c12d4463e075..4a65c348b399d0 100644 --- a/var/spack/repos/builtin/packages/py-zc-lockfile/package.py +++ b/var/spack/repos/builtin/packages/py-zc-lockfile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class PyZcLockfile(PythonPackage): pypi = "zc.lockfile/zc.lockfile-1.4.tar.gz" + license("ZPL-2.1") + version("1.4", sha256="95a8e3846937ab2991b61703d6e0251d5abb9604e18412e2714e1b90db173253") depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-zict/package.py b/var/spack/repos/builtin/packages/py-zict/package.py index b6ee6d5fb74aa2..ce22e8757f18de 100644 --- a/var/spack/repos/builtin/packages/py-zict/package.py +++ b/var/spack/repos/builtin/packages/py-zict/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyZict(PythonPackage): homepage = "https://zict.readthedocs.io/en/latest/" pypi = "zict/zict-1.0.0.tar.gz" + license("BSD-3-Clause") + version("3.0.0", sha256="e321e263b6a97aafc0790c3cfb3c04656b7066e6738c37fffcca95d803c9fba5") version("1.0.0", sha256="e34dd25ea97def518fb4c77f2c27078f3a7d6c965b0a3ac8fe5bdb0a8011a310") diff --git a/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py b/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py index 502c1eda9eba01..fdeb2965dc8cac 100644 --- a/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py +++ b/var/spack/repos/builtin/packages/py-zipfile-deflate64/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyZipfileDeflate64(PythonPackage): homepage = "https://github.com/brianhelba/zipfile-deflate64" pypi = "zipfile-deflate64/zipfile-deflate64-0.2.0.tar.gz" + license("Apache-2.0") + version("0.2.0", sha256="875a3299de102edf1c17f8cafcc528b1ca80b62dc4814b9cb56867ec59fbfd18") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-zipp/package.py b/var/spack/repos/builtin/packages/py-zipp/package.py index 113506c3ea03c5..200e9de075236b 100644 --- a/var/spack/repos/builtin/packages/py-zipp/package.py +++ b/var/spack/repos/builtin/packages/py-zipp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyZipp(PythonPackage): homepage = "https://github.com/jaraco/zipp" pypi = "zipp/zipp-0.6.0.tar.gz" + license("MIT") + version("3.17.0", sha256="84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0") version("3.8.1", sha256="05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2") version("3.6.0", sha256="71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832") diff --git a/var/spack/repos/builtin/packages/py-zipstream-new/package.py b/var/spack/repos/builtin/packages/py-zipstream-new/package.py index e93d8d1dc27622..21981578f6e221 100644 --- a/var/spack/repos/builtin/packages/py-zipstream-new/package.py +++ b/var/spack/repos/builtin/packages/py-zipstream-new/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/py-zope-event/package.py b/var/spack/repos/builtin/packages/py-zope-event/package.py index 814be5490f8711..deec70d19eb508 100644 --- a/var/spack/repos/builtin/packages/py-zope-event/package.py +++ b/var/spack/repos/builtin/packages/py-zope-event/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class PyZopeEvent(PythonPackage): homepage = "https://github.com/zopefoundation/zope.event" pypi = "zope.event/zope.event-4.3.0.tar.gz" + license("ZPL-2.1") + version("4.6", sha256="81d98813046fc86cc4136e3698fee628a3282f9c320db18658c21749235fce80") version("4.5.0", sha256="5e76517f5b9b119acf37ca8819781db6c16ea433f7e2062c4afc2b6fbedb1330") version("4.3.0", sha256="e0ecea24247a837c71c106b0341a7a997e3653da820d21ef6c08b32548f733e7") diff --git a/var/spack/repos/builtin/packages/py-zope-interface/package.py b/var/spack/repos/builtin/packages/py-zope-interface/package.py index 2a30b50410860d..5ac69637f1164d 100644 --- a/var/spack/repos/builtin/packages/py-zope-interface/package.py +++ b/var/spack/repos/builtin/packages/py-zope-interface/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyZopeInterface(PythonPackage): homepage = "https://github.com/zopefoundation/zope.interface" pypi = "zope.interface/zope.interface-4.5.0.tar.gz" + license("ZPL-2.1") + version("5.4.0", sha256="5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e") version("5.1.0", sha256="40e4c42bd27ed3c11b2c983fecfb03356fae1209de10686d03c02c8696a1d90e") version("4.5.0", sha256="57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c") diff --git a/var/spack/repos/builtin/packages/py-zxcvbn/package.py b/var/spack/repos/builtin/packages/py-zxcvbn/package.py index 3a0379ef1dd350..bcc5ab9de31e3b 100644 --- a/var/spack/repos/builtin/packages/py-zxcvbn/package.py +++ b/var/spack/repos/builtin/packages/py-zxcvbn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class PyZxcvbn(PythonPackage): homepage = "https://github.com/dwolfhub/zxcvbn-python" url = "https://github.com/dwolfhub/zxcvbn-python/archive/v4.4.25.tar.gz" + license("MIT") + version("4.4.28", sha256="b7275765acdf8028c21aa502d742e56de2252bac604c04ba5e336c39f88d5576") version("4.4.27", sha256="9b84927fff7b4cc557b63a49adbd74f7a92026e25edd9e1b2867c1610d15fa5d") version("4.4.26", sha256="ee498e9257742972950f33540f0e36112db14c636417ce5b53d99a492dad8aba") diff --git a/var/spack/repos/builtin/packages/pygmo/package.py b/var/spack/repos/builtin/packages/pygmo/package.py index 03f91cd247c8c5..31095ec8db9f91 100644 --- a/var/spack/repos/builtin/packages/pygmo/package.py +++ b/var/spack/repos/builtin/packages/pygmo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Pygmo(CMakePackage): url = "https://github.com/esa/pygmo2/archive/v2.18.0.tar.gz" git = "https://github.com/esa/pygmo2.git" + license("MPL-2.0") + version("master", branch="master") version("2.18.0", sha256="9f081cc973297894af09f713f889870ac452bfb32b471f9f7ba08a5e0bb9a125") diff --git a/var/spack/repos/builtin/packages/pypy-bootstrap/package.py b/var/spack/repos/builtin/packages/pypy-bootstrap/package.py index be10d920acec98..9917ff34c33dad 100644 --- a/var/spack/repos/builtin/packages/pypy-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/pypy-bootstrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class PypyBootstrap(Package): maintainers("adamjstewart") + license("MIT") + if platform.system() == "Linux": if platform.machine() == "x86_64": version( diff --git a/var/spack/repos/builtin/packages/pypy/package.py b/var/spack/repos/builtin/packages/pypy/package.py index 3f1ec58764a62b..b44516b870ebe8 100644 --- a/var/spack/repos/builtin/packages/pypy/package.py +++ b/var/spack/repos/builtin/packages/pypy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Pypy(Package): maintainers("adamjstewart") + license("MIT") + version( "3.10-v7.3.12", sha256="86e4e4eacc36046c6182f43018796537fe33a60e1d2a2cc6b8e7f91a5dcb3e42" ) diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py index 497f9266737769..e1b923f783f33f 100644 --- a/var/spack/repos/builtin/packages/pythia6/package.py +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/pythia8/package.py b/var/spack/repos/builtin/packages/pythia8/package.py index f7ef4ad30bdf5d..b1a69b0ecfd4c6 100644 --- a/var/spack/repos/builtin/packages/pythia8/package.py +++ b/var/spack/repos/builtin/packages/pythia8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,9 @@ class Pythia8(AutotoolsPackage): maintainers("ChristianTackeGSI") + license("GPL-2.0-only") + + version("8.310", sha256="90c811abe7a3d2ffdbf9b4aeab51cf6e0a5a8befb4e3efa806f3d5b9c311e227") version("8.309", sha256="5bdafd9f2c4a1c47fd8a4e82fb9f0d8fcfba4de1003b8e14be4e0347436d6c33") version("8.308", sha256="c2e8c8d38136d85fc0bc9c9fad4c2db679b0819b7d2b6fc9a47f80f99538b4e3") version("8.307", sha256="e5b14d44aa5943332e32dd5dda9a18fdd1a0085c7198e28d840e04167fa6013d") diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 73a5043ffbd5d6..63cb5afaaad7bb 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,7 +30,7 @@ class Python(Package): url = "https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tgz" list_url = "https://www.python.org/ftp/python/" list_depth = 1 - tags = ["windows"] + tags = ["windows", "build-tools"] maintainers("adamjstewart", "skosukhin", "scheibelp") @@ -40,6 +40,8 @@ class Python(Package): install_targets = ["install"] build_targets: List[str] = [] + license("0BSD") + version("3.12.0", sha256="51412956d24a1ef7c97f1cb5f70e185c13e3de1f50d131c0aac6338080687afb") version( "3.11.6", @@ -237,6 +239,7 @@ class Python(Package): variant("crypt", default=True, description="Build crypt module", when="@:3.12 platform=cray") if sys.platform != "win32": + depends_on("gmake", type="build") depends_on("pkgconfig@0.9.0:", type="build") depends_on("gettext +libxml2", when="+libxml2") depends_on("gettext ~libxml2", when="~libxml2") @@ -1267,11 +1270,6 @@ def setup_dependent_package(self, module, dependent_spec): module.python_platlib = join_path(dependent_spec.prefix, self.platlib) module.python_purelib = join_path(dependent_spec.prefix, self.purelib) - # Make the site packages directory for extensions - if dependent_spec.package.is_extension: - mkdirp(module.python_platlib) - mkdirp(module.python_purelib) - def add_files_to_view(self, view, merge_map, skip_if_exists=True): bin_dir = self.spec.prefix.bin if sys.platform != "win32" else self.spec.prefix for src, dst in merge_map.items(): diff --git a/var/spack/repos/builtin/packages/q-e-sirius/package.py b/var/spack/repos/builtin/packages/q-e-sirius/package.py index 1605e4e37d5703..3aee3e101bacc1 100644 --- a/var/spack/repos/builtin/packages/q-e-sirius/package.py +++ b/var/spack/repos/builtin/packages/q-e-sirius/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class QESirius(CMakePackage): maintainers("simonpintarelli") + license("GPL-2.0-or-later") + version("develop-ristretto", branch="ristretto", preferred=True, submodules=True) version( "6.7-rc1-sirius", diff --git a/var/spack/repos/builtin/packages/qb3/package.py b/var/spack/repos/builtin/packages/qb3/package.py index a789d7fe928616..312ad238cd3573 100644 --- a/var/spack/repos/builtin/packages/qb3/package.py +++ b/var/spack/repos/builtin/packages/qb3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Qb3(CMakePackage): homepage = "https://github.com/lucianpls/QB3" git = "https://github.com/lucianpls/QB3.git" + license("Apache-2.0") + version("master", branch="master") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/qbank/package.py b/var/spack/repos/builtin/packages/qbank/package.py index b3af1bb6b76eaa..039be130bb4479 100644 --- a/var/spack/repos/builtin/packages/qbank/package.py +++ b/var/spack/repos/builtin/packages/qbank/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qca/package.py b/var/spack/repos/builtin/packages/qca/package.py index 302416ce94e3fa..1313a3558b109e 100644 --- a/var/spack/repos/builtin/packages/qca/package.py +++ b/var/spack/repos/builtin/packages/qca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Qca(CMakePackage): homepage = "https://userbase.kde.org/QCA" url = "https://github.com/KDE/qca/archive/v2.1.3.tar.gz" + license("LGPL-2.1-or-later") + version("2.3.5", sha256="326346893c5ad41c160b66ff10740ff4d8a1cbcd2fe545693f9791de1e01f00b") version("2.3.0", sha256="39aa18f0985d82949f4dccce04af3eb8d4b6b64e0c71785786738d38d8183b0a") version("2.2.90", sha256="074ac753b51a6fa15503be9418f7430effe368fd31dc41567942d832e539b17e") diff --git a/var/spack/repos/builtin/packages/qcachegrind/package.py b/var/spack/repos/builtin/packages/qcachegrind/package.py index 359a46859ece84..5328f8dc2f92a4 100644 --- a/var/spack/repos/builtin/packages/qcachegrind/package.py +++ b/var/spack/repos/builtin/packages/qcachegrind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Qcachegrind(QMakePackage): homepage = "https://github.com/KDE/kcachegrind" url = "https://github.com/KDE/kcachegrind/archive/v20.08.0.tar.gz" + license("GFDL-1.2-only") + version("20.12.2", sha256="935cf6665fac274f84af84d0a30cc2fdf27d437234b9accbf8ec0a5dba6ad867") version("20.08.0", sha256="ffb50a7c536042ff11eed714b359b8bc419cb12402a31ebe78c3d06363f234e6") diff --git a/var/spack/repos/builtin/packages/qcat/package.py b/var/spack/repos/builtin/packages/qcat/package.py index 9c0d4263afd8da..a6ebd8ae4b8751 100644 --- a/var/spack/repos/builtin/packages/qcat/package.py +++ b/var/spack/repos/builtin/packages/qcat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Qcat(CMakePackage): maintainers("disheng222", "robertu94") + license("BSD-2-Clause") + version("master", branch="master") version("1.4", commit="f16032cf237837b1d32dde0c3daa6ad1ca4a912f") diff --git a/var/spack/repos/builtin/packages/qd/package.py b/var/spack/repos/builtin/packages/qd/package.py index 9a5c90a74bbd8b..aaa6fd1b343684 100644 --- a/var/spack/repos/builtin/packages/qd/package.py +++ b/var/spack/repos/builtin/packages/qd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Qd(AutotoolsPackage): tags = ["hep"] + license("BSD-3-Clause-LBNL") + version("2.3.13", commit="a57dde96b3255b80f7f39cd80217c213bf78d949") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/qemu/package.py b/var/spack/repos/builtin/packages/qemu/package.py index cdfebd868d9871..e5fdd5fd107838 100644 --- a/var/spack/repos/builtin/packages/qemu/package.py +++ b/var/spack/repos/builtin/packages/qemu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class Qemu(AutotoolsPackage): maintainers("anderbubble") + # Docs say TCG is "under a BSD license" but all the headers for TCG have the MIT license. + license("GPL-2.0-only AND LGPL-2.1-only AND MIT", checked_by="tgamblin") + version("4.1.1", sha256="ed6fdbbdd272611446ff8036991e9b9f04a2ab2e3ffa9e79f3bab0eb9a95a1d2") version("4.1.0", sha256="656e60218689bdeec69903087fd7582d5d3e72238d02f4481d8dc6d79fd909c6") version("4.0.1", sha256="f2674dd6053ef1d48593aa1f0a50c5ac9039f7a059ecb6f9b8307f3fb2fcedad") diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 8daf503c98b4c7..7ea73f28fe8919 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Qgis(CMakePackage): maintainers("adamjstewart", "Sinan81") + license("GPL-2.0-or-later") + version("3.34.0", sha256="348a2df4c4520813a319b7f72546b3823e044cacd28646ba189b56a49c7d1b5f") # Prefer latest long term release version( diff --git a/var/spack/repos/builtin/packages/qgraf/package.py b/var/spack/repos/builtin/packages/qgraf/package.py index 7ef64184a90204..722d97b8fa0de1 100644 --- a/var/spack/repos/builtin/packages/qgraf/package.py +++ b/var/spack/repos/builtin/packages/qgraf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qhull/package.py b/var/spack/repos/builtin/packages/qhull/package.py index 3d4f8cd30d6466..c612e8e8163915 100644 --- a/var/spack/repos/builtin/packages/qhull/package.py +++ b/var/spack/repos/builtin/packages/qhull/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Qhull(CMakePackage): homepage = "http://www.qhull.org" url = "https://github.com/qhull/qhull/archive/refs/tags/2020.2.tar.gz" + license("custom") + version("2020.2", sha256="59356b229b768e6e2b09a701448bfa222c37b797a84f87f864f97462d8dbc7c5") version("2020.1", sha256="0258bbf5de447e3d6b3968c5a7b51c08ca5d98f11f94f86621ed3e7c98365b8d") version("2019.1", sha256="cf7235b76244595a86b9407b906e3259502b744528318f2178155e5899d6cf9f") diff --git a/var/spack/repos/builtin/packages/qjson/package.py b/var/spack/repos/builtin/packages/qjson/package.py index 50824207d1fffa..15605094e8c734 100644 --- a/var/spack/repos/builtin/packages/qjson/package.py +++ b/var/spack/repos/builtin/packages/qjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Qjson(CMakePackage): homepage = "http://qjson.sourceforge.net/" url = "https://github.com/flavio/qjson/archive/0.9.0.tar.gz" + license("LGPL-2.1-or-later") + version("0.9.0", sha256="e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4") depends_on("qt") diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 99612cedf9650b..33e1580946fe2d 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Qmcpack(CMakePackage, CudaPackage): maintainers("ye-luo") tags = ["ecp", "ecp-apps"] + license("CC0-1.0") + # This download method is untrusted, and is not recommended by the # Spack manual. However, it is easier to maintain because github hashes # can occasionally change. @@ -389,7 +391,6 @@ def cmake_args(self): else: args.append("-DBUILD_PPCONVERT=0") - args.append(self.define("Python3_EXECUTABLE", self.spec["python"].command.path)) return args # QMCPACK needs custom install method for the following reason: diff --git a/var/spack/repos/builtin/packages/qmd-progress/package.py b/var/spack/repos/builtin/packages/qmd-progress/package.py index e52a247d68cb7b..f3b0580d581770 100644 --- a/var/spack/repos/builtin/packages/qmd-progress/package.py +++ b/var/spack/repos/builtin/packages/qmd-progress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qnnpack/package.py b/var/spack/repos/builtin/packages/qnnpack/package.py index e6419599197d5c..8acd47432103f4 100644 --- a/var/spack/repos/builtin/packages/qnnpack/package.py +++ b/var/spack/repos/builtin/packages/qnnpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Qnnpack(CMakePackage): homepage = "https://github.com/pytorch/QNNPACK" git = "https://github.com/pytorch/QNNPACK.git" + license("BSD-3-Clause") + version("master", branch="master") version("2019-08-28", commit="7d2a4e9931a82adc3814275b6219a03e24e36b4c") # py-torch@1.3:1.9 version("2018-12-27", commit="6c62fddc6d15602be27e9e4cbb9e985151d2fa82") # py-torch@1.2 diff --git a/var/spack/repos/builtin/packages/qorts/package.py b/var/spack/repos/builtin/packages/qorts/package.py index 26342962c0069a..075010decae5ee 100644 --- a/var/spack/repos/builtin/packages/qorts/package.py +++ b/var/spack/repos/builtin/packages/qorts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qoz/package.py b/var/spack/repos/builtin/packages/qoz/package.py index 51aade5fdd5f1b..2cf3db6dcbf5b9 100644 --- a/var/spack/repos/builtin/packages/qoz/package.py +++ b/var/spack/repos/builtin/packages/qoz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qperf/package.py b/var/spack/repos/builtin/packages/qperf/package.py index 9f66e4fc10461d..eb4344129828d4 100644 --- a/var/spack/repos/builtin/packages/qperf/package.py +++ b/var/spack/repos/builtin/packages/qperf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Qperf(AutotoolsPackage): homepage = "https://github.com/linux-rdma/qperf" url = "https://github.com/linux-rdma/qperf/archive/v0.4.10.tar.gz" + license("GPL-2.0") + version("0.4.11", sha256="b0ef2ffe050607566d06102b4ef6268aad08fdc52898620d429096e7b0767e75") version("0.4.10", sha256="94e26725b4f962eacca36d8ef48cd1fb5043721ac82c3f44018319e47a96cf6b") diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py index d0554cb26f8289..bdb85917bafe23 100644 --- a/var/spack/repos/builtin/packages/qrupdate/package.py +++ b/var/spack/repos/builtin/packages/qrupdate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Qrupdate(MakefilePackage, SourceforgePackage): homepage = "https://sourceforge.net/projects/qrupdate/" sourceforge_mirror_path = "qrupdate/qrupdate-1.1.2.tar.gz" + license("GPL-3.0-only") + version("1.1.2", sha256="e2a1c711dc8ebc418e21195833814cb2f84b878b90a2774365f0166402308e08") depends_on("blas") diff --git a/var/spack/repos/builtin/packages/qscintilla/package.py b/var/spack/repos/builtin/packages/qscintilla/package.py index 2048e8318eae10..326b1137bea759 100644 --- a/var/spack/repos/builtin/packages/qscintilla/package.py +++ b/var/spack/repos/builtin/packages/qscintilla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Qscintilla(QMakePackage): homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro" url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz" + license("GPL-3.0-only") + version("2.14.1", sha256="dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d") version("2.14.0", sha256="449353928340300804c47b3785c3e62096f918a723d5eed8a5439764e6507f4c") version("2.13.4", sha256="890c261f31e116f426b0ea03a136d44fc89551ebfd126d7b0bdf8a7197879986") @@ -26,7 +28,10 @@ class Qscintilla(QMakePackage): variant("python", default=False, description="Build python bindings") depends_on("qmake") - depends_on("qmake+opengl", when="+python") + with when("+python"): + depends_on("qt+opengl", when="^[virtuals=qmake] qt") + depends_on("qt-base +opengl", when="^[virtuals=qmake] qt-base") + depends_on("py-pyqt6", type=("build", "run"), when="+python ^qt-base") depends_on("py-pyqt-builder", type="build", when="+python") depends_on("py-pyqt5", type=("build", "run"), when="+python ^qt@5") diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index 4345e6b34d7508..73817c28f48e75 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,8 +33,6 @@ def get_list_url(qualname): maintainers("wdconinc", "sethrj") - provides("qmake") - # Default dependencies for all qt-* components generator("ninja") depends_on("cmake@3.16:", type="build") @@ -91,6 +89,11 @@ class QtBase(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + provides("qmake") + + license("BSD-3-Clause") + + version("6.6.1", sha256="eb091c56e8c572d35d3da36f94f9e228892d43aecb559fa4728a19f0e44914c4") version("6.6.0", sha256="882f39ea3a40a0894cd64e515ce51711a4fab79b8c47bc0fe0279e99493a62cf") version("6.5.3", sha256="174021c4a630df2e7e912c2e523844ad3cb5f90967614628fd8aa15ddbab8bc5") version("6.5.2", sha256="221cafd400c0a992a42746b43ea879d23869232e56d9afe72cb191363267c674") @@ -150,6 +153,13 @@ class QtBase(QtPackage): depends_on("libxkbcommon") depends_on("libxcb@1.13:") # requires xinput depends_on("libxrender") + depends_on("libx11") + depends_on("xcb-util") + depends_on("xcb-util-cursor") + depends_on("xcb-util-image") + depends_on("xcb-util-keysyms") + depends_on("xcb-util-renderutil") + depends_on("xcb-util-wm") with when("+network"): depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/qt-creator/package.py b/var/spack/repos/builtin/packages/qt-creator/package.py index 177883f58bba5d..889c4556cbd05f 100644 --- a/var/spack/repos/builtin/packages/qt-creator/package.py +++ b/var/spack/repos/builtin/packages/qt-creator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qt-declarative/package.py b/var/spack/repos/builtin/packages/qt-declarative/package.py index b93141c4e438d7..42afc99912c153 100644 --- a/var/spack/repos/builtin/packages/qt-declarative/package.py +++ b/var/spack/repos/builtin/packages/qt-declarative/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class QtDeclarative(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + license("BSD-3-Clause") + + version("6.6.1", sha256="b1f5a75c2ea967d21b2c45f56ba1de66e2bf14a581b2f0d8e776441f1bebd0e7") version("6.6.0", sha256="2e52ef00736a9954426adf454cfb365fabdffb5703c814c188bc866cbf9f4dad") version("6.5.3", sha256="563924e58ac517492acb1952af0fb950cd54045ef6d61b98de06fac728239811") version("6.5.2", sha256="8b9eed849c90fb301d5399c545c2c926c18dc889d724df2b284253152a2ee139") diff --git a/var/spack/repos/builtin/packages/qt-quick3d/package.py b/var/spack/repos/builtin/packages/qt-quick3d/package.py index b2d4fb0456b23f..0fea0bdab09de5 100644 --- a/var/spack/repos/builtin/packages/qt-quick3d/package.py +++ b/var/spack/repos/builtin/packages/qt-quick3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class QtQuick3d(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + license("BSD-3-Clause") + + version("6.6.1", sha256="57abc6e178d2b28cfac544c71cb20f362409267be5422ca3fbaa46a1bbfd5515") version("6.6.0", sha256="2cda12649cfb6c23261c48e626714ca7eb01fa4b20e0bed02031f9c488c820ad") version("6.5.3", sha256="5df7494824c44fc73c03348b218166db5c4d8d42bd7d221f15e58c962cf657e5") version("6.5.2", sha256="7b40e578fc1ee2a5f5c413873fdb0552bb97829b70296ba3c6844da062608a7e") diff --git a/var/spack/repos/builtin/packages/qt-quicktimeline/package.py b/var/spack/repos/builtin/packages/qt-quicktimeline/package.py index 42fc1a93e2dd18..a312f667ee268c 100644 --- a/var/spack/repos/builtin/packages/qt-quicktimeline/package.py +++ b/var/spack/repos/builtin/packages/qt-quicktimeline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,9 @@ class QtQuicktimeline(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + license("BSD-3-Clause") + + version("6.6.1", sha256="fe77555566bd6bb0ef0cb67b6ad09e225399fba3d2ec388de84e8a6200c0e2fc") version("6.6.0", sha256="06b94443da3f81153f04dca0cce781481462310d51f97d5550f81322a7a88cd0") version("6.5.3", sha256="fddd90cdb15af093673c6da924e18e22ebd364b9ab215356e1b40db28ac66640") version("6.5.2", sha256="96389af740fde3b2a655bf994001b94fd6e151ef84958ff9982e2ae799f1c3a2") diff --git a/var/spack/repos/builtin/packages/qt-shadertools/package.py b/var/spack/repos/builtin/packages/qt-shadertools/package.py index 5ac23d8626c861..6c06e8992a122c 100644 --- a/var/spack/repos/builtin/packages/qt-shadertools/package.py +++ b/var/spack/repos/builtin/packages/qt-shadertools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class QtShadertools(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + license("BSD-3-Clause") + + version("6.6.1", sha256="1206110464f8829e34ca7277bdcd2044e96a98078c9ab9f8b96ed526a4d81526") version("6.6.0", sha256="8b34908f8bbc7fb00a00babede91dbbeec9826f5138d390041f239d483e1162a") version("6.5.3", sha256="e6c627763db8c60799218947443efb90fb3511342f2212f5e99cd98f6942ed08") version("6.5.2", sha256="2b14cf982753f19cf48a4780bc7d96d8fc0ad3ed1049ae5d3292fc5fc1fd6aef") diff --git a/var/spack/repos/builtin/packages/qt-svg/package.py b/var/spack/repos/builtin/packages/qt-svg/package.py index dfd063bda82e20..c20ffe0ab797c3 100644 --- a/var/spack/repos/builtin/packages/qt-svg/package.py +++ b/var/spack/repos/builtin/packages/qt-svg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class QtSvg(QtPackage): url = QtPackage.get_url(__qualname__) list_url = QtPackage.get_list_url(__qualname__) + license("BSD-3-Clause") + + version("6.6.1", sha256="b947acd83ac51116f29c7f7278d9faed19b8c11e021dbf08616e7d6200118db8") version("6.6.0", sha256="4fd6b4d9307c3cd8fd207e60334823fed07a9acb32f7d53cd9c9be9b6a2f8a30") version("6.5.3", sha256="fb8e5574c2480aab78062fad2d0a521633b4591ada600130b918b703c2ddb09a") version("6.5.2", sha256="2d0c8780f164472ad968bb4eff325a86b2826f101efedbeca5662acdc0b294ba") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 1fe61b3870fced..0b1fbd98231086 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,9 @@ class Qt(Package): phases = ["configure", "build", "install"] + license("LGPL-3.0-only") + + version("5.15.12", sha256="93f2c0889ee2e9cdf30c170d353c3f829de5f29ba21c119167dee5995e48ccce") version("5.15.11", sha256="7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951") version("5.15.10", sha256="b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca") version("5.15.9", sha256="26d5f36134db03abe4a6db794c7570d729c92a3fc1b0bf9b1c8f86d0573cd02f") @@ -150,6 +153,14 @@ class Qt(Package): ) # https://github.com/microsoft/vcpkg/issues/21055 patch("qt5-macos12.patch", working_dir="qtbase", when="@5.14: %apple-clang@13:") + # https://codereview.qt-project.org/c/qt/qtbase/+/503172 + patch( + "https://github.com/qt/qtbase/commit/cdf64b0e47115cc473e1afd1472b4b09e130b2a5.patch?full_index=1", + sha256="2b881ffb2808f8fa79f51f8bec71be91a886bcdc59b1d7b6986cba26ed18d1d3", + working_dir="qtbase", + when="@5.12.1: %apple-clang@15:", + ) + conflicts("%apple-clang@15:", when="@:5.12.0") # Spack path substitution uses excessively long paths that exceed the hard-coded # limit of 256 used by teh generated code with the prefix path as string literals diff --git a/var/spack/repos/builtin/packages/qtgraph/package.py b/var/spack/repos/builtin/packages/qtgraph/package.py index 6f3fbf92badbdb..ed5d649dcbee1a 100644 --- a/var/spack/repos/builtin/packages/qtgraph/package.py +++ b/var/spack/repos/builtin/packages/qtgraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index 048907b8fe9d89..391afc70f357bd 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qtkeychain/package.py b/var/spack/repos/builtin/packages/qtkeychain/package.py index 0bea065f0bc9d7..b6ebbf2379f97f 100644 --- a/var/spack/repos/builtin/packages/qtkeychain/package.py +++ b/var/spack/repos/builtin/packages/qtkeychain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Qtkeychain(CMakePackage): homepage = "https://github.com/frankosterfeld/qtkeychain" url = "https://github.com/frankosterfeld/qtkeychain/archive/v0.9.1.tar.gz" + license("BSD-2-Clause") + version("0.9.1", sha256="9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e") depends_on("qt+dbus") diff --git a/var/spack/repos/builtin/packages/qtltools/package.py b/var/spack/repos/builtin/packages/qtltools/package.py index 21c98d5ccb5c99..b9393e8721bf1e 100644 --- a/var/spack/repos/builtin/packages/qtltools/package.py +++ b/var/spack/repos/builtin/packages/qtltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Qtltools(MakefilePackage): homepage = "https://qtltools.github.io/qtltools/" url = "https://github.com/qtltools/qtltools/archive/refs/tags/1.3.1.tar.gz" + license("GPL-3.0-only") + version("1.3.1", sha256="033b9b61923fd65c4b8b80bc0add321e6fd6fb40de49d15c2dfe6a4d7e60764a") version("1.3", sha256="032020d7e038eac4ec01701343a887bced7cca356cbd24b3d5bbadf83686faeb") diff --git a/var/spack/repos/builtin/packages/qualimap/package.py b/var/spack/repos/builtin/packages/qualimap/package.py index 8a15d30a2a4255..bfa8af70600088 100644 --- a/var/spack/repos/builtin/packages/qualimap/package.py +++ b/var/spack/repos/builtin/packages/qualimap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Qualimap(Package): homepage = "http://qualimap.conesalab.org/" url = "https://bitbucket.org/kokonech/qualimap/downloads/qualimap_v2.2.1.zip" + license("GPL-2.0-or-later") + version("2.2.1", sha256="08f1d66e49c83c76c56c4225c53aee44f41e0592c8bdc84b8c4ecd975700e045") depends_on("java", type="run") diff --git a/var/spack/repos/builtin/packages/quantum-espresso/gipaw-eccee44.patch b/var/spack/repos/builtin/packages/quantum-espresso/gipaw-eccee44.patch new file mode 100644 index 00000000000000..e2d8179010f4ad --- /dev/null +++ b/var/spack/repos/builtin/packages/quantum-espresso/gipaw-eccee44.patch @@ -0,0 +1,8 @@ +--- spack-src/external/submodule_commit_hash_records.org 2023-11-15 18:38:47.485317449 -0300 ++++ spack-src/external/submodule_commit_hash_records 2023-11-15 18:39:02.661861757 -0300 +@@ -5,4 +5,4 @@ + 82005cbb65bdf5d32ca021848eec8f19da956a77 mbd + f72ab25fa4ea755c1b4b230ae8074b47d5509c70 pw2qmcpack + 1d6b187374a2d50b509e5e79e2cab01a79ff7ce1 wannier90 +-f5823521ad8fdd8b8e9e29197eedb354f9b9146d qe-gipaw ++eccee44d3caf1c930fb72ad9c741fbb743eabf45 qe-gipaw diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 40c036320d7a7a..7522227cffbe29 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,7 +22,10 @@ class QuantumEspresso(CMakePackage, Package): build_system(conditional("cmake", when="@6.8:"), "generic", default="cmake") + license("GPL-2.0-only") + version("develop", branch="develop") + version("7.3", sha256="edc2a0f3315c69966df4f82ec86ab9f682187bc9430ef6d2bacad5f27f08972c") version("7.2", sha256="b348a4a7348b66a73545d9ca317a2645755c98d343c1cfe8def475ad030808c0") version("7.1", sha256="d56dea096635808843bd5a9be2dee3d1f60407c01dbeeda03f8256a3bcfc4eb6") version("7.0", sha256="85beceb1aaa1678a49e774c085866d4612d9d64108e0ac49b23152c8622880ee") @@ -102,6 +105,9 @@ class QuantumEspresso(CMakePackage, Package): with when("+nvtx~cuda"): depends_on("cuda") + # CLOCK variant to display program time in seconds + variant("clock", default=False, description="Display program time in seconds") + # Apply upstream patches by default. Variant useful for 3rd party # patches which are incompatible with upstream patches desc = "Apply recommended upstream patches. May need to be set " @@ -132,6 +138,10 @@ class QuantumEspresso(CMakePackage, Package): # folder QE expects as a link, we issue a conflict here. conflicts("@:5.4.0", msg="+elpa requires QE >= 6.0") + variant("fox", default=False, description="Enables FoX library") + with when("+fox"): + conflicts("@:7.1", msg="+fox variant requires QE >= 7.2") + # Support for HDF5 has been added starting in version 6.1.0 and is # still experimental, therefore we default to False for the variant variant( @@ -227,13 +237,8 @@ class QuantumEspresso(CMakePackage, Package): variant( "gipaw", default=False, - when="build_system=generic", description="Builds Gauge-Including Projector Augmented-Waves executable", ) - with when("+gipaw"): - conflicts( - "@:6.3", msg="gipaw standard support available for QE 6.3 or grater version only" - ) # Dependencies not affected by variants depends_on("blas") @@ -260,6 +265,15 @@ class QuantumEspresso(CMakePackage, Package): # NOTE: *SOME* third-party patches will require deactivation of # upstream patches using `~patch` variant + # gipaw + conflicts( + "@:6.2", + when="+gipaw", + msg="gipaw standard support available for QE 6.3 or greater version only", + ) + conflicts("~fox", when="@7.2: +gipaw", msg="gipaw plugin requires FoX") + conflicts("+gipaw build_system=cmake", when="@:7.1") + # Only CMake will work for @6.8: %aocc conflicts( "build_system=generic", when="@6.8: %aocc", msg="Please use CMake to build with AOCC" @@ -285,13 +299,13 @@ class QuantumEspresso(CMakePackage, Package): # see: https://gitlab.com/QEF/q-e/-/merge_requests/2005 patch_url = "https://gitlab.com/QEF/q-e/-/commit/4ca3afd4c6f27afcf3f42415a85a353a7be1bd37.diff" patch_checksum = "e54d33e36a2667bd1d7e358db9fa9d4d83085264cdd47e39ce88754452ae7700" - patch(patch_url, sha256=patch_checksum, when="@:7.1 build_system=cmake") + patch(patch_url, sha256=patch_checksum, when="@7.1 build_system=cmake") # QE 7.1 fix post-processing install part 2/2 # see: https://gitlab.com/QEF/q-e/-/merge_requests/2007 patch_url = "https://gitlab.com/QEF/q-e/-/commit/481a001293de2f9eec8481e02d64f679ffd83ede.diff" patch_checksum = "5075f2df61ef5ff70f2ec3b52a113f5636fb07f5d3d4c0115931f9b95ed61c3e" - patch(patch_url, sha256=patch_checksum, when="@:7.1 build_system=cmake") + patch(patch_url, sha256=patch_checksum, when="@7.1 build_system=cmake") # No patch needed for QMCPACK converter beyond 7.0 # 7.0 @@ -400,6 +414,9 @@ class QuantumEspresso(CMakePackage, Package): # extlibs_makefile updated to work with fujitsu compilers patch("fj-fox.patch", when="+patch %fj") + # gipaw.x will only be installed with cmake if the qe-gipaw version is >= 5c4a4ce. + patch("gipaw-eccee44.patch", when="@7.2+gipaw build_system=cmake") + class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder): def cmake_args(self): @@ -413,9 +430,18 @@ def cmake_args(self): self.define_from_variant("QE_ENABLE_LIBXC", "libxc"), self.define_from_variant("QE_ENABLE_CUDA", "cuda"), self.define_from_variant("QE_ENABLE_PROFILE_NVTX", "nvtx"), + self.define_from_variant("QE_CLOCK_SECONDS", "clock"), self.define_from_variant("QE_ENABLE_MPI_GPU_AWARE", "mpigpu"), ] + plugins = [] + + if "+fox" in spec: + cmake_args.append(self.define("QE_ENABLE_FOX", True)) + + if "+gipaw" in spec: + plugins.append("gipaw") + if "+cuda" in self.spec: cmake_args.append(self.define("QE_ENABLE_OPENACC", True)) @@ -428,7 +454,10 @@ def cmake_args(self): cmake_args.append(self.define("QE_ENABLE_HDF5", True)) if "+qmcpack" in spec: - cmake_args.append(self.define("QE_ENABLE_PW2QMCPACK", True)) + if spec.satisfies("@:7.0"): + cmake_args.append(self.define("QE_ENABLE_PW2QMCPACK", True)) + else: + plugins.append("pw2qmcpack") if "^armpl-gcc" in spec or "^acfl" in spec: cmake_args.append(self.define("BLAS_LIBRARIES", spec["blas"].libs.joined(";"))) @@ -437,6 +466,8 @@ def cmake_args(self): if spec.satisfies("@:7.1"): cmake_args.append(self.define("BLA_VENDOR", "All")) + if plugins: + cmake_args.append(self.define("QE_ENABLE_PLUGINS", plugins)) return cmake_args @@ -589,6 +620,9 @@ def install(self, pkg, spec, prefix): else: options.extend(["--with-elpa-lib={0}".format(elpa.libs[0])]) + if "+fox" in spec: + options.append("--with-fox=yes") + if spec.variants["hdf5"].value != "none": options.append("--with-hdf5={0}".format(spec["hdf5"].prefix)) if spec.satisfies("@6.4.1,6.5"): diff --git a/var/spack/repos/builtin/packages/quartz/package.py b/var/spack/repos/builtin/packages/quartz/package.py index fa2473dafb3611..fd7b8f67ab6ddd 100644 --- a/var/spack/repos/builtin/packages/quartz/package.py +++ b/var/spack/repos/builtin/packages/quartz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qucs/package.py b/var/spack/repos/builtin/packages/qucs/package.py index fb56e58ecaa607..7d948dac68136f 100644 --- a/var/spack/repos/builtin/packages/qucs/package.py +++ b/var/spack/repos/builtin/packages/qucs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/quickjs/package.py b/var/spack/repos/builtin/packages/quickjs/package.py index 6f77137b75da58..69347260894212 100644 --- a/var/spack/repos/builtin/packages/quickjs/package.py +++ b/var/spack/repos/builtin/packages/quickjs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Quickjs(MakefilePackage): git = "https://github.com/bellard/quickjs.git" url = "https://bellard.org/quickjs/quickjs-2021-03-27.tar.xz" + license("MIT") + version("master", branch="master") version( "2021-03-27", sha256="a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a" diff --git a/var/spack/repos/builtin/packages/quicksilver/package.py b/var/spack/repos/builtin/packages/quicksilver/package.py index f4709e191c7729..81dfebea653a51 100644 --- a/var/spack/repos/builtin/packages/quicksilver/package.py +++ b/var/spack/repos/builtin/packages/quicksilver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/quo-vadis/package.py b/var/spack/repos/builtin/packages/quo-vadis/package.py index 029b4926c9128c..52ab8be754eae5 100644 --- a/var/spack/repos/builtin/packages/quo-vadis/package.py +++ b/var/spack/repos/builtin/packages/quo-vadis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class QuoVadis(CMakePackage): maintainers("samuelkgutierrez") + license("BSD-3-Clause") + version("master", branch="master") variant("fortran", default=True, description="Build with Fortran bindings") diff --git a/var/spack/repos/builtin/packages/quota/package.py b/var/spack/repos/builtin/packages/quota/package.py index 77b06f21179cb5..0e2fe920281991 100644 --- a/var/spack/repos/builtin/packages/quota/package.py +++ b/var/spack/repos/builtin/packages/quota/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/qwt/package.py b/var/spack/repos/builtin/packages/qwt/package.py index e2d7a8e0ee5656..d9540fdf795235 100644 --- a/var/spack/repos/builtin/packages/qwt/package.py +++ b/var/spack/repos/builtin/packages/qwt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Qwt(QMakePackage): homepage = "http://qwt.sourceforge.net/" url = "https://sourceforge.net/projects/qwt/files/qwt/6.1.3/qwt-6.1.3.tar.bz2" + license("custom") + version("6.1.6", sha256="99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6") version("6.1.4", sha256="1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9") version("6.1.3", sha256="f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733") @@ -31,7 +33,9 @@ class Qwt(QMakePackage): depends_on("qt+tools", when="+designer") depends_on("qt+opengl", when="+opengl") - depends_on("qt") + # Qwt does not support Qt6; this picks the right qmake provider + conflicts("^qt-base", msg="Qwt requires Qt5") + # the qt@5.14.2 limitation was lifted in qwt@6.1.5 # https://sourceforge.net/p/qwt/code/HEAD/tree/tags/qwt-6.1.6/CHANGES-6.1 depends_on("qt@:5.14.2", when="@:6.1.4") diff --git a/var/spack/repos/builtin/packages/qwtpolar/package.py b/var/spack/repos/builtin/packages/qwtpolar/package.py index b4e1875cc0cd85..7e6fa96220a21f 100644 --- a/var/spack/repos/builtin/packages/qwtpolar/package.py +++ b/var/spack/repos/builtin/packages/qwtpolar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4/package.py b/var/spack/repos/builtin/packages/r-a4/package.py index d602001dddaa6e..c70ae4126b5f39 100644 --- a/var/spack/repos/builtin/packages/r-a4/package.py +++ b/var/spack/repos/builtin/packages/r-a4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4base/package.py b/var/spack/repos/builtin/packages/r-a4base/package.py index 2af4e29e6ce491..6b23c5b777a9f8 100644 --- a/var/spack/repos/builtin/packages/r-a4base/package.py +++ b/var/spack/repos/builtin/packages/r-a4base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4classif/package.py b/var/spack/repos/builtin/packages/r-a4classif/package.py index 7970297043dcec..5f50a4afdcac1a 100644 --- a/var/spack/repos/builtin/packages/r-a4classif/package.py +++ b/var/spack/repos/builtin/packages/r-a4classif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4core/package.py b/var/spack/repos/builtin/packages/r-a4core/package.py index a8dbd02642662c..66ba7dd64f4dd7 100644 --- a/var/spack/repos/builtin/packages/r-a4core/package.py +++ b/var/spack/repos/builtin/packages/r-a4core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4preproc/package.py b/var/spack/repos/builtin/packages/r-a4preproc/package.py index d77b3ff598ecf6..c9388ccc750ad2 100644 --- a/var/spack/repos/builtin/packages/r-a4preproc/package.py +++ b/var/spack/repos/builtin/packages/r-a4preproc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-a4reporting/package.py b/var/spack/repos/builtin/packages/r-a4reporting/package.py index ee210045cb9e23..776bcedc90080c 100644 --- a/var/spack/repos/builtin/packages/r-a4reporting/package.py +++ b/var/spack/repos/builtin/packages/r-a4reporting/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-abadata/package.py b/var/spack/repos/builtin/packages/r-abadata/package.py index d82d66add94684..5daa0cb0909435 100644 --- a/var/spack/repos/builtin/packages/r-abadata/package.py +++ b/var/spack/repos/builtin/packages/r-abadata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-abaenrichment/package.py b/var/spack/repos/builtin/packages/r-abaenrichment/package.py index 110a6a4bd1b369..52b9b30bce92e7 100644 --- a/var/spack/repos/builtin/packages/r-abaenrichment/package.py +++ b/var/spack/repos/builtin/packages/r-abaenrichment/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 41351eb05e1452..02e959db466370 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RAbind(RPackage): cran = "abind" + license("LGPL-2.0-or-later") + version("1.4-5", sha256="3a3ace5afbcb86e56889efcebf3bf5c3bb042a282ba7cc4412d450bb246a3f2c") version("1.4-3", sha256="b6c255878c1ab81701ae701f34546e88be115629b984ac4272e311fa3c0ea6ce") diff --git a/var/spack/repos/builtin/packages/r-absseq/package.py b/var/spack/repos/builtin/packages/r-absseq/package.py index 83a5786bd29c9e..047eb2d83045d8 100644 --- a/var/spack/repos/builtin/packages/r-absseq/package.py +++ b/var/spack/repos/builtin/packages/r-absseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-acde/package.py b/var/spack/repos/builtin/packages/r-acde/package.py index af70a66c456e7b..37b9c0c1b50068 100644 --- a/var/spack/repos/builtin/packages/r-acde/package.py +++ b/var/spack/repos/builtin/packages/r-acde/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-acepack/package.py b/var/spack/repos/builtin/packages/r-acepack/package.py index 5fd558452e34d5..28353cb981e31a 100644 --- a/var/spack/repos/builtin/packages/r-acepack/package.py +++ b/var/spack/repos/builtin/packages/r-acepack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,4 +27,6 @@ class RAcepack(RPackage): cran = "acepack" + license("MIT") + version("1.4.1", sha256="82750507926f02a696f6cc03693e8d4a5ee7e92500c8c15a16a9c12addcd28b9") diff --git a/var/spack/repos/builtin/packages/r-acgh/package.py b/var/spack/repos/builtin/packages/r-acgh/package.py index 3295669b3af80c..4ff4c218c4fee3 100644 --- a/var/spack/repos/builtin/packages/r-acgh/package.py +++ b/var/spack/repos/builtin/packages/r-acgh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-acme/package.py b/var/spack/repos/builtin/packages/r-acme/package.py index 989ec5abd8eec1..4e8b08b81e613b 100644 --- a/var/spack/repos/builtin/packages/r-acme/package.py +++ b/var/spack/repos/builtin/packages/r-acme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ada/package.py b/var/spack/repos/builtin/packages/r-ada/package.py index e440c3f40f0268..ac3c87aa9335aa 100644 --- a/var/spack/repos/builtin/packages/r-ada/package.py +++ b/var/spack/repos/builtin/packages/r-ada/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RAda(RPackage): cran = "ada" + license("GPL-2.0-or-later") + version("2.0-5", sha256="d900172059eebeef30c27944fc29737a231fc4f92e3c2661868383fbd9016ac0") depends_on("r@2.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-adabag/package.py b/var/spack/repos/builtin/packages/r-adabag/package.py index 04de410758cff3..343b8c468d85a3 100644 --- a/var/spack/repos/builtin/packages/r-adabag/package.py +++ b/var/spack/repos/builtin/packages/r-adabag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class RAdabag(RPackage): cran = "adabag" + license("GPL-2.0-or-later") + version("4.2", sha256="47019eb8cefc8372996fbb2642f64d4a91d7cedc192690a8d8be6e7e03cd3c81") version("4.1", sha256="ff938c36122cdf58a71a59a6bf79a3c7816966ee7cc4907c4a0a3c0732e3d028") diff --git a/var/spack/repos/builtin/packages/r-ade4/package.py b/var/spack/repos/builtin/packages/r-ade4/package.py index ce1df4640cd232..00e03cb21ae1a5 100644 --- a/var/spack/repos/builtin/packages/r-ade4/package.py +++ b/var/spack/repos/builtin/packages/r-ade4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RAde4(RPackage): cran = "ade4" + license("GPL-2.0-or-later") + version("1.7-22", sha256="007df54e83a2a6cb8d6da8006f0aace011e7eaa7744dc5f8230ac2c002b393b4") version("1.7-20", sha256="ddc75788b55902f17dabda209eb67c378aa0233767697e00fa3f8fc85e4bad7b") version("1.7-19", sha256="c85111881ff93a261ca34a5b5ef313d1c0ff9b84f0b23596bc56cfa696f165ef") diff --git a/var/spack/repos/builtin/packages/r-adegenet/package.py b/var/spack/repos/builtin/packages/r-adegenet/package.py index e0947b8d0bf516..50ab73ce474140 100644 --- a/var/spack/repos/builtin/packages/r-adegenet/package.py +++ b/var/spack/repos/builtin/packages/r-adegenet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RAdegenet(RPackage): cran = "adegenet" + license("GPL-2.0-or-later") + version("2.1.10", sha256="ab62780ac1dd575d01f3e0869b34728a74b2ca2eaeeccb2f520007e9a578b163") version("2.1.8", sha256="80d72c3eefe077723dec91c98b7d46815b9659ab7196581d18b6e9d6c27f5025") version("2.1.6", sha256="7823de4933634cb887481fe4b12cf2faacbaa1b4b66939584d10fcb7ce2da26b") diff --git a/var/spack/repos/builtin/packages/r-adegraphics/package.py b/var/spack/repos/builtin/packages/r-adegraphics/package.py index e01e96d8652303..1048a74d065fdc 100644 --- a/var/spack/repos/builtin/packages/r-adegraphics/package.py +++ b/var/spack/repos/builtin/packages/r-adegraphics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RAdegraphics(RPackage): cran = "adegraphics" + license("GPL-2.0-or-later") + version("1.0-18", sha256="8fe07fc0f73e9917e098de2ee8e6fdb3e07775446683b6222692a3298e4d563c") version("1.0-16", sha256="7ba59ce9aeefe1c25b4b118d08ef458ffd34115412c147cc428629e72a82ec3a") version("1.0-15", sha256="87bbcd072e9a898955f5ede4315e82365086a50a2887bf5bd2e94bbb4d3f678a") diff --git a/var/spack/repos/builtin/packages/r-adephylo/package.py b/var/spack/repos/builtin/packages/r-adephylo/package.py index ca203bc8d93cad..225b8bc1cfdce0 100644 --- a/var/spack/repos/builtin/packages/r-adephylo/package.py +++ b/var/spack/repos/builtin/packages/r-adephylo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RAdephylo(RPackage): cran = "adephylo" + license("GPL-2.0-or-later") + version("1.1-13", sha256="2aa132fee9d0a14ac09b0a96af40ac332cb4e13c892908803c335aa7319ca76d") version("1.1-11", sha256="154bf2645eac4493b85877933b9445442524ca4891aefe4e80c294c398cff61a") diff --git a/var/spack/repos/builtin/packages/r-adespatial/package.py b/var/spack/repos/builtin/packages/r-adespatial/package.py index b9d95a920338a8..7fe07cbf9ecb7a 100644 --- a/var/spack/repos/builtin/packages/r-adespatial/package.py +++ b/var/spack/repos/builtin/packages/r-adespatial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RAdespatial(RPackage): cran = "adespatial" + license("GPL-2.0-or-later") + version("0.3-21", sha256="4ff65f9bc05892a2d37d34ab2b77dbd24f980adc891f5f94f8e56aec771ea79f") version("0.3-20", sha256="f88e009563087c52af5be490bd111cc38b0b70437bbfa189e846080a069b64eb") version("0.3-19", sha256="db50f1c42961e40bcef6d714a89a09b1345dab2dd013cea8e2122fdf99d5d223") diff --git a/var/spack/repos/builtin/packages/r-adgoftest/package.py b/var/spack/repos/builtin/packages/r-adgoftest/package.py index 11d516d31e0736..f1a9f0a9158aaf 100644 --- a/var/spack/repos/builtin/packages/r-adgoftest/package.py +++ b/var/spack/repos/builtin/packages/r-adgoftest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-adsplit/package.py b/var/spack/repos/builtin/packages/r-adsplit/package.py index 182ffd14a87fb0..8a582acb5376d0 100644 --- a/var/spack/repos/builtin/packages/r-adsplit/package.py +++ b/var/spack/repos/builtin/packages/r-adsplit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-aer/package.py b/var/spack/repos/builtin/packages/r-aer/package.py index 4a941e7a3aab31..8e4e5b57027973 100644 --- a/var/spack/repos/builtin/packages/r-aer/package.py +++ b/var/spack/repos/builtin/packages/r-aer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-afex/package.py b/var/spack/repos/builtin/packages/r-afex/package.py index 3656805ca9f6ea..8d837804708020 100644 --- a/var/spack/repos/builtin/packages/r-afex/package.py +++ b/var/spack/repos/builtin/packages/r-afex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RAfex(RPackage): cran = "afex" + license("GPL-2.0-or-later") + version("1.3-0", sha256="f8e276a1070288c54b83db1d1214fd88fe8d8b8698cf0c2743ef2a45f61e1933") version("1.2-1", sha256="e3a8cecd46db9521039275a5bf27937afb3ec4021644cc4fac94096cc585aacb") version("1.2-0", sha256="8b57ffb8ba2f6354185fc79c8b0cab2703d753b89a100f4325bb2e4c7a3531c2") diff --git a/var/spack/repos/builtin/packages/r-affxparser/package.py b/var/spack/repos/builtin/packages/r-affxparser/package.py index 5e492394e79909..543556040ab382 100644 --- a/var/spack/repos/builtin/packages/r-affxparser/package.py +++ b/var/spack/repos/builtin/packages/r-affxparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affy/package.py b/var/spack/repos/builtin/packages/r-affy/package.py index 57905c89b3609b..5fe87012da9dca 100644 --- a/var/spack/repos/builtin/packages/r-affy/package.py +++ b/var/spack/repos/builtin/packages/r-affy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affycomp/package.py b/var/spack/repos/builtin/packages/r-affycomp/package.py index e7fed58a4f9301..baabacb0e2fb1f 100644 --- a/var/spack/repos/builtin/packages/r-affycomp/package.py +++ b/var/spack/repos/builtin/packages/r-affycomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affycompatible/package.py b/var/spack/repos/builtin/packages/r-affycompatible/package.py index 0adf80212a46de..4ebb9a6c0af229 100644 --- a/var/spack/repos/builtin/packages/r-affycompatible/package.py +++ b/var/spack/repos/builtin/packages/r-affycompatible/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affycontam/package.py b/var/spack/repos/builtin/packages/r-affycontam/package.py index 2853c92b57972e..e1328702ec77ae 100644 --- a/var/spack/repos/builtin/packages/r-affycontam/package.py +++ b/var/spack/repos/builtin/packages/r-affycontam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affycoretools/package.py b/var/spack/repos/builtin/packages/r-affycoretools/package.py index 64118924cbd18c..7ed4ec2c83a293 100644 --- a/var/spack/repos/builtin/packages/r-affycoretools/package.py +++ b/var/spack/repos/builtin/packages/r-affycoretools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affydata/package.py b/var/spack/repos/builtin/packages/r-affydata/package.py index 13ce12703de7d0..f90a969698b2fc 100644 --- a/var/spack/repos/builtin/packages/r-affydata/package.py +++ b/var/spack/repos/builtin/packages/r-affydata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyexpress/package.py b/var/spack/repos/builtin/packages/r-affyexpress/package.py index 29060c7f629a51..4a4dc00882ab63 100644 --- a/var/spack/repos/builtin/packages/r-affyexpress/package.py +++ b/var/spack/repos/builtin/packages/r-affyexpress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyilm/package.py b/var/spack/repos/builtin/packages/r-affyilm/package.py index 629a6d0e7c9433..474adfe1026f79 100644 --- a/var/spack/repos/builtin/packages/r-affyilm/package.py +++ b/var/spack/repos/builtin/packages/r-affyilm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyio/package.py b/var/spack/repos/builtin/packages/r-affyio/package.py index 06dd560743064d..b32ca1b9443ff8 100644 --- a/var/spack/repos/builtin/packages/r-affyio/package.py +++ b/var/spack/repos/builtin/packages/r-affyio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affypdnn/package.py b/var/spack/repos/builtin/packages/r-affypdnn/package.py index ad3cdf7539c822..fea0235b2f71a2 100644 --- a/var/spack/repos/builtin/packages/r-affypdnn/package.py +++ b/var/spack/repos/builtin/packages/r-affypdnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyplm/package.py b/var/spack/repos/builtin/packages/r-affyplm/package.py index 508d94b05d7fa6..b760df5b0206d2 100644 --- a/var/spack/repos/builtin/packages/r-affyplm/package.py +++ b/var/spack/repos/builtin/packages/r-affyplm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyqcreport/package.py b/var/spack/repos/builtin/packages/r-affyqcreport/package.py index c3c5957dec0cc4..8e79d82e09c1df 100644 --- a/var/spack/repos/builtin/packages/r-affyqcreport/package.py +++ b/var/spack/repos/builtin/packages/r-affyqcreport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py index 9615deccf610af..ec88841d97194c 100644 --- a/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py +++ b/var/spack/repos/builtin/packages/r-affyrnadegradation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-agdex/package.py b/var/spack/repos/builtin/packages/r-agdex/package.py index ba29d0e5085cb4..b9ab812b2ea0e6 100644 --- a/var/spack/repos/builtin/packages/r-agdex/package.py +++ b/var/spack/repos/builtin/packages/r-agdex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-agilp/package.py b/var/spack/repos/builtin/packages/r-agilp/package.py index c870fd6fd4fd64..dd0ea09fab5fb9 100644 --- a/var/spack/repos/builtin/packages/r-agilp/package.py +++ b/var/spack/repos/builtin/packages/r-agilp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-agimicrorna/package.py b/var/spack/repos/builtin/packages/r-agimicrorna/package.py index 4e27a80e813279..cd442166ae4be6 100644 --- a/var/spack/repos/builtin/packages/r-agimicrorna/package.py +++ b/var/spack/repos/builtin/packages/r-agimicrorna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-aims/package.py b/var/spack/repos/builtin/packages/r-aims/package.py index 47650bf15320d7..e3c3a73b36e716 100644 --- a/var/spack/repos/builtin/packages/r-aims/package.py +++ b/var/spack/repos/builtin/packages/r-aims/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-aldex2/package.py b/var/spack/repos/builtin/packages/r-aldex2/package.py index 342644e0d70fb3..1ad192fa26932c 100644 --- a/var/spack/repos/builtin/packages/r-aldex2/package.py +++ b/var/spack/repos/builtin/packages/r-aldex2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RAldex2(RPackage): bioc = "ALDEx2" + license("GPL-3.0-only") + version("1.32.0", commit="ba32b9a9b6a8f42906ea094318f00116f15e42eb") version("1.30.0", commit="cb6670515a8722f9cfedac12a8c2747a5298ee46") version("1.28.1", commit="f8d8ba6d2439bff75ab80f5466c9a047c31ed0a6") diff --git a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py index ca2ec19e75eafa..5ee5f93a5629b5 100644 --- a/var/spack/repos/builtin/packages/r-allelicimbalance/package.py +++ b/var/spack/repos/builtin/packages/r-allelicimbalance/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-alpine/package.py b/var/spack/repos/builtin/packages/r-alpine/package.py index 3ed48849b51339..7f67de9a178bd2 100644 --- a/var/spack/repos/builtin/packages/r-alpine/package.py +++ b/var/spack/repos/builtin/packages/r-alpine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-als/package.py b/var/spack/repos/builtin/packages/r-als/package.py index 9cd579e87a0f83..3dfc7a43019cf7 100644 --- a/var/spack/repos/builtin/packages/r-als/package.py +++ b/var/spack/repos/builtin/packages/r-als/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-alsace/package.py b/var/spack/repos/builtin/packages/r-alsace/package.py index 9b212c32f34aec..679cdcc0396a69 100644 --- a/var/spack/repos/builtin/packages/r-alsace/package.py +++ b/var/spack/repos/builtin/packages/r-alsace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py index 5c3dd5428a2834..0bb6abd042978a 100644 --- a/var/spack/repos/builtin/packages/r-altcdfenvs/package.py +++ b/var/spack/repos/builtin/packages/r-altcdfenvs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-amap/package.py b/var/spack/repos/builtin/packages/r-amap/package.py index 4c6d24df5a22b5..b440581cced234 100644 --- a/var/spack/repos/builtin/packages/r-amap/package.py +++ b/var/spack/repos/builtin/packages/r-amap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RAmap(RPackage): cran = "amap" + license("GPL-2.0-or-later") + version("0.8-19", sha256="7349ea684b69eba0fcc48f78b7ac09a838d95d3bc0c6a94b6055605ac0291900") version("0.8-18", sha256="7afbbdd681a201121374821b733c9000ca1046a2353ee386507604c2c759ec7e") version("0.8-17", sha256="6b8473d1d35a9cbc611661882c8f681162e8f913f911ccd51629200ae72289c6") diff --git a/var/spack/repos/builtin/packages/r-amelia/package.py b/var/spack/repos/builtin/packages/r-amelia/package.py index dd1fdd73221a5e..ac363443653c3e 100644 --- a/var/spack/repos/builtin/packages/r-amelia/package.py +++ b/var/spack/repos/builtin/packages/r-amelia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ampliqueso/package.py b/var/spack/repos/builtin/packages/r-ampliqueso/package.py index 9fad686b7c6afc..b3398ca4e1373b 100644 --- a/var/spack/repos/builtin/packages/r-ampliqueso/package.py +++ b/var/spack/repos/builtin/packages/r-ampliqueso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-analysispageserver/package.py b/var/spack/repos/builtin/packages/r-analysispageserver/package.py index 5b57f352e21967..386fcac2a07211 100644 --- a/var/spack/repos/builtin/packages/r-analysispageserver/package.py +++ b/var/spack/repos/builtin/packages/r-analysispageserver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-anaquin/package.py b/var/spack/repos/builtin/packages/r-anaquin/package.py index 7e0419b05ce746..63f3d627f0405a 100644 --- a/var/spack/repos/builtin/packages/r-anaquin/package.py +++ b/var/spack/repos/builtin/packages/r-anaquin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-aneufinder/package.py b/var/spack/repos/builtin/packages/r-aneufinder/package.py index c4fe7b5505e0ae..a4ef4ec68a064c 100644 --- a/var/spack/repos/builtin/packages/r-aneufinder/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py index ba41d17972cec7..8b336a950e79f2 100644 --- a/var/spack/repos/builtin/packages/r-aneufinderdata/package.py +++ b/var/spack/repos/builtin/packages/r-aneufinderdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-animation/package.py b/var/spack/repos/builtin/packages/r-animation/package.py index 88bce8c0bba52d..0f82acb3fc0476 100644 --- a/var/spack/repos/builtin/packages/r-animation/package.py +++ b/var/spack/repos/builtin/packages/r-animation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RAnimation(RPackage): cran = "animation" + license("GPL-2.0-or-later") + version("2.7", sha256="88418f1b04ec785963bad492f30eb48b05914e9e5d88c7eef705d949cbd7e469") version("2.6", sha256="90293638920ac436e7e4de76ebfd92e1643ccdb0259b62128f16dd0b13245b0a") version("2.5", sha256="b232fef1b318c79710e5e1923d87baba4c85ffe2c77ddb188130e0911d8cb55f") diff --git a/var/spack/repos/builtin/packages/r-annaffy/package.py b/var/spack/repos/builtin/packages/r-annaffy/package.py index 8eab7dc0c215fb..b3df79ceb2d33f 100644 --- a/var/spack/repos/builtin/packages/r-annaffy/package.py +++ b/var/spack/repos/builtin/packages/r-annaffy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RAnnaffy(RPackage): bioc = "annaffy" + license("LGPL-2.1-or-later") + version("1.72.0", commit="7cb439706a7e93fb5b44ead374010077a44ea78b") version("1.70.0", commit="c99e81259adb39b5d8e954fd7afe7f93675229bc") version("1.68.0", commit="fa930c0bbdca9828a130ab06d86c65d451380830") diff --git a/var/spack/repos/builtin/packages/r-annotate/package.py b/var/spack/repos/builtin/packages/r-annotate/package.py index 2a3cd745ec0b2b..ce6d2f11faf9de 100644 --- a/var/spack/repos/builtin/packages/r-annotate/package.py +++ b/var/spack/repos/builtin/packages/r-annotate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-annotationdbi/package.py b/var/spack/repos/builtin/packages/r-annotationdbi/package.py index 49ee0ff139a0e9..87fd756322aa8d 100644 --- a/var/spack/repos/builtin/packages/r-annotationdbi/package.py +++ b/var/spack/repos/builtin/packages/r-annotationdbi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-annotationfilter/package.py b/var/spack/repos/builtin/packages/r-annotationfilter/package.py index 3510fd3e90616a..ad8f454bbaf1fd 100644 --- a/var/spack/repos/builtin/packages/r-annotationfilter/package.py +++ b/var/spack/repos/builtin/packages/r-annotationfilter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-annotationforge/package.py b/var/spack/repos/builtin/packages/r-annotationforge/package.py index e10335f6bd193b..92fb079fcf2b06 100644 --- a/var/spack/repos/builtin/packages/r-annotationforge/package.py +++ b/var/spack/repos/builtin/packages/r-annotationforge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-annotationhub/package.py b/var/spack/repos/builtin/packages/r-annotationhub/package.py index 218622ccf6701b..e5ebcce13ee5d9 100644 --- a/var/spack/repos/builtin/packages/r-annotationhub/package.py +++ b/var/spack/repos/builtin/packages/r-annotationhub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-anytime/package.py b/var/spack/repos/builtin/packages/r-anytime/package.py index f49a2a0769d8e1..292e55f637caf6 100644 --- a/var/spack/repos/builtin/packages/r-anytime/package.py +++ b/var/spack/repos/builtin/packages/r-anytime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RAnytime(RPackage): cran = "anytime" + license("GPL-2.0-or-later") + version("0.3.9", sha256="1096c15249ac70997a8a41c37eeb2a6d38530621abeae05d3dcd96a8acc7574a") depends_on("r@3.2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-aod/package.py b/var/spack/repos/builtin/packages/r-aod/package.py index 017efdef72e458..bb1c02ed208009 100644 --- a/var/spack/repos/builtin/packages/r-aod/package.py +++ b/var/spack/repos/builtin/packages/r-aod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RAod(RPackage): cran = "aod" + license("GPL-2.0-or-later") + version("1.3.2", sha256="9b85be7b12b31ac076f2456853a5b18d8a79ce2b86d00055264529a0cd28515c") version("1.3.1", sha256="052d8802500fcfdb3b37a8e3e6f3fbd5c3a54e48c3f68122402d2ea3a15403bc") diff --git a/var/spack/repos/builtin/packages/r-ape/package.py b/var/spack/repos/builtin/packages/r-ape/package.py index 8bb27e4f091798..79c01e29ef56da 100644 --- a/var/spack/repos/builtin/packages/r-ape/package.py +++ b/var/spack/repos/builtin/packages/r-ape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RApe(RPackage): cran = "ape" + license("GPL-2.0-only OR GPL-3.0-only") + version("5.7-1", sha256="8b09c71218d8aa629e43bc807b433a4e30a61847d91b2810e31c366f0fe5057a") version("5.6-2", sha256="9b62450a0390a1f07df007d348ad4cedcd814d42cb11c5a300ed33550fd41257") version("5.6-1", sha256="25401e036576eed1200e15bf68879ccd85611303a3508b989e15164cd4c0f7f7") diff --git a/var/spack/repos/builtin/packages/r-aplot/package.py b/var/spack/repos/builtin/packages/r-aplot/package.py index 2ba35226291299..a13354904ec241 100644 --- a/var/spack/repos/builtin/packages/r-aplot/package.py +++ b/var/spack/repos/builtin/packages/r-aplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RAplot(RPackage): cran = "aplot" + license("Artistic-2.0") + version("0.1.10", sha256="d937768241f887628b88bb3b49dd6cbe9b7dae39ae7054e7380a9836721a67d1") version("0.1.8", sha256="d931d7769dc7ce4bc938e8c068973721e89da0aa5f40a04f8a9119621b33459c") version("0.1.7", sha256="f6250f5f6d1addc8d5717be80a92c569bfd83d35bce2e3dbeb251c9ae1be8616") diff --git a/var/spack/repos/builtin/packages/r-argparse/package.py b/var/spack/repos/builtin/packages/r-argparse/package.py index 511e32aa9f527f..fbacffb18313e8 100644 --- a/var/spack/repos/builtin/packages/r-argparse/package.py +++ b/var/spack/repos/builtin/packages/r-argparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RArgparse(RPackage): cran = "argparse" + license("GPL-2.0-or-later") + version("2.2.2", sha256="b62c9bf5e6ca35fb7a2e614a916815c04cbf6c6db3f89f99b4df76470a4a856d") version("2.1.6", sha256="2ad7faad795878b88969ac5d91ba38f4e96deb85dfea7148c3510f0eaa3de592") version("2.1.5", sha256="83e112beb47733849980b286d93ac930f0cbe6ac78fcb94fc9f6b0eea882658d") diff --git a/var/spack/repos/builtin/packages/r-aroma-light/package.py b/var/spack/repos/builtin/packages/r-aroma-light/package.py index 9d1561be86f9c9..89b0e57f13ef27 100644 --- a/var/spack/repos/builtin/packages/r-aroma-light/package.py +++ b/var/spack/repos/builtin/packages/r-aroma-light/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-arrangements/package.py b/var/spack/repos/builtin/packages/r-arrangements/package.py index d8138743722c2f..e45989522be1ff 100644 --- a/var/spack/repos/builtin/packages/r-arrangements/package.py +++ b/var/spack/repos/builtin/packages/r-arrangements/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RArrangements(RPackage): cran = "arrangements" + license("MIT") + version("1.1.9", sha256="e9b5dcb185ec9b28201b196384b04a8d5a15f4ddb9e0b0b2a0c718635ff7345b") depends_on("r@3.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ash/package.py b/var/spack/repos/builtin/packages/r-ash/package.py index 46adcda9cc0211..44ff67e71e8de3 100644 --- a/var/spack/repos/builtin/packages/r-ash/package.py +++ b/var/spack/repos/builtin/packages/r-ash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class RAsh(RPackage): cran = "ash" + license("GPL-2.0-or-later") + version("1.0-15", sha256="8b0a7bc39dd0ce2172f09edc5b5e029347d041a4d508bbff3f3fd6f69450c2ab") diff --git a/var/spack/repos/builtin/packages/r-askpass/package.py b/var/spack/repos/builtin/packages/r-askpass/package.py index ee2beb7477d86e..8c7d5a5d3ee88b 100644 --- a/var/spack/repos/builtin/packages/r-askpass/package.py +++ b/var/spack/repos/builtin/packages/r-askpass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RAskpass(RPackage): cran = "askpass" + license("MIT") + version("1.1", sha256="db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f") depends_on("r-sys@2.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-assertive-base/package.py b/var/spack/repos/builtin/packages/r-assertive-base/package.py index 309ec807f68b1f..c9ceb3b5cd8261 100644 --- a/var/spack/repos/builtin/packages/r-assertive-base/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-code/package.py b/var/spack/repos/builtin/packages/r-assertive-code/package.py index 78699b07cc0600..81b3036035ef93 100644 --- a/var/spack/repos/builtin/packages/r-assertive-code/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-code/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py b/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py index d4be1e76fba245..854a9dac61a193 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data-uk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-data-us/package.py b/var/spack/repos/builtin/packages/r-assertive-data-us/package.py index 5b26dc6259aabb..099a78ab2b22e0 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data-us/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data-us/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-data/package.py b/var/spack/repos/builtin/packages/r-assertive-data/package.py index cdbf460920c42c..a554cf10b80e6e 100644 --- a/var/spack/repos/builtin/packages/r-assertive-data/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py b/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py index e20050ac2fc792..4f646453c77fe6 100644 --- a/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-datetimes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-files/package.py b/var/spack/repos/builtin/packages/r-assertive-files/package.py index b1e4dcf98030a1..712519a4668a48 100644 --- a/var/spack/repos/builtin/packages/r-assertive-files/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-files/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-matrices/package.py b/var/spack/repos/builtin/packages/r-assertive-matrices/package.py index 2a6984f6665c43..1b91255425e707 100644 --- a/var/spack/repos/builtin/packages/r-assertive-matrices/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-matrices/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-models/package.py b/var/spack/repos/builtin/packages/r-assertive-models/package.py index f43d52d27cbf0f..2b84d47a93eecc 100644 --- a/var/spack/repos/builtin/packages/r-assertive-models/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-models/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-numbers/package.py b/var/spack/repos/builtin/packages/r-assertive-numbers/package.py index b8f1278fedd919..f6e232ba01935e 100644 --- a/var/spack/repos/builtin/packages/r-assertive-numbers/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-numbers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-properties/package.py b/var/spack/repos/builtin/packages/r-assertive-properties/package.py index 0d506adb0b64de..35441312f2ea0a 100644 --- a/var/spack/repos/builtin/packages/r-assertive-properties/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-properties/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-reflection/package.py b/var/spack/repos/builtin/packages/r-assertive-reflection/package.py index ab05e649baa826..f47fe1ce99f06c 100644 --- a/var/spack/repos/builtin/packages/r-assertive-reflection/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-reflection/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-sets/package.py b/var/spack/repos/builtin/packages/r-assertive-sets/package.py index ad6051b1dad82e..924406de1de45c 100644 --- a/var/spack/repos/builtin/packages/r-assertive-sets/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-sets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-strings/package.py b/var/spack/repos/builtin/packages/r-assertive-strings/package.py index 3bb436cb914154..7a01d8708c0dc1 100644 --- a/var/spack/repos/builtin/packages/r-assertive-strings/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-strings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive-types/package.py b/var/spack/repos/builtin/packages/r-assertive-types/package.py index 019ea9481be030..252867c1b67c5d 100644 --- a/var/spack/repos/builtin/packages/r-assertive-types/package.py +++ b/var/spack/repos/builtin/packages/r-assertive-types/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertive/package.py b/var/spack/repos/builtin/packages/r-assertive/package.py index 89fb76f32e618f..a07ade15c33117 100644 --- a/var/spack/repos/builtin/packages/r-assertive/package.py +++ b/var/spack/repos/builtin/packages/r-assertive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index 29c68a51e8c6ee..c0e36a9666e65e 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RAssertthat(RPackage): cran = "assertthat" + license("GPL-3.0-only") + version("0.2.1", sha256="85cf7fcc4753a8c86da9a6f454e46c2a58ffc70c4f47cac4d3e3bcefda2a9e9f") version("0.2.0", sha256="d73ef79b1e75293ed889a99571b237a95829c099f7da094d4763f83ea6fde5f2") version("0.1", sha256="1363645a9a128f615aa0641dc5f5c5abd960b1c38320492366dad1e7a5c29a37") diff --git a/var/spack/repos/builtin/packages/r-automap/package.py b/var/spack/repos/builtin/packages/r-automap/package.py index 34a15d4847af75..712fe46eef6933 100644 --- a/var/spack/repos/builtin/packages/r-automap/package.py +++ b/var/spack/repos/builtin/packages/r-automap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RAutomap(RPackage): cran = "automap" + license("GPL-2.0-or-later") + version("1.1-9", sha256="f3070aed385352d2595ceddd74cb03cd71965f2e60b675832d16ec2ead6f3a43") depends_on("r@2.10.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-backports/package.py b/var/spack/repos/builtin/packages/r-backports/package.py index 9c60f1377403ea..45f7f2edd6a58b 100644 --- a/var/spack/repos/builtin/packages/r-backports/package.py +++ b/var/spack/repos/builtin/packages/r-backports/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RBackports(RPackage): cran = "backports" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.4.1", sha256="845c3c59fbb05e5a892c4231b955a0afdd331d82b7cc815bcff0672023242474") version("1.4.0", sha256="e7611565d24a852ad8b08579a7c67ad9121c1bda148bade98c7bec686e8dabbf") version("1.2.1", sha256="a2834bbd57e305e5d8010322f1906ea1789b3b5ba5eca77c5ff4248aceb7c2d5") diff --git a/var/spack/repos/builtin/packages/r-bamsignals/package.py b/var/spack/repos/builtin/packages/r-bamsignals/package.py index d42d1d9a41722c..87e8bb932928ed 100644 --- a/var/spack/repos/builtin/packages/r-bamsignals/package.py +++ b/var/spack/repos/builtin/packages/r-bamsignals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-base64/package.py b/var/spack/repos/builtin/packages/r-base64/package.py index 95919d7b22e366..98ae55a768283a 100644 --- a/var/spack/repos/builtin/packages/r-base64/package.py +++ b/var/spack/repos/builtin/packages/r-base64/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RBase64(RPackage): cran = "base64" + license("MIT") + version("2.0.1", sha256="4d22687c0195c2049e0af2c613b1ebcb908037010ad6e550bf47d69e842535f1") version("2.0", sha256="8e259c2b12446197d1152b83a81bab84ccb5a5b77021a9b5645dd4c63c804bd1") diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 4ae4538e353e92..452015432cca48 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RBase64enc(RPackage): cran = "base64enc" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.1-3", sha256="6d856d8a364bcdc499a0bf38bfd283b7c743d08f0b288174fba7dbf0a04b688d") depends_on("r@2.9.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-basilisk-utils/package.py b/var/spack/repos/builtin/packages/r-basilisk-utils/package.py index c6db94ccbad554..bc8e5210e3cf82 100644 --- a/var/spack/repos/builtin/packages/r-basilisk-utils/package.py +++ b/var/spack/repos/builtin/packages/r-basilisk-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RBasiliskUtils(RPackage): bioc = "basilisk.utils" + license("GPL-3.0-only") + version("1.12.0", commit="8314f9a72ecc0f20b180431aec93647320de8c2c") depends_on("r-dir-expiry", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-basilisk/package.py b/var/spack/repos/builtin/packages/r-basilisk/package.py index 0a94e3761a2bf0..f0351ba6eaed96 100644 --- a/var/spack/repos/builtin/packages/r-basilisk/package.py +++ b/var/spack/repos/builtin/packages/r-basilisk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RBasilisk(RPackage): bioc = "basilisk" + license("GPL-3.0-or-later") + version("1.12.0", commit="26c1c354526eb8d806268427a7c40b31bb89f489") depends_on("r-reticulate", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-bayesm/package.py b/var/spack/repos/builtin/packages/r-bayesm/package.py index 58dc59f0775c6f..faebd2b48d6b2d 100644 --- a/var/spack/repos/builtin/packages/r-bayesm/package.py +++ b/var/spack/repos/builtin/packages/r-bayesm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -31,6 +31,8 @@ class RBayesm(RPackage): cran = "bayesm" + license("GPL-2.0-or-later") + version("3.1-5", sha256="f223074ca41ede293b48350eac77a565e034f0f8cf3dd72d0e1d126cc58047a2") version("3.1-4", sha256="061b216c62bc72eab8d646ad4075f2f78823f9913344a781fa53ea7cf4a48f94") version("3.1-3", sha256="51e4827eca8cd4cf3626f3c2282543df7c392b3ffb843f4bfb386fe104642a10") diff --git a/var/spack/repos/builtin/packages/r-bayesplot/package.py b/var/spack/repos/builtin/packages/r-bayesplot/package.py index 2c8d3f3f6fd640..adec1f7bebb528 100644 --- a/var/spack/repos/builtin/packages/r-bayesplot/package.py +++ b/var/spack/repos/builtin/packages/r-bayesplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RBayesplot(RPackage): cran = "bayesplot" + license("GPL-3.0-or-later") + version("1.10.0", sha256="bb4cb92b1ae4cf8ae5f4b5cb092aba34af3d820d137e1f2265cca8f3e85113ff") version("1.9.0", sha256="0a81a4b99cf781334e57cfc3c469fad8b932a68204016a3bbca33cab4e2a1e43") version("1.8.1", sha256="d8d74201ea91fa5438714686ca22a947ec9375b6c12b0cfef010c57104b1aa2a") diff --git a/var/spack/repos/builtin/packages/r-bbmisc/package.py b/var/spack/repos/builtin/packages/r-bbmisc/package.py index 64787c14063175..1affd66f3c4c3c 100644 --- a/var/spack/repos/builtin/packages/r-bbmisc/package.py +++ b/var/spack/repos/builtin/packages/r-bbmisc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-beachmat/package.py b/var/spack/repos/builtin/packages/r-beachmat/package.py index 911efb01d9aa90..32afab212951bb 100644 --- a/var/spack/repos/builtin/packages/r-beachmat/package.py +++ b/var/spack/repos/builtin/packages/r-beachmat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-beanplot/package.py b/var/spack/repos/builtin/packages/r-beanplot/package.py index 91b6c2b6dbf2f2..b24feaee3fc4c5 100644 --- a/var/spack/repos/builtin/packages/r-beanplot/package.py +++ b/var/spack/repos/builtin/packages/r-beanplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RBeanplot(RPackage): cran = "beanplot" + license("GPL-2.0-only") + version("1.3.1", sha256="49158aee3449108fd857ef43fb777f55a2b975b350a4a710788996ad19dd15ad") version("1.2", sha256="49da299139a47171c5b4ccdea79ffbbc152894e05d552e676f135147c0c9b372") diff --git a/var/spack/repos/builtin/packages/r-beeswarm/package.py b/var/spack/repos/builtin/packages/r-beeswarm/package.py index 629442bb61572f..dc105aa4a7dfa8 100644 --- a/var/spack/repos/builtin/packages/r-beeswarm/package.py +++ b/var/spack/repos/builtin/packages/r-beeswarm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RBeeswarm(RPackage): cran = "beeswarm" + license("Artistic-2.0") + version("0.4.0", sha256="51f4339bf4080a2be84bb49a844c636625657fbed994abeaa42aead916c3d504") version("0.2.3", sha256="0115425e210dced05da8e162c8455526a47314f72e441ad2a33dcab3f94ac843") diff --git a/var/spack/repos/builtin/packages/r-bfast/package.py b/var/spack/repos/builtin/packages/r-bfast/package.py index 39948327887fc9..7d933ac4ab813f 100644 --- a/var/spack/repos/builtin/packages/r-bfast/package.py +++ b/var/spack/repos/builtin/packages/r-bfast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RBfast(RPackage): cran = "bfast" + license("GPL-2.0-or-later") + version("1.6.1", sha256="aaf479af1924691cbec8c67c68005c00d97cead51b2b44863c18acd4cea453ee") version("1.5.7", sha256="01585fe8944d05ebdb13795214077bc1365f0c0372e2a1f7edb914356dace558") diff --git a/var/spack/repos/builtin/packages/r-bfastspatial/package.py b/var/spack/repos/builtin/packages/r-bfastspatial/package.py index c7bcaf5b3a2026..e1ac087371cb07 100644 --- a/var/spack/repos/builtin/packages/r-bfastspatial/package.py +++ b/var/spack/repos/builtin/packages/r-bfastspatial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bglr/package.py b/var/spack/repos/builtin/packages/r-bglr/package.py index bbe7f6bcd79192..98a96e20b9e8e5 100644 --- a/var/spack/repos/builtin/packages/r-bglr/package.py +++ b/var/spack/repos/builtin/packages/r-bglr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RBglr(RPackage): cran = "BGLR" + license("GPL-3.0-only") + version("1.1.0", sha256="97c5bb8a461eb408e907693811b2d917efc993000da06591a83a3f5529451ea7") version("1.0.9", sha256="440a96f9f502e0d6ecc8c00720d1ccdbab5ee8223e1def6c930edaa9a9de9099") version("1.0.8", sha256="5e969590d80b2f272c02a43b487ab1ffa13af386e0342993e6ac484fc82c9b95") diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index 5f7482d33325d2..ec028b901db5d5 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biasedurn/package.py b/var/spack/repos/builtin/packages/r-biasedurn/package.py index 388c7df064a9ef..9b626313ab0e13 100644 --- a/var/spack/repos/builtin/packages/r-biasedurn/package.py +++ b/var/spack/repos/builtin/packages/r-biasedurn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bibtex/package.py b/var/spack/repos/builtin/packages/r-bibtex/package.py index a65e9929058f2e..81dac2f6989d35 100644 --- a/var/spack/repos/builtin/packages/r-bibtex/package.py +++ b/var/spack/repos/builtin/packages/r-bibtex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RBibtex(RPackage): cran = "bibtex" + license("GPL-2.0-or-later") + version("0.5.1", sha256="f3c1a0a4e666c4addd73ff13ce8ce073d73d10ebca36d333328ade8a0b493ed1") version("0.5.0", sha256="ec81b4ee5b43f2114afd18d266f4633451abe20013422eb03848f00924b79167") version("0.4.2.3", sha256="7bad194920b412781ac9754ad41058d52d3cd7186e1851c2bce3640490e9bc6d") diff --git a/var/spack/repos/builtin/packages/r-bigalgebra/package.py b/var/spack/repos/builtin/packages/r-bigalgebra/package.py index f3e1419ff07885..741c9a4ca2443b 100644 --- a/var/spack/repos/builtin/packages/r-bigalgebra/package.py +++ b/var/spack/repos/builtin/packages/r-bigalgebra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RBigalgebra(RPackage): cran = "bigalgebra" + license("LGPL-3.0-only OR Apache-2.0") + version("1.1.0", sha256="e51530287a64826a3dfb55f41594bc8123b7b4c9b2074f6c8de218fa8b525734") version("1.0.1", sha256="ff7e261d0aa0e0f498e926d923ac62fc5cb783fa1f74bb2ff76a09167388a9d2") version("1.0.0", sha256="f186b603bd660be0cc5b7a52c943e23e92fef264f0bc96a8858e38df6cfc4085") diff --git a/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py b/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py index 413ec4422ee1a1..80deb2b010e4ce 100644 --- a/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py +++ b/var/spack/repos/builtin/packages/r-bigmemory-sri/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bigmemory/package.py b/var/spack/repos/builtin/packages/r-bigmemory/package.py index 3637e7b3c1f044..caeca61193a357 100644 --- a/var/spack/repos/builtin/packages/r-bigmemory/package.py +++ b/var/spack/repos/builtin/packages/r-bigmemory/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RBigmemory(RPackage): cran = "bigmemory" + license("LGPL-3.0-only OR Apache-2.0") + version("4.6.1", sha256="b56e157c87ed6c4fc69d4cb9c697ae9a2001726e776e41aa7c48b35327b65141") version("4.5.36", sha256="18c67fbe6344b2f8223456c4f19ceebcf6c1166255eab81311001fd67a45ef0e") diff --git a/var/spack/repos/builtin/packages/r-bindr/package.py b/var/spack/repos/builtin/packages/r-bindr/package.py index 3d09b2df31e9c7..dd8ca3c52c1b05 100644 --- a/var/spack/repos/builtin/packages/r-bindr/package.py +++ b/var/spack/repos/builtin/packages/r-bindr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RBindr(RPackage): cran = "bindr" + license("MIT") + version("0.1.1", sha256="7c785ca77ceb3ab9282148bcecf64d1857d35f5b800531d49483622fe67505d0") version("0.1", sha256="cca166612eeafd6e1c961b34aaf177f9b47f8b4bc37520e277b9920eaa8b2535") diff --git a/var/spack/repos/builtin/packages/r-bindrcpp/package.py b/var/spack/repos/builtin/packages/r-bindrcpp/package.py index 3fd53da24382b0..8bb8749e9957a2 100644 --- a/var/spack/repos/builtin/packages/r-bindrcpp/package.py +++ b/var/spack/repos/builtin/packages/r-bindrcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RBindrcpp(RPackage): cran = "bindrcpp" + license("MIT") + version("0.2.2", sha256="48130709eba9d133679a0e959e49a7b14acbce4f47c1e15c4ab46bd9e48ae467") version("0.2", sha256="d0efa1313cb8148880f7902a4267de1dcedae916f28d9a0ef5911f44bf103450") diff --git a/var/spack/repos/builtin/packages/r-bio3d/package.py b/var/spack/repos/builtin/packages/r-bio3d/package.py index accb4018505fac..ebd95fd3656059 100644 --- a/var/spack/repos/builtin/packages/r-bio3d/package.py +++ b/var/spack/repos/builtin/packages/r-bio3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RBio3d(RPackage): cran = "bio3d" + license("GPL-2.0-or-later") + version("2.4-4", sha256="5654eac10d33e4235ef89292e3b99006d8812b6bfaaa3d6fb540312160fd9de9") version("2.4-3", sha256="c6031f0d9033260a938171d0fa70720962e352935eb7bd2ddb9b92b93abe6a74") version("2.4-2", sha256="91415766cda0f96557e6bc568dbce8d44254a9460f2e2d0beed0ce14ffad6ccb") diff --git a/var/spack/repos/builtin/packages/r-biobase/package.py b/var/spack/repos/builtin/packages/r-biobase/package.py index 061dbf30f08d2d..bdc2abc2ff3fbd 100644 --- a/var/spack/repos/builtin/packages/r-biobase/package.py +++ b/var/spack/repos/builtin/packages/r-biobase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocfilecache/package.py b/var/spack/repos/builtin/packages/r-biocfilecache/package.py index 43679532e1004b..61dc1a9126df7d 100644 --- a/var/spack/repos/builtin/packages/r-biocfilecache/package.py +++ b/var/spack/repos/builtin/packages/r-biocfilecache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocgenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py index b510d8385bfa8c..a598dab5c56daa 100644 --- a/var/spack/repos/builtin/packages/r-biocgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocinstaller/package.py b/var/spack/repos/builtin/packages/r-biocinstaller/package.py index c9f4fc394684c3..284bb1d2c706c5 100644 --- a/var/spack/repos/builtin/packages/r-biocinstaller/package.py +++ b/var/spack/repos/builtin/packages/r-biocinstaller/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocio/package.py b/var/spack/repos/builtin/packages/r-biocio/package.py index 8efedf2ca9f458..03a12802c3071c 100644 --- a/var/spack/repos/builtin/packages/r-biocio/package.py +++ b/var/spack/repos/builtin/packages/r-biocio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocmanager/package.py b/var/spack/repos/builtin/packages/r-biocmanager/package.py index be935fb765b184..8bf3a70367d48d 100644 --- a/var/spack/repos/builtin/packages/r-biocmanager/package.py +++ b/var/spack/repos/builtin/packages/r-biocmanager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocneighbors/package.py b/var/spack/repos/builtin/packages/r-biocneighbors/package.py index d70fd468943dbb..c9b62f26a2ca6b 100644 --- a/var/spack/repos/builtin/packages/r-biocneighbors/package.py +++ b/var/spack/repos/builtin/packages/r-biocneighbors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocparallel/package.py b/var/spack/repos/builtin/packages/r-biocparallel/package.py index 71ffbbd7fddfd1..3f61181f28f860 100644 --- a/var/spack/repos/builtin/packages/r-biocparallel/package.py +++ b/var/spack/repos/builtin/packages/r-biocparallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocsingular/package.py b/var/spack/repos/builtin/packages/r-biocsingular/package.py index 7d2e240f7334bf..4546a53020a6c6 100644 --- a/var/spack/repos/builtin/packages/r-biocsingular/package.py +++ b/var/spack/repos/builtin/packages/r-biocsingular/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocstyle/package.py b/var/spack/repos/builtin/packages/r-biocstyle/package.py index 4f818aeb34f4cd..3ee5b708f81577 100644 --- a/var/spack/repos/builtin/packages/r-biocstyle/package.py +++ b/var/spack/repos/builtin/packages/r-biocstyle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biocversion/package.py b/var/spack/repos/builtin/packages/r-biocversion/package.py index bee33502114e67..c5b34ef7471677 100644 --- a/var/spack/repos/builtin/packages/r-biocversion/package.py +++ b/var/spack/repos/builtin/packages/r-biocversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biom-utils/package.py b/var/spack/repos/builtin/packages/r-biom-utils/package.py index 45b6c74ce8abaf..1f2bddb053ed22 100644 --- a/var/spack/repos/builtin/packages/r-biom-utils/package.py +++ b/var/spack/repos/builtin/packages/r-biom-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biomart/package.py b/var/spack/repos/builtin/packages/r-biomart/package.py index 57a2ac6e8b4b82..8ca7c136f91c7d 100644 --- a/var/spack/repos/builtin/packages/r-biomart/package.py +++ b/var/spack/repos/builtin/packages/r-biomart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biomartr/package.py b/var/spack/repos/builtin/packages/r-biomartr/package.py index b6d23170d4cd74..cef67089bb4cdf 100644 --- a/var/spack/repos/builtin/packages/r-biomartr/package.py +++ b/var/spack/repos/builtin/packages/r-biomartr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RBiomartr(RPackage): cran = "biomartr" + license("GPL-2.0-only") + version("1.0.2", sha256="7fd6cccd915aa39e593fb7591107ab9792d98a119dd42f3f666e5184f4e42743") version("0.9.2", sha256="d88085696e9c5614828602254c33f2cdd3bbfeebc2f21a705eee3cb961097c89") diff --git a/var/spack/repos/builtin/packages/r-biomformat/package.py b/var/spack/repos/builtin/packages/r-biomformat/package.py index d9a2cc28ec2079..a94535d1bdff9f 100644 --- a/var/spack/repos/builtin/packages/r-biomformat/package.py +++ b/var/spack/repos/builtin/packages/r-biomformat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biostrings/package.py b/var/spack/repos/builtin/packages/r-biostrings/package.py index 2297a0a05449d4..796a66344f01b0 100644 --- a/var/spack/repos/builtin/packages/r-biostrings/package.py +++ b/var/spack/repos/builtin/packages/r-biostrings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-biovizbase/package.py b/var/spack/repos/builtin/packages/r-biovizbase/package.py index 45c015ef6695f3..d2f16d9104cf3a 100644 --- a/var/spack/repos/builtin/packages/r-biovizbase/package.py +++ b/var/spack/repos/builtin/packages/r-biovizbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bit/package.py b/var/spack/repos/builtin/packages/r-bit/package.py index 9974eda3c9aef3..c386c3b77b47ea 100644 --- a/var/spack/repos/builtin/packages/r-bit/package.py +++ b/var/spack/repos/builtin/packages/r-bit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RBit(RPackage): cran = "bit" + license("GPL-2.0-only OR GPL-3.0-only") + version("4.0.5", sha256="f0f2536a8874b6a30b80baefbc68cb21f0ffbf51f3877bda8038c3f9f354bfbc") version("4.0.4", sha256="e404841fbe4ebefe4ecd4392effe673a8c9fa05f97952c4ce6e2f6159bd2f168") version("1.1-14", sha256="5cbaace1fb643a665a6ca69b90f7a6d624270de82420ca7a44f306753fcef254") diff --git a/var/spack/repos/builtin/packages/r-bit64/package.py b/var/spack/repos/builtin/packages/r-bit64/package.py index 59c031563b3e77..a7e9027e821b00 100644 --- a/var/spack/repos/builtin/packages/r-bit64/package.py +++ b/var/spack/repos/builtin/packages/r-bit64/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RBit64(RPackage): cran = "bit64" + license("GPL-2.0-only OR GPL-3.0-only") + version("4.0.5", sha256="25df6826ea5e93241c4874cad4fa8dadc87a40f4ff74c9107aa12a9e033e1578") version("0.9-7", sha256="7b9aaa7f971198728c3629f9ba1a1b24d53db5c7e459498b0fdf86bbd3dff61f") diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index 04e68e4eac2147..07d2a29ad29e26 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RBitops(RPackage): cran = "bitops" + license("GPL-2.0-or-later") + version("1.0-7", sha256="e9b5fc92c39f94a10cd0e13f3d6e2a9c17b75ea01467077a51d47a5f708517c4") version("1.0-6", sha256="9b731397b7166dd54941fb0d2eac6df60c7a483b2e790f7eb15b4d7b79c9d69c") diff --git a/var/spack/repos/builtin/packages/r-blavaan/package.py b/var/spack/repos/builtin/packages/r-blavaan/package.py index 206e7ba9e6f018..5858afc3246bf0 100644 --- a/var/spack/repos/builtin/packages/r-blavaan/package.py +++ b/var/spack/repos/builtin/packages/r-blavaan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RBlavaan(RPackage): cran = "blavaan" + license("GPL-3.0-or-later") + version("0.4-7", sha256="43577264a1faff3cf98fce2c03b729816b40a82d36846458b8026b62da3008c3") version("0.4-3", sha256="a9f9f7b32aab7e7f179340c9f0f9d154b5fac51352c4fd590d317c201fe81b74") version("0.4-1", sha256="afb077d72f84ef0b6f45ef2ccb8335358042943c32a3472a9ca239ebca1c4aa4") diff --git a/var/spack/repos/builtin/packages/r-blob/package.py b/var/spack/repos/builtin/packages/r-blob/package.py index 2c0d36265b916f..4237330b11a054 100644 --- a/var/spack/repos/builtin/packages/r-blob/package.py +++ b/var/spack/repos/builtin/packages/r-blob/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RBlob(RPackage): cran = "blob" + license("MIT") + version("1.2.4", sha256="d08922ebc4147d930fe4762b1b289935217308c6d3fcaa5ae028ce3f5cf2728f") version("1.2.3", sha256="2d88d683ee3d1b56b332b5c7769979b5d3994b5d9285ea634ec919576da3631b") version("1.2.2", sha256="4976053c65994c769a4c22b4553bea0bd9c623b3b991dbaf023d2a164770c7fa") diff --git a/var/spack/repos/builtin/packages/r-blockmodeling/package.py b/var/spack/repos/builtin/packages/r-blockmodeling/package.py index f6d27eefcf22fb..bc330e7b024276 100644 --- a/var/spack/repos/builtin/packages/r-blockmodeling/package.py +++ b/var/spack/repos/builtin/packages/r-blockmodeling/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RBlockmodeling(RPackage): cran = "blockmodeling" + license("GPL-2.0-or-later") + version("1.1.4", sha256="69ce17ed96ca754a6308edb62188e0040e357568b975ce8986f68ecb2fead2b8") version("1.1.3", sha256="5f705f92c9b96dcbdd6f109c6a99f88d70c576485369700b82391b6a75afbda6") version("1.0.5", sha256="18c227bb52f28aff4dae8929563474e3e006e238438c823b67dc6baa897f88ed") diff --git a/var/spack/repos/builtin/packages/r-bluster/package.py b/var/spack/repos/builtin/packages/r-bluster/package.py index c9f653ab412bec..da733833a5025d 100644 --- a/var/spack/repos/builtin/packages/r-bluster/package.py +++ b/var/spack/repos/builtin/packages/r-bluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bmp/package.py b/var/spack/repos/builtin/packages/r-bmp/package.py index 573b1dc2a2390e..6620ed91090fdc 100644 --- a/var/spack/repos/builtin/packages/r-bmp/package.py +++ b/var/spack/repos/builtin/packages/r-bmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class RBmp(RPackage): cran = "bmp" + license("GPL-2.0-or-later") + version("0.3", sha256="bdf790249b932e80bc3a188a288fef079d218856cf64ffb88428d915423ea649") diff --git a/var/spack/repos/builtin/packages/r-bookdown/package.py b/var/spack/repos/builtin/packages/r-bookdown/package.py index ca5079896c6e29..b798a80533ab1a 100644 --- a/var/spack/repos/builtin/packages/r-bookdown/package.py +++ b/var/spack/repos/builtin/packages/r-bookdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RBookdown(RPackage): cran = "bookdown" + license("GPL-3.0-only") + version("0.33", sha256="2288e1d0c383e6ab49202a18db6cc1a04c3adc1b25da646cc46167bc6c2892c3") version("0.29", sha256="5b4e3dc44a5c6574e3d9e19ebe7897d3ddcf6eaffe8214e1d272b545929ff723") version("0.26", sha256="c6207288cb72ea7c555cbad449c61278e94b742cac1f610879fb3f2d60b2b185") diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index d09c64b40591a6..ae81554a166608 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RBoot(RPackage): cran = "boot" + license("custom") + version("1.3-28.1", sha256="d4cde76fcc8ccc7ffa329de69147b66a6a93a10188e89342fd18207b1d02ff53") version("1.3-28", sha256="9f7158fd2714659f590c3955651893dc24bd8f39196bc5a4cc35b0b031744a32") version("1.3-25", sha256="464835fcb453072346ce49e4ae318e04c9dba682349be49db616623b6088fbbe") diff --git a/var/spack/repos/builtin/packages/r-boruta/package.py b/var/spack/repos/builtin/packages/r-boruta/package.py index 8e97547d004a12..68a6bc2d833c04 100644 --- a/var/spack/repos/builtin/packages/r-boruta/package.py +++ b/var/spack/repos/builtin/packages/r-boruta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index bcf6b585381d76..1e2398a8ea0e41 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RBrew(RPackage): cran = "brew" + license("GPL-2.0-only") + version("1.0-8", sha256="11652d5a7042d645cc5be5f9f97ff4d46083cea7d3ad2dd6ad1570b52c097826") version("1.0-7", sha256="38b859c1dca63479f6937c593da8f806f2b3279585bb6e20ecff1b898469e76e") version("1.0-6", sha256="d70d1a9a01cf4a923b4f11e4374ffd887ad3ff964f35c6f9dc0f29c8d657f0ed") diff --git a/var/spack/repos/builtin/packages/r-bridgesampling/package.py b/var/spack/repos/builtin/packages/r-bridgesampling/package.py index 1e584b8f205347..61a5c61511e2ea 100644 --- a/var/spack/repos/builtin/packages/r-bridgesampling/package.py +++ b/var/spack/repos/builtin/packages/r-bridgesampling/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RBridgesampling(RPackage): cran = "bridgesampling" + license("GPL-2.0-or-later") + version("1.1-2", sha256="54ecd39aa2e36d4d521d3d36425f9fe56a3f8547df6048c814c5931d790f3e6b") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-brio/package.py b/var/spack/repos/builtin/packages/r-brio/package.py index bf669981e05a9d..c4feef388bd3a2 100644 --- a/var/spack/repos/builtin/packages/r-brio/package.py +++ b/var/spack/repos/builtin/packages/r-brio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RBrio(RPackage): cran = "brio" + license("MIT") + version("1.1.3", sha256="eaa89041856189bee545bf1c42c7920a0bb0f1f70bb477487c467ee3e8fedcc6") version("1.1.0", sha256="6bb3a3b47bea13f1a1e3dcdc8b9f688502643e4b40a481a34aa04a261aabea38") diff --git a/var/spack/repos/builtin/packages/r-brms/package.py b/var/spack/repos/builtin/packages/r-brms/package.py index 3f415abaf85d9e..e1ce9accb9fbff 100644 --- a/var/spack/repos/builtin/packages/r-brms/package.py +++ b/var/spack/repos/builtin/packages/r-brms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RBrms(RPackage): cran = "brms" + license("GPL-2.0-only") + version("2.19.0", sha256="0e146842c7acfcc6b8273df536eabb5279fb3bf2ae27ce1696f7d838d94fe5c1") version("2.18.0", sha256="63914be03cd1c4e6333317d22d7827ba2dc0414cb0dc88337cf74763ba07e111") version("2.17.0", sha256="24e5a3a40b81bea558e8f660d0de7fd1a4c2080c7553baac98f34dd2682ece71") diff --git a/var/spack/repos/builtin/packages/r-brobdingnag/package.py b/var/spack/repos/builtin/packages/r-brobdingnag/package.py index edaeb3bf01a4de..5e424458ae6d7a 100644 --- a/var/spack/repos/builtin/packages/r-brobdingnag/package.py +++ b/var/spack/repos/builtin/packages/r-brobdingnag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-broom/package.py b/var/spack/repos/builtin/packages/r-broom/package.py index c6e9b5721843f7..0f48847a4c438b 100644 --- a/var/spack/repos/builtin/packages/r-broom/package.py +++ b/var/spack/repos/builtin/packages/r-broom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RBroom(RPackage): cran = "broom" + license("MIT") + version("1.0.4", sha256="1d5f11b509786a8a45ffdd137243e24d6445f2944947cbd62a0734a06add0ad6") version("1.0.1", sha256="4b5e5aa485f0e23ed993088fc84159e31a00087e3a12327071dda25193382892") version("0.8.0", sha256="66a1095d4430450dc810a5cea61cd7e7bee0e23739dcf5ddc5b57c9894fcf999") diff --git a/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py b/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py index 51ada279b8b00d..422fa08409a08a 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome-hsapiens-ucsc-hg19/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bsgenome/package.py b/var/spack/repos/builtin/packages/r-bsgenome/package.py index 5f5eb983b569f4..abefcf3fbac859 100644 --- a/var/spack/repos/builtin/packages/r-bsgenome/package.py +++ b/var/spack/repos/builtin/packages/r-bsgenome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bslib/package.py b/var/spack/repos/builtin/packages/r-bslib/package.py index 75302e41377043..f664c309595d6e 100644 --- a/var/spack/repos/builtin/packages/r-bslib/package.py +++ b/var/spack/repos/builtin/packages/r-bslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RBslib(RPackage): cran = "bslib" + license("MIT") + version("0.4.2", sha256="9a40b7a1bbe409af273e1e940d921ab198ea576548f06f055f552f70ff822f19") version("0.4.1", sha256="4ebd1fc84cd19b414e8f8c13fb95270fc28ede125b6e58b08c574ca8c9e0e62f") version("0.4.0", sha256="fbea4ecec726f23618e825624f1d9c03939f765ca5a490b171ebf95b815475c2") diff --git a/var/spack/repos/builtin/packages/r-bsseq/package.py b/var/spack/repos/builtin/packages/r-bsseq/package.py index 7b96c3370b99e5..27fd2500d5bc0f 100644 --- a/var/spack/repos/builtin/packages/r-bsseq/package.py +++ b/var/spack/repos/builtin/packages/r-bsseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bumphunter/package.py b/var/spack/repos/builtin/packages/r-bumphunter/package.py index 9b560ea4d82358..43259b41c9279d 100644 --- a/var/spack/repos/builtin/packages/r-bumphunter/package.py +++ b/var/spack/repos/builtin/packages/r-bumphunter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-bwstest/package.py b/var/spack/repos/builtin/packages/r-bwstest/package.py index 7d0123ea902c39..85a8808096db96 100644 --- a/var/spack/repos/builtin/packages/r-bwstest/package.py +++ b/var/spack/repos/builtin/packages/r-bwstest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index cb917121380b73..76ef1fa69747f6 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ca/package.py b/var/spack/repos/builtin/packages/r-ca/package.py index 61400f57e4d2f3..f227cda718350b 100644 --- a/var/spack/repos/builtin/packages/r-ca/package.py +++ b/var/spack/repos/builtin/packages/r-ca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCa(RPackage): cran = "ca" + license("GPL-2.0-or-later") + version("0.71.1", sha256="040c2fc94c356075f116cc7cd880530b3c9e02206c0035182c03a525ee99b424") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-cachem/package.py b/var/spack/repos/builtin/packages/r-cachem/package.py index 5fdbf1fd81cc20..b12ed8ef58ff60 100644 --- a/var/spack/repos/builtin/packages/r-cachem/package.py +++ b/var/spack/repos/builtin/packages/r-cachem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCachem(RPackage): cran = "cachem" + license("MIT") + version("1.0.7", sha256="234fad2a947d1e1fb87d3fa92abf9197877772e31bc81ae5991ae69689b6320a") version("1.0.6", sha256="9a9452f7bcf3f79436c418b3c3290449fb8fd338714d9b992153754d112f1864") diff --git a/var/spack/repos/builtin/packages/r-cairo/package.py b/var/spack/repos/builtin/packages/r-cairo/package.py index 7c5534809a809e..8f025f25711620 100644 --- a/var/spack/repos/builtin/packages/r-cairo/package.py +++ b/var/spack/repos/builtin/packages/r-cairo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-callr/package.py b/var/spack/repos/builtin/packages/r-callr/package.py index 6b351096b34dfe..33abeee94dda7b 100644 --- a/var/spack/repos/builtin/packages/r-callr/package.py +++ b/var/spack/repos/builtin/packages/r-callr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCallr(RPackage): cran = "callr" + license("MIT") + version("3.7.3", sha256="567bfedf073a1d4c5785f0553341608a214938110567b9a6495ff20ebb2fd04e") version("3.7.2", sha256="12da8a212679e450d8d43c3c6e61ed09b82047f376f316f6f6392f1638580307") version("3.7.0", sha256="d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a") diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index 3ac525aa39a4df..316e574c6af02e 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RCar(RPackage): cran = "car" + license("GPL-2.0-or-later") + version("3.1-2", sha256="89263491977ac8e9406b2f4b1638bf06c7ddd1b0e0e3ecda4be61420474674c8") version("3.1-1", sha256="8fc55815eed7e46a32b54da9e0bfa4b74a8d082d73d896e3372f2a413b6bd2bc") version("3.1-0", sha256="bd52b4eaea46ce828fccd93445301d06ebd265e2ffff796064875a8c0f0aea21") diff --git a/var/spack/repos/builtin/packages/r-caracas/package.py b/var/spack/repos/builtin/packages/r-caracas/package.py index 52bad211d22c36..fea4048e4ef3cd 100644 --- a/var/spack/repos/builtin/packages/r-caracas/package.py +++ b/var/spack/repos/builtin/packages/r-caracas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCaracas(RPackage): cran = "caracas" + license("GPL-2.0-or-later") + version("2.0.0", sha256="9271239bf7457787371cbd44be74cb9909d67ab7c975b1744d8cf60d8b044b95") version("1.1.2", sha256="9c726c77508617e74d1a11ac6e276973df42e1ad81145db455cc6e420526c757") version("1.1.1", sha256="e14487c9492417cf5c7d7373c37dbb4fea4d91180a1a03154e51eaa7878b2769") diff --git a/var/spack/repos/builtin/packages/r-cardata/package.py b/var/spack/repos/builtin/packages/r-cardata/package.py index e7b8cd0c2ad133..400ff9f35c8e94 100644 --- a/var/spack/repos/builtin/packages/r-cardata/package.py +++ b/var/spack/repos/builtin/packages/r-cardata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index b8ba89be9c3dfd..ca64c4c695088d 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RCaret(RPackage): cran = "caret" + license("GPL-2.0-or-later") + version("6.0-94", sha256="2715e83ca260bb739cd926a55b0d2da1e3f6308b17b56862466e738d930d29a8") version("6.0-93", sha256="4c156b88879d390436a54779ea19ffbae3f476533d83caaf30400d76130c4a07") version("6.0-92", sha256="1d814a2a921a23ad8b9a7da6f788e6abc06f5668b3918bd440d4355bc4b81511") diff --git a/var/spack/repos/builtin/packages/r-caretensemble/package.py b/var/spack/repos/builtin/packages/r-caretensemble/package.py index 971e216a671021..a3114fbd68ace9 100644 --- a/var/spack/repos/builtin/packages/r-caretensemble/package.py +++ b/var/spack/repos/builtin/packages/r-caretensemble/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RCaretensemble(RPackage): cran = "caretEnsemble" + license("MIT") + version("2.0.2", sha256="d8fcf3742beddc723b68677682708408cc11dcb8b36a0f70f03e7c4763e04f4d") version("2.0.1", sha256="7e595e604ce2d9d32afbc5404e6fcbcd7f80e687316e9ca3303aca3e44c3ef88") diff --git a/var/spack/repos/builtin/packages/r-caroline/package.py b/var/spack/repos/builtin/packages/r-caroline/package.py index 91b17bbb0efda1..a4db03a3608980 100644 --- a/var/spack/repos/builtin/packages/r-caroline/package.py +++ b/var/spack/repos/builtin/packages/r-caroline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RCaroline(RPackage): cran = "caroline" + license("Artistic-2.0") + version("0.9.0", sha256="7231daacf2f0e89d9363ea919071f8352ae487011f56e84a4054de11a9243ac8") version("0.8.0", sha256="58f464711f7279ca2aa173e6ce29d3308e01db37dccefbbf14cd7720c0231976") version("0.7.6", sha256="e7ba948f7d87f091b498dd0eec2ca4fdad7af4e2bbb67e0945c2f0d3f2eadda9") diff --git a/var/spack/repos/builtin/packages/r-category/package.py b/var/spack/repos/builtin/packages/r-category/package.py index 3d8ef911dd1968..8c61318c45f19d 100644 --- a/var/spack/repos/builtin/packages/r-category/package.py +++ b/var/spack/repos/builtin/packages/r-category/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index 79819bb4e923d1..db3c6466e8cde2 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-cca/package.py b/var/spack/repos/builtin/packages/r-cca/package.py index 25131dbc5c2356..c33b4e205c0b17 100644 --- a/var/spack/repos/builtin/packages/r-cca/package.py +++ b/var/spack/repos/builtin/packages/r-cca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ccp/package.py b/var/spack/repos/builtin/packages/r-ccp/package.py index 96bf50a8645e35..41205491aedd7c 100644 --- a/var/spack/repos/builtin/packages/r-ccp/package.py +++ b/var/spack/repos/builtin/packages/r-ccp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-cdcfluview/package.py b/var/spack/repos/builtin/packages/r-cdcfluview/package.py index de160bc18c109b..ff6211d5ac011f 100644 --- a/var/spack/repos/builtin/packages/r-cdcfluview/package.py +++ b/var/spack/repos/builtin/packages/r-cdcfluview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RCdcfluview(RPackage): cran = "cdcfluview" + license("MIT") + version("0.9.4", sha256="776a155c4f0cc678fde94a6d47cc2783ff5c199f26cce642461092e1b6311dad") version("0.9.2", sha256="f2080fc80c5e0241f8b657f5ac3a251ea89dfc26c1ab13bdfaed4d4e97495015") version("0.9.0", sha256="1b2064886858cbb1790ef808d88fbab75d3a9cf55e720638221a3377ff8dd244") diff --git a/var/spack/repos/builtin/packages/r-cellranger/package.py b/var/spack/repos/builtin/packages/r-cellranger/package.py index 1da8451f80c19c..c93bf3ed8eb764 100644 --- a/var/spack/repos/builtin/packages/r-cellranger/package.py +++ b/var/spack/repos/builtin/packages/r-cellranger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RCellranger(RPackage): cran = "cellranger" + license("MIT") + version("1.1.0", sha256="5d38f288c752bbb9cea6ff830b8388bdd65a8571fd82d8d96064586bd588cf99") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-champ/package.py b/var/spack/repos/builtin/packages/r-champ/package.py index 97251babef31af..0e89c6c2f4de29 100644 --- a/var/spack/repos/builtin/packages/r-champ/package.py +++ b/var/spack/repos/builtin/packages/r-champ/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-champdata/package.py b/var/spack/repos/builtin/packages/r-champdata/package.py index 5714f5cf7f07cf..d448ee85467d9e 100644 --- a/var/spack/repos/builtin/packages/r-champdata/package.py +++ b/var/spack/repos/builtin/packages/r-champdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-checkmate/package.py b/var/spack/repos/builtin/packages/r-checkmate/package.py index 7312a911bec6f5..ac294085f09e84 100644 --- a/var/spack/repos/builtin/packages/r-checkmate/package.py +++ b/var/spack/repos/builtin/packages/r-checkmate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCheckmate(RPackage): cran = "checkmate" + license("BSD-3-Clause") + version("2.1.0", sha256="b784dd5163a0350d084ef34882d9781373839dedeaa9a8b8e6187d773d0d21c6") version("2.0.0", sha256="0dc25b0e20c04836359df1885d099c6e4ad8ae0e585a9e4107f7ea945d9c6fa4") version("1.9.4", sha256="faa25754b757fe483b876f5d07b73f76f69a1baa971420892fadec4af4bbad21") diff --git a/var/spack/repos/builtin/packages/r-checkpoint/package.py b/var/spack/repos/builtin/packages/r-checkpoint/package.py index d7d54e9384c861..47220b6275415c 100644 --- a/var/spack/repos/builtin/packages/r-checkpoint/package.py +++ b/var/spack/repos/builtin/packages/r-checkpoint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class RCheckpoint(RPackage): cran = "checkpoint" + license("GPL-2.0-only") + version("1.0.2", sha256="a80390d834534e908058a597a2a5ee60a111023e76f13f370949963582dd07a5") version("1.0.1", sha256="8542029395b7d557c1b39423326611f408788fcd02f5cbeb5ed252f368f8dcd2") version("1.0.0", sha256="d36146093763ca29e0296729399b96e0f2e7764745283d6cea1066a96fa085a7") diff --git a/var/spack/repos/builtin/packages/r-chemometrics/package.py b/var/spack/repos/builtin/packages/r-chemometrics/package.py index 94a70b5fcc98cb..fac0b96c3e44e6 100644 --- a/var/spack/repos/builtin/packages/r-chemometrics/package.py +++ b/var/spack/repos/builtin/packages/r-chemometrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RChemometrics(RPackage): cran = "chemometrics" + license("GPL-3.0-or-later") + version("1.4.2", sha256="b705832fa167dc24b52b642f571ed1efd24c5f53ba60d02c7797986481b6186a") version("1.4.1", sha256="7646da0077657d672356204aa2094be68e10ec13617f92ae97ff53a389053905") version("1.3.9", sha256="553eda53789b6a4d0f77842c175f98be5b9a04bccc9d2ba0ecde1bb5c8a53f21") diff --git a/var/spack/repos/builtin/packages/r-chipseq/package.py b/var/spack/repos/builtin/packages/r-chipseq/package.py index 44983cd9daca86..bad1c3369226c4 100644 --- a/var/spack/repos/builtin/packages/r-chipseq/package.py +++ b/var/spack/repos/builtin/packages/r-chipseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index ee88e1687e9837..fbce82e224f0a4 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RChron(RPackage): cran = "chron" + license("GPL-2.0-only") + version("2.3-60", sha256="0e0675cec55b6cea87fc5776846215e0445442554684120079e66013067491ee") version("2.3-58", sha256="057fc628cde330c22b9d20365316d3632c2d217f4f2f97d39b1d1a2c93f766d0") version("2.3-57", sha256="9645d86a84d1afc12a0accf4f826fdd40e6d050a313424ad70f8085e8f19c232") diff --git a/var/spack/repos/builtin/packages/r-circlize/package.py b/var/spack/repos/builtin/packages/r-circlize/package.py index e712336afb905a..2409a909fa5ac3 100644 --- a/var/spack/repos/builtin/packages/r-circlize/package.py +++ b/var/spack/repos/builtin/packages/r-circlize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RCirclize(RPackage): cran = "circlize" + license("MIT") + version("0.4.15", sha256="d602d55313fe7c675109153d6ed3b99bdba5292e1deefed71d5a21e0db595cc7") version("0.4.13", sha256="6cbadbf8e8b1abbd71a79080677d2b95f2bdd18f2e4d707c32d5c2ff26c5369b") version("0.4.12", sha256="b3b60caa5292cf980cf474c85f59582f6862925631a4da86a78eac05903252f4") diff --git a/var/spack/repos/builtin/packages/r-circstats/package.py b/var/spack/repos/builtin/packages/r-circstats/package.py index 5a8047307cac35..3e14ebb8701db4 100644 --- a/var/spack/repos/builtin/packages/r-circstats/package.py +++ b/var/spack/repos/builtin/packages/r-circstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RCircstats(RPackage): maintainers("dorton21") + license("GPL-2.0-only") + version("0.2-6", sha256="8efed93b75b314577341effea214e3dd6e0a515cfe1212eb051047a1f3276f1d") depends_on("r-mass", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index 5c2debd6ab6cd0..8516aabd74339f 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RClass(RPackage): cran = "class" + license("GPL-2.0-only OR GPL-3.0-only") + version("7.3-21", sha256="0c19404aa4d2da61a62495e788b07c8e429c4c5ee64486ea5e6dd347bcaecddf") version("7.3-20", sha256="e65b046bc72b312ff0c5dc7feba4fa3e9bc63387274d44911493782b85f65483") version("7.3-19", sha256="7820ae94b22009561a69ed1f8b2ca2a3814be6a656e9884738206997caecbe37") diff --git a/var/spack/repos/builtin/packages/r-classint/package.py b/var/spack/repos/builtin/packages/r-classint/package.py index ed87cff3858001..5eec1170fb0079 100644 --- a/var/spack/repos/builtin/packages/r-classint/package.py +++ b/var/spack/repos/builtin/packages/r-classint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-cli/package.py b/var/spack/repos/builtin/packages/r-cli/package.py index 80df40b5efabef..ff4540746592ae 100644 --- a/var/spack/repos/builtin/packages/r-cli/package.py +++ b/var/spack/repos/builtin/packages/r-cli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RCli(RPackage): cran = "cli" + license("MIT") + version("3.6.1", sha256="be3006cec7e67f9ae25e21b4658c4bec680038c2ef7467df5f14da3311a05e36") version("3.4.1", sha256="1c585efbfd8b8685c66fac34bcb60f28c351691bb4b9931df214e6e47fd9744e") version("3.3.0", sha256="c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63") diff --git a/var/spack/repos/builtin/packages/r-clipr/package.py b/var/spack/repos/builtin/packages/r-clipr/package.py index 56df3ed97c0a9d..6f6ac97c9b9f4e 100644 --- a/var/spack/repos/builtin/packages/r-clipr/package.py +++ b/var/spack/repos/builtin/packages/r-clipr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RClipr(RPackage): cran = "clipr" + license("GPL-3.0-only") + version("0.8.0", sha256="32c2931992fbec9c31b71de3e27059f1cbb45b4b1f45fd42e0e8dbcec6de3be9") version("0.7.1", sha256="ffad477b07847e3b68f7e4406bbd323025a8dae7e3c768943d4d307ee3248afb") version("0.7.0", sha256="03a4e4b72ec63bd08b53fe62673ffc19a004cc846957a335be2b30d046b8c2e2") diff --git a/var/spack/repos/builtin/packages/r-clisymbols/package.py b/var/spack/repos/builtin/packages/r-clisymbols/package.py index fccd0f1530d71c..a245a7d996d20c 100644 --- a/var/spack/repos/builtin/packages/r-clisymbols/package.py +++ b/var/spack/repos/builtin/packages/r-clisymbols/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class RClisymbols(RPackage): cran = "clisymbols" + license("MIT") + version("1.2.0", sha256="0649f2ce39541820daee3ed408d765eddf83db5db639b493561f4e5fbf88efe0") diff --git a/var/spack/repos/builtin/packages/r-clock/package.py b/var/spack/repos/builtin/packages/r-clock/package.py index cb35a5b63035be..89ddd6dd78c8f9 100644 --- a/var/spack/repos/builtin/packages/r-clock/package.py +++ b/var/spack/repos/builtin/packages/r-clock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RClock(RPackage): cran = "clock" + license("MIT") + version("0.6.1", sha256="f80c385fd8229538968ffb71d7de53ddc82bfcec6641f8e76f299546c43c1702") depends_on("r@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-clue/package.py b/var/spack/repos/builtin/packages/r-clue/package.py index 45c9161f2ea998..ded46e1b06dce7 100644 --- a/var/spack/repos/builtin/packages/r-clue/package.py +++ b/var/spack/repos/builtin/packages/r-clue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RClue(RPackage): cran = "clue" + license("GPL-2.0-only") + version("0.3-64", sha256="f45cb7a84c87ddca2b9f7c2ea9505016d002e6fda23322e6d57466c7a4de28af") version("0.3-62", sha256="575a3fa2c4aa1ae5c7e35f4462f2f331d291d87916aa12f0d11f61988d5e1ed2") version("0.3-61", sha256="71311b16ce380fd9a8834be95b55b3d1b47e4ee2b8acb35b8d481138c314dc31") diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index b54fcd5454108b..096fb45278e77f 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCluster(RPackage): cran = "cluster" + license("GPL-2.0-or-later") + version("2.1.4", sha256="c6f10ceca29a176ba833f24ebf71fd451629052c2338398ba286df5689d6f5b6") version("2.1.3", sha256="a3ad7a9455d634c4e0c6ccf8ea7a3a392a0ecf9c2bdb368d127ffa68a93164a9") version("2.1.2", sha256="5c8aa760fb6dda4fcfe6196e561ffcd2dc12b1a6c7659cb90be2cde747311499") diff --git a/var/spack/repos/builtin/packages/r-clustergeneration/package.py b/var/spack/repos/builtin/packages/r-clustergeneration/package.py index 579b94aba6c497..603effe4592e1f 100644 --- a/var/spack/repos/builtin/packages/r-clustergeneration/package.py +++ b/var/spack/repos/builtin/packages/r-clustergeneration/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py index 67a05755510df2..38588da2051100 100644 --- a/var/spack/repos/builtin/packages/r-clusterprofiler/package.py +++ b/var/spack/repos/builtin/packages/r-clusterprofiler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-cmdstanr/package.py b/var/spack/repos/builtin/packages/r-cmdstanr/package.py index 64811f3b36d082..b5cb716ba3d888 100644 --- a/var/spack/repos/builtin/packages/r-cmdstanr/package.py +++ b/var/spack/repos/builtin/packages/r-cmdstanr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RCmdstanr(RPackage): homepage = "https://mc-stan.org/cmdstanr/" url = "https://github.com/stan-dev/cmdstanr/archive/refs/tags/v0.5.3.tar.gz" + license("BSD-3-Clause") + version("0.5.3", sha256="dafd5808e1a17d2e4ae4048437235b4399464a7c65de68ba4af0ab2b03e27871") version("0.5.2", sha256="5bc2e164e7cce3bfb93d592df5e3059157c8d510b136535bdb6d09c3ef060f64") version("0.5.1", sha256="5b3e83d48c19d309ccca720979449a8ac130ba7e443e70992b1771a1dd9124c9") diff --git a/var/spack/repos/builtin/packages/r-cner/package.py b/var/spack/repos/builtin/packages/r-cner/package.py index fbb94c6375f379..bdfd6383ed3567 100644 --- a/var/spack/repos/builtin/packages/r-cner/package.py +++ b/var/spack/repos/builtin/packages/r-cner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-coda/package.py b/var/spack/repos/builtin/packages/r-coda/package.py index b73385f76468e8..4824988bbbc910 100644 --- a/var/spack/repos/builtin/packages/r-coda/package.py +++ b/var/spack/repos/builtin/packages/r-coda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCoda(RPackage): cran = "coda" + license("GPL-2.0-or-later") + version("0.19-4", sha256="422d3cfd34797a3631e9c4812431940599c0ca4bb9937797bed07b7b1d6fe58f") version("0.19-3", sha256="d3df1fc848bcf1af8fae13d61eeab60e99a3d4b4db384bec4326f909f502c5d6") version("0.19-2", sha256="678a7e6a87a2723089daeb780ea37ac3d4319b37eabe26928ea3fa9c9b1eda0d") diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index 33703fa4abbb9d..a4c600538894b7 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RCodetools(RPackage): cran = "codetools" + license("GPL-2.0-or-later") + version("0.2-19", sha256="c4b7e567c87f33dad85de92f79641e5e5b5deede6d19a9dfa47133d191782dab") version("0.2-18", sha256="1a9ea6b9792dbd1688078455929385acc3a5e4bef945c77bec1261fa4a084c28") version("0.2-16", sha256="c276757c3adabaf700f2ea25835892b09bc1bd438ebd17c805ea9073ed8a74b6") diff --git a/var/spack/repos/builtin/packages/r-codex/package.py b/var/spack/repos/builtin/packages/r-codex/package.py index 6c7ec2987c4fd5..d0a11b1d0e19db 100644 --- a/var/spack/repos/builtin/packages/r-codex/package.py +++ b/var/spack/repos/builtin/packages/r-codex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-coin/package.py b/var/spack/repos/builtin/packages/r-coin/package.py index 9801f4a1a2c7f9..0ea41175c6c825 100644 --- a/var/spack/repos/builtin/packages/r-coin/package.py +++ b/var/spack/repos/builtin/packages/r-coin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCoin(RPackage): cran = "coin" + license("GPL-2.0-only") + version("1.4-2", sha256="7546d1f27a82d98b4b3e43e4659eba0f74a67d5919ce85d2fb360282ba3cfbb2") version("1.3-1", sha256="5de2519a6e2b059bba9d74c58085cccaff1aaaa0454586ed164a108ebd1b2062") version("1.3-0", sha256="adcebb37e0a7dfddbf8ec1e09c12a809bd76d90b5b8ff2b1048a75252ba11ef8") diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index 730da4cbf504f3..0bcc256bd38ff8 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RColorspace(RPackage): cran = "colorspace" + license("BSD-3-Clause") + version("2.1-0", sha256="04078abb6b54119c90dc7085d62916bf292ccb163e213f9ea70567d1be82614c") version("2.0-3", sha256="e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f") version("2.0-2", sha256="b891cd2ec129ed5f116429345947bcaadc33969758a108521eb0cf36bd12183a") diff --git a/var/spack/repos/builtin/packages/r-colourpicker/package.py b/var/spack/repos/builtin/packages/r-colourpicker/package.py index 58e0080c913539..157c0f0d1c70e1 100644 --- a/var/spack/repos/builtin/packages/r-colourpicker/package.py +++ b/var/spack/repos/builtin/packages/r-colourpicker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RColourpicker(RPackage): cran = "colourpicker" + license("MIT") + version("1.2.0", sha256="bc2c80eee046219038baef9f8f213c9824d7fec7f893f6a1b881dd44b4a8638a") version("1.1.1", sha256="a0d09982b048b143e2c3438ccec039dd20d6f892fa0dedc9fdcb0d40de883ce0") version("1.1.0", sha256="2dfbb6262d187d3b17357ff9c22670ced3621feda5b2a2a500558478e4d551e2") diff --git a/var/spack/repos/builtin/packages/r-combinat/package.py b/var/spack/repos/builtin/packages/r-combinat/package.py index 668d4b0874c1f4..d3a64d9eae051a 100644 --- a/var/spack/repos/builtin/packages/r-combinat/package.py +++ b/var/spack/repos/builtin/packages/r-combinat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class RCombinat(RPackage): cran = "combinat" + license("GPL-2.0-only") + version("0.0-8", sha256="1513cf6b6ed74865bfdd9f8ca58feae12b62f38965d1a32c6130bef810ca30c1") diff --git a/var/spack/repos/builtin/packages/r-commonmark/package.py b/var/spack/repos/builtin/packages/r-commonmark/package.py index 003fd4343df910..e06c44e2ace496 100644 --- a/var/spack/repos/builtin/packages/r-commonmark/package.py +++ b/var/spack/repos/builtin/packages/r-commonmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RCommonmark(RPackage): cran = "commonmark" + license("BSD-2-Clause") + version("1.9.0", sha256="6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f") version("1.8.1", sha256="96adcb093de3d2e48811af402da70e7222a313b97f1e979e0cbe84dd59bd5cbe") version("1.8.0", sha256="7d07e72937b1cf158e69f183722bf79dbb91b8967a9dd29f4fa145500c2be668") diff --git a/var/spack/repos/builtin/packages/r-complexheatmap/package.py b/var/spack/repos/builtin/packages/r-complexheatmap/package.py index c108dbbc5fdc95..fe6d74ccfbab0c 100644 --- a/var/spack/repos/builtin/packages/r-complexheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-complexheatmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RComplexheatmap(RPackage): bioc = "ComplexHeatmap" + license("MIT") + version("2.16.0", commit="01eb55ca9b783c6d99bdfe88aa131cc102bae5b3") version("2.14.0", commit="57fcaa040b08917c97fb66b963eb240d5fd5a8c7") version("2.12.1", commit="2c5fe70724219008174d4e6f83189cddbd895ec6") diff --git a/var/spack/repos/builtin/packages/r-compositions/package.py b/var/spack/repos/builtin/packages/r-compositions/package.py index 974f5aa660dcde..03906a4d14925f 100644 --- a/var/spack/repos/builtin/packages/r-compositions/package.py +++ b/var/spack/repos/builtin/packages/r-compositions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCompositions(RPackage): cran = "compositions" + license("GPL-2.0-or-later") + version("2.0-6", sha256="45d374ebfdcc2c9f6cc738d196caf83a2297ed2aefe2cc99007fcbeb78a61c34") version("2.0-4", sha256="7b9c7a3bf654fb02d9eb1b4a7566469b2f5232f3b2c1b324c02239fd31060faf") version("2.0-1", sha256="84a291308faf858e5a9d9570135c2da5e57b0887f407903485fa85d09da61a0f") diff --git a/var/spack/repos/builtin/packages/r-compquadform/package.py b/var/spack/repos/builtin/packages/r-compquadform/package.py index 5d7508d00c83a2..1e45e86015363c 100644 --- a/var/spack/repos/builtin/packages/r-compquadform/package.py +++ b/var/spack/repos/builtin/packages/r-compquadform/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-condop/package.py b/var/spack/repos/builtin/packages/r-condop/package.py index e0aad25d2ed658..171328858978dd 100644 --- a/var/spack/repos/builtin/packages/r-condop/package.py +++ b/var/spack/repos/builtin/packages/r-condop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-conflicted/package.py b/var/spack/repos/builtin/packages/r-conflicted/package.py index c2dc67b7b9c315..29e4f1f37615c8 100644 --- a/var/spack/repos/builtin/packages/r-conflicted/package.py +++ b/var/spack/repos/builtin/packages/r-conflicted/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RConflicted(RPackage): cran = "conflicted" + license("MIT") + version("1.2.0", sha256="c99b86bb52da3e7d1f4d96d70c77304d0434db5bd906edd8d743e89ac9223088") depends_on("r@3.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-conquer/package.py b/var/spack/repos/builtin/packages/r-conquer/package.py index 52c1c627b6fa4e..83045c8164676c 100644 --- a/var/spack/repos/builtin/packages/r-conquer/package.py +++ b/var/spack/repos/builtin/packages/r-conquer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RConquer(RPackage): cran = "conquer" + license("GPL-3.0-only") + version("1.3.3", sha256="a2c6155ed74af0e2a279145843ec5229ae2f3707aa25169ae030c520aa97deba") version("1.3.1", sha256="14c28ab47b60c39696f34ee6fdd737bdcd2d28d05b3641c0e89960ab14a8bcd5") version("1.3.0", sha256="ac354e18c9ad6f41ed5200fad1c99fa5b124fc6fa5bba8f3434be2478f53d5fa") diff --git a/var/spack/repos/builtin/packages/r-construct/package.py b/var/spack/repos/builtin/packages/r-construct/package.py index 72e65af5ae9f0e..14f97e5aeaac70 100644 --- a/var/spack/repos/builtin/packages/r-construct/package.py +++ b/var/spack/repos/builtin/packages/r-construct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-convevol/package.py b/var/spack/repos/builtin/packages/r-convevol/package.py index b8805207ad5c9f..6dbcbc60cf8bb3 100644 --- a/var/spack/repos/builtin/packages/r-convevol/package.py +++ b/var/spack/repos/builtin/packages/r-convevol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RConvevol(RPackage): cran = "convevol" + license("GPL-2.0-only") + version("2.0.0", sha256="690664b93c1f144a409e80b2ebfc20dc34f0eb9405607d15e066e8db573e84de") version("1.3", sha256="d6b24b9796a559f5280e277746189d141151ade4b14cc6b4c2d9d496d7f314ac") diff --git a/var/spack/repos/builtin/packages/r-copula/package.py b/var/spack/repos/builtin/packages/r-copula/package.py index a5051a5bca9e2b..79f7bee3610390 100644 --- a/var/spack/repos/builtin/packages/r-copula/package.py +++ b/var/spack/repos/builtin/packages/r-copula/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RCopula(RPackage): cran = "copula" + license("GPL-3.0-or-later OR custom") + version("1.1-2", sha256="88f9454d25e4dcdf53d8ca5156daf48e664769f5e13b1e835ed64f37251587d3") version("1.1-0", sha256="9ab76e6256534db2a18d3880143b8c67e385767010de861bbde25212aa75d924") version("1.0-1", sha256="d09b2ccffc7379e48b00952aa6b282baf502feebaf55cc44e93f881d7b909742") diff --git a/var/spack/repos/builtin/packages/r-corhmm/package.py b/var/spack/repos/builtin/packages/r-corhmm/package.py index 410f0aa8608f55..dd316f8e2d22b1 100644 --- a/var/spack/repos/builtin/packages/r-corhmm/package.py +++ b/var/spack/repos/builtin/packages/r-corhmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-corpcor/package.py b/var/spack/repos/builtin/packages/r-corpcor/package.py index 1bab4b21eb7c77..47ed5b9e50d090 100644 --- a/var/spack/repos/builtin/packages/r-corpcor/package.py +++ b/var/spack/repos/builtin/packages/r-corpcor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RCorpcor(RPackage): cran = "corpcor" + license("GPL-3.0-or-later") + version("1.6.10", sha256="71a04c503c93ec95ddde09abe8c7ddeb36175b7da76365a14b27066383e10e09") version("1.6.9", sha256="2e4fabd1d3936fecea67fa365233590147ca50bb45cf80efb53a10345a8a23c2") diff --git a/var/spack/repos/builtin/packages/r-corrplot/package.py b/var/spack/repos/builtin/packages/r-corrplot/package.py index ae3f143e968afc..dd132968c1ab4d 100644 --- a/var/spack/repos/builtin/packages/r-corrplot/package.py +++ b/var/spack/repos/builtin/packages/r-corrplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCorrplot(RPackage): cran = "corrplot" + license("MIT") + version("0.92", sha256="e8c09f963f9c4837036c439ebfe00fa3a6e462ccbb786d2cf90850ddcd9428bd") version("0.84", sha256="0dce5e628ead9045580a191f60c58fd7c75b4bbfaaa3307678fc9ed550c303cc") version("0.77", sha256="54b66ff995eaf2eee3f3002509c6f27bb5bd970b0abde41893ed9387e93828d3") diff --git a/var/spack/repos/builtin/packages/r-countrycode/package.py b/var/spack/repos/builtin/packages/r-countrycode/package.py index b1de924b5a817b..f0a9746bc72f6d 100644 --- a/var/spack/repos/builtin/packages/r-countrycode/package.py +++ b/var/spack/repos/builtin/packages/r-countrycode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RCountrycode(RPackage): cran = "countrycode" + license("GPL-3.0-only") + version("1.4.0", sha256="99dfe7652c1e631b9e0f8fac0b0163e7a3fdde8476498555d553e0d1c5fdccc4") version("1.3.0", sha256="34361416e771ece1d56dc56f79416c8b7f9591885773becae270684d095bc70f") version("1.2.0", sha256="32c65702dcc33d512ff99f14c12f4e0c48fe7ed7c8aa2f0a64194576d129dd40") diff --git a/var/spack/repos/builtin/packages/r-covr/package.py b/var/spack/repos/builtin/packages/r-covr/package.py index 22eb9435489ab0..70d3c8adc89a3c 100644 --- a/var/spack/repos/builtin/packages/r-covr/package.py +++ b/var/spack/repos/builtin/packages/r-covr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RCovr(RPackage): cran = "covr" + license("MIT") + version("3.6.2", sha256="ace68ce7516147b4d77f591a498cbd7b2803062c1b47252e7a35081af0ea485b") version("3.6.1", sha256="ffbe15438c1a4f274c14cacfb944480e284f1ab60808d5e840c015cc57c51157") version("3.5.1", sha256="a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c") diff --git a/var/spack/repos/builtin/packages/r-cowplot/package.py b/var/spack/repos/builtin/packages/r-cowplot/package.py index 52731755fa5e28..a70068b2f3d8c6 100644 --- a/var/spack/repos/builtin/packages/r-cowplot/package.py +++ b/var/spack/repos/builtin/packages/r-cowplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RCowplot(RPackage): cran = "cowplot" + license("GPL-2.0-only") + version("1.1.1", sha256="c7dce625b456dffc59ba100c816e16226048d12fdd29a7335dc1f6f6e12eed48") version("1.0.0", sha256="70f9a7c46d10f409d1599f1afc9fd3c947051cf2b430f01d903c64ef1e6c98a5") version("0.9.3", sha256="3e10475fd7506ea9297ed72eb1a3acf858c6fa99d26e46fc39654eba000c3dcb") diff --git a/var/spack/repos/builtin/packages/r-cpp11/package.py b/var/spack/repos/builtin/packages/r-cpp11/package.py index c7a0415b4f1dd8..4a36d4ce113448 100644 --- a/var/spack/repos/builtin/packages/r-cpp11/package.py +++ b/var/spack/repos/builtin/packages/r-cpp11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RCpp11(RPackage): cran = "cpp11" + license("MIT") + version("0.4.3", sha256="f1a60e4971a86dbbcf6a16bbd739b59bb66d9c45d93cfd8dedc2a87e302598f1") version("0.4.2", sha256="403ce0bf82358d237176053b0fb1e958cb6bfa4d0fb3555bf5801db6a6939b99") version("0.4.0", sha256="1768fd07dc30dfbbf8f3fb1a1183947cb7e1dfd909165c4d612a63c163a41e87") diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index 19a1210f9ab30e..23db2f98c1a514 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RCrayon(RPackage): cran = "crayon" + license("MIT") + version("1.5.2", sha256="70a9a505b5b3c0ee6682ad8b965e28b7e24d9f942160d0a2bad18eec22b45a7a") version("1.5.1", sha256="c025c73b78a8e88e8e4363c8e1a941da5089a7baea39e59ea5342ab9ebe45df9") version("1.4.2", sha256="ee34397f643e76e30588068d4c93bd3c9afd2193deacccacb3bffcadf141b857") diff --git a/var/spack/repos/builtin/packages/r-credentials/package.py b/var/spack/repos/builtin/packages/r-credentials/package.py index 6aaecfb0f1ba97..8ac8114ba6a88c 100644 --- a/var/spack/repos/builtin/packages/r-credentials/package.py +++ b/var/spack/repos/builtin/packages/r-credentials/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RCredentials(RPackage): cran = "credentials" + license("MIT") + version("1.3.2", sha256="2ffa7c11bedbfa034adf553d0a2f2e4f6a496b858af753a09a89219cff9028b8") version("1.3.0", sha256="c119ec26fd97b977c3b0cd1eb8fad3c59b84df6262c3adbf5ee9f3d6c9903ff1") diff --git a/var/spack/repos/builtin/packages/r-crosstalk/package.py b/var/spack/repos/builtin/packages/r-crosstalk/package.py index fe59f65b15ab54..1009261d8ce7d9 100644 --- a/var/spack/repos/builtin/packages/r-crosstalk/package.py +++ b/var/spack/repos/builtin/packages/r-crosstalk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RCrosstalk(RPackage): cran = "crosstalk" + license("MIT") + version("1.2.0", sha256="4237baab35cd246a8a98fb9cf4ce53b6ddbc31d00742ded4edea0479613d1ea0") version("1.1.0.1", sha256="36a70b10bc11826e314c05f9579fd791b9ac3b3a2cfed4d4ca74ce1ad991300e") version("1.0.0", sha256="b31eada24cac26f24c9763d9a8cbe0adfd87b264cf57f8725027fe0c7742ca51") diff --git a/var/spack/repos/builtin/packages/r-crul/package.py b/var/spack/repos/builtin/packages/r-crul/package.py index 93ad2bb5709a1f..c7e94bb9af06da 100644 --- a/var/spack/repos/builtin/packages/r-crul/package.py +++ b/var/spack/repos/builtin/packages/r-crul/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RCrul(RPackage): cran = "crul" + license("MIT") + version("1.3", sha256="8058617d8b3724acb5b89d0e6e63f381df5c56565128b250a65eceb2b8081e2d") version("1.2.0", sha256="be1a149b21cf219ef55adfb56a6a5eb9892a9acf0d5f5421a22e52f2a7066f8c") version("1.0.0", sha256="2ade500f6cf89b2d0ca8496b8d4df9937d6f802a35c9ad10d9fab8632cdb1027") diff --git a/var/spack/repos/builtin/packages/r-ctc/package.py b/var/spack/repos/builtin/packages/r-ctc/package.py index 4aba24a7ec66b9..7b40f0e54ea1c2 100644 --- a/var/spack/repos/builtin/packages/r-ctc/package.py +++ b/var/spack/repos/builtin/packages/r-ctc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index fd5ecac0c6756d..23a01172eb0065 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RCubature(RPackage): cran = "cubature" + license("GPL-3.0-only") + version("2.0.4.6", sha256="330c9dc2be9bf6815473fd40efa8c2de47c1ed286cb097d0ff846b56c9e9f95a") version("2.0.4.5", sha256="a81f118e5b7950a4a29e5509f8a40d7b87544fb25783917242000561379c9023") version("2.0.4.4", sha256="087b3b2c4f25d873fa95e9d38766a17a7201d03a6f4960f1e080a8db8b67d569") diff --git a/var/spack/repos/builtin/packages/r-cubist/package.py b/var/spack/repos/builtin/packages/r-cubist/package.py index c4bb7000855d84..1a753e92853b01 100644 --- a/var/spack/repos/builtin/packages/r-cubist/package.py +++ b/var/spack/repos/builtin/packages/r-cubist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index 485935522d3608..c688656ad03620 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RCurl(RPackage): cran = "curl" + license("MIT") + version("5.0.0", sha256="d7f3cac9b513914ffa8f6f64e6fa5dd96c8273378ace6b0c16b71bc6ba59c9b2") version("4.3.3", sha256="3567b6acad40dad68acfe07511c853824839d451a50219a96dd6d125ed617c9e") version("4.3.2", sha256="90b1facb4be8b6315bb3d272ba2dd90b88973f6ea1ab7f439550230f8500a568") diff --git a/var/spack/repos/builtin/packages/r-cvxr/package.py b/var/spack/repos/builtin/packages/r-cvxr/package.py index 8a867130202d5e..20ace982f7755c 100644 --- a/var/spack/repos/builtin/packages/r-cvxr/package.py +++ b/var/spack/repos/builtin/packages/r-cvxr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RCvxr(RPackage): cran = "CVXR" + license("Apache-2.0") + version("1.0-11", sha256="e92a9638f35f4909e2a29c3b7106081e3dae7ff88b14bb6466b87fbdc80b972a") depends_on("r@3.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-dada2/package.py b/var/spack/repos/builtin/packages/r-dada2/package.py index b8ee3e18074f64..8f4d0e7e444fb5 100644 --- a/var/spack/repos/builtin/packages/r-dada2/package.py +++ b/var/spack/repos/builtin/packages/r-dada2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RDada2(RPackage): homepage = "https://benjjneb.github.io/dada2/" url = "https://github.com/benjjneb/dada2/archive/v1.14.tar.gz" + license("LGPL-3.0-only") + version("1.20", sha256="351b80dc5cdd587f5d4fe2541574e3d0cf7966342ee913b47cb20c7eb150e3f5") version("1.14", sha256="19980b9d7b0a0e80e86010357cae11d1fc07c2d02067c4445169143cf1f99906") diff --git a/var/spack/repos/builtin/packages/r-data-table/package.py b/var/spack/repos/builtin/packages/r-data-table/package.py index a967de5f6661b1..425c739112781e 100644 --- a/var/spack/repos/builtin/packages/r-data-table/package.py +++ b/var/spack/repos/builtin/packages/r-data-table/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RDataTable(RPackage): cran = "data.table" + license("MPL-2.0-no-copyleft-exception") + version("1.14.8", sha256="14b2ce5367df9c9bb58f373555066f5dcb629c156149b5565de36d69557139fd") version("1.14.4", sha256="4862a7c26e8309108fd1f5296616407b9ff9e4e1be5cdedcb717f114c2e348f0") version("1.14.2", sha256="f741b951e5937440139514aedbae78dbd6862d825066848bdb006aa02c2f3d2b") diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index 99dfa82ac9091d..bab7446c766bc7 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dbplyr/package.py b/var/spack/repos/builtin/packages/r-dbplyr/package.py index 146e742bbc8fa9..5841bc5e46143a 100644 --- a/var/spack/repos/builtin/packages/r-dbplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dbplyr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RDbplyr(RPackage): cran = "dbplyr" + license("MIT") + version("2.3.2", sha256="0ddc00595ec6b21962d0bb6f470f5f7c9d61c74a4f92681a37e94e1295707fac") version("2.2.1", sha256="a6f3f644c068fe1a3b3e99a3a10de55a150d43ef20b5130e6724d142afcb0df7") version("2.1.1", sha256="aba4cf47b85ab240fd3ec4cd8d512f6e1958201e151577c1a2ebc3d6ebc5bc08") diff --git a/var/spack/repos/builtin/packages/r-debugme/package.py b/var/spack/repos/builtin/packages/r-debugme/package.py index d133637747a854..d17b8edc7477a6 100644 --- a/var/spack/repos/builtin/packages/r-debugme/package.py +++ b/var/spack/repos/builtin/packages/r-debugme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RDebugme(RPackage): cran = "debugme" + license("MIT") + version("1.1.0", sha256="4dae0e2450d6689a6eab560e36f8a7c63853abbab64994028220b8fd4b793ab1") depends_on("r-crayon", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-decipher/package.py b/var/spack/repos/builtin/packages/r-decipher/package.py index 88345c3027e357..f04955e0c0b7e6 100644 --- a/var/spack/repos/builtin/packages/r-decipher/package.py +++ b/var/spack/repos/builtin/packages/r-decipher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-delayedarray/package.py b/var/spack/repos/builtin/packages/r-delayedarray/package.py index bc663ccab5394a..c5e6108253439c 100644 --- a/var/spack/repos/builtin/packages/r-delayedarray/package.py +++ b/var/spack/repos/builtin/packages/r-delayedarray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py b/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py index c1db2e1345e5c7..9687767c835815 100644 --- a/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-delayedmatrixstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-deldir/package.py b/var/spack/repos/builtin/packages/r-deldir/package.py index f79f0c235d5839..4bc422d960cefa 100644 --- a/var/spack/repos/builtin/packages/r-deldir/package.py +++ b/var/spack/repos/builtin/packages/r-deldir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RDeldir(RPackage): cran = "deldir" + license("GPL-2.0-or-later") + version("1.0-6", sha256="6df6d8325c607e0b7d63cbc53c29e774eff95ad4acf9c7ec8f70693b0505f8c5") version("0.2-3", sha256="2d24800f5ec6ad9dc57b9b265365b29c07717f4562d8f3e6344336d3340c364e") version("0.1-23", sha256="e0112bce9fc94daf73596a0fff9b3958b80872e3bbb487be73e157b13a6f201d") diff --git a/var/spack/repos/builtin/packages/r-dendextend/package.py b/var/spack/repos/builtin/packages/r-dendextend/package.py index 8508f59482d369..60705fde311f73 100644 --- a/var/spack/repos/builtin/packages/r-dendextend/package.py +++ b/var/spack/repos/builtin/packages/r-dendextend/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RDendextend(RPackage): cran = "dendextend" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.17.1", sha256="87e96e119e7236b4f5df1c6f1b0d4d4e12aab606a2142e039f56d8ec71f9e521") version("1.16.0", sha256="ec2fd09c31a2a93292d87a9bd5bfc261840de941dfded79d6c2fe87116708466") version("1.15.2", sha256="4ba3885b66694589d455ffef31c218fe653fa25aff3efb7e8db6c25008d2921b") diff --git a/var/spack/repos/builtin/packages/r-densvis/package.py b/var/spack/repos/builtin/packages/r-densvis/package.py index 57b643271e84b4..6099cff50c7db3 100644 --- a/var/spack/repos/builtin/packages/r-densvis/package.py +++ b/var/spack/repos/builtin/packages/r-densvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,6 +33,8 @@ class RDensvis(RPackage): bioc = "densvis" + license("MIT") + version("1.10.0", commit="833db1fb7b2a5667575cc2e7c2fefc8360c8d7fb") depends_on("r-rcpp", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index fabff0249aae69..9e44e7d04ae986 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-deoptimr/package.py b/var/spack/repos/builtin/packages/r-deoptimr/package.py index 1d63653751f945..d2de5443815614 100644 --- a/var/spack/repos/builtin/packages/r-deoptimr/package.py +++ b/var/spack/repos/builtin/packages/r-deoptimr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-deriv/package.py b/var/spack/repos/builtin/packages/r-deriv/package.py index 371525999fcc53..61e169fe543e4c 100644 --- a/var/spack/repos/builtin/packages/r-deriv/package.py +++ b/var/spack/repos/builtin/packages/r-deriv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-desc/package.py b/var/spack/repos/builtin/packages/r-desc/package.py index d214e2709adff6..2fb79bce33298f 100644 --- a/var/spack/repos/builtin/packages/r-desc/package.py +++ b/var/spack/repos/builtin/packages/r-desc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RDesc(RPackage): cran = "desc" + license("MIT") + version("1.4.2", sha256="758acf14be478c09ba7e84ade3a7ce512becf35d44e5e6a997b932065f2a227c") version("1.4.1", sha256="8f9ebb51eccf925b2e76bc65ecf495e8f3882b8c0053023f396622f0402d6f54") version("1.4.0", sha256="8220e4c706449b8121b822e70b1414f391ef419aed574836a234c63b83e5d649") diff --git a/var/spack/repos/builtin/packages/r-deseq/package.py b/var/spack/repos/builtin/packages/r-deseq/package.py index 60696b110bc071..cfdf5f47cc2a66 100644 --- a/var/spack/repos/builtin/packages/r-deseq/package.py +++ b/var/spack/repos/builtin/packages/r-deseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-deseq2/package.py b/var/spack/repos/builtin/packages/r-deseq2/package.py index 45be1ed1127cd1..d646aa2f5761d3 100644 --- a/var/spack/repos/builtin/packages/r-deseq2/package.py +++ b/var/spack/repos/builtin/packages/r-deseq2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-desolve/package.py b/var/spack/repos/builtin/packages/r-desolve/package.py index 8d8fcf9fc65655..45407eb75ae902 100644 --- a/var/spack/repos/builtin/packages/r-desolve/package.py +++ b/var/spack/repos/builtin/packages/r-desolve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 3ad97f1195e7f8..edbdd7f20d5c11 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RDevtools(RPackage): cran = "devtools" + license("MIT") + version("2.4.5", sha256="38160ebd839acdec7ebf0699a085b4ab1ebd5500d3c57a9fa7ae484f1909904b") version("2.4.4", sha256="acd6759d269f30893eda173a738b1ce6537a11313c8e8e12e116452c4296934d") version("2.4.3", sha256="e42159a9bca0b219170e76c282862e27ca283649d6cbf6a868175d8982e06b4f") diff --git a/var/spack/repos/builtin/packages/r-dexseq/package.py b/var/spack/repos/builtin/packages/r-dexseq/package.py index 9c4f71b439c1b3..a74d29e45a1447 100644 --- a/var/spack/repos/builtin/packages/r-dexseq/package.py +++ b/var/spack/repos/builtin/packages/r-dexseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-diagram/package.py b/var/spack/repos/builtin/packages/r-diagram/package.py index 5fcede1769d9ee..c3cd1d416daf10 100644 --- a/var/spack/repos/builtin/packages/r-diagram/package.py +++ b/var/spack/repos/builtin/packages/r-diagram/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RDiagram(RPackage): cran = "diagram" + license("GPL-2.0-or-later") + version("1.6.5", sha256="e9c03e7712e0282c5d9f2b760bafe2aac9e99a9723578d9e6369d60301f574e4") depends_on("r@2.01:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 6a5ab564bd8784..4e71673b051285 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dicekriging/package.py b/var/spack/repos/builtin/packages/r-dicekriging/package.py index 58e611cf83cd9a..1e91e9ecb03f0e 100644 --- a/var/spack/repos/builtin/packages/r-dicekriging/package.py +++ b/var/spack/repos/builtin/packages/r-dicekriging/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index 543c340f108966..e5fcd6fca46edb 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RDichromat(RPackage): cran = "dichromat" + license("GPL-2.0-only") + version("2.0-0.1", sha256="a10578e9ad8a581bd8fe0d8a8370051f3cdcf12c7d282f3af2a18dacda566081") version("2.0-0", sha256="31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1") diff --git a/var/spack/repos/builtin/packages/r-diffobj/package.py b/var/spack/repos/builtin/packages/r-diffobj/package.py index 1f261f5856f119..e6c2cb2b65b277 100644 --- a/var/spack/repos/builtin/packages/r-diffobj/package.py +++ b/var/spack/repos/builtin/packages/r-diffobj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RDiffobj(RPackage): cran = "diffobj" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.3.5", sha256="d860a79b1d4c9e369282d7391b539fe89228954854a65ba47181407c53e3cf60") version("0.3.3", sha256="414e5573470b9565b9149a0a61c7e8344fb37f889d23dc4e131acc8aa62e6df4") diff --git a/var/spack/repos/builtin/packages/r-diffusionmap/package.py b/var/spack/repos/builtin/packages/r-diffusionmap/package.py index 0adf2e17f0673e..d1c7d16fba0b98 100644 --- a/var/spack/repos/builtin/packages/r-diffusionmap/package.py +++ b/var/spack/repos/builtin/packages/r-diffusionmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index 11ba384ed7b91d..48150288b8933d 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class RDigest(RPackage): cran = "digest" + license("GPL-2.0-or-later") + version("0.6.31", sha256="5a284f490eaca6750f695f00a584cfca3f180ca1046ac1107202141149d431b9") version("0.6.30", sha256="7b8059943be7dba6053268dfcc229de1bb0b55db497b2943541a6abace076aa7") version("0.6.29", sha256="792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9") diff --git a/var/spack/repos/builtin/packages/r-diptest/package.py b/var/spack/repos/builtin/packages/r-diptest/package.py index 1c93d94173a3b7..c862c0b74dbd63 100644 --- a/var/spack/repos/builtin/packages/r-diptest/package.py +++ b/var/spack/repos/builtin/packages/r-diptest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RDiptest(RPackage): cran = "diptest" + license("GPL-2.0-or-later") + version("0.76-0", sha256="508a5ebb161519cd0fcd156dc047b51becb216d545d62c6522496463f94ec280") version("0.75-7", sha256="462900100ca598ef21dbe566bf1ab2ce7c49cdeab6b7a600a50489b05f61b61b") diff --git a/var/spack/repos/builtin/packages/r-dir-expiry/package.py b/var/spack/repos/builtin/packages/r-dir-expiry/package.py index 71506ea9c071e7..0ddb1f457d043f 100644 --- a/var/spack/repos/builtin/packages/r-dir-expiry/package.py +++ b/var/spack/repos/builtin/packages/r-dir-expiry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py index 4d0b6ff10d3ffa..b6af1bebb652bd 100644 --- a/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py +++ b/var/spack/repos/builtin/packages/r-dirichletmultinomial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dismo/package.py b/var/spack/repos/builtin/packages/r-dismo/package.py index 7c43eebf1869b7..93aedbad8f5705 100644 --- a/var/spack/repos/builtin/packages/r-dismo/package.py +++ b/var/spack/repos/builtin/packages/r-dismo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RDismo(RPackage): cran = "dismo" + license("GPL-3.0-or-later") + version("1.3-9", sha256="3924521db67716b004a4c870985c65d037edfe926b14222740fd6c2b2093beee") version("1.3-5", sha256="812e1932d42c0f40acf2ab5c5b2d068f93128caf648626e1d11baf1a09340ee7") version("1.3-3", sha256="fd65331ac18a4287ba0856b90508ddd0e2738c653eecc5f3eb2b14e1d06949ca") diff --git a/var/spack/repos/builtin/packages/r-distributional/package.py b/var/spack/repos/builtin/packages/r-distributional/package.py index ca3cc2777c2308..524f21bd63874b 100644 --- a/var/spack/repos/builtin/packages/r-distributional/package.py +++ b/var/spack/repos/builtin/packages/r-distributional/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RDistributional(RPackage): cran = "distributional" + license("GPL-3.0-only") + version("0.3.2", sha256="c883d633398233aee5a8ca6b587687f765bdfe0732a84e4961e7f71ac0d008f8") version("0.3.1", sha256="727e56cbcf0c8a8adacca8030214ddbd14f68ee28d0aad716467bd68b027235f") version("0.3.0", sha256="fab36c7346617d8f2ca4b3cd0e3c9da93cb2f95fb7f102a3ae88670e694751d6") diff --git a/var/spack/repos/builtin/packages/r-diversitree/package.py b/var/spack/repos/builtin/packages/r-diversitree/package.py index f6247bdba1903a..4b3d646833192c 100644 --- a/var/spack/repos/builtin/packages/r-diversitree/package.py +++ b/var/spack/repos/builtin/packages/r-diversitree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RDiversitree(RPackage): cran = "diversitree" + license("GPL-2.0-or-later") + version("0.9-16", sha256="4c236970b58e56b922352f3f5d97010c74d8ec5783b375c311fe11abfb99f967") version("0.9-15", sha256="c739ef3d4fcc24fd6855b1d297d31e0f89fbaff1efe8a2d149044458ecd363ea") version("0.9-11", sha256="4caa6a468f93de9f1c8c30e4457f34bb8346e1acdaf74f684005bfa86a950ecb") diff --git a/var/spack/repos/builtin/packages/r-dmrcate/package.py b/var/spack/repos/builtin/packages/r-dmrcate/package.py index d5ba5db45cfd0b..f75a4c0cd7d93d 100644 --- a/var/spack/repos/builtin/packages/r-dmrcate/package.py +++ b/var/spack/repos/builtin/packages/r-dmrcate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dnacopy/package.py b/var/spack/repos/builtin/packages/r-dnacopy/package.py index 658ec884e22728..f1b23120c3731c 100644 --- a/var/spack/repos/builtin/packages/r-dnacopy/package.py +++ b/var/spack/repos/builtin/packages/r-dnacopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-do-db/package.py b/var/spack/repos/builtin/packages/r-do-db/package.py index 2f5016d289882e..7911c38f7ad263 100644 --- a/var/spack/repos/builtin/packages/r-do-db/package.py +++ b/var/spack/repos/builtin/packages/r-do-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-doby/package.py b/var/spack/repos/builtin/packages/r-doby/package.py index 1562b9cb04bd0d..8c7015b84464a4 100644 --- a/var/spack/repos/builtin/packages/r-doby/package.py +++ b/var/spack/repos/builtin/packages/r-doby/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-domc/package.py b/var/spack/repos/builtin/packages/r-domc/package.py index cdfb1c6e1751a6..e3a7fbe0f89258 100644 --- a/var/spack/repos/builtin/packages/r-domc/package.py +++ b/var/spack/repos/builtin/packages/r-domc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index d067cd7552a508..b50a4e0bc0a6a7 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dorng/package.py b/var/spack/repos/builtin/packages/r-dorng/package.py index 5fa6d60bb24159..e21846392055a5 100644 --- a/var/spack/repos/builtin/packages/r-dorng/package.py +++ b/var/spack/repos/builtin/packages/r-dorng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dose/package.py b/var/spack/repos/builtin/packages/r-dose/package.py index c91be0dfeedfad..c76393ba4c79b3 100644 --- a/var/spack/repos/builtin/packages/r-dose/package.py +++ b/var/spack/repos/builtin/packages/r-dose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dosnow/package.py b/var/spack/repos/builtin/packages/r-dosnow/package.py index 37d27ff221b779..e7ef2fa47650ac 100644 --- a/var/spack/repos/builtin/packages/r-dosnow/package.py +++ b/var/spack/repos/builtin/packages/r-dosnow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dotcall64/package.py b/var/spack/repos/builtin/packages/r-dotcall64/package.py index 3f02d02b3d289a..5c78fcd8358243 100644 --- a/var/spack/repos/builtin/packages/r-dotcall64/package.py +++ b/var/spack/repos/builtin/packages/r-dotcall64/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-downlit/package.py b/var/spack/repos/builtin/packages/r-downlit/package.py index 91533d5ffd2671..5a2e92028e3ebc 100644 --- a/var/spack/repos/builtin/packages/r-downlit/package.py +++ b/var/spack/repos/builtin/packages/r-downlit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RDownlit(RPackage): cran = "downlit" + license("MIT") + version("0.4.2", sha256="33dff66909104d1a5ba8e57b1288986e82b61fd5e91dce0cd358d53724b37e3c") depends_on("r@3.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-downloader/package.py b/var/spack/repos/builtin/packages/r-downloader/package.py index 889f0df9ae6d6a..8b63bfef5abdd0 100644 --- a/var/spack/repos/builtin/packages/r-downloader/package.py +++ b/var/spack/repos/builtin/packages/r-downloader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RDownloader(RPackage): cran = "downloader" + license("GPL-2.0-only") + version("0.4", sha256="1890e75b028775154023f2135cafb3e3eed0fe908138ab4f7eff1fc1b47dafab") depends_on("r-digest", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index 230c4500e95993..edd2e01091e8c2 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RDplyr(RPackage): cran = "dplyr" + license("MIT") + version("1.1.2", sha256="c220c38a3a44977c43eeae3d9aef90e8bb297150cad0993ea8d3cc13150096e3") version("1.0.10", sha256="3ab639f627b4e439052df18f193f0ccab223225a4ae2ff8c18aba4f9807e0f2b") version("1.0.9", sha256="e2e1f7312618b4e32ada9a1da79cef32eaec12acd408c973a6b069c6be4fb46b") diff --git a/var/spack/repos/builtin/packages/r-dqrng/package.py b/var/spack/repos/builtin/packages/r-dqrng/package.py index 37766a052c5ec7..51a7793a1b342a 100644 --- a/var/spack/repos/builtin/packages/r-dqrng/package.py +++ b/var/spack/repos/builtin/packages/r-dqrng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RDqrng(RPackage): cran = "dqrng" + license("AGPL-3.0-only OR custom") + version("0.3.0", sha256="4beeabfe245ce7196b07369f2a7d277cb08869ad8b45a22c6354c4cc70a39abb") version("0.2.1", sha256="e149c105b1db31e7f46b1aebf31d911a109e380923f3696fc56a53197fc1e866") diff --git a/var/spack/repos/builtin/packages/r-dss/package.py b/var/spack/repos/builtin/packages/r-dss/package.py index 8ec607c0dbb8e1..188e324ae46256 100644 --- a/var/spack/repos/builtin/packages/r-dss/package.py +++ b/var/spack/repos/builtin/packages/r-dss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index 82cee8ba934967..3fd34dff09e433 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RDt(RPackage): cran = "DT" + license("Apache-2.0") + version("0.27", sha256="e32fdccd2be430933cff88a9ce79045bfdbe3e08e0cd8d15037445808613289a") version("0.26", sha256="c412932be126d44f415559258e1d65adc0e84c3dfb9a70ce3196a2f877f7030c") version("0.25", sha256="0dfc8713062e1fe4e0428936367f35a0a41616c27b6d9b002bdfda58091c442b") diff --git a/var/spack/repos/builtin/packages/r-dtplyr/package.py b/var/spack/repos/builtin/packages/r-dtplyr/package.py index 7cca9a02ba561c..18fadcb37e0a9f 100644 --- a/var/spack/repos/builtin/packages/r-dtplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dtplyr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RDtplyr(RPackage): cran = "dtplyr" + license("MIT") + version("1.3.1", sha256="a5a9689a640b8bd1274519af220c33deaa3919654acac4ebdff1ff365cc8d6e5") version("1.2.2", sha256="f85928fe63701bc3a0cadf705ba660834a2aaeab37cf20addab406430e53e2d4") version("1.2.1", sha256="2640e9cde4eaa06f02cff29e3f2b99fdd08488df07ea2e6629b2ed6a8285d0f3") diff --git a/var/spack/repos/builtin/packages/r-dtw/package.py b/var/spack/repos/builtin/packages/r-dtw/package.py index 86d396e1f60b5f..ba2f720d91cf61 100644 --- a/var/spack/repos/builtin/packages/r-dtw/package.py +++ b/var/spack/repos/builtin/packages/r-dtw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RDtw(RPackage): cran = "dtw" + license("GPL-2.0-or-later") + version("1.23-1", sha256="6ed6a3b52be673ce2617b8d48723c7c488c95aab88fe2912d7e00507838e826d") version("1.22-3", sha256="df7cf9adf613422ddb22a160597eb5f5475ab6c67c0d790092edb7f72ba98f00") version("1.20-1", sha256="43ca1a47a7c81a2b5d5054da1be8b8af79a85d6f9ce7b4512e9ed91f790f60f0") diff --git a/var/spack/repos/builtin/packages/r-dupradar/package.py b/var/spack/repos/builtin/packages/r-dupradar/package.py new file mode 100644 index 00000000000000..5872f33e24a160 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-dupradar/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class RDupradar(RPackage): + """Assessment of duplication rates in RNA-Seq datasets""" + + maintainers("pabloaledo") + + bioc = "dupRadar" + + license("GPL-3.0-only") + + version("1.32.0", commit="7e07fc3a3901f8cae0203759fc24dd7df430a07f") + version("1.30.3", commit="19e3b13a148c47e69686cd1e872182c564fd4dcd") + version("1.30.0", commit="3d53d2d2e0c404a25845d78b8df8fee3f6b34eb5") + + depends_on("r@3.2:", type=("build", "run")) + depends_on("r-kernsmooth", type=("build", "run")) + depends_on("r-rsubread", type=("build", "run")) + depends_on("subread", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index 14b3ffff5b429f..a063d5cd544519 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RDygraphs(RPackage): cran = "dygraphs" + license("MIT") + version("1.1.1.6", sha256="c3d331f30012e721a048e04639f60ea738cd7e54e4f930ac9849b95f0f005208") version("1.1.1.5", sha256="274035988fdd6833121fd5831692355d383acc828d540788dbcecaf88eb2d72d") version("0.9", sha256="2aa4754a7d824d8994c2a97ee02bab163319f065b4d10d289337dc8398c0646c") diff --git a/var/spack/repos/builtin/packages/r-dynamictreecut/package.py b/var/spack/repos/builtin/packages/r-dynamictreecut/package.py index 62d6f970ae6b00..3f6a218dcd1d21 100644 --- a/var/spack/repos/builtin/packages/r-dynamictreecut/package.py +++ b/var/spack/repos/builtin/packages/r-dynamictreecut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index 4396eedc4c2270..b2e66ec2aebcf4 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RE1071(RPackage): cran = "e1071" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.7-13", sha256="da94e191af6e69aa0f9e3250d4b823674cc869339d914f761ebf2824177b6b2f") version("1.7-12", sha256="91e052d0a521db74a66df90adb28db601f2a2cca38b03dcad030ac2fdc5c5dcf") version("1.7-11", sha256="48c18e10e7cabc742d37b563672e2eddb6061f2378b69e5563be79ab9948d92f") diff --git a/var/spack/repos/builtin/packages/r-earth/package.py b/var/spack/repos/builtin/packages/r-earth/package.py index 0ad4f6d279dbc6..92e3c072bb9b80 100644 --- a/var/spack/repos/builtin/packages/r-earth/package.py +++ b/var/spack/repos/builtin/packages/r-earth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class REarth(RPackage): cran = "earth" + license("GPL-3.0-only") + version("5.3.2", sha256="c844d75edf9a2706a911bb05ed4287aad9acf6f3fed357e037763a300eac0bea") version("5.3.1", sha256="0bbe06ba974ceb8ec5de1d59cb53f9487d1828d7130fe2503c48b6cb449c4b03") version("5.3.0", sha256="05ace806271a74b3ddf8718a93237fe2a8550a8659ebd87f8079c0bda5e02437") diff --git a/var/spack/repos/builtin/packages/r-ebseq/package.py b/var/spack/repos/builtin/packages/r-ebseq/package.py new file mode 100644 index 00000000000000..4be0874887a8d0 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-ebseq/package.py @@ -0,0 +1,33 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class REbseq(RPackage): + """An R package for gene and isoform differential expression analysis of RNA-seq data. + + R/EBSeq is an R package for identifying genes and isoforms differentially + expressed (DE) across two or more biological conditions in an RNA-seq + experiment. Details can be found in Leng et al., 2013. It provides the syntax + required for identifying DE genes and isoforms in a two-group RNA-seq + experiment as well for identifying DE genes across more than two conditions + (the commands for identifying DE isoforms across more than two conditions + are the same as those required for gene-level analysis).""" + + maintainers("pabloaledo") + + bioc = "EBSeq" + + version("2.0.0", commit="f1d4e4419988ab98540739c9349559fd437cb59f") + version("1.40.0", commit="7d1d2a2b4ea0df8cddfb5e57d6431f3948c5c4ca") + + depends_on("r@3.0:", type=("build", "run")) + depends_on("r-bh", type=("build", "run")) + depends_on("r-blockmodeling", type=("build", "run")) + depends_on("r-gplots", type=("build", "run")) + depends_on("r-rcppeigen@0.3.2.9.0:", type=("build", "run")) + depends_on("r-rcpp@0.12.11:", type=("build", "run")) + depends_on("r-testthat", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ecosolver/package.py b/var/spack/repos/builtin/packages/r-ecosolver/package.py index 7fec257e448b01..d61d3979d157fa 100644 --- a/var/spack/repos/builtin/packages/r-ecosolver/package.py +++ b/var/spack/repos/builtin/packages/r-ecosolver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ecp/package.py b/var/spack/repos/builtin/packages/r-ecp/package.py index 533b5c858c9a68..ed1b5341819a84 100644 --- a/var/spack/repos/builtin/packages/r-ecp/package.py +++ b/var/spack/repos/builtin/packages/r-ecp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class REcp(RPackage): cran = "ecp" + license("GPL-2.0-or-later") + version("3.1.4", sha256="1b98bf25a7659517dc98d1b950fe2a5fed9ef8f750893b3a9e06e9c6d59cc04d") version("3.1.3", sha256="a80ab10bafe30cc96287b9220e44c4b4eda40f5dd0546e4d2a2e1baab514c058") version("3.1.1", sha256="d2ab194e22e6ab0168222fbccfcf2e25c6cd51a73edc959086b0c6e0a7410268") diff --git a/var/spack/repos/builtin/packages/r-edger/package.py b/var/spack/repos/builtin/packages/r-edger/package.py index 478323247fb8f9..2e0345e4891948 100644 --- a/var/spack/repos/builtin/packages/r-edger/package.py +++ b/var/spack/repos/builtin/packages/r-edger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-effects/package.py b/var/spack/repos/builtin/packages/r-effects/package.py index 039d3025e4ea68..2f50fda9bfbd3e 100644 --- a/var/spack/repos/builtin/packages/r-effects/package.py +++ b/var/spack/repos/builtin/packages/r-effects/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class REffects(RPackage): cran = "effects" + license("GPL-2.0-or-later") + version("4.2-2", sha256="2fee322cee8f6eb634bcd54e7793a750c8196443cac176c6793ea854553a925a") version("4.2-1", sha256="5397254214d55eb0e0441786f9329f9e3e3ef864366c0a93f0adb941da147640") version("4.2-0", sha256="6833dfbc65f3f33191a24e9b0d2aa0c964caeebb6c4fd2036ad94ed2723a7a46") diff --git a/var/spack/repos/builtin/packages/r-elemstatlearn/package.py b/var/spack/repos/builtin/packages/r-elemstatlearn/package.py index eb25a2ea737022..86f7f2c21f6bd0 100644 --- a/var/spack/repos/builtin/packages/r-elemstatlearn/package.py +++ b/var/spack/repos/builtin/packages/r-elemstatlearn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ellipse/package.py b/var/spack/repos/builtin/packages/r-ellipse/package.py index af03caa50b0fb5..7c791bf1b5db54 100644 --- a/var/spack/repos/builtin/packages/r-ellipse/package.py +++ b/var/spack/repos/builtin/packages/r-ellipse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class REllipse(RPackage): cran = "ellipse" + license("GPL-2.0-or-later") + version("0.4.5", sha256="39c475851380deeb9361464f8f32fa2ee250f24604791c00680a54aaaaba8936") version("0.4.3", sha256="02ef2b11c3462a8b800332e522183f4c7c40c7d2d66c5174d5f3f6d8cc68a946") version("0.4.2", sha256="1719ce9a00b9ac4d56dbf961803085b892d3359726fda3567bb989ddfed9a5f2") diff --git a/var/spack/repos/builtin/packages/r-ellipsis/package.py b/var/spack/repos/builtin/packages/r-ellipsis/package.py index 4a2a71062b4e7e..f0b9ea8882172e 100644 --- a/var/spack/repos/builtin/packages/r-ellipsis/package.py +++ b/var/spack/repos/builtin/packages/r-ellipsis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class REllipsis(RPackage): cran = "ellipsis" + license("MIT") + version("0.3.2", sha256="a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558") version("0.3.1", sha256="4f8a15158dfc27cdc0f7554c7a61e92b02e4d70bfc3d968f01a99da2189b75db") version("0.3.0", sha256="0bf814cb7a1f0ee1f2949bdc98752a0d535f2a9489280dd4d8fcdb10067ee907") diff --git a/var/spack/repos/builtin/packages/r-emmeans/package.py b/var/spack/repos/builtin/packages/r-emmeans/package.py index 5cc9aa0a6a1973..bf2a67120a07ba 100644 --- a/var/spack/repos/builtin/packages/r-emmeans/package.py +++ b/var/spack/repos/builtin/packages/r-emmeans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class REmmeans(RPackage): cran = "emmeans" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.8.5", sha256="5c88b415b5a42d8c1aa63af090c4987326530ea6d0e60bab9b5fb7e99a982415") version("1.8.2", sha256="785973457d8a6547df489f87b62987d44a68c4b9018661d38ca11ee34e49d209") version("1.8.1-1", sha256="79fc5e44255427b038d0dbe2c9887d84984baacb11bb9a9078cd8d0dca2e6577") diff --git a/var/spack/repos/builtin/packages/r-emmli/package.py b/var/spack/repos/builtin/packages/r-emmli/package.py index 14ac80eb27b066..b78ffec5dfcb38 100644 --- a/var/spack/repos/builtin/packages/r-emmli/package.py +++ b/var/spack/repos/builtin/packages/r-emmli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-energy/package.py b/var/spack/repos/builtin/packages/r-energy/package.py index 8a71ec4d842b44..2948c5e1f24198 100644 --- a/var/spack/repos/builtin/packages/r-energy/package.py +++ b/var/spack/repos/builtin/packages/r-energy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class REnergy(RPackage): cran = "energy" + license("GPL-2.0-or-later") + version("1.7-11", sha256="c29f8fb000c979d2504f6f6d3a99c773004f77d58793e7e2a5766155272b6511") version("1.7-10", sha256="543de4875c46cc90e711e71c45b082d962fbb5158a094f9f10d37d3f57e1bea7") version("1.7-9", sha256="68d0e0ed99f5a8a03858603ed36010a2f67b87a947dbcc65a9da2e08a2d3bad9") diff --git a/var/spack/repos/builtin/packages/r-enrichplot/package.py b/var/spack/repos/builtin/packages/r-enrichplot/package.py index 0b2ae3ed1b6479..8965caa63152c6 100644 --- a/var/spack/repos/builtin/packages/r-enrichplot/package.py +++ b/var/spack/repos/builtin/packages/r-enrichplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ensembldb/package.py b/var/spack/repos/builtin/packages/r-ensembldb/package.py index aa04438ae6da26..67529aadc7c083 100644 --- a/var/spack/repos/builtin/packages/r-ensembldb/package.py +++ b/var/spack/repos/builtin/packages/r-ensembldb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-envstats/package.py b/var/spack/repos/builtin/packages/r-envstats/package.py index a91d1854c530b2..6a03accb0d17c2 100644 --- a/var/spack/repos/builtin/packages/r-envstats/package.py +++ b/var/spack/repos/builtin/packages/r-envstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ergm/package.py b/var/spack/repos/builtin/packages/r-ergm/package.py index c5325583e556d1..b5434cfa37b655 100644 --- a/var/spack/repos/builtin/packages/r-ergm/package.py +++ b/var/spack/repos/builtin/packages/r-ergm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RErgm(RPackage): cran = "ergm" + license("GPL-3.0-only") + version("4.4.0", sha256="2db152cc7fdd71d6f0065603405f30bf5e206591da39b8f542178ec6d6126173") version("4.3.1", sha256="3ff63c81ea4061ac0c79247fcd2e614494624f7f1df57a4634927e7e90800ed3") version("4.2.3", sha256="35d15373d4a8445872eb3713c81c6c6ac34b72096e0cdb04292a468e65ae9288") diff --git a/var/spack/repos/builtin/packages/r-estimability/package.py b/var/spack/repos/builtin/packages/r-estimability/package.py index 9dc4f11a8a9436..545001ea96da06 100644 --- a/var/spack/repos/builtin/packages/r-estimability/package.py +++ b/var/spack/repos/builtin/packages/r-estimability/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class REstimability(RPackage): cran = "estimability" + license("GPL-3.0-or-later") + version("1.4.1", sha256="c65aaf1e452f3947013d3ce05ae674d48492081f615a942592dc91db780f1124") version("1.3", sha256="a33179c5fbd6a1a623d90cb6f1743148f92c09429fac466867f3ea70946a2e32") diff --git a/var/spack/repos/builtin/packages/r-europepmc/package.py b/var/spack/repos/builtin/packages/r-europepmc/package.py index 2db4a67486d263..64a9c094626f88 100644 --- a/var/spack/repos/builtin/packages/r-europepmc/package.py +++ b/var/spack/repos/builtin/packages/r-europepmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class REuropepmc(RPackage): cran = "europepmc" + license("GPL-3.0-only") + version("0.4.1", sha256="c1ba91a2a99432cabe18e86fea33ac9d20dbb3ac0b58f430d464b4d8ecba4a9a") version("0.4", sha256="d55f62963d0ee84830654bbc78f4ad8285e376b04be137cbeaf8ad2a98b7969c") version("0.3", sha256="5044a253d223e2bb8502063cd03c0fe4db856467e497d650da7ccd8f75d0f8d9") diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index 5c4c7af18d508f..86aeb872a928c8 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class REvaluate(RPackage): cran = "evaluate" + license("MIT") + version("0.20", sha256="35f5d9e85603600b58960923d591c5ca1115153febba7c612867d8b5598afff0") version("0.18", sha256="7f4eecdc97ac286d5c7a39c454fe6798da38ef634bf9305c595faa8facb2bf36") version("0.17", sha256="49c743c94cb967911af0e5555861a3762cd840b98578882671b583cff86ba963") diff --git a/var/spack/repos/builtin/packages/r-evd/package.py b/var/spack/repos/builtin/packages/r-evd/package.py index e1b7787aab479f..09a3a103566d78 100644 --- a/var/spack/repos/builtin/packages/r-evd/package.py +++ b/var/spack/repos/builtin/packages/r-evd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class REvd(RPackage): cran = "evd" + license("GPL-3.0-only") + version("2.3-6.1", sha256="662c592d3f5c5693dbf1c673d1137c4a60a347e330b71be1f3933f201d2c8971") version("2.3-6", sha256="8edb8bc4f06d246c4343fd923bb5d5df99724d6db8821bfd996220343a834cb6") version("2.3-3", sha256="2fc5ef2e0c3a2a9392425ddd45914445497433d90fb80b8c363877baee4559b4") diff --git a/var/spack/repos/builtin/packages/r-exactextractr/package.py b/var/spack/repos/builtin/packages/r-exactextractr/package.py index 154a2a4b7b6b03..28eb6fe05f63c0 100644 --- a/var/spack/repos/builtin/packages/r-exactextractr/package.py +++ b/var/spack/repos/builtin/packages/r-exactextractr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RExactextractr(RPackage): cran = "exactextractr" + license("Apache-2.0") + version("0.9.1", sha256="f0cf367c25a45b09eda1d435c8c818590ff4de86162f675e3172821d1853f4a1") version("0.9.0", sha256="705a355534f427dc832af2a294aaf928c10c72d6335d38aed86da64d814eb18d") version("0.8.2", sha256="cc32ab3af8d881a7e7836c296ea42f3fdabf3373ec1de0b154dbfe9870ee8a74") diff --git a/var/spack/repos/builtin/packages/r-exomecopy/package.py b/var/spack/repos/builtin/packages/r-exomecopy/package.py index 7403272c840577..893d6c28b265eb 100644 --- a/var/spack/repos/builtin/packages/r-exomecopy/package.py +++ b/var/spack/repos/builtin/packages/r-exomecopy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-exomedepth/package.py b/var/spack/repos/builtin/packages/r-exomedepth/package.py index d2858b58f6e0f1..c67800af9800b0 100644 --- a/var/spack/repos/builtin/packages/r-exomedepth/package.py +++ b/var/spack/repos/builtin/packages/r-exomedepth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-experimenthub/package.py b/var/spack/repos/builtin/packages/r-experimenthub/package.py index d0cd5eb750f0f4..610a0ae0e07c90 100644 --- a/var/spack/repos/builtin/packages/r-experimenthub/package.py +++ b/var/spack/repos/builtin/packages/r-experimenthub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-expint/package.py b/var/spack/repos/builtin/packages/r-expint/package.py index 5aab56de304ca3..b16b9089bef11f 100644 --- a/var/spack/repos/builtin/packages/r-expint/package.py +++ b/var/spack/repos/builtin/packages/r-expint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RExpint(RPackage): cran = "expint" + license("GPL-2.0-or-later") + version("0.1-8", sha256="12654fe0069090c059086d507a99d1061a14acfda4e204c27c0b397c0962c6b2") version("0.1-7", sha256="7cfbd77e5c8ee2f4be5d12d3dd364819a146cbb6d533a00801a763c2ee51a005") version("0.1-6", sha256="c7d13a8e299a91e94622047fe22b0006137e7bf82e34d10871b631fa58115145") diff --git a/var/spack/repos/builtin/packages/r-expm/package.py b/var/spack/repos/builtin/packages/r-expm/package.py index ed1b2a8a3c209e..944d12211ff647 100644 --- a/var/spack/repos/builtin/packages/r-expm/package.py +++ b/var/spack/repos/builtin/packages/r-expm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RExpm(RPackage): cran = "expm" + license("GPL-2.0-or-later") + version("0.999-7", sha256="28f249b914b8dd33eee16663fc793e57afd0e301e16067bf9f27fa8e591ba0f1") version("0.999-6", sha256="2c79912fd2e03fcf89c29f09555880934402fcb2359af8b4579d79b4f955addc") version("0.999-4", sha256="58d06427a08c9442462b00a5531e2575800be13ed450c5a1546261251e536096") diff --git a/var/spack/repos/builtin/packages/r-factoextra/package.py b/var/spack/repos/builtin/packages/r-factoextra/package.py index 36a2e21f05c44a..d5e2a393326be3 100644 --- a/var/spack/repos/builtin/packages/r-factoextra/package.py +++ b/var/spack/repos/builtin/packages/r-factoextra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RFactoextra(RPackage): cran = "factoextra" + license("GPL-2.0-only") + version("1.0.7", sha256="624ff01c74933352aca55966f8a052b1ccc878f52c2c307e47f88e0665db94aa") version("1.0.5", sha256="8177a3f5107883ae248b2cd0afa388a1794741f5155a9455b3883788cf44d5d0") version("1.0.4", sha256="e4a000a04ef5b9aa0790dc6e5277451c482a19ba10dda9474f6c6982424aeed3") diff --git a/var/spack/repos/builtin/packages/r-factominer/package.py b/var/spack/repos/builtin/packages/r-factominer/package.py index ecaa6fd0681510..39b8379a45a501 100644 --- a/var/spack/repos/builtin/packages/r-factominer/package.py +++ b/var/spack/repos/builtin/packages/r-factominer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fansi/package.py b/var/spack/repos/builtin/packages/r-fansi/package.py index 3516a0307b5c85..11d4708e17ef0a 100644 --- a/var/spack/repos/builtin/packages/r-fansi/package.py +++ b/var/spack/repos/builtin/packages/r-fansi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RFansi(RPackage): cran = "fansi" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.0.4", sha256="3163214e6c40922bbb495229259ed8ce1bebd98b77098a6936d234e43da9c49f") version("1.0.3", sha256="86a7b83d8c9d28baebbde310cd0b459d0950a9c7ff1a6276ce5858f6a89bc06a") version("1.0.2", sha256="d1e2cf2e10613abe19071e3dab7c564ebcf85ad13cbee25fa1999267af01b557") diff --git a/var/spack/repos/builtin/packages/r-farver/package.py b/var/spack/repos/builtin/packages/r-farver/package.py index d64e76c1fdc08d..e7d36ca104c4c7 100644 --- a/var/spack/repos/builtin/packages/r-farver/package.py +++ b/var/spack/repos/builtin/packages/r-farver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RFarver(RPackage): cran = "farver" + license("MIT") + version("2.1.1", sha256="0dcfda6ca743f465372790bcff1bcbc6a7145fdac1c682b021f654e8c6c996ce") version("2.1.0", sha256="e5c8630607049f682fb3002b99ca4f5e7c6b94f8b2a4342df594e7853b77cef4") version("2.0.3", sha256="0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc") diff --git a/var/spack/repos/builtin/packages/r-fastcluster/package.py b/var/spack/repos/builtin/packages/r-fastcluster/package.py index 2b5da8e17d01c2..bdc1f96110fb45 100644 --- a/var/spack/repos/builtin/packages/r-fastcluster/package.py +++ b/var/spack/repos/builtin/packages/r-fastcluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RFastcluster(RPackage): cran = "fastcluster" + license("BSD-2-Clause OR GPL-2.0-only OR custom") + version("1.2.3", sha256="1f229129e1cddc78c7bb5ecc90c4d28ed810ee68cf210004c7cdfa12cfaf2a01") version("1.1.25", sha256="f3661def975802f3dd3cec5b2a1379f3707eacff945cf448e33aec0da1ed4205") diff --git a/var/spack/repos/builtin/packages/r-fastdigest/package.py b/var/spack/repos/builtin/packages/r-fastdigest/package.py index 895ce575e82777..aa1aea798887eb 100644 --- a/var/spack/repos/builtin/packages/r-fastdigest/package.py +++ b/var/spack/repos/builtin/packages/r-fastdigest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,4 +21,6 @@ class RFastdigest(RPackage): maintainers("dorton21") + license("Artistic-2.0") + version("0.6-3", sha256="62a04aa39f751cf9bb7ff43cadb3c1a8d2270d7f3e8550a2d6ca9e1d8ca09a09") diff --git a/var/spack/repos/builtin/packages/r-fastica/package.py b/var/spack/repos/builtin/packages/r-fastica/package.py index 96cb4ea4760c05..9c64c3130cfe5d 100644 --- a/var/spack/repos/builtin/packages/r-fastica/package.py +++ b/var/spack/repos/builtin/packages/r-fastica/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fastmap/package.py b/var/spack/repos/builtin/packages/r-fastmap/package.py index a1e12da190485e..a97657a321fe86 100644 --- a/var/spack/repos/builtin/packages/r-fastmap/package.py +++ b/var/spack/repos/builtin/packages/r-fastmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RFastmap(RPackage): cran = "fastmap" + license("MIT") + version("1.1.1", sha256="3623809dd016ae8abd235200ba7834effc4b916915a059deb76044137c5c7173") version("1.1.0", sha256="9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b") version("1.0.1", sha256="4778b05dfebd356f8df980dfeff3b973a72bca14898f870e5c40c1d84db9faec") diff --git a/var/spack/repos/builtin/packages/r-fastmatch/package.py b/var/spack/repos/builtin/packages/r-fastmatch/package.py index c43bae6c671b42..e95677e309d607 100644 --- a/var/spack/repos/builtin/packages/r-fastmatch/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RFastmatch(RPackage): cran = "fastmatch" + license("GPL-2.0-only") + version("1.1-3", sha256="1defa0b08bc3f48e4c3e4ba8df4f1b9e8299932fd8c747c67d32de44f90b9861") version("1.1-0", sha256="20b51aa4838dbe829e11e951444a9c77257dcaf85130807508f6d7e76797007d") diff --git a/var/spack/repos/builtin/packages/r-fastmatrix/package.py b/var/spack/repos/builtin/packages/r-fastmatrix/package.py index a8738a4479952f..c086bcc21e1cb0 100644 --- a/var/spack/repos/builtin/packages/r-fastmatrix/package.py +++ b/var/spack/repos/builtin/packages/r-fastmatrix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class RFastmatrix(RPackage): cran = "fastmatrix" + license("GPL-3.0-only") + version("0.5", sha256="fb5f251a98425161e9dbbbb7edf95226725255b1474aad03ab046c7c6c6c3f12") version("0.4-1245", sha256="ee2e12b5dcda4585cca21f2c0ac144706f6fd26024586e91d622c6cd66d1d873") version("0.4-1", sha256="494a1aad38dcec28956eba8d095c964b20c5388dfb6dc2a23848ae37ea61cde5") diff --git a/var/spack/repos/builtin/packages/r-fda/package.py b/var/spack/repos/builtin/packages/r-fda/package.py index b5d481f4dd8c95..0f5aa30a7f3f83 100644 --- a/var/spack/repos/builtin/packages/r-fda/package.py +++ b/var/spack/repos/builtin/packages/r-fda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RFda(RPackage): cran = "fda" + license("GPL-2.0-or-later") + version("6.0.5", sha256="14445776fc65284cd6cae98e5b4dd14c2626d96db5f78c0fcc6aabce5419b8f1") version("6.0.3", sha256="205814b9812664e8201221f99e0e8391aa49dba2ae287dc404c57c0c492477d3") version("5.5.1", sha256="dcaa2f6ae226d35855bc79c6967f60d45404b984c0afaec215b139c4b8dea23a") diff --git a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py index c30395d819e337..ebbc94f2087345 100644 --- a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py +++ b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg18/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py index 52eb87ad928dff..e237ea1f07b070 100644 --- a/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-fdb-infiniummethylation-hg19/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fds/package.py b/var/spack/repos/builtin/packages/r-fds/package.py index b2cf3269976de1..e13dbfee7b99c6 100644 --- a/var/spack/repos/builtin/packages/r-fds/package.py +++ b/var/spack/repos/builtin/packages/r-fds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class RFds(RPackage): cran = "fds" + license("GPL-2.0-or-later") + version("1.8", sha256="203a5e7671e542dcb83d4c75d0f4012aaebc32d54f94657afaf9e71e99dd0489") depends_on("r@3.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ff/package.py b/var/spack/repos/builtin/packages/r-ff/package.py index 428e6019b391d5..04017a2835a3ce 100644 --- a/var/spack/repos/builtin/packages/r-ff/package.py +++ b/var/spack/repos/builtin/packages/r-ff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -54,6 +54,8 @@ class RFf(RPackage): cran = "ff" + license("GPL-2.0-only OR GPL-3.0-only OR custom") + version("4.0.9", sha256="722053271987a0c9673c3ff9e7968bbab47979d529a2fe6bb1a3179408ee3c4f") version("4.0.7", sha256="0a47333d31c7afc3f95387166e21a3e4c763cbef47d9b5927753aef4ff8d83fa") version("4.0.5", sha256="9aba9e271144ec224063ddba0d791e2fcdb9c912d48fdc49e204fce628355037") diff --git a/var/spack/repos/builtin/packages/r-fftwtools/package.py b/var/spack/repos/builtin/packages/r-fftwtools/package.py index 9b3b679ae64ffb..3072b692e56b6a 100644 --- a/var/spack/repos/builtin/packages/r-fftwtools/package.py +++ b/var/spack/repos/builtin/packages/r-fftwtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RFftwtools(RPackage): cran = "fftwtools" + license("GPL-2.0-or-later") + version("0.9-11", sha256="f1f0c9a9086c7b2f72c5fb0334717cc917213a004eaef8448eab4940c9852c7f") version("0.9-9", sha256="a9273b7e495d228d740ab4525467e4bbefe8614bd2d97e7234017f1305f51441") version("0.9-8", sha256="4641c8cd70938c2a8bde0b6da6cf7f83e96175ef52f1ca42ec3920a1dabf1bdb") diff --git a/var/spack/repos/builtin/packages/r-fgsea/package.py b/var/spack/repos/builtin/packages/r-fgsea/package.py index 1719bde23a9970..a4b092cdf9cbf4 100644 --- a/var/spack/repos/builtin/packages/r-fgsea/package.py +++ b/var/spack/repos/builtin/packages/r-fgsea/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RFgsea(RPackage): bioc = "fgsea" + license("MIT") + version("1.26.0", commit="102b439e2208ae415dc19d3d1ac8936f9c5999f1") version("1.24.0", commit="ac74ccd935c15623b8584caa791835aec514144b") version("1.22.0", commit="e4e203aa64faa984e0406fed5d87a422d9df92f2") diff --git a/var/spack/repos/builtin/packages/r-fields/package.py b/var/spack/repos/builtin/packages/r-fields/package.py index 761d09f5ec9974..27cb884cc0d33f 100644 --- a/var/spack/repos/builtin/packages/r-fields/package.py +++ b/var/spack/repos/builtin/packages/r-fields/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -36,6 +36,8 @@ class RFields(RPackage): cran = "fields" + license("GPL-2.0-or-later") + version("14.1", sha256="57c4c5592443d2ee869014b3199989b5edd1aff52e24f1cd313b8f9b34a95434") version("13.3", sha256="c652838b1ae7eb368831522824bfbc1d1db7b9d1db5e9bb52b194098549944c3") version("11.6", sha256="8600d1d992c40668cc2ab01b3c17d0e1bd44a001ec7ba9f468bc0e9ef87c59db") diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index 6803553cc4accd..3c931a8239a848 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RFilehash(RPackage): cran = "filehash" + license("GPL-2.0-or-later") + version("2.4-5", sha256="3b1ee2794dd61e525ee44db16611c65957691d77bb26ae481eba988bb55da22c") version("2.4-3", sha256="f394e2c93233e8ad1c104562ea9349855dc8e303131f559cd59834f9aa3e41bd") version("2.4-2", sha256="b6d056f75d45e315943a4618f5f62802612cd8931ba3f9f474b595140a3cfb93") diff --git a/var/spack/repos/builtin/packages/r-filelock/package.py b/var/spack/repos/builtin/packages/r-filelock/package.py index e658ece3dd0ff7..3aba76da0895bd 100644 --- a/var/spack/repos/builtin/packages/r-filelock/package.py +++ b/var/spack/repos/builtin/packages/r-filelock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RFilelock(RPackage): cran = "filelock" + license("MIT") + version("1.0.2", sha256="ac2915950789b16c43a625a2b8dab6ba423588db4a7d0daa75b74518b82b1403") depends_on("r-callr@2.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-findpython/package.py b/var/spack/repos/builtin/packages/r-findpython/package.py index c74bbc0751fc44..86808846365a87 100644 --- a/var/spack/repos/builtin/packages/r-findpython/package.py +++ b/var/spack/repos/builtin/packages/r-findpython/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RFindpython(RPackage): cran = "findpython" + license("MIT") + version("1.0.8", sha256="0f8a90cbafd4949c0333a86808383a358fb7ec3268953d8a4887d5d22264cdb7") version("1.0.7", sha256="59f904b9c2ec84b589380de59d13afbf14d1ec3b670e3a07e820298aaf04c149") version("1.0.5", sha256="3e9a21988cb78833769b02680d128a0cc01bcb41aa9c9725ab1742f349759145") diff --git a/var/spack/repos/builtin/packages/r-fit-models/package.py b/var/spack/repos/builtin/packages/r-fit-models/package.py index fde80a06129309..56873e254681cc 100644 --- a/var/spack/repos/builtin/packages/r-fit-models/package.py +++ b/var/spack/repos/builtin/packages/r-fit-models/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fitdistrplus/package.py b/var/spack/repos/builtin/packages/r-fitdistrplus/package.py index e427d0f8c893ca..5602ed82aa10b0 100644 --- a/var/spack/repos/builtin/packages/r-fitdistrplus/package.py +++ b/var/spack/repos/builtin/packages/r-fitdistrplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RFitdistrplus(RPackage): cran = "fitdistrplus" + license("GPL-2.0-or-later") + version("1.1-11", sha256="26274f2b710b2417a8bca314d400abf320d4ccf0387ad082743056699501b53d") version("1.1-8", sha256="f3c72310f40773b3839a9506c3cb781d044e09b94f2f38d332bb24e5f9960f5a") version("1.1-6", sha256="17c2990041a3bb7479f3c3a6d13d96c989db8eaddab17eff7e1fbe172a5b96be") diff --git a/var/spack/repos/builtin/packages/r-flashclust/package.py b/var/spack/repos/builtin/packages/r-flashclust/package.py index eb96e880c38719..0bd9a53583970c 100644 --- a/var/spack/repos/builtin/packages/r-flashclust/package.py +++ b/var/spack/repos/builtin/packages/r-flashclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-flexclust/package.py b/var/spack/repos/builtin/packages/r-flexclust/package.py index e734e918cdb7b2..bbc9fff7000e54 100644 --- a/var/spack/repos/builtin/packages/r-flexclust/package.py +++ b/var/spack/repos/builtin/packages/r-flexclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RFlexclust(RPackage): cran = "flexclust" + license("GPL-2.0-only") + version("1.4-1", sha256="d67977df059e622832358069509f8968d506074320a45d34bfd21c65f898538d") version("1.4-0", sha256="82fe445075a795c724644864c7ee803c5dd332a89ea9e6ccf7cd1ae2d1ecfc74") version("1.3-5", sha256="dbf49969c93a7b314d9dc3299a0764ed9a804ba7dcbdc08a1235f244f4b85059") diff --git a/var/spack/repos/builtin/packages/r-flexmix/package.py b/var/spack/repos/builtin/packages/r-flexmix/package.py index 9580d655b69cac..90ae1b58faf95d 100644 --- a/var/spack/repos/builtin/packages/r-flexmix/package.py +++ b/var/spack/repos/builtin/packages/r-flexmix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RFlexmix(RPackage): cran = "flexmix" + license("GPL-2.0-or-later") + version("2.3-19", sha256="adf5a40cbb6d45e3652c1666cb3ccdb9654e501fd685c091cad0686e62bc12e9") version("2.3-18", sha256="462201ef49088845c83083e4ed6725cf069aafb12a814041618aaf09ebd69b51") version("2.3-17", sha256="36019b7833032409ac61720dd625fa5a581a1d8bcba9045b04979c90907b5649") diff --git a/var/spack/repos/builtin/packages/r-fnn/package.py b/var/spack/repos/builtin/packages/r-fnn/package.py index 1599e8227c272a..c9e235eb4dcf0a 100644 --- a/var/spack/repos/builtin/packages/r-fnn/package.py +++ b/var/spack/repos/builtin/packages/r-fnn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fontawesome/package.py b/var/spack/repos/builtin/packages/r-fontawesome/package.py index 195606b65e5c67..90a63abb63170b 100644 --- a/var/spack/repos/builtin/packages/r-fontawesome/package.py +++ b/var/spack/repos/builtin/packages/r-fontawesome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RFontawesome(RPackage): cran = "fontawesome" + license("MIT") + version("0.5.1", sha256="f4ebbbe2ee8d2e2c0342b72095cfe668bd9800ea6c4bf7180300544bde7e566c") version("0.4.0", sha256="760a0bc5b50ddbce1160b123f3b3d76342167519d75641dc2c5b952fa8d4242f") version("0.3.0", sha256="4deefcf4d4580d84213f863351c2a23c39adbd2f8762d7477ec2faa8235a1a31") diff --git a/var/spack/repos/builtin/packages/r-forcats/package.py b/var/spack/repos/builtin/packages/r-forcats/package.py index 960fd7e1cd1695..445dc89c0aa8c4 100644 --- a/var/spack/repos/builtin/packages/r-forcats/package.py +++ b/var/spack/repos/builtin/packages/r-forcats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RForcats(RPackage): cran = "forcats" + license("MIT") + version("1.0.0", sha256="c5bb157909d92e1e1a427c0dc5cb358ea00a43a14918a9088fa4f6630962254e") version("0.5.2", sha256="14a60a43183f82da0fbf42633cee446d21dcbb98a8c37361b5c8061a4da86141") version("0.5.1", sha256="c4fb96e874e2bedaa8a1aa32ea22abdee7906d93b5c5c7b42c0894c0c5b6a289") diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index 9308b9a61bd246..816028867e9f72 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RForeach(RPackage): cran = "foreach" + license("Apache-2.0") + version("1.5.2", sha256="56338d8753f9f68f262cf532fd8a6d0fe25a71a2ff0107f3ce378feb926bafe4") version("1.5.1", sha256="fb5ad69e295618c52b2ac7dff84a0771462870a97345374d43b3de2dc31a68e1") version("1.4.7", sha256="95632c0b1182fc01490718d82fa3b2bce864f2a011ae53282431c7c2a3f5f160") diff --git a/var/spack/repos/builtin/packages/r-forecast/package.py b/var/spack/repos/builtin/packages/r-forecast/package.py index 36058dd915e4d6..713c688d18cd1c 100644 --- a/var/spack/repos/builtin/packages/r-forecast/package.py +++ b/var/spack/repos/builtin/packages/r-forecast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RForecast(RPackage): cran = "forecast" + license("GPL-3.0-only") + version("8.21", sha256="fdd131795a9d3fb399d76a9aa66a0c276637caaa9ec0c75fbe386189d005c6c2") version("8.18", sha256="5920baa8d9d81988000d0e2edcea61c05126b5cb923cb5921a6fcd7bc312d8dd") version("8.16", sha256="9f01eb895a883a7e1e23725b167b46edc1b0b152fd4120278aaa5f7b2621767f") diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index c4d21c04715f15..18e6d6ac46ac42 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RForeign(RPackage): cran = "foreign" + license("GPL-2.0-or-later") + version("0.8-84", sha256="17edf302c7568a122dc496a61a4a886ef7c02224a235d945b473611c79c98549") version("0.8-83", sha256="87eae73f780b6bbcf0a45b3e21d1c87be0404aa2d5b455df92ab45516030721b") version("0.8-82", sha256="f8ed0684d59bec7f3a39cde1aa5ec7b3e6e36aaecacb28120c9c54f7b13f80fb") diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index d0773e89231aa2..985dcfb803f97a 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 109b0208be5546..4b3a454388df35 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fpc/package.py b/var/spack/repos/builtin/packages/r-fpc/package.py index 562ba15e892d20..7b29d95d0fb7a3 100644 --- a/var/spack/repos/builtin/packages/r-fpc/package.py +++ b/var/spack/repos/builtin/packages/r-fpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class RFpc(RPackage): cran = "fpc" + license("GPL-2.0-or-later") + version("2.2-10", sha256="99b4548f2eca1a092a31bc2fa4e4bd1d6b50fdfacf3218588c879ceec99147d2") version("2.2-9", sha256="29b0006e96c8645645d215d3378551bd6525aaf45abde2d9f12933cf6e75fa38") version("2.2-3", sha256="8100a74e6ff96b1cd65fd22494f2d200e54ea5ea533cfca321fa494914bdc3b7") diff --git a/var/spack/repos/builtin/packages/r-fpcompare/package.py b/var/spack/repos/builtin/packages/r-fpcompare/package.py index 8188a1df09cb1a..d31563491525dd 100644 --- a/var/spack/repos/builtin/packages/r-fpcompare/package.py +++ b/var/spack/repos/builtin/packages/r-fpcompare/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-fracdiff/package.py b/var/spack/repos/builtin/packages/r-fracdiff/package.py index ea6c913bf490d8..ac7209584ba049 100644 --- a/var/spack/repos/builtin/packages/r-fracdiff/package.py +++ b/var/spack/repos/builtin/packages/r-fracdiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RFracdiff(RPackage): cran = "fracdiff" + license("GPL-2.0-or-later") + version("1.5-2", sha256="ac5f881330287f5bc68b5cdce4fb74156a95356ffb875ee171538bc44200f437") version("1.5-1", sha256="b8103b32a4ca3a59dda1624c07da08ecd144c7a91a747d1f4663e99421950eb6") version("1.4-2", sha256="983781cedc2b4e3ba9fa020213957d5133ae9cd6710bc61d6225728e2f6e850e") diff --git a/var/spack/repos/builtin/packages/r-fs/package.py b/var/spack/repos/builtin/packages/r-fs/package.py index 55ae18434c2e10..01da707587f2e4 100644 --- a/var/spack/repos/builtin/packages/r-fs/package.py +++ b/var/spack/repos/builtin/packages/r-fs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RFs(RPackage): cran = "fs" + license("MIT") + version("1.6.2", sha256="548b7c0ed5ab26dc4fbd88707ae12987bcaef834dbc6de4e17d453846dc436b2") version("1.5.2", sha256="35cad1781d6d17c1feb56adc4607079c6844b63794d0ce1e74bb18dbc11e1987") version("1.5.0", sha256="36df1653571de3c628a4f769c4627f6ac53d0f9e4106d9d476afb22ae9603897") diff --git a/var/spack/repos/builtin/packages/r-functional/package.py b/var/spack/repos/builtin/packages/r-functional/package.py index 2123ffc7e225a6..eab298ede4824b 100644 --- a/var/spack/repos/builtin/packages/r-functional/package.py +++ b/var/spack/repos/builtin/packages/r-functional/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RFunctional(RPackage): maintainers("jgaeb") + license("GPL-2.0-or-later") + version("0.6", sha256="19b78e27c27b1081245222c42da4dd1cb65c5643e6da9d6c1a6e997755c21888") version("0.4", sha256="05d1a50de6a574d938471c9a615c840871df9f879b2cbbcabc6b25b5809a70a8") version("0.2", sha256="1b11d039153a214e89e4903163522d8e15c1fcf84495023d9e463487bde1e8d8") diff --git a/var/spack/repos/builtin/packages/r-furrr/package.py b/var/spack/repos/builtin/packages/r-furrr/package.py index 690cde5cc2cd88..75eecc4446643d 100644 --- a/var/spack/repos/builtin/packages/r-furrr/package.py +++ b/var/spack/repos/builtin/packages/r-furrr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RFurrr(RPackage): maintainers("jgaeb") + license("MIT") + version("0.3.1", sha256="0d91735e2e9be759b1ab148d115c2c7429b79740514778828e5dab631dc0e48b") version("0.3.0", sha256="3fe91cc1614f9404c708ea3a15b6a40289fa57f40f3ece54452093408d91fd84") version("0.2.3", sha256="0a213422dc0a2e84173f2d3e6c7900dcb677f980c255d6b6ccf666fba1173700") diff --git a/var/spack/repos/builtin/packages/r-futile-logger/package.py b/var/spack/repos/builtin/packages/r-futile-logger/package.py index 3be75b253bdd65..4fffc43d256862 100644 --- a/var/spack/repos/builtin/packages/r-futile-logger/package.py +++ b/var/spack/repos/builtin/packages/r-futile-logger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-futile-options/package.py b/var/spack/repos/builtin/packages/r-futile-options/package.py index 3dee4aad2fb733..45a9890d57e815 100644 --- a/var/spack/repos/builtin/packages/r-futile-options/package.py +++ b/var/spack/repos/builtin/packages/r-futile-options/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-future-apply/package.py b/var/spack/repos/builtin/packages/r-future-apply/package.py index e2ffc238bb7d71..43d35b3845b46a 100644 --- a/var/spack/repos/builtin/packages/r-future-apply/package.py +++ b/var/spack/repos/builtin/packages/r-future-apply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-future/package.py b/var/spack/repos/builtin/packages/r-future/package.py index ef5cfcc18f7578..5cdaa6a99430cc 100644 --- a/var/spack/repos/builtin/packages/r-future/package.py +++ b/var/spack/repos/builtin/packages/r-future/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RFuture(RPackage): cran = "future" + license("LGPL-2.1-or-later") + version("1.32.0", sha256="d5bb74512d069745184dd580a36449dc0b50d95b1cbbbc1605db82de596f2f76") version("1.29.0", sha256="856d1fd51d2f998c6572490c49fdcc27e5f3e0c1ade75eecdbf64a2cd0954373") version("1.28.0", sha256="6fdda66acd9a255e5baa70ff5dacd3c57ab2ecc2d87fd6abeebdfb939c051bf6") diff --git a/var/spack/repos/builtin/packages/r-gamlss-data/package.py b/var/spack/repos/builtin/packages/r-gamlss-data/package.py index d37e856a0099b1..327f62a42ea766 100644 --- a/var/spack/repos/builtin/packages/r-gamlss-data/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gamlss-dist/package.py b/var/spack/repos/builtin/packages/r-gamlss-dist/package.py index 6158655cde2b11..46a8f63ad000cd 100644 --- a/var/spack/repos/builtin/packages/r-gamlss-dist/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss-dist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gamlss/package.py b/var/spack/repos/builtin/packages/r-gamlss/package.py index 63d6c543629cc7..b052d0e2dc7a78 100644 --- a/var/spack/repos/builtin/packages/r-gamlss/package.py +++ b/var/spack/repos/builtin/packages/r-gamlss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGamlss(RPackage): cran = "gamlss" + license("GPL-2.0-only OR GPL-3.0-only") + version("5.4-12", sha256="9f791039f7e5c3cf3f6a2da955994a8c41c43044a2d77d99b289e4f82118a6f0") version("5.4-3", sha256="6619d4fdc183ab492615d44961a126c827d18db20a0d59362e54de877f0a3076") version("5.3-4", sha256="72707187471fd35c5379ae8c9b7b0ca87e302557f09cb3979d1cdb2e2500b01a") diff --git a/var/spack/repos/builtin/packages/r-gamm4/package.py b/var/spack/repos/builtin/packages/r-gamm4/package.py index 3a5e5c760f145c..6d8970260674d0 100644 --- a/var/spack/repos/builtin/packages/r-gamm4/package.py +++ b/var/spack/repos/builtin/packages/r-gamm4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGamm4(RPackage): cran = "gamm4" + license("GPL-2.0-or-later") + version("0.2-6", sha256="57c5b66582b2adc32f6a3bb6a259f5b95198e283a96d966a6007e8e48b380c89") depends_on("r@2.9.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-gargle/package.py b/var/spack/repos/builtin/packages/r-gargle/package.py index 160f836284bd79..9f396884521579 100644 --- a/var/spack/repos/builtin/packages/r-gargle/package.py +++ b/var/spack/repos/builtin/packages/r-gargle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGargle(RPackage): cran = "gargle" + license("MIT") + version("1.4.0", sha256="8e0f1edf5595d4fd27bd92f98af1cc0c1349975803d9d6f3ff0c25ee2440498b") version("1.2.1", sha256="f367e2c82f403167ae84058303a4fb0402664558a2abf0b495474a7ef1a2f020") version("1.2.0", sha256="4d46ca2933f19429ca5a2cfe47b4130a75c7cd9931c7758ade55bac0c091d73b") diff --git a/var/spack/repos/builtin/packages/r-gbm/package.py b/var/spack/repos/builtin/packages/r-gbm/package.py index 7ace49ccaec64e..6204c12b686f29 100644 --- a/var/spack/repos/builtin/packages/r-gbm/package.py +++ b/var/spack/repos/builtin/packages/r-gbm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGbm(RPackage): cran = "gbm" + license("GPL-2.0-or-later OR custom") + version("2.1.8.1", sha256="8d2456124552658ee9500707c4e9992cf42cb88705008c32ea258efb4f2be80b") version("2.1.8", sha256="7d5de3b980b8f23275e86ac9bed48a497c9aa53c58e407dfd676309f38272ec1") version("2.1.5", sha256="06fbde10639dfa886554379b40a7402d1f1236a9152eca517e97738895a4466f") diff --git a/var/spack/repos/builtin/packages/r-gbrd/package.py b/var/spack/repos/builtin/packages/r-gbrd/package.py index d88b569bcfda51..e44000f09e38d6 100644 --- a/var/spack/repos/builtin/packages/r-gbrd/package.py +++ b/var/spack/repos/builtin/packages/r-gbrd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gcrma/package.py b/var/spack/repos/builtin/packages/r-gcrma/package.py index 565ca6c86d8a34..869d0f98486f96 100644 --- a/var/spack/repos/builtin/packages/r-gcrma/package.py +++ b/var/spack/repos/builtin/packages/r-gcrma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gdalutilities/package.py b/var/spack/repos/builtin/packages/r-gdalutilities/package.py index ee93c6577d4635..125dafba92f0de 100644 --- a/var/spack/repos/builtin/packages/r-gdalutilities/package.py +++ b/var/spack/repos/builtin/packages/r-gdalutilities/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gdalutils/package.py b/var/spack/repos/builtin/packages/r-gdalutils/package.py index e00d44746fa928..04b2de51b477eb 100644 --- a/var/spack/repos/builtin/packages/r-gdalutils/package.py +++ b/var/spack/repos/builtin/packages/r-gdalutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index 3071f436714509..51ff21edf0d933 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,6 +33,8 @@ class RGdata(RPackage): cran = "gdata" + license("GPL-2.0-only") + version("2.18.0.1", sha256="5e2f3d5b9398d52a4c07a4d35f5f936450a44567c7db8d8f68b4cc6946e032d9") version("2.18.0", sha256="4b287f59f5bbf5fcbf18db16477852faac4a605b10c5284c46b93fa6e9918d7f") version("2.17.0", sha256="8097ec0e4868f6bf746f821cff7842f696e874bb3a84f1b2aa977ecd961c3e4e") diff --git a/var/spack/repos/builtin/packages/r-gdsfmt/package.py b/var/spack/repos/builtin/packages/r-gdsfmt/package.py index c0aa0aeb4963a5..b2f85fbc0c74f2 100644 --- a/var/spack/repos/builtin/packages/r-gdsfmt/package.py +++ b/var/spack/repos/builtin/packages/r-gdsfmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RGdsfmt(RPackage): bioc = "gdsfmt" + license("BSD-2-Clause") + version("1.36.0", commit="39ba0af93d499b0f9ef53f04d4f15e5436616f1a") version("1.34.0", commit="ab912c393d8eb6dc26f844a13422a29b9ce7265b") version("1.32.0", commit="06f2097cc10b1888739f86e635383a0f2ee7e208") diff --git a/var/spack/repos/builtin/packages/r-geiger/package.py b/var/spack/repos/builtin/packages/r-geiger/package.py index bb9ed694e57fb3..62d8a896cd7c74 100644 --- a/var/spack/repos/builtin/packages/r-geiger/package.py +++ b/var/spack/repos/builtin/packages/r-geiger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGeiger(RPackage): cran = "geiger" + license("GPL-2.0-or-later") + version("2.0.11", sha256="dcc5a0a988439110078867e0aaf09b048e27db7f02e4cbdfe35783611fde3f69") version("2.0.10", sha256="2895cfb73fb91764be2ec3f931e4f3b2e75ae00a1431af4b40dc90e7c0693be0") version("2.0.9", sha256="c8c8c871b4eb03ba1dc2fd49db304741b16ede99fe49bb5f9b2c220b9e2a8066") diff --git a/var/spack/repos/builtin/packages/r-genefilter/package.py b/var/spack/repos/builtin/packages/r-genefilter/package.py index ce8764eadd723c..74936d9ab5a0a6 100644 --- a/var/spack/repos/builtin/packages/r-genefilter/package.py +++ b/var/spack/repos/builtin/packages/r-genefilter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genelendatabase/package.py b/var/spack/repos/builtin/packages/r-genelendatabase/package.py index 3d583803af405f..52db556603b4f2 100644 --- a/var/spack/repos/builtin/packages/r-genelendatabase/package.py +++ b/var/spack/repos/builtin/packages/r-genelendatabase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genemeta/package.py b/var/spack/repos/builtin/packages/r-genemeta/package.py index ed6458cc9b5d33..0eff5a6e108f59 100644 --- a/var/spack/repos/builtin/packages/r-genemeta/package.py +++ b/var/spack/repos/builtin/packages/r-genemeta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-geneplotter/package.py b/var/spack/repos/builtin/packages/r-geneplotter/package.py index 74caffa944ce4b..d6c499a30f927d 100644 --- a/var/spack/repos/builtin/packages/r-geneplotter/package.py +++ b/var/spack/repos/builtin/packages/r-geneplotter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-generics/package.py b/var/spack/repos/builtin/packages/r-generics/package.py index 0d99164169e3fe..5dbb40efc8fc58 100644 --- a/var/spack/repos/builtin/packages/r-generics/package.py +++ b/var/spack/repos/builtin/packages/r-generics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGenerics(RPackage): cran = "generics" + license("MIT") + version("0.1.3", sha256="75046163bfa8b8a4f4214c1b689e796207f6447182f2e5062cf570302387d053") version("0.1.2", sha256="63eab37a9148f820ce2d67bda3dab6dedb9db6890baa5284949c39ab1b4c5898") version("0.1.1", sha256="a2478ebf1a0faa8855a152f4e747ad969a800597434196ed1f71975a9eb11912") diff --git a/var/spack/repos/builtin/packages/r-genetics/package.py b/var/spack/repos/builtin/packages/r-genetics/package.py index 52de75a4c79014..d57ef790614f85 100644 --- a/var/spack/repos/builtin/packages/r-genetics/package.py +++ b/var/spack/repos/builtin/packages/r-genetics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGenetics(RPackage): cran = "genetics" + license("GPL-2.0-or-later") + version("1.3.8.1.3", sha256="fef2c95f6a57f32b3cf4acf003480439462bb28297c501c617de307bfeee9252") version("1.3.8.1.2", sha256="30cb67de2e901578fd802deb7fbfea6c93024c9fb6ea66cad88430a3a2a51eec") diff --git a/var/spack/repos/builtin/packages/r-genie3/package.py b/var/spack/repos/builtin/packages/r-genie3/package.py index f07a94e7ed0b0d..3a79f63b99feee 100644 --- a/var/spack/repos/builtin/packages/r-genie3/package.py +++ b/var/spack/repos/builtin/packages/r-genie3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py index 4f04c16c238781..46df7986469e1c 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodb/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py index cfb5093c117393..dde99a8f618eeb 100644 --- a/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py +++ b/var/spack/repos/builtin/packages/r-genomeinfodbdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genomicalignments/package.py b/var/spack/repos/builtin/packages/r-genomicalignments/package.py index f3e8a24e47477a..3a4364713d0606 100644 --- a/var/spack/repos/builtin/packages/r-genomicalignments/package.py +++ b/var/spack/repos/builtin/packages/r-genomicalignments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py index 0ca2561f352a34..81d2cc1a43384f 100644 --- a/var/spack/repos/builtin/packages/r-genomicfeatures/package.py +++ b/var/spack/repos/builtin/packages/r-genomicfeatures/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-genomicranges/package.py b/var/spack/repos/builtin/packages/r-genomicranges/package.py index cad44e125da373..ca13cefcbfca3b 100644 --- a/var/spack/repos/builtin/packages/r-genomicranges/package.py +++ b/var/spack/repos/builtin/packages/r-genomicranges/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gensa/package.py b/var/spack/repos/builtin/packages/r-gensa/package.py index 009aba764c3160..7402c6808fc250 100644 --- a/var/spack/repos/builtin/packages/r-gensa/package.py +++ b/var/spack/repos/builtin/packages/r-gensa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-geojsonsf/package.py b/var/spack/repos/builtin/packages/r-geojsonsf/package.py index 64d81948ae0d7b..8307479d69d31a 100644 --- a/var/spack/repos/builtin/packages/r-geojsonsf/package.py +++ b/var/spack/repos/builtin/packages/r-geojsonsf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RGeojsonsf(RPackage): cran = "geojsonsf" + license("MIT") + version("2.0.3", sha256="275ca14672d982e6a95884515f49d8a0aad14f3be62ea01b675a91b0bffb46d1") version("2.0.1", sha256="42df40433bfbece5a39cd97b5bd4690b4424855241fcc3e7322ee68a3988bfbf") diff --git a/var/spack/repos/builtin/packages/r-geometries/package.py b/var/spack/repos/builtin/packages/r-geometries/package.py index 984da306d044e9..68728af1d3adf2 100644 --- a/var/spack/repos/builtin/packages/r-geometries/package.py +++ b/var/spack/repos/builtin/packages/r-geometries/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGeometries(RPackage): cran = "geometries" + license("MIT") + version("0.2.2", sha256="32d3063de0f8a751382788f85ebaee5f39d68e486253c159d553bb3d72d69141") version("0.2.0", sha256="8cf5094f3c2458fef5d755799c766afd27c66cd1c292574a6ab532d608360314") diff --git a/var/spack/repos/builtin/packages/r-geometry/package.py b/var/spack/repos/builtin/packages/r-geometry/package.py index 779b62be63874a..855612ecc9ab83 100644 --- a/var/spack/repos/builtin/packages/r-geometry/package.py +++ b/var/spack/repos/builtin/packages/r-geometry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RGeometry(RPackage): cran = "geometry" + license("GPL-3.0-or-later") + version("0.4.7", sha256="96204205f51b4d63c2e7a7b00365def27d131f3c9ec66db56b510046e5d2013b") version("0.4.6.1", sha256="52c87a43cdf414c08b8183441c44497039cba92a9cff719debf09ad8d5d7f472") version("0.4.6", sha256="910465a8c8043faca73bcc7c81c9249b9938677ee6649468003b438a6503f5d8") diff --git a/var/spack/repos/builtin/packages/r-geomorph/package.py b/var/spack/repos/builtin/packages/r-geomorph/package.py index 18e1003be5014a..6cce7f23134a71 100644 --- a/var/spack/repos/builtin/packages/r-geomorph/package.py +++ b/var/spack/repos/builtin/packages/r-geomorph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGeomorph(RPackage): cran = "geomorph" + license("GPL-3.0-or-later") + version("4.0.5", sha256="900d41f95a610b026763797f290ce94c10827a59b05030ed01c841c59264313b") version("4.0.4", sha256="dfded29070bc06bf1dc0d6fedaa16fea9f8eef76f0a7443a11f2835c328c6b0a") version("4.0.3", sha256="8fd77bedf2ee85f1e4aaac4b22253810d12dba0b79d78d67695d237b7184e263") diff --git a/var/spack/repos/builtin/packages/r-geonames/package.py b/var/spack/repos/builtin/packages/r-geonames/package.py index ea4a19839028fc..d49fee04a1b7a6 100644 --- a/var/spack/repos/builtin/packages/r-geonames/package.py +++ b/var/spack/repos/builtin/packages/r-geonames/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGeonames(RPackage): cran = "geonames" + license("GPL-3.0-only") + version("0.999", sha256="1dd7bbd82d9425d14eb36f8e5bf431feaccfe3b0c4e70bf38f44f13dfc59e17b") depends_on("r@2.2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-geoquery/package.py b/var/spack/repos/builtin/packages/r-geoquery/package.py index 7b31628598965d..a0745d329ff63c 100644 --- a/var/spack/repos/builtin/packages/r-geoquery/package.py +++ b/var/spack/repos/builtin/packages/r-geoquery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGeoquery(RPackage): bioc = "GEOquery" + license("MIT") + version("2.68.0", commit="7995c579b068f98ebf3f1cd2cfd0575c3d73530c") version("2.66.0", commit="00a954e9f8223607b43cf112943ab575d03a0eb6") version("2.64.2", commit="e9b7f075a4a6a952660443ca93ed392d7a4fd6d7") diff --git a/var/spack/repos/builtin/packages/r-geor/package.py b/var/spack/repos/builtin/packages/r-geor/package.py index 42179c4c4f96ee..60cc131b92cec1 100644 --- a/var/spack/repos/builtin/packages/r-geor/package.py +++ b/var/spack/repos/builtin/packages/r-geor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index 68012887a2cedc..c9079b02a4a68c 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGeosphere(RPackage): cran = "geosphere" + license("GPL-3.0-or-later") + version("1.5-18", sha256="99ff6ff050cc8c2d565b6bb1488607fc7950a6d448930f8d9642eccefbc6dac0") version("1.5-14", sha256="f2c3a4ae1c87c86c123d48f134721c809fb33675cb5cd0959080049eabdbe42d") version("1.5-10", sha256="56cd4f787101e2e18f19ddb83794154b58697e63cad81168f0936f60ab7eb497") diff --git a/var/spack/repos/builtin/packages/r-gert/package.py b/var/spack/repos/builtin/packages/r-gert/package.py index eb57fcf8213093..3ac439d4207bab 100644 --- a/var/spack/repos/builtin/packages/r-gert/package.py +++ b/var/spack/repos/builtin/packages/r-gert/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGert(RPackage): cran = "gert" + license("MIT") + version("1.9.2", sha256="42ca1b4bcafb1fdbbc7f54df0ee4476ecd19e9e7d563b53fe7064e0086ab665e") version("1.9.1", sha256="751d18760a08ae00b8de73dc3e564cf4e76b1f47c7179101320e1b70152e1fdd") version("1.6.0", sha256="8c440aeebabf1cb3b57124ec9280e0f46b2ab56f2bca07d72b5c7a7f4edc2964") diff --git a/var/spack/repos/builtin/packages/r-getopt/package.py b/var/spack/repos/builtin/packages/r-getopt/package.py index 7e18e8c5c733a3..79b26170f133a6 100644 --- a/var/spack/repos/builtin/packages/r-getopt/package.py +++ b/var/spack/repos/builtin/packages/r-getopt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGetopt(RPackage): cran = "getopt" + license("GPL-2.0-or-later") + version("1.20.3", sha256="531f5fdfdcd6b96a73df2b39928418de342160ac1b0043861e9ea844f9fbf57f") version("1.20.2", sha256="3d6c12d32d6cd4b2909be626e570e158b3ed960e4739510e3a251e7f172de38e") version("1.20.1", sha256="1522c35b13e8546979725a68b75e3bc9d156fb06569067472405f6b8591d8654") diff --git a/var/spack/repos/builtin/packages/r-getoptlong/package.py b/var/spack/repos/builtin/packages/r-getoptlong/package.py index 06a3b9df0768d6..c9b2e59812d7c9 100644 --- a/var/spack/repos/builtin/packages/r-getoptlong/package.py +++ b/var/spack/repos/builtin/packages/r-getoptlong/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ggally/package.py b/var/spack/repos/builtin/packages/r-ggally/package.py index 262ac611dc3512..dac799bacf2cfd 100644 --- a/var/spack/repos/builtin/packages/r-ggally/package.py +++ b/var/spack/repos/builtin/packages/r-ggally/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py b/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py index 32b70de08b132e..5915714aff0413 100644 --- a/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py +++ b/var/spack/repos/builtin/packages/r-ggbeeswarm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGgbeeswarm(RPackage): cran = "ggbeeswarm" + license("GPL-3.0-or-later") + version("0.7.1", sha256="f41550335149bc2122fed0dd280d980cecd02ace79e042d5e03c1f102200ac92") version("0.6.0", sha256="bbac8552f67ff1945180fbcda83f7f1c47908f27ba4e84921a39c45d6e123333") diff --git a/var/spack/repos/builtin/packages/r-ggbio/package.py b/var/spack/repos/builtin/packages/r-ggbio/package.py index bc4b7f0946dd7d..2fce8c9c5aa5c1 100644 --- a/var/spack/repos/builtin/packages/r-ggbio/package.py +++ b/var/spack/repos/builtin/packages/r-ggbio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ggdendro/package.py b/var/spack/repos/builtin/packages/r-ggdendro/package.py index 1b72e2bf8d22b9..657d9a4d49f566 100644 --- a/var/spack/repos/builtin/packages/r-ggdendro/package.py +++ b/var/spack/repos/builtin/packages/r-ggdendro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RGgdendro(RPackage): cran = "ggdendro" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.1.23", sha256="3a33e988c4fe12eec540876ad8ba09bda998773b2d2a90e043ebae4a69fa8eb8") version("0.1.22", sha256="f0a65f3498c1abc3076df0fb56364b63bdf5d212d8931f85bcc6997510916b6a") version("0.1-20", sha256="125cae904fa5d426cccaf32ebe9c6297e9ef0c6fd3f19f61513834d03a0cf8ff") diff --git a/var/spack/repos/builtin/packages/r-ggforce/package.py b/var/spack/repos/builtin/packages/r-ggforce/package.py index 870145d4145c8a..0c73a818132577 100644 --- a/var/spack/repos/builtin/packages/r-ggforce/package.py +++ b/var/spack/repos/builtin/packages/r-ggforce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGgforce(RPackage): cran = "ggforce" + license("MIT") + version("0.4.1", sha256="b44219fb63c45fa003c64bca323452f16dcace635204bc0127d3244c0f451873") version("0.3.3", sha256="2a283bb409da6b96929863a926b153bcc59b2c6f00551805db1d1d43e5929f2f") version("0.3.2", sha256="4cce8acb60ce06af44c1c76bbacd7de129eed9b51ed6a85e03a9bf55b0eff4d2") diff --git a/var/spack/repos/builtin/packages/r-ggfun/package.py b/var/spack/repos/builtin/packages/r-ggfun/package.py index 20aad57768b1ac..9c73c7fa48e7b7 100644 --- a/var/spack/repos/builtin/packages/r-ggfun/package.py +++ b/var/spack/repos/builtin/packages/r-ggfun/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGgfun(RPackage): cran = "ggfun" + license("Artistic-2.0") + version("0.0.9", sha256="5c740e9d1e73b77658f41ed65e21492f4e71b12c7c9ff4b9e52ebf5f8f197612") version("0.0.8", sha256="9471a12fc7af203a419767b845e6b6c1e63c080370cb8f2dac80187194122273") version("0.0.7", sha256="a83b5fb95f61e366f96d6d8e6b04dafff8e885e7c80c913614876b50ebb8e174") diff --git a/var/spack/repos/builtin/packages/r-ggjoy/package.py b/var/spack/repos/builtin/packages/r-ggjoy/package.py index a1d0d6fbf163d6..d78fa4694475ec 100644 --- a/var/spack/repos/builtin/packages/r-ggjoy/package.py +++ b/var/spack/repos/builtin/packages/r-ggjoy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGgjoy(RPackage): cran = "ggjoy" + license("GPL-2.0-only OR custom") + version("0.4.1", sha256="d2f778bc40203d7fbb7c81b40beed8614c36ea10448e911663cc6109aa685504") version("0.4.0", sha256="cb9ef790921ffcd3cfb6a55b409d17ccae9e8f5fdd2a28e55ea2ccfa8efd44e8") version("0.3.0", sha256="bb6d5172deda6cc54d2647644c1056944bc886d48fe1f11a23afd518eaf5cc97") diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index 49456489d303ef..9a007a055fb28a 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGgmap(RPackage): cran = "ggmap" + license("GPL-2.0-only") + version("3.0.2", sha256="ba5fe3975fd4ca1a5fbda4910c9705ac2edacec75c658177edaf87f1c55cdcae") version("3.0.1", sha256="fc824b547f1fd0b52b6fbd18a82fe6f29f97b1f592e2c61baf4686ddfd47e35d") version("3.0.0", sha256="96c24ffdc0710d0633ac4721d599d2c06f43a29c59d1e85c94ff0af30dfdb58d") diff --git a/var/spack/repos/builtin/packages/r-ggnewscale/package.py b/var/spack/repos/builtin/packages/r-ggnewscale/package.py index ace764a632399d..5c0d929a7f8163 100644 --- a/var/spack/repos/builtin/packages/r-ggnewscale/package.py +++ b/var/spack/repos/builtin/packages/r-ggnewscale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RGgnewscale(RPackage): cran = "ggnewscale" + license("GPL-3.0-only") + version("0.4.8", sha256="c7fefa6941ecbc789507e59be13fa96327fe2549681a938c43beb06ca22a9700") depends_on("r-ggplot2@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index 3e7aac24375943..21ec26809f5c38 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGgplot2(RPackage): cran = "ggplot2" + license("MIT") + version("3.4.2", sha256="70230aa70a2c6f844fc41dd93e5f62af6859dfed390026ae58f223637e5283ca") version("3.4.0", sha256="a82f9e52f974389439765f71a8206ec26e3be30a8864d2c784d5ea8abcb0473e") version("3.3.6", sha256="bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9") diff --git a/var/spack/repos/builtin/packages/r-ggplotify/package.py b/var/spack/repos/builtin/packages/r-ggplotify/package.py index 1a8d692f5b9469..b87ca84a9d7d12 100644 --- a/var/spack/repos/builtin/packages/r-ggplotify/package.py +++ b/var/spack/repos/builtin/packages/r-ggplotify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGgplotify(RPackage): cran = "ggplotify" + license("Artistic-2.0") + version("0.1.0", sha256="178f73d6d3dc391c3efb1a62c95fe38587044f9e3288dffb915d3687941bb38a") version("0.0.5", sha256="035ea6a70023c4819c8a486d0fd94c2765aa4d6df318747e104eeb9829b9d65d") version("0.0.3", sha256="7e7953a2933aa7127a0bac54375e3e0219a0744cfc3249c3d7b76065f7a51892") diff --git a/var/spack/repos/builtin/packages/r-ggpubr/package.py b/var/spack/repos/builtin/packages/r-ggpubr/package.py index 6fe8e00c8ec3fc..65872d595b5357 100644 --- a/var/spack/repos/builtin/packages/r-ggpubr/package.py +++ b/var/spack/repos/builtin/packages/r-ggpubr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RGgpubr(RPackage): cran = "ggpubr" + license("GPL-2.0-or-later") + version("0.6.0", sha256="2e6ec5d8151991d17ef8832259cf545fa0d1a50b326ba8c1c4657700171df774") version("0.4.0", sha256="abb21ec0b1ae3fa1c58eedca2d59b9b009621b30e3660f1247b3880c5fa50675") version("0.2.2", sha256="1c93dc6d1f08680dd00a10b6842445700d1fccb11f18599fbdf51e70c6b6b364") diff --git a/var/spack/repos/builtin/packages/r-ggraph/package.py b/var/spack/repos/builtin/packages/r-ggraph/package.py index a4ce7b42c91c54..cc887295f08b27 100644 --- a/var/spack/repos/builtin/packages/r-ggraph/package.py +++ b/var/spack/repos/builtin/packages/r-ggraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGgraph(RPackage): cran = "ggraph" + license("MIT") + version("2.1.0", sha256="686fdb22dc4f613273fb755ec42399a208b4d10348eecd1a217afd4612245c1f") version("2.0.6", sha256="7b0ac90d834a3ce5641b4bca159d59d09607ddaab592908361b75cffb648d40a") version("2.0.5", sha256="e36ad49dba92ee8652e18b1fb197be0ceb9f0a2f8faee2194453a62578449654") diff --git a/var/spack/repos/builtin/packages/r-ggrastr/package.py b/var/spack/repos/builtin/packages/r-ggrastr/package.py index 820de4f429f72f..67f07d652dc2fc 100644 --- a/var/spack/repos/builtin/packages/r-ggrastr/package.py +++ b/var/spack/repos/builtin/packages/r-ggrastr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGgrastr(RPackage): cran = "ggrastr" + license("MIT") + version("1.0.1", sha256="82d6e90fa38dec85e829f71018532ed5b709a50a585455fc07cb3bae282f5d1f") depends_on("r@3.2.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ggrepel/package.py b/var/spack/repos/builtin/packages/r-ggrepel/package.py index fdb5fc49f4259d..ecb836d2bb666f 100644 --- a/var/spack/repos/builtin/packages/r-ggrepel/package.py +++ b/var/spack/repos/builtin/packages/r-ggrepel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGgrepel(RPackage): cran = "ggrepel" + license("GPL-3.0-only OR custom") + version("0.9.3", sha256="b9eba0e2edee84db0276b49e4834b65f5369edc4bc56f4cacc13e0d1c39a005c") version("0.9.2", sha256="0a3088c48177528e2a65defebbc4f09a744ebb44408588f688811f8d0d827488") version("0.9.1", sha256="29fb916d4799ba6503a5dd019717ffdf154d2aaae9ff1736f03e2be24af6bdfc") diff --git a/var/spack/repos/builtin/packages/r-ggridges/package.py b/var/spack/repos/builtin/packages/r-ggridges/package.py index 1d076804859ac7..b91e7d0b8d3c0e 100644 --- a/var/spack/repos/builtin/packages/r-ggridges/package.py +++ b/var/spack/repos/builtin/packages/r-ggridges/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGgridges(RPackage): cran = "ggridges" + license("GPL-2.0-only OR custom") + version("0.5.4", sha256="2bf71c2034804cec637e6748dc51d8cadad01d3ea4d14ace754327f082e8d851") version("0.5.3", sha256="f5eafab17f2d4a8a2a83821ad3e96ae7c26b62bbce9de414484c657383c7b42e") version("0.5.1", sha256="01f87cdcdf2052ed9c078d9352465cdeda920a41e2ca55bc154c1574fc651c36") diff --git a/var/spack/repos/builtin/packages/r-ggsci/package.py b/var/spack/repos/builtin/packages/r-ggsci/package.py index 59c48650ecba86..5c5f4a75fb76d5 100644 --- a/var/spack/repos/builtin/packages/r-ggsci/package.py +++ b/var/spack/repos/builtin/packages/r-ggsci/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGgsci(RPackage): cran = "ggsci" + license("GPL-3.0-or-later") + version("3.0.0", sha256="8901316516d78f82a2a8685d93ba479424bcfd8cb5e28a28adbd50e68964e129") version("2.9", sha256="4af14e6f3657134c115d5ac5e65a2ed74596f9a8437c03255447cd959fe9e33c") version("2.8", sha256="b4ce7adce7ef23edf777866086f98e29b2b45b58fed085bbd1ffe6ab52d74ae8") diff --git a/var/spack/repos/builtin/packages/r-ggsignif/package.py b/var/spack/repos/builtin/packages/r-ggsignif/package.py index b3c320734f751b..86ae4903e5cad4 100644 --- a/var/spack/repos/builtin/packages/r-ggsignif/package.py +++ b/var/spack/repos/builtin/packages/r-ggsignif/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RGgsignif(RPackage): cran = "ggsignif" + license("GPL-3.0-only OR custom") + version("0.6.4", sha256="112051af425a0c0f2998ce187dacad066bc16f55af01e3e7b76d62ff6954b20a") version("0.6.3", sha256="ca8545b25590e531512a90a18449a2cbab945f7434a1d60188c41f7d1839a7a9") version("0.6.0", sha256="6fe13efda31386483e64d466ba2f5a53a2a235ae04f5c17bba3ccc63d283499e") diff --git a/var/spack/repos/builtin/packages/r-ggthemes/package.py b/var/spack/repos/builtin/packages/r-ggthemes/package.py index 0d946dd11ef9a8..a2689071ebba13 100644 --- a/var/spack/repos/builtin/packages/r-ggthemes/package.py +++ b/var/spack/repos/builtin/packages/r-ggthemes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGgthemes(RPackage): cran = "ggthemes" + license("GPL-2.0-only") + version("4.2.4", sha256="7b35168cf5b68f6f52dd533a1b345ec87e09d1a85ca68e8dc5377cdf95718567") version("4.2.0", sha256="5bb3fe94819fe2cce7865f07a6e6ea5c59d3996f78d1c0836ad406f69efb3367") diff --git a/var/spack/repos/builtin/packages/r-ggtree/package.py b/var/spack/repos/builtin/packages/r-ggtree/package.py index db34d3dae45ec5..0bc7eb9f1a8fcb 100644 --- a/var/spack/repos/builtin/packages/r-ggtree/package.py +++ b/var/spack/repos/builtin/packages/r-ggtree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index a0c3c4e0e3c32d..ac8864a19c3d79 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGgvis(RPackage): cran = "ggvis" + license("GPL-2.0-only OR custom") + version("0.4.8", sha256="3d5480a0b97a57c26b595785f826b13d7695dab1f1dd8fcf5d7964fa8546a26a") version("0.4.7", sha256="9e6b067e11d497c796d42156570e2481afb554c5db265f42afbb74d2ae0865e3") version("0.4.4", sha256="1332ea122b768688c8a407a483be80febc4576de0ec8929077738421b27cafaf") diff --git a/var/spack/repos/builtin/packages/r-gh/package.py b/var/spack/repos/builtin/packages/r-gh/package.py index 8aeb38af6a4446..e20962e5930ff1 100644 --- a/var/spack/repos/builtin/packages/r-gh/package.py +++ b/var/spack/repos/builtin/packages/r-gh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RGh(RPackage): cran = "gh" + license("MIT") + version("1.4.0", sha256="68c69fcd18429b378e639a09652465a4e92b7b5b5704804d0c5b1ca2b9b58b71") version("1.3.1", sha256="fbaea2abdeceb03d28839fd0e58c2eea01092f9ef92dcc044718ef0d298612ef") version("1.3.0", sha256="a44039054e8ca56496f2d9c7a10cdadf4a7383bc91086e768ba7e7f1fbcaed1c") diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index 87b82ae0b1f58a..54bf24b39d7cb0 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RGistr(RPackage): cran = "gistr" + license("MIT") + version("0.9.0", sha256="170ae025151ee688e7d31b9e49112086a8ddf4fef10155e9ee289ad7f28c8929") version("0.4.2", sha256="43c00c7f565732125f45f6c067724771ba1b337d6dd3a6e301639fe16e11032e") version("0.4.0", sha256="51771a257379a17552d0c88ada72ca6263954bbe896997f8a66cde3bf0b83ce0") diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 61b448242bbd74..a6718ceec1ce27 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGit2r(RPackage): cran = "git2r" + license("GPL-2.0-only") + version("0.32.0", sha256="1b5d254c0c684a56751d26d482823d0006964eb1f55c558f365d037f5e984671") version("0.31.0", sha256="f1db9278fa4604600a64beaedcf86dda595d7c8a10cdb1f7300a6635e73cd66d") version("0.30.1", sha256="85d913ddc7659e32c1b98ebc247fa1cc1b7717a5bd413fa78ea84696986ca840") diff --git a/var/spack/repos/builtin/packages/r-gitcreds/package.py b/var/spack/repos/builtin/packages/r-gitcreds/package.py index e5e0714970c6fe..5eea2f1634e831 100644 --- a/var/spack/repos/builtin/packages/r-gitcreds/package.py +++ b/var/spack/repos/builtin/packages/r-gitcreds/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RGitcreds(RPackage): cran = "gitcreds" + license("MIT") + version("0.1.2", sha256="41c6abcca5635062b123ffb5af2794770eca5ebd97b05c5a64b24fa1c803c75d") version("0.1.1", sha256="b14aaf4e910a9d2d6c65c93e645f0b0159c00898e669f917f83c03dfedb1dfea") diff --git a/var/spack/repos/builtin/packages/r-glimma/package.py b/var/spack/repos/builtin/packages/r-glimma/package.py index abf310b46902aa..d9a8162a92a886 100644 --- a/var/spack/repos/builtin/packages/r-glimma/package.py +++ b/var/spack/repos/builtin/packages/r-glimma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGlimma(RPackage): bioc = "Glimma" + license("LGPL-3.0-only") + version("2.10.0", commit="ea1257614c5fca0cedf5805d5b9a21e8b7d15d18") version("2.8.0", commit="09cec82e9af9c6775192570f8c28f050c0df08ac") version("2.6.0", commit="23220d9b90476059aab035b5de11b7ce04b331c8") diff --git a/var/spack/repos/builtin/packages/r-glmgampoi/package.py b/var/spack/repos/builtin/packages/r-glmgampoi/package.py index b36ac7d2631ee0..186701a6f085ac 100644 --- a/var/spack/repos/builtin/packages/r-glmgampoi/package.py +++ b/var/spack/repos/builtin/packages/r-glmgampoi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index 3e656bf3edd630..1f613f021ac739 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGlmnet(RPackage): cran = "glmnet" + license("GPL-2.0-only") + version("4.1-7", sha256="b3a0b606d99df0256eb68e6ebd271e071b246900a4379641af2e7d548c70eaa8") version("4.1-4", sha256="f6b0f70a0b3d81ff91c2b94f795a2a32e90dd458270f1a29e49e085dd65000f9") version("4.1-3", sha256="64bc35aa40b6e580cfb8a21e649eb103e996e8747a10c476b8bb9545c846325a") diff --git a/var/spack/repos/builtin/packages/r-globaloptions/package.py b/var/spack/repos/builtin/packages/r-globaloptions/package.py index c7a6090bb1554f..d512706232559a 100644 --- a/var/spack/repos/builtin/packages/r-globaloptions/package.py +++ b/var/spack/repos/builtin/packages/r-globaloptions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-globals/package.py b/var/spack/repos/builtin/packages/r-globals/package.py index 687a3b94fa5e36..954094aeca6e63 100644 --- a/var/spack/repos/builtin/packages/r-globals/package.py +++ b/var/spack/repos/builtin/packages/r-globals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGlobals(RPackage): cran = "globals" + license("LGPL-2.1-or-later") + version("0.16.2", sha256="682c26a95fa6c4e76a3a875be1a3192fc5b88e036c80dfa3b256add0336d770a") version("0.16.1", sha256="f7f63a575a3dd518c6afeabb4116bd26692a2a250df113059bc1a5b4711a1e95") version("0.15.0", sha256="f83689a420590b0d62b049c40a944c1c8c7202b3f1cc12102712c63104e99496") diff --git a/var/spack/repos/builtin/packages/r-globaltest/package.py b/var/spack/repos/builtin/packages/r-globaltest/package.py index 461aed1f035827..b0e15badfbd543 100644 --- a/var/spack/repos/builtin/packages/r-globaltest/package.py +++ b/var/spack/repos/builtin/packages/r-globaltest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-glue/package.py b/var/spack/repos/builtin/packages/r-glue/package.py index 1bf1d0dfd77aa0..a52dfa812fa89f 100644 --- a/var/spack/repos/builtin/packages/r-glue/package.py +++ b/var/spack/repos/builtin/packages/r-glue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGlue(RPackage): cran = "glue" + license("MIT") + version("1.6.2", sha256="9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf") version("1.6.1", sha256="318c2f9544f1204216009f512793c44d6bbe178ff2012f56fa5ffb5e1da978db") version("1.6.0", sha256="77bef37ef2c47aad6188ea772880591c5763cce4b1c256e10e68e7c3ec6b4338") diff --git a/var/spack/repos/builtin/packages/r-gmodels/package.py b/var/spack/repos/builtin/packages/r-gmodels/package.py index 2e9e0585480a4a..f43e4c2660faf2 100644 --- a/var/spack/repos/builtin/packages/r-gmodels/package.py +++ b/var/spack/repos/builtin/packages/r-gmodels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RGmodels(RPackage): cran = "gmodels" + license("GPL-2.0-only") + version("2.18.1.1", sha256="da7d48021b7cd2fd8a7cd8d0bb9658b12342a32698a13877b25ca94aa03f1e95") version("2.18.1", sha256="626140a34eb8c53dd0a06511a76c71bc61c48777fa76fcc5e6934c9c276a1369") version("2.16.2", sha256="ab018894bdb376c5bd6bc4fbc4fe6e86590f4106795a586ef196fbb6699ec47d") diff --git a/var/spack/repos/builtin/packages/r-gmp/package.py b/var/spack/repos/builtin/packages/r-gmp/package.py index 0bd020e8a03b2d..85d4797c3a266d 100644 --- a/var/spack/repos/builtin/packages/r-gmp/package.py +++ b/var/spack/repos/builtin/packages/r-gmp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGmp(RPackage): cran = "gmp" + license("GPL-2.0-or-later") + version("0.7-1", sha256="a6873dc65218905cb7615cb8e2522258f3740e29c0632473d58a1cb409835db6") version("0.6-7", sha256="6333fe691f267aa29f8078f7f738dda50c496f660357276fd33e28d607363f85") version("0.6-6", sha256="87fa95a8084855d2137b3863b6b8f3c277280dbe3a6a230e359cf32c3bed2793") diff --git a/var/spack/repos/builtin/packages/r-go-db/package.py b/var/spack/repos/builtin/packages/r-go-db/package.py index c5dfb5e6ff96cc..be91be6ac28db6 100644 --- a/var/spack/repos/builtin/packages/r-go-db/package.py +++ b/var/spack/repos/builtin/packages/r-go-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-goftest/package.py b/var/spack/repos/builtin/packages/r-goftest/package.py index 57381cd151afe0..9516bd7f126a49 100644 --- a/var/spack/repos/builtin/packages/r-goftest/package.py +++ b/var/spack/repos/builtin/packages/r-goftest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGoftest(RPackage): cran = "goftest" + license("GPL-2.0-or-later") + version("1.2-3", sha256="3a5f74b6ae7ece5b294781ae57782abe12375d61789c55ff5e92e4aacf347f19") version("1.2-2", sha256="e497992666b002b6c6bed73bf05047ad7aa69eb58898da0ad8f1f5b2219e7647") diff --git a/var/spack/repos/builtin/packages/r-gofuncr/package.py b/var/spack/repos/builtin/packages/r-gofuncr/package.py index db691bdb288483..4f402c206636c1 100644 --- a/var/spack/repos/builtin/packages/r-gofuncr/package.py +++ b/var/spack/repos/builtin/packages/r-gofuncr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-googleauthr/package.py b/var/spack/repos/builtin/packages/r-googleauthr/package.py index f4ccdd77a265d3..81e0152f89bdf7 100644 --- a/var/spack/repos/builtin/packages/r-googleauthr/package.py +++ b/var/spack/repos/builtin/packages/r-googleauthr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-googledrive/package.py b/var/spack/repos/builtin/packages/r-googledrive/package.py index 3bc5fa11e901bf..9f39117c087821 100644 --- a/var/spack/repos/builtin/packages/r-googledrive/package.py +++ b/var/spack/repos/builtin/packages/r-googledrive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RGoogledrive(RPackage): cran = "googledrive" + license("MIT") + version("2.1.0", sha256="0d70353bbf1bebc96d3987ebd9cbb2b0902e6ddc4cdccece3d07c2bb688c4b74") version("2.0.0", sha256="605c469a6a086ef4b049909c2e20a35411c165ce7ce4f62d68fd39ffed8c5a26") diff --git a/var/spack/repos/builtin/packages/r-googlesheets4/package.py b/var/spack/repos/builtin/packages/r-googlesheets4/package.py index 82e7197d428cd2..f613964731fd31 100644 --- a/var/spack/repos/builtin/packages/r-googlesheets4/package.py +++ b/var/spack/repos/builtin/packages/r-googlesheets4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RGooglesheets4(RPackage): cran = "googlesheets4" + license("MIT") + version("1.1.0", sha256="50e15543bef5b8d8cda36f6ea8a1d59b256d889cd3cedddc91f00ae30c8c8ec9") version("1.0.1", sha256="284ecbce98944093cb065c1b0b32074eae7b45fd74b87d7815c7ca6deca76591") version("1.0.0", sha256="0a107d76aac99d6db48d97ce55810c1412b2197f457b8476f676169a36c7cc7a") diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index 807b62a3deae20..8200e7c0d62bdc 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGooglevis(RPackage): cran = "googleVis" + license("CC-BY-SA-4.0") + version("0.7.1", sha256="335931059ea8645f824b01a06d30fafb4e38b47cd610a5eee20628801767f218") version("0.7.0", sha256="5f1636024e678f9973e3ce605b46f46ea9cdffd58b98e315b495e66f34eb02e9") version("0.6.11", sha256="f8c90b6c51da7bf184bff6762d98fc24faba1b634724ecdb987161ee10987b97") diff --git a/var/spack/repos/builtin/packages/r-goplot/package.py b/var/spack/repos/builtin/packages/r-goplot/package.py index ed87b1252375fb..d0730b73cd08ce 100644 --- a/var/spack/repos/builtin/packages/r-goplot/package.py +++ b/var/spack/repos/builtin/packages/r-goplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gosemsim/package.py b/var/spack/repos/builtin/packages/r-gosemsim/package.py index 65fb0705c3ba41..9e81019131d298 100644 --- a/var/spack/repos/builtin/packages/r-gosemsim/package.py +++ b/var/spack/repos/builtin/packages/r-gosemsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-goseq/package.py b/var/spack/repos/builtin/packages/r-goseq/package.py index 5f9ae293e0a5f3..a1c9cb4dee1f44 100644 --- a/var/spack/repos/builtin/packages/r-goseq/package.py +++ b/var/spack/repos/builtin/packages/r-goseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gostats/package.py b/var/spack/repos/builtin/packages/r-gostats/package.py index e021f6c9c35e71..ea3aa25a9e4d66 100644 --- a/var/spack/repos/builtin/packages/r-gostats/package.py +++ b/var/spack/repos/builtin/packages/r-gostats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gower/package.py b/var/spack/repos/builtin/packages/r-gower/package.py index 4d9b82ee487c3a..2f6f7156d69492 100644 --- a/var/spack/repos/builtin/packages/r-gower/package.py +++ b/var/spack/repos/builtin/packages/r-gower/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGower(RPackage): cran = "gower" + license("GPL-3.0-only") + version("1.0.1", sha256="296a9d8e5efa8c3a8cc6b92cf38880915753afdef30281629af9dc8eae8315fc") version("1.0.0", sha256="671cb7baafe05140d822e8f26f9cd3576fc3bf4c6572b7223fb54da754ea385d") version("0.2.2", sha256="3f022010199fafe34f6e7431730642a76893e6b4249b84e5a61012cb83483631") diff --git a/var/spack/repos/builtin/packages/r-gparotation/package.py b/var/spack/repos/builtin/packages/r-gparotation/package.py index cf05794f34913e..d1a486174641af 100644 --- a/var/spack/repos/builtin/packages/r-gparotation/package.py +++ b/var/spack/repos/builtin/packages/r-gparotation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gplots/package.py b/var/spack/repos/builtin/packages/r-gplots/package.py index 0241d5baec2835..bde5c06bef5850 100644 --- a/var/spack/repos/builtin/packages/r-gplots/package.py +++ b/var/spack/repos/builtin/packages/r-gplots/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,6 +32,8 @@ class RGplots(RPackage): cran = "gplots" + license("GPL-2.0-only") + version("3.1.3", sha256="9f853b9e205264d087e61e8825f797ce36c9eb585b187dab794563613a526716") version("3.1.1", sha256="f9ae19c2574b6d41adbeccaf7bc66cf56d7b2769004daba7e0038d5fbd821339") version("3.0.1.1", sha256="7db103f903a25d174cddcdfc7b946039b61e236c95084b90ad17f1a41da3770c") diff --git a/var/spack/repos/builtin/packages/r-graph/package.py b/var/spack/repos/builtin/packages/r-graph/package.py index c9c3ddb4a10bcb..e3fe8eeb7eeee9 100644 --- a/var/spack/repos/builtin/packages/r-graph/package.py +++ b/var/spack/repos/builtin/packages/r-graph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-graphlayouts/package.py b/var/spack/repos/builtin/packages/r-graphlayouts/package.py index bf2bcf05f89422..7a0aadaed50965 100644 --- a/var/spack/repos/builtin/packages/r-graphlayouts/package.py +++ b/var/spack/repos/builtin/packages/r-graphlayouts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGraphlayouts(RPackage): cran = "graphlayouts" + license("MIT") + version("0.8.4", sha256="778d8f7e190b05d0dbbaa7e6dbdfc0b8fef3c83b71333a6fa89926e6c04690fd") version("0.8.3", sha256="f9e4e5d794b4d1c6eba962490b3220d09b73e10893f5fa3be210240bfc654421") version("0.8.2", sha256="0fa2777a2c159f3ef1209cd96838d2651d144c9c971abfef1d22bc6376f47bec") diff --git a/var/spack/repos/builtin/packages/r-grbase/package.py b/var/spack/repos/builtin/packages/r-grbase/package.py index aabcd9b58b3a9d..ce963aa539325e 100644 --- a/var/spack/repos/builtin/packages/r-grbase/package.py +++ b/var/spack/repos/builtin/packages/r-grbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index 7728e29f40d7f1..cd8371e9cd2690 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index 0052d83c44e14f..b9654bc05efe19 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gridgraphics/package.py b/var/spack/repos/builtin/packages/r-gridgraphics/package.py index 35efdb95d458f7..123bc936d23ea4 100644 --- a/var/spack/repos/builtin/packages/r-gridgraphics/package.py +++ b/var/spack/repos/builtin/packages/r-gridgraphics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gsa/package.py b/var/spack/repos/builtin/packages/r-gsa/package.py index 652ebd20491307..71c0da0a61bfdb 100644 --- a/var/spack/repos/builtin/packages/r-gsa/package.py +++ b/var/spack/repos/builtin/packages/r-gsa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gsalib/package.py b/var/spack/repos/builtin/packages/r-gsalib/package.py index c208f3c270990b..32a7cde963a293 100644 --- a/var/spack/repos/builtin/packages/r-gsalib/package.py +++ b/var/spack/repos/builtin/packages/r-gsalib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RGsalib(RPackage): cran = "gsalib" + license("MIT") + version("2.2.1", sha256="3da3a4b959142a0d694a843e39143bfce82a6de197c6cc92650a28ac05f3bf90") version("2.1", sha256="e1b23b986c18b89a94c58d9db45e552d1bce484300461803740dacdf7c937fcc") diff --git a/var/spack/repos/builtin/packages/r-gseabase/package.py b/var/spack/repos/builtin/packages/r-gseabase/package.py index 318e2417f305b0..b17b30cfe0bdd2 100644 --- a/var/spack/repos/builtin/packages/r-gseabase/package.py +++ b/var/spack/repos/builtin/packages/r-gseabase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-gsl/package.py b/var/spack/repos/builtin/packages/r-gsl/package.py index ef74ea8de2a1cf..726445818c1bae 100644 --- a/var/spack/repos/builtin/packages/r-gsl/package.py +++ b/var/spack/repos/builtin/packages/r-gsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGsl(RPackage): cran = "gsl" + license("GPL-3.0-only") + version("2.1-8", sha256="f33609bf485abd190e65ff5d0fdab438b759294c47b921d983d89d6f053a2d95") version("2.1-7.1", sha256="ee98d1382d37ffa77538a90ccdbf44affbf1710a9e66b8ada73fa72e67921985") version("2.1-6", sha256="f5d463239693f146617018987687db31b163653708cbae0b730b9b7bed81995c") diff --git a/var/spack/repos/builtin/packages/r-gsodr/package.py b/var/spack/repos/builtin/packages/r-gsodr/package.py index 6865e5f46a568e..da64fb09535cc8 100644 --- a/var/spack/repos/builtin/packages/r-gsodr/package.py +++ b/var/spack/repos/builtin/packages/r-gsodr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,8 @@ class RGsodr(RPackage): cran = "GSODR" + license("MIT") + version("3.1.8", sha256="f43668b14be30632086b832be83c74fa7c25e123fbce0d0203e992a0c11e7c8d") version("3.1.6", sha256="fbeac54e86fba1e4415b41608ca59cf50be1b421cc890eb5c5b0d6d1c9229f6a") version("3.1.5", sha256="37682141707d7e29fab653ccdeb154fea2c085080f686b33f1a54140608e824d") diff --git a/var/spack/repos/builtin/packages/r-gson/package.py b/var/spack/repos/builtin/packages/r-gson/package.py index d96449ba79e5b0..dcb866a89a667c 100644 --- a/var/spack/repos/builtin/packages/r-gson/package.py +++ b/var/spack/repos/builtin/packages/r-gson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RGson(RPackage): cran = "gson" + license("Artistic-2.0") + version("0.1.0", sha256="14ddbee5be66d0b1dc178e41175a50ab6ed9ffed04d4361ecf5eef3548d9a381") version("0.0.9", sha256="f694765cd2872efb73dd7be66ef8e31395915f9b277f59e0891cff138777b118") diff --git a/var/spack/repos/builtin/packages/r-gss/package.py b/var/spack/repos/builtin/packages/r-gss/package.py index fa57dd130d6277..6cc95a075d8364 100644 --- a/var/spack/repos/builtin/packages/r-gss/package.py +++ b/var/spack/repos/builtin/packages/r-gss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RGss(RPackage): cran = "gss" + license("GPL-2.0-or-later") + version("2.2-4", sha256="953e89dfe3bee9cac51df3e5325bf4d1496ad76e4393706c4efdb1834c0c7441") version("2.2-3", sha256="24306401cf4e5869f8a690eca7e17c044ece83edd66969bd2daf5976272d244b") version("2.2-2", sha256="1da4da894378ee730cff9628e8b4d2a0d7dfa344b94e5bce6953e66723c21fe4") diff --git a/var/spack/repos/builtin/packages/r-gstat/package.py b/var/spack/repos/builtin/packages/r-gstat/package.py index 226b7b0f9ea5da..a747cab40fe4d7 100644 --- a/var/spack/repos/builtin/packages/r-gstat/package.py +++ b/var/spack/repos/builtin/packages/r-gstat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGstat(RPackage): cran = "gstat" + license("GPL-2.0-or-later") + version("2.1-1", sha256="48b205e65155effb6827fca062f2a409a0922241b7714cc6c8248f141b125d25") version("2.1-0", sha256="57a6eb46fa601f159ace1e56ebe8928d210a62d85552a4eb5a5ca4ada48f2d6f") version("2.0-9", sha256="122c032c2e15388496853597ebcb5664e76cda96b164e9917ee66d1c24fba4a6") diff --git a/var/spack/repos/builtin/packages/r-gsubfn/package.py b/var/spack/repos/builtin/packages/r-gsubfn/package.py index df4b662cd2638d..9efe7b7f268cfa 100644 --- a/var/spack/repos/builtin/packages/r-gsubfn/package.py +++ b/var/spack/repos/builtin/packages/r-gsubfn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RGsubfn(RPackage): cran = "gsubfn" + license("GPL-2.0-or-later") + version("0.7", sha256="89351df9e65722d2862f26a0a3985666de3c86e8400808ced8a6eb6e165a4602") version("0.6-6", sha256="bbc5d29bb48e836407f81880aeb368544a54a5513dacb3411c9838180723dda4") diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index f9e5896681f982..1e05bf47a54989 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RGtable(RPackage): cran = "gtable" + license("MIT") + version("0.3.3", sha256="2f9a58d978e2a487b7fd8841539ea33cf948e55ddf6f7a9bd2dd3362600a7b3a") version("0.3.1", sha256="8bd62c5722d5188914d667cabab12991c555f657f4f5ce7b547571ae3aec7cb5") version("0.3.0", sha256="fd386cc4610b1cc7627dac34dba8367f7efe114b968503027fb2e1265c67d6d3") diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index 72ca34b6333dd3..2a6d23fc12c779 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -43,6 +43,8 @@ class RGtools(RPackage): cran = "gtools" + license("GPL-2.0-only") + version("3.9.4", sha256="59cf8b194fe98b1cc05dbb4d686810a1068f59d8b402b731548a898ece85f111") version("3.9.3", sha256="7afb53277b382d5752f4597ae433f3c0addf5e8eb24d01a9562faf2a01e33133") version("3.9.2.1", sha256="ec5febad7bb33812684b39679b0bce8a668361b87714f7388546e0f4ac02af5f") diff --git a/var/spack/repos/builtin/packages/r-gtrellis/package.py b/var/spack/repos/builtin/packages/r-gtrellis/package.py index 90fea73d531174..d314ffbd6db2dc 100644 --- a/var/spack/repos/builtin/packages/r-gtrellis/package.py +++ b/var/spack/repos/builtin/packages/r-gtrellis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGtrellis(RPackage): bioc = "gtrellis" + license("MIT") + version("1.32.0", commit="4c2361bde90a556aa5a585d45f056b3ddc806f9b") version("1.30.0", commit="da93b30ef812e231c47aa83da5c521f1801b3d14") version("1.28.0", commit="d770a7b3441e4003869c88cfd8e21fd6508b86c4") diff --git a/var/spack/repos/builtin/packages/r-gviz/package.py b/var/spack/repos/builtin/packages/r-gviz/package.py index d102bf17c59447..f1fb13111f214a 100644 --- a/var/spack/repos/builtin/packages/r-gviz/package.py +++ b/var/spack/repos/builtin/packages/r-gviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RGviz(RPackage): bioc = "Gviz" + license("Artistic-2.0") + version("1.44.0", commit="e70aaa7dd27df8482ee854395475a87ec2121279") version("1.42.0", commit="4eddb688bca3fdeb65fd536d653d7ba7f7976121") version("1.40.1", commit="d21843710cd05135353de5cd4ce4d35cdd333b7c") diff --git a/var/spack/repos/builtin/packages/r-gwmodel/package.py b/var/spack/repos/builtin/packages/r-gwmodel/package.py index a7d6c1c6b9a6b8..4a83437510d5c0 100644 --- a/var/spack/repos/builtin/packages/r-gwmodel/package.py +++ b/var/spack/repos/builtin/packages/r-gwmodel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hardhat/package.py b/var/spack/repos/builtin/packages/r-hardhat/package.py index 3d673747be829f..88330864e76803 100644 --- a/var/spack/repos/builtin/packages/r-hardhat/package.py +++ b/var/spack/repos/builtin/packages/r-hardhat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RHardhat(RPackage): cran = "hardhat" + license("MIT") + version("1.3.0", sha256="fe9ff009e2ba6dd4d70cbb541430f88d85c0a28d6a1c2772e4910c79b81fe82e") version("1.2.0", sha256="f9320eccb1b5f624a46fa074e3ccc202c383b77098ecd08b193aeb47daedad78") version("1.0.0", sha256="2740dc243a440e7d32370a78f9258255faea6d900075901cf6009c651769e7bd") diff --git a/var/spack/repos/builtin/packages/r-haven/package.py b/var/spack/repos/builtin/packages/r-haven/package.py index d7edaed6bf81a3..e034e646c57ee9 100644 --- a/var/spack/repos/builtin/packages/r-haven/package.py +++ b/var/spack/repos/builtin/packages/r-haven/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RHaven(RPackage): cran = "haven" + license("MIT") + version("2.5.2", sha256="2131fb0377ae1beffae54bf4beb8b3a876e9b6b9841a5acc39a2a2615023561d") version("2.5.1", sha256="9f40462097a0b1cf3831bca493851fe4a6b3570d957a775ca81940f241c50a70") version("2.5.0", sha256="b580311bc1b28efc6b123e29a331282b9f7eb552c485f4e5cacab39fe534aff4") diff --git a/var/spack/repos/builtin/packages/r-hdf5array/package.py b/var/spack/repos/builtin/packages/r-hdf5array/package.py index b8e0e5ed1ff81a..a8b419a351505c 100644 --- a/var/spack/repos/builtin/packages/r-hdf5array/package.py +++ b/var/spack/repos/builtin/packages/r-hdf5array/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hdf5r/package.py b/var/spack/repos/builtin/packages/r-hdf5r/package.py index 5e3064ef93108d..259c32003b9f16 100644 --- a/var/spack/repos/builtin/packages/r-hdf5r/package.py +++ b/var/spack/repos/builtin/packages/r-hdf5r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RHdf5r(RPackage): cran = "hdf5r" + license("Apache-2.0 OR custom") + version("1.3.8", sha256="b53281e2cf57447965849748e972de2f7fe8df0cee3538ef5813c33c7ed2302b") version("1.3.7", sha256="6e8a02843ed1c970cb41f97e2acee34853d3b70ce617bc9bcff07c41b98f295b") version("1.3.5", sha256="87b75173ab226a9fbaa5b28289349f3c56b638629560a172994b8f9323c1622f") diff --git a/var/spack/repos/builtin/packages/r-hdo-db/package.py b/var/spack/repos/builtin/packages/r-hdo-db/package.py index 10cd99678be25d..49edc44d5f6d29 100644 --- a/var/spack/repos/builtin/packages/r-hdo-db/package.py +++ b/var/spack/repos/builtin/packages/r-hdo-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hdrcde/package.py b/var/spack/repos/builtin/packages/r-hdrcde/package.py index 0a15464b4dd1b2..4ff2c07428a803 100644 --- a/var/spack/repos/builtin/packages/r-hdrcde/package.py +++ b/var/spack/repos/builtin/packages/r-hdrcde/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RHdrcde(RPackage): cran = "hdrcde" + license("GPL-3.0-only") + version("3.4", sha256="4341c6a021da46dcae3b1ef6d580e84dcf625c2b2139f537d0c26ec90899149b") depends_on("r@2.15:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-here/package.py b/var/spack/repos/builtin/packages/r-here/package.py index 198725d8db99c5..dfaf44d5332b5e 100644 --- a/var/spack/repos/builtin/packages/r-here/package.py +++ b/var/spack/repos/builtin/packages/r-here/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RHere(RPackage): cran = "here" + license("MIT") + version("1.0.1", sha256="08ed908033420d3d665c87248b3a14d1b6e2b37844bf736be620578c20ca346b") depends_on("r-rprojroot@2.0.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index 7be2ef56b40e6b..3324d1b2e0f4ce 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RHexbin(RPackage): cran = "hexbin" + license("GPL-2.0-only") + version("1.28.3", sha256="0eb33511c1a4ff29dda8b89fee420ea7041033f981c7f16484c9f504d749de5f") version("1.28.2", sha256="6241f8d3a6c6be2c1c693c3ddb99554bc103e3c6cf602d0c2787c0ce6fd1702d") version("1.27.3", sha256="7ea422a76542c2fc2840df601af1b7803aa96df4fee6d51dec456ac36940c191") diff --git a/var/spack/repos/builtin/packages/r-hh/package.py b/var/spack/repos/builtin/packages/r-hh/package.py index bff8444aa65c19..da38dfed21b413 100644 --- a/var/spack/repos/builtin/packages/r-hh/package.py +++ b/var/spack/repos/builtin/packages/r-hh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index 3ededdda7876ed..7452077ba82f4a 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RHighr(RPackage): cran = "highr" + license("GPL-2.0-or-later") + version("0.10", sha256="ec55bc1ff66390ed66806dc2a7b6c17dbfd089b3d73fe2e369017f8cb4bc347b") version("0.9", sha256="beff11390d936c90fdcc00e7ed0eb72220f3de403a51b56659e3d3e0b6d8ed4d") version("0.8", sha256="4bd01fba995f68c947a99bdf9aca15327a5320151e10bd0326fad50a6d8bc657") diff --git a/var/spack/repos/builtin/packages/r-hmisc/package.py b/var/spack/repos/builtin/packages/r-hmisc/package.py index 41e31441d8e1f1..2ea88f61d0f89b 100644 --- a/var/spack/repos/builtin/packages/r-hmisc/package.py +++ b/var/spack/repos/builtin/packages/r-hmisc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hms/package.py b/var/spack/repos/builtin/packages/r-hms/package.py index 395c0acd20ca8e..8a7f004bd2506b 100644 --- a/var/spack/repos/builtin/packages/r-hms/package.py +++ b/var/spack/repos/builtin/packages/r-hms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RHms(RPackage): cran = "hms" + license("MIT") + version("1.1.3", sha256="e626f4c60af46efd53ea631b316a103e089470d8fd63c0e0c0efb99364990282") version("1.1.2", sha256="1ee6a9847336aaf58d3fcee5b56c290c2204e1213b6628862818419b2302bded") version("1.1.1", sha256="6b5f30db1845c70d27b5de33f31caa487cdd0787cd80a4073375e5f482269062") diff --git a/var/spack/repos/builtin/packages/r-hoardr/package.py b/var/spack/repos/builtin/packages/r-hoardr/package.py index 2f76907365719f..1002268151896c 100644 --- a/var/spack/repos/builtin/packages/r-hoardr/package.py +++ b/var/spack/repos/builtin/packages/r-hoardr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RHoardr(RPackage): cran = "hoardr" + license("MIT") + version("0.5.3", sha256="b9e4d1350e1fde7db922e55128306e3768ee46ff9532f05c96543dcae383647c") version("0.5.2", sha256="819113f0e25da105f120a676b5173872a4144f2f6f354cad14b35f898e76dc54") diff --git a/var/spack/repos/builtin/packages/r-htmltable/package.py b/var/spack/repos/builtin/packages/r-htmltable/package.py index c716ff11e66766..e381c8773dc321 100644 --- a/var/spack/repos/builtin/packages/r-htmltable/package.py +++ b/var/spack/repos/builtin/packages/r-htmltable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index c34c86bffde27d..8af75e17e41365 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RHtmltools(RPackage): cran = "htmltools" + license("GPL-2.0-or-later") + version("0.5.5", sha256="c8b23fab855a89c6ed0f6d6c7cad0ff9c5ae329c0bdb479940443ee752f26659") version("0.5.3", sha256="2c451b369ea8918358e2b280f548816664fe0143222c609e6bfb1f9cd2f7324f") version("0.5.2", sha256="7dc7d50436e5a82a5801f85bcd2f572a06a98b4027d71aa17b4854ec9b2767fb") diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index 2386ad8ba2b9bf..95e0cbd21c22d1 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RHtmlwidgets(RPackage): cran = "htmlwidgets" + license("MIT") + version("1.6.2", sha256="7fda1672a4c0fbc203c790677b6ee7c40d2c2d72be4f6772f75288fc712b10bc") version("1.5.4", sha256="1a3fc60f40717de7f1716b754fd1c31a132e489a2560a278636ee78eba46ffc1") version("1.5.3", sha256="01a5833182cc224bd100be2815e57e67b524de9f2bb1542787b6e3d1303f0f29") diff --git a/var/spack/repos/builtin/packages/r-httpcode/package.py b/var/spack/repos/builtin/packages/r-httpcode/package.py index d9d25b908d3135..822c679ac0e0fb 100644 --- a/var/spack/repos/builtin/packages/r-httpcode/package.py +++ b/var/spack/repos/builtin/packages/r-httpcode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RHttpcode(RPackage): cran = "httpcode" + license("MIT") + version("0.3.0", sha256="593a030a4f94c3df8c15576837c17344701bac023ae108783d0f06c476062f76") version("0.2.0", sha256="fbc1853db742a2cc1df11285cf27ce2ea43bc0ba5f7d393ee96c7e0ee328681a") diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 3a539d278fb6fb..e54167e7d60efd 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RHttpuv(RPackage): cran = "httpuv" + license("GPL-2.0-or-later OR custom") + version("1.6.9", sha256="8d77f25b22fa7473b45007c2048e9a38d3792d59b2716e1fcdf9e99bd585d95d") version("1.6.6", sha256="41395fd324c5cb884d4f2a8060744758904119db22eeb312f2ea1e7ad7711293") version("1.6.5", sha256="f5f63629ca5e9d0e396a89982d95b5286726c0cb425166f35a3ad32a60a79156") diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index 4051533b2be0bb..028903fd0c251f 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RHttr(RPackage): cran = "httr" + license("MIT") + version("1.4.5", sha256="f93bac7f882b0df099abca47dd5aae3686fb3cd2d3e9926fcd639bcddff76f6c") version("1.4.4", sha256="41d82523f3ee260d409a7b5ae4136190cbc5aecbc270b40ed7064f83e7f5435d") version("1.4.3", sha256="9a8613fa96173ac910c021391af1ced4d0609169049c802cf7cdfe1c40897c6a") diff --git a/var/spack/repos/builtin/packages/r-httr2/package.py b/var/spack/repos/builtin/packages/r-httr2/package.py index 146ba8d2384f3c..4ca63c8d50684d 100644 --- a/var/spack/repos/builtin/packages/r-httr2/package.py +++ b/var/spack/repos/builtin/packages/r-httr2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RHttr2(RPackage): cran = "httr2" + license("MIT") + version("0.2.2", sha256="5d1ab62541f7817112519f0f9d00d6a2555bab5b2da7f5c6d579b0c307d7f2bf") depends_on("r@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-humaniformat/package.py b/var/spack/repos/builtin/packages/r-humaniformat/package.py index 643574468a1eda..ee8057d6874b34 100644 --- a/var/spack/repos/builtin/packages/r-humaniformat/package.py +++ b/var/spack/repos/builtin/packages/r-humaniformat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RHumaniformat(RPackage): maintainers("jgaeb") + license("MIT") + version("0.6.0", sha256="861232c66bf6d4ff91b073193506104f4d99eca5e9a9488327f39ef2bfb45e6d") version("0.5.0", sha256="02b585e3623a5c5faa7dc3abff92b932d748900be39097c5db8434b8e92709a0") diff --git a/var/spack/repos/builtin/packages/r-hwriter/package.py b/var/spack/repos/builtin/packages/r-hwriter/package.py index 1facb7af813f08..f2054b6453e7be 100644 --- a/var/spack/repos/builtin/packages/r-hwriter/package.py +++ b/var/spack/repos/builtin/packages/r-hwriter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RHwriter(RPackage): cran = "hwriter" + license("LGPL-2.1-only") + version("1.3.2.1", sha256="ed2fa254ab27cf65d397e181339976fc3261dfb4f6b600fea8c5689620dab6f3") version("1.3.2", sha256="6b3531d2e7a239be9d6e3a1aa3256b2745eb68aa0bdffd2076d36552d0d7322b") diff --git a/var/spack/repos/builtin/packages/r-hydrogof/package.py b/var/spack/repos/builtin/packages/r-hydrogof/package.py index ac928494c5bfb6..3f5f11b161aa76 100644 --- a/var/spack/repos/builtin/packages/r-hydrogof/package.py +++ b/var/spack/repos/builtin/packages/r-hydrogof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hydrotsm/package.py b/var/spack/repos/builtin/packages/r-hydrotsm/package.py index dcafeabeb19d0d..2fd5cde5e956cc 100644 --- a/var/spack/repos/builtin/packages/r-hydrotsm/package.py +++ b/var/spack/repos/builtin/packages/r-hydrotsm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-hypergraph/package.py b/var/spack/repos/builtin/packages/r-hypergraph/package.py index 37fcca408ff46d..abe0e005e7ae3d 100644 --- a/var/spack/repos/builtin/packages/r-hypergraph/package.py +++ b/var/spack/repos/builtin/packages/r-hypergraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ica/package.py b/var/spack/repos/builtin/packages/r-ica/package.py index 1b778b81bb18e1..1ef9fd903ea23a 100644 --- a/var/spack/repos/builtin/packages/r-ica/package.py +++ b/var/spack/repos/builtin/packages/r-ica/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RIca(RPackage): cran = "ica" + license("GPL-2.0-or-later") + version("1.0-3", sha256="474d3530b16b76a1bf1a1114d24092678ea7215fa57c6fdcee6333f1e768b865") version("1.0-2", sha256="e721596fc6175d3270a60d5e0b5b98be103a8fd0dd93ef16680af21fe0b54179") version("1.0-1", sha256="98559a8bb12dd134a40ce8fd133803e2a38456b45d0e2a507d66022a8e2274ae") diff --git a/var/spack/repos/builtin/packages/r-ids/package.py b/var/spack/repos/builtin/packages/r-ids/package.py index 9af43e2a43834a..517d06f12fad99 100644 --- a/var/spack/repos/builtin/packages/r-ids/package.py +++ b/var/spack/repos/builtin/packages/r-ids/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RIds(RPackage): cran = "ids" + license("MIT") + version("1.0.1", sha256="b6212a186063c23116c5cbd3cca65dbb8977dd737261e4526ebee8f64852cfe8") depends_on("r-openssl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ieugwasr/package.py b/var/spack/repos/builtin/packages/r-ieugwasr/package.py index bce36046bba013..1825d39a8da6b9 100644 --- a/var/spack/repos/builtin/packages/r-ieugwasr/package.py +++ b/var/spack/repos/builtin/packages/r-ieugwasr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RIeugwasr(RPackage): homepage = "https://github.com/MRCIEU/ieugwasr" url = "https://github.com/MRCIEU/ieugwasr/archive/refs/tags/0.1.5.tar.gz" + license("MIT") + version("0.1.5", sha256="8d900d5a780f23836c80191f9635fbf48a0ca94f828452948c0f445e3217f422") depends_on("r@3.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index d4852d7e4fb2b3..dba6d2beabbd6d 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RIgraph(RPackage): cran = "igraph" + license("GPL-2.0-or-later") + version("1.4.2", sha256="7d5300adb1a25a6470cada8630e35ef416181147ab624d5a0a8d3552048c4ae5") version("1.3.5", sha256="9e615d67b6b5b57dfa54ec2bbc8c29da8f7c3fe82af1e35ab27273b1035b9bd4") version("1.3.1", sha256="505a2ba7c417ceaf869240cc1c9a5f3fbd75f8d9dfcfe048df1326c6ec41144e") diff --git a/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py b/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py index 8b638114d878a3..3adf23aa0bc66b 100644 --- a/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py +++ b/var/spack/repos/builtin/packages/r-illumina450probevariants-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py index e47abc886f6d59..4d56732ad11729 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kanno-ilmn12-hg19/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py index f06b3e519726f8..cccadc46beed2b 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylation450kmanifest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py index 0f03378aa8a81b..3cfbc85da9a2f8 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicanno-ilm10b4-hg19/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py index 1afa4ae292b047..4c5884f132c0c8 100644 --- a/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py +++ b/var/spack/repos/builtin/packages/r-illuminahumanmethylationepicmanifest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-illuminaio/package.py b/var/spack/repos/builtin/packages/r-illuminaio/package.py index 33d212a04be1cb..9f5a60263d182c 100644 --- a/var/spack/repos/builtin/packages/r-illuminaio/package.py +++ b/var/spack/repos/builtin/packages/r-illuminaio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-imager/package.py b/var/spack/repos/builtin/packages/r-imager/package.py index 3053ea94911c33..b132cfee0f1611 100644 --- a/var/spack/repos/builtin/packages/r-imager/package.py +++ b/var/spack/repos/builtin/packages/r-imager/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RImager(RPackage): cran = "imager" + license("LGPL-3.0-only") + version("0.42.19", sha256="187abccba648ecece5e466ca6333acd5c8fdd1476daa2d04d5fa9ec5400ae1e2") version("0.42.13", sha256="d90a9893d11190ba249c7fae5bd6517a77907efbce2941452cb2aec57bb5cf7f") version("0.42.11", sha256="47f8b7ff8d05a5191e30ad1869f12a62bdbe3142b22b12a6032dec9b5f8532a8") diff --git a/var/spack/repos/builtin/packages/r-impute/package.py b/var/spack/repos/builtin/packages/r-impute/package.py index d1c25eea6409d1..ecc5b356f8f945 100644 --- a/var/spack/repos/builtin/packages/r-impute/package.py +++ b/var/spack/repos/builtin/packages/r-impute/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index f518278b46132a..e3e60fa1dfd4aa 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ini/package.py b/var/spack/repos/builtin/packages/r-ini/package.py index f5a2ebb11d86c6..0c2cd68bb18493 100644 --- a/var/spack/repos/builtin/packages/r-ini/package.py +++ b/var/spack/repos/builtin/packages/r-ini/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class RIni(RPackage): cran = "ini" + license("GPL-3.0-only") + version("0.3.1", sha256="7b191a54019c8c52d6c2211c14878c95564154ec4865f57007953742868cd813") diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index f9812cdf635cd3..d7601ea0a0302b 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RInline(RPackage): cran = "inline" + license("LGPL-2.0-or-later") + version("0.3.19", sha256="0ee9309bb7dab0b97761ddd18381aa12bd7d54678ccd7bec00784e831f4c99d5") version("0.3.17", sha256="792857b2ebd408d6523424d2f6bb7297e241d4b28ab32372f6a9240c8cd554f3") version("0.3.15", sha256="ff043fe13c1991a3b285bed256ff4a9c0ba10bee764225a34b285875b7d69c68") diff --git a/var/spack/repos/builtin/packages/r-insight/package.py b/var/spack/repos/builtin/packages/r-insight/package.py index 7b0565db39160f..2f9f27c8ded0b6 100644 --- a/var/spack/repos/builtin/packages/r-insight/package.py +++ b/var/spack/repos/builtin/packages/r-insight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RInsight(RPackage): cran = "insight" + license("GPL-3.0-only") + version("0.19.1", sha256="1042629644c66b1a372fd4471d38adccc0c3a329879ef685b14b65575c1c98eb") version("0.18.6", sha256="ab0dc3c8ec765f2e93f7bcc3a7abb05140f71db24d50bf8cdd595a5a4e771cae") version("0.18.4", sha256="6e3f378bc2eb30c0300103bdd8a3e74371199b36867b45978ec9690a6fda0c5f") diff --git a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py index 2ee8dc7223d54e..1341a23acb9856 100644 --- a/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py +++ b/var/spack/repos/builtin/packages/r-interactivedisplaybase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-interp/package.py b/var/spack/repos/builtin/packages/r-interp/package.py index cf720a51fd7740..800ecaf9a5b395 100644 --- a/var/spack/repos/builtin/packages/r-interp/package.py +++ b/var/spack/repos/builtin/packages/r-interp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class RInterp(RPackage): cran = "interp" + license("GPL-2.0-or-later") + version("1.1-4", sha256="4f7b5d388132a4d76e8635e2a7c4fa0d705df2b49e7d108faa16ce2236e34d06") version("1.1-3", sha256="b74e606b38cfb02985c1f9e3e45093620f76c0307b1b0b4058761e871eb5fa3f") diff --git a/var/spack/repos/builtin/packages/r-intervals/package.py b/var/spack/repos/builtin/packages/r-intervals/package.py index 01499bfec44468..60006c590a02ff 100644 --- a/var/spack/repos/builtin/packages/r-intervals/package.py +++ b/var/spack/repos/builtin/packages/r-intervals/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RIntervals(RPackage): cran = "intervals" + license("Artistic-2.0") + version("0.15.3", sha256="8501fef7c74b9be874e807839518aae85e79bf4a047cd52169b52c6d9b41dfc4") version("0.15.2", sha256="0bd23b0ce817ddd851238233d8a5420bf3a6d29e75fd361418cbc50118777c57") version("0.15.1", sha256="9a8b3854300f2055e1492c71932cc808b02feac8c4d3dbf6cba1c7dbd09f4ae4") diff --git a/var/spack/repos/builtin/packages/r-inum/package.py b/var/spack/repos/builtin/packages/r-inum/package.py index ecedd5e5d5b35f..35b85b8de70bd3 100644 --- a/var/spack/repos/builtin/packages/r-inum/package.py +++ b/var/spack/repos/builtin/packages/r-inum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RInum(RPackage): cran = "inum" + license("GPL-2.0-only") + version("1.0-5", sha256="e696b7e0b31b3bbf405112e60691b6a72fedcaa02e08ee517c59f6bf9cd36bbd") version("1.0-4", sha256="5febef69c43a4b95b376c1418550a949d988a5f26b1383ca01c9728a94fc13ce") version("1.0-1", sha256="3c2f94c13c03607e05817e4859595592068b55e810fed94e29bc181ad248a099") diff --git a/var/spack/repos/builtin/packages/r-ipred/package.py b/var/spack/repos/builtin/packages/r-ipred/package.py index b6ee34cce04957..6e4d00a80e9490 100644 --- a/var/spack/repos/builtin/packages/r-ipred/package.py +++ b/var/spack/repos/builtin/packages/r-ipred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RIpred(RPackage): cran = "ipred" + license("GPL-2.0-or-later") + version("0.9-14", sha256="81c83dc847d09c3db52ef15e36cd4dac38c50eead1008ddd458b9e89d7528f35") version("0.9-13", sha256="6168a062d93c2d3063c064a8f242cd3716dee99822e20363a1801261319c4c98") version("0.9-12", sha256="d6e1535704d39415a799d7643141ffa4f6f55597f03e763f4ccd5d8106005843") diff --git a/var/spack/repos/builtin/packages/r-iranges/package.py b/var/spack/repos/builtin/packages/r-iranges/package.py index e998ffe89d0e1a..47a37a38ef8599 100644 --- a/var/spack/repos/builtin/packages/r-iranges/package.py +++ b/var/spack/repos/builtin/packages/r-iranges/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index c5ddc401ade563..b94700df3f3f21 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 363493de094bb1..2541213a9330e9 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index 65c53ff7817ef0..1d6ad085206d1f 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RIrlba(RPackage): cran = "irlba" + license("GPL-3.0-only") + version("2.3.5.1", sha256="2cfe6384fef91c223a9920895ce89496f990d1450d731e44309fdbec2bb5c5cf") version("2.3.5", sha256="26fc8c0d36460e422ab77f43a597b8ec292eacd452628c54d34b8bf7d5269bb9") version("2.3.3", sha256="6ee233697bcd579813bd0af5e1f4e6dd1eea971e8919c748408130d970fef5c0") diff --git a/var/spack/repos/builtin/packages/r-isdparser/package.py b/var/spack/repos/builtin/packages/r-isdparser/package.py index 41a8f27e189d0b..4433c557c3f6d7 100644 --- a/var/spack/repos/builtin/packages/r-isdparser/package.py +++ b/var/spack/repos/builtin/packages/r-isdparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RIsdparser(RPackage): cran = "isdparser" + license("MIT") + version("0.4.0", sha256="6f609e8f5ae4ce2e7904401f289d60d219b8f3a2bec9f661d10afa18ab73b317") version("0.3.0", sha256="6c9e1d7f3661802838010d659d7c77b964423dcc9a6623402df1fe3be627b7b9") diff --git a/var/spack/repos/builtin/packages/r-islr/package.py b/var/spack/repos/builtin/packages/r-islr/package.py index 9f64472da694a5..dbeca25824abf4 100644 --- a/var/spack/repos/builtin/packages/r-islr/package.py +++ b/var/spack/repos/builtin/packages/r-islr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-iso/package.py b/var/spack/repos/builtin/packages/r-iso/package.py index 1842917cae3984..4f8ec037d0d2e6 100644 --- a/var/spack/repos/builtin/packages/r-iso/package.py +++ b/var/spack/repos/builtin/packages/r-iso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-isoband/package.py b/var/spack/repos/builtin/packages/r-isoband/package.py index b7fe30e0b89883..2533c6c6f81e1a 100644 --- a/var/spack/repos/builtin/packages/r-isoband/package.py +++ b/var/spack/repos/builtin/packages/r-isoband/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RIsoband(RPackage): cran = "isoband" + license("MIT") + version("0.2.7", sha256="7693223343b45b86de2b5b638ff148f0dafa6d7b1237e822c5272902f79cdf61") version("0.2.6", sha256="27e460945753f6710649563dc817e2f314392ef6d1f8b6af2b1bf9447fab43a3") version("0.2.5", sha256="46f53fa066f0966f02cb2bf050190c0d5e950dab2cdf565feb63fc092c886ba5") diff --git a/var/spack/repos/builtin/packages/r-isva/package.py b/var/spack/repos/builtin/packages/r-isva/package.py index 31893be099f858..dd40bf59dbcf36 100644 --- a/var/spack/repos/builtin/packages/r-isva/package.py +++ b/var/spack/repos/builtin/packages/r-isva/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RIsva(RPackage): cran = "isva" + license("GPL-2.0-only") + version("1.9", sha256="9fd016e0b34034d271d45f8a0d0db62780bf0187112e45f610aa9237014e1d17") depends_on("r-qvalue", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index 51a9802dfb005c..1d59f787ca984a 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RIterators(RPackage): cran = "iterators" + license("Apache-2.0") + version("1.0.14", sha256="cef3075a0930e1408c764e4da56bbadd4f7d14315809df8f38dd51f80ccc677b") version("1.0.13", sha256="778e30e4c292da9f94d62acc637cf55273dae258199d847e62658f44840f11a4") version("1.0.12", sha256="96bf31d60ebd23aefae105d9b7790715e63327eec0deb2ddfb3d543994ea9f4b") diff --git a/var/spack/repos/builtin/packages/r-iterpc/package.py b/var/spack/repos/builtin/packages/r-iterpc/package.py index f038fe324928a3..bb078d444f76b8 100644 --- a/var/spack/repos/builtin/packages/r-iterpc/package.py +++ b/var/spack/repos/builtin/packages/r-iterpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RIterpc(RPackage): cran = "iterpc" + license("GPL-2.0-only") + version("0.4.2", sha256="38bd464042a27536f676e889263eb2c257a431b59083f58cb54473f42ba2071b") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-jade/package.py b/var/spack/repos/builtin/packages/r-jade/package.py index f584d060152e9d..3047b0916d8a40 100644 --- a/var/spack/repos/builtin/packages/r-jade/package.py +++ b/var/spack/repos/builtin/packages/r-jade/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-janitor/package.py b/var/spack/repos/builtin/packages/r-janitor/package.py index 656c4bd2a8dd09..8ee3268f045391 100644 --- a/var/spack/repos/builtin/packages/r-janitor/package.py +++ b/var/spack/repos/builtin/packages/r-janitor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RJanitor(RPackage): cran = "janitor" + license("MIT") + version("2.2.0", sha256="29d5d0185e4e824bb38f905b158162a12f52dc01c2e8a487fc730ce46bf6baae") version("2.1.0", sha256="d60615940fbe174f67799c8abc797f27928eca4ac180418527c5897a4aaad826") version("1.2.0", sha256="5e15a2292c65c5ddd6160289dec2604b05a813651a2be0d7854ace4548a32b8c") diff --git a/var/spack/repos/builtin/packages/r-jaspar2018/package.py b/var/spack/repos/builtin/packages/r-jaspar2018/package.py index 8819341ecca3da..6a9eebb8d46204 100644 --- a/var/spack/repos/builtin/packages/r-jaspar2018/package.py +++ b/var/spack/repos/builtin/packages/r-jaspar2018/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-jomo/package.py b/var/spack/repos/builtin/packages/r-jomo/package.py index c1fa53f2b60ca4..36a96efafd8ab2 100644 --- a/var/spack/repos/builtin/packages/r-jomo/package.py +++ b/var/spack/repos/builtin/packages/r-jomo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RJomo(RPackage): cran = "jomo" + license("GPL-2.0-only") + version("2.7-6", sha256="3ffa2a5521d4969fe77b23cd3ab201afdf8db3f8f708b1276c33083c01d7e2da") version("2.7-4", sha256="2d25bc248dc1b931e6c19636197cd6f58fb00f5e1102ed3c04084c71d03d93fd") version("2.7-3", sha256="9d3987f3a73d305f3ab6fc66efc04a196a7eb8b65e20c411131dc17af51f0063") diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index d58499fa00051c..0709499e83d327 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RJpeg(RPackage): cran = "jpeg" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.1-10", sha256="c8d9f609c3088f91ec4853d6cc0e66511038a465811dea79ca6a0c09519178ca") version("0.1-9", sha256="01a175442ec209b838a56a66a3908193aca6f040d537da7838d9368e46913072") version("0.1-8.1", sha256="1db0a4976fd9b2ae27a37d3e856cca35bc2909323c7a40724846a5d3c18915a9") diff --git a/var/spack/repos/builtin/packages/r-jquerylib/package.py b/var/spack/repos/builtin/packages/r-jquerylib/package.py index f4aded4e45d7f7..84d974113cec27 100644 --- a/var/spack/repos/builtin/packages/r-jquerylib/package.py +++ b/var/spack/repos/builtin/packages/r-jquerylib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RJquerylib(RPackage): cran = "jquerylib" + license("MIT") + version("0.1.4", sha256="f0bcc11dcde3a6ff180277e45c24642d3da3c8690900e38f44495efbc9064411") depends_on("r-htmltools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-jsonify/package.py b/var/spack/repos/builtin/packages/r-jsonify/package.py index 56ff80c3a1ef23..4887837dbdd639 100644 --- a/var/spack/repos/builtin/packages/r-jsonify/package.py +++ b/var/spack/repos/builtin/packages/r-jsonify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RJsonify(RPackage): cran = "jsonify" + license("MIT") + version("1.2.2", sha256="3745e962592f021a3deaed8b2f6b99c4f7181f28e095300a96d1c2b08af4af2f") version("1.2.1", sha256="929191ab32e34af6a02ad991e29314cc78ea40763fcf232388ef2d132137fbce") diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index 6ffb5a2265168f..952b58337a561c 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RJsonlite(RPackage): cran = "jsonlite" + license("MIT") + version("1.8.4", sha256="79eaabe042226b0918aa828cc63d54fee8be67ae7c67f5e0d3010f468efb1278") version("1.8.3", sha256="c57f1daf681fc7d5db893693a65ac61a48ddd7aabf66b28647b0e30df92ac8f0") version("1.8.2", sha256="677b645c081a7e004b71f0c48a1d46c1be9715163ccb6b419fbb0342a6c9cc3a") diff --git a/var/spack/repos/builtin/packages/r-kableextra/package.py b/var/spack/repos/builtin/packages/r-kableextra/package.py index 67fa2cb848fbc9..38ae8c03eba9c4 100644 --- a/var/spack/repos/builtin/packages/r-kableextra/package.py +++ b/var/spack/repos/builtin/packages/r-kableextra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-kegg-db/package.py b/var/spack/repos/builtin/packages/r-kegg-db/package.py index f68500c7a095af..475b20f63de464 100644 --- a/var/spack/repos/builtin/packages/r-kegg-db/package.py +++ b/var/spack/repos/builtin/packages/r-kegg-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-kegggraph/package.py b/var/spack/repos/builtin/packages/r-kegggraph/package.py index 02480e023bc051..c301d3f04de51c 100644 --- a/var/spack/repos/builtin/packages/r-kegggraph/package.py +++ b/var/spack/repos/builtin/packages/r-kegggraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-keggrest/package.py b/var/spack/repos/builtin/packages/r-keggrest/package.py index 7b11221c766351..8523fe9aa7c539 100644 --- a/var/spack/repos/builtin/packages/r-keggrest/package.py +++ b/var/spack/repos/builtin/packages/r-keggrest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-kernlab/package.py b/var/spack/repos/builtin/packages/r-kernlab/package.py index c4afc804895103..ec7f355a92e004 100644 --- a/var/spack/repos/builtin/packages/r-kernlab/package.py +++ b/var/spack/repos/builtin/packages/r-kernlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RKernlab(RPackage): cran = "kernlab" + license("GPL-2.0-only") + version("0.9-32", sha256="654ef34e343deb4d2c4c139a44e5397d6e38876088ce1c53c7deb087935d6fdc") version("0.9-31", sha256="7359c665c1c5e6780e1ce44b143347c8eec839301c3079d7f19e29159873278a") version("0.9-30", sha256="48fc3a839ae57e8ab6ec26a34093ca3306391e7b271bef6e69812e2b4859ee81") diff --git a/var/spack/repos/builtin/packages/r-kernsmooth/package.py b/var/spack/repos/builtin/packages/r-kernsmooth/package.py index 3e1fdae74ed798..2c19b6b76bcd3a 100644 --- a/var/spack/repos/builtin/packages/r-kernsmooth/package.py +++ b/var/spack/repos/builtin/packages/r-kernsmooth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-kknn/package.py b/var/spack/repos/builtin/packages/r-kknn/package.py index f7bf380b6607c3..1c674e39de5a4e 100644 --- a/var/spack/repos/builtin/packages/r-kknn/package.py +++ b/var/spack/repos/builtin/packages/r-kknn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RKknn(RPackage): cran = "kknn" + license("GPL-2.0-or-later") + version("1.3.1", sha256="22840e70ec2afa40371e274b583634c8f6d27149a87253ee411747d5db78f3db") depends_on("r@2.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-klar/package.py b/var/spack/repos/builtin/packages/r-klar/package.py index efc23d7d0bf4cb..bef15e27e149d0 100644 --- a/var/spack/repos/builtin/packages/r-klar/package.py +++ b/var/spack/repos/builtin/packages/r-klar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 71eb84b4f9d4d8..08e5dd22e4f02d 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RKnitr(RPackage): cran = "knitr" + license("GPL-2.0-or-later") + version("1.42", sha256="9344f1a0089e4da101def54aee38d7cfe3b2022d75c560141d8cc22ac65130f3") version("1.40", sha256="9b8f95ff367a0e52f024bda30315ec7cdd6a5b82371a1aaed95ab4eea78535bc") version("1.39", sha256="c91a65edebdca779af7f7480fa6636667497c9291ad55d6efd982db0bb91ac72") diff --git a/var/spack/repos/builtin/packages/r-kpmt/package.py b/var/spack/repos/builtin/packages/r-kpmt/package.py index 5f34826a42c829..aeb7344b2747ca 100644 --- a/var/spack/repos/builtin/packages/r-kpmt/package.py +++ b/var/spack/repos/builtin/packages/r-kpmt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RKpmt(RPackage): cran = "kpmt" + license("MIT") + version("0.1.0", sha256="6342ad02c93bfa7a764d028821bb6115bb8bc8c55b057a5860736cc0e034a295") depends_on("r@2.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ks/package.py b/var/spack/repos/builtin/packages/r-ks/package.py index ca4166cb67c9a3..9ef0ad456fb171 100644 --- a/var/spack/repos/builtin/packages/r-ks/package.py +++ b/var/spack/repos/builtin/packages/r-ks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RKs(RPackage): cran = "ks" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.14.0", sha256="2db9c56b7b0217b324bbf1e0f66bb94d3f7067a75c5823cbc7d369d63bbb4391") version("1.13.5", sha256="d1c4d06d704f301628455787ba929add1e774debc343d0952a768abea6cc7815") version("1.13.3", sha256="defb80df665d987f1751899f7a9809cb5a770f3c74266d7fbc7b9493616dce73") diff --git a/var/spack/repos/builtin/packages/r-ksamples/package.py b/var/spack/repos/builtin/packages/r-ksamples/package.py index 6ff57ab4a4115e..fc0bb71af3a616 100644 --- a/var/spack/repos/builtin/packages/r-ksamples/package.py +++ b/var/spack/repos/builtin/packages/r-ksamples/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 1def1479bf1b94..cafeae89614e39 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class RLabeling(RPackage): cran = "labeling" + license("MIT OR custom") + version("0.4.2", sha256="e022d79276173e0d62bf9e37d7574db65ab439eb2ae1833e460b1cff529bd165") version("0.3", sha256="0d8069eb48e91f6f6d6a9148f4e2dc5026cabead15dd15fc343eff9cf33f538f") diff --git a/var/spack/repos/builtin/packages/r-labelled/package.py b/var/spack/repos/builtin/packages/r-labelled/package.py index c1db80844b1ece..7d3e5d852631fa 100644 --- a/var/spack/repos/builtin/packages/r-labelled/package.py +++ b/var/spack/repos/builtin/packages/r-labelled/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLabelled(RPackage): cran = "labelled" + license("GPL-3.0-or-later") + version("2.11.0", sha256="eddc5299ca448ea9c244960af65b95f4164495febd609f719e0f453598a0e5dd") version("2.10.0", sha256="5e93e29dcbbf0f6273b502b744695426e238ffe106f1db2bb5daeb1f17c9c40a") version("2.9.1", sha256="9eb10b245f64f3fb7346121aa4cd98638946e1cc4208dd5e28791ef8fd62fa40") diff --git a/var/spack/repos/builtin/packages/r-lambda-r/package.py b/var/spack/repos/builtin/packages/r-lambda-r/package.py index 3fe77baf36757e..aaea0bddce43bd 100644 --- a/var/spack/repos/builtin/packages/r-lambda-r/package.py +++ b/var/spack/repos/builtin/packages/r-lambda-r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py index b3cc7b99255813..3fc00ebf51959b 100644 --- a/var/spack/repos/builtin/packages/r-laplacesdemon/package.py +++ b/var/spack/repos/builtin/packages/r-laplacesdemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lars/package.py b/var/spack/repos/builtin/packages/r-lars/package.py index 56045be985d9cd..e150766a921dec 100644 --- a/var/spack/repos/builtin/packages/r-lars/package.py +++ b/var/spack/repos/builtin/packages/r-lars/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLars(RPackage): cran = "lars" + license("GPL-2.0-only") + version("1.3", sha256="c69e6a8da6a3344c0915dd1fd4c78fec5cdf50c62cf6297476e9bb7dc10b549d") version("1.2", sha256="64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e") version("1.1", sha256="a8e4a0efb9ca6760dec1cadf395d9a805508455a2c3ced18cc53d9b8fa70cdc0") diff --git a/var/spack/repos/builtin/packages/r-later/package.py b/var/spack/repos/builtin/packages/r-later/package.py index 8981aa0ad1f2a4..78f29762a9ee0d 100644 --- a/var/spack/repos/builtin/packages/r-later/package.py +++ b/var/spack/repos/builtin/packages/r-later/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLater(RPackage): cran = "later" + license("MIT") + version("1.3.0", sha256="08f50882ca3cfd2bb68c83f1fcfbc8f696f5cfb5a42c1448c051540693789829") version("1.1.0.1", sha256="71baa7beae774a35a117e01d7b95698511c3cdc5eea36e29732ff1fe8f1436cd") version("0.8.0", sha256="6b2a28b43c619b2c7890840c62145cd3a34a7ed65b31207fdedde52efb00e521") diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index e22f9a22e675d0..78c7afeb11b87a 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLattice(RPackage): cran = "lattice" + license("GPL-2.0-or-later") + version("0.21-8", sha256="8ad3d6974262e6cab6cc8fec38aa279b5b2f2524adf6f3eab56f68302b60c329") version("0.20-45", sha256="22388d92bdb7d3959da84d7308d9026dd8226ef07580783729e8ad2f7d7507ad") version("0.20-44", sha256="57b908e3c7ada08a38ad857ee44f44fdf9cfa59d5d9500bda2ccc9c7e96cdb9b") diff --git a/var/spack/repos/builtin/packages/r-latticeextra/package.py b/var/spack/repos/builtin/packages/r-latticeextra/package.py index 8e41037aa41ef2..6adc35b4bc08ba 100644 --- a/var/spack/repos/builtin/packages/r-latticeextra/package.py +++ b/var/spack/repos/builtin/packages/r-latticeextra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lava/package.py b/var/spack/repos/builtin/packages/r-lava/package.py index 7cc14c9f5a56ad..25c4232c2beba6 100644 --- a/var/spack/repos/builtin/packages/r-lava/package.py +++ b/var/spack/repos/builtin/packages/r-lava/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RLava(RPackage): cran = "lava" + license("GPL-3.0-only") + version("1.7.2.1", sha256="d42b1f5c7e4e76718e4f014c44608295f82b5de0eb25ce8e9b35c40c7839ef2e") version("1.7.0", sha256="3078da69f3828812bcd093acc2d1cd2c8cbc8480d81da222ae49a55bcb2e5e24") version("1.6.10", sha256="7a88f8a885872e2abb3011c446e9e1c4884cd4dbe6ab4cfe9207538e5560232e") diff --git a/var/spack/repos/builtin/packages/r-lavaan/package.py b/var/spack/repos/builtin/packages/r-lavaan/package.py index 8049fbb6f22f1f..a1361283d1a7e9 100644 --- a/var/spack/repos/builtin/packages/r-lavaan/package.py +++ b/var/spack/repos/builtin/packages/r-lavaan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLavaan(RPackage): cran = "lavaan" + license("GPL-2.0-or-later") + version("0.6-15", sha256="9a43f3e999f9b3003a8c46a615902e01d6701d28a871d657751dd2ff3928ed9b") version("0.6-12", sha256="8048273e4102f8355ba123c8aff94a9e5a8e9ac9e02a73e986b106ceed4d079e") version("0.6-11", sha256="2cc193b82463a865cd8dadb7332409fdebf47e4035d5fe8dbf3414a7ae18d308") diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index 044e33de9a19ac..cbaafd963bbb4e 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RLazyeval(RPackage): cran = "lazyeval" + license("GPL-3.0-only") + version("0.2.2", sha256="d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4") version("0.2.1", sha256="83b3a43e94c40fe7977e43eb607be0a3cd64c02800eae4f2774e7866d1e93f61") version("0.2.0", sha256="13738f55b2044184fe91f53d17516a445dfb508227527921218cda6f01f98dcb") diff --git a/var/spack/repos/builtin/packages/r-ldheatmap/package.py b/var/spack/repos/builtin/packages/r-ldheatmap/package.py index 04cd605c031a4b..0db6a4b9d9e2b5 100644 --- a/var/spack/repos/builtin/packages/r-ldheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-ldheatmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-leafem/package.py b/var/spack/repos/builtin/packages/r-leafem/package.py index 85f45f29ce6e9f..6a1ebaa35f5607 100644 --- a/var/spack/repos/builtin/packages/r-leafem/package.py +++ b/var/spack/repos/builtin/packages/r-leafem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RLeafem(RPackage): cran = "leafem" + license("MIT") + version("0.2.0", sha256="97eb78b3eaf6012940f2c4f73effd8ff2d39aa46fef5f2ddf0005990b07dba8d") version("0.1.6", sha256="ca50e0a699f564449248511857a2df0d48cd07de3157e099478a19b533088156") version("0.1.3", sha256="6f123fc15efadb85d317c01003e3b7af5dc925cffe0bbe774b1b39b6bd67f304") diff --git a/var/spack/repos/builtin/packages/r-leaflet-providers/package.py b/var/spack/repos/builtin/packages/r-leaflet-providers/package.py index 570b63854eb30e..6d3f39a792375b 100644 --- a/var/spack/repos/builtin/packages/r-leaflet-providers/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet-providers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLeafletProviders(RPackage): cran = "leaflet.providers" + license("BSD-2-Clause") + version("1.9.0", sha256="9e8fc75c83313ab24663c2e718135459599549ed6e7396086cacb44e36cfd67b") depends_on("r@2.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index 1691bc4ede7f10..7b17cf605c4ddb 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RLeaflet(RPackage): cran = "leaflet" + license("GPL-3.0-only") + version("2.1.2", sha256="26d8671e8c99d85a4c257d8fb8c07ba899a2b95f801652598578f5cc5c724039") version("2.1.1", sha256="32f6a043759a0d2d98ea05739b7b4c55a266aa01272e48243e3c44046c7a5677") version("2.0.4.1", sha256="b0f038295f1de5d32d9ffa1d0dbc1562320190f2f1365f3a5e95863fff88901f") diff --git a/var/spack/repos/builtin/packages/r-leafpop/package.py b/var/spack/repos/builtin/packages/r-leafpop/package.py index 5c82b7a7b35f25..fb3cd2e4afba30 100644 --- a/var/spack/repos/builtin/packages/r-leafpop/package.py +++ b/var/spack/repos/builtin/packages/r-leafpop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RLeafpop(RPackage): cran = "leafpop" + license("MIT") + version("0.1.0", sha256="6e546886e1db4ad93a038de6d1e8331c0d686e96a0d3f0694e7575471f7d9db1") version("0.0.6", sha256="3d9ca31d081ce8540a87790786840bde5f833543af608c53a26623c7874e722f") diff --git a/var/spack/repos/builtin/packages/r-leaps/package.py b/var/spack/repos/builtin/packages/r-leaps/package.py index 8685effe5e5610..ee2ae5752b582d 100644 --- a/var/spack/repos/builtin/packages/r-leaps/package.py +++ b/var/spack/repos/builtin/packages/r-leaps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class RLeaps(RPackage): cran = "leaps" + license("GPL-2.0-or-later") + version("3.1", sha256="3d7c3a102ce68433ecf167ece96a7ebb4207729e4defd0ac8fc00e7003f5c3b6") version("3.0", sha256="55a879cdad5a4c9bc3b5697dd4d364b3a094a49d8facb6692f5ce6af82adf285") diff --git a/var/spack/repos/builtin/packages/r-learnbayes/package.py b/var/spack/repos/builtin/packages/r-learnbayes/package.py index c370e021a42338..97d78f9e72e8d5 100644 --- a/var/spack/repos/builtin/packages/r-learnbayes/package.py +++ b/var/spack/repos/builtin/packages/r-learnbayes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-leiden/package.py b/var/spack/repos/builtin/packages/r-leiden/package.py index 24c8d7e95f4d3a..045f47f7f5d4fd 100644 --- a/var/spack/repos/builtin/packages/r-leiden/package.py +++ b/var/spack/repos/builtin/packages/r-leiden/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RLeiden(RPackage): cran = "leiden" + license("GPL-3.0-only OR custom") + version("0.4.3", sha256="6a464b4b860e621749b3b701bb7ceb07e23c1a36be241c3e13b18105eb980938") version("0.4.2", sha256="cace86748c4aa1720508210658ee2f63f7875be5bac215084001fdc59d22e2bd") version("0.3.9", sha256="81754276e026a9a8436476365bbadf0f15a403a525a349cb56418da5d8edea0d") diff --git a/var/spack/repos/builtin/packages/r-lfe/package.py b/var/spack/repos/builtin/packages/r-lfe/package.py index b28fe938b28abf..fc00f5b69d04f5 100644 --- a/var/spack/repos/builtin/packages/r-lfe/package.py +++ b/var/spack/repos/builtin/packages/r-lfe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RLfe(RPackage): cran = "lfe" + license("Artistic-2.0") + version("2.9-0", sha256="7c9a9cd74ad98c65b67477eb6924409d7e372d01d7ed50fa2edb6fa34e02223c") version("2.8-8", sha256="0fc22928fa16f22ee66c8e426a0e994346ad2f67b3c5aea597f3eeffbd85ab71") version("2.8-7.1", sha256="d6a1efd8c43f84fa291e4959938f16e85bf5feef113515aaca1fe90075a78c50") diff --git a/var/spack/repos/builtin/packages/r-lhs/package.py b/var/spack/repos/builtin/packages/r-lhs/package.py index ef673901ee815f..b04915a5a2d87d 100644 --- a/var/spack/repos/builtin/packages/r-lhs/package.py +++ b/var/spack/repos/builtin/packages/r-lhs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLhs(RPackage): cran = "lhs" + license("GPL-3.0-only") + version("1.1.6", sha256="e37fce44efe6a371677ba2f72f9e1e48270a0fdc60872d05def89270586cd23f") version("1.1.5", sha256="7a3c6fdcc953490e51026e17a0b1a9dc0ca8d03e6fc989457a7cdda2075b6339") version("1.1.3", sha256="e43b8d48db1cf26013697e2a798ed1d31d1ee1790f2ebfecb280176c0e0c06d1") diff --git a/var/spack/repos/builtin/packages/r-libcoin/package.py b/var/spack/repos/builtin/packages/r-libcoin/package.py index 0325b935aa9cfe..34c66ac1f80a3e 100644 --- a/var/spack/repos/builtin/packages/r-libcoin/package.py +++ b/var/spack/repos/builtin/packages/r-libcoin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLibcoin(RPackage): cran = "libcoin" + license("GPL-2.0-only") + version("1.0-9", sha256="2d7dd0b7c6dfc20472430570419ea36a714da7bbafd336da1fb53c5c6463d9eb") version("1.0-6", sha256="48afc1415fc89b29e4f2c8b6f6db3cffef1531580e5c806ad7cacf4afe6a4e5a") version("1.0-4", sha256="91dcbaa0ab8c2109aa54c3eda29ad0acd67c870efcda208e27acce9d641c09c5") diff --git a/var/spack/repos/builtin/packages/r-libpressio/package.py b/var/spack/repos/builtin/packages/r-libpressio/package.py index 1e69f86aa8eefd..cc397330a3f8e1 100644 --- a/var/spack/repos/builtin/packages/r-libpressio/package.py +++ b/var/spack/repos/builtin/packages/r-libpressio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lifecycle/package.py b/var/spack/repos/builtin/packages/r-lifecycle/package.py index fe2e08caa13c91..6a72cd526ae15b 100644 --- a/var/spack/repos/builtin/packages/r-lifecycle/package.py +++ b/var/spack/repos/builtin/packages/r-lifecycle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RLifecycle(RPackage): cran = "lifecycle" + license("MIT") + version("1.0.3", sha256="6459fdc3211585c0cdf120427579c12149b02161efe273a64b825c05e9aa69c2") version("1.0.1", sha256="1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0") version("0.2.0", sha256="29746e8dee05d4e36f9c612e8c7a903a4f648a36b3b94c9776e518c38a412224") diff --git a/var/spack/repos/builtin/packages/r-limma/package.py b/var/spack/repos/builtin/packages/r-limma/package.py index 99f01b292dc6aa..5e3b183a8dc495 100644 --- a/var/spack/repos/builtin/packages/r-limma/package.py +++ b/var/spack/repos/builtin/packages/r-limma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-limsolve/package.py b/var/spack/repos/builtin/packages/r-limsolve/package.py index 52f12bf53adbb5..ae67f10b813fbf 100644 --- a/var/spack/repos/builtin/packages/r-limsolve/package.py +++ b/var/spack/repos/builtin/packages/r-limsolve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-linprog/package.py b/var/spack/repos/builtin/packages/r-linprog/package.py index db4b202fba838e..affc1343e6ddf0 100644 --- a/var/spack/repos/builtin/packages/r-linprog/package.py +++ b/var/spack/repos/builtin/packages/r-linprog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLinprog(RPackage): cran = "linprog" + license("GPL-2.0-or-later") + version("0.9-4", sha256="81a6aa2fdc075f12dc912794d0554f87705a8b872b99c89a90a69ee9ada864b4") depends_on("r@2.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-listenv/package.py b/var/spack/repos/builtin/packages/r-listenv/package.py index 71dee6ecab06cc..d9370a0b79b499 100644 --- a/var/spack/repos/builtin/packages/r-listenv/package.py +++ b/var/spack/repos/builtin/packages/r-listenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RListenv(RPackage): cran = "listenv" + license("LGPL-2.1-or-later") + version("0.9.0", sha256="352841e04f0725d361b78cfdc75e00511f740d97237dd651ea86aa5484674887") version("0.8.0", sha256="fd2aaf3ff2d8d546ce33d1cb38e68401613975117c1f9eb98a7b41facf5c485f") version("0.7.0", sha256="6126020b111870baea08b36afa82777cd578e88c17db5435cd137f11b3964555") diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index 6cf7ff3fe1082a..cff157fee17a2d 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLme4(RPackage): cran = "lme4" + license("GPL-2.0-or-later") + version("1.1-33", sha256="d956a5ed7cbcc016114a836bad89acf6cdafcd0f82a7d85e3805ced936b40910") version("1.1-31", sha256="5affd1e33d3fece5ec0a6c7663eb12328e64147f8aa92675ce6453c4fe72edfd") version("1.1-30", sha256="fdabdfc4b64cff05ae9506a766c948a953eeb6db71761f9401b36d6d9979300f") diff --git a/var/spack/repos/builtin/packages/r-lmertest/package.py b/var/spack/repos/builtin/packages/r-lmertest/package.py index d5f2ce21a0de86..521bbe49d76c35 100644 --- a/var/spack/repos/builtin/packages/r-lmertest/package.py +++ b/var/spack/repos/builtin/packages/r-lmertest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 155125377f54b8..ed98a3f759b591 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RLmtest(RPackage): cran = "lmtest" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.9-40", sha256="64400d4d6cc635316531042971f1783539686e9015c76f5741c07304fa14d997") version("0.9-39", sha256="71f8d67cbe559b33fe02910a3e98cddc60c9dcc421c64f7878c647218f07d488") version("0.9-38", sha256="32a22cea45398ffc5732d9f5c0391431d0cdd3a9e29cc7b77bea32c1eb4a216b") diff --git a/var/spack/repos/builtin/packages/r-lobstr/package.py b/var/spack/repos/builtin/packages/r-lobstr/package.py index 4fb34a52ae39ee..f322a9ab4cd8aa 100644 --- a/var/spack/repos/builtin/packages/r-lobstr/package.py +++ b/var/spack/repos/builtin/packages/r-lobstr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RLobstr(RPackage): cran = "lobstr" + license("MIT") + version("1.1.2", sha256="9bc533ed7e8f816097a03acfbca33308c9940ba26d02674f4ba06311cf3a1718") version("1.1.1", sha256="b8c9ce00095bd4f304b4883ef71da24572022f0632a18c3e1ba317814e70716e") version("1.0.1", sha256="25fb288f73dbaf680ebbf27a50da338868c55d788501118fd33748854c5104fb") diff --git a/var/spack/repos/builtin/packages/r-locfit/package.py b/var/spack/repos/builtin/packages/r-locfit/package.py index 3acc8f33a81407..932e614ba5fe22 100644 --- a/var/spack/repos/builtin/packages/r-locfit/package.py +++ b/var/spack/repos/builtin/packages/r-locfit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLocfit(RPackage): cran = "locfit" + license("GPL-2.0-or-later") + version("1.5-9.7", sha256="48e5fcd089fbc609d8e4c62c390425fba1dd167ad95ae0bddc175cbbe1517aff") version("1.5-9.6", sha256="1ee89e4003cb769feae61ada7ac0a971df30644824f7ed84a21dd5719f713476") version("1.5-9.5", sha256="fd9f2bad9d8beec8be4843dc80e38ebe0f388835a7003490f67e57eeb9e6de23") diff --git a/var/spack/repos/builtin/packages/r-log4r/package.py b/var/spack/repos/builtin/packages/r-log4r/package.py index c3fce35ff6b238..53dd72495441ae 100644 --- a/var/spack/repos/builtin/packages/r-log4r/package.py +++ b/var/spack/repos/builtin/packages/r-log4r/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RLog4r(RPackage): cran = "log4r" + license("Artistic-2.0") + version("0.4.3", sha256="dfe3d49d35a8d8f3ad63f156d18e860540a01bd0af0e343cbab3e31a2cf5904c") version("0.4.2", sha256="924a020565dcd05a2bc8283285fcae60f6b58b35e1be7c55acc0c703c7edfe34") version("0.3.2", sha256="14ba6b096283279f0accbde26a600771ab2df271db6c8eeb04d6f113107825a3") diff --git a/var/spack/repos/builtin/packages/r-loo/package.py b/var/spack/repos/builtin/packages/r-loo/package.py index ee8022f404cfb4..68f9e89684aefd 100644 --- a/var/spack/repos/builtin/packages/r-loo/package.py +++ b/var/spack/repos/builtin/packages/r-loo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RLoo(RPackage): cran = "loo" + license("GPL-3.0-or-later") + version("2.6.0", sha256="66da60fdf53a62cbc93797fa696a4cc43bce77f1721dd4bc1a58d25b3f981210") version("2.5.1", sha256="866a2f54a4e8726cc3062e27daa8a073e6ac4aeb6719af7845284f7a668745f1") version("2.4.1", sha256="bc21fb6b4a93a7e95ee1be57e4e787d731895fb8b4743c26b30b43adee475b50") diff --git a/var/spack/repos/builtin/packages/r-lpsolve/package.py b/var/spack/repos/builtin/packages/r-lpsolve/package.py index 3f0aa0a9cfb5b4..01847c815886ce 100644 --- a/var/spack/repos/builtin/packages/r-lpsolve/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lpsolveapi/package.py b/var/spack/repos/builtin/packages/r-lpsolveapi/package.py index ba33779a0fac23..3e313013b17d7f 100644 --- a/var/spack/repos/builtin/packages/r-lpsolveapi/package.py +++ b/var/spack/repos/builtin/packages/r-lpsolveapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lsei/package.py b/var/spack/repos/builtin/packages/r-lsei/package.py index f5993090264052..cf29fe58b37c32 100644 --- a/var/spack/repos/builtin/packages/r-lsei/package.py +++ b/var/spack/repos/builtin/packages/r-lsei/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,5 +19,7 @@ class RLsei(RPackage): cran = "lsei" + license("GPL-2.0-or-later") + version("1.3-0", sha256="6289058f652989ca8a5ad6fa324ce1762cc9e36c42559c00929b70f762066ab6") version("1.2-0", sha256="4781ebd9ef93880260d5d5f23066580ac06061e95c1048fb25e4e838963380f6") diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 0d389012c57a40..f3ea109ef55c62 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RLubridate(RPackage): cran = "lubridate" + license("GPL-2.0-or-later") + version("1.9.2", sha256="8976431a4affe989261cbaa5e09cd44bb42a3b16eed59a42c1698da34c6544a7") version("1.9.0", sha256="b936041f8a71894ef930cfff61b45833e0dd148b5b16697f4f541d25b31a903a") version("1.8.0", sha256="87d66efdb1f3d680db381d7e40a202d35645865a0542e2f270ef008a19002ba5") diff --git a/var/spack/repos/builtin/packages/r-lumi/package.py b/var/spack/repos/builtin/packages/r-lumi/package.py index 5206ac2b4b32a5..7325cd1dafef3b 100644 --- a/var/spack/repos/builtin/packages/r-lumi/package.py +++ b/var/spack/repos/builtin/packages/r-lumi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-lwgeom/package.py b/var/spack/repos/builtin/packages/r-lwgeom/package.py index 9476506fc20e7b..c25ea73c5d5419 100644 --- a/var/spack/repos/builtin/packages/r-lwgeom/package.py +++ b/var/spack/repos/builtin/packages/r-lwgeom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RLwgeom(RPackage): cran = "lwgeom" + license("GPL-2.0-only") + version("0.2-11", sha256="7fd73cf58981f9566d946bf63ed6575ea0c70634abeaf4e60ef9615040d63419") version("0.2-9", sha256="69b2a2efdafb0b32c801932eee7cd2c4b8402cede6487f4dfea4e14873091aa8") version("0.2-8", sha256="f48a92de222da0590b37a30d5cbf2364555044a842795f6b488afecc650b8b34") diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index 994a93eece2fad..294578d1d15558 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RMagic(RPackage): cran = "magic" + license("GPL-2.0-only") + version("1.6-1", sha256="ca79ec7ae92b736cb128556c081abf547f49956c326e053a76579889cbcb7976") version("1.6-0", sha256="4516d48c9618e3f395db873e886f5deb3b66b32ebe10d4c26c1420ac848acbbf") version("1.5-9", sha256="fa1d5ef2d39e880f262d31b77006a2a7e76ea38e306aae4356e682b90d6cd56a") diff --git a/var/spack/repos/builtin/packages/r-magick/package.py b/var/spack/repos/builtin/packages/r-magick/package.py index 9ea716bb7f8d40..c722a4b67cdcd6 100644 --- a/var/spack/repos/builtin/packages/r-magick/package.py +++ b/var/spack/repos/builtin/packages/r-magick/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RMagick(RPackage): cran = "magick" + license("MIT") + version("2.7.4", sha256="e28d67737590f8c19e4cf00a9c74e59d0e45f9ece363ed105b5f40e821e8f02f") version("2.7.3", sha256="83877b2e23ea43fbc1164de9c2422eafbe7858393ac384df5adf3a7eec122441") version("2.6.0", sha256="66585336e3ff18793ae9e2726af67a6672622f270468670ab5fe5e013bc48ecc") diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 1e30e8de652d52..989ca317de2390 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMagrittr(RPackage): cran = "magrittr" + license("MIT") + version("2.0.3", sha256="a2bff83f792a1acb801bfe6330bb62724c74d5308832f2cb6a6178336ace55d2") version("2.0.2", sha256="7be6fd0d0da75b92d8bad0136076da96260ee84bf639ef632a24668acdc163a6") version("2.0.1", sha256="75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f") diff --git a/var/spack/repos/builtin/packages/r-makecdfenv/package.py b/var/spack/repos/builtin/packages/r-makecdfenv/package.py index 307ae72906b277..21d255366d84d4 100644 --- a/var/spack/repos/builtin/packages/r-makecdfenv/package.py +++ b/var/spack/repos/builtin/packages/r-makecdfenv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-maldiquant/package.py b/var/spack/repos/builtin/packages/r-maldiquant/package.py index a38e89146f2975..3d646cd433c5c9 100644 --- a/var/spack/repos/builtin/packages/r-maldiquant/package.py +++ b/var/spack/repos/builtin/packages/r-maldiquant/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-manipulatewidget/package.py b/var/spack/repos/builtin/packages/r-manipulatewidget/package.py index 300008d54d31a4..3dcf466b197c5b 100644 --- a/var/spack/repos/builtin/packages/r-manipulatewidget/package.py +++ b/var/spack/repos/builtin/packages/r-manipulatewidget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mapplots/package.py b/var/spack/repos/builtin/packages/r-mapplots/package.py index 4d11303ce429f4..f19a3424c1f2e9 100644 --- a/var/spack/repos/builtin/packages/r-mapplots/package.py +++ b/var/spack/repos/builtin/packages/r-mapplots/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RMapplots(RPackage): cran = "mapplots" + license("GPL-2.0-or-later") + version("1.5.1", sha256="37e96d34f37922180e07bb63b4514e07d42eee5bbf0885b278286ee48cf142a3") depends_on("r@2.10.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index 4ec1e86923e1d6..3c9963ffcdf029 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RMapproj(RPackage): cran = "mapproj" + license("LPL-1.02") + version("1.2.11", sha256="db2d201cc939de26717566066bf44225a967ccde6fc34731af845f03c086347d") version("1.2.9", sha256="da28fab490072e0b2ff5e124092d6b3146e4c01b2386e23a2ea4b0e9fc72df82") version("1.2.8", sha256="865f108f1ee54cda38571b86cd46063a903824d9b4eabfdf75218023d08a7781") diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index bf2e17d1478a51..b6b6e19dc51794 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMaps(RPackage): cran = "maps" + license("GPL-2.0-only") + version("3.4.1", sha256="e693a5218ed8122e92d73a98a475d9016f2293c7852c8048677daa7649086400") version("3.4.0", sha256="7918ccb2393ca19589d4c4e77d9ebe863dc6317ebfc1ff41869dbfaf439f5747") version("3.3.0", sha256="199afe19a4edcef966ae79ef802f5dcc15a022f9c357fcb8cae8925fe8bd2216") diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index f16bb171d54d90..8ca517229139e6 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mapview/package.py b/var/spack/repos/builtin/packages/r-mapview/package.py index 36eea7a3345cd6..aa7f0dc717b86c 100644 --- a/var/spack/repos/builtin/packages/r-mapview/package.py +++ b/var/spack/repos/builtin/packages/r-mapview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RMapview(RPackage): cran = "mapview" + license("GPL-3.0-or-later OR custom") + version("2.11.0", sha256="87f8cf562a0918201082a743438b9af47429bdb8871511235d72505107f4d30a") version("2.10.0", sha256="b597902c654b9abf1163bb9d4f1044fef85d0a52c8dc6538ca46b0024f63baaa") version("2.9.0", sha256="170cb2b5e67cbeb177f87bd2eab1ecabc44a1042addbcd95a85b2ec4a00eb690") diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index aa7240368c7bde..2453101e8ecc16 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMarkdown(RPackage): cran = "markdown" + license("MIT") + version("1.6", sha256="46228b8d8161ae4b651b4662364eb35a3b91e6a7a457fe99d0e709f2a6f559ea") version("1.3", sha256="b1773e94e7b927c3a8540c2704b06e0f7721a0e3538a93abd58fff420ecb30f1") version("1.1", sha256="8d8cd47472a37362e615dbb8865c3780d7b7db694d59050e19312f126e5efc1b") diff --git a/var/spack/repos/builtin/packages/r-marray/package.py b/var/spack/repos/builtin/packages/r-marray/package.py index 6d181c0eef3c04..daf6298f4eca0e 100644 --- a/var/spack/repos/builtin/packages/r-marray/package.py +++ b/var/spack/repos/builtin/packages/r-marray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMarray(RPackage): bioc = "marray" + license("GPL-2.0-or-later") + version("1.78.0", commit="97d74b2af40568eda445378b4708a2e2d33291cd") version("1.76.0", commit="88cb0fd21cc60ac65410ca4314eca2e351933ec5") version("1.74.0", commit="9130a936fffb7d2d445ff21d04520e78b62625ac") diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index 3ccd755dd3afc8..035d1ed9007e9a 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mathjaxr/package.py b/var/spack/repos/builtin/packages/r-mathjaxr/package.py index 7b255138b40fc8..af32f8df386895 100644 --- a/var/spack/repos/builtin/packages/r-mathjaxr/package.py +++ b/var/spack/repos/builtin/packages/r-mathjaxr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMathjaxr(RPackage): cran = "mathjaxr" + license("GPL-3.0-only") + version("1.6-0", sha256="ecc47607111b788d84789459af7f4f9102719f98640b7a23bd5a4eb1a6d3c179") version("1.4-0", sha256="ba57378236d593a39c5839054adc5473526de0c8f05b7eeb87c99438496ddc67") version("1.0-1", sha256="0d3d370c4d0c7c7c6d5541d4e0ae50170b4084ca8a66e8a43bd92c7d1c112148") diff --git a/var/spack/repos/builtin/packages/r-matlab/package.py b/var/spack/repos/builtin/packages/r-matlab/package.py index 97072439d985fd..1483e712473cd4 100644 --- a/var/spack/repos/builtin/packages/r-matlab/package.py +++ b/var/spack/repos/builtin/packages/r-matlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RMatlab(RPackage): cran = "matlab" + license("Artistic-2.0") + version("1.0.4", sha256="1988a2220703444a575f2bad4eb090a0da71478599eb53081dd7237b7ec216ea") version("1.0.2", sha256="a23dec736c51ae1864c1a53caac556a2f98e8020138a3b121badb0f5b7984154") diff --git a/var/spack/repos/builtin/packages/r-matr/package.py b/var/spack/repos/builtin/packages/r-matr/package.py index bac7161dff7189..0e58b759041ab1 100644 --- a/var/spack/repos/builtin/packages/r-matr/package.py +++ b/var/spack/repos/builtin/packages/r-matr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index 6b227adaec15ce..16dbc8fe2f7cd9 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RMatrix(RPackage): cran = "Matrix" + license("GPL-3.0-only") + version("1.5-4", sha256="15ceb61993d61b442068104abb46e6d91b5a1179c01eeb64563b853abab66f06") version("1.5-1", sha256="557dba0358172d67dc63eb5db90841915bb5ce1528f941a8005ae808d635575d") version("1.4-1", sha256="42b24f1d1e94482b0ff0ef1292e2df29f69694bdbee47b3d6bfeec46fafb2f7e") diff --git a/var/spack/repos/builtin/packages/r-matrixgenerics/package.py b/var/spack/repos/builtin/packages/r-matrixgenerics/package.py index b5df37b26c02d3..743a31e4803f62 100644 --- a/var/spack/repos/builtin/packages/r-matrixgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-matrixgenerics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index dc07109d248452..ead6d5734c31cb 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-matrixstats/package.py b/var/spack/repos/builtin/packages/r-matrixstats/package.py index f2941b0258d567..aeb8639d0862ff 100644 --- a/var/spack/repos/builtin/packages/r-matrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-matrixstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mclogit/package.py b/var/spack/repos/builtin/packages/r-mclogit/package.py index a2c47b2e34cb2e..4046feab1ee160 100644 --- a/var/spack/repos/builtin/packages/r-mclogit/package.py +++ b/var/spack/repos/builtin/packages/r-mclogit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RMclogit(RPackage): cran = "mclogit" + license("GPL-2.0-only") + version("0.9.6", sha256="9adc5f6d8649960abe009c30d9b4c448ff7d174c455a594cbf104a33d5a36f69") depends_on("r-matrix", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-mclust/package.py b/var/spack/repos/builtin/packages/r-mclust/package.py index 55b8d5e9ce5a25..76ad0b7e0e52ee 100644 --- a/var/spack/repos/builtin/packages/r-mclust/package.py +++ b/var/spack/repos/builtin/packages/r-mclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMclust(RPackage): cran = "mclust" + license("GPL-2.0-or-later") + version("6.0.0", sha256="de7c306ecba1ef0f4e4a56c748ce08149417496b711beefb032d561a4c28122a") version("5.4.10", sha256="2a1bbbf3c4a17df08d1ba8bc4d3c6d9c7241ed5fd68b8aabe660115597b60672") version("5.4.9", sha256="65f123c6af86cf5eb511c81ae0eafa60da7b2085bfea1a08bdc3116081da9568") diff --git a/var/spack/repos/builtin/packages/r-mcmc/package.py b/var/spack/repos/builtin/packages/r-mcmc/package.py index 6e5af313147b15..3e32f58cefdc73 100644 --- a/var/spack/repos/builtin/packages/r-mcmc/package.py +++ b/var/spack/repos/builtin/packages/r-mcmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RMcmc(RPackage): cran = "mcmc" + license("MIT") + version("0.9-7", sha256="b7c4d3d5f9364c67a4a3cd49296a61c315ad9bd49324a22deccbacb314aa8260") depends_on("r@3.0.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py index 3fde8522f8d3bf..7519f5075145a7 100644 --- a/var/spack/repos/builtin/packages/r-mcmcglmm/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcglmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mcmcpack/package.py b/var/spack/repos/builtin/packages/r-mcmcpack/package.py index 55046e67b36118..80a0d6ac68dc0b 100644 --- a/var/spack/repos/builtin/packages/r-mcmcpack/package.py +++ b/var/spack/repos/builtin/packages/r-mcmcpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mco/package.py b/var/spack/repos/builtin/packages/r-mco/package.py index ddbd57b39c85b4..1f9d061f04060d 100644 --- a/var/spack/repos/builtin/packages/r-mco/package.py +++ b/var/spack/repos/builtin/packages/r-mco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RMco(RPackage): cran = "mco" + license("GPL-2.0-only") + version("1.15.6", sha256="17ebe279cb9c89b7cd8054ac50d3b657d2b10dadbc584b88da7e79c3a9680582") version("1.0-15.1", sha256="3c13ebc8c1f1bfa18f3f95b3998c57fde5259876e92456b6c6d4c59bef07c193") version("1.0-15", sha256="a25e3effbb6dcae735fdbd6c0bfc775e9fbbcc00dc00076b69c53fe250627055") diff --git a/var/spack/repos/builtin/packages/r-mda/package.py b/var/spack/repos/builtin/packages/r-mda/package.py index a2560e3ed71b4c..ea00d0f377f547 100644 --- a/var/spack/repos/builtin/packages/r-mda/package.py +++ b/var/spack/repos/builtin/packages/r-mda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMda(RPackage): cran = "mda" + license("GPL-2.0-only") + version("0.5-3", sha256="bda6409c17f385fae97da458cc742334e7b47aab8217a975b7551e2e18d38463") version("0.5-2", sha256="344f2053215ddf535d1554b4539e9b09067dac878887cc3eb995cef421fc00c3") version("0.4-10", sha256="7036bc622a8fea5b2de94fc19e6b64f5f0c27e5d743ae7646e116af08c9de6a5") diff --git a/var/spack/repos/builtin/packages/r-memisc/package.py b/var/spack/repos/builtin/packages/r-memisc/package.py index 1c9fd4893f742c..983cf8f3557f92 100644 --- a/var/spack/repos/builtin/packages/r-memisc/package.py +++ b/var/spack/repos/builtin/packages/r-memisc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RMemisc(RPackage): cran = "memisc" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.99.31.6", sha256="52336b4ffc6e60c3ed10ccc7417231582b0d2e4c5c3b2184396a7d3ca9c1d96e") depends_on("r@3.3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index a7d908a5480d84..c0e1d850920b90 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMemoise(RPackage): cran = "memoise" + license("MIT") + version("2.0.1", sha256="f85034ee98c8ca07fb3cd826142c1cd1e1e5747075a94c75a45783bbc4fe2deb") version("1.1.0", sha256="b276f9452a26aeb79e12dd7227fcc8712832781a42f92d70e86040da0573980c") version("1.0.0", sha256="fd1b6cf12929890db7819f74a44a1dbe3d6f25c8a608a956d827f8be2f6c026b") diff --git a/var/spack/repos/builtin/packages/r-memuse/package.py b/var/spack/repos/builtin/packages/r-memuse/package.py index f4eeb82b08597a..e1abbbc6315efd 100644 --- a/var/spack/repos/builtin/packages/r-memuse/package.py +++ b/var/spack/repos/builtin/packages/r-memuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RMemuse(RPackage): maintainers("dorton21") + license("BSD-2-Clause") + version("4.2-3", sha256="906fdff665e2aed0e98ee3181233a5c62bd521abfce6ab1cb215c71c95d12620") version("4.2-2", sha256="63dc2b2ad41da9af5d9b71c1fa9b03f37d1d58db2ed63355c303349d2247b7e5") version("4.2-1", sha256="f5e9dbaad4efbbfe219a93f446e318a00cad5b294bfc60ca2146eca894b47cf3") diff --git a/var/spack/repos/builtin/packages/r-mendelianrandomization/package.py b/var/spack/repos/builtin/packages/r-mendelianrandomization/package.py index ed7b9a905b3ad1..45e0017a92fe46 100644 --- a/var/spack/repos/builtin/packages/r-mendelianrandomization/package.py +++ b/var/spack/repos/builtin/packages/r-mendelianrandomization/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mergemaid/package.py b/var/spack/repos/builtin/packages/r-mergemaid/package.py index 710e35411b8029..c3931eda690d45 100644 --- a/var/spack/repos/builtin/packages/r-mergemaid/package.py +++ b/var/spack/repos/builtin/packages/r-mergemaid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-meta/package.py b/var/spack/repos/builtin/packages/r-meta/package.py index 916d8e9ac89fae..9a1facc53419c3 100644 --- a/var/spack/repos/builtin/packages/r-meta/package.py +++ b/var/spack/repos/builtin/packages/r-meta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RMeta(RPackage): cran = "meta" + license("GPL-2.0-or-later") + version("6.2-1", sha256="2c2a0d4d8f3b07211120b232a155e3e1312164ce18817e0d5693c8da5da1d6cc") version("6.2-0", sha256="8ec8fb412996bbe17d3ca073f15c191a77bad486b08f39d7b8c2d07360ad5781") diff --git a/var/spack/repos/builtin/packages/r-metadat/package.py b/var/spack/repos/builtin/packages/r-metadat/package.py index 71e249541813b9..921f188987ff97 100644 --- a/var/spack/repos/builtin/packages/r-metadat/package.py +++ b/var/spack/repos/builtin/packages/r-metadat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RMetadat(RPackage): cran = "metadat" + license("GPL-2.0-or-later") + version("1.2-0", sha256="f0cce5e30c3d256eaf5a41e4f52ffc7108e195016a4b99409e0ab4c2ef58f5b8") depends_on("r@4.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-metafor/package.py b/var/spack/repos/builtin/packages/r-metafor/package.py index 0e38a8f150656e..0d7716b13f57a3 100644 --- a/var/spack/repos/builtin/packages/r-metafor/package.py +++ b/var/spack/repos/builtin/packages/r-metafor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,8 @@ class RMetafor(RPackage): cran = "metafor" + license("GPL-2.0-or-later") + version("4.0-0", sha256="5cd552ebaf225b745c2e4d944ca80986dd1ad6f1a4c902fb646f3cb11b8dc23b") version("3.8-1", sha256="d694577f954144d8a5eeab6521fe1c87e68ddf9ecfd7ccc915d01533371b0514") diff --git a/var/spack/repos/builtin/packages/r-metap/package.py b/var/spack/repos/builtin/packages/r-metap/package.py index 338d5ba35a9d08..514c44074d9418 100644 --- a/var/spack/repos/builtin/packages/r-metap/package.py +++ b/var/spack/repos/builtin/packages/r-metap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMetap(RPackage): cran = "metap" + license("GPL-2.0-only") + version("1.8", sha256="ee9501a8de8a4c47af1632e6053e42ef53fc4b8bdf0f2759edc4d3eefaf5552b") version("1.7", sha256="d9b511607d0e37de4428549061c5577a4e812b0f55bb7ed887d1b24711f58c42") version("1.4", sha256="5fac23d823d0ad4eebc3f97620364e25f7b41f8d0c3579f6c09ec059940b85a5") diff --git a/var/spack/repos/builtin/packages/r-metapod/package.py b/var/spack/repos/builtin/packages/r-metapod/package.py index b2156dfae6dc6f..595c008a667327 100644 --- a/var/spack/repos/builtin/packages/r-metapod/package.py +++ b/var/spack/repos/builtin/packages/r-metapod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-methylumi/package.py b/var/spack/repos/builtin/packages/r-methylumi/package.py index 1fb9aa9ab71ffd..28ab374e75d158 100644 --- a/var/spack/repos/builtin/packages/r-methylumi/package.py +++ b/var/spack/repos/builtin/packages/r-methylumi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 642fd0e668da8a..a0e59e0b84eee7 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RMgcv(RPackage): cran = "mgcv" + license("GPL-2.0-or-later") + version("1.8-42", sha256="087fc38b64ad06f2149eafc54f2679dd8840cf6fc488e66cf131e3c1de2db6c7") version("1.8-41", sha256="2f7a030fe2be75edef6bd96147df46c2262f3cdc44c383d8f82b401df44fe690") version("1.8-40", sha256="dbe627266c3b339232e2d4228d5370ba88c86540319e6891d161242efba7e4a5") diff --git a/var/spack/repos/builtin/packages/r-mgraster/package.py b/var/spack/repos/builtin/packages/r-mgraster/package.py index bfdcd8e19ad526..7b82a49347c111 100644 --- a/var/spack/repos/builtin/packages/r-mgraster/package.py +++ b/var/spack/repos/builtin/packages/r-mgraster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mice/package.py b/var/spack/repos/builtin/packages/r-mice/package.py index af625c08838753..d61198a6c3e1b1 100644 --- a/var/spack/repos/builtin/packages/r-mice/package.py +++ b/var/spack/repos/builtin/packages/r-mice/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RMice(RPackage): cran = "mice" + license("GPL-2.0-or-later") + version("3.15.0", sha256="3d64dd260e3dce9c4c2f7be8c99f3063769df9ccfd3a0fc827c2de0ac842e87b") version("3.14.0", sha256="f87bb73d8bfee36c6bf4f15779c59ff6b70c70ca25b1388b4ee236757276d605") version("3.12.0", sha256="575d9e650d5fc8cd66c0b5a2f1e659605052b26d61f772fff5eed81b414ef144") diff --git a/var/spack/repos/builtin/packages/r-microbenchmark/package.py b/var/spack/repos/builtin/packages/r-microbenchmark/package.py index bbac853898428d..5382fa8ac55b1f 100644 --- a/var/spack/repos/builtin/packages/r-microbenchmark/package.py +++ b/var/spack/repos/builtin/packages/r-microbenchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RMicrobenchmark(RPackage): cran = "microbenchmark" + license("BSD-2-Clause") + version("1.4.9", sha256="443d2caf370ef33e4ac2773176ad9eb86f8790f43b430968ef9647699dbbffd2") version("1.4-7", sha256="268f13c6323dd28cc2dff7e991bb78b814a8873b4a73f4a3645f40423da984f6") diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index dc50385f9f162f..2ba4d9bff8f5ec 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMime(RPackage): cran = "mime" + license("GPL-2.0-or-later") + version("0.12", sha256="a9001051d6c1e556e881910b1816b42872a1ee41ab76d0040ce66a27135e3849") version("0.11", sha256="215427a49f0d0b0e3ab38d419c515a35d57e3bc32535805306275d8b33f8eec0") version("0.9", sha256="2ccf97d2940a09539dc051c7a9a1aee90ef04b34e9bc6c0b64b4435fb3c2fa80") diff --git a/var/spack/repos/builtin/packages/r-minfi/package.py b/var/spack/repos/builtin/packages/r-minfi/package.py index 2431d770556432..2b1e4ba2d57214 100644 --- a/var/spack/repos/builtin/packages/r-minfi/package.py +++ b/var/spack/repos/builtin/packages/r-minfi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-miniui/package.py b/var/spack/repos/builtin/packages/r-miniui/package.py index 4b4a5307a0c758..0f1571173e781f 100644 --- a/var/spack/repos/builtin/packages/r-miniui/package.py +++ b/var/spack/repos/builtin/packages/r-miniui/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 0ba2f3a36d0069..44337b542c5dce 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMinqa(RPackage): cran = "minqa" + license("GPL-2.0-only") + version("1.2.5", sha256="9b83562390990d04b2c61b63ac9a7c9ecab0d35c460d232596e3c73bdc89f4be") version("1.2.4", sha256="cfa193a4a9c55cb08f3faf4ab09c11b70412523767f19894e4eafc6e94cccd0c") diff --git a/var/spack/repos/builtin/packages/r-misc3d/package.py b/var/spack/repos/builtin/packages/r-misc3d/package.py index e3cf4a50609f7e..41d144da214f6a 100644 --- a/var/spack/repos/builtin/packages/r-misc3d/package.py +++ b/var/spack/repos/builtin/packages/r-misc3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RMisc3d(RPackage): cran = "misc3d" + license("GPL-2.0-or-later") + version("0.9-1", sha256="a07bbb0de153e806cd79675ed478d2d9221cff825654f59a71a9cf61f4293d65") version("0.9-0", sha256="a1e9291d625bd1312bae5b0e26d48b9362f66a8a0fabbf48891ba1d2432e4e82") version("0.8-4", sha256="75de3d2237f67f9e58a36e80a6bbf7e796d43eb46789f2dd1311270007bf5f62") diff --git a/var/spack/repos/builtin/packages/r-missmethyl/package.py b/var/spack/repos/builtin/packages/r-missmethyl/package.py index 9190733b12b8af..5057a34bc3ac67 100644 --- a/var/spack/repos/builtin/packages/r-missmethyl/package.py +++ b/var/spack/repos/builtin/packages/r-missmethyl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mitml/package.py b/var/spack/repos/builtin/packages/r-mitml/package.py index c64e5552d08d1c..d64b16a662f07f 100644 --- a/var/spack/repos/builtin/packages/r-mitml/package.py +++ b/var/spack/repos/builtin/packages/r-mitml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RMitml(RPackage): cran = "mitml" + license("GPL-2.0-or-later") + version("0.4-5", sha256="056aec823187cc3793640d8a5e74d74093bae74260a975ceb098a83a52e2eeeb") version("0.4-3", sha256="49bd3eb68a60fb2a269e7ddca8b862e1e81e0651e2b29759482fb7bcad452102") version("0.3-7", sha256="c6f796d0059f1b093b599a89d955982fa257de9c45763ecc2cbbce10fdec1e7b") diff --git a/var/spack/repos/builtin/packages/r-mitools/package.py b/var/spack/repos/builtin/packages/r-mitools/package.py index 81b5e663019419..f619711f109a62 100644 --- a/var/spack/repos/builtin/packages/r-mitools/package.py +++ b/var/spack/repos/builtin/packages/r-mitools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMitools(RPackage): cran = "mitools" + license("GPL-2.0-only") + version("2.4", sha256="f204f3774e29d79810f579f128de892539518f2cbe6ed237e08c8e7283155d30") depends_on("r-dbi", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-mixtools/package.py b/var/spack/repos/builtin/packages/r-mixtools/package.py index e14c3caa9afa1e..64a6c88194020b 100644 --- a/var/spack/repos/builtin/packages/r-mixtools/package.py +++ b/var/spack/repos/builtin/packages/r-mixtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class RMixtools(RPackage): cran = "mixtools" + license("GPL-2.0-or-later") + version("2.0.0", sha256="854e7482230b9a5dde61bab191b78e06aa8f9b0cdfe3c03e046afa133b317e0d") version("1.2.0", sha256="ef033ef13625209065d26767bf70d129972e6808927f755629f1d70a118b9023") version("1.1.0", sha256="543fd8d8dc8d4b6079ebf491cf97f27d6225e1a6e65d8fd48553ada23ba88d8f") diff --git a/var/spack/repos/builtin/packages/r-mlbench/package.py b/var/spack/repos/builtin/packages/r-mlbench/package.py index b0716860cc9a4f..f70c74bece3ff7 100644 --- a/var/spack/repos/builtin/packages/r-mlbench/package.py +++ b/var/spack/repos/builtin/packages/r-mlbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMlbench(RPackage): cran = "mlbench" + license("GPL-2.0-only") + version("2.1-3", sha256="b1f92be633243185ab86e880a1e1ac5a4dd3c535d01ebd187a4872d0a8c6f194") version("2.1-1", sha256="748141d56531a39dc4d37cf0a5165a40b653a04c507e916854053ed77119e0e6") diff --git a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py index b1c04a6591bd64..829e83d6820ce9 100644 --- a/var/spack/repos/builtin/packages/r-mlinterfaces/package.py +++ b/var/spack/repos/builtin/packages/r-mlinterfaces/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mlr/package.py b/var/spack/repos/builtin/packages/r-mlr/package.py index 268aeb8eff8c0f..00c402838ed252 100644 --- a/var/spack/repos/builtin/packages/r-mlr/package.py +++ b/var/spack/repos/builtin/packages/r-mlr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RMlr(RPackage): cran = "mlr" + license("BSD-2-Clause") + version("2.19.1", sha256="9d52afd54d9d5746e798134d5675818cee65caa53d7eaf317d46ba88d5865202") version("2.19.0", sha256="1149c9b453896481c85906045aa82d511d96979ddecbe5a3faf04f9f4a5e6113") version("2.18.0", sha256="c2fe74e90ed32e5f4cbb0c09a1742051688d87db2f12dd408ddad0f5afc7f8d3") diff --git a/var/spack/repos/builtin/packages/r-mlrmbo/package.py b/var/spack/repos/builtin/packages/r-mlrmbo/package.py index 7b37a9885bb0dd..0b945e185af090 100644 --- a/var/spack/repos/builtin/packages/r-mlrmbo/package.py +++ b/var/spack/repos/builtin/packages/r-mlrmbo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mmwrweek/package.py b/var/spack/repos/builtin/packages/r-mmwrweek/package.py index 85fe38a393ced1..b0d05a2485c94a 100644 --- a/var/spack/repos/builtin/packages/r-mmwrweek/package.py +++ b/var/spack/repos/builtin/packages/r-mmwrweek/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class RMmwrweek(RPackage): cran = "MMWRweek" + license("GPL-2.0-or-later") + version("0.1.3", sha256="1aa8b687dc3340c3f277689eb0ca529e0064a4a3a66868137f2f8ab209d133d0") version("0.1.1", sha256="969fd18535f3b78dd360d62d29d5f15409fc059f4af5d345abfde711e4adbc99") diff --git a/var/spack/repos/builtin/packages/r-mnormt/package.py b/var/spack/repos/builtin/packages/r-mnormt/package.py index 53a9e5c2c05149..06d34557911f0f 100644 --- a/var/spack/repos/builtin/packages/r-mnormt/package.py +++ b/var/spack/repos/builtin/packages/r-mnormt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RMnormt(RPackage): cran = "mnormt" + license("GPL-2.0-only OR GPL-3.0-only") + version("2.1.1", sha256="95fca70378af0afd5a388982ba5528f5b27e02157eeb9940a0a9762d11511308") version("2.0.2", sha256="5c6aa036d3f1035ffe8f9a8e95bb908b191b126b016591cf893c50472851f334") version("1.5-5", sha256="ff78d5f935278935f1814a69e5a913d93d6dd2ac1b5681ba86b30c6773ef64ac") diff --git a/var/spack/repos/builtin/packages/r-mockery/package.py b/var/spack/repos/builtin/packages/r-mockery/package.py index 819d96cf67a214..12e25a80e62f5f 100644 --- a/var/spack/repos/builtin/packages/r-mockery/package.py +++ b/var/spack/repos/builtin/packages/r-mockery/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMockery(RPackage): cran = "mockery" + license("MIT") + version("0.4.3", sha256="9fc9f1565c51e51b33634e9fc5328211559a561f095bc4d0fa8bd8b7533d476a") version("0.4.2", sha256="988e249c366ee7faf277de004084cf5ca24b5c8a8c6e3842f1b1362ce2f7ea9b") version("0.4.1", sha256="959d83f8b21e9a89c06c73f310356790c2d63d5ba39b2b60c6777a4eb33909c1") diff --git a/var/spack/repos/builtin/packages/r-modelmetrics/package.py b/var/spack/repos/builtin/packages/r-modelmetrics/package.py index add3d3310aae1e..7cfe7a9e124b70 100644 --- a/var/spack/repos/builtin/packages/r-modelmetrics/package.py +++ b/var/spack/repos/builtin/packages/r-modelmetrics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-modelr/package.py b/var/spack/repos/builtin/packages/r-modelr/package.py index 331de07b3cc66e..1aa748e2794570 100644 --- a/var/spack/repos/builtin/packages/r-modelr/package.py +++ b/var/spack/repos/builtin/packages/r-modelr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RModelr(RPackage): cran = "modelr" + license("GPL-3.0-only") + version("0.1.11", sha256="94ebd506e9ccf3bf25318be6a182f8f89c3669a77b41864a0b9dbcc1d4337bd3") version("0.1.9", sha256="10e9fde89e4695bbab3de2490336f68805cc327807a809982231169963dfa9c9") version("0.1.8", sha256="825ba77d95d60cfb94920bec910872ca2ffe7790a44148b2992be2759cb361c4") diff --git a/var/spack/repos/builtin/packages/r-modeltools/package.py b/var/spack/repos/builtin/packages/r-modeltools/package.py index d86169da344ea1..ea55739bfa783d 100644 --- a/var/spack/repos/builtin/packages/r-modeltools/package.py +++ b/var/spack/repos/builtin/packages/r-modeltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RModeltools(RPackage): cran = "modeltools" + license("GPL-2.0-only") + version("0.2-23", sha256="6b3e8d5af1a039db5c178498dbf354ed1c5627a8cea9229726644053443210ef") version("0.2-22", sha256="256a088fc80b0d9182f984f9bd3d6207fb7c1e743f72e2ecb480e6c1d4ac34e9") version("0.2-21", sha256="07b331475625674ab00e6ddfc479cbdbf0b22d5d237e8c25d83ddf3e0ad1cd7a") diff --git a/var/spack/repos/builtin/packages/r-mpm/package.py b/var/spack/repos/builtin/packages/r-mpm/package.py index 788e2c5a882856..737b0312918e70 100644 --- a/var/spack/repos/builtin/packages/r-mpm/package.py +++ b/var/spack/repos/builtin/packages/r-mpm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RMpm(RPackage): cran = "mpm" + license("GPL-2.0-or-later") + version("1.0-23", sha256="d2abda28246842b187b796a730c6e0590182960fda3bbf16ce4a1d5e5b13fbca") version("1.0-22", sha256="d3ba4053cd57a189cb65c5fa20e6a4152374aead8c985254cb6e550e36e23272") diff --git a/var/spack/repos/builtin/packages/r-mr-raps/package.py b/var/spack/repos/builtin/packages/r-mr-raps/package.py index 496756f9164a15..754c332fec9b34 100644 --- a/var/spack/repos/builtin/packages/r-mr-raps/package.py +++ b/var/spack/repos/builtin/packages/r-mr-raps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mrinstruments/package.py b/var/spack/repos/builtin/packages/r-mrinstruments/package.py index d80922c1cab210..736577c9af5d0a 100644 --- a/var/spack/repos/builtin/packages/r-mrinstruments/package.py +++ b/var/spack/repos/builtin/packages/r-mrinstruments/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mrmix/package.py b/var/spack/repos/builtin/packages/r-mrmix/package.py index d6c51a75416b11..59adb33e2b934b 100644 --- a/var/spack/repos/builtin/packages/r-mrmix/package.py +++ b/var/spack/repos/builtin/packages/r-mrmix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mrpresso/package.py b/var/spack/repos/builtin/packages/r-mrpresso/package.py index 7d4ab68341d919..fe925079c161c8 100644 --- a/var/spack/repos/builtin/packages/r-mrpresso/package.py +++ b/var/spack/repos/builtin/packages/r-mrpresso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mscoreutils/package.py b/var/spack/repos/builtin/packages/r-mscoreutils/package.py index e8be0bb0df29e1..769d7528c6b3dc 100644 --- a/var/spack/repos/builtin/packages/r-mscoreutils/package.py +++ b/var/spack/repos/builtin/packages/r-mscoreutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-msnbase/package.py b/var/spack/repos/builtin/packages/r-msnbase/package.py index 434ef49d024207..e7c550f9ca256f 100644 --- a/var/spack/repos/builtin/packages/r-msnbase/package.py +++ b/var/spack/repos/builtin/packages/r-msnbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 44fe4340595a3d..6fd24c0aa9cc0a 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMultcomp(RPackage): cran = "multcomp" + license("GPL-2.0-only") + version("1.4-23", sha256="425154a58bd8f2dbaff5d16e97b03473cbc0d571b1c2e4dd66a13c6d20a8cde1") version("1.4-20", sha256="328be4fa4189bde4a7bc645d9ae5ea071ebe31ed658c8c48c4e45aa8e8c42cfc") version("1.4-19", sha256="f03473b1cfbc714cd85a0ee948e2ecdb23bcdccbe95e27237ee25e9c71e3e557") diff --git a/var/spack/repos/builtin/packages/r-multcompview/package.py b/var/spack/repos/builtin/packages/r-multcompview/package.py index e8c70124ad8aba..bbb75b1dc4deea 100644 --- a/var/spack/repos/builtin/packages/r-multcompview/package.py +++ b/var/spack/repos/builtin/packages/r-multcompview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-multicool/package.py b/var/spack/repos/builtin/packages/r-multicool/package.py index a48254d6af3788..fd79b36bde6dc3 100644 --- a/var/spack/repos/builtin/packages/r-multicool/package.py +++ b/var/spack/repos/builtin/packages/r-multicool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RMulticool(RPackage): cran = "multicool" + license("GPL-2.0-only") + version("0.1-12", sha256="487d28d9c3c606be0cf56e2d8f8b0d79fb71949c68886ea9251fbb1c01664a36") version("0.1-11", sha256="1c907e64af2ac39facdf431a5691e69649f64af1f50e198ae39da5bf30026476") version("0.1-10", sha256="5bb0cb0d9eb64420c862877247a79bb0afadacfe23262ec8c3fa26e5e34d6ff9") diff --git a/var/spack/repos/builtin/packages/r-multitaper/package.py b/var/spack/repos/builtin/packages/r-multitaper/package.py index cab409e12b642e..024e7bbe305539 100644 --- a/var/spack/repos/builtin/packages/r-multitaper/package.py +++ b/var/spack/repos/builtin/packages/r-multitaper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RMultitaper(RPackage): cran = "multitaper" + license("GPL-2.0-or-later") + version("1.0-15", sha256="837d71f3b46fbce2bea210449cf75e609f5363ff23b7808f5f115fdc51e6a3be") version("1.0-14", sha256="c84c122541dc2874131446e23b212259b3b00590d701efee49e6740fd74a8d13") diff --git a/var/spack/repos/builtin/packages/r-multtest/package.py b/var/spack/repos/builtin/packages/r-multtest/package.py index 43b2d96bef2382..6fa806025d26d8 100644 --- a/var/spack/repos/builtin/packages/r-multtest/package.py +++ b/var/spack/repos/builtin/packages/r-multtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index 1c1c7022e14e87..44e8c0c4280f95 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RMunsell(RPackage): cran = "munsell" + license("MIT") + version("0.5.0", sha256="d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199") version("0.4.3", sha256="397c3c90af966f48eebe8f5d9e40c41b17541f0baaa102eec3ea4faae5a2bd49") diff --git a/var/spack/repos/builtin/packages/r-mutoss/package.py b/var/spack/repos/builtin/packages/r-mutoss/package.py index 4f31c30bf20947..f7fa8b7c21b6e5 100644 --- a/var/spack/repos/builtin/packages/r-mutoss/package.py +++ b/var/spack/repos/builtin/packages/r-mutoss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RMutoss(RPackage): cran = "mutoss" + license("GPL-2.0-or-later") + version("0.1-13", sha256="b60f6fcdce44dc60c7d34c6510047f756f1442366a3566661b22aae12f4ff141") version("0.1-12", sha256="2889ae3d502157592697124eb86adc14911e2b7fdaa7204743a376b1eeb967fa") diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index 7291268d2d7118..57fead3897e9ed 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RMvtnorm(RPackage): cran = "mvtnorm" + license("GPL-2.0-only") + version("1.1-3", sha256="ff4e302139ba631280fc9c4a2ab168596bfd09e17a805974199b043697c02448") version("1.1-1", sha256="e965dad5e93babb7ded25b5ebdbd52332191b61f897d68853a379a07620d45de") version("1.0-11", sha256="0321612de99aa9bc75a45c7e029d3372736014223cbdefb80d8cae600cbc7252") diff --git a/var/spack/repos/builtin/packages/r-mzid/package.py b/var/spack/repos/builtin/packages/r-mzid/package.py index 85e9db1e8b4c2b..4af67071aca97c 100644 --- a/var/spack/repos/builtin/packages/r-mzid/package.py +++ b/var/spack/repos/builtin/packages/r-mzid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-mzr/package.py b/var/spack/repos/builtin/packages/r-mzr/package.py index fc2faa2600019b..df724a5961390e 100644 --- a/var/spack/repos/builtin/packages/r-mzr/package.py +++ b/var/spack/repos/builtin/packages/r-mzr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-nada/package.py b/var/spack/repos/builtin/packages/r-nada/package.py index dda0bf500d7539..c7bce77d509ecf 100644 --- a/var/spack/repos/builtin/packages/r-nada/package.py +++ b/var/spack/repos/builtin/packages/r-nada/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-nanotime/package.py b/var/spack/repos/builtin/packages/r-nanotime/package.py index 82b162182220d5..35af382e82f65e 100644 --- a/var/spack/repos/builtin/packages/r-nanotime/package.py +++ b/var/spack/repos/builtin/packages/r-nanotime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RNanotime(RPackage): cran = "nanotime" + license("GPL-2.0-or-later") + version("0.3.7", sha256="a771782653aef62a071682907fd7bd611f7f98fc80beda227d619aae166ccb15") version("0.3.6", sha256="df751a5cb11ca9ac8762cd1e33bc73e7d20fde9339d2c46bc6f85873388568df") version("0.3.5", sha256="44deaae58452bacea4855d018212593811401c2afc460ffb11905479013923a0") diff --git a/var/spack/repos/builtin/packages/r-ncbit/package.py b/var/spack/repos/builtin/packages/r-ncbit/package.py index ad3cd2fce41ab9..fa3569912777c4 100644 --- a/var/spack/repos/builtin/packages/r-ncbit/package.py +++ b/var/spack/repos/builtin/packages/r-ncbit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RNcbit(RPackage): cran = "ncbit" + license("GPL-2.0-or-later") + version( "2013.03.29.1", sha256="847f570c035d849e775c1cb922d2775e6c535971eb4429cf62904319fd126504" ) diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index cab2bb3f14fff5..874a36f0639b38 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RNcdf4(RPackage): cran = "ncdf4" + license("GPL-3.0-or-later") + version("1.21", sha256="2f5ae7def382c595c66b6ed0ea0529f8337108eb73de39939f9762f3fb21b30d") version("1.19", sha256="cb8d139211fc7475c435ce9f6a43e47710603409dc523b053c8b7de9848dfb63") version("1.17", sha256="db95c4729d3187d1a56dfd019958216f442be6221bd15e23cd597e6129219af6") diff --git a/var/spack/repos/builtin/packages/r-network/package.py b/var/spack/repos/builtin/packages/r-network/package.py index abcdca91d01b96..bea112a0b85d98 100644 --- a/var/spack/repos/builtin/packages/r-network/package.py +++ b/var/spack/repos/builtin/packages/r-network/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RNetwork(RPackage): cran = "network" + license("GPL-2.0-or-later") + version("1.18.1", sha256="c80d70352967d8480cfa801f2a31bfe130e2ad4dbf2c07b0046e57f3013cd243") version("1.18.0", sha256="59f4b10174c87c8742c6b3c93c5e47833042375f5f872fdd23155b4a5244ce5b") version("1.17.2", sha256="9588a198807c8c68da147f479ca9af5bcb4468cf91b6a90b8044d313d9fa30f7") diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index 2807b6b6575851..ecf3084c83866d 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-neuralnet/package.py b/var/spack/repos/builtin/packages/r-neuralnet/package.py index 8ad5f13f58b63c..c16c94bbf81cf4 100644 --- a/var/spack/repos/builtin/packages/r-neuralnet/package.py +++ b/var/spack/repos/builtin/packages/r-neuralnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RNeuralnet(RPackage): cran = "neuralnet" + license("GPL-2.0-or-later") + version("1.44.2", sha256="5f66cd255db633322c0bd158b9320cac5ceff2d56f93e4864a0540f936028826") depends_on("r@2.9.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-nfactors/package.py b/var/spack/repos/builtin/packages/r-nfactors/package.py index 8ae3b1d4f07e01..4e72ddb432845e 100644 --- a/var/spack/repos/builtin/packages/r-nfactors/package.py +++ b/var/spack/repos/builtin/packages/r-nfactors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-nimble/package.py b/var/spack/repos/builtin/packages/r-nimble/package.py index 1ea30ea21cb427..816780deebf76a 100644 --- a/var/spack/repos/builtin/packages/r-nimble/package.py +++ b/var/spack/repos/builtin/packages/r-nimble/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RNimble(RPackage): cran = "nimble" + license("BSD-3-Clause OR GPL-2.0-or-later") + version("0.13.1", sha256="dc70caab64a8a4e44fb13fa6d67f6f2a0453fa684669e24718758bb2a8cf8530") version("0.12.2", sha256="2af7a3ab159a7f0b3b4b139da1db45be4b602f2c0e115cb0403b060ab0101a1b") version("0.12.1", sha256="3520f3212a48c8cbe08a6a8e57b3a72180594f7c09f647d1daf417c9857867d8") diff --git a/var/spack/repos/builtin/packages/r-nleqslv/package.py b/var/spack/repos/builtin/packages/r-nleqslv/package.py index 453273c40c32ee..da58b461a9f1cf 100644 --- a/var/spack/repos/builtin/packages/r-nleqslv/package.py +++ b/var/spack/repos/builtin/packages/r-nleqslv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RNleqslv(RPackage): cran = "nleqslv" + license("GPL-2.0-or-later") + version("3.3.4", sha256="2783e7525bcd155dd8cedf5a41b7db65cd1fa0e095cd937371448316f3930fcf") version("3.3.3", sha256="2e46dfce95ddfd7ed5208413ee41f6bdf1ae18414fb1d0c146d9da3af12ac633") version("3.3.2", sha256="f54956cf67f9970bb3c6803684c84a27ac78165055745e444efc45cfecb63fed") diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index ae0c1d0bcea232..f08f3a4b2c5b65 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RNlme(RPackage): cran = "nlme" + license("GPL-2.0-or-later") + version("3.1-162", sha256="ba6da2575554afa2614c4cba9971f8a9f8a07622d201284cb78899f3d6a2dc67") version("3.1-160", sha256="d4454623194876b083774c662fd223bc3b9e8325824cb758b8adecd5dc0d8a08") version("3.1-159", sha256="9bb05f5c3146e2d75078e668821485a3e9ca246fd5d7db2ef1963d3735d919bf") diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index 848a8a4312cb87..9d53c849160508 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RNloptr(RPackage): cran = "nloptr" + license("LGPL-3.0-or-later") + version("2.0.3", sha256="7b26ac1246fd1bd890817b0c3a145456c11aec98458b8518de863650b99616d7") version("2.0.0", sha256="65ca3149cfc9ba15ac10a91f34b5d86b20f5fd693f44e3edf3e392402911619a") version("1.2.2.3", sha256="af08b74fd5e7b4cb455fe67ed759346cbb8f3b9a4178f5f117e0092e5c9af6ff") diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index c5bf7d0e5f484e..744605ac88498f 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-nmof/package.py b/var/spack/repos/builtin/packages/r-nmof/package.py index ecc36c05c488b8..52dcda0ebdde33 100644 --- a/var/spack/repos/builtin/packages/r-nmof/package.py +++ b/var/spack/repos/builtin/packages/r-nmof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index 2290a2c3055d3e..63b8c5fc3233c7 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RNnet(RPackage): cran = "nnet" + license("GPL-2.0-only OR GPL-3.0-only") + version("7.3-18", sha256="d29aebfb5cb00071eecf754d55db5d474a6fda88860df5c9d31ba89aa8d9e3d0") version("7.3-17", sha256="ee750bb8164aa058edf93823af987ab2c7ec64128dce2abeaae1b7d3661e9a67") version("7.3-14", sha256="5d1b9e9764d74d16c651f18f949aa4e9e2995ba64633cbfa2c6a7355ae30f4af") diff --git a/var/spack/repos/builtin/packages/r-nnls/package.py b/var/spack/repos/builtin/packages/r-nnls/package.py index a927126dfc79cd..3fb292aa7e1d9c 100644 --- a/var/spack/repos/builtin/packages/r-nnls/package.py +++ b/var/spack/repos/builtin/packages/r-nnls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class RNnls(RPackage): cran = "nnls" + license("GPL-2.0-or-later") + version("1.4", sha256="0e5d77abae12bc50639d34354f96a8e079408c9d7138a360743b73bd7bce6c1f") diff --git a/var/spack/repos/builtin/packages/r-nonnest2/package.py b/var/spack/repos/builtin/packages/r-nonnest2/package.py index 3080bf147962cf..3899ba0a474c87 100644 --- a/var/spack/repos/builtin/packages/r-nonnest2/package.py +++ b/var/spack/repos/builtin/packages/r-nonnest2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RNonnest2(RPackage): cran = "nonnest2" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.5-5", sha256="027f510e322122fc75c936251a95ddd392f96047ac86e0fae6cf8f883ac7aab5") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-nor1mix/package.py b/var/spack/repos/builtin/packages/r-nor1mix/package.py index 95f7a111291320..2f6b7907c37032 100644 --- a/var/spack/repos/builtin/packages/r-nor1mix/package.py +++ b/var/spack/repos/builtin/packages/r-nor1mix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class RNor1mix(RPackage): cran = "nor1mix" + license("GPL-2.0-or-later") + version("1.3-0", sha256="9ce4ee92f889a4a4041b5ea1ff09396780785a9f12ac46f40647f74a37e327a0") version("1.2-3", sha256="435e6519e832ef5229c51ccb2619640e6b50dfc7470f70f0c938d18a114273af") diff --git a/var/spack/repos/builtin/packages/r-nortest/package.py b/var/spack/repos/builtin/packages/r-nortest/package.py index b40fbd1ed4bc14..cfe2a251e30c88 100644 --- a/var/spack/repos/builtin/packages/r-nortest/package.py +++ b/var/spack/repos/builtin/packages/r-nortest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,4 +13,6 @@ class RNortest(RPackage): cran = "nortest" + license("GPL-2.0-or-later") + version("1.0-4", sha256="a3850a048181d5d059c1e74903437569873b430c915b709808237d71fee5209f") diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index de83e59ef340ca..2ba3eda569b288 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RNp(RPackage): cran = "np" + license("GPL-2.0-or-later") + version("0.60-17", sha256="d97957cb234ec2e570fc2d02d305eadff3d71939484b3d1054ed8b67a3427f36") version("0.60-16", sha256="bef967c0195059e53c68e64d7540bf4627415c832f050c8806520ab8796e01b0") version("0.60-14", sha256="342b7f51e44eee556a9bb1f2ac9a143006019ca398fdccbb9c4562db3883d56c") diff --git a/var/spack/repos/builtin/packages/r-npsurv/package.py b/var/spack/repos/builtin/packages/r-npsurv/package.py index 3c3dd5e63ed7ac..97718a91d27a80 100644 --- a/var/spack/repos/builtin/packages/r-npsurv/package.py +++ b/var/spack/repos/builtin/packages/r-npsurv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RNpsurv(RPackage): cran = "npsurv" + license("GPL-2.0-or-later") + version("0.5-0", sha256="bc87db76e7017e178c2832a684fcd49c42e20054644b21b586413d26c8821dc6") version("0.4-0", sha256="404cf7135dc40a04e9b81224a543307057a8278e11109ba1fcaa28e87c6204f3") diff --git a/var/spack/repos/builtin/packages/r-numderiv/package.py b/var/spack/repos/builtin/packages/r-numderiv/package.py index e072112fca78a9..158b40eca59bf8 100644 --- a/var/spack/repos/builtin/packages/r-numderiv/package.py +++ b/var/spack/repos/builtin/packages/r-numderiv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-oligoclasses/package.py b/var/spack/repos/builtin/packages/r-oligoclasses/package.py index 92c8e49a3b0462..30b1533f5eb0c4 100644 --- a/var/spack/repos/builtin/packages/r-oligoclasses/package.py +++ b/var/spack/repos/builtin/packages/r-oligoclasses/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index 470b233e31786c..be058a55493255 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class ROpenssl(RPackage): cran = "openssl" + license("MIT") + version("2.0.6", sha256="77f3032a16270f0d1734f269b8d348eedc75b277812854386091143082c1b3f3") version("2.0.4", sha256="a1a5c65127c20c0ca3b46f2c4f4d3817276a887a231569537c1373e7740a5cec") version("2.0.3", sha256="7cde98520bec857f043fb6aae92334e2ae0dcd86108adc9b18ca298ec16286aa") diff --git a/var/spack/repos/builtin/packages/r-openxlsx/package.py b/var/spack/repos/builtin/packages/r-openxlsx/package.py index 4a22bebe069275..f16120e2579819 100644 --- a/var/spack/repos/builtin/packages/r-openxlsx/package.py +++ b/var/spack/repos/builtin/packages/r-openxlsx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class ROpenxlsx(RPackage): cran = "openxlsx" + license("MIT") + version("4.2.5.2", sha256="ee7089e7e5832ef22ee0d0eebf7cca5096ce23afb2bcdb58700be62526fc9b67") version("4.2.5.1", sha256="64d224380809d8d19788b02daf9d6dae45262594b81f5e013d37d34daf0945c8") version("4.2.5", sha256="65d06d2819b656ac30fc78437ee712a83fb5a7ab750f56268e5c9e578c582519") diff --git a/var/spack/repos/builtin/packages/r-optimparallel/package.py b/var/spack/repos/builtin/packages/r-optimparallel/package.py index d2854aa0634466..d1524bb2235359 100644 --- a/var/spack/repos/builtin/packages/r-optimparallel/package.py +++ b/var/spack/repos/builtin/packages/r-optimparallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-optimx/package.py b/var/spack/repos/builtin/packages/r-optimx/package.py index f967395bfacfe9..b079c0226ca9b2 100644 --- a/var/spack/repos/builtin/packages/r-optimx/package.py +++ b/var/spack/repos/builtin/packages/r-optimx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class ROptimx(RPackage): cran = "optimx" + license("GPL-2.0-only") + version("2022-4.30", sha256="ebe9887a22296cf4b2db07981aaa1f898bf7c17fb61a4b398c228d4077d0b410") version( "2021-10.12", sha256="39384c856b5efa3992cd230548b60eff936d428111ad6ad5b8fb98a3bcbb7943" diff --git a/var/spack/repos/builtin/packages/r-optparse/package.py b/var/spack/repos/builtin/packages/r-optparse/package.py index 20f6657cb61b89..90ab226ce4a23d 100644 --- a/var/spack/repos/builtin/packages/r-optparse/package.py +++ b/var/spack/repos/builtin/packages/r-optparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ROptparse(RPackage): cran = "optparse" + license("GPL-2.0-or-later") + version("1.7.3", sha256="6287e1af051d4a65037900ce7b30bd962039450dd4eab63b6f2491eace6a07ed") version("1.7.1", sha256="324e304c13efd565d766766193d4ccd75e2cd949dfcfb416afc3939489071fe7") version("1.6.6", sha256="51779d497146e9354b1153713d939e81551e08948c2b00e4b117b1377c0b60d0") diff --git a/var/spack/repos/builtin/packages/r-ordinal/package.py b/var/spack/repos/builtin/packages/r-ordinal/package.py index 39fecc0214f71b..6e7cc275734d16 100644 --- a/var/spack/repos/builtin/packages/r-ordinal/package.py +++ b/var/spack/repos/builtin/packages/r-ordinal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class ROrdinal(RPackage): cran = "ordinal" + license("GPL-2.0-or-later") + version( "2022.11-16", sha256="5488ad1dfa531a09d017d68d7393d376c8bc49cceeaa6a3e5f7d57b99168d493" ) diff --git a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py index ae6e5fca687396..3974775d0df1be 100644 --- a/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py +++ b/var/spack/repos/builtin/packages/r-org-hs-eg-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-organismdbi/package.py b/var/spack/repos/builtin/packages/r-organismdbi/package.py index 6231b229e6f2cb..b64b7a520a6dab 100644 --- a/var/spack/repos/builtin/packages/r-organismdbi/package.py +++ b/var/spack/repos/builtin/packages/r-organismdbi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-osqp/package.py b/var/spack/repos/builtin/packages/r-osqp/package.py index ea3b99f65458a2..a02f97fe441a75 100644 --- a/var/spack/repos/builtin/packages/r-osqp/package.py +++ b/var/spack/repos/builtin/packages/r-osqp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class ROsqp(RPackage): cran = "osqp" + license("Apache-2.0 OR custom") + version("0.6.0.8", sha256="14034045ae4ae5ec4eae4944653d41d94282fa85a0cd53614ac86f34fd02ed97") version("0.6.0.7", sha256="ee6584d02341e3f1d8fab3b2cb93defd6c48d561297d82a6bedb3e7541868203") diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index d095b56c66e208..f62071662ee0ed 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPackrat(RPackage): cran = "packrat" + license("GPL-2.0-only") + version("0.9.1", sha256="414013c6044d2985e69bbc8494c152716b6f81ca15b329c731cfe8f965fd3344") version("0.8.1", sha256="45db0301fa6a0a6944b070ac219cd1fa754bac24e517e59758cdc51e8aed23da") version("0.8.0", sha256="3025b9052974bec00fb09299226b80004d48e611e15a65e5a0bc49d3538844ef") diff --git a/var/spack/repos/builtin/packages/r-pacman/package.py b/var/spack/repos/builtin/packages/r-pacman/package.py index e8bc2fe763f55b..1fe7175a37285c 100644 --- a/var/spack/repos/builtin/packages/r-pacman/package.py +++ b/var/spack/repos/builtin/packages/r-pacman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RPacman(RPackage): cran = "pacman" + license("GPL-2.0-only") + version("0.5.1", sha256="9ec9a72a15eda5b8f727adc877a07c4b36f8372fe7ed80a1bc6c2068dab3ef7c") version("0.5.0", sha256="61294757212ab0aa0153219d7d031f58be6f30ead88d84859001d58caa76603d") version("0.4.1", sha256="fffa72307912cbd5aa5bee0a9b65931500483036ccffb1791dd808eb5eb70362") diff --git a/var/spack/repos/builtin/packages/r-paleotree/package.py b/var/spack/repos/builtin/packages/r-paleotree/package.py index b4fd3e8b7afbf9..48507c3653e045 100644 --- a/var/spack/repos/builtin/packages/r-paleotree/package.py +++ b/var/spack/repos/builtin/packages/r-paleotree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPaleotree(RPackage): cran = "paleotree" + license("CC0-1.0") + version("3.4.5", sha256="c4dceb3352b74730643aa9f62ceb7f020ce6763614ba334723aadf0eb003d125") version("3.4.4", sha256="8809c3395e6904669db8c7cc3b54dd5c3c76948c8568d310cf02e4a5dbc678e4") version("3.3.25", sha256="aa64b9120075581229439227a12db776d052b03eb5f9721692a16a9402ac8712") diff --git a/var/spack/repos/builtin/packages/r-pamr/package.py b/var/spack/repos/builtin/packages/r-pamr/package.py index 3bec5dddf7ce4e..b16f865fbb660a 100644 --- a/var/spack/repos/builtin/packages/r-pamr/package.py +++ b/var/spack/repos/builtin/packages/r-pamr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RPamr(RPackage): cran = "pamr" + license("GPL-2.0-only") + version("1.56.1", sha256="d0e527f2336ee4beee91eefb2a8f0dfa96413d9b5a5841d6fc7ff821e67c9779") version("1.55", sha256="ed910194937a6097ec79234d84777856fd520b111a7c79f7c86dc607169cc3c3") diff --git a/var/spack/repos/builtin/packages/r-pan/package.py b/var/spack/repos/builtin/packages/r-pan/package.py index f0a8cb01b02bd2..c50d192d007429 100644 --- a/var/spack/repos/builtin/packages/r-pan/package.py +++ b/var/spack/repos/builtin/packages/r-pan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,5 +18,7 @@ class RPan(RPackage): cran = "pan" + license("GPL-3.0-only") + version("1.6", sha256="adc0df816ae38bc188bce0aef3aeb71d19c0fc26e063107eeee71a81a49463b6") version("1.4", sha256="e6a83f0799cc9714f5052f159be6e82ececd013d1626f40c828cda0ceb8b76dc") diff --git a/var/spack/repos/builtin/packages/r-parallelly/package.py b/var/spack/repos/builtin/packages/r-parallelly/package.py index ac71b531f51d83..ad333a9de4556a 100644 --- a/var/spack/repos/builtin/packages/r-parallelly/package.py +++ b/var/spack/repos/builtin/packages/r-parallelly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RParallelly(RPackage): cran = "parallelly" + license("LGPL-2.1-or-later") + version("1.35.0", sha256="3f5e9b6507196aab052c5e67f8b524b75aa356731c5eaffbadde76c967ad5dcd") version("1.32.1", sha256="31c685f59ac7ff702fe2720910780378113adf0df0baf048a62eef94524cca90") version("1.31.1", sha256="40c7fc3d842fa928448e574091a521bead2367bf97545c744ca78ea9af3117da") diff --git a/var/spack/repos/builtin/packages/r-parallelmap/package.py b/var/spack/repos/builtin/packages/r-parallelmap/package.py index 59e37b24438a6c..e69e12dee8fd27 100644 --- a/var/spack/repos/builtin/packages/r-parallelmap/package.py +++ b/var/spack/repos/builtin/packages/r-parallelmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-paramhelpers/package.py b/var/spack/repos/builtin/packages/r-paramhelpers/package.py index 04a14b61c42f83..cde9476185829c 100644 --- a/var/spack/repos/builtin/packages/r-paramhelpers/package.py +++ b/var/spack/repos/builtin/packages/r-paramhelpers/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-party/package.py b/var/spack/repos/builtin/packages/r-party/package.py index 53659ed838ea56..4c0783c34c9bbd 100644 --- a/var/spack/repos/builtin/packages/r-party/package.py +++ b/var/spack/repos/builtin/packages/r-party/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class RParty(RPackage): cran = "party" + license("GPL-2.0-only") + version("1.3-13", sha256="def05e7f0c59f1b1ecf0ab3929cff75ae8c2691aaf52292cad4371281b897e7b") version("1.3-11", sha256="3ea41a1775d40bc6d0bdf657b98d939d99f98925ac985a31c969735c56618c9c") version("1.3-10", sha256="e5892955f6ce662ade568e646d1d672c3ecbf5d4e74b4a887a353e6160f7b56a") diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index 1b7ca6c9c957b1..fa35055cee0970 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RPartykit(RPackage): cran = "partykit" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.2-20", sha256="63509aa3ed2d7417ad284c037cef66bc837fdb7a97967957e79b9fee8ed2e0da") version("1.2-16", sha256="e643d4e29c1894497e3dd5fe274783319d0044dec50282ed807cebc21736ddb2") version("1.2-15", sha256="b2e9454b2f4b9a39c9581c5871462f00acef4eeee5696ce3e32cfa1468d1e3ac") diff --git a/var/spack/repos/builtin/packages/r-patchwork/package.py b/var/spack/repos/builtin/packages/r-patchwork/package.py index 112ee33519879d..96b701585f6847 100644 --- a/var/spack/repos/builtin/packages/r-patchwork/package.py +++ b/var/spack/repos/builtin/packages/r-patchwork/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RPatchwork(RPackage): cran = "patchwork" + license("MIT") + version("1.1.2", sha256="dab9d5d2d704d591717eaa6efeacf09cb6cd7bee2ca2c46d18414e8503ac8977") version("1.1.1", sha256="cf0d7d9f92945729b499d6e343441c55007d5b371206d5389b9e5154dc7cf481") diff --git a/var/spack/repos/builtin/packages/r-pathview/package.py b/var/spack/repos/builtin/packages/r-pathview/package.py index bf201d9d76b8b4..3e3c9af946f13c 100644 --- a/var/spack/repos/builtin/packages/r-pathview/package.py +++ b/var/spack/repos/builtin/packages/r-pathview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-pbapply/package.py b/var/spack/repos/builtin/packages/r-pbapply/package.py index 1a1cf19d9a901f..070035aca81824 100644 --- a/var/spack/repos/builtin/packages/r-pbapply/package.py +++ b/var/spack/repos/builtin/packages/r-pbapply/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RPbapply(RPackage): cran = "pbapply" + license("GPL-2.0-or-later") + version("1.7-0", sha256="64b8e931e0a09031c20b66173ce80a646043b8f135d329bc86226a11c6b706c0") version("1.5-0", sha256="effdfee286e5ba9534dc2ac3cee96590a37f5cd2af28c836d00c25ca9f070a55") version("1.4-3", sha256="8fe6287535be766b5a688810e2cc1ca4e668ac6b42b6e832473fe5701133eb21") diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index 77d18bbb19ffce..c3ee4bbac8befb 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RPbdzmq(RPackage): cran = "pbdZMQ" + license("GPL-3.0-or-later") + version("0.3-9", sha256="d033238d0a9810581f6b40c7c75263cfc495a585653bbff98e957c37954e0fb6") version("0.3-8", sha256="eded4ccf6ee54a59e06061f1c6e67a8ec36e03c6ab2318af64446d8f95505465") version("0.3-7", sha256="df2d2be14b2f57a64d76cdda4c01fd1c3d9aa12221c63524c01c71849df11808") diff --git a/var/spack/repos/builtin/packages/r-pbivnorm/package.py b/var/spack/repos/builtin/packages/r-pbivnorm/package.py index 982e3b3c69987e..bd56dd5148dfcf 100644 --- a/var/spack/repos/builtin/packages/r-pbivnorm/package.py +++ b/var/spack/repos/builtin/packages/r-pbivnorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class RPbivnorm(RPackage): cran = "pbivnorm" + license("GPL-2.0-or-later") + version("0.6.0", sha256="07c37d507cb8f8d2d9ae51a9a6d44dfbebd8a53e93c242c4378eaddfb1cc5f16") diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index 3da9a9f1ff6066..86f2a3f59838f7 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RPbkrtest(RPackage): cran = "pbkrtest" + license("GPL-2.0-or-later") + version("0.5.2", sha256="8e79adf035a0fcf3c82145ad55847497379e009f7be880ba3007ebeb2e69b6e3") version("0.5.1", sha256="b2a3452003d93890f122423b3f2487dcb6925440f5b8a05578509e98b6aec7c5") version("0.5-0.1", sha256="f56525488c6efe4a5cbf849bf9a82747041478605b166c29bad54e464e46f469") diff --git a/var/spack/repos/builtin/packages/r-pcamethods/package.py b/var/spack/repos/builtin/packages/r-pcamethods/package.py index 26fdbd08846482..413fea97a9f355 100644 --- a/var/spack/repos/builtin/packages/r-pcamethods/package.py +++ b/var/spack/repos/builtin/packages/r-pcamethods/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RPcamethods(RPackage): bioc = "pcaMethods" + license("GPL-2.0-or-later") + version("1.92.0", commit="ecbbc5b96b8fa79342611af8f798dd43c36d6699") version("1.90.0", commit="52474bc6d125122e89834328a1a780988349756f") version("1.88.0", commit="02fb58d6fe35579b86fb2ebd2eaf92e6b53444d2") diff --git a/var/spack/repos/builtin/packages/r-pcapp/package.py b/var/spack/repos/builtin/packages/r-pcapp/package.py index 48dc752de8568b..536c2e65da8a9e 100644 --- a/var/spack/repos/builtin/packages/r-pcapp/package.py +++ b/var/spack/repos/builtin/packages/r-pcapp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-pegas/package.py b/var/spack/repos/builtin/packages/r-pegas/package.py index 717330f6cf1763..c60f86f2bc7398 100644 --- a/var/spack/repos/builtin/packages/r-pegas/package.py +++ b/var/spack/repos/builtin/packages/r-pegas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RPegas(RPackage): maintainers("dorton21") + license("GPL-2.0-or-later") + version("1.2", sha256="9d39f3937c09ea6e2189949a23879bb366f5ca1df3a6aac411c7d2b73837ad55") version("1.1", sha256="87ba91a819496dfc3abdcc792ff853a6d49caae6335598a24c23e8851505ed59") version("0.14", sha256="7df90e6c4a69e8dbed2b3f68b18f1975182475bf6f86d4159256b52fd5332053") diff --git a/var/spack/repos/builtin/packages/r-permute/package.py b/var/spack/repos/builtin/packages/r-permute/package.py index 5364a600022c46..28e711039470c9 100644 --- a/var/spack/repos/builtin/packages/r-permute/package.py +++ b/var/spack/repos/builtin/packages/r-permute/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPermute(RPackage): cran = "permute" + license("GPL-2.0-only") + version("0.9-7", sha256="eff88ffb579aaeb994e9f8609b776b2d9d9d56bc2879ddf180e3a2ad19f48dc0") version("0.9-5", sha256="d2885384a07497e8df273689d6713fc7c57a7c161f6935f3572015e16ab94865") version("0.9-4", sha256="a541a5f5636ddd67fd856d3e11224f15bc068e96e23aabe3e607a7e7c2fc1cf1") diff --git a/var/spack/repos/builtin/packages/r-pfam-db/package.py b/var/spack/repos/builtin/packages/r-pfam-db/package.py index 1a9705e88a7034..b3a343c7091976 100644 --- a/var/spack/repos/builtin/packages/r-pfam-db/package.py +++ b/var/spack/repos/builtin/packages/r-pfam-db/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-phangorn/package.py b/var/spack/repos/builtin/packages/r-phangorn/package.py index 2ff63f66fa0a85..c417b5662c3db4 100644 --- a/var/spack/repos/builtin/packages/r-phangorn/package.py +++ b/var/spack/repos/builtin/packages/r-phangorn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RPhangorn(RPackage): cran = "phangorn" + license("GPL-2.0-or-later") + version("2.11.1", sha256="10096ecae03e118aa4dbc60d9866175fad4849c948e004cf10c3868e3feed420") version("2.10.0", sha256="d153f87053a1e6eebf46be98fad3f118349008c559a6797b55613629cab85dce") version("2.8.1", sha256="6d471410ae29775104a94746936e8c1c54c7273dd289333973ec06dad489dc75") diff --git a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py index 2bb550e9f18657..a9fcf1aa80aded 100644 --- a/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py +++ b/var/spack/repos/builtin/packages/r-phantompeakqualtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-pheatmap/package.py b/var/spack/repos/builtin/packages/r-pheatmap/package.py index 537b30515b4db1..79b84dd54f3654 100644 --- a/var/spack/repos/builtin/packages/r-pheatmap/package.py +++ b/var/spack/repos/builtin/packages/r-pheatmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPheatmap(RPackage): cran = "pheatmap" + license("GPL-2.0-only") + version("1.0.12", sha256="579d96ee0417203b85417780eca921969cda3acc210c859bf9dfeff11539b0c1") depends_on("r@2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-philentropy/package.py b/var/spack/repos/builtin/packages/r-philentropy/package.py index 5e4328869a9ef4..3bca7876a36eb7 100644 --- a/var/spack/repos/builtin/packages/r-philentropy/package.py +++ b/var/spack/repos/builtin/packages/r-philentropy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RPhilentropy(RPackage): cran = "philentropy" + license("GPL-2.0-only") + version("0.7.0", sha256="ce72e2327aee80aeeb630caa33be6a35e4f2b8a7491842d8c21099b9c43584b7") version("0.6.0", sha256="138acf2aedab17c9d367def378e35c8aba80d9e786284b2866955cea1c24eeb6") version("0.5.0", sha256="b39e9a825458f3377e23b2a133180566780e89019e9d22a6a5b7ca87c49c412f") diff --git a/var/spack/repos/builtin/packages/r-phylobase/package.py b/var/spack/repos/builtin/packages/r-phylobase/package.py index c6fe3023ec141f..6ef5f16f86cbe7 100644 --- a/var/spack/repos/builtin/packages/r-phylobase/package.py +++ b/var/spack/repos/builtin/packages/r-phylobase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPhylobase(RPackage): cran = "phylobase" + license("GPL-2.0-or-later") + version("0.8.10", sha256="5a44380ff49bab333a56f6f96157324ade8afb4af0730e013194c4badb0bf94b") depends_on("r-ade4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-phyloseq/package.py b/var/spack/repos/builtin/packages/r-phyloseq/package.py index 5da02d1f58b19d..8afe85d7a2619f 100644 --- a/var/spack/repos/builtin/packages/r-phyloseq/package.py +++ b/var/spack/repos/builtin/packages/r-phyloseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPhyloseq(RPackage): bioc = "phyloseq" + license("LiLiQ-R-1.1") + version("1.44.0", commit="03b74f7d7aa866f5f9a84c7368da57b7a168967e") version("1.42.0", commit="de6be71fe9902bdfe7791163acb7b67d238424dc") version("1.40.0", commit="20bb27d5e6e0d4368978a15671b829990b1f4568") diff --git a/var/spack/repos/builtin/packages/r-phylostratr/package.py b/var/spack/repos/builtin/packages/r-phylostratr/package.py index 93196bd58004ae..23c61ab4fbf2a2 100644 --- a/var/spack/repos/builtin/packages/r-phylostratr/package.py +++ b/var/spack/repos/builtin/packages/r-phylostratr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class RPhylostratr(RPackage): homepage = "https://github.com/arenasee/phylostratr" git = "https://github.com/arendsee/phylostratr.git" + license("GPL-3.0-or-later") + version("20190323", commit="9f6d1ee2e93d973dabcfc72a44af9a032cb7ebbd") depends_on("r@3.4.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-phytools/package.py b/var/spack/repos/builtin/packages/r-phytools/package.py index 25eba89d6222c4..894bf1daae403f 100644 --- a/var/spack/repos/builtin/packages/r-phytools/package.py +++ b/var/spack/repos/builtin/packages/r-phytools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class RPhytools(RPackage): cran = "phytools" + license("GPL-2.0-or-later") + version("1.5-1", sha256="f8be59abbff1f5032be4523c361da53b0d5b71677fedebba6d7cbae2dca7e101") version("1.2-0", sha256="ba3c684118c0eaab4601b21988c553ce7ee019df1714d2ac8d4451075f843b86") version("1.0-3", sha256="bfe2aec6aae8235264c1494eee42be494fed81a676c6de9e39c57a6e3682b37d") diff --git a/var/spack/repos/builtin/packages/r-picante/package.py b/var/spack/repos/builtin/packages/r-picante/package.py index a29d7dbbfbe159..0e5644de7074b3 100644 --- a/var/spack/repos/builtin/packages/r-picante/package.py +++ b/var/spack/repos/builtin/packages/r-picante/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RPicante(RPackage): cran = "picante" + license("GPL-2.0-only") + version("1.8.2", sha256="56565ca7f7c37f49c961372a816724967c21a4f5025cd69b8b671122bfdc4aa7") version("1.8", sha256="81a6308dbb53c9cdab30c1f9ac727abee76314351823b3a2142c21ed8e1498ad") version("1.7", sha256="75e4d73080db67e776562a1d58685438461cbde39af46900c7838da56aef0a62") diff --git a/var/spack/repos/builtin/packages/r-piggyback/package.py b/var/spack/repos/builtin/packages/r-piggyback/package.py index 76cf04b88c62e5..3b36baa5160791 100644 --- a/var/spack/repos/builtin/packages/r-piggyback/package.py +++ b/var/spack/repos/builtin/packages/r-piggyback/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RPiggyback(RPackage): maintainers("jgaeb") + license("GPL-3.0-only") + version("0.1.5", sha256="983b5a46792ff5f2895f36ee29afcbd7723d05fe3daefdaefaada12987e36aee") version("0.1.4", sha256="9e9d6d75e13f82559e5322182af557b3c79f9a6e9b0bc8c1e1b193544dcda511") version("0.1.3", sha256="6fccae21a97653f6a1d90d97c4f089bf403126a808f4b4023f4b0c6a496e0b07") diff --git a/var/spack/repos/builtin/packages/r-pillar/package.py b/var/spack/repos/builtin/packages/r-pillar/package.py index 560599fc5bafa2..41525581f20479 100644 --- a/var/spack/repos/builtin/packages/r-pillar/package.py +++ b/var/spack/repos/builtin/packages/r-pillar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPillar(RPackage): cran = "pillar" + license("MIT") + version("1.9.0", sha256="f23eb486c087f864c2b4072d5cba01d5bebf2f554118bcba6886d8dbceb87acc") version("1.8.1", sha256="2f06a7cc9e5638390c9b98a6ec9a9ec1beec0f2b9dbdfa42e39a5ab2456d87ec") version("1.7.0", sha256="7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb") diff --git a/var/spack/repos/builtin/packages/r-pinfsc50/package.py b/var/spack/repos/builtin/packages/r-pinfsc50/package.py index 31e22161125a2a..2c0808598ccce2 100644 --- a/var/spack/repos/builtin/packages/r-pinfsc50/package.py +++ b/var/spack/repos/builtin/packages/r-pinfsc50/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPinfsc50(RPackage): maintainers("dorton21") + license("GPL-2.0-or-later") + version("1.2.0", sha256="ed1fe214b9261feef8abfbf724c2bd9070d68e99a6ea95208aff2c57bbef8794") depends_on("r@3.2.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-pixmap/package.py b/var/spack/repos/builtin/packages/r-pixmap/package.py index 1cb80cd9fedda8..25158831a2b0b4 100644 --- a/var/spack/repos/builtin/packages/r-pixmap/package.py +++ b/var/spack/repos/builtin/packages/r-pixmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RPixmap(RPackage): cran = "pixmap" + license("GPL-2.0-only") + version("0.4-12", sha256="893ba894d4348ba05e6edf9c1b4fd201191816b444a214f7a6b2c0a79b0a2aec") version("0.4-11", sha256="6fa010749a59cdf56aad9f81271473b7d55697036203f2cd5d81372bcded7412") diff --git a/var/spack/repos/builtin/packages/r-pkgbuild/package.py b/var/spack/repos/builtin/packages/r-pkgbuild/package.py index 4aa54e040aee4c..9289da8fb73d33 100644 --- a/var/spack/repos/builtin/packages/r-pkgbuild/package.py +++ b/var/spack/repos/builtin/packages/r-pkgbuild/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPkgbuild(RPackage): cran = "pkgbuild" + license("MIT") + version("1.4.0", sha256="357f3c40c99650eaa8a715991ff1355a553acb165f217ed204712f698ba55ed6") version("1.3.1", sha256="7c6a82d1e6b19e136a7d16095743c50cd7b6340eeda594e4a8e14d74972ddb48") version("1.2.0", sha256="2e19308d3271fefd5e118c6d132d6a2511253b903620b5417892c72d2010a963") diff --git a/var/spack/repos/builtin/packages/r-pkgcache/package.py b/var/spack/repos/builtin/packages/r-pkgcache/package.py index 3c51535d692960..4f7db9e75be88d 100644 --- a/var/spack/repos/builtin/packages/r-pkgcache/package.py +++ b/var/spack/repos/builtin/packages/r-pkgcache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPkgcache(RPackage): cran = "pkgcache" + license("MIT") + version("2.1.0", sha256="cfc03c2060028097972c32c3f2d922d7a598dfd963e5e5250d85a3dfa2f2e206") version("2.0.3", sha256="80deafd60f15dda029536d4ce13c37ef91c49cb6636323daadbf3d64a67da028") version("2.0.2", sha256="6860b5b7046ef349c2fdad4ba3aecb57c7516fba952a19e3ff7cccb7f859f881") diff --git a/var/spack/repos/builtin/packages/r-pkgconfig/package.py b/var/spack/repos/builtin/packages/r-pkgconfig/package.py index 183cedaaaf5826..35e3a41b7bfd3d 100644 --- a/var/spack/repos/builtin/packages/r-pkgconfig/package.py +++ b/var/spack/repos/builtin/packages/r-pkgconfig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPkgconfig(RPackage): cran = "pkgconfig" + license("MIT") + version("2.0.3", sha256="330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850") version("2.0.2", sha256="25997754d1adbe7a251e3bf9879bb52dced27dd8b84767d558f0f644ca8d69ca") version("2.0.1", sha256="ab02b2a4b639ba94dcba882a059fe9cddae5498a4309841f764b62ec46ba5a40") diff --git a/var/spack/repos/builtin/packages/r-pkgdepends/package.py b/var/spack/repos/builtin/packages/r-pkgdepends/package.py index ca11fd640c2a1f..73ba6e593b87db 100644 --- a/var/spack/repos/builtin/packages/r-pkgdepends/package.py +++ b/var/spack/repos/builtin/packages/r-pkgdepends/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RPkgdepends(RPackage): cran = "pkgdepends" + license("MIT") + version("0.5.0", sha256="eadc98e335f9d2cc10b31cf7a5b55fe3308266fbd6f46d5dbd37b5d90bfcf1bc") version("0.3.2", sha256="61db529965f973847b4d1337c6556527a89953cad09d231a6e6ca2145a426a21") version("0.3.1", sha256="8e4263a1792871ee9629b0d6a8caeb53b77012db3b5be91b432f3553cd2a80be") diff --git a/var/spack/repos/builtin/packages/r-pkgdown/package.py b/var/spack/repos/builtin/packages/r-pkgdown/package.py index 71cfcbc3d18654..14cb41076c0d5e 100644 --- a/var/spack/repos/builtin/packages/r-pkgdown/package.py +++ b/var/spack/repos/builtin/packages/r-pkgdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPkgdown(RPackage): cran = "pkgdown" + license("MIT") + version("2.0.7", sha256="f33872869dfa8319182d87e90eab3245ff69293b3b791471bf9538afb81b356a") version("2.0.6", sha256="d29a65c8a5b189fd89842e769f58f8c2369a55406269eabfb66d41d0fe1c7f69") diff --git a/var/spack/repos/builtin/packages/r-pkgload/package.py b/var/spack/repos/builtin/packages/r-pkgload/package.py index cc787a3b452b75..0ad45d99b548db 100644 --- a/var/spack/repos/builtin/packages/r-pkgload/package.py +++ b/var/spack/repos/builtin/packages/r-pkgload/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPkgload(RPackage): cran = "pkgload" + license("GPL-3.0-only") + version("1.3.2", sha256="35d19a032bfeeefcab92d76a768b4a420c2ede0920badaf48cca878592b46b2f") version("1.3.1", sha256="c6b8b70d7b7e194e7d44a42364f0362e971d9ab9c5794c4ae5ed4f9e61b1679a") version("1.3.0", sha256="5af653c901662260cc221971cc968355428cc6183b61c15be80aa9545f9f4228") diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index ce76a61b2dcaf8..47efa743ec4041 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPkgmaker(RPackage): cran = "pkgmaker" + license("GPL-2.0-or-later") + version("0.32.8", sha256="0ff3578d2c051b544c3f105cfe4801575aac1564add048f9e952c53a8ccd1745") version("0.32.2", sha256="ce45b22def771a9c90a414093823e6befe7e23489c500eeccee5154b44d3ef91") version("0.27", sha256="17a289d8f596ba5637b07077b3bff22411a2c2263c0b7de59fe848666555ec6a") diff --git a/var/spack/repos/builtin/packages/r-pl94171/package.py b/var/spack/repos/builtin/packages/r-pl94171/package.py index 6cd51f523e701c..e3a876dc2f2a57 100644 --- a/var/spack/repos/builtin/packages/r-pl94171/package.py +++ b/var/spack/repos/builtin/packages/r-pl94171/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-plogr/package.py b/var/spack/repos/builtin/packages/r-plogr/package.py index 768f0521dae0e5..e539421a375ef8 100644 --- a/var/spack/repos/builtin/packages/r-plogr/package.py +++ b/var/spack/repos/builtin/packages/r-plogr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RPlogr(RPackage): cran = "plogr" + license("MIT") + version("0.2.0", sha256="0e63ba2e1f624005fe25c67cdd403636a912e063d682eca07f2f1d65e9870d29") version("0.1-1", sha256="22755c93c76c26252841f43195df31681ea865e91aa89726010bd1b9288ef48f") diff --git a/var/spack/repos/builtin/packages/r-plot3d/package.py b/var/spack/repos/builtin/packages/r-plot3d/package.py index 9a023b36a0aea9..0ba526522a76cd 100644 --- a/var/spack/repos/builtin/packages/r-plot3d/package.py +++ b/var/spack/repos/builtin/packages/r-plot3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-plotly/package.py b/var/spack/repos/builtin/packages/r-plotly/package.py index 41a6053afdade4..9b266588fdf4d4 100644 --- a/var/spack/repos/builtin/packages/r-plotly/package.py +++ b/var/spack/repos/builtin/packages/r-plotly/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPlotly(RPackage): cran = "plotly" + license("MIT") + version("4.10.1", sha256="ac0921a1cba24e17a0f3a0a28b7a40ac930e17fe5caa9c3973c9a8d1e20c367a") version("4.10.0", sha256="bd995c654dbc8c09a84adaba8def99766919e3894caf18b551bb26b2f591389a") version("4.9.3", sha256="d44d1a16d96de28bc2d36f1c897384215eeec44d109546c6e9c2707db0880120") diff --git a/var/spack/repos/builtin/packages/r-plotmo/package.py b/var/spack/repos/builtin/packages/r-plotmo/package.py index 8d384581e59b2f..de5de683ee83b4 100644 --- a/var/spack/repos/builtin/packages/r-plotmo/package.py +++ b/var/spack/repos/builtin/packages/r-plotmo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPlotmo(RPackage): cran = "plotmo" + license("GPL-3.0-only") + version("3.6.2", sha256="cde33a8ec558b12d8e11d7d0531e73f6678a25ee589b79897d2fc425a3fd353c") version("3.6.1", sha256="245a0c87f0cca08746c6fdc60da2e3856cd69b1a2b7b5641293c620d4ae04343") version("3.6.0", sha256="c05afcc442f9542868beea5c3c40fb93b049f9b61c42725b2a1e2bc750c241e3") diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index da8a3707df8472..9a74b4ceb74b53 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RPlotrix(RPackage): cran = "plotrix" + license("GPL-2.0-or-later") + version("3.8-2", sha256="bb72953102889cea41cd6521874e35d2458ebd10aab97ba6f262e102cac0bc1f") version("3.7-8", sha256="8ccd1f7e656413b9956cea614c986ce9cc61366deba356afb38cee6672a59480") version("3.7-6", sha256="83d5f7574592953288b4fe39c4c0dd7670d097598ad7f6bddbb0687a32954e46") diff --git a/var/spack/repos/builtin/packages/r-pls/package.py b/var/spack/repos/builtin/packages/r-pls/package.py index 2986e6fc0567b2..b5cdc6df154562 100644 --- a/var/spack/repos/builtin/packages/r-pls/package.py +++ b/var/spack/repos/builtin/packages/r-pls/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPls(RPackage): cran = "pls" + license("GPL-2.0-only") + version("2.8-1", sha256="e22e7febeef1a6800b97ee7f6eb03dc1d6681aba7f9298449c9e6375fa78f28c") version("2.8-0", sha256="eff3a92756ca34cdc1661fa36d2bf7fc8e9f4132d2f1ef9ed0105c83594618bf") version("2.7-3", sha256="8f1d960ab74f05fdd11c4c7a3d30ff9e263fc658f5690b67278ca7c045d0742c") diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index 58ef9fc24a05eb..e0cd4ca9f3acf7 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPlyr(RPackage): cran = "plyr" + license("MIT") + version("1.8.8", sha256="a73211b4bbe13e4e5e764966a8dd90172c1cc311938dd464d142e1c7a701070c") version("1.8.7", sha256="7d9fdaf1157035a49c3661da3bbaa7bfcf782aafe1b98f7b5a68b0520046e87f") version("1.8.6", sha256="ea55d26f155443e9774769531daa5d4c20a0697bb53abd832e891b126c935287") diff --git a/var/spack/repos/builtin/packages/r-pmcmr/package.py b/var/spack/repos/builtin/packages/r-pmcmr/package.py index c70a529968e9d7..507578c2db2e0b 100644 --- a/var/spack/repos/builtin/packages/r-pmcmr/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-pmcmrplus/package.py b/var/spack/repos/builtin/packages/r-pmcmrplus/package.py index fee0c7cfa0d4d3..047b2bffa94bc5 100644 --- a/var/spack/repos/builtin/packages/r-pmcmrplus/package.py +++ b/var/spack/repos/builtin/packages/r-pmcmrplus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index 97ead7b24b3abe..41950df3dc5469 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPng(RPackage): cran = "png" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.1-8", sha256="5a36fabb6d62ba2533d3fc4cececd07891942cfb76fe689ec0d550d08762f61c") version("0.1-7", sha256="e269ff968f04384fc9421d17cfc7c10cf7756b11c2d6d126e9776f5aca65553c") diff --git a/var/spack/repos/builtin/packages/r-polspline/package.py b/var/spack/repos/builtin/packages/r-polspline/package.py index 15fb19d20d8a86..ed627a8781b775 100644 --- a/var/spack/repos/builtin/packages/r-polspline/package.py +++ b/var/spack/repos/builtin/packages/r-polspline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPolspline(RPackage): cran = "polspline" + license("GPL-2.0-or-later") + version("1.1.22", sha256="b2f2198f020d7d492a87bad2b58a6cc9ae91d95b7330dd12b9b1145c72d7457b") version("1.1.20", sha256="6992484e9e41036debef1e705e26959f8f5c7a68d3e1fda58273d2a72297a1b5") version("1.1.19", sha256="953e3c4d007c3ef86ac2af3c71b272a99e8e35b194bdd58575785558c6711f66") diff --git a/var/spack/repos/builtin/packages/r-polyclip/package.py b/var/spack/repos/builtin/packages/r-polyclip/package.py index d179673e7d1396..55c5ff6f81d59f 100644 --- a/var/spack/repos/builtin/packages/r-polyclip/package.py +++ b/var/spack/repos/builtin/packages/r-polyclip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPolyclip(RPackage): cran = "polyclip" + license("BSL-1.0") + version("1.10-4", sha256="84d2c9778771d3759b49d7d16fb54c8ddc5397da3b1d21074bc4aa42c02e6f56") version("1.10-0", sha256="74dabc0dfe5a527114f0bb8f3d22f5d1ae694e6ea9345912909bae885525d34b") diff --git a/var/spack/repos/builtin/packages/r-polynom/package.py b/var/spack/repos/builtin/packages/r-polynom/package.py index 47dd92cd0899c0..43339726ebc3f4 100644 --- a/var/spack/repos/builtin/packages/r-polynom/package.py +++ b/var/spack/repos/builtin/packages/r-polynom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class RPolynom(RPackage): cran = "polynom" + license("GPL-2.0-only") + version("1.4-1", sha256="bc1edb7bb16c8b299103f80a52ab8c5fc200cd07a9056578c1f672e9f5019278") version("1.4-0", sha256="c5b788b26f7118a18d5d8e7ba93a0abf3efa6603fa48603c70ed63c038d3d4dd") diff --git a/var/spack/repos/builtin/packages/r-pool/package.py b/var/spack/repos/builtin/packages/r-pool/package.py index 53314bd16b4092..56c8ad12266c2f 100644 --- a/var/spack/repos/builtin/packages/r-pool/package.py +++ b/var/spack/repos/builtin/packages/r-pool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPool(RPackage): cran = "pool" + license("MIT") + version("1.0.1", sha256="73d5dffd55e80fdadb88401f12570fcf08e932c4c86761931241f9841fddadbf") version("0.1.6", sha256="cdbe5f6c7f757c01893dc9870df0fb8d300829da0e427f6c2559b01caa52d9e1") diff --git a/var/spack/repos/builtin/packages/r-poorman/package.py b/var/spack/repos/builtin/packages/r-poorman/package.py index 42be59116fe380..ea5c5ac0e4a80b 100644 --- a/var/spack/repos/builtin/packages/r-poorman/package.py +++ b/var/spack/repos/builtin/packages/r-poorman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPoorman(RPackage): cran = "poorman" + license("MIT") + version("0.2.6", sha256="328e0a3e610f17e845d95cd9c0803e0367d6f5835706e8b0ed921fc500983774") version("0.2.5", sha256="b92b30ce0f4f02c4fa4a4e90673ef2e0ed8de9b9080dd064506581989fcc0716") diff --git a/var/spack/repos/builtin/packages/r-popgenome/package.py b/var/spack/repos/builtin/packages/r-popgenome/package.py index d53b3fcefcb912..5c8d55d51a0c2c 100644 --- a/var/spack/repos/builtin/packages/r-popgenome/package.py +++ b/var/spack/repos/builtin/packages/r-popgenome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-popvar/package.py b/var/spack/repos/builtin/packages/r-popvar/package.py index 45c8a3d094ec6a..90c15fa3cb6895 100644 --- a/var/spack/repos/builtin/packages/r-popvar/package.py +++ b/var/spack/repos/builtin/packages/r-popvar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-posterior/package.py b/var/spack/repos/builtin/packages/r-posterior/package.py index 02c82b5804ddaa..4d1c9fdc2c7f1f 100644 --- a/var/spack/repos/builtin/packages/r-posterior/package.py +++ b/var/spack/repos/builtin/packages/r-posterior/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RPosterior(RPackage): cran = "posterior" + license("BSD-3-Clause") + version("1.4.1", sha256="2b8953fa8d6890a105521023c431ddea725465eb95cf9454a88852e43ebb58d3") version("1.3.1", sha256="7000780290a24be86dbc406dd4338aec622d8dee1e471b68b55abb4872934d7a") version("1.2.1", sha256="b757e06885a1f21e7ad8f5a3feaecbe0a71ae8d766e4aec4c3aa2183a810afe1") diff --git a/var/spack/repos/builtin/packages/r-powerlaw/package.py b/var/spack/repos/builtin/packages/r-powerlaw/package.py index 5bd0770573129f..4c664b9d152282 100644 --- a/var/spack/repos/builtin/packages/r-powerlaw/package.py +++ b/var/spack/repos/builtin/packages/r-powerlaw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-prabclus/package.py b/var/spack/repos/builtin/packages/r-prabclus/package.py index bca81c06f35c94..56d94d7ba93d81 100644 --- a/var/spack/repos/builtin/packages/r-prabclus/package.py +++ b/var/spack/repos/builtin/packages/r-prabclus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RPrabclus(RPackage): cran = "prabclus" + license("GPL-2.0-or-later") + version("2.3-2", sha256="f421bcbcb557281e0de4a06b15f9a496adb5c640e883c0f7bb12051efc69e441") version("2.3-1", sha256="ef3294767d43bc3f72478fdaf0d1f13c8de18881bf9040c9f1add68af808b3c0") version("2.2-7.1", sha256="2c5bf3bbb0d225e04c53bb0e11e9c2a6809f0e46d95b8f6dc14b9dd6a2452975") diff --git a/var/spack/repos/builtin/packages/r-pracma/package.py b/var/spack/repos/builtin/packages/r-pracma/package.py index bdd4920f36d2df..2d4858d429a0b6 100644 --- a/var/spack/repos/builtin/packages/r-pracma/package.py +++ b/var/spack/repos/builtin/packages/r-pracma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RPracma(RPackage): cran = "pracma" + license("GPL-3.0-or-later") + version("2.4.2", sha256="1d50337fdfd9a8d704a64f01dae5d52b9a2bd6d872fdaa4a6685b8d3bde89c16") version("2.3.8", sha256="2302d454406e72711714732658d0c59c9d5a1ead698f22ee23f38cba63d42764") version("2.3.6", sha256="17ac83fd48c9155e00dc3f0433f95723505dc73d046860afd9001866d699b8de") diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index 5656f8f73b83d2..0b51540adee1e8 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class RPraise(RPackage): cran = "praise" + license("MIT") + version("1.0.0", sha256="5c035e74fd05dfa59b03afe0d5f4c53fbf34144e175e90c53d09c6baedf5debd") diff --git a/var/spack/repos/builtin/packages/r-preprocesscore/package.py b/var/spack/repos/builtin/packages/r-preprocesscore/package.py index c6c9f5ece43b80..080ff674cad4ba 100644 --- a/var/spack/repos/builtin/packages/r-preprocesscore/package.py +++ b/var/spack/repos/builtin/packages/r-preprocesscore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-prettydoc/package.py b/var/spack/repos/builtin/packages/r-prettydoc/package.py index b7c5e548b7c602..21b67b67ab7d1a 100644 --- a/var/spack/repos/builtin/packages/r-prettydoc/package.py +++ b/var/spack/repos/builtin/packages/r-prettydoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-prettyunits/package.py b/var/spack/repos/builtin/packages/r-prettyunits/package.py index fc95c38fe74edf..b3b317d3f601c9 100644 --- a/var/spack/repos/builtin/packages/r-prettyunits/package.py +++ b/var/spack/repos/builtin/packages/r-prettyunits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPrettyunits(RPackage): cran = "prettyunits" + license("MIT") + version("1.1.1", sha256="9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5") version("1.0.2", sha256="35a4980586c20650538ae1e4fed4d80fdde3f212b98546fc3c7d9469a1207f5c") diff --git a/var/spack/repos/builtin/packages/r-proc/package.py b/var/spack/repos/builtin/packages/r-proc/package.py index ce09c424e89db8..eb2a3ee026af54 100644 --- a/var/spack/repos/builtin/packages/r-proc/package.py +++ b/var/spack/repos/builtin/packages/r-proc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-processx/package.py b/var/spack/repos/builtin/packages/r-processx/package.py index 01771aa7fd6535..cf92432de3a65a 100644 --- a/var/spack/repos/builtin/packages/r-processx/package.py +++ b/var/spack/repos/builtin/packages/r-processx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RProcessx(RPackage): cran = "processx" + license("MIT") + version("3.8.1", sha256="e008472b81d4ca1a37a4ba7dd58e5e944f96ab2e44c8ccc8840d43e9fe99e93c") version("3.8.0", sha256="9270d9d26c4314151062801a5c1fc57556b4fcb41dbf3558cb5bd230b18ffb0b") version("3.7.0", sha256="de6a8d4135fc53ec35043fbaf6b000dc9597719345595d8479662a39dad55ed3") diff --git a/var/spack/repos/builtin/packages/r-prodlim/package.py b/var/spack/repos/builtin/packages/r-prodlim/package.py index 497ffc911fd1a1..617aa47649a6d4 100644 --- a/var/spack/repos/builtin/packages/r-prodlim/package.py +++ b/var/spack/repos/builtin/packages/r-prodlim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RProdlim(RPackage): cran = "prodlim" + license("GPL-2.0-or-later") + version( "2023.03.31", sha256="5510454f8511ca956666f27dfb77d875c56b9166188c33f22cd22b7615797800" ) diff --git a/var/spack/repos/builtin/packages/r-profvis/package.py b/var/spack/repos/builtin/packages/r-profvis/package.py index ddaa241f9317d1..709aca7e825642 100644 --- a/var/spack/repos/builtin/packages/r-profvis/package.py +++ b/var/spack/repos/builtin/packages/r-profvis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RProfvis(RPackage): cran = "profvis" + license("GPL-3.0-only OR custom") + version("0.3.7", sha256="43974863cb793f81dbea4b94096343c321f7739c9038980405c9b16b04a906b9") depends_on("r@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-progress/package.py b/var/spack/repos/builtin/packages/r-progress/package.py index 9b0a65d7b65cf4..d3f41e6548513e 100644 --- a/var/spack/repos/builtin/packages/r-progress/package.py +++ b/var/spack/repos/builtin/packages/r-progress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RProgress(RPackage): cran = "progress" + license("MIT") + version("1.2.2", sha256="b4a4d8ed55db99394b036a29a0fb20b5dd2a91c211a1d651c52a1023cc58ff35") version("1.2.1", sha256="7401e86ff76bef4d26508b74ee8bd169a0377b2738d9ec79ebff0b7fd5c55326") version("1.1.2", sha256="a9f4abfd9579b80967cd681041643fe9dfcc4eb3beeba45391bb64e9209baabb") diff --git a/var/spack/repos/builtin/packages/r-progressr/package.py b/var/spack/repos/builtin/packages/r-progressr/package.py index 738f5ca669a1d1..457a09c4b0304a 100644 --- a/var/spack/repos/builtin/packages/r-progressr/package.py +++ b/var/spack/repos/builtin/packages/r-progressr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,8 @@ class RProgressr(RPackage): cran = "progressr" + license("GPL-3.0-or-later") + version("0.13.0", sha256="0ffb3dcadde0cc191bad0ff9e05d000aa65e2fc339cfc94ebbb263088df5a4e1") version("0.11.0", sha256="d8668c82348a20cca34bb18c0c94e6083dbb6dbea40615e07e4161aff7366cd9") version("0.10.1", sha256="8f83024b2a6f52996750d45bf6698c2b438fb1062985f1df936ba3af313caed1") diff --git a/var/spack/repos/builtin/packages/r-proj/package.py b/var/spack/repos/builtin/packages/r-proj/package.py index bd08ac316f3cd5..78463c53d97f0b 100644 --- a/var/spack/repos/builtin/packages/r-proj/package.py +++ b/var/spack/repos/builtin/packages/r-proj/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-proj4/package.py b/var/spack/repos/builtin/packages/r-proj4/package.py index 1dff0eef612d3c..d0d6d029850a53 100644 --- a/var/spack/repos/builtin/packages/r-proj4/package.py +++ b/var/spack/repos/builtin/packages/r-proj4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RProj4(RPackage): cran = "proj4" + license("GPL-2.0-only") + version("1.0-12", sha256="4aeb8a54d5b459674093c76068b92dbd3ce99a4e5db8829fbae868c2e43776f8") version("1.0-11", sha256="c5f186530267005d53cc2e86849613b254ca4515a8b10310146f712d45a1d11d") version("1.0-10.1", sha256="66857cbe5cba4930b18621070f9a7263ea0d8ddc3e5a035a051a1496e4e1da19") diff --git a/var/spack/repos/builtin/packages/r-projpred/package.py b/var/spack/repos/builtin/packages/r-projpred/package.py index 6b003660f3b9b2..35c3befa538c65 100644 --- a/var/spack/repos/builtin/packages/r-projpred/package.py +++ b/var/spack/repos/builtin/packages/r-projpred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RProjpred(RPackage): cran = "projpred" + license("GPL-3.0-only OR custom") + version("2.5.0", sha256="b6ec123f5bf573d14cbd5431e3fbdee3215d71d3e263fcbec72bee5930044e39") version("2.2.1", sha256="6825ace07d1e580d5916bcd6bfd163460ae9008926f464e00deb7f2395cc72ad") version("2.1.2", sha256="a88a651e533c118aad0e8c2c905cfcf688d9c419ed195896036b8f6667b5cfb0") diff --git a/var/spack/repos/builtin/packages/r-promises/package.py b/var/spack/repos/builtin/packages/r-promises/package.py index b0c4deac23e74a..32016c25724495 100644 --- a/var/spack/repos/builtin/packages/r-promises/package.py +++ b/var/spack/repos/builtin/packages/r-promises/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RPromises(RPackage): cran = "promises" + license("MIT") + version("1.2.0.1", sha256="8d3a8217909e91f4c2a2eebba5ac8fc902a9ac1a9e9d8a30815c9dc0f162c4b7") version("1.1.1", sha256="3718c6eb2c3362cbe89389e613118f783f9977dbf24757f85026e661199c5800") version("1.0.1", sha256="c2dbc7734adf009377a41e570dfe0d82afb91335c9d0ca1ef464b9bdcca65558") diff --git a/var/spack/repos/builtin/packages/r-protgenerics/package.py b/var/spack/repos/builtin/packages/r-protgenerics/package.py index 75271dd5c814fd..235cd1b55cba44 100644 --- a/var/spack/repos/builtin/packages/r-protgenerics/package.py +++ b/var/spack/repos/builtin/packages/r-protgenerics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 696250d919727f..a7cb8906f2f962 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class RProto(RPackage): cran = "proto" + license("GPL-2.0-only") + version("1.0.0", sha256="9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1") version("0.3-10", sha256="d0d941bfbf247879b3510c8ef3e35853b1fbe83ff3ce952e93d3f8244afcbb0e") diff --git a/var/spack/repos/builtin/packages/r-proxy/package.py b/var/spack/repos/builtin/packages/r-proxy/package.py index 010fa2fee44c56..52f3d7809fbbc7 100644 --- a/var/spack/repos/builtin/packages/r-proxy/package.py +++ b/var/spack/repos/builtin/packages/r-proxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RProxy(RPackage): cran = "proxy" + license("GPL-2.0-only") + version("0.4-27", sha256="249991a4c4d70ad139e93f3a24e17f161ad1ec854951813ea192daf79478563f") version("0.4-26", sha256="676bad821343974e0297a0566c4bf0cf0ea890104906a745b87d3b5989c81a4d") version("0.4-24", sha256="8cff9bf036475941a7c44ba9bb5e2f6d4777d49ab3daaeb52d23f4b2af6d9c7c") diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index 97b66d3d15d366..80240fa83d64f0 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RPryr(RPackage): cran = "pryr" + license("GPL-2.0-only") + version("0.1.6", sha256="68c1a30a42808eb01a64d31e521d21f2fd5a88dd2c14d05b4b7986d27a177704") version("0.1.5", sha256="7b1653ec51850f4633cee8e2eb7d0b2724fb587b801539488b426cf88f0f770b") version("0.1.4", sha256="d39834316504c49ecd4936cbbcaf3ee3dae6ded287af42475bf38c9e682f721b") diff --git a/var/spack/repos/builtin/packages/r-ps/package.py b/var/spack/repos/builtin/packages/r-ps/package.py index fd5c29cfe23cb6..89612d8233e912 100644 --- a/var/spack/repos/builtin/packages/r-ps/package.py +++ b/var/spack/repos/builtin/packages/r-ps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RPs(RPackage): cran = "ps" + license("MIT") + version("1.7.5", sha256="1abc3ae3c55797b994973f7e43bf5c7bbb4da649a0dcfad36675e196dba4cb4e") version("1.7.2", sha256="9225ebdedb5c1b245bb38b01ce88084c0fc7eafcff6c4fda2e299003ace6b21a") version("1.7.1", sha256="9c458a377d47cc972d3cd0b2a17d0b7ad3cf3b62226410803072089a57a55ef1") diff --git a/var/spack/repos/builtin/packages/r-pscbs/package.py b/var/spack/repos/builtin/packages/r-pscbs/package.py index 3b285a96de0f3d..1ac75ed63a739c 100644 --- a/var/spack/repos/builtin/packages/r-pscbs/package.py +++ b/var/spack/repos/builtin/packages/r-pscbs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-pspline/package.py b/var/spack/repos/builtin/packages/r-pspline/package.py index 7c462be7b417e0..03e2140fe43033 100644 --- a/var/spack/repos/builtin/packages/r-pspline/package.py +++ b/var/spack/repos/builtin/packages/r-pspline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RPspline(RPackage): cran = "pspline" + license("custom") + version("1.0-19", sha256="ba55bf193f1df9785a0e13b7ef727d5fd2415b318cd6a26b48a2db490c4dfe40") version("1.0-18", sha256="f71cf293bd5462e510ac5ad16c4a96eda18891a0bfa6447dd881c65845e19ac7") diff --git a/var/spack/repos/builtin/packages/r-psych/package.py b/var/spack/repos/builtin/packages/r-psych/package.py index 53e56459d58aa2..c474110e1e4fbe 100644 --- a/var/spack/repos/builtin/packages/r-psych/package.py +++ b/var/spack/repos/builtin/packages/r-psych/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RPsych(RPackage): cran = "psych" + license("GPL-2.0-or-later") + version("2.3.3", sha256="94a9f3c39f8243573752709b89eb8068e11dbe809f86ecf0225fb429556efb6f") version("2.2.9", sha256="4cd518bff387fef95067696b0a0b323310e6f4a063c3d242f2a50bcb17675571") version("2.2.5", sha256="dcc3f9b30ed44dfd1de0366295a308e0b52959eb7ac9cb3bc3f32dc5b15fc321") diff --git a/var/spack/repos/builtin/packages/r-ptw/package.py b/var/spack/repos/builtin/packages/r-ptw/package.py index 874a1405ec349e..7d753a046706f1 100644 --- a/var/spack/repos/builtin/packages/r-ptw/package.py +++ b/var/spack/repos/builtin/packages/r-ptw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RPtw(RPackage): cran = "ptw" + license("GPL-2.0-or-later") + version("1.9-16", sha256="7e87c34b9eeaeabe3bfb937162e6cda4dd48d6bd6a97b9db8bb8303d131caa66") version("1.9-15", sha256="22fa003f280bc000f46bca88d69bf332b29bc68435115ba8044533b70bfb7b46") version("1.9-13", sha256="7855e74a167db3d3eba9df9d9c3daa25d7cf487cbcfe8b095f16d96eba862f46") diff --git a/var/spack/repos/builtin/packages/r-purrr/package.py b/var/spack/repos/builtin/packages/r-purrr/package.py index a653ca347b9b3a..b0b1acc7091c01 100644 --- a/var/spack/repos/builtin/packages/r-purrr/package.py +++ b/var/spack/repos/builtin/packages/r-purrr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RPurrr(RPackage): cran = "purrr" + license("MIT") + version("1.0.1", sha256="0a7911be3539355a4c40d136f2602befcaaad5a3f7222078500bfb969a6f2ba2") version("0.3.5", sha256="a2386cd7e78a043cb9c14703023fff15ab1c879bf648816879d2c0c4a554fcef") version("0.3.4", sha256="23ebc93bc9aed9e7575e8eb9683ff4acc0270ef7d6436cc2ef4236a9734840b2") diff --git a/var/spack/repos/builtin/packages/r-pvclust/package.py b/var/spack/repos/builtin/packages/r-pvclust/package.py index 7c770f3632c4b0..38e73d15507492 100644 --- a/var/spack/repos/builtin/packages/r-pvclust/package.py +++ b/var/spack/repos/builtin/packages/r-pvclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RPvclust(RPackage): cran = "pvclust" + license("GPL-2.0-or-later") + version("2.2-0", sha256="7892853bacd413b5a921006429641ad308a344ca171b3081c15e4c522a8b0201") depends_on("r@2.10.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-qqconf/package.py b/var/spack/repos/builtin/packages/r-qqconf/package.py index a4a5af737fb710..1637124429addd 100644 --- a/var/spack/repos/builtin/packages/r-qqconf/package.py +++ b/var/spack/repos/builtin/packages/r-qqconf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RQqconf(RPackage): cran = "qqconf" + license("GPL-3.0-only") + version("1.3.2", sha256="9405d627adf9447a003e14dac43701ea3e03ee73244038aa4a6e3dd324dd8ea3") version("1.3.0", sha256="1c42ab81403568f3ad53217cc85190dad7c2fae957bfd0f0f30d57be0a065087") version("1.2.3", sha256="9b5b6042ea8e52e6e049807c0b5e3bfd534b624bd257be769de69cf505fece62") diff --git a/var/spack/repos/builtin/packages/r-qs/package.py b/var/spack/repos/builtin/packages/r-qs/package.py index 0eac6681990d17..a4c64566a1692d 100644 --- a/var/spack/repos/builtin/packages/r-qs/package.py +++ b/var/spack/repos/builtin/packages/r-qs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RQs(RPackage): maintainers("dorton21") + license("GPL-3.0-only") + version("0.25.5", sha256="3f87388708a0fdfb0e68caade75ed771fd395cb4f649973459bc97f41d42064c") version("0.25.4", sha256="92c49206a9c1c66dbd95f12efc3a57acb728e1f8387b549c437519fb2b98a533") version("0.25.3", sha256="51adf6a112c19f78ceeefa55acf800c7e6bf2664e7d9cea9d932abb24f22be6b") diff --git a/var/spack/repos/builtin/packages/r-qtl/package.py b/var/spack/repos/builtin/packages/r-qtl/package.py index 754f8887e4a9e5..9497f5aa513466 100644 --- a/var/spack/repos/builtin/packages/r-qtl/package.py +++ b/var/spack/repos/builtin/packages/r-qtl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RQtl(RPackage): cran = "qtl" + license("GPL-3.0-only") + version("1.60", sha256="8e9e5dfe2c6a76d4f69fb27add93ed0859ed3eaa23347310c2b9e3f07359d8ad") version("1.58", sha256="6eca5ac177ae62304d63c224f161b0f3ac9327ec1a03da5d7df2d5ddf4b09d97") version("1.52", sha256="320ac6172f2911ee772472becd68ff49a357c99fe7454335e4a19090d5788960") diff --git a/var/spack/repos/builtin/packages/r-quadprog/package.py b/var/spack/repos/builtin/packages/r-quadprog/package.py index e4dc8225834540..91319e9e8f492d 100644 --- a/var/spack/repos/builtin/packages/r-quadprog/package.py +++ b/var/spack/repos/builtin/packages/r-quadprog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RQuadprog(RPackage): cran = "quadprog" + license("GPL-2.0-or-later") + version("1.5-8", sha256="22128dd6b08d3516c44ff89276719ad4fe46b36b23fdd585274fa3a93e7a49cd") version("1.5-7", sha256="1af41e57df6f2d08ee8b72a1a5ada137beadb36c7ec9ab9bdb7c05226e8ae76d") version("1.5-6", sha256="1443e5ffdf884b13dd454e4f6aa260fce6ec47e6845d85b62238c206ce57dcba") diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index 385125f690992e..2368def60f5c28 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RQuantmod(RPackage): cran = "quantmod" + license("GPL-3.0-only") + version("0.4.22", sha256="f29496f1ca9a9faf91aba70ac50bfe79303197ca8f1e369c96300005b5e6765e") version("0.4.20", sha256="f757df41595d885f7927e18f4835bc233d78d2d3ae48fd11c8874d4338c48e94") version("0.4.18", sha256="aa40448e93a1facf399213ac691784007731e869ad243fe762381ab099cd6c35") diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index 7a17e47142dfb2..9bff357602bb1e 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RQuantreg(RPackage): cran = "quantreg" + license("GPL-2.0-or-later") + version("5.95", sha256="4b05a81eceebbd927372cefdc4912dfa70b6dfcd96528489f78e125eb32a96cc") version("5.94", sha256="52d585ccb972ed7726b7d083f5635d3e42915847398e00fd6e0f69a5fe1b17c1") version("5.93", sha256="d4a94984a500bf4c92dec21013441f001a4aa0541c4c651384e257a4b4e9e539") diff --git a/var/spack/repos/builtin/packages/r-quantro/package.py b/var/spack/repos/builtin/packages/r-quantro/package.py index 1811b7b9eb2fc8..b5b919a2ca5c9d 100644 --- a/var/spack/repos/builtin/packages/r-quantro/package.py +++ b/var/spack/repos/builtin/packages/r-quantro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-questionr/package.py b/var/spack/repos/builtin/packages/r-questionr/package.py index 6c2c35226cf834..f4f5c1b78ee863 100644 --- a/var/spack/repos/builtin/packages/r-questionr/package.py +++ b/var/spack/repos/builtin/packages/r-questionr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RQuestionr(RPackage): cran = "questionr" + license("GPL-2.0-or-later") + version("0.7.8", sha256="af72e59fe652c6063282a7e5b0f487993b9361cc9ed052a632d64a5a6db76ba9") version("0.7.7", sha256="ce24c40bd98dbeca615b9eb2a9cd2da26852821dc3840f8394eeecb0739dfd56") version("0.7.6", sha256="4b71d049d9e032157e12a7809dbfa2a39262b49d0c7a03ed434791a66f0cee5e") diff --git a/var/spack/repos/builtin/packages/r-quickplot/package.py b/var/spack/repos/builtin/packages/r-quickplot/package.py index 016199d6e36975..7cb0c274698a23 100644 --- a/var/spack/repos/builtin/packages/r-quickplot/package.py +++ b/var/spack/repos/builtin/packages/r-quickplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-qvalue/package.py b/var/spack/repos/builtin/packages/r-qvalue/package.py index defcc31eb60d78..b2daa7f96c9f8e 100644 --- a/var/spack/repos/builtin/packages/r-qvalue/package.py +++ b/var/spack/repos/builtin/packages/r-qvalue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-r-cache/package.py b/var/spack/repos/builtin/packages/r-r-cache/package.py index 1d402bd4ffbdc6..5cfe601c39e4f2 100644 --- a/var/spack/repos/builtin/packages/r-r-cache/package.py +++ b/var/spack/repos/builtin/packages/r-r-cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-r-methodss3/package.py b/var/spack/repos/builtin/packages/r-r-methodss3/package.py index 18c9170d7ccb4c..6f1d3d42a34809 100644 --- a/var/spack/repos/builtin/packages/r-r-methodss3/package.py +++ b/var/spack/repos/builtin/packages/r-r-methodss3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-r-oo/package.py b/var/spack/repos/builtin/packages/r-r-oo/package.py index 4548779de9c15b..f15782b3bc3523 100644 --- a/var/spack/repos/builtin/packages/r-r-oo/package.py +++ b/var/spack/repos/builtin/packages/r-r-oo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-r-utils/package.py b/var/spack/repos/builtin/packages/r-r-utils/package.py index 1a7787a32fac4c..e673eb37572acc 100644 --- a/var/spack/repos/builtin/packages/r-r-utils/package.py +++ b/var/spack/repos/builtin/packages/r-r-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-r6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py index ab9a905d42c13a..12668e15ff13b3 100644 --- a/var/spack/repos/builtin/packages/r-r6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-radialmr/package.py b/var/spack/repos/builtin/packages/r-radialmr/package.py index 301bd60fc17b0f..9616a32f69de24 100644 --- a/var/spack/repos/builtin/packages/r-radialmr/package.py +++ b/var/spack/repos/builtin/packages/r-radialmr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRadialmr(RPackage): homepage = "https://github.com/WSpiller/RadialMR" git = "https://github.com/WSpiller/RadialMR" + license("GPL-3.0-or-later") + version("1.0", commit="d63d3fc8270836ab441b9e14a5ba3eeb2795d7cb") depends_on("r@3.5.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-ragg/package.py b/var/spack/repos/builtin/packages/r-ragg/package.py index 634bca5a1b5abd..0d0abcb60c0d6e 100644 --- a/var/spack/repos/builtin/packages/r-ragg/package.py +++ b/var/spack/repos/builtin/packages/r-ragg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRagg(RPackage): cran = "ragg" + license("MIT") + version("1.2.5", sha256="936f4d75e0e01cdeefb9f57d121cdd7812d0de5a9e1a3a8315f92ce1c84da8f9") version("1.2.4", sha256="c547e5636a2eefaa0021a0d50fad1e813c2ce976ec0c9c3f796d38a110680dcd") version("1.2.3", sha256="976da0007ef0d4dbadda4734727b539671b65c1eff4ff392d734f4e2c846f2b2") diff --git a/var/spack/repos/builtin/packages/r-rainbow/package.py b/var/spack/repos/builtin/packages/r-rainbow/package.py index 82467a0fc176e1..c5c88b9ca79239 100644 --- a/var/spack/repos/builtin/packages/r-rainbow/package.py +++ b/var/spack/repos/builtin/packages/r-rainbow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRainbow(RPackage): cran = "rainbow" + license("GPL-3.0-only") + version("3.7", sha256="159dd90555eee237397f042d811f773aaee779f5036c4e0669a52c36e28d8db2") version("3.6", sha256="63d1246f88a498f3db0321b46a552163631b288a25b24400935db41326636e87") diff --git a/var/spack/repos/builtin/packages/r-randomfields/package.py b/var/spack/repos/builtin/packages/r-randomfields/package.py index fd7e7b7c4a5e38..cce5a491bfe55f 100644 --- a/var/spack/repos/builtin/packages/r-randomfields/package.py +++ b/var/spack/repos/builtin/packages/r-randomfields/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py b/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py index 369213c6ca87b2..5385ee1342ce55 100644 --- a/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py +++ b/var/spack/repos/builtin/packages/r-randomfieldsutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 10e0104d38c209..5349bc60c23864 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRandomforest(RPackage): cran = "randomForest" + license("GPL-2.0-or-later") + version("4.7-1.1", sha256="f59ea87534480edbcd6baf53d7ec57e8c69f4532c2d2528eacfd48924efa2cd6") version("4.6-14", sha256="f4b88920419eb0a89d0bc5744af0416d92d112988702dc726882394128a8754d") version("4.6-12", sha256="6e512f8f88a51c01a918360acba61f1f39432f6e690bc231b7864218558b83c4") diff --git a/var/spack/repos/builtin/packages/r-randomglm/package.py b/var/spack/repos/builtin/packages/r-randomglm/package.py index bf23fba9c46d33..f7626552ee4b17 100644 --- a/var/spack/repos/builtin/packages/r-randomglm/package.py +++ b/var/spack/repos/builtin/packages/r-randomglm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-ranger/package.py b/var/spack/repos/builtin/packages/r-ranger/package.py index 77bf3834a30d05..a952be3532d2af 100644 --- a/var/spack/repos/builtin/packages/r-ranger/package.py +++ b/var/spack/repos/builtin/packages/r-ranger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RRanger(RPackage): cran = "ranger" + license("GPL-3.0-only") + version("0.15.1", sha256="4d65d9ee7c5f2704a0e303a27222c02aa53e49f3c28dc0b4451371e37ada2b2e") version("0.14.1", sha256="5d99401d555da1cfb11c70e59d1bb545ce48720073a06a2a32eb396f622dee1b") version("0.13.1", sha256="60934f0accc21edeefddbb4ddebfdd7cd10a3d3e90b31aa2e6e4b7f50d632d0a") diff --git a/var/spack/repos/builtin/packages/r-rann/package.py b/var/spack/repos/builtin/packages/r-rann/package.py index 0fc6ab3466bbe7..b09253a0a3847e 100644 --- a/var/spack/repos/builtin/packages/r-rann/package.py +++ b/var/spack/repos/builtin/packages/r-rann/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rapidjsonr/package.py b/var/spack/repos/builtin/packages/r-rapidjsonr/package.py index 4d5509b18c6072..d8f563d81b1161 100644 --- a/var/spack/repos/builtin/packages/r-rapidjsonr/package.py +++ b/var/spack/repos/builtin/packages/r-rapidjsonr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRapidjsonr(RPackage): cran = "rapidjsonr" + license("MIT") + version("1.2.0", sha256="62c94fcdcf5d0fbdfa2f6168affe526bf547c37c16d94e2e1b78d7bf608eed1f") depends_on("gmake", type="build") diff --git a/var/spack/repos/builtin/packages/r-rapiserialize/package.py b/var/spack/repos/builtin/packages/r-rapiserialize/package.py index 9ca91a6beecd2b..8b4e48ed9b569c 100644 --- a/var/spack/repos/builtin/packages/r-rapiserialize/package.py +++ b/var/spack/repos/builtin/packages/r-rapiserialize/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rappdirs/package.py b/var/spack/repos/builtin/packages/r-rappdirs/package.py index 39b5a279f3ba21..da734837889fe2 100644 --- a/var/spack/repos/builtin/packages/r-rappdirs/package.py +++ b/var/spack/repos/builtin/packages/r-rappdirs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRappdirs(RPackage): cran = "rappdirs" + license("MIT") + version("0.3.3", sha256="49959f65b45b0b189a2792d6c1339bef59674ecae92f8c2ed9f26ff9e488c184") version("0.3.1", sha256="2fd891ec16d28862f65bb57e4a78f77a597930abb59380e757afd8b6c6d3264a") diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index ff3b22d04564d1..1059e36a53431b 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRaster(RPackage): cran = "raster" + license("GPL-3.0-or-later") + version("3.6-20", sha256="7e5be49f4e37a2c14a3b87661b252956643b959146cbdb08e983660c1d59a813") version("3.6-3", sha256="9f06e0f7c36258790a97421b3a26d98c9b6a2cb702f941e58ab0b18f21b0c3c6") version("3.5-15", sha256="29c7d3c5d34284f8b5a2ddc9989fbcf092ce209d5eb5310ebc772b5ebdfdd685") diff --git a/var/spack/repos/builtin/packages/r-rbgl/package.py b/var/spack/repos/builtin/packages/r-rbgl/package.py index 8db4889873b16d..4807eb795d5ead 100644 --- a/var/spack/repos/builtin/packages/r-rbgl/package.py +++ b/var/spack/repos/builtin/packages/r-rbgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRbgl(RPackage): bioc = "RBGL" + license("BSL-1.0") + version("1.76.0", commit="18b7cc5f002435aa83e8b693e7bf269fc0b096a5") version("1.74.0", commit="e698db897b719992a8c0747138735c0e7d9dfb21") version("1.72.0", commit="a86f3102f2795e1ffb530bb061247e3a42ca22f7") diff --git a/var/spack/repos/builtin/packages/r-rbibutils/package.py b/var/spack/repos/builtin/packages/r-rbibutils/package.py index 90a0579f9aa19d..f4c84e16ddf475 100644 --- a/var/spack/repos/builtin/packages/r-rbibutils/package.py +++ b/var/spack/repos/builtin/packages/r-rbibutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRbibutils(RPackage): cran = "rbibutils" + license("GPL-2.0-only") + version("2.2.13", sha256="ac235c60bf191ad1830b93045af1b2fe50a6978f6f63cecc4c514a8ba339efc2") version("2.2.9", sha256="b22c07ff916ec338e5a8c6e7e4302f06c9b88d64ee6a59ee4bf5d83a3d5eff86") version("2.2.8", sha256="f1aecdeeba99042d34de19234238c5bbdc18a26f271f6adf9c9b7e349d50d152") diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index 83050abd76fa0b..2482a54a1b6333 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRbokeh(RPackage): cran = "rbokeh" + license("BSD-3-Clause") + version("0.5.2", sha256="d8c47dbd978efce04e5676a3a91d511517a9bb8fe1859c404bfc9ee0f0bf4ec0") version("0.5.1", sha256="48eba3b238cea2b9aa408d8a48c663564292e76f2ab3f603bc671315a4a75a88") version("0.5.0", sha256="499c3224a7dcaeb4bb60fd645b3ef528a20e59437747a073713941b80cbcebd2") diff --git a/var/spack/repos/builtin/packages/r-rcmdcheck/package.py b/var/spack/repos/builtin/packages/r-rcmdcheck/package.py index a4059f8d8dcfe8..37dc7a2e068333 100644 --- a/var/spack/repos/builtin/packages/r-rcmdcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rcmdcheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRcmdcheck(RPackage): cran = "rcmdcheck" + license("MIT") + version("1.4.0", sha256="bbd4ef7d514b8c2076196a7c4a6041d34623d55fbe73f2771758ce61fd32c9d0") version("1.3.3", sha256="1ab679eb1976d74cd3be5bcad0af7fcc673dbdfd4406bbce32591c8fddfb93b4") diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index 52ecef1ad21504..0fc6e6172ceaee 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index e5eb5c550e81ef..8653f446c46ca7 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppannoy/package.py b/var/spack/repos/builtin/packages/r-rcppannoy/package.py index 9485536c253b2e..3277a206c08a3b 100644 --- a/var/spack/repos/builtin/packages/r-rcppannoy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppannoy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py index b6d56003162e3a..fd7f543b708131 100644 --- a/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py +++ b/var/spack/repos/builtin/packages/r-rcpparmadillo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppblaze/package.py b/var/spack/repos/builtin/packages/r-rcppblaze/package.py index b0919b1c26a527..817b604c3a8b34 100644 --- a/var/spack/repos/builtin/packages/r-rcppblaze/package.py +++ b/var/spack/repos/builtin/packages/r-rcppblaze/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class RRcppblaze(RPackage): cran = "RcppBlaze" + license("BSD-3-Clause") + version("0.2.2", sha256="67550ed8aea12a219047af61b41e5b9f991608a21ce9a8fbf7ac55da0f7c2742") depends_on("r@3.0.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-rcppcctz/package.py b/var/spack/repos/builtin/packages/r-rcppcctz/package.py index b84b64716a5f05..6858c016212411 100644 --- a/var/spack/repos/builtin/packages/r-rcppcctz/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcctz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py index 096a5ad025b60c..550a3ba3c2134f 100644 --- a/var/spack/repos/builtin/packages/r-rcppcnpy/package.py +++ b/var/spack/repos/builtin/packages/r-rcppcnpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RRcppcnpy(RPackage): cran = "RcppCNPy" + license("BitTorrent-1.0") + version("0.2.11", sha256="5dbb36f2526c276fd79b8e08a30503dc401cdf54d8c40f61af758c9ee1192f55") version("0.2.10", sha256="77d6fbc86520a08da40d44c0b82767099f8f719ca95870d91efff1a9cab1ab9c") version("0.2.9", sha256="733f004ad1a8b0e5aafbf547c4349d2df3118afd57f1ff99f20e39135c6edb30") diff --git a/var/spack/repos/builtin/packages/r-rcppdate/package.py b/var/spack/repos/builtin/packages/r-rcppdate/package.py index 52169a46c92cc2..8135cc8a8232de 100644 --- a/var/spack/repos/builtin/packages/r-rcppdate/package.py +++ b/var/spack/repos/builtin/packages/r-rcppdate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,5 +19,7 @@ class RRcppdate(RPackage): cran = "RcppDate" + license("MIT") + version("0.0.3", sha256="9c5ee7cf76d63cd51e8faff831f5f865762868d7d705395960c0f22e9b238bdb") version("0.0.1", sha256="117721fc677dfb4209200a7ff894fbbb8ee1b652d01b3878b11c3253733b4a5f") diff --git a/var/spack/repos/builtin/packages/r-rcppde/package.py b/var/spack/repos/builtin/packages/r-rcppde/package.py index 93ec5811986dbb..25680af5618d8d 100644 --- a/var/spack/repos/builtin/packages/r-rcppde/package.py +++ b/var/spack/repos/builtin/packages/r-rcppde/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index 4c9dbb397ade7e..2b0899a537b0d4 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class RRcppeigen(RPackage): cran = "RcppEigen" + license("MPL-2.0") + version("0.3.3.9.3", sha256="5873a47fd6587d916f86119ab140c6736abf80ac45d06ff1c9d198708e7d1c76") version("0.3.3.9.2", sha256="2547e794d5a6fb8d9fbadf19e64afa0bcf413cc69ecf3f428995fa5a0fced493") version("0.3.3.9.1", sha256="8a0486249b778a4275a1168fc89fc7fc49c2bb031cb14b50a50089acae7fe962") diff --git a/var/spack/repos/builtin/packages/r-rcppensmallen/package.py b/var/spack/repos/builtin/packages/r-rcppensmallen/package.py index c4c1fb3a0e544e..a835b67d9a2372 100644 --- a/var/spack/repos/builtin/packages/r-rcppensmallen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppensmallen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppgsl/package.py b/var/spack/repos/builtin/packages/r-rcppgsl/package.py index f485d1c0f35d5d..27e486c3104edd 100644 --- a/var/spack/repos/builtin/packages/r-rcppgsl/package.py +++ b/var/spack/repos/builtin/packages/r-rcppgsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcpphnsw/package.py b/var/spack/repos/builtin/packages/r-rcpphnsw/package.py index 91fc505c1c9297..0400df4dc15637 100644 --- a/var/spack/repos/builtin/packages/r-rcpphnsw/package.py +++ b/var/spack/repos/builtin/packages/r-rcpphnsw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppml/package.py b/var/spack/repos/builtin/packages/r-rcppml/package.py index 64a7e63d3238a0..7f986444e6c67a 100644 --- a/var/spack/repos/builtin/packages/r-rcppml/package.py +++ b/var/spack/repos/builtin/packages/r-rcppml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppparallel/package.py b/var/spack/repos/builtin/packages/r-rcppparallel/package.py index 17f7cba5fabff3..c127625cc326ed 100644 --- a/var/spack/repos/builtin/packages/r-rcppparallel/package.py +++ b/var/spack/repos/builtin/packages/r-rcppparallel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcppprogress/package.py b/var/spack/repos/builtin/packages/r-rcppprogress/package.py index d2cb0a66cdf066..115f7978c43a90 100644 --- a/var/spack/repos/builtin/packages/r-rcppprogress/package.py +++ b/var/spack/repos/builtin/packages/r-rcppprogress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcpproll/package.py b/var/spack/repos/builtin/packages/r-rcpproll/package.py index 41f0732b18fcfa..a963f612903449 100644 --- a/var/spack/repos/builtin/packages/r-rcpproll/package.py +++ b/var/spack/repos/builtin/packages/r-rcpproll/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcpptoml/package.py b/var/spack/repos/builtin/packages/r-rcpptoml/package.py index cf0c88e9917eaf..78954874e32375 100644 --- a/var/spack/repos/builtin/packages/r-rcpptoml/package.py +++ b/var/spack/repos/builtin/packages/r-rcpptoml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRcpptoml(RPackage): cran = "RcppTOML" + license("JSON") + version("0.2.2", sha256="371391f9ca82221e76a424082ea9ebc5ea2c50f14e8408469b09d7dc3e6f63aa") version("0.1.7", sha256="2f09f00cbee6c6eeff5d5f0195c10de0155496de15fbe8189c18627ee3090541") diff --git a/var/spack/repos/builtin/packages/r-rcppziggurat/package.py b/var/spack/repos/builtin/packages/r-rcppziggurat/package.py index 403caa4d170e21..5b10ed4f15aafe 100644 --- a/var/spack/repos/builtin/packages/r-rcppziggurat/package.py +++ b/var/spack/repos/builtin/packages/r-rcppziggurat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rcurl/package.py b/var/spack/repos/builtin/packages/r-rcurl/package.py index c9e2b20f6dddc6..187bc3809849a5 100644 --- a/var/spack/repos/builtin/packages/r-rcurl/package.py +++ b/var/spack/repos/builtin/packages/r-rcurl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rda/package.py b/var/spack/repos/builtin/packages/r-rda/package.py index 1d083901acf39f..c0e1e75dd05c18 100644 --- a/var/spack/repos/builtin/packages/r-rda/package.py +++ b/var/spack/repos/builtin/packages/r-rda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRda(RPackage): cran = "rda" + license("GPL-3.0-or-later") + version("1.2-1", sha256="37038a9131c9133519f5e64fa1a86dbe28b21f519cf6528503234648a139ae9a") version("1.0.2-2.1", sha256="eea3a51a2e132a023146bfbc0c384f5373eb3ea2b61743d7658be86a5b04949e") version("1.0.2-2", sha256="52ee41249b860af81dc692eee38cd4f8f26d3fbe34cb274f4e118de0013b58bc") diff --git a/var/spack/repos/builtin/packages/r-rdpack/package.py b/var/spack/repos/builtin/packages/r-rdpack/package.py index 897697141d7a4a..cb3ecb5a5f273f 100644 --- a/var/spack/repos/builtin/packages/r-rdpack/package.py +++ b/var/spack/repos/builtin/packages/r-rdpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-readbitmap/package.py b/var/spack/repos/builtin/packages/r-readbitmap/package.py index 48ae86f4a88b0c..9a07567d3769e2 100644 --- a/var/spack/repos/builtin/packages/r-readbitmap/package.py +++ b/var/spack/repos/builtin/packages/r-readbitmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RReadbitmap(RPackage): cran = "readbitmap" + license("GPL-2.0-or-later") + version("0.1.5", sha256="737d7d585eb33de2c200da64d16781e3c9522400fe2af352e1460c6a402a0291") depends_on("r-bmp", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-readr/package.py b/var/spack/repos/builtin/packages/r-readr/package.py index 95e17dd11467ec..2621ce060f23ff 100644 --- a/var/spack/repos/builtin/packages/r-readr/package.py +++ b/var/spack/repos/builtin/packages/r-readr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RReadr(RPackage): cran = "readr" + license("MIT") + version("2.1.4", sha256="98144fa48c4fa61ef8c73ede8f87a2d2c5c44e9502b7875b266eb79984fbeb0d") version("2.1.3", sha256="d70dd55e80e87cf1387811fcdc3da92987a892ee75dae02f77ff074142618263") version("2.1.2", sha256="94afd03a1fa4abcf2985ec903bbf5995d7c590e1a50512ed80d081ef4fe10c1b") diff --git a/var/spack/repos/builtin/packages/r-readxl/package.py b/var/spack/repos/builtin/packages/r-readxl/package.py index d3e8a60f51d977..8867658ab7031a 100644 --- a/var/spack/repos/builtin/packages/r-readxl/package.py +++ b/var/spack/repos/builtin/packages/r-readxl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RReadxl(RPackage): cran = "readxl" + license("MIT") + version("1.4.2", sha256="387304e2c5be0dca4861ec0232f0d92cc1882b660ca917f8f2a8a4ae858aba11") version("1.4.1", sha256="f6bebb7f940fb21baacd60345b7075c77eb1d026466c55e6a36148de680da1fa") version("1.4.0", sha256="ab9239c249f79b649f7665a612b3dbf4b774ab633115e6dee41091a8cb2491f7") diff --git a/var/spack/repos/builtin/packages/r-reams/package.py b/var/spack/repos/builtin/packages/r-reams/package.py index d4b5d4191c6ec4..0a0c49568f30df 100644 --- a/var/spack/repos/builtin/packages/r-reams/package.py +++ b/var/spack/repos/builtin/packages/r-reams/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-recipes/package.py b/var/spack/repos/builtin/packages/r-recipes/package.py index f1c477fcece7b9..499c560a274af3 100644 --- a/var/spack/repos/builtin/packages/r-recipes/package.py +++ b/var/spack/repos/builtin/packages/r-recipes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRecipes(RPackage): cran = "recipes" + license("MIT") + version("1.0.6", sha256="105e97127cdd6aaeb9fb3348e51a9c46e21fb8bcb734cb3bbd6dbdf2b6b2fc8f") version("1.0.2", sha256="1a7b5a9a2946fa34599935b6d93101ec559d8a901d49cc691972c75df8d5670e") version("1.0.1", sha256="9e3ae212413409bf41ec7d1a311586e12c0ca79943cef436707d041c57125bc9") diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index e975fb94c53692..116e0ef8bb191b 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRegistry(RPackage): cran = "registry" + license("GPL-2.0-only") + version("0.5-1", sha256="dfea36edb0a703ec57e111016789b47a1ba21d9c8ff30672555c81327a3372cc") version("0.5", sha256="5d8be59ba791987b2400e9e8eaaac614cd544c1aece785ec4782ea6d5ea00efb") version("0.3", sha256="58a5c43b8012ca5e509fa29a8daf6f24f097b8eb021a723f6a9c33db1dd3f430") diff --git a/var/spack/repos/builtin/packages/r-rematch/package.py b/var/spack/repos/builtin/packages/r-rematch/package.py index 3644c84a810085..54933633fc3819 100644 --- a/var/spack/repos/builtin/packages/r-rematch/package.py +++ b/var/spack/repos/builtin/packages/r-rematch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class RRematch(RPackage): cran = "rematch" + license("MIT") + version("1.0.1", sha256="a409dec978cd02914cdddfedc974d9b45bd2975a124d8870d52cfd7d37d47578") diff --git a/var/spack/repos/builtin/packages/r-rematch2/package.py b/var/spack/repos/builtin/packages/r-rematch2/package.py index d1b334dc9290f8..d1f5eab86ed7df 100644 --- a/var/spack/repos/builtin/packages/r-rematch2/package.py +++ b/var/spack/repos/builtin/packages/r-rematch2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRematch2(RPackage): cran = "rematch2" + license("MIT") + version("2.1.2", sha256="fe9cbfe99dd7731a0a2a310900d999f80e7486775b67f3f8f388c30737faf7bb") version("2.1.1", sha256="d0423a418e8b46ac3a4819af7a7d19c39ca7c8c862c1e9a1c1294aa19152518f") version("2.1.0", sha256="78677071bd44b40e562df1da6f0c6bdeae44caf973f97ff8286b8c994db59f01") diff --git a/var/spack/repos/builtin/packages/r-remotes/package.py b/var/spack/repos/builtin/packages/r-remotes/package.py index 23f823bb14726c..6db1982ab0fded 100644 --- a/var/spack/repos/builtin/packages/r-remotes/package.py +++ b/var/spack/repos/builtin/packages/r-remotes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRemotes(RPackage): cran = "remotes" + license("MIT") + version("2.4.2", sha256="f2ef875f24a485bf4f55a8c830f87cdd5db868f9a8cdb624dc452d0bf66ba516") version("2.2.0", sha256="12f234fd8c46f4ac54e06a3c60e4015ed2193a32762ca4dd6854f120136f33b8") version("2.1.1", sha256="4e590746fce618094089372b185e1ea234b3337b23c44c44118e942d0fb5118b") diff --git a/var/spack/repos/builtin/packages/r-renv/package.py b/var/spack/repos/builtin/packages/r-renv/package.py index e229c5881fd5af..2f60c028645d17 100644 --- a/var/spack/repos/builtin/packages/r-renv/package.py +++ b/var/spack/repos/builtin/packages/r-renv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRenv(RPackage): cran = "renv" + license("MIT") + version("0.17.3", sha256="1c4f28cd233e1f539a2a091f1d118de83eb8aea5d5780dbdfb6bb8dcc6e4f5f0") version("0.16.0", sha256="f3a13e6b71e9be460db73bd9e11a3cb8a1d9bc05c6b77423957cbc2a7f8ba016") version("0.15.5", sha256="b4f1a9a7daa82f0c3123ebd4eeba06e98d5485215518e5292b25bc56741d582e") diff --git a/var/spack/repos/builtin/packages/r-reordercluster/package.py b/var/spack/repos/builtin/packages/r-reordercluster/package.py index eba72526deaa24..65321c878d8015 100644 --- a/var/spack/repos/builtin/packages/r-reordercluster/package.py +++ b/var/spack/repos/builtin/packages/r-reordercluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-reportingtools/package.py b/var/spack/repos/builtin/packages/r-reportingtools/package.py index e2888761516297..0a855f4bbd65bb 100644 --- a/var/spack/repos/builtin/packages/r-reportingtools/package.py +++ b/var/spack/repos/builtin/packages/r-reportingtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index f76b93759a68bd..7146c4da14d9e4 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRepr(RPackage): cran = "repr" + license("GPL-3.0-or-later") + version("1.1.6", sha256="3d2e6c9b363c1ec4811688deff7fb22093cadc9e0a333930382093d93c16673f") version("1.1.4", sha256="6f799ca83e0940618dd8c22e62ffdce5ec11ba3366c5306ae58b55b53c097040") version("1.1.0", sha256="743fe018f9e3e54067a970bc38b6b8c0c0498b43f88d179ac4a959c2013a5f96") diff --git a/var/spack/repos/builtin/packages/r-reprex/package.py b/var/spack/repos/builtin/packages/r-reprex/package.py index ddd37618f0d71a..3043c5e95aba3f 100644 --- a/var/spack/repos/builtin/packages/r-reprex/package.py +++ b/var/spack/repos/builtin/packages/r-reprex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RReprex(RPackage): cran = "reprex" + license("MIT") + version("2.0.2", sha256="a85b16e26112364a65c886efea050df08c17aadf1411fd14ec27d9ef13e87092") version("2.0.1", sha256="0e6d8667cacb63135476a766fba3a4f91e5ad86274ea66d2b1e6d773b5ca6426") version("0.3.0", sha256="203c2ae6343f6ff887e7a5a3f5d20bae465f6e8d9745c982479f5385f4effb6c") diff --git a/var/spack/repos/builtin/packages/r-reproducible/package.py b/var/spack/repos/builtin/packages/r-reproducible/package.py index f4e06125a1f65a..94b3089e4bb62b 100644 --- a/var/spack/repos/builtin/packages/r-reproducible/package.py +++ b/var/spack/repos/builtin/packages/r-reproducible/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RReproducible(RPackage): maintainers("dorton21") + license("GPL-3.0-only") + version("1.2.16", sha256="ec504cdc1adf305cd008ce65eff226e3cb60b7a454b2c8b98a871c84458546ae") version("1.2.10", sha256="fcee3aeb9d38c561c95df8663614ff0ed91a871719730766171b4ed19c82f729") version("1.2.8", sha256="6f453016404f6a2a235cb4d951a29aa7394dc3bd0b9cfc338dc85fb3d5045dd5") diff --git a/var/spack/repos/builtin/packages/r-require/package.py b/var/spack/repos/builtin/packages/r-require/package.py index c04866ab2ab488..867c8417847479 100644 --- a/var/spack/repos/builtin/packages/r-require/package.py +++ b/var/spack/repos/builtin/packages/r-require/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-reshape/package.py b/var/spack/repos/builtin/packages/r-reshape/package.py index daa526efcf1cd8..4268ca78982761 100644 --- a/var/spack/repos/builtin/packages/r-reshape/package.py +++ b/var/spack/repos/builtin/packages/r-reshape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RReshape(RPackage): cran = "reshape" + license("MIT") + version("0.8.9", sha256="791178b3b5f30c166ebf5910a5ab1c67b54e7023b10b6c2e2ddd1cc02a1e4048") version("0.8.8", sha256="4d5597fde8511e8fe4e4d1fd7adfc7ab37ff41ac68c76a746f7487d7b106d168") version("0.8.7", sha256="2fa6c87d1e89f182e51bc5a4fcda3d42d83b8fb4474ca525fa7a8db5081f3992") diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index a20525b10e3eb3..713f78c9d2ad52 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RReshape2(RPackage): cran = "reshape2" + license("MIT") + version("1.4.4", sha256="d88dcf9e2530fa9695fc57d0c78adfc5e361305fe8919fe09410b17da5ca12d8") version("1.4.3", sha256="8aff94c935e75032344b52407593392ddd4e16a88bb206984340c816d42c710e") version("1.4.2", sha256="6d3783610379be4c5676d9236cf66276a166b5b96c18f2759e9b219758959b6b") diff --git a/var/spack/repos/builtin/packages/r-restfulr/package.py b/var/spack/repos/builtin/packages/r-restfulr/package.py index 38caff2eca754f..d325d585dcb3f3 100644 --- a/var/spack/repos/builtin/packages/r-restfulr/package.py +++ b/var/spack/repos/builtin/packages/r-restfulr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRestfulr(RPackage): cran = "restfulr" + license("Artistic-2.0") + version("0.0.15", sha256="40ff8f1fb2987af2223e1a855bb1680c5ce2143fbce7ebc42f1edb291f80e692") version("0.0.13", sha256="7b59f5887aaf02f46a80617f4d1e0ffd4e11e4840e9e2fbd486a9a9c7f2d64b6") diff --git a/var/spack/repos/builtin/packages/r-reticulate/package.py b/var/spack/repos/builtin/packages/r-reticulate/package.py index dad07be86bb08f..120cce8a6e3de4 100644 --- a/var/spack/repos/builtin/packages/r-reticulate/package.py +++ b/var/spack/repos/builtin/packages/r-reticulate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RReticulate(RPackage): cran = "reticulate" + license("Apache-2.0") + version("1.28", sha256="58a299ed18faaa3ff14936752fcc2b86e64ae18fc9f36befdfd492ccb251516f") version("1.26", sha256="3fd74823bde1b0e094db7c2bf6b40ee2501f8d724b4c35b53da95c3c588c74c5") version("1.25", sha256="2125af9e75939c3b7c0dc74f28f42606e816d63aa1143baf631c318ff5ff3a2c") diff --git a/var/spack/repos/builtin/packages/r-rex/package.py b/var/spack/repos/builtin/packages/r-rex/package.py index 5efcb9cfa3dbe4..187353dafe592f 100644 --- a/var/spack/repos/builtin/packages/r-rex/package.py +++ b/var/spack/repos/builtin/packages/r-rex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRex(RPackage): cran = "rex" + license("MIT") + version("1.2.1", sha256="af42e649c06e4bbdba94d5a1870a7e8347903571c90cd5e5ca40f52307a3bfd6") version("1.2.0", sha256="06b491f1469078862e40543fd74e1d38b2e0fb61fdf01c8083add4b11ac2eb54") version("1.1.2", sha256="bd3c74ceaf335336f5dd04314d0a791f6311e421a2158f321f5aab275f539a2a") diff --git a/var/spack/repos/builtin/packages/r-rfast/package.py b/var/spack/repos/builtin/packages/r-rfast/package.py index 0f281d4f5ac1df..d6ddfe5967c5e0 100644 --- a/var/spack/repos/builtin/packages/r-rfast/package.py +++ b/var/spack/repos/builtin/packages/r-rfast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rferns/package.py b/var/spack/repos/builtin/packages/r-rferns/package.py index d9e96cd7944464..8dcaeff9c0ad5e 100644 --- a/var/spack/repos/builtin/packages/r-rferns/package.py +++ b/var/spack/repos/builtin/packages/r-rferns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rgdal/package.py b/var/spack/repos/builtin/packages/r-rgdal/package.py index 343ed8195c6057..4194c69d7f7f07 100644 --- a/var/spack/repos/builtin/packages/r-rgdal/package.py +++ b/var/spack/repos/builtin/packages/r-rgdal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rgenoud/package.py b/var/spack/repos/builtin/packages/r-rgenoud/package.py index 1af235a07e747d..172196c919519a 100644 --- a/var/spack/repos/builtin/packages/r-rgenoud/package.py +++ b/var/spack/repos/builtin/packages/r-rgenoud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRgenoud(RPackage): cran = "rgenoud" + license("GPL-3.0-only") + version("5.9-0.3", sha256="31560a8dad791f9c47a673e90d397b3fc60da1a58be1ae1486ace90d988eb55f") version("5.8-3.0", sha256="9beb11b5edab3ab3aa6001daa39668b240a8e0328be9d55db4e23ff88ce3235d") version("5.8-2.0", sha256="106c4f6a6df5159578e929a0141b3cfbaa88141a70703ff59a1fc48a27e2d239") diff --git a/var/spack/repos/builtin/packages/r-rgeos/package.py b/var/spack/repos/builtin/packages/r-rgeos/package.py index 9a33f8aa3f7237..fae7ad271ea3be 100644 --- a/var/spack/repos/builtin/packages/r-rgeos/package.py +++ b/var/spack/repos/builtin/packages/r-rgeos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rgexf/package.py b/var/spack/repos/builtin/packages/r-rgexf/package.py index ec96f665e43f0a..e9c146ced9005f 100644 --- a/var/spack/repos/builtin/packages/r-rgexf/package.py +++ b/var/spack/repos/builtin/packages/r-rgexf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RRgexf(RPackage): cran = "rgexf" + license("MIT") + version("0.16.2", sha256="6ee052b0de99d0c7492366b991d345a51b3d0cc890d10a68b8670e1bd4fc8201") version("0.16.0", sha256="2a671df9ac70cfefd4092754317cb28e32a33df345b80e1975bf838e838245ee") version("0.15.3", sha256="2e8a7978d1fb977318e6310ba65b70a9c8890185c819a7951ac23425c6dc8147") diff --git a/var/spack/repos/builtin/packages/r-rgl/package.py b/var/spack/repos/builtin/packages/r-rgl/package.py index 6f96a6f712d2ee..67f0b5e874b109 100644 --- a/var/spack/repos/builtin/packages/r-rgl/package.py +++ b/var/spack/repos/builtin/packages/r-rgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RRgl(RPackage): cran = "rgl" + license("GPL-2.0-or-later") + version("1.1.3", sha256="4fa246c2ab06261ea81e09a7a489f34174b93359fe74a3db291f8d0eccd38aae") version("0.110.2", sha256="da1118c1990ae161a5787960fb22009601d2ee7d39ca9c97c31c70589bce346d") version("0.108.3.2", sha256="033af3aceade6c21d0a602958fff1c25c21febc7d0e867cf88860cfa25fc3c65") diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index dcbf644f2c2b20..f2931bef8119a1 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rgraphviz/package.py b/var/spack/repos/builtin/packages/r-rgraphviz/package.py index 85d98ab6019acb..eb0fb02104432b 100644 --- a/var/spack/repos/builtin/packages/r-rgraphviz/package.py +++ b/var/spack/repos/builtin/packages/r-rgraphviz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rhdf5/package.py b/var/spack/repos/builtin/packages/r-rhdf5/package.py index c09c4cb20a06b5..a312524388e8ea 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py index 9f29a05f4a54e8..560cf9dba4a4f5 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5filters/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5filters/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRhdf5filters(RPackage): bioc = "rhdf5filters" + license("BSD-2-Clause") + version("1.12.0", commit="4deabdef71c0349c4eaf7e5604cb7f389809f006") version("1.10.0", commit="6131538e2c5896dca0af33882bc2da961d79e49a") version("1.8.0", commit="b0b588b71a5595b30f4e698a50b84310dc19745d") diff --git a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py index 396626eae4384b..05433c61ef7617 100644 --- a/var/spack/repos/builtin/packages/r-rhdf5lib/package.py +++ b/var/spack/repos/builtin/packages/r-rhdf5lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rhmmer/package.py b/var/spack/repos/builtin/packages/r-rhmmer/package.py index df0354cdd807e5..9089cab38f2b2c 100644 --- a/var/spack/repos/builtin/packages/r-rhmmer/package.py +++ b/var/spack/repos/builtin/packages/r-rhmmer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rhtslib/package.py b/var/spack/repos/builtin/packages/r-rhtslib/package.py index e8f1fd49be8c58..8f2896c7b6acf8 100644 --- a/var/spack/repos/builtin/packages/r-rhtslib/package.py +++ b/var/spack/repos/builtin/packages/r-rhtslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index 26a30593a869f3..b2f222bdd11828 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rio/package.py b/var/spack/repos/builtin/packages/r-rio/package.py index 27458bdca8a644..f120492fe933df 100644 --- a/var/spack/repos/builtin/packages/r-rio/package.py +++ b/var/spack/repos/builtin/packages/r-rio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RRio(RPackage): cran = "rio" + license("GPL-2.0-only") + version("0.5.29", sha256="9fa63187e1814053e6ed2a164665b4924e08c3453adccb78f7211d403dcc5412") version("0.5.16", sha256="d3eb8d5a11e0a3d26169bb9d08f834a51a6516a349854250629072d59c29d465") diff --git a/var/spack/repos/builtin/packages/r-rjags/package.py b/var/spack/repos/builtin/packages/r-rjags/package.py index 9744c45be6fc7a..3797aa89837798 100644 --- a/var/spack/repos/builtin/packages/r-rjags/package.py +++ b/var/spack/repos/builtin/packages/r-rjags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRjags(RPackage): cran = "rjags" + license("GPL-2.0-only") + version("4-14", sha256="313b5df702598ce3bbc5f8b027b654c8489420ca5a4e0a794954ea9f4837e2cb") version("4-13", sha256="f85cc34c5127b828d8a3fa3613ef29f147c868bdaf55eb0f7406c10abbf92b32") version("4-12", sha256="b91f34c3f9ebf78fa44bd661346fbb6f28a01693a7203ac133c98392dd273e10") diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index fcf5c95a06a6b6..0a135ed48789f1 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index f1b76f423ceb51..d45011509d2b76 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRjson(RPackage): cran = "rjson" + license("GPL-2.0-only") + version("0.2.21", sha256="982b56d35ccc0c7db0b20c1d3eab5f5f47c620309646fdc278ff1cc3433ea2e2") version("0.2.20", sha256="3a287c1e5ee7c333ed8385913c0a307daf99335fbdf803e9dcca6e3d5adb3f6c") version("0.2.19", sha256="5c2672461986f2b715416cab92ed262abe9875f31299bc8a1a072ef7c6dd49bc") diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index 201042350804b0..63495d35d3cda7 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rlang/package.py b/var/spack/repos/builtin/packages/r-rlang/package.py index 40120150b06b2c..48a47e14479eee 100644 --- a/var/spack/repos/builtin/packages/r-rlang/package.py +++ b/var/spack/repos/builtin/packages/r-rlang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,10 @@ class RRlang(RPackage): cran = "rlang" + license("MIT") + + 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") diff --git a/var/spack/repos/builtin/packages/r-rle/package.py b/var/spack/repos/builtin/packages/r-rle/package.py index 64e53863ae8dd9..60b2088e53da6c 100644 --- a/var/spack/repos/builtin/packages/r-rle/package.py +++ b/var/spack/repos/builtin/packages/r-rle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRle(RPackage): cran = "rle" + license("GPL-3.0-only") + version("0.9.2", sha256="803cbe310af6e882e27be61d37d660dbe5910ac1ee1eff61a480bcf724a04f69") depends_on("r@3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-rmariadb/package.py b/var/spack/repos/builtin/packages/r-rmariadb/package.py index 0e296e316dce27..740d434eaff766 100644 --- a/var/spack/repos/builtin/packages/r-rmariadb/package.py +++ b/var/spack/repos/builtin/packages/r-rmariadb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 230caf57885777..2b4e444e0ef688 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRmarkdown(RPackage): cran = "rmarkdown" + license("GPL-3.0-only") + version("2.21", sha256="c25b20a422d11a115c93460f41c488874002154abb349b14e0d6518682fdac28") version("2.17", sha256="aa576c458ec4c2e8468aaa4e3f60202d8d9c7ef54fa01d6b2d243bffee08c4be") version("2.16", sha256="d3d34e0419c419d3ab20eb60952a0f0f4c391d202277af55dcd673d25561fa71") diff --git a/var/spack/repos/builtin/packages/r-rminer/package.py b/var/spack/repos/builtin/packages/r-rminer/package.py index 5b799831508825..abfefa957f19b8 100644 --- a/var/spack/repos/builtin/packages/r-rminer/package.py +++ b/var/spack/repos/builtin/packages/r-rminer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RRminer(RPackage): cran = "rminer" + license("GPL-2.0-only") + version("1.4.6", sha256="1f8bf7b3fbc887fd766568c1ec1f861021c962259354bd8967a61c1d0761cdf7") version("1.4.2", sha256="64444dcedcd17f2f26129819d6bd2f84d4bb59c8f65328b6054ef32cb9624fc2") diff --git a/var/spack/repos/builtin/packages/r-rmpfr/package.py b/var/spack/repos/builtin/packages/r-rmpfr/package.py index d89056495b0de0..7388730fc157d1 100644 --- a/var/spack/repos/builtin/packages/r-rmpfr/package.py +++ b/var/spack/repos/builtin/packages/r-rmpfr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rmpi/package.py b/var/spack/repos/builtin/packages/r-rmpi/package.py index d225ade2c32834..88b9a301751980 100644 --- a/var/spack/repos/builtin/packages/r-rmpi/package.py +++ b/var/spack/repos/builtin/packages/r-rmpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rms/package.py b/var/spack/repos/builtin/packages/r-rms/package.py index f44e171ee2257b..a14c2404c25241 100644 --- a/var/spack/repos/builtin/packages/r-rms/package.py +++ b/var/spack/repos/builtin/packages/r-rms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class RRms(RPackage): cran = "rms" + license("GPL-2.0-or-later") + version("6.6-0", sha256="f3abadb94339f3aedadd27e1aceade069bcb53c94bf246626b0dc94b16b6625c") version("6.3-0", sha256="6c41eb670daf5e4391cc2f2a19e20a591f90769c124300a7ccf555820140d3f9") version("6.2-0", sha256="10d58cbfe39fb434223834e29e5248c9384cded23e6267cfc99367d0f5ee24b6") diff --git a/var/spack/repos/builtin/packages/r-rmutil/package.py b/var/spack/repos/builtin/packages/r-rmutil/package.py index 6a4576fb716414..9405ff6fbc8877 100644 --- a/var/spack/repos/builtin/packages/r-rmutil/package.py +++ b/var/spack/repos/builtin/packages/r-rmutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRmutil(RPackage): cran = "rmutil" + license("GPL-2.0-or-later") + version("1.1.10", sha256="819fd7ce695cc742b4594705986eb06764460fc88521ea32de793c49de7ca5f9") version("1.1.9", sha256="3a68cc4058394fcb6bab960a680bad939ad7270888f4c271ca6438e49670333c") version("1.1.5", sha256="6077e643d6daeba6edcf49d928320b54cc6aa6ff59934f9e9e6071a2f9afb2f6") diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index 36ec34aa3932e6..2e3639efdd42fc 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rnaseqmap/package.py b/var/spack/repos/builtin/packages/r-rnaseqmap/package.py index 37c9f6b88278d5..6f9cadba5d3e1f 100644 --- a/var/spack/repos/builtin/packages/r-rnaseqmap/package.py +++ b/var/spack/repos/builtin/packages/r-rnaseqmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rncl/package.py b/var/spack/repos/builtin/packages/r-rncl/package.py index f03506f8eaa95f..7fef555fec1cd3 100644 --- a/var/spack/repos/builtin/packages/r-rncl/package.py +++ b/var/spack/repos/builtin/packages/r-rncl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRncl(RPackage): cran = "rncl" + license("BSD-2-Clause") + version("0.8.7", sha256="1d876e4f5f2b8a24cc3ea1002c29eedbc0ca96011b0fa15b085e5b75cfc7993a") version("0.8.6", sha256="fcc972c04fb43ace0876eb640a6433caddf6ec8304f7ceee37107d812ce68ffb") version("0.8.4", sha256="6b19d0dd9bb08ecf99766be5ad684bcd1894d1cd9291230bdd709dbd3396496b") diff --git a/var/spack/repos/builtin/packages/r-rnexml/package.py b/var/spack/repos/builtin/packages/r-rnexml/package.py index 97f2cfd91f3a4b..230360e4ea2285 100644 --- a/var/spack/repos/builtin/packages/r-rnexml/package.py +++ b/var/spack/repos/builtin/packages/r-rnexml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index 04b2a98a53e4d9..1ecd7881a03962 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRngtools(RPackage): cran = "rngtools" + license("GPL-3.0-only") + version("1.5.2", sha256="7f8c76ca4c7851b69a86e27be09b02ddc86357f0388659ef8787634682e8a74d") version("1.5", sha256="8274873b73f7acbe0ce007e62893bf4d369d2aab8768754a60da46b3f078f575") version("1.4", sha256="3aa92366e5d0500537964302f5754a750aff6b169a27611725e7d84552913bce") diff --git a/var/spack/repos/builtin/packages/r-rnoaa/package.py b/var/spack/repos/builtin/packages/r-rnoaa/package.py index 81e4c00b510aba..5e059a6b534980 100644 --- a/var/spack/repos/builtin/packages/r-rnoaa/package.py +++ b/var/spack/repos/builtin/packages/r-rnoaa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RRnoaa(RPackage): cran = "rnoaa" + license("MIT") + version("1.3.8", sha256="57974b48162637e98888f041d6f0e580d3c60bd5008af2d2bc659491f0deb98a") version("1.3.0", sha256="4c421ad6e4c2b25e4dea5351c338aed70bea6e382562412d1dad825a50b0d161") version("0.8.4", sha256="fb9ae771111dd5f638c1eff3290abad2ff9cc7e68a6678bf2414433ebed2dbbf") diff --git a/var/spack/repos/builtin/packages/r-robust/package.py b/var/spack/repos/builtin/packages/r-robust/package.py index c4e08eeda951b0..a5bf5c16e107b1 100644 --- a/var/spack/repos/builtin/packages/r-robust/package.py +++ b/var/spack/repos/builtin/packages/r-robust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRobust(RPackage): cran = "robust" + license("GPL-3.0-or-later") + version("0.7-1", sha256="efaac70c6399b2787938e23ea89039b4a6043e76601bd794ba0ddda1edee65df") version("0.7-0", sha256="5e1aac30e185e416c22445663704f39433af9fdb48452185f2c9beb3528084b9") version("0.6-1", sha256="496fd225f6bc6f734e338308f18475125aaf691b39e25308bddb284d3106117d") diff --git a/var/spack/repos/builtin/packages/r-robustbase/package.py b/var/spack/repos/builtin/packages/r-robustbase/package.py index 68a278c4ca6d5a..a05863c09574b0 100644 --- a/var/spack/repos/builtin/packages/r-robustbase/package.py +++ b/var/spack/repos/builtin/packages/r-robustbase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRobustbase(RPackage): cran = "robustbase" + license("GPL-2.0-or-later") + version("0.95-1", sha256="862cd26db3ecdf34ab47c52d355fd65ffebbff448aea17999a9b95a1f13ba3ea") version("0.95-0", sha256="5cfaea1c46df6d45086614fea5f152c8da8ebfcadf33bb8df5b82e742eef9724") version("0.93-9", sha256="d75fb5075463fec61d063bced7003936e9198492328b6fae15f67e8415713c45") diff --git a/var/spack/repos/builtin/packages/r-roc/package.py b/var/spack/repos/builtin/packages/r-roc/package.py index 3343237f825439..35d02e07bde02d 100644 --- a/var/spack/repos/builtin/packages/r-roc/package.py +++ b/var/spack/repos/builtin/packages/r-roc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rocr/package.py b/var/spack/repos/builtin/packages/r-rocr/package.py index db093ff29d1a44..7e0d1e52e67215 100644 --- a/var/spack/repos/builtin/packages/r-rocr/package.py +++ b/var/spack/repos/builtin/packages/r-rocr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index 218e5387e73f8d..e16a948741e307 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RRodbc(RPackage): cran = "RODBC" + license("GPL-2.0-or-later") + version("1.3-20", sha256="7f157bd1ca2502bea4247260aac5b0f3aa1026ddffe5c50b026f2d59c210fbd6") version("1.3-19", sha256="3afcbd6877cd8b7c8df4a94bacd041a51e5ac607810acb88efd380b45d2d4efe") version("1.3-17", sha256="469fc835f65c344d5c3eaa097ff278ee8e9f12f845722a9aad340115faa704f7") diff --git a/var/spack/repos/builtin/packages/r-rook/package.py b/var/spack/repos/builtin/packages/r-rook/package.py index a59885cb1952a8..a7ccc3e09485cd 100644 --- a/var/spack/repos/builtin/packages/r-rook/package.py +++ b/var/spack/repos/builtin/packages/r-rook/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rots/package.py b/var/spack/repos/builtin/packages/r-rots/package.py index 4556d3a1c1066a..d85b123da8d838 100644 --- a/var/spack/repos/builtin/packages/r-rots/package.py +++ b/var/spack/repos/builtin/packages/r-rots/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index be585b745187a9..60df397a81d3f0 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RRoxygen2(RPackage): cran = "roxygen2" + license("MIT") + version("7.2.3", sha256="d844fab977d2575ab942fa1309ac7ff67f35f099a75d8b41c79efe6ea10416da") version("7.2.1", sha256="d2f0342591dc2b561fad8f6cf6fb3001e5e0bdd02be68bb2c6315f6bb82cda21") version("7.2.0", sha256="2ebfcfd567b9db6c606c6d42be1645b4e987f987995a2ad8954fa963a519448b") diff --git a/var/spack/repos/builtin/packages/r-rpart-plot/package.py b/var/spack/repos/builtin/packages/r-rpart-plot/package.py index 482ab29463ca7f..7ed71d89b96617 100644 --- a/var/spack/repos/builtin/packages/r-rpart-plot/package.py +++ b/var/spack/repos/builtin/packages/r-rpart-plot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rpart/package.py b/var/spack/repos/builtin/packages/r-rpart/package.py index 6aa3d96dca27ce..24fd3ebd141ac9 100644 --- a/var/spack/repos/builtin/packages/r-rpart/package.py +++ b/var/spack/repos/builtin/packages/r-rpart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRpart(RPackage): cran = "rpart" + license("GPL-2.0-only OR GPL-3.0-only") + version("4.1.19", sha256="fe723ed0b5583fae8b40e6fecc29b357229cb11f2339b02a4e4f812926249565") version("4.1.16", sha256="27ec75258a5a3459ad999f5f36760ead974930744249605bf8465f234f31425c") version("4.1-15", sha256="2b8ebe0e9e11592debff893f93f5a44a6765abd0bd956b0eb1f70e9394cfae5c") diff --git a/var/spack/repos/builtin/packages/r-rpmm/package.py b/var/spack/repos/builtin/packages/r-rpmm/package.py index 7953edf49424d0..aaf9fa399c6d01 100644 --- a/var/spack/repos/builtin/packages/r-rpmm/package.py +++ b/var/spack/repos/builtin/packages/r-rpmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rpostgres/package.py b/var/spack/repos/builtin/packages/r-rpostgres/package.py index f48ab447e38f39..0e829406e50370 100644 --- a/var/spack/repos/builtin/packages/r-rpostgres/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index b8b645007018e0..74715c6c5d8a18 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RRpostgresql(RPackage): cran = "RPostgreSQL" + license("PostgreSQL") + version("0.7-5", sha256="6b5401ee55bd948ae7bc84520d789ceb422533a7d5e5bd6e10e3b54447f29fa1") version("0.7-4", sha256="b6adf60094f2b03dff1959147cde7f61c2f4c4576d77b2a263c63f8e3cd556c6") version("0.7-3", sha256="bdbca10329aeb357f05364772964716dfb5ce2470f7eb4a33770862b6ded71b9") diff --git a/var/spack/repos/builtin/packages/r-rprojroot/package.py b/var/spack/repos/builtin/packages/r-rprojroot/package.py index 981d73c431d2b4..0d6bea6d61b240 100644 --- a/var/spack/repos/builtin/packages/r-rprojroot/package.py +++ b/var/spack/repos/builtin/packages/r-rprojroot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRprojroot(RPackage): cran = "rprojroot" + license("MIT") + version("2.0.3", sha256="50604247470e910cecfe9b76df754bf96a0d701f81b732f7aa9c90a20d30f897") version("2.0.2", sha256="5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f") version("1.3-2", sha256="df5665834941d8b0e377a8810a04f98552201678300f168de5f58a587b73238b") diff --git a/var/spack/repos/builtin/packages/r-rpsychi/package.py b/var/spack/repos/builtin/packages/r-rpsychi/package.py index b6a52249852e6f..190c54c421037c 100644 --- a/var/spack/repos/builtin/packages/r-rpsychi/package.py +++ b/var/spack/repos/builtin/packages/r-rpsychi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rrblup/package.py b/var/spack/repos/builtin/packages/r-rrblup/package.py index 0ab0e2fb2ead3a..85db94fb3ef34a 100644 --- a/var/spack/repos/builtin/packages/r-rrblup/package.py +++ b/var/spack/repos/builtin/packages/r-rrblup/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rrcov/package.py b/var/spack/repos/builtin/packages/r-rrcov/package.py index c156e23f7ac942..a0822cb4e6725c 100644 --- a/var/spack/repos/builtin/packages/r-rrcov/package.py +++ b/var/spack/repos/builtin/packages/r-rrcov/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RRrcov(RPackage): cran = "rrcov" + license("GPL-3.0-or-later") + version("1.7-2", sha256="0f01ed07cbc9e55dfcba27040a3f72237fb2fb86eda899472c2f96500220ecae") version("1.7-1", sha256="e115a09997b46c7eed33017f748632c7d50a95ad621f1f452f22dfc714c9a4e5") version("1.7-0", sha256="cbcca84a82d63fa50556aa8db29312b9bb588a638eb306ce4a81c271529228fd") diff --git a/var/spack/repos/builtin/packages/r-rrpp/package.py b/var/spack/repos/builtin/packages/r-rrpp/package.py index 64234fd8cbb6d0..b9de4ebda6b3aa 100644 --- a/var/spack/repos/builtin/packages/r-rrpp/package.py +++ b/var/spack/repos/builtin/packages/r-rrpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rsamtools/package.py b/var/spack/repos/builtin/packages/r-rsamtools/package.py index 4e6ae59f913d71..60489b90021b31 100644 --- a/var/spack/repos/builtin/packages/r-rsamtools/package.py +++ b/var/spack/repos/builtin/packages/r-rsamtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRsamtools(RPackage): bioc = "Rsamtools" + license("MIT") + version("2.16.0", commit="3eb6d03acecb8d640ec5201cacdc322e9e0c2445") version("2.14.0", commit="8302eb7fa1c40384f1af5855222d94f2efbdcad1") version("2.12.0", commit="d6a65dd57c5a17e4c441a27492e92072f69b175e") diff --git a/var/spack/repos/builtin/packages/r-rsconnect/package.py b/var/spack/repos/builtin/packages/r-rsconnect/package.py index 594cb9876cc444..2e5b56d586480f 100644 --- a/var/spack/repos/builtin/packages/r-rsconnect/package.py +++ b/var/spack/repos/builtin/packages/r-rsconnect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRsconnect(RPackage): cran = "rsconnect" + license("GPL-2.0-only") + version("0.8.29", sha256="852899d2aaf90bcedf4d191a9e00c770e8ee4233235169fc97e6aa636de01c43") version("0.8.28", sha256="25b9a947772ada9593da5c48297b7a7dd0e11aa73fbb9a282631c75ec49616e0") version("0.8.27", sha256="0a44d5605fc7cd6855ea0235d662e4a323a24a2c214cc4f1696afbca3a8f169c") diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index fdc710b74d9fd7..75c5dd094b63ff 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rsolnp/package.py b/var/spack/repos/builtin/packages/r-rsolnp/package.py index 1f670887aef318..56cfedf47926ad 100644 --- a/var/spack/repos/builtin/packages/r-rsolnp/package.py +++ b/var/spack/repos/builtin/packages/r-rsolnp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rspectra/package.py b/var/spack/repos/builtin/packages/r-rspectra/package.py index 2cc685af7c8651..93fe03871aa62b 100644 --- a/var/spack/repos/builtin/packages/r-rspectra/package.py +++ b/var/spack/repos/builtin/packages/r-rspectra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index a41e985fd22c7e..f81bdf06ac0704 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 531de3d2ce11d5..00da44c08d40ce 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RRstan(RPackage): cran = "rstan" + license("GPL-3.0-or-later") + version("2.21.8", sha256="b2d4edc315419037970c9fa2e8740b934966d88d40548152811f3d4a28475075") version("2.21.7", sha256="4495221310d390925b665c32e05ffabd3ae8857225bda65131a7ed2be41d6d45") version("2.21.5", sha256="86e4fe562d8ddcd0b02336f35a420fa8786dd21de7ca2bebb4ed6e9c252bb9ea") diff --git a/var/spack/repos/builtin/packages/r-rstantools/package.py b/var/spack/repos/builtin/packages/r-rstantools/package.py index 7bc579096bf0df..f2acce430cbe20 100644 --- a/var/spack/repos/builtin/packages/r-rstantools/package.py +++ b/var/spack/repos/builtin/packages/r-rstantools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RRstantools(RPackage): cran = "rstantools" + license("GPL-3.0-or-later") + version("2.3.1", sha256="82d4f2e884ffc894463bd37765606d5a9bef2ee631758840ec58636acdca6975") version("2.2.0", sha256="cb810baeb90c67668361b666c6862df9917aff6aaec63d2c3a485f28407c4eb7") version("2.1.1", sha256="c95b15de8ec577eeb24bb5206e7b685d882f88b5e6902efda924b7217f463d2d") diff --git a/var/spack/repos/builtin/packages/r-rstatix/package.py b/var/spack/repos/builtin/packages/r-rstatix/package.py index b8c3186fa50b73..53a64c4c2e57c2 100644 --- a/var/spack/repos/builtin/packages/r-rstatix/package.py +++ b/var/spack/repos/builtin/packages/r-rstatix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RRstatix(RPackage): cran = "rstatix" + license("GPL-2.0-only") + version("0.7.2", sha256="e0c6f5ab1d9c5d84713defabc5d149aad3d55944cffdb903cc128b694e5221a1") version("0.7.0", sha256="a5ae17dc32cc26fc5dcab9ff0a9747ce3786c9fe091699247ad8b9f823f2600c") version("0.6.0", sha256="ebb28e20c7e28809194a2a027bc83303b17be1e3db32f49325727c9279df9c5b") diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index 107ddd6ca2fb4d..f581b5dd5c3363 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRstudioapi(RPackage): cran = "rstudioapi" + license("MIT") + version("0.14", sha256="469d0987b1ad728a96c363a422fba712a5cebc8b11a5f7e953b4a671044dafc4") version("0.13", sha256="aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b") version("0.11", sha256="13e07fb7e2eba8cf1d885db2721901d676d219a1042d7ef5d166125e4905306b") diff --git a/var/spack/repos/builtin/packages/r-rsubread/package.py b/var/spack/repos/builtin/packages/r-rsubread/package.py new file mode 100644 index 00000000000000..2b6ba1166d70c6 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-rsubread/package.py @@ -0,0 +1,20 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class RRsubread(RPackage): + """Mapping, quantification and variant analysis of sequencing data""" + + bioc = "Rsubread" + + version("2.16.0", commit="62b92c9ed3fc2be89ed9f29e3db1809d1e115dbc") + version("2.14.2", commit="863bd98c6523b888da59335a6acb516d2676d412") + + depends_on("r", type=("build", "run")) + depends_on("r-matrix", type=("build", "run")) + depends_on("r-r-utils", type=("build", "run")) + depends_on("zlib-api", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-rsvd/package.py b/var/spack/repos/builtin/packages/r-rsvd/package.py index 610f4bd4f13bb9..82d925c4ca81f2 100644 --- a/var/spack/repos/builtin/packages/r-rsvd/package.py +++ b/var/spack/repos/builtin/packages/r-rsvd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class RRsvd(RPackage): cran = "rsvd" + license("GPL-3.0-or-later") + version("1.0.5", sha256="e40686b869acd4f71fdb1e8e7a6c64cd6792fc9d52a78f9e559a7176ab84e21e") version("1.0.3", sha256="13560e0fc3ae6927c4cc4d5ad816b1f640a2a445b712a5a612ab17ea0ce179bb") version("1.0.2", sha256="c8fe5c18bf7bcfe32604a897e3a7caae39b49e47e93edad9e4d07657fc392a3a") diff --git a/var/spack/repos/builtin/packages/r-rtracklayer/package.py b/var/spack/repos/builtin/packages/r-rtracklayer/package.py index 832d129de6e778..3acc58d1c71446 100644 --- a/var/spack/repos/builtin/packages/r-rtracklayer/package.py +++ b/var/spack/repos/builtin/packages/r-rtracklayer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rtsne/package.py b/var/spack/repos/builtin/packages/r-rtsne/package.py index 9450424a1ddd70..3949660dff7d42 100644 --- a/var/spack/repos/builtin/packages/r-rtsne/package.py +++ b/var/spack/repos/builtin/packages/r-rtsne/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-runit/package.py b/var/spack/repos/builtin/packages/r-runit/package.py index 51b0b1dc1437b5..9c88a53ce58972 100644 --- a/var/spack/repos/builtin/packages/r-runit/package.py +++ b/var/spack/repos/builtin/packages/r-runit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRunit(RPackage): cran = "RUnit" + license("GPL-2.0-only") + version("0.4.32", sha256="23a393059989000734898685d0d5509ece219879713eb09083f7707f167f81f1") depends_on("r@2.5.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-runjags/package.py b/var/spack/repos/builtin/packages/r-runjags/package.py index 9cd1040f08c859..c9343dbf9f0668 100644 --- a/var/spack/repos/builtin/packages/r-runjags/package.py +++ b/var/spack/repos/builtin/packages/r-runjags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RRunjags(RPackage): cran = "runjags" + license("GPL-2.0-only") + version("2.2.1-7", sha256="e81fdb15e59cdceda125d6ae7cf0cde93361ba80b123d51afd1ecdc993f25016") version("2.2.0-3", sha256="1b1fc0b0cfecf9ecdecc3abcba804cdc114b3c5352d5cc801602deeca90db528") version("2.2.0-2", sha256="e5dfeb83d36faf19ebe64429f6db64aedecf3c9a040fd5bf9c0200914bf5039a") diff --git a/var/spack/repos/builtin/packages/r-ruv/package.py b/var/spack/repos/builtin/packages/r-ruv/package.py index 3980e8efdced8b..8abccd4aae4ebf 100644 --- a/var/spack/repos/builtin/packages/r-ruv/package.py +++ b/var/spack/repos/builtin/packages/r-ruv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class RRuv(RPackage): cran = "ruv" + license("GPL-2.0-or-later") + version("0.9.7.1", sha256="a0c54e56ba3d8f6ae178ae4d0e417a79295abf5dcb68bbae26c4b874734d98d8") depends_on("r-ggplot2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-rvcheck/package.py b/var/spack/repos/builtin/packages/r-rvcheck/package.py index 8eae14f4151cd2..5e51c61063d85e 100644 --- a/var/spack/repos/builtin/packages/r-rvcheck/package.py +++ b/var/spack/repos/builtin/packages/r-rvcheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRvcheck(RPackage): cran = "rvcheck" + license("Artistic-2.0") + version("0.2.1", sha256="2ad9efd2af8d103e88bff0a01692f0e32515805f269152f2694eadbfe9947026") version("0.1.8", sha256="4ca5aa48fbf543e6171696ca7e1bff81e3112d06c919e88769b5c38a115b4718") version("0.1.3", sha256="0b59986c1ccc5b89f8aca8fa7cf62d0b875719addb40e08dbda1791cfd334fc4") diff --git a/var/spack/repos/builtin/packages/r-rversions/package.py b/var/spack/repos/builtin/packages/r-rversions/package.py index 8aa1dcf735e038..c403324c978b41 100644 --- a/var/spack/repos/builtin/packages/r-rversions/package.py +++ b/var/spack/repos/builtin/packages/r-rversions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRversions(RPackage): cran = "rversions" + license("MIT") + version("2.1.2", sha256="de5818233e8271132fe8ea70145618950b35786e0d2f270e39bf3338f3b8b160") version("2.1.1", sha256="79aaacf5a1258d91ac0ddedf3c8c16a2d10d39010993dcc7b0a2638afee27cb1") version("2.0.2", sha256="3523f4b7393365341d429500b01ba3a224056e89d134635b81dfb4918ba2173e") diff --git a/var/spack/repos/builtin/packages/r-rvest/package.py b/var/spack/repos/builtin/packages/r-rvest/package.py index b59d6643dfcc46..0e3cb2b544c956 100644 --- a/var/spack/repos/builtin/packages/r-rvest/package.py +++ b/var/spack/repos/builtin/packages/r-rvest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RRvest(RPackage): cran = "rvest" + license("MIT") + version("1.0.3", sha256="a465ef7391afaa3c26eebe8c61db02314ac04c4d8de5aa53f090716763d21c1e") version("1.0.2", sha256="89bb477e0944c80298a52ccf650db8f6377fd7ed3c1bc7034d000f695fdf05a4") version("0.3.6", sha256="6a2ee3a25d2d738031edbc1b5e2410f2a4538dfbb9705af145f9039504b902fa") diff --git a/var/spack/repos/builtin/packages/r-rviennacl/package.py b/var/spack/repos/builtin/packages/r-rviennacl/package.py index 39cdc861269671..78f4f5e32c0635 100644 --- a/var/spack/repos/builtin/packages/r-rviennacl/package.py +++ b/var/spack/repos/builtin/packages/r-rviennacl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index 3c950d31e5dde4..4d32899d5de6a2 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RRzmq(RPackage): cran = "rzmq" + license("GPL-3.0-only") + version("0.9.8", sha256="815a7eb502b1da3a84246b2dfb6594ca3f241a8675783e6bcdbbf9c952ec1c53") version("0.9.7", sha256="5f47b67b75fd4a230780406f7a55a3708ce8c014cff755a809a6bfa1a6925a45") version("0.9.6", sha256="80a3fc6eb6f7851224c4cd5e219ca4db0286551ad429359d4df853ccb9234316") diff --git a/var/spack/repos/builtin/packages/r-s2/package.py b/var/spack/repos/builtin/packages/r-s2/package.py index 2f547b044e3392..bf4d851e0854de 100644 --- a/var/spack/repos/builtin/packages/r-s2/package.py +++ b/var/spack/repos/builtin/packages/r-s2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RS2(RPackage): cran = "s2" + license("Apache-2.0") + version("1.1.2", sha256="8fb237531c6f4aa5b78fbe36d4fd15bfe852c1308fed58b04b3dae2bb73c0b57") version("1.1.0", sha256="e3aae968538fe80db5b3325474dd9d8ff7f0452b6c606d049a3cac72732ac416") version("1.0.7", sha256="2010c1c6ae29938ec9cd153a8b2c06a333ea4d647932369b2fc7d0c68d6d9e3f") diff --git a/var/spack/repos/builtin/packages/r-s4vectors/package.py b/var/spack/repos/builtin/packages/r-s4vectors/package.py index 4760e02e88935d..1527b55ca7dd3f 100644 --- a/var/spack/repos/builtin/packages/r-s4vectors/package.py +++ b/var/spack/repos/builtin/packages/r-s4vectors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-samr/package.py b/var/spack/repos/builtin/packages/r-samr/package.py index 94ab125012d86d..fe5d05918a5bce 100644 --- a/var/spack/repos/builtin/packages/r-samr/package.py +++ b/var/spack/repos/builtin/packages/r-samr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RSamr(RPackage): cran = "samr" + license("LGPL-2.0-or-later") + version("3.0", sha256="25f88ac002c2adce8881a562241bc12d683810a05defb553e8e3d4878f037506") version("2.0", sha256="090b5becd91d60f4bb8269df5c9bc19a03c09917d327b28e75b0ee7b80624e67") diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index 1df9f60f0aaf1c..808fae8fb70309 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class RSandwich(RPackage): cran = "sandwich" + license("GPL-2.0-only OR GPL-3.0-only") + version("3.0-2", sha256="6e30b6b554eb19430a60c45a8132fb7918ddb0013577bf6a62caeb163bdfe2b4") version("3.0-1", sha256="f6584b7084f3223bbc0c4722f53280496be73849747819b0cb4e8f3910284a89") version("3.0-0", sha256="828fe53b5e09db5015efd529b2db4dcd40251bce110fea7b0b219fa9ac36d529") diff --git a/var/spack/repos/builtin/packages/r-sass/package.py b/var/spack/repos/builtin/packages/r-sass/package.py index a76144cac759f9..4ac8e74774c482 100644 --- a/var/spack/repos/builtin/packages/r-sass/package.py +++ b/var/spack/repos/builtin/packages/r-sass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RSass(RPackage): cran = "sass" + license("MIT") + version("0.4.5", sha256="eba161d982d2db108c8c0b61ec6b41a20d3adec430c7cc39537ab388c1007a90") version("0.4.2", sha256="b409049d0de9fae853f46c19d353226c8e9244ce847bdada033d8669fc2c9646") version("0.4.1", sha256="850fcb6bd49085d5afd25ac18da0744234385baf1f13d8c0a320f4da2de608bb") diff --git a/var/spack/repos/builtin/packages/r-satellite/package.py b/var/spack/repos/builtin/packages/r-satellite/package.py index 7f2e10a43f79ce..c5bb5a77ba2f5e 100644 --- a/var/spack/repos/builtin/packages/r-satellite/package.py +++ b/var/spack/repos/builtin/packages/r-satellite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RSatellite(RPackage): cran = "satellite" + license("MIT") + version("1.0.4", sha256="99e79577a70489930c32da46ac26453af53e21c2d3a99f51fbf1f55f2d80dc7c") version("1.0.2", sha256="6447476bd31216e5abe504221e465677954d07419b4174ab4f4e4f7a197969c5") diff --git a/var/spack/repos/builtin/packages/r-scaledmatrix/package.py b/var/spack/repos/builtin/packages/r-scaledmatrix/package.py index 4f8349781e3e5c..d1c82e171d2197 100644 --- a/var/spack/repos/builtin/packages/r-scaledmatrix/package.py +++ b/var/spack/repos/builtin/packages/r-scaledmatrix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index 02f603e4a1b3c2..d431c428f886a4 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RScales(RPackage): cran = "scales" + license("MIT") + version("1.2.1", sha256="59453e6dbdafee93dfb101e4d86048a62a12898134259d3ef02d65aeec57ed08") version("1.2.0", sha256="185d50240e6b3e84d36ec7fbca6aef7a85db7c8c1b0dde51d4af28d363ce02df") version("1.1.1", sha256="40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705") diff --git a/var/spack/repos/builtin/packages/r-scater/package.py b/var/spack/repos/builtin/packages/r-scater/package.py index c8778d192f39b6..7df42b07cc87c5 100644 --- a/var/spack/repos/builtin/packages/r-scater/package.py +++ b/var/spack/repos/builtin/packages/r-scater/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-scattermore/package.py b/var/spack/repos/builtin/packages/r-scattermore/package.py index 31a9dfe509be47..84f03f3dcf8f43 100644 --- a/var/spack/repos/builtin/packages/r-scattermore/package.py +++ b/var/spack/repos/builtin/packages/r-scattermore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RScattermore(RPackage): cran = "scattermore" + license("GPL-3.0-or-later") + version("0.8", sha256="dbdd73d8261cb063464bb29d5c17733b7e87bc50a19948bc80439e19f2a9f8e5") version("0.7", sha256="f36280197b8476314d6ce81a51c4ae737180b180204043d2937bc25bf3a5dfa2") diff --git a/var/spack/repos/builtin/packages/r-scatterpie/package.py b/var/spack/repos/builtin/packages/r-scatterpie/package.py index 4af673eaa10d00..6fdd0ba32c9a13 100644 --- a/var/spack/repos/builtin/packages/r-scatterpie/package.py +++ b/var/spack/repos/builtin/packages/r-scatterpie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RScatterpie(RPackage): cran = "scatterpie" + license("Artistic-2.0") + version("0.1.9", sha256="517fd6cc297aa33f0fbb2643e35ca41dc971166ea2e8ed78460bd4ef7a77a687") version("0.1.8", sha256="a6ccc63a8be63fa113704cf5d4893c1ec1b75d3081ab971bd70e650e708872a0") version("0.1.7", sha256="3f7807519cfe135066ca79c8d8a09b59da9aa6d8aaee5e9aff40cca3d0bebade") diff --git a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py index 76d4193f3f4bca..f9f96803ee60b3 100644 --- a/var/spack/repos/builtin/packages/r-scatterplot3d/package.py +++ b/var/spack/repos/builtin/packages/r-scatterplot3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RScatterplot3d(RPackage): cran = "scatterplot3d" + license("GPL-2.0-only") + version("0.3-43", sha256="90d7bfb535b76008768306ea9209adfb48e0e07f36eabbb59ab6ddb6522f16a5") version("0.3-42", sha256="a9fedde70e1a846c4dcafbff20f115425206d507896d12c2b21ff052556c5216") version("0.3-41", sha256="4c8326b70a3b2d37126ca806771d71e5e9fe1201cfbe5b0d5a0a83c3d2c75d94") diff --git a/var/spack/repos/builtin/packages/r-scdblfinder/package.py b/var/spack/repos/builtin/packages/r-scdblfinder/package.py index 8a6ef79ba1799a..de058eb6d82ed5 100644 --- a/var/spack/repos/builtin/packages/r-scdblfinder/package.py +++ b/var/spack/repos/builtin/packages/r-scdblfinder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RScdblfinder(RPackage): bioc = "scDblFinder" + license("GPL-3.0-only") + version("1.14.0", commit="6191ed09b87d7c54809a721d1d6c50c0027cf0a9") version("1.12.0", commit="65a88be3a4ca98ccad0a1829a19652df1a3c94fd") version("1.10.0", commit="03512cad0cdfe3cddbef66ec5e330b53661eccfc") diff --git a/var/spack/repos/builtin/packages/r-scran/package.py b/var/spack/repos/builtin/packages/r-scran/package.py index 7ed0479b18e893..494607b9525140 100644 --- a/var/spack/repos/builtin/packages/r-scran/package.py +++ b/var/spack/repos/builtin/packages/r-scran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-scrime/package.py b/var/spack/repos/builtin/packages/r-scrime/package.py index 9b0c084a36c6e4..55d6255731d28b 100644 --- a/var/spack/repos/builtin/packages/r-scrime/package.py +++ b/var/spack/repos/builtin/packages/r-scrime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class RScrime(RPackage): cran = "scrime" + license("GPL-2.0-only") + version("1.3.5", sha256="5d97d3e57d8eb30709340fe572746029fd139456d7a955421c4e3aa75d825578") diff --git a/var/spack/repos/builtin/packages/r-scs/package.py b/var/spack/repos/builtin/packages/r-scs/package.py index 47b86dbc476794..c6f31f98e0fd17 100644 --- a/var/spack/repos/builtin/packages/r-scs/package.py +++ b/var/spack/repos/builtin/packages/r-scs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RScs(RPackage): cran = "scs" + license("GPL-3.0-only") + version("3.2.4", sha256="c3f39874bf4532fa8c2f2e2c41533ba4fe20b61cf6dfc6314407dc981621298f") version("3.0-1", sha256="d6881eeec7282f8bfbf60847327786e7f90299e4b8c0b084d8bd11fec7705913") diff --git a/var/spack/repos/builtin/packages/r-sctransform/package.py b/var/spack/repos/builtin/packages/r-sctransform/package.py index aaef9183d28a14..345c4d9a2aa82d 100644 --- a/var/spack/repos/builtin/packages/r-sctransform/package.py +++ b/var/spack/repos/builtin/packages/r-sctransform/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RSctransform(RPackage): cran = "sctransform" + license("GPL-3.0-only OR custom") + version("0.3.5", sha256="c08e56df05d64ed04ee53eb9e1d4d321da8aff945e36d56db1d5ceb1cd7e6e0b") version("0.3.3", sha256="83af125c40f211e1ddae5098f88766aea1453c02ae98486081f3efadb3620b2b") version("0.3.2", sha256="5dbb0a045e514c19f51bbe11c2dba0b72dca1942d6eb044c36b0538b443475dc") diff --git a/var/spack/repos/builtin/packages/r-scuttle/package.py b/var/spack/repos/builtin/packages/r-scuttle/package.py index 9601d33c5e8879..42e8ac5e8fa5f0 100644 --- a/var/spack/repos/builtin/packages/r-scuttle/package.py +++ b/var/spack/repos/builtin/packages/r-scuttle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-sdmtools/package.py b/var/spack/repos/builtin/packages/r-sdmtools/package.py index 784e528ef58894..c7682bc3e37f24 100644 --- a/var/spack/repos/builtin/packages/r-sdmtools/package.py +++ b/var/spack/repos/builtin/packages/r-sdmtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-segmented/package.py b/var/spack/repos/builtin/packages/r-segmented/package.py index c9dd2cb54b937f..71a2c7cf9910ad 100644 --- a/var/spack/repos/builtin/packages/r-segmented/package.py +++ b/var/spack/repos/builtin/packages/r-segmented/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RSegmented(RPackage): cran = "segmented" + license("GPL-2.0-or-later") + version("1.6-4", sha256="472c08ae3eb1c4e784aba45f3e745b0e946bef77c26fbb9f103fd35e1a349191") version("1.6-1", sha256="f609ca311c8ca45a7b0776b47d9df06aa175c4f17f8e7e9b33c64902ee00d56f") version("1.6-0", sha256="6baf7f0a4f5d37b945312d28fcbca47cc3c171d097c43a28cf7ffc998a4ce569") diff --git a/var/spack/repos/builtin/packages/r-selectr/package.py b/var/spack/repos/builtin/packages/r-selectr/package.py index 883786349cb5ff..a412fdd83cf207 100644 --- a/var/spack/repos/builtin/packages/r-selectr/package.py +++ b/var/spack/repos/builtin/packages/r-selectr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSelectr(RPackage): cran = "selectr" + license("BSD-3-Clause") + version("0.4-2", sha256="5588aed05f3f5ee63c0d29953ef53da5dac7afccfdd04b7b22ef24e1e3b0c127") version("0.4-1", sha256="8bd42f167629344e485e586f9b05fed342746132489079084d82133d7b3ee2ca") version("0.4-0", sha256="40cd51bfe499954b300742c49f92167a68964b974268a7f47ca8864f32020ece") diff --git a/var/spack/repos/builtin/packages/r-seqinr/package.py b/var/spack/repos/builtin/packages/r-seqinr/package.py index 278c13b498cf45..dd12e8fa2aac44 100644 --- a/var/spack/repos/builtin/packages/r-seqinr/package.py +++ b/var/spack/repos/builtin/packages/r-seqinr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RSeqinr(RPackage): cran = "seqinr" + license("GPL-2.0-or-later") + version("4.2-30", sha256="faf8fe533867eeef57fddfa6592e19d5984954d0670c6c7dbeab6411d55fee4b") version("4.2-16", sha256="c4f3253832fc255197bdce7b4dd381db606c6b787d2e888751b4963acf3a4032") version("4.2-8", sha256="584b34e9dec0320cef02096eb356a0f6115bbd24356cf62e67356963e9d5e9f7") diff --git a/var/spack/repos/builtin/packages/r-seqlogo/package.py b/var/spack/repos/builtin/packages/r-seqlogo/package.py index c854dd9ae9daaf..df299a5a7d01b4 100644 --- a/var/spack/repos/builtin/packages/r-seqlogo/package.py +++ b/var/spack/repos/builtin/packages/r-seqlogo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-servr/package.py b/var/spack/repos/builtin/packages/r-servr/package.py index aec8be0bf60f32..9766f0b22b2441 100644 --- a/var/spack/repos/builtin/packages/r-servr/package.py +++ b/var/spack/repos/builtin/packages/r-servr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RServr(RPackage): cran = "servr" + license("GPL-2.0-or-later") + version("0.26", sha256="7588d7e00d5b2f77b0737f164f3d7b0ba7b1e8b60c0372a1d6452096e2d2031c") version("0.25", sha256="e6ae0d4c09e9037268b1c291c36c93ba0a74c31fe2fcb1f0652b2ae9fca5e73c") version("0.24", sha256="d94e1d31802ce6bbab7a5838ff94cbca8cd998237d834ff25fedf7514f41a087") diff --git a/var/spack/repos/builtin/packages/r-sessioninfo/package.py b/var/spack/repos/builtin/packages/r-sessioninfo/package.py index 41cea7878df1e6..ef24c5f5bd01f3 100644 --- a/var/spack/repos/builtin/packages/r-sessioninfo/package.py +++ b/var/spack/repos/builtin/packages/r-sessioninfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSessioninfo(RPackage): cran = "sessioninfo" + license("GPL-2.0-only") + version("1.2.2", sha256="f56283857c53ac8691e3747ed48fe03e893d8ff348235bff7364658bcfb0c7cb") version("1.1.1", sha256="166b04678448a7decd50f24afabe5e2ad613e3c55b180ef6e8dd7a870a1dae48") diff --git a/var/spack/repos/builtin/packages/r-sets/package.py b/var/spack/repos/builtin/packages/r-sets/package.py index 289b03d111d025..308610786d0004 100644 --- a/var/spack/repos/builtin/packages/r-sets/package.py +++ b/var/spack/repos/builtin/packages/r-sets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSets(RPackage): maintainers("jgaeb") + license("GPL-2.0-only") + version("1.0-24", sha256="e75733f5c9418eb09fb950a4a94ccf84ddd88231c61ee80d02b7f0917debcac9") version("1.0-23", sha256="e5b6bc52060421c572d7f2d99b25909a38eacabd5344a47e1cdb2662c62d690b") version("1.0-22", sha256="6fbf9aa6b0113a58e04f803ab35593feabb0fb55d486d54afb59e027008f9ec6") diff --git a/var/spack/repos/builtin/packages/r-seurat/package.py b/var/spack/repos/builtin/packages/r-seurat/package.py index d5564e07d3cc0b..f8483751fccf5c 100644 --- a/var/spack/repos/builtin/packages/r-seurat/package.py +++ b/var/spack/repos/builtin/packages/r-seurat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-seuratobject/package.py b/var/spack/repos/builtin/packages/r-seuratobject/package.py index 1f443880a22151..74d32ae36f8f4c 100644 --- a/var/spack/repos/builtin/packages/r-seuratobject/package.py +++ b/var/spack/repos/builtin/packages/r-seuratobject/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py index d06183e8b000af..4328390a65b17d 100644 --- a/var/spack/repos/builtin/packages/r-sf/package.py +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSf(RPackage): cran = "sf" + license("GPL-2.0-only OR MIT") + version("1.0-12", sha256="3778ebf58d824b1dfa6297ca8363714d5d85eda04c55ab2bf39597cac1d91287") version("1.0-9", sha256="85c0c71a0a64750281e79aa96e36d13e6285927008b2d37d699e52aba7d8013b") version("1.0-8", sha256="3ddc7090e79d6b5e3fad69e01254677ab5ec86a0b25e7e73493c8eac0ea98732") diff --git a/var/spack/repos/builtin/packages/r-sfheaders/package.py b/var/spack/repos/builtin/packages/r-sfheaders/package.py index e40e6d7881313e..46d0172e3fbb24 100644 --- a/var/spack/repos/builtin/packages/r-sfheaders/package.py +++ b/var/spack/repos/builtin/packages/r-sfheaders/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSfheaders(RPackage): cran = "sfheaders" + license("MIT") + version("0.4.2", sha256="ed9fb934c537fb6f126886f8e5997727de856e32fc3d38911b61a3a83faa7b2c") version("0.4.0", sha256="86bcd61018a0491fc8a1e7fb0422c918296287b82be299a79ccee8fcb515e045") diff --git a/var/spack/repos/builtin/packages/r-sfsmisc/package.py b/var/spack/repos/builtin/packages/r-sfsmisc/package.py index 66f2eeb3b40cd1..e024fa2f8be048 100644 --- a/var/spack/repos/builtin/packages/r-sfsmisc/package.py +++ b/var/spack/repos/builtin/packages/r-sfsmisc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RSfsmisc(RPackage): cran = "sfsmisc" + license("GPL-2.0-or-later") + version("1.1-15", sha256="4afa42cf83a287f62cac21741fc0559dee9dbd69dee59a740defce9a0e7c81e6") version("1.1-13", sha256="a81710357de2dcdaf00d9fa30a29cde0dd83616edc358452fd6105ea88f34218") version("1.1-12", sha256="9b12184a28fff87cacd0c3602d0cf63acb4d0f3049ad3a6ff16177f6df350782") diff --git a/var/spack/repos/builtin/packages/r-sftime/package.py b/var/spack/repos/builtin/packages/r-sftime/package.py index 6000da04d0eb20..bea456930e077c 100644 --- a/var/spack/repos/builtin/packages/r-sftime/package.py +++ b/var/spack/repos/builtin/packages/r-sftime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-shadowtext/package.py b/var/spack/repos/builtin/packages/r-shadowtext/package.py index b04e03d9f73e6e..f7f9eefa0a5bfc 100644 --- a/var/spack/repos/builtin/packages/r-shadowtext/package.py +++ b/var/spack/repos/builtin/packages/r-shadowtext/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RShadowtext(RPackage): cran = "shadowtext" + license("Artistic-2.0") + version("0.1.2", sha256="253c4e737dbb302aa0729e5074e84cbfde2a73bfd7a0fd2c74b557cb728bae7d") version("0.1.1", sha256="eb06581d7ed06c963eee47548932688fd48eba70b3ebd2a7b41a6501d6e00006") version("0.0.7", sha256="6e32b1dfd3d4816803848b876666185258b888286ec3d3e8500499ec3eba31e8") diff --git a/var/spack/repos/builtin/packages/r-shape/package.py b/var/spack/repos/builtin/packages/r-shape/package.py index 7eeea0c1213578..338cebd9601a7f 100644 --- a/var/spack/repos/builtin/packages/r-shape/package.py +++ b/var/spack/repos/builtin/packages/r-shape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RShape(RPackage): cran = "shape" + license("GPL-3.0-or-later") + version("1.4.6", sha256="b9103e5ed05c223c8147dbe3b87a0d73184697343634a353a2ae722f7ace0b7b") version("1.4.5", sha256="094a79b8f42226189227fd7af71868e42106caa25a4d7f80a26977e8bc84189f") version("1.4.4", sha256="f4cb1b7d7c84cf08d2fa97f712ea7eb53ed5fa16e5c7293b820bceabea984d41") diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index bc060627e191e4..b969837c621cae 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RShiny(RPackage): cran = "shiny" + license("GPL-3.0-only OR custom") + version("1.7.4", sha256="bbfcdd7375013b8f59248b3f3f4e752acd445feb25179f3f7f65cd69614da4b5") version("1.7.3", sha256="b8ca9a39fa69ea9b270a7e9037198d95122c79bd493b865d909d343dd3523ada") version("1.7.2", sha256="23b5bfee8d597b4147e07c89391a735361cd9f69abeecfd9bd38a14d35fe6252") diff --git a/var/spack/repos/builtin/packages/r-shinydashboard/package.py b/var/spack/repos/builtin/packages/r-shinydashboard/package.py index 19fda26a28a2b1..654534fffa7f51 100644 --- a/var/spack/repos/builtin/packages/r-shinydashboard/package.py +++ b/var/spack/repos/builtin/packages/r-shinydashboard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RShinydashboard(RPackage): cran = "shinydashboard" + license("GPL-2.0-or-later OR custom") + version("0.7.2", sha256="a56ee48572649830cd8d82f1caa2099411461e19e19223cbad36a375299f3843") version("0.7.1", sha256="51a49945c6b8a684111a2ba4b2a5964e3a50610286ce0378e37ae02316620a4e") version("0.7.0", sha256="0b7b102e9e5bea78ddc4da628d072a358270f2db9b63a6ebe4d8bdce3066d883") diff --git a/var/spack/repos/builtin/packages/r-shinyfiles/package.py b/var/spack/repos/builtin/packages/r-shinyfiles/package.py index 3d1aad884becbd..d912d9fe463c88 100644 --- a/var/spack/repos/builtin/packages/r-shinyfiles/package.py +++ b/var/spack/repos/builtin/packages/r-shinyfiles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-shinyjs/package.py b/var/spack/repos/builtin/packages/r-shinyjs/package.py index 0827496ea9f86d..79d09e3a5674ad 100644 --- a/var/spack/repos/builtin/packages/r-shinyjs/package.py +++ b/var/spack/repos/builtin/packages/r-shinyjs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RShinyjs(RPackage): cran = "shinyjs" + license("MIT") + version("2.1.0", sha256="7ec20cbf1b1fd7a32d85a56dfc0df8b5f67c828d241da400a21d893cb37ea9c5") version("2.0.0", sha256="c2cdd9fab41f6b46bb41b288cd9b3fb3a7fe9627b664e3a58a0cb5dd4c19f8ff") diff --git a/var/spack/repos/builtin/packages/r-shinystan/package.py b/var/spack/repos/builtin/packages/r-shinystan/package.py index 495615ab0dfa51..fe92508b577927 100644 --- a/var/spack/repos/builtin/packages/r-shinystan/package.py +++ b/var/spack/repos/builtin/packages/r-shinystan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RShinystan(RPackage): cran = "shinystan" + license("GPL-3.0-or-later") + version("2.6.0", sha256="a084856a2d66d8744f2c72e3e19ca35e600a508ed7ef1f7ebed8c7fc0738d529") version("2.5.0", sha256="45f9c552a31035c5de8658bb9e5d72da7ec1f88fbddb520d15fe701c677154a1") diff --git a/var/spack/repos/builtin/packages/r-shinythemes/package.py b/var/spack/repos/builtin/packages/r-shinythemes/package.py index 481686dce6a032..428c2aa2c6520d 100644 --- a/var/spack/repos/builtin/packages/r-shinythemes/package.py +++ b/var/spack/repos/builtin/packages/r-shinythemes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RShinythemes(RPackage): cran = "shinythemes" + license("GPL-3.0-only OR custom") + version("1.2.0", sha256="37d68569ce838c7da9f0ea7e2b162ecf38fba2ae448a4888b6dd29c4bb5b2963") depends_on("r@3.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-shortread/package.py b/var/spack/repos/builtin/packages/r-shortread/package.py index 85b766e191d204..da27db85af7190 100644 --- a/var/spack/repos/builtin/packages/r-shortread/package.py +++ b/var/spack/repos/builtin/packages/r-shortread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-siggenes/package.py b/var/spack/repos/builtin/packages/r-siggenes/package.py index d857b2c7c4fd4c..6df0346fdbb351 100644 --- a/var/spack/repos/builtin/packages/r-siggenes/package.py +++ b/var/spack/repos/builtin/packages/r-siggenes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-signac/package.py b/var/spack/repos/builtin/packages/r-signac/package.py index 84bb7113ccc254..0188ca933440a3 100644 --- a/var/spack/repos/builtin/packages/r-signac/package.py +++ b/var/spack/repos/builtin/packages/r-signac/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-simpleaffy/package.py b/var/spack/repos/builtin/packages/r-simpleaffy/package.py index 316142ce319299..d56ef2989372a8 100644 --- a/var/spack/repos/builtin/packages/r-simpleaffy/package.py +++ b/var/spack/repos/builtin/packages/r-simpleaffy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSimpleaffy(RPackage): bioc = "simpleaffy" + license("Unlicense") + version("2.66.0", commit="902db69e4ea4b6d306f0c744d3be600f1418ebc9") version("2.60.0", commit="b32b5e7d5c65e43c10f98ab8684a1086a06d04f9") version("2.58.0", commit="70cf1199bad620f60eaa288279632110bb571200") diff --git a/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py b/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py index b41e444e8a6de4..8ae5347171f37f 100644 --- a/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-singlecellexperiment/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-sitmo/package.py b/var/spack/repos/builtin/packages/r-sitmo/package.py index 28046129b09817..09de1b2c2a9797 100644 --- a/var/spack/repos/builtin/packages/r-sitmo/package.py +++ b/var/spack/repos/builtin/packages/r-sitmo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RSitmo(RPackage): cran = "sitmo" + license("MIT") + version("2.0.2", sha256="448ef8d56e36783354011845daf33f1efb83ea3b9685eea75eaf5134e24fa8c2") version("2.0.1", sha256="0c90d357af334d5c99c8956739dc12623ddd87dda5efa59f4a43f7393c87ed2a") diff --git a/var/spack/repos/builtin/packages/r-sm/package.py b/var/spack/repos/builtin/packages/r-sm/package.py index 5cd7cda3e0168c..60879f612c79d4 100644 --- a/var/spack/repos/builtin/packages/r-sm/package.py +++ b/var/spack/repos/builtin/packages/r-sm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSm(RPackage): cran = "sm" + license("GPL-2.0-or-later") + version("2.2-5.7.1", sha256="ea0cc32eb14f6c18beba0bede66ed37bc5341bd3f76c1a7ae56d7254693e1457") version("2.2-5.7", sha256="2607a2cafc68d7e99005daf99e36f4a66eaf569ebb6b7500e962642cf58be80f") version("2.2-5.6", sha256="b890cd7ebe8ed711ab4a3792c204c4ecbe9e6ca1fd5bbc3925eba5833a839c30") diff --git a/var/spack/repos/builtin/packages/r-smoof/package.py b/var/spack/repos/builtin/packages/r-smoof/package.py index 7cb7eda5a1759b..6a3144ec782348 100644 --- a/var/spack/repos/builtin/packages/r-smoof/package.py +++ b/var/spack/repos/builtin/packages/r-smoof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSmoof(RPackage): cran = "smoof" + license("BSD-2-Clause") + version("1.6.0.3", sha256="af8664b152876c545f6545528de6e05a289d0714103fac7afc52960a9a855fb1") version("1.6.0.2", sha256="d82dba9702eade00afb84c2c12167de6cec790be7d23ac227f8fe705bdcefc93") version("1.5.1", sha256="cfb6f6460e9593351428656b225b5ba3867a216d35a05f2babdb20db6ba35306") diff --git a/var/spack/repos/builtin/packages/r-sn/package.py b/var/spack/repos/builtin/packages/r-sn/package.py index 567b5ee3313289..31c04143db0874 100644 --- a/var/spack/repos/builtin/packages/r-sn/package.py +++ b/var/spack/repos/builtin/packages/r-sn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RSn(RPackage): cran = "sn" + license("GPL-2.0-only OR GPL-3.0-only") + version("2.1.1", sha256="f9f6b56d91dc7cb18dc8308d0875b9648c90b268d1aaf8f4c5164ff016df22bd") version("2.1.0", sha256="495f9baed26e2e70357eda996fdb327ccc22673486e375686c32daec727a448b") version("2.0.2", sha256="957b49027c2111f51893433e902486141a942a5ed384ca605714605de80d1790") diff --git a/var/spack/repos/builtin/packages/r-snakecase/package.py b/var/spack/repos/builtin/packages/r-snakecase/package.py index d8eef5f7dfa997..fc895fbf5b0d25 100644 --- a/var/spack/repos/builtin/packages/r-snakecase/package.py +++ b/var/spack/repos/builtin/packages/r-snakecase/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RSnakecase(RPackage): cran = "snakecase" + license("GPL-3.0-only") + version("0.11.0", sha256="998420a58391ac85785e60bcdf6fd6927c82758ad2859a9a73a0e57299e8c1cf") depends_on("r@3.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-snow/package.py b/var/spack/repos/builtin/packages/r-snow/package.py index d16983bdece111..e2f0baa1524eb7 100644 --- a/var/spack/repos/builtin/packages/r-snow/package.py +++ b/var/spack/repos/builtin/packages/r-snow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RSnow(RPackage): cran = "snow" + license("GPL-2.0-or-later") + version("0.4-4", sha256="84587f46f222a96f3e2fde10ad6ec6ddbd878f4e917cd926d632f61a87db13c9") version("0.4-3", sha256="8512537daf334ea2b8074dbb80cf5e959a403a78d68bc1e97664e8a4f64576d8") version("0.4-2", sha256="ee070187aea3607c9ca6235399b3db3e181348692405d038e962e06aefccabd7") diff --git a/var/spack/repos/builtin/packages/r-snowfall/package.py b/var/spack/repos/builtin/packages/r-snowfall/package.py index 99702dd96305c9..0f5473d70d8d88 100644 --- a/var/spack/repos/builtin/packages/r-snowfall/package.py +++ b/var/spack/repos/builtin/packages/r-snowfall/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSnowfall(RPackage): cran = "snowfall" + license("GPL-2.0-or-later") + version("1.84-6.2", sha256="9b467ab2b992455c6e1aeabe375c5694761fa1cf8aaf4f003ca47102b656353b") version("1.84-6.1", sha256="5c446df3a931e522a8b138cf1fb7ca5815cc82fcf486dbac964dcbc0690e248d") diff --git a/var/spack/repos/builtin/packages/r-snprelate/package.py b/var/spack/repos/builtin/packages/r-snprelate/package.py index b61a9bcf2e34e0..5ce53283911787 100644 --- a/var/spack/repos/builtin/packages/r-snprelate/package.py +++ b/var/spack/repos/builtin/packages/r-snprelate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-snpstats/package.py b/var/spack/repos/builtin/packages/r-snpstats/package.py index b4038acea31c23..aed788cd8ed5dc 100644 --- a/var/spack/repos/builtin/packages/r-snpstats/package.py +++ b/var/spack/repos/builtin/packages/r-snpstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-som/package.py b/var/spack/repos/builtin/packages/r-som/package.py index 9f7a7703e5911d..4c1515240d5f7b 100644 --- a/var/spack/repos/builtin/packages/r-som/package.py +++ b/var/spack/repos/builtin/packages/r-som/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RSom(RPackage): cran = "som" + license("GPL-3.0-or-later") + version("0.3-5.1", sha256="a6f4c0e5b36656b7a8ea144b057e3d7642a8b71972da387a7133f3dd65507fb9") version("0.3-5", sha256="f7672afaaffcf41a8b2dd50e4c76b3a640ea2ad099f18b5dfcf00389abf6ba07") version("0.3-4", sha256="679e3d3f0af6e56da3b0a4d8577334e03ad45fe76916bbc2592548f85b6b1c84") diff --git a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py index ebc211ad61f3df..6dc7f47020bd34 100644 --- a/var/spack/repos/builtin/packages/r-somaticsignatures/package.py +++ b/var/spack/repos/builtin/packages/r-somaticsignatures/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RSomaticsignatures(RPackage): bioc = "SomaticSignatures" + license("MIT") + version("2.36.0", commit="26ce72c1fc771f711796eccee0a24c1070d33066") version("2.34.0", commit="249b1ef7cef3c94cfb96cc8aa2a16e00c2bd5d1f") version("2.32.0", commit="444d37661d147618f6830fd5de01a83ddf2a694d") diff --git a/var/spack/repos/builtin/packages/r-sourcetools/package.py b/var/spack/repos/builtin/packages/r-sourcetools/package.py index 0d58744285c66f..f356242224e5eb 100644 --- a/var/spack/repos/builtin/packages/r-sourcetools/package.py +++ b/var/spack/repos/builtin/packages/r-sourcetools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSourcetools(RPackage): cran = "sourcetools" + license("MIT") + version("0.1.7-1", sha256="96812bdb7a0dd99690d84e4b0a3def91389e4290f53f01919ef28a50554e31d1") version("0.1.7", sha256="47984406efb3b3face133979ccbae9fefb7360b9a6ca1a1c11473681418ed2ca") version("0.1.6", sha256="c9f48d2f0b7f7ed0e7fecdf8e730b0b80c4d567f0e1e880d118b0944b1330c51") diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index ef9069039f4cad..b0c228fd6dc977 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RSp(RPackage): cran = "sp" + license("GPL-2.0-or-later") + version("1.6-0", sha256="f5977fbe80e7dee8e95d41fe0ef9d87c2c984422bb529ea5211fd38a13f9fcda") version("1.5-1", sha256="69b9eab481d389bbb736d2adcf50c180aca248c3ffc4ebda8ffe2accc5f229df") version("1.5-0", sha256="939a06adf78ec8de7a663d6ca5bba426780852b357773446b00cc298200ff81c") diff --git a/var/spack/repos/builtin/packages/r-spacetime/package.py b/var/spack/repos/builtin/packages/r-spacetime/package.py index c8e541822aeb14..e3c0310fcbff62 100644 --- a/var/spack/repos/builtin/packages/r-spacetime/package.py +++ b/var/spack/repos/builtin/packages/r-spacetime/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RSpacetime(RPackage): cran = "spacetime" + license("GPL-2.0-or-later") + version("1.3-0", sha256="2e9902a5c6f355f0b8e23237cf3b1553f22d7d79493bdbdb99e49104b9ef541b") version("1.2-8", sha256="4297a027ab4cff32e41cec65aa7d92af66c7a885fd2322b010b0af9a14f24c59") version("1.2-6", sha256="8fd46606ed9589ffce19368d40004890f96e8fe77f13b546e6a2f8b9ced0dd81") diff --git a/var/spack/repos/builtin/packages/r-spades-addins/package.py b/var/spack/repos/builtin/packages/r-spades-addins/package.py index 1c93f3ebb3c7b8..cbeb81e6166e90 100644 --- a/var/spack/repos/builtin/packages/r-spades-addins/package.py +++ b/var/spack/repos/builtin/packages/r-spades-addins/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spades-core/package.py b/var/spack/repos/builtin/packages/r-spades-core/package.py index b8ef92f7febd29..4aacc1dd26cb16 100644 --- a/var/spack/repos/builtin/packages/r-spades-core/package.py +++ b/var/spack/repos/builtin/packages/r-spades-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spades-tools/package.py b/var/spack/repos/builtin/packages/r-spades-tools/package.py index 83c98b0e21ed5c..809ad5f86d3453 100644 --- a/var/spack/repos/builtin/packages/r-spades-tools/package.py +++ b/var/spack/repos/builtin/packages/r-spades-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spades/package.py b/var/spack/repos/builtin/packages/r-spades/package.py index f369f819bf175e..f7db62f71dfb7c 100644 --- a/var/spack/repos/builtin/packages/r-spades/package.py +++ b/var/spack/repos/builtin/packages/r-spades/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spam/package.py b/var/spack/repos/builtin/packages/r-spam/package.py index f8b552b1d86915..845a6147f30f12 100644 --- a/var/spack/repos/builtin/packages/r-spam/package.py +++ b/var/spack/repos/builtin/packages/r-spam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RSpam(RPackage): cran = "spam" + license("LGPL-2.0-only OR BSD-3-Clause") + version("2.9-1", sha256="c32e219279988b1bfc258aaf64f5a46efa558202848a9ae64946ffbe8b497ddb") version("2.8-0", sha256="d98177435b028d1c706d0197ea8132bfaffae6052c3ce6064a7f64178512d6aa") version("2.6-0", sha256="638fdd658e94f7544b46f6b6568b20a9f390bcd703aff572a3a5249fef66be5c") diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index 89233d62aca92a..0c9254fad8a8df 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py b/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py index 7bb2e38b0c7aa5..4b513cd2f41120 100644 --- a/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py +++ b/var/spack/repos/builtin/packages/r-sparsematrixstats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatial/package.py b/var/spack/repos/builtin/packages/r-spatial/package.py index e43487cc2cf868..401e685f9c5d54 100644 --- a/var/spack/repos/builtin/packages/r-spatial/package.py +++ b/var/spack/repos/builtin/packages/r-spatial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RSpatial(RPackage): cran = "spatial" + license("GPL-2.0-only OR GPL-3.0-only") + version("7.3-16", sha256="e46565a64c5ec148a77789867e5103746462a41de294539b230bad2a0e16e406") version("7.3-15", sha256="e5613be94d6f5c1f54813dadc96e4a86b3417dea28106cc90cb24dfd6c3c8cef") version("7.3-12", sha256="7639039ee7407bd088e1b253376b2cb4fcdf4cc9124d6b48e4119d5cda872d63") diff --git a/var/spack/repos/builtin/packages/r-spatialeco/package.py b/var/spack/repos/builtin/packages/r-spatialeco/package.py index 8b29bb5ef49115..40b51335c87910 100644 --- a/var/spack/repos/builtin/packages/r-spatialeco/package.py +++ b/var/spack/repos/builtin/packages/r-spatialeco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatialpack/package.py b/var/spack/repos/builtin/packages/r-spatialpack/package.py index b58de2d2e08939..8e996635505157 100644 --- a/var/spack/repos/builtin/packages/r-spatialpack/package.py +++ b/var/spack/repos/builtin/packages/r-spatialpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatialreg/package.py b/var/spack/repos/builtin/packages/r-spatialreg/package.py index 525873d2e77c2e..7f187dbf57c166 100644 --- a/var/spack/repos/builtin/packages/r-spatialreg/package.py +++ b/var/spack/repos/builtin/packages/r-spatialreg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,6 +33,8 @@ class RSpatialreg(RPackage): cran = "spatialreg" + license("GPL-2.0-only") + version("1.2-8", sha256="150cb77ca09800d93af7de37440072d59ac7e41acb45ab42fc1c0e59edd7f9de") version("1.2-6", sha256="9b384117a31ab5fe830325b3eacbec5eb9d40bf0e9ca3c75ea15ca6b78fbd41d") version("1.2-3", sha256="09e0e65f043975d5c1d4be99ef9f29cf0790e962dcde9b7e45a7027d268fce22") diff --git a/var/spack/repos/builtin/packages/r-spatstat-core/package.py b/var/spack/repos/builtin/packages/r-spatstat-core/package.py index 97aad754a72149..857f8dd8d1de34 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-core/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-data/package.py b/var/spack/repos/builtin/packages/r-spatstat-data/package.py index da4bef95f5983e..bcb503e91d9412 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-data/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-explore/package.py b/var/spack/repos/builtin/packages/r-spatstat-explore/package.py index 90db8dafd37dad..373c33f4255dfe 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-explore/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-explore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-geom/package.py b/var/spack/repos/builtin/packages/r-spatstat-geom/package.py index a8442dedb549a9..8070c59daf6bad 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-geom/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-geom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py b/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py index f096d10c637bd6..cae0f1106f143f 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-linnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-model/package.py b/var/spack/repos/builtin/packages/r-spatstat-model/package.py index aee2dfd5ba6ce0..1a84bfd784dc39 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-model/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-model/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-random/package.py b/var/spack/repos/builtin/packages/r-spatstat-random/package.py index 840519b77bcc97..2a8cf215742877 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-random/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-random/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py b/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py index 4d28b1102ea5c5..932c51884ffa1e 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat-utils/package.py b/var/spack/repos/builtin/packages/r-spatstat-utils/package.py index 8dec99444e921e..2a5490c177afb9 100644 --- a/var/spack/repos/builtin/packages/r-spatstat-utils/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spatstat/package.py b/var/spack/repos/builtin/packages/r-spatstat/package.py index 869ef460805451..766b10079e68ea 100644 --- a/var/spack/repos/builtin/packages/r-spatstat/package.py +++ b/var/spack/repos/builtin/packages/r-spatstat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -48,6 +48,8 @@ class RSpatstat(RPackage): cran = "spatstat" + license("GPL-2.0-or-later") + version("3.0-5", sha256="b926ed55dfeb95b09fb441f44d85204277eee00e42ac258c0a08baa1ce263bb1") version("2.3-4", sha256="4ea0f8d70b926b92bf4a06521f985a0bb6d573619f5d526957c87860ccb999da") version("2.3-0", sha256="da02443722f2c7ef9d59a2799b7b8002c94cecf73f2b0d2b29280d39f49c4c06") diff --git a/var/spack/repos/builtin/packages/r-spdata/package.py b/var/spack/repos/builtin/packages/r-spdata/package.py index 56363e94cff258..7a4a7e225ebbe7 100644 --- a/var/spack/repos/builtin/packages/r-spdata/package.py +++ b/var/spack/repos/builtin/packages/r-spdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-spdep/package.py b/var/spack/repos/builtin/packages/r-spdep/package.py index e92c2683fc8144..63f980382cd8bf 100644 --- a/var/spack/repos/builtin/packages/r-spdep/package.py +++ b/var/spack/repos/builtin/packages/r-spdep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RSpdep(RPackage): cran = "spdep" + license("GPL-2.0-or-later") + version("1.2-8", sha256="8d9fb4cb10d1035526ad6d9f7a11972efb0e3137dcff176d73df6ebfe96c9190") version("1.2-7", sha256="9dac594825bf2d0aa31e845bfec05d8ce206327840fe455391741dbbdf9c9eea") version("1.2-4", sha256="a9f4d5af56efb1a2bcd3e85fe4d0e8a42896a2c30a790b2487e1ebadf398a677") diff --git a/var/spack/repos/builtin/packages/r-speedglm/package.py b/var/spack/repos/builtin/packages/r-speedglm/package.py index ba095cab7c8c82..9ec7b5a82472ae 100644 --- a/var/spack/repos/builtin/packages/r-speedglm/package.py +++ b/var/spack/repos/builtin/packages/r-speedglm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RSpeedglm(RPackage): cran = "speedglm" + license("GPL-2.0-or-later") + version("0.3-4", sha256="1a12db7dbceaaf5cf4f9a0c03e2a2b9f32e91b697daf2ccfe81bbae9ac3046ce") version("0.3-3", sha256="d065d0ee42fb772760fca8d97ad2aa56cd76b1d9ecb4e97478ec362429e16738") version("0.3-2", sha256="5fcaf18324dc754152f528a44894944063303f780d33e58569ea7c306bfc45ac") diff --git a/var/spack/repos/builtin/packages/r-spem/package.py b/var/spack/repos/builtin/packages/r-spem/package.py index 5ddb1b986a007d..760f3562e001d9 100644 --- a/var/spack/repos/builtin/packages/r-spem/package.py +++ b/var/spack/repos/builtin/packages/r-spem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-splancs/package.py b/var/spack/repos/builtin/packages/r-splancs/package.py index e31d4875b6b37d..2dbe2fb03352e7 100644 --- a/var/spack/repos/builtin/packages/r-splancs/package.py +++ b/var/spack/repos/builtin/packages/r-splancs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSplancs(RPackage): cran = "splancs" + license("GPL-2.0-or-later") + version("2.01-43", sha256="b351565e1f69f6c86a29d921d3a18d5896c4586e2ab8c73bb3df8e75630fc448") version("2.01-42", sha256="8c0af4764521e20b629dba6afd5c284e7be48786f378c37668eacfa26d2ef0aa") version("2.01-40", sha256="79744381ebc4a361740a36dca3c9fca9ae015cfe0bd585b7856a664a3da74363") diff --git a/var/spack/repos/builtin/packages/r-splitstackshape/package.py b/var/spack/repos/builtin/packages/r-splitstackshape/package.py index 0ae9a14d087dba..45c3dc6cbacb5f 100644 --- a/var/spack/repos/builtin/packages/r-splitstackshape/package.py +++ b/var/spack/repos/builtin/packages/r-splitstackshape/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RSplitstackshape(RPackage): cran = "splitstackshape" + license("GPL-3.0-only") + version("1.4.8", sha256="656032c3f1e3dd5b8a3ee19ffcae617e07104c0e342fc3da4d863637a770fe56") version("1.4.6", sha256="b9888f9508babdb8e09f57674facaa8b158a06255ef1e61c8df813f58881860f") version("1.4.4", sha256="78c27fb55459b0cc858cef5c2201a10ae2472a1a0be179e05df05ced2f590f6e") diff --git a/var/spack/repos/builtin/packages/r-sqldf/package.py b/var/spack/repos/builtin/packages/r-sqldf/package.py index 4bd0be9685a7f2..d4643c2049ffaf 100644 --- a/var/spack/repos/builtin/packages/r-sqldf/package.py +++ b/var/spack/repos/builtin/packages/r-sqldf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RSqldf(RPackage): cran = "sqldf" + license("GPL-2.0-only") + version("0.4-11", sha256="cee979d4e8c67b4924655365d925a8d67104e62adf71741f645cdc5196de2260") depends_on("r@3.1.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-squarem/package.py b/var/spack/repos/builtin/packages/r-squarem/package.py index 6e679576b52dc1..cbb3fbfa453104 100644 --- a/var/spack/repos/builtin/packages/r-squarem/package.py +++ b/var/spack/repos/builtin/packages/r-squarem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-squash/package.py b/var/spack/repos/builtin/packages/r-squash/package.py index 68f594b0147092..29702e20ae9478 100644 --- a/var/spack/repos/builtin/packages/r-squash/package.py +++ b/var/spack/repos/builtin/packages/r-squash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSquash(RPackage): cran = "squash" + license("Artistic-2.0") + version("1.0.9", sha256="ff381c85071e3407574e3db28d789657f64e7d3f9d74ac123539de22ab8ac6f4") version("1.0.8", sha256="e6932c0a461d5c85f7180a31d18a3eb4f28afd6769efe251075a4de12de039f4") version("1.0.7", sha256="d2d7182a72dfd93b8b65e775bea11e891c38598fa49a3ed4f92ec1159ffab6f1") diff --git a/var/spack/repos/builtin/packages/r-sseq/package.py b/var/spack/repos/builtin/packages/r-sseq/package.py index db132609cbcda3..0f1363d3cde21b 100644 --- a/var/spack/repos/builtin/packages/r-sseq/package.py +++ b/var/spack/repos/builtin/packages/r-sseq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-stabledist/package.py b/var/spack/repos/builtin/packages/r-stabledist/package.py index 8adb56f921d4b6..747a119144c5e5 100644 --- a/var/spack/repos/builtin/packages/r-stabledist/package.py +++ b/var/spack/repos/builtin/packages/r-stabledist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RStabledist(RPackage): cran = "stabledist" + license("GPL-2.0-or-later") + version("0.7-1", sha256="06c5704d3a3c179fa389675c537c39a006867bc6e4f23dd7e406476ed2c88a69") depends_on("r@3.1.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index ae587cff7a5715..4ce431492efe98 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-stargazer/package.py b/var/spack/repos/builtin/packages/r-stargazer/package.py index 0003535cdca265..ef9126b1a1a496 100644 --- a/var/spack/repos/builtin/packages/r-stargazer/package.py +++ b/var/spack/repos/builtin/packages/r-stargazer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RStargazer(RPackage): cran = "stargazer" + license("GPL-2.0-or-later") + version("5.2.3", sha256="208e9b48a11cf56ce142731c204f3d2bcb5b68719f84309a36362cd925414265") version("5.2.2", sha256="70eb4a13a6ac1bfb35af07cb8a63d501ad38dfd9817fc3fba6724260b23932de") diff --git a/var/spack/repos/builtin/packages/r-stars/package.py b/var/spack/repos/builtin/packages/r-stars/package.py index 1c9355f25ca9eb..20f393bbe3ffde 100644 --- a/var/spack/repos/builtin/packages/r-stars/package.py +++ b/var/spack/repos/builtin/packages/r-stars/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-statmod/package.py b/var/spack/repos/builtin/packages/r-statmod/package.py index 68fea07426ab1f..3f5ba597577145 100644 --- a/var/spack/repos/builtin/packages/r-statmod/package.py +++ b/var/spack/repos/builtin/packages/r-statmod/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RStatmod(RPackage): cran = "statmod" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.5.0", sha256="d61c3ef9b09d55b42e038f8d767fa483ebbdec2a9c7172b1b0ccda0ae0016ec9") version("1.4.37", sha256="90d2c8a79e0cb291f2685686436bcf4c5b9abd2efb84759a8553d1b1adb76913") version("1.4.36", sha256="14e897c83d426caca4d920d3d5bead7ae9a679276b3cb2e227f299ad189d7bc2") diff --git a/var/spack/repos/builtin/packages/r-statnet-common/package.py b/var/spack/repos/builtin/packages/r-statnet-common/package.py index 8e145eb7b2fb3d..f02f6d0cb4cebb 100644 --- a/var/spack/repos/builtin/packages/r-statnet-common/package.py +++ b/var/spack/repos/builtin/packages/r-statnet-common/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-stringfish/package.py b/var/spack/repos/builtin/packages/r-stringfish/package.py index 590393d020f386..14c846404ed634 100644 --- a/var/spack/repos/builtin/packages/r-stringfish/package.py +++ b/var/spack/repos/builtin/packages/r-stringfish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RStringfish(RPackage): maintainers("dorton21") + license("GPL-3.0-only") + version("0.15.7", sha256="34b1703a8876a40860d35f88a94e069832a7d2bc86189ff07af84ff04fd4b735") version("0.15.5", sha256="9df21146a7710e5a9ab4bb53ebc231a580c798b7e541b8d78df53207283f8129") version("0.14.2", sha256="9373cfc715cda1527fd20179435977b8e59e19d8c5ef82a31e519f93fb624ced") diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index 18d1f3bc10a730..abc075ec2a75f1 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RStringi(RPackage): cran = "stringi" + license("custom") + version("1.7.12", sha256="efe8ac2900001f986a75db5641fbb24587a6d23de274a6a85c39dfa58921e009") version("1.7.8", sha256="538918b1cd6ed1d8a2dd5ab146ba800a088e99f93c52dcd82615b6e127478b1c") version("1.7.6", sha256="0ea3d5afec5701977ff53de9afbaceb53b00aa34f5fb641cadc1eeb7759119ec") diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 647b2b4ee94f21..90fcda65fb417d 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RStringr(RPackage): cran = "stringr" + license("MIT") + version("1.5.0", sha256="52b159d7700a139111b4caf939e7c9c6ab3e01185181400d70a74c552826633a") version("1.4.1", sha256="ec0d8e90caa3e107f18c188ed313dea8bfd12a738011b0be09ef5362360ddcb1") version("1.4.0", sha256="87604d2d3a9ad8fd68444ce0865b59e2ffbdb548a38d6634796bbd83eeb931dd") diff --git a/var/spack/repos/builtin/packages/r-strucchange/package.py b/var/spack/repos/builtin/packages/r-strucchange/package.py index 4a15fdede2dbc6..c8828973b8765b 100644 --- a/var/spack/repos/builtin/packages/r-strucchange/package.py +++ b/var/spack/repos/builtin/packages/r-strucchange/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RStrucchange(RPackage): cran = "strucchange" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.5-3", sha256="cac6b4028f68cc8d39202377161d0f7f72ea229b552a5c35769053ab89f90f86") version("1.5-2", sha256="7d247c5ae6f5a63c80e478799d009c57fb8803943aa4286d05f71235cc1002f8") version("1.5-1", sha256="740e2e20477b9fceeef767ae1002adc5ec397cb0f7daba5289a2c23b0dddaf31") diff --git a/var/spack/repos/builtin/packages/r-strucchangercpp/package.py b/var/spack/repos/builtin/packages/r-strucchangercpp/package.py index 2baba494dc2489..0485cece4f508b 100644 --- a/var/spack/repos/builtin/packages/r-strucchangercpp/package.py +++ b/var/spack/repos/builtin/packages/r-strucchangercpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-styler/package.py b/var/spack/repos/builtin/packages/r-styler/package.py index ecc5317d5cf1f9..a64f522bccc1a9 100644 --- a/var/spack/repos/builtin/packages/r-styler/package.py +++ b/var/spack/repos/builtin/packages/r-styler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RStyler(RPackage): cran = "styler" + license("MIT") + version("1.9.1", sha256="c80fa3c062f007645ec820b5b087d4d5784e7797cc88d030ab59fb5823ded0bb") version("1.8.1", sha256="15505fa85f0aa2902bc8af3f00b2aeb205d41a92b77bffbd176d657753ee81e9") version("1.8.0", sha256="4f8b74c1ac158b0a4433b6008da6bb708f3c9ed1c7fb9bb5d79748858cb484c7") diff --git a/var/spack/repos/builtin/packages/r-subplex/package.py b/var/spack/repos/builtin/packages/r-subplex/package.py index 4967b5d4f3a12a..9199d1e852debe 100644 --- a/var/spack/repos/builtin/packages/r-subplex/package.py +++ b/var/spack/repos/builtin/packages/r-subplex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RSubplex(RPackage): cran = "subplex" + license("GPL-3.0-only") + version("1.8", sha256="3bc31d8990380c9f790c9c7d84cb2e39f4945eff934eddfa1196d597465be5a5") version("1.7", sha256="d5ecf4a484936d71cb294f08c3968ef5a8dcbdc861bfc0e97e3b1ab99afff887") version("1.6", sha256="0d05da1622fffcd20a01cc929fc6c2b7df40a8246e7018f7f1f3c175b774cbf9") diff --git a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py index a421fef13066d3..e220e2cd1e5424 100644 --- a/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py +++ b/var/spack/repos/builtin/packages/r-summarizedexperiment/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-suppdists/package.py b/var/spack/repos/builtin/packages/r-suppdists/package.py index 7540b5f8fc1daa..04368370a6d0dd 100644 --- a/var/spack/repos/builtin/packages/r-suppdists/package.py +++ b/var/spack/repos/builtin/packages/r-suppdists/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index ee1dfc2ef42eb1..9cc9e7b6c65a54 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RSurvey(RPackage): cran = "survey" + license("GPL-2.0-only OR GPL-3.0-only") + version("4.1-1", sha256="05e89a1678a39e32bfb41af8a31d643b04fc4d2660a96e701825e6bffcd75a52") version("4.0", sha256="b053f40f4cfa90507ca524f72d3b3a4b4869def52f11f907a14f1c6d90063de1") version("3.36", sha256="90f32e9d2b52eacf881e6717a4b5edfc5a3beb5da516f8372293549589d79475") diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index 2b1cbbebe1a8ae..79b6b0e0293b55 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RSurvival(RPackage): cran = "survival" + license("LGPL-2.0-or-later") + version("3.5-5", sha256="1375a509554b0258e04e27baca2e073e179406e2a9a71e6d3e0c777072568476") version("3.4-0", sha256="a48e23d47265fe4d90fb5f0f9fc388906014f8063211980856985db9e89cf812") version("3.3-1", sha256="14878705cd0c7edcfead79011444aa84f680759293bde8634721c49f37cb4dc7") diff --git a/var/spack/repos/builtin/packages/r-sva/package.py b/var/spack/repos/builtin/packages/r-sva/package.py index 10c6d5d225eb04..5d56201407ebda 100644 --- a/var/spack/repos/builtin/packages/r-sva/package.py +++ b/var/spack/repos/builtin/packages/r-sva/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-svglite/package.py b/var/spack/repos/builtin/packages/r-svglite/package.py index f14b1bf81a6e19..2003f6a798c21f 100644 --- a/var/spack/repos/builtin/packages/r-svglite/package.py +++ b/var/spack/repos/builtin/packages/r-svglite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RSvglite(RPackage): cran = "svglite" + license("GPL-2.0-or-later") + version("2.1.1", sha256="48700169eec1b05dbee9e2bae000aa84c544617b018cb3ac431a128cfd8dac56") version("2.1.0", sha256="ad40f590c7e80ae83001a3826b6e8394ba733446ed51fd55faeda974ab839c9b") version("2.0.0", sha256="76e625fe172a5b7ce99a67b6d631b037b3f7f0021cfe15f2e15e8851b89defa5") diff --git a/var/spack/repos/builtin/packages/r-sys/package.py b/var/spack/repos/builtin/packages/r-sys/package.py index 12b6f0b50eefd7..117130dc41fcf5 100644 --- a/var/spack/repos/builtin/packages/r-sys/package.py +++ b/var/spack/repos/builtin/packages/r-sys/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RSys(RPackage): cran = "sys" + license("MIT") + version("3.4.1", sha256="324e6d8fde58264e62bc04867b719c5fd16296de1542689801b8cb13621ecf52") version("3.4", sha256="17f88fbaf222f1f8fd07919461093dac0e7175ae3c3b3264b88470617afd0487") version("3.2", sha256="2819498461fe2ce83d319d1a47844e86bcea6d01d10861818dba289e7099bbcc") diff --git a/var/spack/repos/builtin/packages/r-systemfonts/package.py b/var/spack/repos/builtin/packages/r-systemfonts/package.py index 48f2f7b9ae31d3..fffb2dcdc7a805 100644 --- a/var/spack/repos/builtin/packages/r-systemfonts/package.py +++ b/var/spack/repos/builtin/packages/r-systemfonts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RSystemfonts(RPackage): cran = "systemfonts" + license("MIT") + version("1.0.4", sha256="ef766c75b942f147d382664a00d6a4930f1bfe0cce9d88943f571682a85a84c0") version("1.0.3", sha256="647c99d5ea6f90a49768ea7b10b39816af6be85168475273369fd973a20dbbba") version("1.0.1", sha256="401db4d9e78e3a5e00b7a0b4fbad7fbb1c584734469b65fe5b7ebe1851c7a797") diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index c9997f14a4841a..9e0cb96f2542cf 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-taxizedb/package.py b/var/spack/repos/builtin/packages/r-taxizedb/package.py index 7c0646b4d0eee7..a920c973f88d18 100644 --- a/var/spack/repos/builtin/packages/r-taxizedb/package.py +++ b/var/spack/repos/builtin/packages/r-taxizedb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTaxizedb(RPackage): cran = "taxizedb" + license("MIT") + version("0.3.1", sha256="452a1b8079e370c1f29a1ff40d731a5b04c935068b1d6b1c5d808e8bebbafd94") version("0.3.0", sha256="5f28338a233f0021097147e74c5f83107e5847de3413eceb308208e39af9fcb4") version("0.1.4", sha256="5a40569a2b5abe56201f112a10220150353412df39b7e8d21ea8698f424cf295") diff --git a/var/spack/repos/builtin/packages/r-tclust/package.py b/var/spack/repos/builtin/packages/r-tclust/package.py index 8d4c340e5b3bb8..964e8746050f48 100644 --- a/var/spack/repos/builtin/packages/r-tclust/package.py +++ b/var/spack/repos/builtin/packages/r-tclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTclust(RPackage): cran = "tclust" + license("GPL-3.0-only") + version("1.5-4", sha256="2b55da5e351c5054c9627f57a43084518a138a1d8097e35a364db0eff63471a8") version("1.5-2", sha256="492674b30a465e5f4a22ba0ce5556ed4d8e57b29090f9b5b94ad655d064e6f8b") version("1.5-1", sha256="73328b30774bb0767d613d7f2b60b75706b19fab864c712645ea18181f1af327") diff --git a/var/spack/repos/builtin/packages/r-teachingdemos/package.py b/var/spack/repos/builtin/packages/r-teachingdemos/package.py index 87e26a6eec9500..72d8ccbcc41aed 100644 --- a/var/spack/repos/builtin/packages/r-teachingdemos/package.py +++ b/var/spack/repos/builtin/packages/r-teachingdemos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tensor/package.py b/var/spack/repos/builtin/packages/r-tensor/package.py index dd9bd207454f33..e739c6a436a41d 100644 --- a/var/spack/repos/builtin/packages/r-tensor/package.py +++ b/var/spack/repos/builtin/packages/r-tensor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class RTensor(RPackage): cran = "tensor" + license("GPL-2.0-or-later") + version("1.5", sha256="e1dec23e3913a82e2c79e76313911db9050fb82711a0da227f94fc6df2d3aea6") version("1.4", sha256="6f1643da018d58a0aaa27260df6fdf687fc36f4cd1964931b3180b7df8c0e642") diff --git a/var/spack/repos/builtin/packages/r-tensora/package.py b/var/spack/repos/builtin/packages/r-tensora/package.py index 2839764aee3999..1e962ddcdbfa52 100644 --- a/var/spack/repos/builtin/packages/r-tensora/package.py +++ b/var/spack/repos/builtin/packages/r-tensora/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTensora(RPackage): cran = "tensorA" + license("GPL-2.0-or-later") + version("0.36.2", sha256="8e8947566bd3b65a54de4269df1abaa3d49cf5bfd2a963c3274a524c8a819ca7") version("0.36.1", sha256="c7ffe12b99867675b5e9c9f31798f9521f14305c9d9f9485b171bcbd8697d09c") version("0.36", sha256="97b3e72f26ca3a756d045008764d787a32c68f0a276fb7a29b6e1b4592fdecf6") diff --git a/var/spack/repos/builtin/packages/r-terra/package.py b/var/spack/repos/builtin/packages/r-terra/package.py index 46a91e1ea1e25a..d71f827e72ae34 100644 --- a/var/spack/repos/builtin/packages/r-terra/package.py +++ b/var/spack/repos/builtin/packages/r-terra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RTerra(RPackage): cran = "terra" + license("GPL-3.0-or-later") + version("1.7-29", sha256="3f39b052a34c9f1166a342be4c25bbdc1e2c81402edb734901d63fc6fa547ca5") version("1.6-17", sha256="db888f4220ca511332f4d011345b2b207fcc1de26d2eae473e0eeb5dfd8bbc02") version("1.5-21", sha256="091ee928ccaa6561aa9f8ee6c1c99f139dc89f1653c2a76a035cca14d404f43f") diff --git a/var/spack/repos/builtin/packages/r-tester/package.py b/var/spack/repos/builtin/packages/r-tester/package.py index 296b3838e50ce4..3d25497a42a403 100644 --- a/var/spack/repos/builtin/packages/r-tester/package.py +++ b/var/spack/repos/builtin/packages/r-tester/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RTester(RPackage): cran = "tester" + license("GPL-3.0-only") + version("0.1.7", sha256="b9c645119c21c69450f3d366c911ed92ac7c14ef61652fd676a38fb9d420b5f4") depends_on("r@3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index 83a8687ae1fd38..280e9d20bada18 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RTestit(RPackage): cran = "testit" + license("GPL-3.0-only") + version("0.13", sha256="90d47168ab6bdbd1274b600b457626ac07697ce09792c92b2043be5f5b678d80") version("0.12", sha256="9acdf912f0e7a68a5b6a7946d5ebb0c2007b3d6cd2e39075eddae2b586354e89") version("0.9", sha256="9cf6b3df9b2c700e4e7dcbd5b8cb64fabefe674e1f40346ccaf39fe7feda5e55") diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index fdd50962440038..756b98bad21d8d 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RTestthat(RPackage): cran = "testthat" + license("MIT") + version("3.1.7", sha256="1ad86b1739481c6c46359a6634ecc706bf513f34b26d7a62cbc719bbd4658eab") version("3.1.5", sha256="a8f56b9426206ddfc30b550c82ff2f042ebe1c2f5bfd4184aec8facac8f5b7fc") version("3.1.4", sha256="a47eec031b4e186a8bd331031371b2347063a283050eca2adbfaa37d7a6c9c09") diff --git a/var/spack/repos/builtin/packages/r-textshaping/package.py b/var/spack/repos/builtin/packages/r-textshaping/package.py index f5c698f6106aa4..877fe54114bf6a 100644 --- a/var/spack/repos/builtin/packages/r-textshaping/package.py +++ b/var/spack/repos/builtin/packages/r-textshaping/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTextshaping(RPackage): cran = "textshaping" + license("MIT") + version("0.3.6", sha256="80e2c087962f55ce2811fbc798b09f5638c06c6b28c10cd3cb3827005b902ada") depends_on("r@3.2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-tfbstools/package.py b/var/spack/repos/builtin/packages/r-tfbstools/package.py index 3c808e10bf919a..2e73e8248c994a 100644 --- a/var/spack/repos/builtin/packages/r-tfbstools/package.py +++ b/var/spack/repos/builtin/packages/r-tfbstools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tfisher/package.py b/var/spack/repos/builtin/packages/r-tfisher/package.py index ee5c8071c66930..3dfcdef171bcc6 100644 --- a/var/spack/repos/builtin/packages/r-tfisher/package.py +++ b/var/spack/repos/builtin/packages/r-tfisher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py index f5ba1ddda07d8d..c899a4a4cff30c 100644 --- a/var/spack/repos/builtin/packages/r-tfmpvalue/package.py +++ b/var/spack/repos/builtin/packages/r-tfmpvalue/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-th-data/package.py b/var/spack/repos/builtin/packages/r-th-data/package.py index f5c349dcac83b8..f186d6b3c14df5 100644 --- a/var/spack/repos/builtin/packages/r-th-data/package.py +++ b/var/spack/repos/builtin/packages/r-th-data/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index e7e290a1bae759..aba75b1fd85338 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RThreejs(RPackage): cran = "threejs" + license("MIT") + version("0.3.3", sha256="76c759c8b20fb34f4f7a01cbd1b961296e1f19f4df6dded69aae7f1bca80219c") version("0.3.1", sha256="71750b741672a435ecf749b69c72f0681aa8bb795e317f4e3056d5e33f6d79e8") version("0.2.2", sha256="41fe949490fbe0f71e39b0a144791da427bd7361d027579cb4a002ed53520cc5") diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index 136a602de7dcd5..c01e9dfc96a4ae 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RTibble(RPackage): cran = "tibble" + license("MIT") + version("3.2.1", sha256="65a72d0c557fd6e7c510d150c935ed6ced5db7d05fc20236b370f11428372131") version("3.1.8", sha256="acf30e075d18d2f61de53ca20a13c502bb32abb8083089b0bb9172a0cb5cedea") version("3.1.7", sha256="e1a50891f476803526960b4c4d736a72e7d9c3d366946744a02d6347f591c872") diff --git a/var/spack/repos/builtin/packages/r-tictoc/package.py b/var/spack/repos/builtin/packages/r-tictoc/package.py index a9d103c6b5f01e..726315142308af 100644 --- a/var/spack/repos/builtin/packages/r-tictoc/package.py +++ b/var/spack/repos/builtin/packages/r-tictoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RTictoc(RPackage): cran = "tictoc" + license("Apache-2.0 OR custom") + version("1.2", sha256="f05ea4b4142a90b0dc5d10356be3748625ef86bbd0e4399c56455654165ff20c") version("1.1", sha256="120f868ba276bda70c8edef5d6c092586cf73db0fa02eb5459d8f55350fb474d") version("1.0.1", sha256="a09a1535c417ddf6637bbbda5fca6edab6c7f7b252a64e57e99d4d0748712705") diff --git a/var/spack/repos/builtin/packages/r-tidycensus/package.py b/var/spack/repos/builtin/packages/r-tidycensus/package.py index 891a0b4a89d9ab..19b3865c0dd573 100644 --- a/var/spack/repos/builtin/packages/r-tidycensus/package.py +++ b/var/spack/repos/builtin/packages/r-tidycensus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RTidycensus(RPackage): cran = "tidycensus" + license("MIT") + version("1.3.2", sha256="ca47323f19c94a3c767bef59986f4a6cb4e455b3eb21ea64f1b3d6339443c515") version("1.2.3", sha256="23bc58bb6e20e1056e40dca55a49576b5e186fdb324f00fa9d5c07fb675f32ff") version("1.2.2", sha256="5cdbb92314061c9d8d3d62f623699fa115d7faae1f4a961d55ab905538f8e7cc") diff --git a/var/spack/repos/builtin/packages/r-tidygraph/package.py b/var/spack/repos/builtin/packages/r-tidygraph/package.py index bb45b918fb6422..0b4496c6edda6c 100644 --- a/var/spack/repos/builtin/packages/r-tidygraph/package.py +++ b/var/spack/repos/builtin/packages/r-tidygraph/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RTidygraph(RPackage): cran = "tidygraph" + license("MIT") + version("1.2.3", sha256="b09c06b12583ae57edd1ec01e61a0e1b7a4b82358361fb28a6046dbece475687") version("1.2.2", sha256="d555cad6b5b56bd2edaa29950a0fd15942e972db21561bfd5cd64fd9a8936470") version("1.2.1", sha256="2fbdc2db18c5ad48c72f14d2d04111f4b0d4c434ad87c280eda3bcb98673ad36") diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index 037d37442973fa..1a690a07a22aa3 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RTidyr(RPackage): cran = "tidyr" + license("MIT") + version("1.3.0", sha256="8d532b9366fdd3ec9827b51830e559a49d073425007c766025f0e603964e0a9d") version("1.2.1", sha256="6971766d3663dc75c2328ab257816f4e42d9fdc05c2d87d171b8b9b5ecce61af") version("1.2.0", sha256="8cd01da9e97827521d01ea50b9225f2705c46b7538bbf74bec6249a04c1213a8") diff --git a/var/spack/repos/builtin/packages/r-tidyselect/package.py b/var/spack/repos/builtin/packages/r-tidyselect/package.py index 584908e4156b78..91c1235e7bc1b8 100644 --- a/var/spack/repos/builtin/packages/r-tidyselect/package.py +++ b/var/spack/repos/builtin/packages/r-tidyselect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RTidyselect(RPackage): cran = "tidyselect" + license("MIT") + version("1.2.0", sha256="538d26b727e37d618e2efd3b00836048f103112a03e6994bf07a02392e269e3b") version("1.1.2", sha256="0389a3b15417954a30d6d692f6ebdd3d0f318cb94a5c9b05365df2f4ea1d8270") version("1.1.1", sha256="18eb6a6746196a81ce19ee6cbf1db0c33f494177b97e2419312ef25a00ae486b") diff --git a/var/spack/repos/builtin/packages/r-tidytree/package.py b/var/spack/repos/builtin/packages/r-tidytree/package.py index 11128ff264847f..53ec7b519e7722 100644 --- a/var/spack/repos/builtin/packages/r-tidytree/package.py +++ b/var/spack/repos/builtin/packages/r-tidytree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTidytree(RPackage): cran = "tidytree" + license("Artistic-2.0") + version("0.4.2", sha256="cb831a66d8afa5e21f5072e4fbebcbd2228881090d0040f87605f5aeefda155e") version("0.4.1", sha256="fbc4364d17e1b1c26ed06af0cdf36c88a5bc562fdbd4731ab179e30bba4009eb") version("0.3.9", sha256="12435d4f4c4d734b2a758cb13eb3b44bdfa8fdfa79a6e81fb99f7ce3a5d82edf") diff --git a/var/spack/repos/builtin/packages/r-tidyverse/package.py b/var/spack/repos/builtin/packages/r-tidyverse/package.py index 7509e2ba4f77a2..51b2942770b12a 100644 --- a/var/spack/repos/builtin/packages/r-tidyverse/package.py +++ b/var/spack/repos/builtin/packages/r-tidyverse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RTidyverse(RPackage): cran = "tidyverse" + license("MIT") + version("2.0.0", sha256="3d3c2d135056333247d309d1c2cc98cc0d87e2c781f4c6fbceab28d28c0728e5") version("1.3.2", sha256="37fbf8b72e49e96b1770dfb8e37f3e9e29269e8d6c96d6d3902561252ec1cf61") version("1.3.1", sha256="83cf95109d4606236274f5a8ec2693855bf75d3a1b3bc1ab4426dcc275ed6632") diff --git a/var/spack/repos/builtin/packages/r-tiff/package.py b/var/spack/repos/builtin/packages/r-tiff/package.py index d0951af7515b0f..b99b115da6047f 100644 --- a/var/spack/repos/builtin/packages/r-tiff/package.py +++ b/var/spack/repos/builtin/packages/r-tiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RTiff(RPackage): cran = "tiff" + license("GPL-2.0-only OR GPL-3.0-only") + version("0.1-11", sha256="b8c3ea15114d972f8140541c7b01f5ce2e5322af1f63c1a083aaf766fd3eec75") version("0.1-10", sha256="535154e89e85e14fe697469d2c59826a44c7937e7eca2eaca1aee6b0fe320afe") version("0.1-6", sha256="623bd9c16a426df7e6056738c5d91da86ea9b49df375eea6b5127e4e458dc4fb") diff --git a/var/spack/repos/builtin/packages/r-tigris/package.py b/var/spack/repos/builtin/packages/r-tigris/package.py index d8360cb1e2764e..cb556f39c81f92 100644 --- a/var/spack/repos/builtin/packages/r-tigris/package.py +++ b/var/spack/repos/builtin/packages/r-tigris/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RTigris(RPackage): cran = "tigris" + license("MIT") + version("2.0.1", sha256="d87c6b0c11ffb967699d345c6bfcfa82581a0753e1130bf0c927b2960b074d8c") version("1.6.1", sha256="927e8da3f7120bcc10f0b4ded95687512693e069f082eea7aea6302a2f1b2db2") version("1.6", sha256="fa14fbbaf44f5ade1cc92e6e4e4ed2e775bc7c106310711d16b0135a948a1661") diff --git a/var/spack/repos/builtin/packages/r-timechange/package.py b/var/spack/repos/builtin/packages/r-timechange/package.py index 98c59ae22eef25..27425f56bdb623 100644 --- a/var/spack/repos/builtin/packages/r-timechange/package.py +++ b/var/spack/repos/builtin/packages/r-timechange/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RTimechange(RPackage): cran = "timechange" + license("GPL-3.0-only") + version("0.2.0", sha256="3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1") version("0.1.1", sha256="8503919d233d7d7b81fe47692f0f2d6742ff4cae7320a5522bf98f077f5d7f70") diff --git a/var/spack/repos/builtin/packages/r-timedate/package.py b/var/spack/repos/builtin/packages/r-timedate/package.py index bf3c7d5e15fc35..60d51b27944ea9 100644 --- a/var/spack/repos/builtin/packages/r-timedate/package.py +++ b/var/spack/repos/builtin/packages/r-timedate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tinytex/package.py b/var/spack/repos/builtin/packages/r-tinytex/package.py index a841b3c156e1d9..754386ac724945 100644 --- a/var/spack/repos/builtin/packages/r-tinytex/package.py +++ b/var/spack/repos/builtin/packages/r-tinytex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RTinytex(RPackage): cran = "tinytex" + license("MIT") + version("0.45", sha256="0c2fbbd09e80af80ca6b685bf0653f070da97b85413d39af966aba28f376e92c") version("0.42", sha256="205f7a1978118aa38b6d9f7d3e1667c635da262b43967d1a879520284c2e22b1") version("0.39", sha256="f22e9b77c200fe44cc073b759c2b2bc3310a2382d897282548aa02dcbabc25ed") diff --git a/var/spack/repos/builtin/packages/r-tinytiger/package.py b/var/spack/repos/builtin/packages/r-tinytiger/package.py index d0b66c81f9e00d..930f366c341531 100644 --- a/var/spack/repos/builtin/packages/r-tinytiger/package.py +++ b/var/spack/repos/builtin/packages/r-tinytiger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RTinytiger(RPackage): maintainers("jgaeb") + license("MIT") + version("0.0.4", sha256="818328b5095d9e8b302f1a04d004cd3ec6e62d945dbd757fe15e9ab768a7459e") version("0.0.3", sha256="841d92dd4185b9bff5eef0d3635805c5a3efb1bc4ff0a1101ef264417e37921c") diff --git a/var/spack/repos/builtin/packages/r-tmixclust/package.py b/var/spack/repos/builtin/packages/r-tmixclust/package.py index 269f12fadd83a3..a6e66b155d27e8 100644 --- a/var/spack/repos/builtin/packages/r-tmixclust/package.py +++ b/var/spack/repos/builtin/packages/r-tmixclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tmvnsim/package.py b/var/spack/repos/builtin/packages/r-tmvnsim/package.py index 1cc765de20c735..69cf0c88fea486 100644 --- a/var/spack/repos/builtin/packages/r-tmvnsim/package.py +++ b/var/spack/repos/builtin/packages/r-tmvnsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,4 +21,6 @@ class RTmvnsim(RPackage): cran = "tmvnsim" + license("GPL-2.0-only") + version("1.0-2", sha256="97f63d0bab3b240cc7bdbe6e6e74e90ad25a4382a345ee51a26fe3959edeba0f") diff --git a/var/spack/repos/builtin/packages/r-topgo/package.py b/var/spack/repos/builtin/packages/r-topgo/package.py index cc79a5842cadd2..ac41cdb2cc9c28 100644 --- a/var/spack/repos/builtin/packages/r-topgo/package.py +++ b/var/spack/repos/builtin/packages/r-topgo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-treeio/package.py b/var/spack/repos/builtin/packages/r-treeio/package.py index ef065df5dea7a8..8163b1876ce52a 100644 --- a/var/spack/repos/builtin/packages/r-treeio/package.py +++ b/var/spack/repos/builtin/packages/r-treeio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-triebeard/package.py b/var/spack/repos/builtin/packages/r-triebeard/package.py index eae6aeff176007..e20dcf6e0d87dd 100644 --- a/var/spack/repos/builtin/packages/r-triebeard/package.py +++ b/var/spack/repos/builtin/packages/r-triebeard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RTriebeard(RPackage): cran = "triebeard" + license("MIT") + version("0.4.1", sha256="192f2fef6341e43bd56ef4f9841e813e07be990f4ffcf38c5606259630efe0f7") version("0.3.0", sha256="bf1dd6209cea1aab24e21a85375ca473ad11c2eff400d65c6202c0fb4ef91ec3") diff --git a/var/spack/repos/builtin/packages/r-trimcluster/package.py b/var/spack/repos/builtin/packages/r-trimcluster/package.py index b275dde29356e7..8edaed081a1dec 100644 --- a/var/spack/repos/builtin/packages/r-trimcluster/package.py +++ b/var/spack/repos/builtin/packages/r-trimcluster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RTrimcluster(RPackage): cran = "trimcluster" + license("GPL-2.0-or-later") + version("0.1-5", sha256="9239f20e4a06ac2fa89e5d5d89b23a45c8c534a7264d89bede8a35d43dda518b") version("0.1-2.1", sha256="b64a872a6c2ad677dfeecc776c9fe5aff3e8bab6bc6a8c86957b5683fd5d2300") version("0.1-2", sha256="622fb61580cc19b9061c6ee28ffd751250a127f07904b45a0e1c5438d25b4f53") diff --git a/var/spack/repos/builtin/packages/r-truncdist/package.py b/var/spack/repos/builtin/packages/r-truncdist/package.py index b40a3c88c58862..724272efff68fb 100644 --- a/var/spack/repos/builtin/packages/r-truncdist/package.py +++ b/var/spack/repos/builtin/packages/r-truncdist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RTruncdist(RPackage): cran = "truncdist" + license("GPL-2.0-or-later") + version("1.0-2", sha256="b848b68bdd983bd496fa7327632ffa8add8d2231229b8af5c8bc29d823e1300a") depends_on("r@2.0.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-truncnorm/package.py b/var/spack/repos/builtin/packages/r-truncnorm/package.py index c73895443908e7..2ffcf43b654239 100644 --- a/var/spack/repos/builtin/packages/r-truncnorm/package.py +++ b/var/spack/repos/builtin/packages/r-truncnorm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RTruncnorm(RPackage): cran = "truncnorm" + license("GPL-2.0-or-later") + version("1.0-9", sha256="5156acc4d63243bf95326d6285b0ba3cdf710697d67c233a12ae56f3d87ec708") version("1.0-8", sha256="49564e8d87063cf9610201fbc833859ed01935cc0581b9e21c42a0d21a47c87e") version("1.0.0", sha256="dc1b018cb6d9ad5beb2d9e2f3ebe56c3f69d7a98fc5a1d963dd7933d209ac272") diff --git a/var/spack/repos/builtin/packages/r-trust/package.py b/var/spack/repos/builtin/packages/r-trust/package.py index 3e2f6539c6d6b7..8da19d2f62c94a 100644 --- a/var/spack/repos/builtin/packages/r-trust/package.py +++ b/var/spack/repos/builtin/packages/r-trust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RTrust(RPackage): cran = "trust" + license("MIT") + version("0.1-8", sha256="952e348b62aec35988b103fd152329662cb6a451538f184549252fbf49d7dcac") version("0.1-7", sha256="e3d15aa84a71becd2824253d4a8156bdf1ab9ac3b72ced0cd53f3bb370ac6f04") diff --git a/var/spack/repos/builtin/packages/r-tseries/package.py b/var/spack/repos/builtin/packages/r-tseries/package.py index 1ecfe41cddbbb4..55c8888de3986d 100644 --- a/var/spack/repos/builtin/packages/r-tseries/package.py +++ b/var/spack/repos/builtin/packages/r-tseries/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class RTseries(RPackage): cran = "tseries" + license("GPL-2.0-only") + version("0.10-53", sha256="ec388ee6d022752bbebbecbf22d793d31f3734982e3f2e3ffd8dde14bffcca56") version("0.10-52", sha256="9399c8dbedb3b44b8b3b854f6e8867e0a14f3727a7aa66ec9c6eff069ead8f45") version("0.10-51", sha256="a55f20704883710ab58ea479e20cf0f263c50d54282f693793cda4af664c207f") diff --git a/var/spack/repos/builtin/packages/r-tsne/package.py b/var/spack/repos/builtin/packages/r-tsne/package.py index ba7ac5c01bec5b..009428390b3d57 100644 --- a/var/spack/repos/builtin/packages/r-tsne/package.py +++ b/var/spack/repos/builtin/packages/r-tsne/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RTsne(RPackage): cran = "tsne" + license("GPL-2.0-or-later") + version("0.1-3.1", sha256="14abc65bc0a3f3ed63c04dda19620e483a21d1f5f33feb74aba9f3221434d888") version("0.1-3", sha256="66fdf5d73e69594af529a9c4f261d972872b9b7bffd19f85c1adcd66afd80c69") version("0.1-2", sha256="c6c3455e0f0f5dcac14299b3dfeb1a5f1bfe5623cdaf602afc892491d3d1058b") diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index 827bdf989e3614..74b7203b52c63d 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tweenr/package.py b/var/spack/repos/builtin/packages/r-tweenr/package.py index 9636e28c9aa9d1..254f43f96f19b3 100644 --- a/var/spack/repos/builtin/packages/r-tweenr/package.py +++ b/var/spack/repos/builtin/packages/r-tweenr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RTweenr(RPackage): cran = "tweenr" + license("MIT") + version("2.0.2", sha256="64bbfded418d4880e3636f434571c20303d2f66be6950d64583a864fbb661ff3") version("1.0.2", sha256="1805f575da6705ca4e5ec1c4605222fc826ba806d9ff9af41770294fe08ff69f") version("1.0.1", sha256="efd68162cd6d5a4f6d833dbf785a2bbce1cb7b9f90ba3fb060931a4bd705096b") diff --git a/var/spack/repos/builtin/packages/r-twosamplemr/package.py b/var/spack/repos/builtin/packages/r-twosamplemr/package.py index 7ca1bc9a221670..d83554678f3ced 100644 --- a/var/spack/repos/builtin/packages/r-twosamplemr/package.py +++ b/var/spack/repos/builtin/packages/r-twosamplemr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RTwosamplemr(RPackage): homepage = "https://mrcieu.github.io/TwoSampleMR/" url = "https://github.com/MRCIEU/TwoSampleMR/archive/refs/tags/v0.5.6.tar.gz" + license("MIT") + version("0.5.6", sha256="c63eb008ab7ed08a6f30ccbf0c299beb31b2f5835e5e2aa1b59c5e4fe284a30c") depends_on("r@3.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py index 4baac92596a113..98b034b8b66a01 100644 --- a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py +++ b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg18-knowngene/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py index 6b3b8f5e84ae3d..6f578243fd43ea 100644 --- a/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py +++ b/var/spack/repos/builtin/packages/r-txdb-hsapiens-ucsc-hg19-knowngene/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tximeta/package.py b/var/spack/repos/builtin/packages/r-tximeta/package.py new file mode 100644 index 00000000000000..ef7b5b8d0aac17 --- /dev/null +++ b/var/spack/repos/builtin/packages/r-tximeta/package.py @@ -0,0 +1,39 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class RTximeta(RPackage): + """Transcript Quantification Import with Automatic Metadata + + Transcript quantification import from Salmon and alevin with automatic + attachment of transcript ranges and release information, and other associated + metadata. De novo transcriptomes can be linked to the appropriate sources with + linkedTxomes and shared for computational reproducibility.""" + + bioc = "tximeta" + + version("1.20.0", commit="c9cf6d6a80ca5129b91d723867aca0aec12e8299") + version("1.18.3", commit="3caed00397476cfe9c379f4bc5a361023fdd6ffa") + version("1.18.0", commit="8f87d53bbd6f2d97821dd8f7fdd54624928f862d") + + depends_on("r", type=("build", "run")) + depends_on("r-annotationdbi", type=("build", "run")) + depends_on("r-annotationhub", type=("build", "run")) + depends_on("r-biocfilecache", type=("build", "run")) + depends_on("r-biostrings", type=("build", "run")) + depends_on("r-ensembldb", type=("build", "run")) + depends_on("r-genomeinfodb", type=("build", "run")) + depends_on("r-genomicfeatures", type=("build", "run")) + depends_on("r-genomicranges", type=("build", "run")) + depends_on("r-iranges", type=("build", "run")) + depends_on("r-jsonlite", type=("build", "run")) + depends_on("r-matrix", type=("build", "run")) + depends_on("r-r-utils", type=("build", "run")) + depends_on("r-s4vectors", type=("build", "run")) + depends_on("r-summarizedexperiment", type=("build", "run")) + depends_on("r-tibble", type=("build", "run")) + depends_on("r-tximport", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-tximport/package.py b/var/spack/repos/builtin/packages/r-tximport/package.py index d4e585e1ca1c6e..5e51a74f43ba3d 100644 --- a/var/spack/repos/builtin/packages/r-tximport/package.py +++ b/var/spack/repos/builtin/packages/r-tximport/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tximportdata/package.py b/var/spack/repos/builtin/packages/r-tximportdata/package.py index 0dd8c26137eceb..b11e596819f782 100644 --- a/var/spack/repos/builtin/packages/r-tximportdata/package.py +++ b/var/spack/repos/builtin/packages/r-tximportdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-tzdb/package.py b/var/spack/repos/builtin/packages/r-tzdb/package.py index 078c2ebd327141..8f606a1a1e9e43 100644 --- a/var/spack/repos/builtin/packages/r-tzdb/package.py +++ b/var/spack/repos/builtin/packages/r-tzdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RTzdb(RPackage): cran = "tzdb" + license("MIT") + version("0.3.0", sha256="6099f0ec1fba692b51b4360aa776902a39f10dae815933c31994b8e4d4277038") version("0.2.0", sha256="c335905d452b400af7ed54b916b5246cb3f47ede0602911a2bcb25a1cf56d5a9") diff --git a/var/spack/repos/builtin/packages/r-ucminf/package.py b/var/spack/repos/builtin/packages/r-ucminf/package.py index abd1890e02bdf0..ba6dc6e92af8bc 100644 --- a/var/spack/repos/builtin/packages/r-ucminf/package.py +++ b/var/spack/repos/builtin/packages/r-ucminf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class RUcminf(RPackage): cran = "ucminf" + license("GPL-2.0-or-later") + version("1.1-4.1", sha256="01a5b6f373ad267d22e2c29b8f7b6e31a1a148e48f4413e6a38e51aa049976b2") version("1.1-4", sha256="a2eb382f9b24e949d982e311578518710f8242070b3aa3314a331c1e1e7f6f07") diff --git a/var/spack/repos/builtin/packages/r-udunits2/package.py b/var/spack/repos/builtin/packages/r-udunits2/package.py index 54aceb153922b3..22e2884e9ba1c3 100644 --- a/var/spack/repos/builtin/packages/r-udunits2/package.py +++ b/var/spack/repos/builtin/packages/r-udunits2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RUdunits2(RPackage): cran = "udunits2" + license("GPL-2.0-only") + version("0.13.2.1", sha256="9f5429c04a24930f7d037d506e5b154b6154df69247dcdaa6261075291d7f902") version("0.13.2", sha256="ee00898801b3282717cba40a9ef930515506386aa82a050356d1a9c80a9f5969") version("0.13", sha256="d155d3c07f6202b65dec4075ffd1e1c3f4f35f5fdece8cfb319d39256a3e5b79") diff --git a/var/spack/repos/builtin/packages/r-units/package.py b/var/spack/repos/builtin/packages/r-units/package.py index b43dbc954aa631..01ebe5a976f5de 100644 --- a/var/spack/repos/builtin/packages/r-units/package.py +++ b/var/spack/repos/builtin/packages/r-units/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class RUnits(RPackage): cran = "units" + license("GPL-2.0-only") + version("0.8-1", sha256="d3e1ba246b4c97205bc3da3cf45d6b5bd5c196b8d421b84b4e94b2090985cd9a") version("0.8-0", sha256="9c46fe138e8c1c3d3a51268776412f02d09673656516148cccb71b1071beb21a") version("0.7-2", sha256="b90be023431100632b3081747af9e743e615452b4ad38810991f7b024b7040eb") diff --git a/var/spack/repos/builtin/packages/r-upsetr/package.py b/var/spack/repos/builtin/packages/r-upsetr/package.py index fe471bc4b208c2..3e299cff315cc4 100644 --- a/var/spack/repos/builtin/packages/r-upsetr/package.py +++ b/var/spack/repos/builtin/packages/r-upsetr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-urca/package.py b/var/spack/repos/builtin/packages/r-urca/package.py index 17b9b86ca59cc6..2dcbdb474b29a5 100644 --- a/var/spack/repos/builtin/packages/r-urca/package.py +++ b/var/spack/repos/builtin/packages/r-urca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RUrca(RPackage): cran = "urca" + license("GPL-2.0-or-later") + version("1.3-3", sha256="43baa8b6735f8325a69e6a43686f4fecd77a0eb7f60da25b4fc5c51b9271e9f1") version("1.3-0", sha256="621cc82398e25b58b4a16edf000ed0a1484d9a0bc458f734e97b6f371cc76aaa") diff --git a/var/spack/repos/builtin/packages/r-urlchecker/package.py b/var/spack/repos/builtin/packages/r-urlchecker/package.py index 754e0636b2dcce..912b64ccaab722 100644 --- a/var/spack/repos/builtin/packages/r-urlchecker/package.py +++ b/var/spack/repos/builtin/packages/r-urlchecker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RUrlchecker(RPackage): cran = "urlchecker" + license("GPL-3.0-only") + version("1.0.1", sha256="62165ddbe1b748b58c71a50c8f07fdde6f3d19a7b39787b9fa2b4f9216250318") depends_on("r@3.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-urltools/package.py b/var/spack/repos/builtin/packages/r-urltools/package.py index 13579acda17db6..013d8555d7f4a7 100644 --- a/var/spack/repos/builtin/packages/r-urltools/package.py +++ b/var/spack/repos/builtin/packages/r-urltools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RUrltools(RPackage): cran = "urltools" + license("MIT") + version("1.7.3", sha256="6020355c1b16a9e3956674e5dea9ac5c035c8eb3eb6bbdd841a2b5528cafa313") depends_on("r@2.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-usethis/package.py b/var/spack/repos/builtin/packages/r-usethis/package.py index 5b4892f8367a8e..497cfe55a70646 100644 --- a/var/spack/repos/builtin/packages/r-usethis/package.py +++ b/var/spack/repos/builtin/packages/r-usethis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RUsethis(RPackage): cran = "usethis" + license("MIT") + version("2.1.6", sha256="31dc6707577065ac1d4acb7d4cbf135942727c5cc2699092198c544be86f6818") version("2.1.5", sha256="7d539e16ecdc1cd45ba1a215d42d8b9c16bc38280ddd27048003dbb37b16f052") version("2.0.0", sha256="22aa2b59f36a8701a4648554c7b0e010253bf917a0f431f06efac7d8a6b59854") diff --git a/var/spack/repos/builtin/packages/r-utf8/package.py b/var/spack/repos/builtin/packages/r-utf8/package.py index f3dda3334b222d..ac87cb8e0464e9 100644 --- a/var/spack/repos/builtin/packages/r-utf8/package.py +++ b/var/spack/repos/builtin/packages/r-utf8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RUtf8(RPackage): cran = "utf8" + license("Apache-2.0 OR custom") + version("1.2.3", sha256="c0a88686591f4ad43b52917d0964e9df4c62d8858fe25135a1bf357dfcbd6347") version("1.2.2", sha256="a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4") version("1.1.4", sha256="f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54") diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index 8d6beca2d48f42..a8b3bcc731ec23 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RUuid(RPackage): cran = "uuid" + license("MIT") + version("1.1-0", sha256="e75b50ee7dc8c4c8e7083023e954ffd1c6a004431bf5e9094463e46aa760f42f") version("1.0-3", sha256="456e4633659f20242fd7cd585ad005a3e07265f1d1db383fca6794c8ac2c8346") version("0.1-4", sha256="98e0249dda17434bfa209c2058e9911e576963d4599be9f7ea946e664f8ca93e") diff --git a/var/spack/repos/builtin/packages/r-uwot/package.py b/var/spack/repos/builtin/packages/r-uwot/package.py index 8b1eadcffb1b2d..c5e5d78dbdb689 100644 --- a/var/spack/repos/builtin/packages/r-uwot/package.py +++ b/var/spack/repos/builtin/packages/r-uwot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class RUwot(RPackage): cran = "uwot" + license("GPL-3.0-or-later") + version("0.1.14", sha256="8016e8192b7e72604ca71840cbe43fa1d2caed8a8ad7cbf20e85cd3b384a9fe0") version("0.1.11", sha256="4fcf90f1369a2a1f01db9e05a2365b155b2ada8e51e1f7f3ba5122d86affd41b") version("0.1.10", sha256="6ee1b6027bce679cd5a35f647f516a5b327632234bcf323c7f3d5b5e10807d23") diff --git a/var/spack/repos/builtin/packages/r-v8/package.py b/var/spack/repos/builtin/packages/r-v8/package.py index 81dbfba559161c..423c952e82b8e6 100644 --- a/var/spack/repos/builtin/packages/r-v8/package.py +++ b/var/spack/repos/builtin/packages/r-v8/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-variantannotation/package.py b/var/spack/repos/builtin/packages/r-variantannotation/package.py index 5bb805c3403d5e..6df0be0c65a37f 100644 --- a/var/spack/repos/builtin/packages/r-variantannotation/package.py +++ b/var/spack/repos/builtin/packages/r-variantannotation/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-varselrf/package.py b/var/spack/repos/builtin/packages/r-varselrf/package.py index b40f53b10b6633..9b59881921a188 100644 --- a/var/spack/repos/builtin/packages/r-varselrf/package.py +++ b/var/spack/repos/builtin/packages/r-varselrf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index 0301c4129de8c2..14933c740c03c0 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RVcd(RPackage): cran = "vcd" + license("GPL-2.0-only") + version("1.4-11", sha256="7a54e855689e1429d46e0d4d7a956f96b0ad2fd0c7084fa023902c55849e0932") version("1.4-10", sha256="7188192afa289350cc1b89790f4f8f5a5114c1c88bee7715a0c8f5347aa0b35b") version("1.4-9", sha256="a5b420ad5ff1a27fa92f98099a8b43f2dded7e5f60297b3e4d947ad6f039568f") diff --git a/var/spack/repos/builtin/packages/r-vcfr/package.py b/var/spack/repos/builtin/packages/r-vcfr/package.py index 83d2fa0c0d2b91..f8320ac87e6a56 100644 --- a/var/spack/repos/builtin/packages/r-vcfr/package.py +++ b/var/spack/repos/builtin/packages/r-vcfr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-vctrs/package.py b/var/spack/repos/builtin/packages/r-vctrs/package.py index 9f50b1c6414a86..49e8bf5e37c670 100644 --- a/var/spack/repos/builtin/packages/r-vctrs/package.py +++ b/var/spack/repos/builtin/packages/r-vctrs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RVctrs(RPackage): cran = "vctrs" + license("MIT") + version("0.6.2", sha256="feecabe11f6c55e04377d36fa59842187f0a6fe52aaf867c08289a948781ee84") version("0.5.0", sha256="7c372e13c39ddace9c9bb9f33238de6dd2cd0f37dcc7054ba6435d271e5df686") version("0.4.2", sha256="5414d1d6977163b4e85efa40d6facdd98089d6ffd460daaba729d4200942d815") diff --git a/var/spack/repos/builtin/packages/r-vegan/package.py b/var/spack/repos/builtin/packages/r-vegan/package.py index 0020b867db7a12..5821e4b266fc5b 100644 --- a/var/spack/repos/builtin/packages/r-vegan/package.py +++ b/var/spack/repos/builtin/packages/r-vegan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RVegan(RPackage): cran = "vegan" + license("GPL-2.0-only") + version("2.6-4", sha256="5d8ad4bebe79ae2bbd840a34100cf54c62f089c66ea484a542a201afcba21d06") version("2.6-2", sha256="ab77d110c959d19b0c6268ae0c8f78c897e2419eff3f1f7b19c1bb2f8db7c059") version("2.5-7", sha256="e63b586951ea7d8b0118811f329c700212892ec1db3b93951603ce1d68aa462a") diff --git a/var/spack/repos/builtin/packages/r-vfs/package.py b/var/spack/repos/builtin/packages/r-vfs/package.py index 770e328eca0509..6561aad0ebd2d4 100644 --- a/var/spack/repos/builtin/packages/r-vfs/package.py +++ b/var/spack/repos/builtin/packages/r-vfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-vgam/package.py b/var/spack/repos/builtin/packages/r-vgam/package.py index b1e3a43d25a857..1a51917d721f39 100644 --- a/var/spack/repos/builtin/packages/r-vgam/package.py +++ b/var/spack/repos/builtin/packages/r-vgam/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-vioplot/package.py b/var/spack/repos/builtin/packages/r-vioplot/package.py index 5e1b59032ee914..8cf9bf66acbe59 100644 --- a/var/spack/repos/builtin/packages/r-vioplot/package.py +++ b/var/spack/repos/builtin/packages/r-vioplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RVioplot(RPackage): cran = "vioplot" + license("BSD-3-Clause") + version("0.4.0", sha256="5729b483e3a4f7c81d2cc22c8bc5211b64e289734e9da5b5696c4974067867b5") version("0.3.7", sha256="06475d9a47644245ec91598e9aaef7db1c393802d9fc314420ac5139ae56adb6") version("0.3.5", sha256="1b64833c1bd6851036cf1c400c7d0036a047e71def94a399c897263b4b303e2a") diff --git a/var/spack/repos/builtin/packages/r-vipor/package.py b/var/spack/repos/builtin/packages/r-vipor/package.py index 3d3139bd4cbe4f..aa0b4a3273a223 100644 --- a/var/spack/repos/builtin/packages/r-vipor/package.py +++ b/var/spack/repos/builtin/packages/r-vipor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RVipor(RPackage): cran = "vipor" + license("GPL-2.0-or-later") + version("0.4.5", sha256="7d19251ac37639d6a0fed2d30f1af4e578785677df5e53dcdb2a22771a604f84") version("0.4.4", sha256="5abfd7869dae42ae2e4f52206c23433a43b485b1220685e445877ee5864a3f5c") diff --git a/var/spack/repos/builtin/packages/r-viridis/package.py b/var/spack/repos/builtin/packages/r-viridis/package.py index 19e532457b8d6f..8807a1a30115ca 100644 --- a/var/spack/repos/builtin/packages/r-viridis/package.py +++ b/var/spack/repos/builtin/packages/r-viridis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class RViridis(RPackage): cran = "viridis" + license("MIT") + version("0.6.2", sha256="69b58cd1d992710a08b0b227fd0a9590430eea3ed4858099412f910617e41311") version("0.5.1", sha256="ddf267515838c6eb092938133035cee62ab6a78760413bfc28b8256165701918") version("0.5.0", sha256="fea477172c1e11be40554545260b36d6ddff3fe6bc3bbed87813ffb77c5546cd") diff --git a/var/spack/repos/builtin/packages/r-viridislite/package.py b/var/spack/repos/builtin/packages/r-viridislite/package.py index 73c1e957f05f60..4b6a08da391eb3 100644 --- a/var/spack/repos/builtin/packages/r-viridislite/package.py +++ b/var/spack/repos/builtin/packages/r-viridislite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 8382c39d49769c..72dcf9a7ee2372 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-vroom/package.py b/var/spack/repos/builtin/packages/r-vroom/package.py index 29afcfdabe2e32..9843483ddf7515 100644 --- a/var/spack/repos/builtin/packages/r-vroom/package.py +++ b/var/spack/repos/builtin/packages/r-vroom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RVroom(RPackage): cran = "vroom" + license("MIT") + version("1.6.1", sha256="eb0e33d53212f9c7e8b38d632c98bd5015365cc13f55dadb15ff0d404b31807c") version("1.6.0", sha256="a718ccdf916442693af5392944774d8aec5ce48f417871f9de84dd1089d26ca6") version("1.5.7", sha256="d087cb148f71c222fc89199d03df2502689149873414a6d89c2f006d3a109fde") diff --git a/var/spack/repos/builtin/packages/r-vsn/package.py b/var/spack/repos/builtin/packages/r-vsn/package.py index 30bdedbbc73489..f89be049975787 100644 --- a/var/spack/repos/builtin/packages/r-vsn/package.py +++ b/var/spack/repos/builtin/packages/r-vsn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-waldo/package.py b/var/spack/repos/builtin/packages/r-waldo/package.py index a4952b534bf0bd..69b70bcd053bea 100644 --- a/var/spack/repos/builtin/packages/r-waldo/package.py +++ b/var/spack/repos/builtin/packages/r-waldo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RWaldo(RPackage): cran = "waldo" + license("MIT") + version("0.4.0", sha256="57ee89eec9bcbba58cf8fa29c8e097f038768c30833eaf812682826333127eaa") version("0.3.1", sha256="ec2c8c1afbc413f8db8b6b0c6970194a875f616ad18e1e72a004bc4497ec019b") version("0.2.3", sha256="1fbab22fe9be6ca8caa3df7306c763d7025d81ab6f17b85daaf8bdc8c9455c53") diff --git a/var/spack/repos/builtin/packages/r-watermelon/package.py b/var/spack/repos/builtin/packages/r-watermelon/package.py index 4663ad90bb2a6f..e4edaba0afbe52 100644 --- a/var/spack/repos/builtin/packages/r-watermelon/package.py +++ b/var/spack/repos/builtin/packages/r-watermelon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-webshot/package.py b/var/spack/repos/builtin/packages/r-webshot/package.py index 159df2f014f220..044732bf6b8417 100644 --- a/var/spack/repos/builtin/packages/r-webshot/package.py +++ b/var/spack/repos/builtin/packages/r-webshot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RWebshot(RPackage): cran = "webshot" + license("GPL-2.0-only") + version("0.5.4", sha256="3dc2b9baef7855e1deea060276b9ccc6375eee36b7100987cbb1f8e5cd7a8f24") version("0.5.3", sha256="b7c4f2be61c8c4730202a9c3604072478e30cb85b423b7497cd703cc3f49dbc0") version("0.5.2", sha256="f183dc970157075b51ac543550a7a48fa3428b9c6838abb72fe987c21982043f") diff --git a/var/spack/repos/builtin/packages/r-wgcna/package.py b/var/spack/repos/builtin/packages/r-wgcna/package.py index bd849354fd509f..b11908f1052e60 100644 --- a/var/spack/repos/builtin/packages/r-wgcna/package.py +++ b/var/spack/repos/builtin/packages/r-wgcna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index 0bd701b877009f..f56e5ab26f1374 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RWhisker(RPackage): cran = "whisker" + license("GPL-3.0-only") + version("0.4.1", sha256="bf5151494508032f68ac41e211bda80da9087c65c7068ffdd12f16669bf1f2bc") version("0.4", sha256="7a86595be4f1029ec5d7152472d11b16175737e2777134e296ae97341bf8fba8") version("0.3-2", sha256="484836510fcf123a66ddd13cdc8f32eb98e814cad82ed30c0294f55742b08c7c") diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 9dc43073ab213d..b678ee0b112e91 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RWithr(RPackage): cran = "withr" + license("MIT") + version("2.5.0", sha256="37317b3ed790a08407072993a05ab255f6305f95a12a16e0e28aa6aa80fc8bc0") version("2.4.3", sha256="9bdac7459ccc6c2d599ecfd132a7f0aa68d958942d9fe7dbb0442c9eda129d4c") version("2.4.2", sha256="48f96a4cb780cf6fd5fbbea1f1eb04ea3102d7a4a644cae1ed1e91139dcbbac8") diff --git a/var/spack/repos/builtin/packages/r-wk/package.py b/var/spack/repos/builtin/packages/r-wk/package.py index 1c531e9c646238..4b3497b89d7649 100644 --- a/var/spack/repos/builtin/packages/r-wk/package.py +++ b/var/spack/repos/builtin/packages/r-wk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RWk(RPackage): cran = "wk" + license("MIT") + version("0.7.2", sha256="6f8b72f54e2efea62fda8bc897124b43a39b81cffa9569103d06d95f946eab2f") version("0.7.0", sha256="e24327d38f2ff2d502c67c60eba3b4e44079a64ed8b805df64f231dc4712a2de") version("0.6.0", sha256="af2c2837056a6dcc9f64d5ace29601d6d668c95769f855ca0329648d7326eaf5") diff --git a/var/spack/repos/builtin/packages/r-wru/package.py b/var/spack/repos/builtin/packages/r-wru/package.py index d513a33f2d5bdb..ef07ef21b40d83 100644 --- a/var/spack/repos/builtin/packages/r-wru/package.py +++ b/var/spack/repos/builtin/packages/r-wru/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class RWru(RPackage): maintainers("jgaeb") + license("GPL-3.0-or-later") + version("1.0.1", sha256="80b3f54cb2de77ea005755a2de3acfb923a1d380c0dbd52bc4d3e3fcb1d6f1fc") version("1.0.0", sha256="4eae65644981d0b99d3610adf40340b3606f40e6cd578e76a745524ba927e417") version("0.1-12", sha256="896ef4718109ab9fee686f050a3269cbab1589ef2aff7a45fc11a67f7bb35a29") diff --git a/var/spack/repos/builtin/packages/r-xde/package.py b/var/spack/repos/builtin/packages/r-xde/package.py index 97d8af821d8c51..309e099ede1f50 100644 --- a/var/spack/repos/builtin/packages/r-xde/package.py +++ b/var/spack/repos/builtin/packages/r-xde/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xfun/package.py b/var/spack/repos/builtin/packages/r-xfun/package.py index b49015a5187a7c..57f44f4912a49b 100644 --- a/var/spack/repos/builtin/packages/r-xfun/package.py +++ b/var/spack/repos/builtin/packages/r-xfun/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RXfun(RPackage): cran = "xfun" + license("MIT") + version("0.39", sha256="d0ecaabb243dd3496da6029932fcdd4772914843de7ffd0b78a172efde1356c9") version("0.34", sha256="50e76c1febb988c044e44fb78e1abc1ba681173c9ff3c336f4c0ad71e6a2853d") version("0.33", sha256="45fbc2d252867b69bbde64d4a4e3d2e049ad1d3a84984e9cfb242d8d1f41ee6c") diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index d372d788717027..9abb3f87a86dd4 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RXgboost(RPackage): cran = "xgboost" + license("Apache-2.0 OR custom") + version("1.7.5.1", sha256="4ec0833f206f84e5983e9f373ea64903bec488f751fba6f75a6f4702b1c965bc") version("1.6.0.1", sha256="9ae99a20997e1b02ffd21cabada2a55e53f5754746238ee900de5eb6cd964ebd") version("1.5.0.2", sha256="4750b9a289d8cb685291939eed7c493bb42c5cc154ef98e13100abb1727eab13") diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 8dc36f2a900345..a91a83c1bd823e 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index 7e3f66c338d980..78a1e5ce557923 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index be39802f963ed8..79c424a02ffd44 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RXlsx(RPackage): cran = "xlsx" + license("GPL-3.0-only") + version("0.6.5", sha256="378c5ed475a3d7631ea1ea13e0a69d619c1a52260922abda42818752dbb32107") version("0.6.1", sha256="a580bd16b5477c1c185bf681c12c1ffff4088089f97b6a37997913d93ec5a8b4") diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index d657ea69287041..7509b2aabf59f5 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RXlsxjars(RPackage): cran = "xlsxjars" + license("GPL-3.0-only") + version("0.6.1", sha256="37c1517f95f8bca6e3514429394d2457b9e62383305eba288416fb53ab2e6ae6") depends_on("r-rjava", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-xmapbridge/package.py b/var/spack/repos/builtin/packages/r-xmapbridge/package.py index 584612f2d8d710..495f8b82282570 100644 --- a/var/spack/repos/builtin/packages/r-xmapbridge/package.py +++ b/var/spack/repos/builtin/packages/r-xmapbridge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index b6a0441fb5b0ac..7c69fe12e6ec30 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xml2/package.py b/var/spack/repos/builtin/packages/r-xml2/package.py index 41bcea63f1690b..33165efa43f8e6 100644 --- a/var/spack/repos/builtin/packages/r-xml2/package.py +++ b/var/spack/repos/builtin/packages/r-xml2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RXml2(RPackage): cran = "xml2" + license("MIT") + version("1.3.3", sha256="cb4e9c0d31618ed67d2bfa4c7b5e52680e11612ed356a8164b541d44163c1c8d") version("1.3.2", sha256="df22f9e7e3189d8c9b8804eaf0105324fdac983cffe743552f6d76613600a4cf") version("1.2.2", sha256="3050f147c4335be2925a576557bbda36bd52a5bba3110d47b740a2dd811a78f4") diff --git a/var/spack/repos/builtin/packages/r-xnomial/package.py b/var/spack/repos/builtin/packages/r-xnomial/package.py index 01c054e890e417..1d58c27b9bcbb2 100644 --- a/var/spack/repos/builtin/packages/r-xnomial/package.py +++ b/var/spack/repos/builtin/packages/r-xnomial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-xopen/package.py b/var/spack/repos/builtin/packages/r-xopen/package.py index f501fcde3d8b00..e2086426414906 100644 --- a/var/spack/repos/builtin/packages/r-xopen/package.py +++ b/var/spack/repos/builtin/packages/r-xopen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RXopen(RPackage): cran = "xopen" + license("MIT") + version("1.0.0", sha256="e207603844d69c226142be95281ba2f4a056b9d8cbfae7791ba60535637b3bef") depends_on("r@3.1:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 75646fc61980fd..0901f0e9ad587a 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RXtable(RPackage): cran = "xtable" + license("GPL-2.0-or-later") + version("1.8-4", sha256="5abec0e8c27865ef0880f1d19c9f9ca7cc0fd24eadaa72bcd270c3fb4075fd1c") version("1.8-3", sha256="53b2b0fff8d7a8bba434063c2a01b867f510a4389ded2691fbedbc845f08c325") version("1.8-2", sha256="1623a1cde2e130fedb46f98840c3a882f1cbb167b292ef2bd86d70baefc4280d") diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index 67e1e6527a9588..af45b05ae06b5d 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RXts(RPackage): cran = "xts" + license("GPL-2.0-or-later") + version("0.13.1", sha256="2c3907c6d0162e48d1898647105bbb32cfe0cb005788481a64ee675a941d825d") version("0.13.0", sha256="188e4d1d8c3ec56a544dfb9da002e8aac80b9303d0a5a1f62ff0e960aeef9674") version("0.12.2", sha256="9c287ceaeb758ff4c9596be6a688db5683d50b45e7610e6d068891ca10dca743") diff --git a/var/spack/repos/builtin/packages/r-xvector/package.py b/var/spack/repos/builtin/packages/r-xvector/package.py index 7bf098cc8c6b36..55a3b400cc03ce 100644 --- a/var/spack/repos/builtin/packages/r-xvector/package.py +++ b/var/spack/repos/builtin/packages/r-xvector/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-yaimpute/package.py b/var/spack/repos/builtin/packages/r-yaimpute/package.py index bcca90d4669f95..bee3635d39d8d5 100644 --- a/var/spack/repos/builtin/packages/r-yaimpute/package.py +++ b/var/spack/repos/builtin/packages/r-yaimpute/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index 8de330f7494846..f8cb214c859267 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RYaml(RPackage): cran = "yaml" + license("BSD-3-Clause") + version("2.3.7", sha256="d20cb219e0f9c48aba02f132f81cfa9ecda5e22c925e36726840218ed56680ab") version("2.3.6", sha256="5dd19d8d6654ef2e4ccd6216ce8e96ca5185ae6143f95194955f6908a6e1ba26") version("2.3.5", sha256="3edf6c0554a0e184a25e8bec5721a2e66b4ab0dceb3737428e22705e52eb5140") diff --git a/var/spack/repos/builtin/packages/r-yapsa/package.py b/var/spack/repos/builtin/packages/r-yapsa/package.py index 8c90980a6cdaa3..aba3e5a2e047db 100644 --- a/var/spack/repos/builtin/packages/r-yapsa/package.py +++ b/var/spack/repos/builtin/packages/r-yapsa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RYapsa(RPackage): bioc = "YAPSA" + license("GPL-3.0-or-later") + version("1.26.0", commit="eab6bbd7a44e1368c7827e4717439de445303868") version("1.24.0", commit="68d1c9c71af3ade4a44237ec2d3003688378f898") version("1.22.0", commit="55c2886874f154c737264ce6843089bf3565fa57") diff --git a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py index 47a03d84d4b8fc..60c2a01b057403 100644 --- a/var/spack/repos/builtin/packages/r-yaqcaffy/package.py +++ b/var/spack/repos/builtin/packages/r-yaqcaffy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-yarn/package.py b/var/spack/repos/builtin/packages/r-yarn/package.py index 3f2901fef7e42d..e271c8c153030f 100644 --- a/var/spack/repos/builtin/packages/r-yarn/package.py +++ b/var/spack/repos/builtin/packages/r-yarn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-yulab-utils/package.py b/var/spack/repos/builtin/packages/r-yulab-utils/package.py index 009173b383f796..30137e8782079b 100644 --- a/var/spack/repos/builtin/packages/r-yulab-utils/package.py +++ b/var/spack/repos/builtin/packages/r-yulab-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-zcompositions/package.py b/var/spack/repos/builtin/packages/r-zcompositions/package.py index 80cff0878206de..110f4a120ed891 100644 --- a/var/spack/repos/builtin/packages/r-zcompositions/package.py +++ b/var/spack/repos/builtin/packages/r-zcompositions/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-zeallot/package.py b/var/spack/repos/builtin/packages/r-zeallot/package.py index 12c2fdca8c3ed9..5a4a5c2dad0baf 100644 --- a/var/spack/repos/builtin/packages/r-zeallot/package.py +++ b/var/spack/repos/builtin/packages/r-zeallot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class RZeallot(RPackage): cran = "zeallot" + license("MIT") + version("0.1.0", sha256="439f1213c97c8ddef9a1e1499bdf81c2940859f78b76bc86ba476cebd88ba1e9") diff --git a/var/spack/repos/builtin/packages/r-zip/package.py b/var/spack/repos/builtin/packages/r-zip/package.py index d35684783d4e95..8f17fba4579a3d 100644 --- a/var/spack/repos/builtin/packages/r-zip/package.py +++ b/var/spack/repos/builtin/packages/r-zip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RZip(RPackage): cran = "zip" + license("MIT") + version("2.3.0", sha256="33eba844922af9981732ee6ec1582d46cf04c562344f09a0f0f14a22c6f74543") version("2.2.2", sha256="e16cde23bb283efbe9b6bce19575c716c371d09033b42514471ccb444c0a8ea4") version("2.2.1", sha256="14873d0874813139411c120d8b209af71e4e087871eeb963f235411eb1061422") diff --git a/var/spack/repos/builtin/packages/r-zlibbioc/package.py b/var/spack/repos/builtin/packages/r-zlibbioc/package.py index 33da7c380fc91e..ed618d261f4e95 100644 --- a/var/spack/repos/builtin/packages/r-zlibbioc/package.py +++ b/var/spack/repos/builtin/packages/r-zlibbioc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index 7a81e11e77abb5..907daa0f33c38f 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RZoo(RPackage): cran = "zoo" + license("GPL-2.0-only OR GPL-3.0-only") + version("1.8-12", sha256="e6c3862668f9e3422bced3b6fba485c76a1e91b48f5d6153822d6a61863b2fb8") version("1.8-11", sha256="848e50f875afe06f13422e32160082b0725159a8be98234ef358480e57029ca5") version("1.8-10", sha256="c9a282d8004c22651c4fa1d657d3cad946c5ec55c4dc068569d860ee9b31ed47") diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index 7232a7e6c165dc..052d22c1a534d7 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -1,10 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -import re from spack.package import * @@ -21,7 +20,12 @@ class R(AutotoolsPackage): extendable = True + license("GPL-2.0-or-later") + + version("4.3.2", sha256="b3f5760ac2eee8026a3f0eefcb25b47723d978038eee8e844762094c860c452a") + version("4.3.1", sha256="8dd0bf24f1023c6f618c3b317383d291b4a494f40d73b983ac22ffea99e4ba99") version("4.3.0", sha256="45dcc48b6cf27d361020f77fde1a39209e997b81402b3663ca1c010056a6a609") + version("4.2.3", sha256="55e4a9a6d43be314e2c03d0266a6fa5444afdce50b303bfc3b82b3979516e074") version("4.2.2", sha256="0ff62b42ec51afa5713caee7c4fde7a0c45940ba39bef8c5c9487fef0c953df5") version("4.2.1", sha256="4d52db486d27848e54613d4ee977ad952ec08ce17807e1b525b10cd4436c643f") version("4.2.0", sha256="38eab7719b7ad095388f06aa090c5a2b202791945de60d3e2bb0eab1f5097488") @@ -60,21 +64,20 @@ class R(AutotoolsPackage): version("3.1.3", sha256="07e98323935baa38079204bfb9414a029704bb9c0ca5ab317020ae521a377312") version("3.1.2", sha256="bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a") - variant( - "external-lapack", default=False, description="Links to externally installed BLAS/LAPACK" - ) variant("X", default=False, description="Enable X11 support (TCLTK, PNG, JPEG, TIFF, CAIRO)") variant("memory_profiling", default=False, description="Enable memory profiling") variant("rmath", default=False, description="Build standalone Rmath library") - depends_on("blas", when="+external-lapack") - depends_on("lapack", when="+external-lapack") + depends_on("blas") + depends_on("lapack") + depends_on("bzip2") depends_on("curl+libidn2") # R didn't anticipate the celebratory non-breaking major version bump of curl 8. depends_on("curl@:7", when="@:4.2") depends_on("icu4c") depends_on("java") + depends_on("libtirpc") depends_on("ncurses") depends_on("pcre", when="@:3.6.3") depends_on("pcre2", when="@4:") @@ -84,16 +87,18 @@ class R(AutotoolsPackage): depends_on("zlib-api") depends_on("zlib@1.2.5:", when="^zlib") depends_on("texinfo", type="build") - depends_on("cairo+X+gobject+pdf", when="+X") - depends_on("pango+X", when="+X") - depends_on("harfbuzz+graphite2", when="+X") - depends_on("jpeg", when="+X") - depends_on("libpng", when="+X") - depends_on("libtiff", when="+X") - depends_on("libx11", when="+X") - depends_on("libxmu", when="+X") - depends_on("libxt", when="+X") - depends_on("tk", when="+X") + + with when("+X"): + depends_on("cairo+X+gobject+pdf") + depends_on("pango+X") + depends_on("harfbuzz+graphite2") + depends_on("jpeg") + depends_on("libpng") + depends_on("libtiff") + depends_on("libx11") + depends_on("libxmu") + depends_on("libxt") + depends_on("tk") patch("zlib.patch", when="@:3.3.2") @@ -103,6 +108,10 @@ class R(AutotoolsPackage): # temporary fix to lower the optimization level. patch("change_optflags_tmp.patch", when="%fj@4.1.0") + # Make R use a symlink to which in Sys.which, otherwise an absolute path + # gets stored as compressed byte code, which is not relocatable + patch("relocate-which.patch") + build_directory = "spack-build" # R custom URL version @@ -118,7 +127,7 @@ def etcdir(self): @run_after("install") def install_rmath(self): if "+rmath" in self.spec: - with working_dir("src/nmath/standalone"): + with working_dir(join_path(self.build_directory, "src", "nmath", "standalone")): make() make("install", parallel=False) @@ -126,32 +135,34 @@ def configure_args(self): spec = self.spec prefix = self.prefix + extra_rpath = join_path(prefix, "rlib", "R", "lib") + + blas_flags: str = spec["blas"].libs.ld_flags + lapack_flags: str = spec["lapack"].libs.ld_flags + + # R uses LAPACK in Fortran, which requires libmkl_gf_* when gfortran is used. + # TODO: cleaning this up seem to require both compilers as dependencies and use variants. + if spec["lapack"].name in INTEL_MATH_LIBRARIES and "gfortran" in self.compiler.fc: + xlp64 = "ilp64" if spec["lapack"].satisfies("+ilp64") else "lp64" + blas_flags = blas_flags.replace(f"mkl_intel_{xlp64}", f"mkl_gf_{xlp64}") + lapack_flags = lapack_flags.replace(f"mkl_intel_{xlp64}", f"mkl_gf_{xlp64}") + config_args = [ "--with-internal-tzcode", "--libdir={0}".format(join_path(prefix, "rlib")), "--enable-R-shlib", - "--enable-BLAS-shlib", "--enable-R-framework=no", "--without-recommended-packages", - "LDFLAGS=-L{0} -Wl,-rpath,{0}".format(join_path(prefix, "rlib", "R", "lib")), + f"LDFLAGS=-Wl,-rpath,{extra_rpath}", + f"--with-blas={blas_flags}", + f"--with-lapack={lapack_flags}", + # cannot disable docs with a normal configure option + "ac_cv_path_PDFLATEX=", + "ac_cv_path_PDFTEX=", + "ac_cv_path_TEX=", + "ac_cv_path_TEXI2DVI=", ] - if "+external-lapack" in spec: - if spec["lapack"].name in INTEL_MATH_LIBRARIES and "gfortran" in self.compiler.fc: - mkl_re = re.compile(r"(mkl_)intel(_i?lp64\b)") - config_args.extend( - [ - mkl_re.sub( - r"\g<1>gf\g<2>", "--with-blas={0}".format(spec["blas"].libs.ld_flags) - ), - "--with-lapack", - ] - ) - else: - config_args.extend( - ["--with-blas={0}".format(spec["blas"].libs.ld_flags), "--with-lapack"] - ) - if "+X" in spec: config_args.append("--with-cairo") config_args.append("--with-jpeglib") diff --git a/var/spack/repos/builtin/packages/r/relocate-which.patch b/var/spack/repos/builtin/packages/r/relocate-which.patch new file mode 100644 index 00000000000000..d8e18e187755d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/r/relocate-which.patch @@ -0,0 +1,52 @@ +From 3f2b1b6c94460fd4d3e9f03c9f17a25db2d2b473 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels +Date: Wed, 10 Jan 2024 12:40:40 +0100 +Subject: [PATCH] base: use a symlink for which instead of hard-coded string + +--- + share/make/basepkg.mk | 8 ++++---- + src/library/base/R/unix/system.unix.R | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/share/make/basepkg.mk b/share/make/basepkg.mk +index c0a69c8a0af338ec002156236e47b9d7efea8165..4cf6387870915001cbb8b1439509ff4955cc67b1 100644 +--- a/share/make/basepkg.mk ++++ b/share/make/basepkg.mk +@@ -72,16 +72,16 @@ mkRbase: + else \ + cat $(RSRC) > "$${f}"; \ + fi; \ +- f2=$${TMPDIR:-/tmp}/R2$$$$; \ +- sed -e "s:@WHICH@:${WHICH}:" "$${f}" > "$${f2}"; \ +- rm -f "$${f}"; \ +- $(SHELL) $(top_srcdir)/tools/move-if-change "$${f2}" all.R) ++ $(SHELL) $(top_srcdir)/tools/move-if-change "$${f}" all.R) + @if ! test -f $(top_builddir)/library/$(pkg)/R/$(pkg); then \ + $(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \ + else if test all.R -nt $(top_builddir)/library/$(pkg)/R/$(pkg); then \ + $(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \ + fi \ + fi ++ @if ! test -f $(top_builddir)/library/$(pkg)/R/which; then \ ++ cd $(top_builddir)/library/$(pkg)/R/ && $(LN_S) $(WHICH) which; \ ++ fi + + mkdesc: + @if test -f DESCRIPTION; then \ +diff --git a/src/library/base/R/unix/system.unix.R b/src/library/base/R/unix/system.unix.R +index 3bb7d0cb27cc73a024bcea3e41e2e0c5c7e9648a..78271c8c12cb3217bc068e9d53ef9e3060e8dcc9 100644 +--- a/src/library/base/R/unix/system.unix.R ++++ b/src/library/base/R/unix/system.unix.R +@@ -114,9 +114,9 @@ system2 <- function(command, args = character(), + Sys.which <- function(names) + { + res <- character(length(names)); names(res) <- names +- ## hopefully configure found [/usr]/bin/which +- which <- "@WHICH@" +- if (!nzchar(which)) { ++ which <- file.path(R.home(), "library", "base", "R", "which") ++ ## which should be a symlink to the system's which ++ if (!file.exists(which)) { + warning("'which' was not found on this platform") + return(res) + } diff --git a/var/spack/repos/builtin/packages/r3d/package.py b/var/spack/repos/builtin/packages/r3d/package.py index 8179db1dffd0c1..63f13ec2387d5a 100644 --- a/var/spack/repos/builtin/packages/r3d/package.py +++ b/var/spack/repos/builtin/packages/r3d/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rabbitmq-c/package.py b/var/spack/repos/builtin/packages/rabbitmq-c/package.py index f37274bc9228c0..3e7396a1b3b7de 100644 --- a/var/spack/repos/builtin/packages/rabbitmq-c/package.py +++ b/var/spack/repos/builtin/packages/rabbitmq-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RabbitmqC(CMakePackage): maintainers("lpottier") + license("MIT") + version("0.13.0", sha256="8b224e41bba504fc52b02f918d8df7e4bf5359d493cbbff36c06078655c676e6") version("0.11.0", sha256="437d45e0e35c18cf3e59bcfe5dfe37566547eb121e69fca64b98f5d2c1c2d424") diff --git a/var/spack/repos/builtin/packages/rabbitmq/package.py b/var/spack/repos/builtin/packages/rabbitmq/package.py index 72854ac2059ef0..754b272f068346 100644 --- a/var/spack/repos/builtin/packages/rabbitmq/package.py +++ b/var/spack/repos/builtin/packages/rabbitmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Rabbitmq(Package): homepage = "https://www.rabbitmq.com/" url = "http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.15/rabbitmq-server-generic-unix-3.6.15.tar.xz" + license("BSD-2-Clause") + version("3.6.15", sha256="04e6a291642f80e87fc892d5e8ea309fb3fab85ebb64a79a70dfe6c6cfde36fb") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/racket/package.py b/var/spack/repos/builtin/packages/racket/package.py index 62bc8b7fa59709..a9cfa27dea5183 100644 --- a/var/spack/repos/builtin/packages/racket/package.py +++ b/var/spack/repos/builtin/packages/racket/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Racket(MakefilePackage): maintainers("arjunguha", "elfprince13") + license("Apache-2.0 OR MIT") + version("8.3", sha256="3b963cd29ae119e1acc2c6dc4781bd9f25027979589caaae3fdfc021aac2324b") depends_on("libffi", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/racon/package.py b/var/spack/repos/builtin/packages/racon/package.py index fd58e568b33934..4ba7ec80e059d2 100644 --- a/var/spack/repos/builtin/packages/racon/package.py +++ b/var/spack/repos/builtin/packages/racon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Racon(CMakePackage): homepage = "https://github.com/isovic/racon" url = "https://github.com/isovic/racon/releases/download/1.2.1/racon-v1.2.1.tar.gz" + license("MIT") + version("1.4.3", sha256="dfce0bae8234c414ef72b690247701b4299e39a2593bcda548a7a864f51de7f2") version("1.4.2", sha256="b36d8b767e0fc9acdd3e9d34c99a8bbc02a3aae7a953c57923d935ebdf332700") version("1.4.0", sha256="3e1e97388f428326342dead3f8500e72b1986f292bdfd4d1be4a0d2a21f4cc61") diff --git a/var/spack/repos/builtin/packages/raft/package.py b/var/spack/repos/builtin/packages/raft/package.py index fcc19c9c402dfb..919a555a008fae 100644 --- a/var/spack/repos/builtin/packages/raft/package.py +++ b/var/spack/repos/builtin/packages/raft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ragel/package.py b/var/spack/repos/builtin/packages/ragel/package.py index cac2eaa8ca6253..62d97dde140e7c 100644 --- a/var/spack/repos/builtin/packages/ragel/package.py +++ b/var/spack/repos/builtin/packages/ragel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Ragel(AutotoolsPackage): git = "git://colm.net/ragel.git" url = "https://www.colm.net/files/ragel/ragel-6.10.tar.gz" + license("GPL-2.0-or-later") + version("6.10", sha256="5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f") depends_on("colm", type="build") diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index 99221b9b08c7d3..9bb463412f38c8 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): maintainers("davidbeckingsale") + license("BSD-3-Clause") + version("develop", branch="develop", submodules=False) version("main", branch="main", submodules=False) version( @@ -112,6 +114,14 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): when="@:0.13.0 ^blt@0.4:", ) + # Backward compatibility is stopped from ROCm 6.0 + # Future relase will have the change from PR https://github.com/LLNL/RAJA/pull/1568 + patch( + "https://github.com/LLNL/RAJA/commit/406eb8dee05a41eb32c421c375688a4863b60642.patch?full_index=1", + sha256="d9ce5ef038555cbccb330a9016b7be77e56ae0660583cba955dab9d0297a4b07", + when="^hip@6.0.0", + ) + variant("openmp", default=True, description="Build OpenMP backend") variant("shared", default=True, description="Build Shared Libs") variant("plugins", default=False, description="Enable runtime plugins") @@ -162,6 +172,11 @@ def _get_sys_type(self, spec): sys_type = env["SYS_TYPE"] return sys_type + @property + def libs(self): + shared = "+shared" in self.spec + return find_libraries("libRAJA", root=self.prefix, shared=shared, recursive=True) + @property def cache_name(self): hostname = socket.gethostname() diff --git a/var/spack/repos/builtin/packages/ramulator/package.py b/var/spack/repos/builtin/packages/ramulator/package.py index ab0cc180fe3e5a..724a26fc27a3d6 100644 --- a/var/spack/repos/builtin/packages/ramulator/package.py +++ b/var/spack/repos/builtin/packages/ramulator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Ramulator(MakefilePackage): maintainers("jjwilke") + license("MIT") + version("sst", commit="7d2e72306c6079768e11a1867eb67b60cee34a1c") patch("ramulator_sha_7d2e723_gcc48Patch.patch", when="@sst") diff --git a/var/spack/repos/builtin/packages/randfold/package.py b/var/spack/repos/builtin/packages/randfold/package.py index dffbb2f7662f57..ae2dbac959f237 100644 --- a/var/spack/repos/builtin/packages/randfold/package.py +++ b/var/spack/repos/builtin/packages/randfold/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Randfold(MakefilePackage): homepage = "http://bioinformatics.psb.ugent.be/supplementary_data/erbon/nov2003/" url = "http://bioinformatics.psb.ugent.be/supplementary_data/erbon/nov2003/downloads/randfold-2.0.1.tar.gz" + license("GPL-2.0-only") + version("2.0.1", sha256="b286145deb9ac6197062d98e209da095f00c45a5a615616bcf2b2a6609ed113f") depends_on("squid") diff --git a/var/spack/repos/builtin/packages/random123/package.py b/var/spack/repos/builtin/packages/random123/package.py index ac6992dfd2f58f..efc681f98c1204 100644 --- a/var/spack/repos/builtin/packages/random123/package.py +++ b/var/spack/repos/builtin/packages/random123/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py index 935f98baea022b..7d13f054925895 100644 --- a/var/spack/repos/builtin/packages/randrproto/package.py +++ b/var/spack/repos/builtin/packages/randrproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/range-v3/package.py b/var/spack/repos/builtin/packages/range-v3/package.py index 9ab4c315b41162..40227261c0fe06 100644 --- a/var/spack/repos/builtin/packages/range-v3/package.py +++ b/var/spack/repos/builtin/packages/range-v3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RangeV3(CMakePackage): git = "https://github.com/ericniebler/range-v3.git" maintainers("greenc-FNAL") + license("BSL-1.0") + version("master", branch="master") version("0.11.0", sha256="376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c") version("0.10.0", sha256="5a1cd44e7315d0e8dcb1eee4df6802221456a9d1dbeac53da02ac7bd4ea150cd") diff --git a/var/spack/repos/builtin/packages/rankstr/package.py b/var/spack/repos/builtin/packages/rankstr/package.py index 560f4eae76c046..899e8ed1c3a1dc 100644 --- a/var/spack/repos/builtin/packages/rankstr/package.py +++ b/var/spack/repos/builtin/packages/rankstr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Rankstr(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.3.0", sha256="5e6378a8fe155b4c6c5cf45db8aaf0562d88e93471d0e12c1e922252ffcce5e6") version("0.2.0", sha256="a3f7fd8015156c1b600946af759a03e099e05c83e7b2da6bac394fe7c0d4efae") diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py index ed11da9857af2a..fdd0b7f903ac68 100644 --- a/var/spack/repos/builtin/packages/rapidjson/package.py +++ b/var/spack/repos/builtin/packages/rapidjson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rapidjson(CMakePackage): url = "https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz" git = "https://github.com/Tencent/rapidjson.git" + license("MIT") + version("1.2.0-2022-03-09", commit="8261c1ddf43f10de00fd8c9a67811d1486b2c784") version("1.2.0-2021-08-13", commit="00dbcf2c6e03c47d6c399338b6de060c71356464") version("1.1.0", sha256="bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e") diff --git a/var/spack/repos/builtin/packages/raptor2/package.py b/var/spack/repos/builtin/packages/raptor2/package.py index 1d030ced7d3200..5c9bf22a4610fd 100644 --- a/var/spack/repos/builtin/packages/raptor2/package.py +++ b/var/spack/repos/builtin/packages/raptor2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Raptor2(AutotoolsPackage): homepage = "https://librdf.org/" url = "https://download.librdf.org/source/raptor2-2.0.15.tar.gz" + license("LGPL-2.1-or-later") + version("2.0.15", sha256="ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed") depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/rarpd/package.py b/var/spack/repos/builtin/packages/rarpd/package.py index 7b342667af121e..c9eb493031807c 100644 --- a/var/spack/repos/builtin/packages/rarpd/package.py +++ b/var/spack/repos/builtin/packages/rarpd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Rarpd(MakefilePackage): maintainers("jcpunk") + license("GPL-2.0-only") + version( "0.981107-fixes", sha256="92b44adc4a061dcedeb01f7e1c1700374199cccceef1a798de97303d387bb4c2" ) diff --git a/var/spack/repos/builtin/packages/rasdaemon/package.py b/var/spack/repos/builtin/packages/rasdaemon/package.py index eeed6ffcb01eb2..4d3a07af0a9614 100644 --- a/var/spack/repos/builtin/packages/rasdaemon/package.py +++ b/var/spack/repos/builtin/packages/rasdaemon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Rasdaemon(AutotoolsPackage): homepage = "https://github.com/mchehab/rasdaemon" url = "https://github.com/mchehab/rasdaemon/archive/v0.6.6.tar.gz" + license("GPL-2.0-or-later") + version("0.6.6", sha256="eea5fefc68583cca2e6daec58508a554553056aeec5eeee0989417c89607eaba") version("0.6.5", sha256="1d85580778a0b7c0587b42e24dfe6c02f4c07c6ca9bbb80737d50b58ac830c92") version("0.6.4", sha256="c70e2dae1e15af496873b9e5a4d89847759fffd6cbf5ed1d74d28cd250c0771b") diff --git a/var/spack/repos/builtin/packages/rasqal/package.py b/var/spack/repos/builtin/packages/rasqal/package.py index fbb6329b319042..bce50a0341670e 100644 --- a/var/spack/repos/builtin/packages/rasqal/package.py +++ b/var/spack/repos/builtin/packages/rasqal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Rasqal(AutotoolsPackage): homepage = "https://librdf.org/" url = "https://download.librdf.org/source/rasqal-0.9.33.tar.gz" + license("LGPL-2.1-or-later") + version("0.9.33", sha256="6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c") version("0.9.32", sha256="eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f") version("0.9.31", sha256="28d743c9f1b0e5b0486ae4a945fa1e021c8495707e7adbfa0e232244b28b7fee") diff --git a/var/spack/repos/builtin/packages/ratel/package.py b/var/spack/repos/builtin/packages/ratel/package.py index 9eeaf2ec8c8a7d..34b2a6c08b6f54 100644 --- a/var/spack/repos/builtin/packages/ratel/package.py +++ b/var/spack/repos/builtin/packages/ratel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ratel(MakefilePackage, CudaPackage, ROCmPackage): maintainers("jedbrown", "jeremylt") + license("BSD-2-Clause") + version("develop", branch="main") version("0.3.0", tag="v0.3.0", commit="ca2f3357e10b89fb274626fba104aad30c72774b") version("0.2.1", tag="v0.2.1", commit="043b61696a2407205fdfd898681467d1a7ff59e0") diff --git a/var/spack/repos/builtin/packages/ravel/package.py b/var/spack/repos/builtin/packages/ravel/package.py index 47aa2dabd0eb35..accaf42d88a666 100644 --- a/var/spack/repos/builtin/packages/ravel/package.py +++ b/var/spack/repos/builtin/packages/ravel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/raxml-ng/package.py b/var/spack/repos/builtin/packages/raxml-ng/package.py index f2c1c381a8f558..4564eaca280fa6 100644 --- a/var/spack/repos/builtin/packages/raxml-ng/package.py +++ b/var/spack/repos/builtin/packages/raxml-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class RaxmlNg(CMakePackage): url = "https://github.com/amkozlov/raxml-ng/archive/1.0.1.tar.gz" git = "https://github.com/amkozlov/raxml-ng.git" + license("AGPL-3.0-only") + version("1.1.0", submodules=True) version("1.0.2", submodules=True) version("1.0.1", submodules=True) diff --git a/var/spack/repos/builtin/packages/raxml/package.py b/var/spack/repos/builtin/packages/raxml/package.py index f93b69a5df07bf..ee3669cf3dde86 100644 --- a/var/spack/repos/builtin/packages/raxml/package.py +++ b/var/spack/repos/builtin/packages/raxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Raxml(Package): homepage = "https://sco.h-its.org/exelixis/web/software/raxml" url = "https://github.com/stamatak/standard-RAxML/archive/v8.2.12.tar.gz" + license("GPL-3.0-or-later") + version("8.2.12", sha256="338f81b52b54e16090e193daf36c1d4baa9b902705cfdc7f4497e3e09718533b") version("8.2.11", sha256="08cda74bf61b90eb09c229e39b1121c6d95caf182708e8745bd69d02848574d7") diff --git a/var/spack/repos/builtin/packages/ray/package.py b/var/spack/repos/builtin/packages/ray/package.py index c481aeeb5936cb..bc75c8a9380f21 100644 --- a/var/spack/repos/builtin/packages/ray/package.py +++ b/var/spack/repos/builtin/packages/ray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Ray(CMakePackage, SourceforgePackage): homepage = "http://denovoassembler.sourceforge.net/" sourceforge_mirror_path = "denovoassembler/Ray-2.3.1.tar.bz2" + license("GPL-3.0-or-later") + version("2.3.1", sha256="3122edcdf97272af3014f959eab9a0f0e5a02c8ffc897d842b06b06ccd748036") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/rccl-tests/package.py b/var/spack/repos/builtin/packages/rccl-tests/package.py index 8939db446a41ed..a27bebac07bffc 100644 --- a/var/spack/repos/builtin/packages/rccl-tests/package.py +++ b/var/spack/repos/builtin/packages/rccl-tests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,13 +10,15 @@ class RcclTests(MakefilePackage): """These tests check both the performance and the correctness of RCCL operations. They can be compiled against RCCL.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rccl-tests" - git = "https://github.com/ROCmSoftwarePlatform/rccl-tests.git" - url = "https://github.com/ROCmSoftwarePlatform/rccl-tests.git" + homepage = "https://github.com/ROCm/rccl-tests" + git = "https://github.com/ROCm/rccl-tests.git" + url = "https://github.com/ROCm/rccl-tests.git" tags = ["rocm"] maintainers("bvanessen") + license("BSD-3-Clause") + version("develop", branch="develop", preferred=True) version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/rccl/0004-Set-rocm-core-path-for-version-file.patch b/var/spack/repos/builtin/packages/rccl/0004-Set-rocm-core-path-for-version-file.patch new file mode 100644 index 00000000000000..fd03def3ee22b3 --- /dev/null +++ b/var/spack/repos/builtin/packages/rccl/0004-Set-rocm-core-path-for-version-file.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5384287..ea6fd4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,7 @@ message(STATUS "hipcc version: ${hipcc_version_string}") + + ## Check for ROCm version + execute_process( +- COMMAND bash "-c" "cat ${ROCM_PATH}/.info/version" ++ COMMAND bash "-c" "cat $ENV{ROCMCORE_PATH}/.info/version" + OUTPUT_VARIABLE rocm_version_string + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string}) diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 677b077b4bdce7..52519c0194529e 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,13 +14,16 @@ class Rccl(CMakePackage): implementing all-reduce, all-gather, reduce, broadcast, and reduce-scatter.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rccl" - git = "https://github.com/ROCmSoftwarePlatform/rccl.git" - url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rccl" + git = "https://github.com/ROCm/rccl.git" + url = "https://github.com/ROCm/rccl/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librccl"] + version("6.0.0", sha256="0496d5a5f2e48c92cd390ab318df31a53cf7ec590988c2574c9f3d99c38b0fa7") + version("5.7.1", sha256="fb4c1f0084196d1226ce8a726d0f012d3890b54508a06ca87bbda619be8b90b1") + version("5.7.0", sha256="4c2825a3e4323ef3c2f8855ef445c1a81cf1992fb37e3e8a07a50db354aa3954") version("5.6.1", sha256="27ec6b86a1a329684d808f728c1fce134517ac8e6e7047689f95dbf8386c077e") version("5.6.0", sha256="cce13c8a9e233e7ddf91a67b1626b7aaeaf818fefe61af8de6b6b6ff47cb358c") version("5.5.1", sha256="f6b9dc6dafeb49d95c085825876b09317d8252771c746ccf5aa19a9204a404b2") @@ -116,7 +119,8 @@ class Rccl(CMakePackage): patch("0001-Fix-numactl-path-issue.patch", when="@3.7.0:4.3.2") patch("0002-Fix-numactl-rocm-smi-path-issue.patch", when="@4.5.0:5.2.1") - patch("0003-Fix-numactl-rocm-smi-path-issue.patch", when="@5.2.3:") + patch("0003-Fix-numactl-rocm-smi-path-issue.patch", when="@5.2.3:5.6") + patch("0004-Set-rocm-core-path-for-version-file.patch", when="@6.0:") depends_on("cmake@3.5:", type="build") for ver in [ @@ -147,6 +151,9 @@ class Rccl(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -180,6 +187,9 @@ class Rccl(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("numactl@2:", when="@" + ver) for ver in [ @@ -200,12 +210,16 @@ class Rccl(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-smi-lib@" + ver, when="@" + ver) depends_on("chrpath", when="@5.3.0:") - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) + depends_on("googletest@1.11.0:", when="@5.3:") @classmethod @@ -221,6 +235,7 @@ def determine_version(cls, lib): def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) + env.set("ROCMCORE_PATH", self.spec["rocm-core"].prefix) def cmake_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/rclone/package.py b/var/spack/repos/builtin/packages/rclone/package.py index a1dacabc7708e7..2582cf1327bad0 100644 --- a/var/spack/repos/builtin/packages/rclone/package.py +++ b/var/spack/repos/builtin/packages/rclone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,8 +15,18 @@ class Rclone(Package): maintainers("alecbcs") + license("MIT") + + version("1.65.1", sha256="904b906cc465dd679a00487497e3891d33fca6b6e25c184400bccfb248344f39") + version("1.65.0", sha256="45ec732d50b2517dc2c860317a3bf79867634a8143e4a441a3e399434ad6c141") + version("1.64.2", sha256="0c74d8fb887691e04e865e3b6bc32e8af47c3e54a9922ffdbed38c8323e281c9") + version("1.64.1", sha256="670e18960efd34bae9d1a0152a54f16ba0c6b8fad728d7ff4ea8b141ef1ed93d") + version("1.64.0", sha256="fb08b2b7c991ade4019a561f9bb75683b8d0daa45226efbc9937639775977203") version("1.63.1", sha256="0d8bf8b7460681f7906096a9d37eedecc5a1d1d3ad17652e68f0c6de104c2412") + version("1.63.0", sha256="88ed9c876b03d2cc745463903ac5233e441cd56d0d1031906bc8381af11ea0c8") version("1.62.2", sha256="340371f94604e6771cc4a2c91e37d1bf00a524deab520340440fb0968e783f63") + version("1.62.1", sha256="3bb03c08f11fda276c953544487558c3c0bfe14f89796b9eaa108a334d854ed1") + version("1.62.0", sha256="2a04a254f60255c10998f74be9d320740df82525a7d16d8ceebab57627137b44") version("1.61.1", sha256="34b5f52047741c7bbf54572c02cc9998489c4736a753af3c99255296b1af125d") version("1.59.1", sha256="db3860e4549af28d87aa83f2035a57c5d081b179e40d4c828db19c3c3545831e") version("1.58.1", sha256="4d1d50a5b4888aa8eca10624073759ab8376c8b1acb38a238831d40074792524") diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index 8f88417ebf127c..f4466bc9910cc8 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,8 +12,8 @@ class Rdc(CMakePackage): """ROCm Data Center Tool""" - homepage = "https://github.com/RadeonOpenCompute/rdc" - url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rdc" + url = "https://github.com/ROCm/rdc/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") @@ -21,11 +21,16 @@ class Rdc(CMakePackage): def url_for_version(self, version): if version == Version("3.9.0"): - return "https://github.com/RadeonOpenCompute/rdc/archive/rdc_so_ver-0.3.tar.gz" + return "https://github.com/ROCm/rdc/archive/rdc_so_ver-0.3.tar.gz" - url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-{0}.tar.gz" + url = "https://github.com/ROCm/rdc/archive/rocm-{0}.tar.gz" return url.format(version) + license("MIT") + + version("6.0.0", sha256="5e3847a919d5f7efe99d8d76c96e78401659eccd1fb234b1b8cb4304096d6e89") + version("5.7.1", sha256="5251eb3085f2019246b332e9552dfae1572cf64ddf58306b81cbe7108019ffee") + version("5.7.0", sha256="924e94f14f6390d7a6ff7863fb4e2085c1ff5f9c12b8bd46471eb31f001c4f14") version("5.6.1", sha256="9e9f57cebbc5ae386a405957ed2c17344cdb42db5e1a71285f2c9bc09eea6519") version("5.6.0", sha256="5213cd89215463862f6a1e9480ebe017944a6bb6b0db1722628afaa34af57991") version("5.5.1", sha256="a58a319ee702cf61cf71a4eba647c231392f68449b35419d941079c6de944844") @@ -134,6 +139,9 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-smi-lib@" + ver, type=("build", "link"), when="@" + ver) @@ -153,10 +161,13 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) def patch(self): diff --git a/var/spack/repos/builtin/packages/rdkit/package.py b/var/spack/repos/builtin/packages/rdkit/package.py index 15a68ab8b1ff0b..60263763ec96fa 100644 --- a/var/spack/repos/builtin/packages/rdkit/package.py +++ b/var/spack/repos/builtin/packages/rdkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Rdkit(CMakePackage): maintainers("bvanessen", "RMeli") + license("BSD-3-Clause") + version("2023_03_1", sha256="db346afbd0ba52c843926a2a62f8a38c7b774ffab37eaf382d789a824f21996c") version("2022_09_5", sha256="2efe7ce3b527df529ed3e355e2aaaf14623e51876be460fa4ad2b7f7ad54c9b1") version("2021_09_5", sha256="f720b3f6292c4cd0a412a073d848ffac01a43960082e33ee54b68798de0cbfa1") diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py index 875471d02cfe4a..8c2998e5da05df 100644 --- a/var/spack/repos/builtin/packages/rdma-core/package.py +++ b/var/spack/repos/builtin/packages/rdma-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,16 @@ class RdmaCore(CMakePackage): libraries = ["librdmacm.so"] keep_werror = "all" + license("GPL-2.0-only OR BSD-2-Clause") + + version("49.0", sha256="953546ad2b179f9ce68dc21eb1eb26003098ea1bf0f87a4baed45bcea134b2b4") + version("47.1", sha256="5d92058473b90be231c17220ce456837cb6da9975de498bd63b9660baa25afd6") + version("46.2", sha256="c59c3c79fbae6038d7c6d16b37132e433e19f4a86d41341c6b7974b830b0d4fa") + version("45.3", sha256="6cb2bf25927dfbaf5acba9ae755f11beabc2983720d2eb2c4547a490bbf2ba81") + version("44.4", sha256="7de3f50d3e11a519494efc88250ca6aef992c072d772113eb81b64e69d03e46b") + version("43.4", sha256="2a3155774947ef602f50a3d41d642d09348e4c55411633743985bf8c83d0b9bf") + version("42.5", sha256="d6f8976d4cc295ad6eba09a3dcad8cdb26f36556dbee81f41965f3761f3ac093") + version("41.5", sha256="70e2a5f1d552398c09c02e660fa63c476c05c47c8b47b3fd2f8661503f35aed8") version("41.0", sha256="e0b7deb8a71f229796a0cfe0fa25192c530cd3d86b755b6b28d1a5986a77507b") version("40.0", sha256="8844edb71311e3212e55e28fa4bdc6e06dd6c7b839ed56ee4b606e4220d94ee8") version("39.1", sha256="32ccd5c990d34605b6e996de991528ef01d278ad06bcf62ccf8a32edb118c335") @@ -61,9 +71,11 @@ class RdmaCore(CMakePackage): default=True, description="Produce static libraries along with usual shared libraries.", ) + variant("pyverbs", default=True, description="Build with support for pyverbs") + variant("man_pages", default=True, description="Build with support for man pages") depends_on("pkgconfig", type="build") - depends_on("py-docutils", type="build") + depends_on("py-docutils", when="+man_pages", type="build") depends_on("libnl") conflicts("platform=darwin", msg="rdma-core requires FreeBSD or Linux") conflicts("%intel", msg="rdma-core cannot be built with intel (use gcc instead)") @@ -90,11 +102,9 @@ def cmake_args(self): cmake_args.append(self.define_from_variant("ENABLE_STATIC", "static")) - if self.spec.satisfies("@:39.0"): - cmake_args.extend( - [ - self.define("PYTHON_LIBRARY", self.spec["python"].libs[0]), - self.define("PYTHON_INCLUDE_DIR", self.spec["python"].headers.directories[0]), - ] - ) + if self.spec.satisfies("~pyverbs"): + cmake_args.append("-DNO_PYVERBS=1") + if self.spec.satisfies("~man_pages"): + cmake_args.append("-DNO_MAN_PAGES=1") + return cmake_args diff --git a/var/spack/repos/builtin/packages/rdp-classifier/package.py b/var/spack/repos/builtin/packages/rdp-classifier/package.py index 248a7da8baf51a..96b2083d602add 100644 --- a/var/spack/repos/builtin/packages/rdp-classifier/package.py +++ b/var/spack/repos/builtin/packages/rdp-classifier/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RdpClassifier(Package, SourceforgePackage): homepage = "http://rdp.cme.msu.edu/" sourceforge_mirror_path = "rdp-classifier/rdp_classifier_2.12.zip" + license("GPL-2.0-only") + version("2.12", sha256="977896248189a1ce2146dd3a61d203c3c6bc9aa3982c60332d463832922f7d0a") depends_on("java", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/rdptools/package.py b/var/spack/repos/builtin/packages/rdptools/package.py index e8bb714e71129f..de35c48be36ef8 100644 --- a/var/spack/repos/builtin/packages/rdptools/package.py +++ b/var/spack/repos/builtin/packages/rdptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/re2/package.py b/var/spack/repos/builtin/packages/re2/package.py index 3c62d3da76217c..0932968d18e81c 100644 --- a/var/spack/repos/builtin/packages/re2/package.py +++ b/var/spack/repos/builtin/packages/re2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Re2(CMakePackage): homepage = "https://github.com/google/re2" url = "https://github.com/google/re2/archive/2020-08-01.tar.gz" + license("BSD-3-Clause") + version( "2023-09-01", sha256="5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b" ) diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py index a135b2f3815a79..6f621b5d3adb9b 100644 --- a/var/spack/repos/builtin/packages/re2c/package.py +++ b/var/spack/repos/builtin/packages/re2c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Re2c(Package): url = "https://github.com/skvadrik/re2c/releases/download/1.2.1/re2c-1.2.1.tar.xz" tags = ["windows"] + license("Public-Domain") + version("2.2", sha256="0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda") version("2.1.1", sha256="036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8") version("2.1", sha256="8cba0d95c246c670de8f97f57def83a9c0f2113eaa6f7e4867a941f48f633540") diff --git a/var/spack/repos/builtin/packages/readfq/package.py b/var/spack/repos/builtin/packages/readfq/package.py index 3d6504f9f2c0e9..280ca5cf3b31c7 100644 --- a/var/spack/repos/builtin/packages/readfq/package.py +++ b/var/spack/repos/builtin/packages/readfq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Readfq(Package): homepage = "https://github.com/lh3/readfq" git = "https://github.com/lh3/readfq.git" + license("MIT") + version("2013.04.10", commit="4fb766095d8f459e0f8025be70f9173673905d12") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/readline/package.py b/var/spack/repos/builtin/packages/readline/package.py index 6bc5e0c74d1c72..3ef4ee6894d3c0 100644 --- a/var/spack/repos/builtin/packages/readline/package.py +++ b/var/spack/repos/builtin/packages/readline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Readline(AutotoolsPackage, GNUMirrorPackage): # URL must remain http:// so Spack can bootstrap curl gnu_mirror_path = "readline/readline-8.0.tar.gz" + license("GPL-3.0-or-later") + version("8.2", sha256="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35") version("8.1", sha256="f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02") version("8.0", sha256="e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461") diff --git a/var/spack/repos/builtin/packages/recola-sm/package.py b/var/spack/repos/builtin/packages/recola-sm/package.py index bd4ac9d61fc011..93d104250d60f8 100644 --- a/var/spack/repos/builtin/packages/recola-sm/package.py +++ b/var/spack/repos/builtin/packages/recola-sm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RecolaSm(CMakePackage): maintainers("vvolkl") + license("GPL-3.0-only") + version("2.2.3", sha256="9ebdc4fd8ca48789de0b6bbb2ab7e4845c92d19dfe0c3f67866cbf114d6242a5") depends_on("collier") diff --git a/var/spack/repos/builtin/packages/recola/package.py b/var/spack/repos/builtin/packages/recola/package.py index c4cb8d3c5f48b1..1ea5a04dece85d 100644 --- a/var/spack/repos/builtin/packages/recola/package.py +++ b/var/spack/repos/builtin/packages/recola/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Recola(CMakePackage): variant("python", default=True, description="Build py-recola python bindings.") + license("GPL-3.0-or-later") + version("2.2.4", sha256="212ae6141bc5de38c50be3e0c6947a3b0752aeb463cf850c22cfed5e61b1a64b") version("2.2.3", sha256="8dc25798960c272434fcde93817ed92aad82b2a7cf07438bb4deb5688d301086") version("2.2.2", sha256="a64cf2b4aa213289dfab6e2255a77264f281cd0ac85f5e9770c82b815272c5c9") diff --git a/var/spack/repos/builtin/packages/recon/package.py b/var/spack/repos/builtin/packages/recon/package.py index 5b49059fdb5308..fa6117fffe8036 100644 --- a/var/spack/repos/builtin/packages/recon/package.py +++ b/var/spack/repos/builtin/packages/recon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Recon(MakefilePackage): homepage = "http://eddylab.org/software/recon/" url = "http://eddylab.org/software/recon/RECON1.05.tar.gz" + license("GPL-2.0-only") + version("1.05", sha256="4d4f76f439bcffd50380cffc41a80dc15fa4a80f38a04234e24da893ed7c025a") variant("repeatmasker", default=False, description="Use RepeatMasker developer patches (1.08)") diff --git a/var/spack/repos/builtin/packages/recorder/package.py b/var/spack/repos/builtin/packages/recorder/package.py index 9f6db1ce4c727d..064e20f62efd30 100644 --- a/var/spack/repos/builtin/packages/recorder/package.py +++ b/var/spack/repos/builtin/packages/recorder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py index d446c82a64ed65..0834cce7c20e94 100644 --- a/var/spack/repos/builtin/packages/recordproto/package.py +++ b/var/spack/repos/builtin/packages/recordproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/redis-ai/package.py b/var/spack/repos/builtin/packages/redis-ai/package.py index 05a3d1a0e51187..b790fd638a4f76 100644 --- a/var/spack/repos/builtin/packages/redis-ai/package.py +++ b/var/spack/repos/builtin/packages/redis-ai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RedisAi(MakefilePackage): maintainers("MattToast") + license("Apache-2.0") + version( "1.2.7", tag="v1.2.7", commit="1bf38d86233ba06e1350ca9de794df2b07cdb274", submodules=True ) diff --git a/var/spack/repos/builtin/packages/redis-plus-plus/package.py b/var/spack/repos/builtin/packages/redis-plus-plus/package.py index 1ab033f47644a5..04fe1d0df8f99e 100644 --- a/var/spack/repos/builtin/packages/redis-plus-plus/package.py +++ b/var/spack/repos/builtin/packages/redis-plus-plus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class RedisPlusPlus(CMakePackage): variant("test", default=False, description="Builds test suite") variant("tls", default=False, description="Builds with TLS support") + license("Apache-2.0") + version("1.3.8", sha256="ad521b4a24d1591a1564f945ba6370875b501210222e324f398065251df41641") version("1.3.6", sha256="87dcadca50c6f0403cde47eb1f79af7ac8dd5a19c3cad2bb54ba5a34f9173a3e") version("1.3.5", sha256="a49a72fef26ed39d36a278fcc4e4d92822e111697b5992d8f26f70d16edc6c1f") diff --git a/var/spack/repos/builtin/packages/redis/package.py b/var/spack/repos/builtin/packages/redis/package.py index 0c7396fea666a6..e2e325faf70974 100644 --- a/var/spack/repos/builtin/packages/redis/package.py +++ b/var/spack/repos/builtin/packages/redis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class Redis(MakefilePackage): maintainers("lpottier") + license("BSD-3-Clause") + version("7.0.5", sha256="67054cc37b58c125df93bd78000261ec0ef4436a26b40f38262c780e56315cc3") version("7.0.4", sha256="f0e65fda74c44a3dd4fa9d512d4d4d833dd0939c934e946a5c622a630d057f2f") version("7.0.3", sha256="2cde7d17214ffe305953da9fff12333e8a72caa57fd4923e4872f6362a208e73") diff --git a/var/spack/repos/builtin/packages/reditools/package.py b/var/spack/repos/builtin/packages/reditools/package.py index 0a6015909bb131..64e6859a491225 100644 --- a/var/spack/repos/builtin/packages/reditools/package.py +++ b/var/spack/repos/builtin/packages/reditools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Reditools(PythonPackage): homepage = "https://github.com/BioinfoUNIBA/REDItools" git = "https://github.com/BioinfoUNIBA/REDItools.git" + license("MIT") + version("1.3_2020-08-03", commit="2dc71277a25e667797c363d1fca22726249774a3") version("1.3_2020-03-20", commit="cf47f3d54f324aeb9650bcf8bfacf5a967762a55") diff --git a/var/spack/repos/builtin/packages/redland-bindings/package.py b/var/spack/repos/builtin/packages/redland-bindings/package.py index e0018d95a1e450..964f62108f023b 100644 --- a/var/spack/repos/builtin/packages/redland-bindings/package.py +++ b/var/spack/repos/builtin/packages/redland-bindings/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RedlandBindings(AutotoolsPackage): homepage = "https://librdf.org/" url = "https://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz" + license("Apache-2.0") + version("1.0.17.1", sha256="ff72b587ab55f09daf81799cb3f9d263708fad5df7a5458f0c28566a2563b7f5") version("1.0.16.1", sha256="065037ef61e9b78f642e75b9c2a42700eb1a87d903f2f9963d86591c7d916826") version("1.0.14.1", sha256="a8cc365fccf292c56d53341ecae57fe8727e5002e048ca25f6251b5e595aec40") diff --git a/var/spack/repos/builtin/packages/redland/package.py b/var/spack/repos/builtin/packages/redland/package.py index 36c9b821e2da67..1c8fc89e53571b 100644 --- a/var/spack/repos/builtin/packages/redland/package.py +++ b/var/spack/repos/builtin/packages/redland/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Redland(AutotoolsPackage): homepage = "https://librdf.org/" url = "https://download.librdf.org/source/redland-1.0.17.tar.gz" + license("LGPL-2.1-or-later") + version("1.0.17", sha256="de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681") version("1.0.16", sha256="d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd") version("1.0.15", sha256="0e1f5825b6357c9b490da866c95ae1d895dbb5f445013d2511c37df822ee9ec6") diff --git a/var/spack/repos/builtin/packages/redset/package.py b/var/spack/repos/builtin/packages/redset/package.py index f89b1a6a63e025..5df8a0e25e2ece 100644 --- a/var/spack/repos/builtin/packages/redset/package.py +++ b/var/spack/repos/builtin/packages/redset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Redset(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.3.0", sha256="007ca5e7e5f4400e22ad7bca82e366cd51c73f28067c955cc16d7d0ff0c06a1b") version("0.2.0", sha256="0438b0ba56dafcd5694a8fceeb5a932901307353e056ab29817d30b8387f787f") diff --git a/var/spack/repos/builtin/packages/redundans/package.py b/var/spack/repos/builtin/packages/redundans/package.py index 280034b015b1a2..75c296e13a7af1 100644 --- a/var/spack/repos/builtin/packages/redundans/package.py +++ b/var/spack/repos/builtin/packages/redundans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Redundans(Package): url = "https://github.com/Gabaldonlab/redundans/archive/v0.13c.tar.gz" git = "https://github.com/Gabaldonlab/redundans.git" + license("GPL-2.0-or-later") + version("0.14a", commit="a20215a862aed161cbfc79df9133206156a1e9f0") version("0.13c", sha256="26d48f27a32678d94c1d00cb3b8991d74891d6cad64a94569901ff9607a7a736") diff --git a/var/spack/repos/builtin/packages/reframe/package.py b/var/spack/repos/builtin/packages/reframe/package.py index 0451593ed5820c..dce47d20183b5b 100644 --- a/var/spack/repos/builtin/packages/reframe/package.py +++ b/var/spack/repos/builtin/packages/reframe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Reframe(Package): # notify when the package is updated. maintainers("victorusu", "vkarak") + license("BSD-3-Clause") + version("develop", branch="develop") version("4.0.4", sha256="a9fb10bf2dc01f721142453297e348084683acfc0b8caa38ad1daa1b5c66456e") version("4.0.3", sha256="ae216b0ccfda9f5f5c09f0be46cf8ab04183a0c30edf581917767dc3bb8de010") diff --git a/var/spack/repos/builtin/packages/regale/package.py b/var/spack/repos/builtin/packages/regale/package.py index 705533fabd86b1..8cb597774053f1 100644 --- a/var/spack/repos/builtin/packages/regale/package.py +++ b/var/spack/repos/builtin/packages/regale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Regale(CMakePackage): homepage = "https://regale-project.eu/" url = "https://gricad-gitlab.univ-grenoble-alpes.fr/regale/tools/regale/-/archive/v1.0/regale-v1.0.tar.gz" + license("Apache-2.0") + version("1.0", sha256="894b0927372467e765049e79b855a9a277def65638013f68a1f2b6e837e35663") depends_on("eprosima-fastdds") diff --git a/var/spack/repos/builtin/packages/regcm/package.py b/var/spack/repos/builtin/packages/regcm/package.py index 15383820b8733a..2b47d0e5223739 100644 --- a/var/spack/repos/builtin/packages/regcm/package.py +++ b/var/spack/repos/builtin/packages/regcm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Regcm(AutotoolsPackage): homepage = "https://gforge.ictp.it/gf/project/regcm/" + license("AFL-1.1") + version( "4.7.0", sha256="456631c10dcb83d70e51c3babda2f7a1aa41ed9e60cb4209deb3764655267519", diff --git a/var/spack/repos/builtin/packages/relax/package.py b/var/spack/repos/builtin/packages/relax/package.py index c8f7cac42093da..d591b95500a911 100644 --- a/var/spack/repos/builtin/packages/relax/package.py +++ b/var/spack/repos/builtin/packages/relax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py index a35a092f99e98f..b2b93dbd1596dd 100644 --- a/var/spack/repos/builtin/packages/relion/package.py +++ b/var/spack/repos/builtin/packages/relion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Relion(CMakePackage, CudaPackage): url = "https://github.com/3dem/relion/archive/4.0.0.zip" maintainers("dacolombo") + license("GPL-2.0-only") + version("4.0.1", sha256="7e0d56fd4068c99f943dc309ae533131d33870392b53a7c7aae7f65774f667be") version("4.0.0", sha256="0987e684e9d2dfd630f1ad26a6847493fe9fcd829ec251d8bc471d11701d51dd") diff --git a/var/spack/repos/builtin/packages/remhos/package.py b/var/spack/repos/builtin/packages/remhos/package.py index 9d15670389f73e..f53de7fcb2e1d2 100644 --- a/var/spack/repos/builtin/packages/remhos/package.py +++ b/var/spack/repos/builtin/packages/remhos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Remhos(MakefilePackage): maintainers("v-dobrev", "tzanio", "vladotomov") + license("BSD-2-Clause") + version("develop", branch="master") version("1.0", sha256="e60464a867fe5b1fd694fbb37bb51773723427f071c0ae26852a2804c08bbb32") diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py index 63461f40e3cf6b..a3651b37a7f166 100644 --- a/var/spack/repos/builtin/packages/rempi/package.py +++ b/var/spack/repos/builtin/packages/rempi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rempi(AutotoolsPackage): url = "https://github.com/PRUNERS/ReMPI/releases/download/v1.0.0/ReMPI-1.0.0.tar.gz" tags = ["e4s"] + license("GPL-3.0-or-later") + version("1.1.0", sha256="4fd94fca52311fd19dc04a32547841e6c1c1656b7999b2f76f537d6ec24efccc") version("1.0.0", sha256="1cb21f457cf8a04632150156a2ba699dd0c3f81d47e8881a9b943b9bf575fa01") diff --git a/var/spack/repos/builtin/packages/rename/package.py b/var/spack/repos/builtin/packages/rename/package.py index 03a71bd79ffc53..33960495165738 100644 --- a/var/spack/repos/builtin/packages/rename/package.py +++ b/var/spack/repos/builtin/packages/rename/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py index c36c69f6185f85..ab98014564af34 100644 --- a/var/spack/repos/builtin/packages/rendercheck/package.py +++ b/var/spack/repos/builtin/packages/rendercheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py index 0bef29045df592..a208a991f643ec 100644 --- a/var/spack/repos/builtin/packages/renderproto/package.py +++ b/var/spack/repos/builtin/packages/renderproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index 5ec1da0a1b83ea..385a40198b79d5 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Repeatmasker(Package): homepage = "https://www.repeatmasker.org" + license("OSL-2.1") + version("4.1.5", sha256="16e07f9efd99adf15f4492b0e334df5ad4ea6ca38ddf62bdd180d257f2f4753f") version("4.1.2-p1", sha256="4be54bf6c050422b211e24a797feb06fd7954c8b4ee6f3ece94cb6faaf6b0e96") version("4.0.9", sha256="8d67415d89ed301670b7632ea411f794c6e30d8ed0f007a726c4b0a39c8638e5") diff --git a/var/spack/repos/builtin/packages/repeatmodeler/package.py b/var/spack/repos/builtin/packages/repeatmodeler/package.py index e38db20fd96e13..5addc8e669a371 100644 --- a/var/spack/repos/builtin/packages/repeatmodeler/package.py +++ b/var/spack/repos/builtin/packages/repeatmodeler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Repeatmodeler(Package): maintainers("snehring") + license("OSL-2.1") + version("2.0.4", sha256="94aad46cc70911d48de3001836fc3165adb95b2b282b5c53ab0d1da98c27a6b6") version( "1.0.11", diff --git a/var/spack/repos/builtin/packages/repeatscout/package.py b/var/spack/repos/builtin/packages/repeatscout/package.py index d7a6d9c536409d..61ab32310cda4d 100644 --- a/var/spack/repos/builtin/packages/repeatscout/package.py +++ b/var/spack/repos/builtin/packages/repeatscout/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/reprimand/package.py b/var/spack/repos/builtin/packages/reprimand/package.py index 39c8078b49e8f6..905e309d2ff331 100644 --- a/var/spack/repos/builtin/packages/reprimand/package.py +++ b/var/spack/repos/builtin/packages/reprimand/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Reprimand(MesonPackage): maintainers("eschnett") + license("CC-BY-NC-SA-4.0") + version("develop", git="https://github.com/wokast/RePrimAnd", branch="public") version("1.5", sha256="bc71030c1ae337c3631cfc7e46270260b0663e4ad73129148bf443c9220afb86") version("1.4", sha256="260730696175fa21d35d1a92df2c68b69243bb617083c82616efcb4720d557e8") diff --git a/var/spack/repos/builtin/packages/resolve/package.py b/var/spack/repos/builtin/packages/resolve/package.py new file mode 100644 index 00000000000000..82234bf66bea04 --- /dev/null +++ b/var/spack/repos/builtin/packages/resolve/package.py @@ -0,0 +1,67 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Resolve(CMakePackage, CudaPackage, ROCmPackage): + """ReSolve is a library of GPU-resident sparse linear solvers. It contains iterative and direct + solvers designed to run on NVIDIA and AMD GPUs, as well as CPU devices.""" + + homepage = "https://github.com/ORNL/ReSolve" + git = "https://github.com/ORNL/ReSolve.git" + + maintainers("cameronrutherford", "pelesh", "ryandanehy", "kswirydo") + + version( + "0.99.1", + submodules=False, + tag="v0.99.1", + commit="e10dd417e836f47b3dc7c8b123a81bfbb654ee82", + ) + version("develop", submodules=False, branch="develop") + + variant("klu", default=True, description="Use KLU, AMD and COLAMD Libraries from SuiteSparse") + + depends_on("suite-sparse", when="+klu") + + with when("+rocm"): + # Need at least 5.6+ + depends_on("rocsparse@5.6:") + depends_on("rocblas@5.6:") + depends_on("rocsolver@5.6:") + + # Optional profiling dependecies + # Will be controlled by variant in the future + # depends_on("roctracer-dev@5.6:") + # depends_on("roctracer-dev-api@5.6:") + # depends_on("rocprofiler-dev@5.6:") + + def cmake_args(self): + args = [] + spec = self.spec + + args.extend( + [self.define("RESOLVE_USE_KLU", "klu"), self.define("RESOLVE_TEST_WITH_BSUB", False)] + ) + + if "+cuda" in spec: + cuda_arch_list = spec.variants["cuda_arch"].value + if cuda_arch_list[0] != "none": + args.append(self.define("CMAKE_CUDA_ARCHITECTURES", cuda_arch_list)) + else: + args.append(self.define("CMAKE_CUDA_ARCHITECTURES", "70;75;80")) + args.append(self.define("RESOLVE_USE_CUDA", True)) + + elif "+rocm" in spec: + rocm_arch_list = spec.variants["amdgpu_target"].value + # `+rocm` conflicts with amdgpu_target == "none"... + # if rocm_arch_list[0] == "none": + # rocm_arch_list = "gfx90a" + args.append(self.define("GPU_TARGETS", rocm_arch_list)) + args.append(self.define("AMDGPU_TARGETS", rocm_arch_list)) + args.append(self.define("RESOLVE_USE_HIP", True)) + + return args diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py index ef64bc593b3fef..953de839f30bae 100644 --- a/var/spack/repos/builtin/packages/resourceproto/package.py +++ b/var/spack/repos/builtin/packages/resourceproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/restic/package.py b/var/spack/repos/builtin/packages/restic/package.py index 493e0c098331f2..8faa0abeb3355f 100644 --- a/var/spack/repos/builtin/packages/restic/package.py +++ b/var/spack/repos/builtin/packages/restic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,10 @@ class Restic(Package): maintainers("alecbcs") + license("BSD-2-Clause") + + version("0.16.3", sha256="a94d6c1feb0034fcff3e8b4f2d65c0678f906fc21a1cf2d435341f69e7e7af52") + version("0.16.2", sha256="88165b5b89b6064df37a9964d660f40ac62db51d6536e459db9aaea6f2b2fc11") version("0.16.0", sha256="b91f5ef6203a5c50a72943c21aaef336e1344f19a3afd35406c00f065db8a8b9") version("0.15.2", sha256="52aca841486eaf4fe6422b059aa05bbf20db94b957de1d3fca019ed2af8192b7") version("0.15.1", sha256="fce382fdcdac0158a35daa640766d5e8a6e7b342ae2b0b84f2aacdff13990c52") diff --git a/var/spack/repos/builtin/packages/revbayes/package.py b/var/spack/repos/builtin/packages/revbayes/package.py index 7a23a2c4294085..709c3dadd96564 100644 --- a/var/spack/repos/builtin/packages/revbayes/package.py +++ b/var/spack/repos/builtin/packages/revbayes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,14 @@ class Revbayes(CMakePackage): url = "https://github.com/revbayes/revbayes/archive/1.1.0.tar.gz" git = "https://github.com/revbayes/revbayes.git" + license("GPL-3.0-only") + version("develop", branch="development") + version( + "1.2.2", + sha256="339f89169cc9320212c3c64d0557b66f416ec9ae25d45e21a4e9a1cafef6e423", + url="https://github.com/revbayes/revbayes/archive/refs/tags/v1.2.2.tar.gz", + ) version("1.1.1", sha256="d61293fceac817d8203ed1e828661d76c73fa16bf04458a50a37057e99fd40c0") version("1.1.0", sha256="a9f35178d8289d0dd32c9d936f6384f260e8e81e7b80a5155169064a24666012") version("1.0.13", sha256="e85e2e1fe182fe9f504900150d936a06d252a362c591b9d3d8272dd085aa85d9") diff --git a/var/spack/repos/builtin/packages/revocap-coupler/package.py b/var/spack/repos/builtin/packages/revocap-coupler/package.py index 4222c6d41b5b00..ab89240a0badd6 100644 --- a/var/spack/repos/builtin/packages/revocap-coupler/package.py +++ b/var/spack/repos/builtin/packages/revocap-coupler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/revocap-refiner/package.py b/var/spack/repos/builtin/packages/revocap-refiner/package.py index 8662cc939f0592..3d457e62959103 100644 --- a/var/spack/repos/builtin/packages/revocap-refiner/package.py +++ b/var/spack/repos/builtin/packages/revocap-refiner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rgb/package.py b/var/spack/repos/builtin/packages/rgb/package.py index 5c02e2c23ebaaa..e30b4cea82074a 100644 --- a/var/spack/repos/builtin/packages/rgb/package.py +++ b/var/spack/repos/builtin/packages/rgb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Rgb(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/rgb" xorg_mirror_path = "app/rgb-1.0.6.tar.gz" + license("MIT") + version("1.1.0", sha256="77142e3d6f06cfbfbe440e29596765259988a22db40b1e706e14b8ba4c962aa5") version("1.0.6", sha256="cb998035e08b9f58ad3150cab60461c3225bdd075238cffc665e24da40718933") diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index 0c38a86b4f0018..6a53f98ab4d166 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Rhash(MakefilePackage): homepage = "https://sourceforge.net/projects/rhash/" url = "https://github.com/rhash/RHash/archive/v1.3.5.tar.gz" + license("0BSD") + version("1.4.2", sha256="600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62") version("1.3.5", sha256="98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e") diff --git a/var/spack/repos/builtin/packages/rinetd/package.py b/var/spack/repos/builtin/packages/rinetd/package.py index 1bcae9739cc5b0..bad9485262b15f 100644 --- a/var/spack/repos/builtin/packages/rinetd/package.py +++ b/var/spack/repos/builtin/packages/rinetd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rinetd(AutotoolsPackage): homepage = "https://github.com/samhocevar/rinetd" url = "https://github.com/samhocevar/rinetd/archive/v0.70.tar.gz" + license("GPL-2.0-only") + version("0.73", sha256="62d3e5800299bb3940aea847ffd7662722deb5d4b85625fcfe8f7ebbc0424c80") version("0.70", sha256="e69538e9d1fdc1ba5cc24733a52c571568e9cad0876c09144aa1eaa71e13fba5") version("0.63", sha256="1f0e8cda524b8f4811a876e69e16d11f12c33a63d00b55c66e2129f87444000c") diff --git a/var/spack/repos/builtin/packages/ripgrep/package.py b/var/spack/repos/builtin/packages/ripgrep/package.py index e2d026535f9de0..f8c0649e7f82aa 100644 --- a/var/spack/repos/builtin/packages/ripgrep/package.py +++ b/var/spack/repos/builtin/packages/ripgrep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ from spack.package import * -class Ripgrep(Package): +class Ripgrep(CargoPackage): """ripgrep is a line-oriented search tool that recursively searches your current directory for a regex pattern. ripgrep is similar to other popular search tools like The Silver Searcher, ack and grep. @@ -15,11 +15,11 @@ class Ripgrep(Package): homepage = "https://github.com/BurntSushi/ripgrep" url = "https://github.com/BurntSushi/ripgrep/archive/11.0.2.tar.gz" - version("13.0.0", sha256="0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2") - version("11.0.2", sha256="0983861279936ada8bc7a6d5d663d590ad34eb44a44c75c2d6ccd0ab33490055") + maintainers("alecbcs") - depends_on("rust") + license("MIT OR Unlicense") - def install(self, spec, prefix): - cargo = which("cargo") - cargo("install", "--root", prefix, "--path", ".") + version("14.1.0", sha256="33c6169596a6bbfdc81415910008f26e0809422fda2d849562637996553b2ab6") + version("14.0.3", sha256="f5794364ddfda1e0411ab6cad6dd63abe3a6b421d658d9fee017540ea4c31a0e") + version("13.0.0", sha256="0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2") + version("11.0.2", sha256="0983861279936ada8bc7a6d5d663d590ad34eb44a44c75c2d6ccd0ab33490055") diff --git a/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py b/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py index 71ff595e64247e..c12d5209ae0251 100644 --- a/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py +++ b/var/spack/repos/builtin/packages/riscv-gnu-toolchain/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,48 @@ class RiscvGnuToolchain(AutotoolsPackage): maintainers("wanlinwang") version("develop", branch="master", submodules=True) + version( + "2023.10.18", + tag="2023.10.18", + commit="b86b2b37d0acc607156ff56ff17ee105a9b48897", + submodules=True, + ) + version( + "2023.10.17", + tag="2023.10.17", + commit="c11f0748276c58df4f9d9602cdc2de5f17cbae8c", + submodules=True, + ) + version( + "2023.10.12", + tag="2023.10.12", + commit="e65e7fc58543c821baf4f1fb6d0ef700177b9d89", + submodules=True, + ) + version( + "2023.10.06", + tag="2023.10.06", + commit="6e7190e8c95e09d541e69f6f6e39163f808570d5", + submodules=True, + ) + version( + "2023.09.27", + tag="2023.09.27", + commit="5afde2de23c6597aaa5069f36574c61bcb39b007", + submodules=True, + ) + version( + "2023.09.26", + tag="2023.09.26", + commit="ffb5968884630c7baebba7b2af493f6b5f74ad80", + submodules=True, + ) + version( + "2023.09.13", + tag="2023.09.13", + commit="5437780994b830e9eabf467f85f22ed24b5fade1", + submodules=True, + ) version( "2022.08.08", tag="2022.08.08", diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py index dd20cd7273ee40..d055f7d8a40923 100644 --- a/var/spack/repos/builtin/packages/rivet/package.py +++ b/var/spack/repos/builtin/packages/rivet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Rivet(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("3.1.8", sha256="75b3f3d419ca6388d1fd2ec0eda7e1f90f324b996ccf0591f48a5d2e28dccc13") version("3.1.7", sha256="27c7dbbcb5fd7ee81caf136daf4e960bca0ec255d9fa1abe602f4d430861b27a") version("3.1.6", sha256="1cf6ebb6a79d181c441d1d0c7c6d623c423817c61093f36f21adaae23e679090") diff --git a/var/spack/repos/builtin/packages/rkcommon/package.py b/var/spack/repos/builtin/packages/rkcommon/package.py index 4f0a07559ef9c6..ffcd012d32498a 100644 --- a/var/spack/repos/builtin/packages/rkcommon/package.py +++ b/var/spack/repos/builtin/packages/rkcommon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class Rkcommon(CMakePackage): # maintainers("github_user1",o"github_user2") + license("Apache-2.0") + + version("1.12.0", sha256="6abb901073811cdbcbe336772e1fcb458d78cab5ad8d5d61de2b57ab83581e80") version("1.11.0", sha256="9cfeedaccdefbdcf23c465cb1e6c02057100c4a1a573672dc6cfea5348cedfdd") version("1.10.0", sha256="57a33ce499a7fc5a5aaffa39ec7597115cf69ed4ff773546b5b71ff475ee4730") version("1.9.0", sha256="b68aa02ef44c9e35c168f826a14802bb5cc6a9d769ba4b64b2c54f347a14aa53") diff --git a/var/spack/repos/builtin/packages/rkt-base/package.py b/var/spack/repos/builtin/packages/rkt-base/package.py index 3782049f955caa..ea277d91206600 100644 --- a/var/spack/repos/builtin/packages/rkt-base/package.py +++ b/var/spack/repos/builtin/packages/rkt-base/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-cext-lib/package.py b/var/spack/repos/builtin/packages/rkt-cext-lib/package.py index 30cd7a8cd1a85f..be3f0a88cb9994 100644 --- a/var/spack/repos/builtin/packages/rkt-cext-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-cext-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py b/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py index a08eb5a3c0ec11..f91a118a53604b 100644 --- a/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-compiler-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py b/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py index 49bb565f88c24f..b391fdeeea2c8e 100644 --- a/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-dynext-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-racket-lib/package.py b/var/spack/repos/builtin/packages/rkt-racket-lib/package.py index a64e9527638f64..1dfed11df269bd 100644 --- a/var/spack/repos/builtin/packages/rkt-racket-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-racket-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py b/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py index 59316620857ec2..00941ababee2dc 100644 --- a/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-rackunit-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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)- diff --git a/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py b/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py index d29ae350b7779a..dec38a9b5cfd07 100644 --- a/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-scheme-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py b/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py index 8382a1e658b0f7..fc588699f76bb3 100644 --- a/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-testing-util-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rkt-zo-lib/package.py b/var/spack/repos/builtin/packages/rkt-zo-lib/package.py index d39aa4a2df9530..579be294ca25ec 100644 --- a/var/spack/repos/builtin/packages/rkt-zo-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-zo-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rlwrap/package.py b/var/spack/repos/builtin/packages/rlwrap/package.py index 8203856915270c..9a3d8f29594662 100644 --- a/var/spack/repos/builtin/packages/rlwrap/package.py +++ b/var/spack/repos/builtin/packages/rlwrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rlwrap(AutotoolsPackage): homepage = "https://github.com/hanslub42/rlwrap" url = "https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz" + license("GPL-2.0-or-later") + version("0.46.1", sha256="2711986a1248f6ac59e2aecf5586205835970040d300a42b4bf8014397e73e37") version("0.46", sha256="b4bd79fda824426dae65236e338ba7daf3f0d0acad7c1561d4d5e6dadcfd539d") version("0.45.2", sha256="9f8870deb46e473d21b5db89d709b6497f4ef9fa06d44eebc5f821daa00c8eca") diff --git a/var/spack/repos/builtin/packages/rmats/package.py b/var/spack/repos/builtin/packages/rmats/package.py index 7d95036af6476b..f26ec51c93cb82 100644 --- a/var/spack/repos/builtin/packages/rmats/package.py +++ b/var/spack/repos/builtin/packages/rmats/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rmgdft/package.py b/var/spack/repos/builtin/packages/rmgdft/package.py index 23cec275799fe7..55acee0203627c 100644 --- a/var/spack/repos/builtin/packages/rmgdft/package.py +++ b/var/spack/repos/builtin/packages/rmgdft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rmlab/package.py b/var/spack/repos/builtin/packages/rmlab/package.py index 7f57741a5241da..d9aa91441cb784 100644 --- a/var/spack/repos/builtin/packages/rmlab/package.py +++ b/var/spack/repos/builtin/packages/rmlab/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Rmlab(CMakePackage): maintainers("ax3l") + license("GPL-3.0-or-later") + version("develop", branch="develop") variant("png", default=True, description="Enable PNG conversion support") diff --git a/var/spack/repos/builtin/packages/rna-seqc/package.py b/var/spack/repos/builtin/packages/rna-seqc/package.py index bc1fef15031dd8..2ce429b4be50b5 100644 --- a/var/spack/repos/builtin/packages/rna-seqc/package.py +++ b/var/spack/repos/builtin/packages/rna-seqc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rnaquast/package.py b/var/spack/repos/builtin/packages/rnaquast/package.py index b360f25d9588ac..3b799112ab4e92 100644 --- a/var/spack/repos/builtin/packages/rnaquast/package.py +++ b/var/spack/repos/builtin/packages/rnaquast/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rnaz/package.py b/var/spack/repos/builtin/packages/rnaz/package.py index 27fc408ccbd0a5..7031c2dc9b692a 100644 --- a/var/spack/repos/builtin/packages/rnaz/package.py +++ b/var/spack/repos/builtin/packages/rnaz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rng-tools/package.py b/var/spack/repos/builtin/packages/rng-tools/package.py index 0c0fea109b9e29..40341e0b157710 100644 --- a/var/spack/repos/builtin/packages/rng-tools/package.py +++ b/var/spack/repos/builtin/packages/rng-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class RngTools(AutotoolsPackage): homepage = "https://github.com/nhorman/rng-tools/" url = "https://github.com/nhorman/rng-tools/archive/v6.10.tar.gz" + license("GPL-2.0-or-later") + version("6.10", sha256="2e462821aaa7d6dc24646aa0d2239d97cb8b07b3e60715159a9edcaa9189f8ef") version("6.9", sha256="a57a7f51a2e3c0faa8afb979709a4c0cbea36d0b52fd835b104f8fb4fd1fa610") version("6.8", sha256="93e548d4aaf2a1897d4b677f41d8473db1c7f57648adeca18cafa1907e410bb3") diff --git a/var/spack/repos/builtin/packages/rngstreams/package.py b/var/spack/repos/builtin/packages/rngstreams/package.py index 509ab3e18dddfe..f5a86039eb809b 100644 --- a/var/spack/repos/builtin/packages/rngstreams/package.py +++ b/var/spack/repos/builtin/packages/rngstreams/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Rngstreams(AutotoolsPackage): homepage = "https://statmath.wu.ac.at/software/RngStreams" url = "https://statmath.wu.ac.at/software/RngStreams/rngstreams-1.0.1.tar.gz" + license("GPL-3.0-only") + version("1.0.1", sha256="966195febb9fb9417e4e361948843425aee12efc8b4e85332acbcd011ff2d9b0") diff --git a/var/spack/repos/builtin/packages/rnpletal/package.py b/var/spack/repos/builtin/packages/rnpletal/package.py index 7d57a483140019..b055e9496891a2 100644 --- a/var/spack/repos/builtin/packages/rnpletal/package.py +++ b/var/spack/repos/builtin/packages/rnpletal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/roary/package.py b/var/spack/repos/builtin/packages/roary/package.py index 7269df3436a530..14730375846373 100644 --- a/var/spack/repos/builtin/packages/roary/package.py +++ b/var/spack/repos/builtin/packages/roary/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Roary(Package): homepage = "https://github.com/sanger-pathogens/Roary" url = "https://github.com/sanger-pathogens/Roary/archive/refs/tags/v3.13.0.tar.gz" + license("GPL-3.0-or-later") + version("3.13.0", sha256="375f83c8750b0f4dea5b676471e73e94f3710bc3a327ec88b59f25eae1c3a1e8") variant("kraken", default=False, description="Enable kraken support") diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index b0ba2021ba6804..d04530e77b72a8 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,13 +17,19 @@ class Rocalution(CMakePackage): generic and flexible design that allows seamless integration with other scientific software packages.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION" - git = "https://github.com/ROCmSoftwarePlatform/rocALUTION.git" - url = "https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocALUTION" + git = "https://github.com/ROCm/rocALUTION.git" + url = "https://github.com/ROCm/rocALUTION/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") libraries = ["librocalution_hip"] + + license("MIT") + + version("6.0.0", sha256="cabf37691b8db00c82bda49c7dcfaefd9b9067b7d097afa43b7a5f86c45bff99") + version("5.7.1", sha256="b95afa1285759843c5fea1ad6e1c1edf283922e0d448db03a3e1f42b6942bc24") + version("5.7.0", sha256="48232a0d1250debce89e39a233bd0b5d52324a2454c078b99c9d44965cbbc0e9") version("5.6.1", sha256="7197b3617a0c91e90adaa32003c04d247a5f585d216e77493d20984ba215addb") version("5.6.0", sha256="7397a2039e9615c0cf6776c33c4083c00b185b5d5c4149c89fea25a8976a3097") version("5.5.1", sha256="4612e30a0290b1732c8862eea655122abc2d22ce4345b8498fe4127697e880b4") @@ -158,6 +164,9 @@ class Rocalution(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) @@ -184,10 +193,6 @@ class Rocalution(CMakePackage): # Fix build for most Radeon 5000 and Radeon 6000 series GPUs. patch("0004-fix-navi-1x.patch", when="@5.2.0:5.3") - def check(self): - exe = join_path(self.build_directory, "clients", "staging", "rocalution-test") - self.run_test(exe) - def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) @@ -236,3 +241,9 @@ def cmake_args(self): args.append("-DCMAKE_INSTALL_LIBDIR=lib") return args + + @run_after("build") + @on_package_attributes(run_tests=True) + def check_build(self): + exe = Executable(join_path(self.build_directory, "clients", "staging", "rocalution-test")) + exe() diff --git a/var/spack/repos/builtin/packages/rocblas/0007-add-rocm-openmp-extras-include-dir.patch b/var/spack/repos/builtin/packages/rocblas/0007-add-rocm-openmp-extras-include-dir.patch new file mode 100644 index 00000000000000..4e265011b167bb --- /dev/null +++ b/var/spack/repos/builtin/packages/rocblas/0007-add-rocm-openmp-extras-include-dir.patch @@ -0,0 +1,20 @@ +diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt +index 55e9bbe..32b350c 100644 +--- a/clients/gtest/CMakeLists.txt ++++ b/clients/gtest/CMakeLists.txt +@@ -164,6 +164,7 @@ target_include_directories( rocblas-test + $ + $ # may be blank if not used + $ ++ $ + ) + target_include_directories( rocblas_v3-test + SYSTEM PRIVATE +@@ -171,6 +172,7 @@ target_include_directories( rocblas_v3-test + $ + $ # may be blank if not used + $ ++ $ + ) + + if( BUILD_FORTRAN_CLIENTS ) diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 0b59eadd7e559b..854d897e5db5cf 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,16 +11,21 @@ class Rocblas(CMakePackage): """Radeon Open Compute BLAS library""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS/" - git = "https://github.com/ROCmSoftwarePlatform/rocBLAS.git" - url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocBLAS/" + git = "https://github.com/ROCm/rocBLAS.git" + url = "https://github.com/ROCm/rocBLAS/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie") libraries = ["librocblas"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") + version("6.0.0", sha256="befa4a75f1de0ea37f2358d4c2de5406d7bce671ca9936e2294b64d3b3bafb60") + version("5.7.1", sha256="2984a5ed0ea5a05d40996ee3fddecb24399cbe8ea3e4921fc254e54d8f52fe4f") + version("5.7.0", sha256="024edd98de9687ee5394badc4dd4c543eef4eb3f71c96ff64100705d851e1744") version("5.6.1", sha256="73896ebd445162a69af97f9fd462684609b4e0cf617eab450cd4558b4a23941e") version("5.6.0", sha256="6a70b27eede02c45f46095a6ce8421af9a774a565e39f5e1074783ecf00c1ea7") version("5.5.1", sha256="7916a8d238d51cc239949d799f0b61c9d5cd63c6ccaed0e16749489b89ca8ff3") @@ -127,21 +132,19 @@ class Rocblas(CMakePackage): conflicts("amdgpu_target=gfx1012", when="@:4.2.1") conflicts("amdgpu_target=gfx1030", when="@:4.2.1") # https://reviews.llvm.org/D124866 - # https://github.com/ROCm-Developer-Tools/HIP/issues/2678 - # https://github.com/ROCm-Developer-Tools/hipamd/blob/rocm-5.2.x/include/hip/amd_detail/host_defines.h#L50 - conflicts("%gcc@12", when="@5.2.1:5.2.3") + # https://github.com/ROCm/HIP/issues/2678 + # https://github.com/ROCm/hipamd/blob/rocm-5.2.x/include/hip/amd_detail/host_defines.h#L50 + conflicts("%gcc@12", when="@5.2") depends_on("cmake@3.16.8:", type="build", when="@4.2.0:") depends_on("cmake@3.8:", type="build", when="@3.9.0:") depends_on("cmake@3.5:", type="build") depends_on("googletest@1.10.0:", type="test") - depends_on("netlib-lapack@3.7.1:", type="test") + depends_on("amdblis", type="test") - def check(self): - if "@4.2.0:" in self.spec: - exe = join_path(self.build_directory, "clients", "staging", "rocblas-test") - self.run_test(exe, options=["--gtest_filter=*quick*-*known_bug*"]) + for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1"]: + depends_on("rocm-openmp-extras@" + ver, type="test", when="@" + ver) depends_on("hip@4.1.0:", when="@4.1.0:") depends_on("llvm-amdgpu@4.1.0:", type="build", when="@4.1.0:") @@ -178,6 +181,9 @@ def check(self): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver) @@ -226,10 +232,13 @@ def check(self): ("@5.5.1", "38d444a9f2b6cddfeaeedcb39a5688150fa27093"), ("@5.6.0", "7d0a9d040c3bbae893df7ecef6a19d9cd1c304aa"), ("@5.6.1", "7d0a9d040c3bbae893df7ecef6a19d9cd1c304aa"), + ("@5.7.0", "97e0cfc2c8cb87a1e38901d99c39090dc4181652"), + ("@5.7.1", "97e0cfc2c8cb87a1e38901d99c39090dc4181652"), + ("@6.0.0", "17df881bde80fc20f997dfb290f4bb4b0e05a7e9"), ]: resource( name="Tensile", - git="https://github.com/ROCmSoftwarePlatform/Tensile.git", + git="https://github.com/ROCm/Tensile.git", commit=t_commit, when="{} +tensile".format(t_version), ) @@ -237,12 +246,12 @@ def check(self): for ver in ["master", "develop"]: resource( name="Tensile", - git="https://github.com/ROCmSoftwarePlatform/Tensile.git", + git="https://github.com/ROCm/Tensile.git", branch=ver, when="@{} +tensile".format(ver), ) - # Status: https://github.com/ROCmSoftwarePlatform/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 + # Status: https://github.com/ROCm/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 # Not yet landed in 3.7.0, nor 3.8.0. patch("0001-Fix-compilation-error-with-StringRef-to-basic-string.patch", when="@:3.8") patch("0002-Fix-rocblas-clients-blas.patch", when="@4.2.0:4.3.1") @@ -250,6 +259,7 @@ def check(self): # Finding Python package and set command python as python3 patch("0004-Find-python.patch", when="@5.2.0:5.4") patch("0006-Guard-use-of-OpenMP-to-make-it-optional-5.4.patch", when="@5.4") + patch("0007-add-rocm-openmp-extras-include-dir.patch", when="@5.6:5.7") def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) @@ -274,7 +284,17 @@ def cmake_args(self): self.define_from_variant("BUILD_WITH_TENSILE", "tensile"), ] if self.run_tests: - args.append(self.define("LINK_BLIS", "OFF")) + args.append(self.define("LINK_BLIS", "ON")) + if self.spec.satisfies("@5.6.0:"): + args.append( + self.define("ROCM_OPENMP_EXTRAS_DIR", self.spec["rocm-openmp-extras"].prefix) + ) + args.append( + self.define("BLIS_INCLUDE_DIR", self.spec["amdblis"].prefix + "/include/blis/") + ) + args.append( + self.define("BLAS_LIBRARY", self.spec["amdblis"].prefix + "/lib/libblis.a") + ) arch_define_name = "AMDGPU_TARGETS" if "+tensile" in self.spec: @@ -292,14 +312,14 @@ def cmake_args(self): # Restrict the number of jobs Tensile can spawn. # If we don't specify otherwise, Tensile creates a job per available core, # and that consumes a lot of system memory. - # https://github.com/ROCmSoftwarePlatform/Tensile/blob/93e10678a0ced7843d9332b80bc17ebf9a166e8e/Tensile/Parallel.py#L38 + # https://github.com/ROCm/Tensile/blob/93e10678a0ced7843d9332b80bc17ebf9a166e8e/Tensile/Parallel.py#L38 args.append(self.define("Tensile_CPU_THREADS", min(16, make_jobs))) - # See https://github.com/ROCmSoftwarePlatform/rocBLAS/commit/c1895ba4bb3f4f5947f3818ebd155cf71a27b634 + # See https://github.com/ROCm/rocBLAS/commit/c1895ba4bb3f4f5947f3818ebd155cf71a27b634 if "auto" not in self.spec.variants["amdgpu_target"]: args.append(self.define_from_variant(arch_define_name, "amdgpu_target")) - # See https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1196 + # See https://github.com/ROCm/rocBLAS/issues/1196 if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) @@ -313,3 +333,9 @@ def cmake_args(self): args.append(self.define("Tensile_CODE_OBJECT_VERSION", "default")) return args + + @run_after("build") + @on_package_attributes(run_tests=True) + def check_build(self): + exe = Executable(join_path(self.build_directory, "clients", "staging", "rocblas-test")) + exe("--gtest_filter=*quick*-*known_bug*") diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 63c0548ce3a6b3..815bb0313203a3 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,18 @@ class Rocfft(CMakePackage): """Radeon Open Compute FFT library""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT/" - git = "https://github.com/ROCmSoftwarePlatform/rocFFT.git" - url = "https://github.com/ROCmSoftwarePlatform/rocfft/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocFFT/" + git = "https://github.com/ROCm/rocFFT.git" + url = "https://github.com/ROCm/rocfft/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie") libraries = ["librocfft"] + + license("MIT") + version("6.0.0", sha256="fb8ba56572702e77e4383d922cd1fee4ad3fa5f63a5ebdb3d9c354439a446992") + version("5.7.1", sha256="202f11f60dc8738e29bbd1b397d419e032794f8bffb7f48f2b31f09cc5f08bc2") + version("5.7.0", sha256="3c4a1537a6ec76dc9b622644fe3890647306bf9f28f61c5d2028259c31bb964f") version("5.6.1", sha256="a65861e453587c3e6393da75b0b1976508c61f968aecda77fbec920fea48489e") version("5.6.0", sha256="e3d4a6c1bdac78f9a22033f57011af783d560308103f73542f9e0e4dd133d38a") version("5.5.1", sha256="57423a64f5cdb1c37ff0891b6c17b59f73198d46be42db4ae23781ef2c0cd49d") @@ -125,7 +130,8 @@ class Rocfft(CMakePackage): depends_on("googletest@1.10.0:", type="test") depends_on("fftw@3.3.8:", type="test") depends_on("boost@1.64.0: +program_options", type="test") - depends_on("llvm-amdgpu +openmp", type="test") + depends_on("rocm-openmp-extras", type="test") + depends_on("hiprand", type="test") def check(self): exe = join_path(self.build_directory, "clients", "staging", "rocfft-test") @@ -159,6 +165,9 @@ def check(self): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) @@ -170,6 +179,14 @@ def check(self): # Patch to add install prefix header location for sqlite for 5.4 patch("0004-fix-missing-sqlite-include-paths.patch", when="@5.4.0:5.5") + # Set LD_LIBRARY_PATH for executing the binaries from build directoryfix missing type + # https://github.com/ROCm/rocFFT/pull/449) + patch( + "https://github.com/ROCm/rocFFT/commit/0ec78f1daac2d7fa1415f4deff0d129252c1c9de.patch?full_index=1", + sha256="bac7873185ac60f2aaa50e278f0b8d52b4d79d586bf7f52db1da33559569ba54", + when="@6.0.0", + ) + def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) @@ -206,7 +223,7 @@ def cmake_args(self): self.define_from_variant("AMDGPU_TARGETS_SRAM_ECC", "amdgpu_target_sram_ecc") ) - # See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/322 + # See https://github.com/ROCm/rocFFT/issues/322 if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) diff --git a/var/spack/repos/builtin/packages/rocketmq/package.py b/var/spack/repos/builtin/packages/rocketmq/package.py index 39203f87ea3555..33d73d444cbdc4 100644 --- a/var/spack/repos/builtin/packages/rocketmq/package.py +++ b/var/spack/repos/builtin/packages/rocketmq/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Rocketmq(Package): homepage = "https://rocketmq.apache.org/" url = "https://archive.apache.org/dist/rocketmq/4.5.2/rocketmq-all-4.5.2-bin-release.zip" + license("Apache-2.0") + version("4.6.0", sha256="584910d50639297808dd0b86fcdfaf431efd9607009a44c6258d9a0e227748fe") version("4.5.2", sha256="f7711ef9c203d7133e70e0e1e887025d7dd80d29f6d5283ca6022b12576b8aba") version("4.5.1", sha256="0c46e4b652b007d07e9c456eb2e275126b9210c27cd56bee518809f33c8ed437") diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py index 80f4b88b822ea9..b8dd075da91789 100644 --- a/var/spack/repos/builtin/packages/rocksdb/package.py +++ b/var/spack/repos/builtin/packages/rocksdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rocksdb(MakefilePackage): url = "https://github.com/facebook/rocksdb/archive/v6.5.3.tar.gz" git = "https://github.com/facebook/rocksdb.git" + license("Apache-2.0 OR GPL-2.0-only") + version("master", git=git, branch="master", submodules=True) version("8.6.7", sha256="cdb2fc3c6a556f20591f564cb8e023e56828469aa3f76e1d9535c443ba1f0c1a") version("8.1.1", sha256="9102704e169cfb53e7724a30750eeeb3e71307663852f01fa08d5a320e6155a8") diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index cbf5446ce94b81..a7ff592b1f8ee1 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index af829cf7ade83a..ffb8f927f033f1 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,14 +10,17 @@ class RocmBandwidthTest(CMakePackage): """Test to measure PciE bandwidth on ROCm platforms""" - homepage = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test" - git = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test.git" - url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocm_bandwidth_test" + git = "https://github.com/ROCm/rocm_bandwidth_test.git" + url = "https://github.com/ROCm/rocm_bandwidth_test/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") version("master", branch="master") + version("6.0.0", sha256="9023401bd6a896059545b8e6263c6730afd89d7d45c0f5866261c300415532a6") + version("5.7.1", sha256="7426ef1e317b8293e4d6389673cfa8c63efb3f7d061e2f50a6f0b1b706e2a2a7") + version("5.7.0", sha256="fa95c28488ab4bb6d920b9f3c316554ca340f44c87ec2efb4cf8fa488e63ddd9") version("5.6.1", sha256="849af715d08dfd89e7aa5e4453b624151db1cafaa567ab5fa36a77948b90bf0d") version("5.6.0", sha256="ae2f7263a21a3a650068f43e3112b2b765eea80a5af2297572f850c77f83c85e") version("5.5.1", sha256="768b3da49fe7d4bb4e6536a8ee15be9f5e865d961e813ed4a407f32402685e1f") @@ -132,12 +135,15 @@ class RocmBandwidthTest(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("hsakmt-roct@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) build_targets = ["package"] diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index 941b1900f07802..aeca0c39a2d682 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,13 +9,18 @@ class RocmClangOcl(CMakePackage): """OpenCL compilation with clang compiler""" - homepage = "https://github.com/RadeonOpenCompute/clang-ocl" - git = "https://github.com/RadeonOpenCompute/clang-ocl.git" - url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/clang-ocl" + git = "https://github.com/ROCm/clang-ocl.git" + url = "https://github.com/ROCm/clang-ocl/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("MIT") + maintainers("srekolam", "renjithravindrankannath") version("master", branch="master") + version("6.0.0", sha256="74b5a64c32f3c57e7e4de638fffabbf448ecdb3dd8e65678b7ba0633352b4ca3") + version("5.7.1", sha256="32e4430d009cbbf5404ca9cbbb549b36897fa1826bc2285372e293cfe7531bf8") + version("5.7.0", sha256="c9ca80bfee674e740039256a846107373f1cf6554dc28398599976d8646a0392") version("5.6.1", sha256="c41deb1b564d939fc897b2bbdb13570b2234fa4c052a39783f5ad2dd1052f901") version("5.6.0", sha256="1afc47dee02d73c10de422f254067f4ef3ff921c4a1204d54ecc40e61fc63497") version("5.5.1", sha256="bfa62ad14830e2bd5afbc346685216c69f8cbef0eb449954f793178e10b19a38") @@ -130,6 +135,9 @@ class RocmClangOcl(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) @@ -139,7 +147,7 @@ class RocmClangOcl(CMakePackage): depends_on( "rocm-device-libs@" + ver, when="@{0} ^llvm-amdgpu ~rocm-device-libs".format(ver) ) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) test_src_dir = "test" diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index c833db675557c3..a5cbb03c5b4db9 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,14 +11,19 @@ class RocmCmake(CMakePackage): """rocm-cmake provides CMake modules for common build tasks in the ROCm software stack""" - homepage = "https://github.com/RadeonOpenCompute/rocm-cmake" - git = "https://github.com/RadeonOpenCompute/rocm-cmake.git" - url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.6.0.tar.gz" + homepage = "https://github.com/ROCm/rocm-cmake" + git = "https://github.com/ROCm/rocm-cmake.git" + url = "https://github.com/ROCm/rocm-cmake/archive/rocm-5.6.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") + license("MIT") + version("master", branch="master") + version("6.0.0", sha256="82bd97ba23d1883ef38bb667e92f7367fedc50d6c11c82f54cced4ab04b0412d") + version("5.7.1", sha256="4a4c6aa09576ccb834f869bdcb49e98cc0f0bac3678b802358065d1179a9d6f1") + version("5.7.0", sha256="93b98144201a1143eeca32744a9927d063f4685189f132ba52a6f3bba158a86b") version("5.6.1", sha256="98bf5fe2e6e12f55d122807d0060f1bb19c80d63d2c2f6fee579c40bfd244fa6") version("5.6.0", sha256="a118ca937856a4d0039955a8aef2466ef1fd1f08f7f7221cda53e1b5d02e476a") version("5.5.1", sha256="60113412b35d94e20e8100ed3db688c35801991b4b8fa282fdc6fd6fd413fb6e") @@ -106,7 +111,7 @@ class RocmCmake(CMakePackage): depends_on("cmake@3:", type="build") depends_on("cmake@3.6:", type="build", when="@4.1.0:") - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) test_src_dir = "test" diff --git a/var/spack/repos/builtin/packages/rocm-core/package.py b/var/spack/repos/builtin/packages/rocm-core/package.py index 45d947ce0e7f2a..54c1a526dd50ea 100644 --- a/var/spack/repos/builtin/packages/rocm-core/package.py +++ b/var/spack/repos/builtin/packages/rocm-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,18 @@ class RocmCore(CMakePackage): It also provides the Lmod modules files for the ROCm release. getROCmVersion function provides the ROCm version.""" - homepage = "https://github.com/RadeonOpenCompute/rocm-core" - url = "https://github.com/RadeonOpenCompute/rocm-core/archive/refs/tags/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocm-core" + url = "https://github.com/ROCm/rocm-core/archive/refs/tags/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librocm-core"] + license("MIT") + + version("6.0.0", sha256="d950ee4b63336f34579b6e1dda2d05966b7afa9c84bcdc13874991d1147dc788") + version("5.7.1", sha256="fc4915019ddfd126e8ef6a15006bce3aa7bd5fd11dc8eb04ce2ee6bdf9c6ae7f") + version("5.7.0", sha256="722689bfec46c35f5428a41c5aacfc31efec2294fc3b0112861c562f8a71ac93") version("5.6.1", sha256="eeef75e16e05380ccbc8df17a02dc141a66dddaadb444a97f7278f78067c498c") version("5.6.0", sha256="3c3d47c8b774968d768d42810a3fed42d058b7d6da248d5295df2a7ffb262568") version("5.5.1", sha256="bc73060432ffdc2e210394835d383890b9652476074ef4708d447473f273ce76") diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 6b28adb40c121d..d068de34569e04 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,15 +14,20 @@ class RocmDbgapi(CMakePackage): control of the execution and inspection of execution state of AMD's commercially available GPU architectures.""" - homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi" - git = "https://github.com/ROCm-Developer-Tools/ROCdbgapi.git" - url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCdbgapi" + git = "https://github.com/ROCm/ROCdbgapi.git" + url = "https://github.com/ROCm/ROCdbgapi/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librocm-dbgapi"] + license("MIT") + version("master", branch="amd-master") + version("6.0.0", sha256="4e823eba255e46b93aff05fd5938ef2a51693ffd74debebffc1aabfce613805c") + version("5.7.1", sha256="0ee9c2f083868849f2ea0cec7010e0270c27e7679ccbbadd12072cc0ef6c8a6f") + version("5.7.0", sha256="285ddded8e7f1981d8861ffc1cd7770b78129e4955da08ad55a4779945699716") version("5.6.1", sha256="c7241bf94bdb97a4cf1befbf25b8c35720797710da6f6b5b9d6a4094c1bc9c8b") version("5.6.0", sha256="9b66e47f4eccb3c8bbc324aade92aac6139539dda449427b7823d0c45341afc8") version("5.5.1", sha256="c41dfc62591bcf42003fe744d8bd03a51311d54e4b012f946ca0ede0c14dd977") @@ -138,12 +143,15 @@ class RocmDbgapi(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("hsa-rocr-dev@" + ver, type="build", when="@" + ver) depends_on("comgr@" + ver, type=("build", "link"), when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) @classmethod diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index 4b5850f0d0b8fe..a397fb6f562d9d 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,16 @@ class RocmDebugAgent(CMakePackage): """Radeon Open Compute (ROCm) debug agent""" - homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent" - git = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent.git" - url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocr_debug_agent" + git = "https://github.com/ROCm/rocr_debug_agent.git" + url = "https://github.com/ROCm/rocr_debug_agent/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librocm-debug-agent"] + version("6.0.0", sha256="705be2c2bd0f5c7d1e286eb9b94045b2bd017ff323f07bca9aa7c81f2d168524") + version("5.7.1", sha256="3b8d2835935da98f41e7cfc5b808c596ac06dd705b9a07bb70283e002f8dea6a") + version("5.7.0", sha256="d9344ed02e82a01140f2162e901e6a519e5fee6b498e2f49417730ee2660c5c1") version("5.6.1", sha256="d3b1d5d757489ed3cc66d351cec56b7b850aaa7ecf6a55b0350b89c3dee3153a") version("5.6.0", sha256="0bed788f07906afeb9092d0bec184a7963233ac9d8ccd20b4afeb624a1d20698") version("5.5.1", sha256="1bb66734f11bb57df6efa507f0217651446653bf28b3ca36acfcf94511a7c2bc") @@ -103,7 +106,7 @@ class RocmDebugAgent(CMakePackage): ) def url_for_version(self, version): - url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/" + url = "https://github.com/ROCm/rocr_debug_agent/archive/" if version <= Version("3.7.0"): url += "roc-{0}.tar.gz".format(version) else: @@ -142,6 +145,9 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("hsakmt-roct@" + ver, when="@" + ver) @@ -173,14 +179,17 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-dbgapi@" + ver, when="@" + ver) depends_on("hip@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) - # https://github.com/ROCm-Developer-Tools/rocr_debug_agent/pull/4 + # https://github.com/ROCm/rocr_debug_agent/pull/4 patch("0001-Drop-overly-strict-Werror-flag.patch", when="@3.7.0:") patch("0002-add-hip-architecture.patch", when="@3.9.0:") diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index cb784a050f195c..6ba87f4dab42c2 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,14 +10,17 @@ class RocmDeviceLibs(CMakePackage): """set of AMD specific device-side language runtime libraries""" - homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs" - git = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs.git" - url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCm-Device-Libs" + git = "https://github.com/ROCm/ROCm-Device-Libs.git" + url = "https://github.com/ROCm/ROCm-Device-Libs/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "haampie") version("master", branch="amd-stg-open") + version("6.0.0", sha256="198df4550d4560537ba60ac7af9bde31d59779c8ec5d6309627f77a43ab6ef6f") + version("5.7.1", sha256="703de8403c0bd0d80f37c970a698f10f148daf144d34f982e4484d04f7c7bbef") + version("5.7.0", sha256="0f8780b9098573f1c456bdc84358de924dcf00604330770a383983e1775bf61e") version("5.6.1", sha256="f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c") version("5.6.0", sha256="efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921") version("5.5.1", sha256="3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833") @@ -142,11 +145,14 @@ class RocmDeviceLibs(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("llvm-amdgpu@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index a752f0c4d79056..5a7c06d8ebaa7b 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,11 +11,16 @@ class RocmGdb(AutotoolsPackage): """This is ROCmgdb, the ROCm source-level debugger for Linux, based on GDB, the GNU source-level debugger.""" - homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/" - url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCgdb" + url = "https://github.com/ROCm/ROCgdb/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("LGPL-2.0-or-later") + maintainers("srekolam", "renjithravindrankannath") + version("6.0.0", sha256="0db4ab32ca729e69688cdb238df274ce5cf58b5cb2538584662cca4358708c2b") + version("5.7.1", sha256="5cd150b5796aea9d77efd43b89d30a34fa4125338179eb87c6053abcac9f3c62") + version("5.7.0", sha256="94fba57b2f17b593de61f7593b404fabc00b054d38567be57d12cf7654b7969a") version("5.6.1", sha256="d2b40d4c5aa41a6ce2a84307627b30d16a458672e03e13f9d27c12f2dc3f21d6") version("5.6.0", sha256="997ef1883aac2769552bc7082c70b837f4e98b57d24c133cea52b9c92fb0dee1") version("5.5.1", sha256="359258548bc7e6abff16bb13c301339fb96560b2b961433c9e0712e4aaf2d9e1") @@ -139,11 +144,14 @@ class RocmGdb(AutotoolsPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-dbgapi@" + ver, type="link", when="@" + ver) depends_on("comgr@" + ver, type="link", when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) build_directory = "spack-build" @@ -154,7 +162,7 @@ def configure_args(self): # Distributor options "--program-prefix=roc", "--enable-64-bit-bfd", - "--with-bugurl=https://github.com/ROCm-Developer-Tools/ROCgdb/issues", + "--with-bugurl=https://github.com/ROCm/ROCgdb/issues", "--with-pkgversion=-ROCm", "--enable-targets=x86_64-linux-gnu,amdgcn-amd-amdhsa", "--disable-ld", diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index f79496e91dc2c2..8aa0b0a391c1d4 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,8 +12,8 @@ class RocmOpencl(CMakePackage): """OpenCL: Open Computing Language on ROCclr""" - homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" - git = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git" + homepage = "https://github.com/ROCm/ROCm-OpenCL-Runtime" + git = "https://github.com/ROCm/ROCm-OpenCL-Runtime.git" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") @@ -24,11 +24,19 @@ def url_for_version(self, version): return ( "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz" ) - - url = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz" + elif version <= Version("5.6.1"): + url = ( + "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-{0}.tar.gz" + ) + else: + url = "https://github.com/ROCm/clr/archive/refs/tags/rocm-{0}.tar.gz" return url.format(version) + license("MIT") + version("master", branch="main") + version("5.7.1", sha256="c78490335233a11b4d8a5426ace7417c555f5e2325de10422df06c0f0f00f7eb") + version("5.7.0", sha256="bc2447cb6fd86dff6a333b04e77ce85755104d9011a14a044af53caf02449573") version("5.6.1", sha256="ec26049f7d93c95050c27ba65472736665ec7a40f25920a868616b2970f6b845") version("5.6.0", sha256="52ab260d00d279c2a86c353901ffd88ee61b934ad89e9eb480f210656705f04e") version("5.5.1", sha256="a8a62a7c6fc5398406d2203b8cb75621a24944688e545d917033d87de2724498") @@ -138,9 +146,7 @@ def url_for_version(self, version): ]: resource( name="rocclr", - url="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-{0}.tar.gz".format( - d_version - ), + url="https://github.com/ROCm/ROCclr/archive/rocm-{0}.tar.gz".format(d_version), sha256=d_shasum, expand=True, destination="", @@ -192,12 +198,14 @@ def url_for_version(self, version): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", "master", ]: depends_on("comgr@" + ver, type="build", when="@" + ver) depends_on("hsa-rocr-dev@" + ver, type="link", when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1"]: depends_on("rocm-core@" + ver, when="@" + ver) @classmethod @@ -242,9 +250,13 @@ def cmake_args(self): "-DROCclr_DIR={0}".format(self.spec["hip-rocclr"].prefix), "-DLIBROCclr_STATIC_DIR={0}/lib".format (self.spec["hip-rocclr"].prefix) - if "@4.5.0:" in self.spec: + if self.spec.satisfies("@4.5:5.6"): args.append(self.define("ROCCLR_PATH", self.stage.source_path + "/rocclr")) args.append(self.define("AMD_OPENCL_PATH", self.stage.source_path)) + if self.spec.satisfies("@5.7:"): + args.append(self.define("CLR_BUILD_HIP", False)) + args.append(self.define("CLR_BUILD_OCL", True)) + return args def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/0001-Linking-hsakmt-libdrm-and-numactl-libraries.patch b/var/spack/repos/builtin/packages/rocm-openmp-extras/0001-Linking-hsakmt-libdrm-and-numactl-libraries.patch new file mode 100644 index 00000000000000..32b47192925206 --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/0001-Linking-hsakmt-libdrm-and-numactl-libraries.patch @@ -0,0 +1,41 @@ +From f9b5b4ceacc57b72cb9f4a3b3ab31d8143771548 Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Fri, 1 Dec 2023 06:10:36 +0000 +Subject: [PATCH] Linking hsakmt, libdrm and numactl libraries + +--- + .../openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt | 3 ++- + .../openmp/libomptarget/plugins/amdgpu/CMakeLists.txt | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt b/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt +index f918206..06656f1 100644 +--- a/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt ++++ b/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt +@@ -22,7 +22,8 @@ endif() + # libhsakmt.a + find_library ( HSAKMT_LIB libhsakmt.a REQURIED HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm) + get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) +-link_directories (${HSAKMT_LIB_PATH}) ++link_directories (${HSAKMT_LIB_PATH} ${HSAKMT_LIB64} ${HSAKMT_LIB} ${LIBDRM_LIB} ${NUMACTL_DIR}/lib) ++include_directories(${HSAKMT_INC_PATH}) + + # lib_amdgpu + pkg_check_modules(drm_amdgpu REQUIRED IMPORTED_TARGET libdrm_amdgpu) +diff --git a/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt b/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt +index 8f1fc98..c230b00 100644 +--- a/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/rocm-openmp-extras/llvm-project/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -36,7 +36,8 @@ endif() + # libhsakmt.a + find_library ( HSAKMT_LIB libhsakmt.a REQURIED HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm) + get_filename_component ( HSAKMT_LIB_PATH ${HSAKMT_LIB} DIRECTORY ) +-link_directories (${HSAKMT_LIB_PATH}) ++link_directories (${HSAKMT_LIB_PATH} ${HSAKMT_LIB64} ${HSAKMT_LIB} ${LIBDRM_LIB} ${NUMACTL_DIR}/lib) ++include_directories(${HSAKMT_INC_PATH}) + + # lib_drm_amdgpu + pkg_check_modules(drm_amdgpu REQUIRED IMPORTED_TARGET libdrm_amdgpu) +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py index dedba382c56714..d23a487914c5c6 100644 --- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,8 +8,8 @@ from spack.package import * -tools_url = "https://github.com/ROCm-Developer-Tools" -compute_url = "https://github.com/RadeonOpenCompute" +tools_url = "https://github.com/ROCm" +compute_url = "https://github.com/ROCm" # Arrays of hashes are in order of the versions array below # For example array[0] = 3.9.0, array[1] = 3.10.0, etc. @@ -39,6 +39,9 @@ "9ec03a69cc462ada43e1fd4ca905a765b08c10e0911fb7a202c893cc577855e6", "0673820a81986c9e2f28f15bbb45ad18934bca56a9d08aae6c49ec3895b38487", "6c051bf7625f682ba3d2ea80b46a38ca2cbcd20f5d89ae3433602d3e7ef0403a", + "4f34fa02db410808c5e629f30f8804210b42c4ff7d31aa80606deaed43054c3c", + "ed7bbf92230b6535a353ed032a39a9f16e9987397798100392fc25e40c8a1a4e", + "1b2c0934ef16e17b2377944fae8c9b3db6dc64b7e43932ddfe2eeefdf6821410", ] devlib = [ @@ -66,6 +69,9 @@ "3b5f6dd85f0e3371f6078da7b59bf77d5b210e30f1cc66ef1e2de6bbcb775833", "efb5dcdca9b3a9fbe408d494fb4a23e0b78417eb5fa8eebd4a5d226088f28921", "f0dfab272ff936225bfa1e9dabeb3c5d12ce08b812bf53ffbddd2ddfac49761c", + "0f8780b9098573f1c456bdc84358de924dcf00604330770a383983e1775bf61e", + "703de8403c0bd0d80f37c970a698f10f148daf144d34f982e4484d04f7c7bbef", + "198df4550d4560537ba60ac7af9bde31d59779c8ec5d6309627f77a43ab6ef6f", ] llvm = [ @@ -93,6 +99,9 @@ "7d7181f20f89cb0715191aa32914186c67a34258c13457055570d47e15296553", "e922bd492b54d99e56ed88c81e2009ed6472059a180b10cc56ce1f9bd2d7b6ed", "045e43c0c4a3f4f2f1db9fb603a4f1ea3d56e128147e19ba17909eb57d7f08e5", + "4abdf00b297a77c5886cedb37e63acda2ba11cb9f4c0a64e133b05800aadfcf0", + "6b54c422e45ad19c9bf5ab090ec21753e7f7d854ca78132c30eb146657b168eb", + "c673708d413d60ca8606ee75c77e9871b6953c59029c987b92f2f6e85f683626", ] flang = [ @@ -120,6 +129,9 @@ "7c3b4eb3e95b9e2f91234f202a76034628d230a92e57b7c5ee9dcca1097bec46", "fcefebddca0b373da81ff84f0f5469a1ef77a05430a5195d0f2e6399d3af31c3", "5ebcbca2e03bd0686e677f44ea551e97bd9395c6b119f832fa784818733aa652", + "cc4f1973b1b8e7bcc4f09e3381bae4e1a2e51ea4e2598fc1b520ccb8bf24d28c", + "8fd618d81af092416b267c4d00c801731f7a00c0f8d4aedb795e52a4ec1bf183", + "fcb319ddb2aa3004a6ae60370ab4425f529336b1cee50f29200e697e61b53586", ] extras = [ @@ -147,6 +159,9 @@ "8955aa9d039fd6c1ff2e26d7298f0bf09bbcf03f09c6df92c91a9ab2510df9da", "017bfed52fbe08185d8dbde79377918454215683562519a9e47acf403d9a1c29", "437e2017cfe2ab73b15ada0fc1ea88f794f0b108cc5410f457268ae7e4e8985a", + "be59433dd85d4b8f0eaff87e0cc424a814152c67f3a682d1343c4bd61dd49a0f", + "8060c6879708faf5f7d417b19a479dec9b7b9583a1b885f12d247faf831f7f0b", + "f37e1107e4da5b083e794244f3d0c9fd073ccb6fd6015e635349d8f0d679c4b8", ] versions = [ @@ -174,6 +189,9 @@ "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ] versions_dict = dict() # type: Dict[str,Dict[str,str]] components = ["aomp", "devlib", "llvm", "flang", "extras"] @@ -191,10 +209,15 @@ class RocmOpenmpExtras(Package): """OpenMP support for ROCm LLVM.""" homepage = tools_url + "/aomp" - url = tools_url + "/aomp/archive/rocm-5.5.0.tar.gz" + url = tools_url + "/aomp/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("Apache-2.0") + maintainers("srekolam", "renjithravindrankannath", "estewart08") + version("6.0.0", sha256=versions_dict["6.0.0"]["aomp"]) + version("5.7.1", sha256=versions_dict["5.7.1"]["aomp"]) + version("5.7.0", sha256=versions_dict["5.7.0"]["aomp"]) version("5.6.1", sha256=versions_dict["5.6.1"]["aomp"]) version("5.6.0", sha256=versions_dict["5.6.0"]["aomp"]) version("5.5.1", sha256=versions_dict["5.5.1"]["aomp"]) @@ -227,6 +250,8 @@ class RocmOpenmpExtras(Package): depends_on("awk", type="build") depends_on("elfutils", type=("build", "link")) depends_on("libffi", type=("build", "link")) + depends_on("libdrm", when="@5.7:6.0") + depends_on("numactl", when="@5.7:6.0") for ver in [ "3.9.0", @@ -253,13 +278,16 @@ class RocmOpenmpExtras(Package): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("comgr@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("llvm-amdgpu@{0} ~openmp".format(ver), when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) # tag changed to 'rocm-' in 4.0.0 @@ -307,6 +335,7 @@ class RocmOpenmpExtras(Package): placement="llvm-project", when="@" + ver, ) + patch("0001-Linking-hsakmt-libdrm-and-numactl-libraries.patch", when="@5.7:6.0") def setup_run_environment(self, env): devlibs_prefix = self.spec["llvm-amdgpu"].prefix @@ -476,6 +505,9 @@ def install(self, spec, prefix): devlibs_src = "{0}/rocm-openmp-extras/rocm-device-libs".format(src) hsa_prefix = self.spec["hsa-rocr-dev"].prefix hsakmt_prefix = self.spec["hsakmt-roct"].prefix + if self.spec.satisfies("@5.7:6.0"): + libdrm_prefix = self.spec["libdrm"].prefix + numactl_prefix = self.spec["numactl"].prefix comgr_prefix = self.spec["comgr"].prefix llvm_inc = "/rocm-openmp-extras/llvm-project/llvm/include" llvm_prefix = self.spec["llvm-amdgpu"].prefix @@ -552,7 +584,12 @@ def install(self, spec, prefix): "-DCMAKE_CXX_FLAGS=-isystem{0} -I{1}".format(elfutils_inc, ffi_inc), "-DNEW_BC_PATH=1", ] - + if self.spec.satisfies("@5.7:6.0"): + openmp_common_args += [ + "-DLIBDRM_LIB={0}/lib".format(libdrm_prefix), + "-DHSAKMT_INC_PATH={0}/include".format(hsakmt_prefix), + "-DNUMACTL_DIR={0}".format(numactl_prefix), + ] if self.spec.version < Version("4.1.0"): openmp_common_args += ["-DHSA_INCLUDE={0}".format(hsa_prefix)] else: diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index 11ad3aa2ab257e..23af4a7653f080 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,15 +16,18 @@ class RocmSmiLib(CMakePackage): """It is a C library for Linux that provides a user space interface for applications to monitor and control GPU applications.""" - homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib" - git = "https://github.com/RadeonOpenCompute/rocm_smi_lib.git" - url = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocm_smi_lib" + git = "https://github.com/ROCm/rocm_smi_lib.git" + url = "https://github.com/ROCm/rocm_smi_lib/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librocm_smi64"] version("master", branch="master") + version("6.0.0", sha256="0053b42402fd007e5ca9b3186c70f2c6f1b3026558f328722adadc2838c51309") + version("5.7.1", sha256="4d79cb0482b2f801cc7824172743e3dd2b44b9f6784d1ca2e5067f2fbb4ef803") + version("5.7.0", sha256="a399db3d9fc113ce2dd1ab5608a1cf9129ec4b6a2a79ab7922b1d9f43c454640") version("5.6.1", sha256="9e94f9a941202c3d7ce917fd1cd78c4e0f06f48d6c929f3aa916378ccef1e02c") version("5.6.0", sha256="88be875948a29454b8aacced8bb8ad967502a7a074ecbc579ed673c1650a2f7e") version("5.5.1", sha256="37f32350bfaf6c697312628696d1b1d5fd9165f183882759bc6cb9a5d65b9430") @@ -114,9 +117,9 @@ class RocmSmiLib(CMakePackage): depends_on("cmake@3:", type="build") depends_on("python@3:", type=("build", "run"), when="@3.9.0:") - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) - patch("disable_pdf_generation_with_doxygen_and_latex.patch", when="@4.5.2:") + patch("disable_pdf_generation_with_doxygen_and_latex.patch", when="@4.5.2:5.6") def cmake_args(self): args = [ diff --git a/var/spack/repos/builtin/packages/rocm-smi/package.py b/var/spack/repos/builtin/packages/rocm-smi/package.py index 09a4e8c4934df2..4e927b1f01b225 100644 --- a/var/spack/repos/builtin/packages/rocm-smi/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,11 +14,11 @@ class RocmSmi(MakefilePackage): management of your ROCm enabled system Note: After ROCm 3.9, this project moved to - https://github.com/RadeonOpenCompute/rocm_smi_lib/tree/master/python_smi_tools + https://github.com/ROCm/rocm_smi_lib/tree/master/python_smi_tools The spack package is called: rocm-smi-lib""" - homepage = "https://github.com/RadeonOpenCompute/ROC-smi" - url = "https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-4.1.0.tar.gz" + homepage = "https://github.com/ROCm/ROC-smi" + url = "https://github.com/ROCm/ROC-smi/archive/rocm-4.1.0.tar.gz" maintainers("srekolam", "renjithravindrankannath") tags = ["rocm"] diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 29a6e82e092e3c..8b869452cc44f6 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,17 @@ class RocmTensile(CMakePackage): """Radeon Open Compute Tensile library""" - homepage = "https://github.com/ROCmSoftwarePlatform/Tensile/" - git = "https://github.com/ROCmSoftwarePlatform/Tensile.git" - url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/Tensile/" + git = "https://github.com/ROCm/Tensile.git" + url = "https://github.com/ROCm/Tensile/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] - maintainers("srekolam", "renjithravindrankannath", "haampie") + license("MIT") + maintainers("srekolam", "renjithravindrankannath", "haampie") + version("6.0.0", sha256="5d90add62d1439b7daf0527316e950e454e5d8beefb4f723865fe9ab26c7aa42") + version("5.7.1", sha256="9211a51b23c22b7a79e4e494e8ff3c31e90bf21adb8cce260acc57891fb2c917") + version("5.7.0", sha256="fe2ae067c1c579f33d7a1e26da3fe6b4ed44befa08f9dfce2ceae586f184b816") version("5.6.1", sha256="3e78c933563fade8781a1dca2079bff135af2f5d2c6eb0147797d2c1f24d006c") version("5.6.0", sha256="383728ecf49def59ab9a7f8a1d1e2eaf8b528e36b461e27030a2aab1a1ed80cb") version("5.5.1", sha256="b65cb7335abe51ba33be9d46a5ede992b4e5932fa33797397899a6bf33a770e9") @@ -161,6 +165,9 @@ class RocmTensile(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@" + ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -180,6 +187,9 @@ class RocmTensile(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-openmp-extras@" + ver, when="@" + ver) @@ -209,11 +219,14 @@ class RocmTensile(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-smi-lib@" + ver, type="build", when="@" + ver) root_cmakelists_dir = "Tensile/Source" - # Status: https://github.com/ROCmSoftwarePlatform/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 + # Status: https://github.com/ROCm/Tensile/commit/a488f7dadba34f84b9658ba92ce9ec5a0615a087 # Not yet landed in 3.7.0, nor 3.8.0. patch("0001-fix-compile-error.patch", when="@3.7.0:3.8.0") patch("0002-require-openmp-when-tensile-use-openmp-is-on.patch", when="@3.9.0:4.0.0") @@ -243,6 +256,7 @@ def cmake_args(self): self.define("Tensile_LOGIC", "asm_full"), self.define("Tensile_CODE_OBJECT_VERSION", "V3"), self.define("Boost_USE_STATIC_LIBS", "OFF"), + self.define_from_variant("TENSILE_USE_OPENMP", "openmp"), self.define("BUILD_WITH_TENSILE_HOST", "ON" if "@3.7.0:" in self.spec else "OFF"), ] @@ -256,7 +270,14 @@ def cmake_args(self): else: args.append(self.define("TENSILE_USE_OPENMP", "OFF")), - args.append(self.define("Tensile_ARCHITECTURE", self.get_gpulist_for_tensile_support())) + if self.spec.satisfies("^cmake@3.21.0:"): + args.append( + self.define("CMAKE_HIP_ARCHITECTURES", self.get_gpulist_for_tensile_support()) + ) + else: + args.append( + self.define("Tensile_ARCHITECTURE", self.get_gpulist_for_tensile_support()) + ) if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/008-correcting-library-and-include-path-WITHOUT-RVS-BUILD-TESTS.patch b/var/spack/repos/builtin/packages/rocm-validation-suite/008-correcting-library-and-include-path-WITHOUT-RVS-BUILD-TESTS.patch new file mode 100644 index 00000000000000..e206428eb1c90a --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/008-correcting-library-and-include-path-WITHOUT-RVS-BUILD-TESTS.patch @@ -0,0 +1,606 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7a750b2..e281439 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,15 +68,14 @@ endif(rocblas_FOUND) + # variables since we will pass them as cmake params appropriately, and + # all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH + set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path") +-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory") +-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rvs") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages") ++set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}") +-set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE) +-set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE) +-set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") +-set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE) ++set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime") ++set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime") ++set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") ++set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk") + + add_definitions(-DROCM_PATH="${ROCM_PATH}") + add_definitions(-DRVS_LIB_PATH="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rvs") +@@ -420,8 +419,8 @@ if (RVS_ROCBLAS EQUAL 1) + set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install") + set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/") + else() +- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include") +- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib") ++ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include") ++ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib") + endif() + + if (RVS_ROCMSMI EQUAL 1) +@@ -436,8 +435,8 @@ else() + set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib") + else() + message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" ) +- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include") +- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib") ++ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include") ++ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib") + endif() + endif() + set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name") +diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt +index f163dae..fa85b38 100644 +--- a/babel.so/CMakeLists.txt ++++ b/babel.so/CMakeLists.txt +@@ -107,13 +107,13 @@ set(HIP_HCC_LIB "amdhip64") + add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT}) + + # Determine Roc Runtime header files are accessible +-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h) +- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) ++if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h) ++ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + +-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h) +- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) ++if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h) ++ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + +@@ -133,16 +133,16 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") +- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) ++if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so") ++ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${HIP_PATH}) + + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries + set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) + +@@ -154,7 +154,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake +index e0e9f88..7321e0a 100644 +--- a/cmake_modules/tests_unit.cmake ++++ b/cmake_modules/tests_unit.cmake +@@ -27,7 +27,7 @@ + ## define additional unit testing include directories + include_directories(${UT_INC}) + ## define additional unit testing lib directories +-link_directories(${UT_LIB} ${RVS_LIB_DIR}) ++link_directories(${UT_LIB} ${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + + file(GLOB TESTSOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/test*.cpp ) + #message ( "TESTSOURCES: ${TESTSOURCES}" ) +@@ -45,6 +45,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) + ) + target_link_libraries(${TEST_NAME} + ${UT_LINK_LIBS} rvslibut rvslib gtest_main gtest pthread pci ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so + ) + target_compile_definitions(${TEST_NAME} PUBLIC RVS_UNIT_TEST) + if(DEFINED tcd.${TEST_NAME}) +diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt +index 7dd34ea..7978abe 100644 +--- a/edp.so/CMakeLists.txt ++++ b/edp.so/CMakeLists.txt +@@ -134,11 +134,11 @@ if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp ) +diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt +index d3caa84..73b83ce 100644 +--- a/gm.so/CMakeLists.txt ++++ b/gm.so/CMakeLists.txt +@@ -118,11 +118,11 @@ if(DEFINED RVS_ROCMSMI) + endif() + + ## define include directories +-include_directories(./ ../ ${ROCM_SMI_INC_DIR}) ++include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link + link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -133,7 +133,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCM_SMI_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt +index 43d337a..a234feb 100644 +--- a/gpup.so/CMakeLists.txt ++++ b/gpup.so/CMakeLists.txt +@@ -109,11 +109,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ include ../include) ++include_directories(./ ../ include ../include ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp) +@@ -124,7 +124,7 @@ set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt +index fd346ce..cb8c4b6 100644 +--- a/gst.so/CMakeLists.txt ++++ b/gst.so/CMakeLists.txt +@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/gst_worker.cpp) +@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt +index a85ca98..252e565 100644 +--- a/iet.so/CMakeLists.txt ++++ b/iet.so/CMakeLists.txt +@@ -140,7 +140,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + endif() + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -159,7 +159,7 @@ include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR + # Add directories to look for library files to link + link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp ) + +@@ -168,7 +168,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt +index 5133337..2462bbc 100644 +--- a/mem.so/CMakeLists.txt ++++ b/mem.so/CMakeLists.txt +@@ -134,7 +134,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -143,9 +143,9 @@ endif() + include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) + + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/rvs_memtest.cpp src/rvs_memworker.cpp) +diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt +index 5ae675a..892b6ac 100644 +--- a/pbqt.so/CMakeLists.txt ++++ b/pbqt.so/CMakeLists.txt +@@ -136,11 +136,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so) + endif() + + ## define include directories +-include_directories(./ ../ pci ${ROCR_INC_DIR}) ++include_directories(./ ../ pci ${ROCR_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp +diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt +index c4e2964..7a6b368 100644 +--- a/pebb.so/CMakeLists.txt ++++ b/pebb.so/CMakeLists.txt +@@ -139,9 +139,9 @@ endif() + ## define include directories + include_directories(./ ../ pci ${ROCR_INC_DIR}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp +diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt +index ead507d..567358b 100644 +--- a/peqt.so/CMakeLists.txt ++++ b/peqt.so/CMakeLists.txt +@@ -107,9 +107,9 @@ else() + endif() + + ## define include directories +-include_directories(./ ../) ++include_directories(./ ../ ${HSA_PATH}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${YAML_CPP_INCLUDE_DIRS}) + ## additional libraries + set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) + +@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt +index 518dac9..02d2245 100644 +--- a/perf.so/CMakeLists.txt ++++ b/perf.so/CMakeLists.txt +@@ -137,7 +137,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -145,9 +145,9 @@ endif() + ## define include directories + include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/perf_worker.cpp) +@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt +index 1f27f34..20a8bed 100644 +--- a/pesm.so/CMakeLists.txt ++++ b/pesm.so/CMakeLists.txt +@@ -107,11 +107,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt +index c0099ab..8d92982 100644 +--- a/rcqt.so/CMakeLists.txt ++++ b/rcqt.so/CMakeLists.txt +@@ -108,11 +108,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../) ++include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib) ++set (PROJECT_LINK_LIBS rvslib ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES +diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt +index 0dbd41b..3a0f7ab 100644 +--- a/rvs/CMakeLists.txt ++++ b/rvs/CMakeLists.txt +@@ -113,21 +113,22 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) ++include_directories(./ ../ ${YAML_INC_DIR}) + ## define lib directories +-link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${RVS_LIB_DIR}/.. ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${YAML_CPP_LIBRARIES} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ) + + ## additional libraries +-set(ROCBLAS_LIB "rocblas") +-set(ROC_THUNK_NAME "hsakmt") +-set(CORE_RUNTIME_NAME "hsa-runtime") ++set(ROCBLAS_LIB "${ROCBLAS_LIB_DIR}/librocblas.so") ++set(ROC_THUNK_NAME "${HSAKMT_LIB_DIR}/libhsakmt.a") ++set(CORE_RUNTIME_NAME "${HSA_PATH}/lib/libhsa-runtime64.so") ++set(YAML_CPP_LIB "${YAML_INC_DIR}/../lib64/libyaml-cpp.a") + set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") +-set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so ${YAML_CPP_LIBRARIES}) ++set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so) + + ## define target + add_executable(${RVS_TARGET} src/rvs.cpp) + target_link_libraries(${RVS_TARGET} rvslib +- ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${PROJECT_LINK_LIBS}) ++ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${PROJECT_LINK_LIBS} ${CORE_RUNTIME_NAME} ${YAML_CPP_LIB}) + add_dependencies(${RVS_TARGET} rvslib) + + install(TARGETS ${RVS_TARGET} +diff --git a/rvs/tests.cmake b/rvs/tests.cmake +index 38ae3fb..0d62675 100644 +--- a/rvs/tests.cmake ++++ b/rvs/tests.cmake +@@ -41,7 +41,8 @@ link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LI + ## define target for "test-to-fail" + add_executable(${RVS_TARGET}fail src/rvs.cpp) + target_link_libraries(${RVS_TARGET}fail rvslib rvslibut ${PROJECT_LINK_LIBS} +- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET}) ++ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + target_compile_definitions(${RVS_TARGET}fail PRIVATE RVS_INVERT_RETURN_STATUS) + set_target_properties(${RVS_TARGET}fail PROPERTIES +@@ -187,7 +188,7 @@ add_test(NAME unit.ttf.rvs.config.noconfig + ) + + ## define include directories +-include_directories(${UT_INC}) ++include_directories(${UT_INC} ${YAML_INC_DIR}) + ## define lib directories + link_directories(${UT_LIB} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR}) + ## additional libraries for unit tests +@@ -211,6 +212,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) + ${PROJECT_TEST_LINK_LIBS} + rvslib rvslibut gtest_main gtest pthread + ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so + ) + add_dependencies(${TEST_NAME} rvs_gtest_target) + +diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt +index 8d29590..d52aee3 100644 +--- a/rvslib/CMakeLists.txt ++++ b/rvslib/CMakeLists.txt +@@ -116,7 +116,7 @@ endif() + + ## define include directories + include_directories(./ ../ ../rvs +- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${YAML_INC_DIR}) + + link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + +diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt +index 042586f..0133c00 100644 +--- a/smqt.so/CMakeLists.txt ++++ b/smqt.so/CMakeLists.txt +@@ -106,11 +106,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp) +diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt +index 4cba0f9..34b491e 100644 +--- a/testif.so/CMakeLists.txt ++++ b/testif.so/CMakeLists.txt +@@ -108,11 +108,11 @@ endif() + + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + ## set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -124,7 +124,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -145,7 +145,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if0.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -166,7 +166,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if0_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -187,7 +187,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if1.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -208,7 +208,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if1_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -229,7 +229,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_fail_init.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -250,7 +250,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_fail_create_action.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path.patch b/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path.patch new file mode 100644 index 00000000000000..ae21de8c82c1cc --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path.patch @@ -0,0 +1,636 @@ +From 7bb26280b6da667573a581780f97856985b44e4e Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Fri, 12 Jan 2024 09:31:21 +0000 +Subject: [PATCH] Updating cmake with include and library path for spack + +--- + CMakeLists.txt | 21 +++++++++++---------- + babel.so/CMakeLists.txt | 18 +++++++++--------- + cmake_modules/tests_unit.cmake | 3 ++- + edp.so/CMakeLists.txt | 6 +++--- + gm.so/CMakeLists.txt | 6 +++--- + gpup.so/CMakeLists.txt | 8 ++++---- + gst.so/CMakeLists.txt | 10 +++++----- + iet.so/CMakeLists.txt | 6 +++--- + mem.so/CMakeLists.txt | 6 +++--- + pbqt.so/CMakeLists.txt | 6 +++--- + pebb.so/CMakeLists.txt | 4 ++-- + peqt.so/CMakeLists.txt | 6 +++--- + perf.so/CMakeLists.txt | 8 ++++---- + pesm.so/CMakeLists.txt | 8 ++++---- + rcqt.so/CMakeLists.txt | 6 +++--- + rvs/CMakeLists.txt | 15 ++++++++------- + rvs/tests.cmake | 6 ++++-- + rvslib/CMakeLists.txt | 2 +- + smqt.so/CMakeLists.txt | 6 +++--- + testif.so/CMakeLists.txt | 20 ++++++++++---------- + 20 files changed, 88 insertions(+), 83 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b25eca4..eeee55d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,13 +70,14 @@ endif(rocblas_FOUND) + # variables since we will pass them as cmake params appropriately, and + # all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH + set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path") +-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory") +-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}") +-set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE) +-set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE) +-set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") +-set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE) ++set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime") ++set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime") ++set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") ++set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk") + + add_definitions(-DROCM_PATH="${ROCM_PATH}") + add_definitions(-DRVS_LIB_PATH="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rvs") +@@ -420,8 +421,8 @@ if (RVS_ROCBLAS EQUAL 1) + set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install") + set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/") + else() +- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include") +- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib") ++ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include") ++ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib") + endif() + + if (RVS_ROCMSMI EQUAL 1) +@@ -436,8 +437,8 @@ else() + set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib") + else() + message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" ) +- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include") +- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib") ++ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include") ++ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib") + endif() + endif() + set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name") +diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt +index f163dae..fa85b38 100644 +--- a/babel.so/CMakeLists.txt ++++ b/babel.so/CMakeLists.txt +@@ -107,13 +107,13 @@ set(HIP_HCC_LIB "amdhip64") + add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT}) + + # Determine Roc Runtime header files are accessible +-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h) +- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) ++if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h) ++ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + +-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h) +- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) ++if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h) ++ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + +@@ -133,16 +133,16 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") +- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) ++if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so") ++ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) + RETURN() + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${HIP_PATH}) + + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries + set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) + +@@ -154,7 +154,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake +index e0e9f88..7321e0a 100644 +--- a/cmake_modules/tests_unit.cmake ++++ b/cmake_modules/tests_unit.cmake +@@ -27,7 +27,7 @@ + ## define additional unit testing include directories + include_directories(${UT_INC}) + ## define additional unit testing lib directories +-link_directories(${UT_LIB} ${RVS_LIB_DIR}) ++link_directories(${UT_LIB} ${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + + file(GLOB TESTSOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/test*.cpp ) + #message ( "TESTSOURCES: ${TESTSOURCES}" ) +@@ -45,6 +45,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) + ) + target_link_libraries(${TEST_NAME} + ${UT_LINK_LIBS} rvslibut rvslib gtest_main gtest pthread pci ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so + ) + target_compile_definitions(${TEST_NAME} PUBLIC RVS_UNIT_TEST) + if(DEFINED tcd.${TEST_NAME}) +diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt +index 7dd34ea..7978abe 100644 +--- a/edp.so/CMakeLists.txt ++++ b/edp.so/CMakeLists.txt +@@ -134,11 +134,11 @@ if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp ) +diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt +index d3caa84..73b83ce 100644 +--- a/gm.so/CMakeLists.txt ++++ b/gm.so/CMakeLists.txt +@@ -118,11 +118,11 @@ if(DEFINED RVS_ROCMSMI) + endif() + + ## define include directories +-include_directories(./ ../ ${ROCM_SMI_INC_DIR}) ++include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link + link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -133,7 +133,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCM_SMI_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt +index 43d337a..a234feb 100644 +--- a/gpup.so/CMakeLists.txt ++++ b/gpup.so/CMakeLists.txt +@@ -109,11 +109,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ include ../include) ++include_directories(./ ../ include ../include ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp) +@@ -124,7 +124,7 @@ set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt +index fd346ce..cb8c4b6 100644 +--- a/gst.so/CMakeLists.txt ++++ b/gst.so/CMakeLists.txt +@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() + + ## define include directories +-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/gst_worker.cpp) +@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt +index a85ca98..252e565 100644 +--- a/iet.so/CMakeLists.txt ++++ b/iet.so/CMakeLists.txt +@@ -140,7 +140,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + endif() + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -159,7 +159,7 @@ include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR + # Add directories to look for library files to link + link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp ) + +@@ -168,7 +168,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt +index 5133337..2462bbc 100644 +--- a/mem.so/CMakeLists.txt ++++ b/mem.so/CMakeLists.txt +@@ -134,7 +134,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -143,9 +143,9 @@ endif() + include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) + + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/rvs_memtest.cpp src/rvs_memworker.cpp) +diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt +index 5ae675a..892b6ac 100644 +--- a/pbqt.so/CMakeLists.txt ++++ b/pbqt.so/CMakeLists.txt +@@ -136,11 +136,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so) + endif() + + ## define include directories +-include_directories(./ ../ pci ${ROCR_INC_DIR}) ++include_directories(./ ../ pci ${ROCR_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp +diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt +index c4e2964..7a6b368 100644 +--- a/pebb.so/CMakeLists.txt ++++ b/pebb.so/CMakeLists.txt +@@ -139,9 +139,9 @@ endif() + ## define include directories + include_directories(./ ../ pci ${ROCR_INC_DIR}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp +diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt +index ead507d..567358b 100644 +--- a/peqt.so/CMakeLists.txt ++++ b/peqt.so/CMakeLists.txt +@@ -107,9 +107,9 @@ else() + endif() + + ## define include directories +-include_directories(./ ../) ++include_directories(./ ../ ${HSA_PATH}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${YAML_CPP_INCLUDE_DIRS}) + ## additional libraries + set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) + +@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt +index 518dac9..02d2245 100644 +--- a/perf.so/CMakeLists.txt ++++ b/perf.so/CMakeLists.txt +@@ -137,7 +137,7 @@ if(DEFINED RVS_ROCMSMI) + endif() + + +-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") ++if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") + message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) + RETURN() + endif() +@@ -145,9 +145,9 @@ endif() + ## define include directories + include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/perf_worker.cpp) +@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) ++target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt +index 1f27f34..20a8bed 100644 +--- a/pesm.so/CMakeLists.txt ++++ b/pesm.so/CMakeLists.txt +@@ -107,11 +107,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt +index c0099ab..8d92982 100644 +--- a/rcqt.so/CMakeLists.txt ++++ b/rcqt.so/CMakeLists.txt +@@ -108,11 +108,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../) ++include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib) ++set (PROJECT_LINK_LIBS rvslib ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES +diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt +index 527d474..76a5efd 100644 +--- a/rvs/CMakeLists.txt ++++ b/rvs/CMakeLists.txt +@@ -113,21 +113,22 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) ++include_directories(./ ../ ${YAML_INC_DIR}) + ## define lib directories +-link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${RVS_LIB_DIR}/.. ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${YAML_CPP_LIBRARIES} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ) + + ## additional libraries +-set(ROCBLAS_LIB "rocblas") +-set(ROC_THUNK_NAME "hsakmt") +-set(CORE_RUNTIME_NAME "hsa-runtime") ++set(ROCBLAS_LIB "${ROCBLAS_LIB_DIR}/librocblas.so") ++set(ROC_THUNK_NAME "${HSAKMT_LIB_DIR}/libhsakmt.a") ++set(CORE_RUNTIME_NAME "${HSA_PATH}/lib/libhsa-runtime64.so") ++set(YAML_CPP_LIB "${YAML_INC_DIR}/../lib64/libyaml-cpp.a") + set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") +-set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so ${YAML_CPP_LIBRARIES}) ++set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so) + + ## define target + add_executable(${RVS_TARGET} src/rvs.cpp) + target_link_libraries(${RVS_TARGET} rvslib +- ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${PROJECT_LINK_LIBS}) ++ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${PROJECT_LINK_LIBS} ${CORE_RUNTIME_NAME} ${YAML_CPP_LIB}) + add_dependencies(${RVS_TARGET} rvslib) + + install(TARGETS ${RVS_TARGET} +diff --git a/rvs/tests.cmake b/rvs/tests.cmake +index 38ae3fb..0d62675 100644 +--- a/rvs/tests.cmake ++++ b/rvs/tests.cmake +@@ -41,7 +41,8 @@ link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LI + ## define target for "test-to-fail" + add_executable(${RVS_TARGET}fail src/rvs.cpp) + target_link_libraries(${RVS_TARGET}fail rvslib rvslibut ${PROJECT_LINK_LIBS} +- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET}) ++ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + target_compile_definitions(${RVS_TARGET}fail PRIVATE RVS_INVERT_RETURN_STATUS) + set_target_properties(${RVS_TARGET}fail PROPERTIES +@@ -187,7 +188,7 @@ add_test(NAME unit.ttf.rvs.config.noconfig + ) + + ## define include directories +-include_directories(${UT_INC}) ++include_directories(${UT_INC} ${YAML_INC_DIR}) + ## define lib directories + link_directories(${UT_LIB} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR}) + ## additional libraries for unit tests +@@ -211,6 +212,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) + ${PROJECT_TEST_LINK_LIBS} + rvslib rvslibut gtest_main gtest pthread + ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ++ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so + ) + add_dependencies(${TEST_NAME} rvs_gtest_target) + +diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt +index 8d29590..d52aee3 100644 +--- a/rvslib/CMakeLists.txt ++++ b/rvslib/CMakeLists.txt +@@ -116,7 +116,7 @@ endif() + + ## define include directories + include_directories(./ ../ ../rvs +- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) ++ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${YAML_INC_DIR}) + + link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + +diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt +index 042586f..0133c00 100644 +--- a/smqt.so/CMakeLists.txt ++++ b/smqt.so/CMakeLists.txt +@@ -106,11 +106,11 @@ else() + endif() + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) ++set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + set(SOURCES src/rvs_module.cpp src/action.cpp) +diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt +index 4cba0f9..34b491e 100644 +--- a/testif.so/CMakeLists.txt ++++ b/testif.so/CMakeLists.txt +@@ -108,11 +108,11 @@ endif() + + + ## define include directories +-include_directories(./ ../ pci) ++include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) + # Add directories to look for library files to link +-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) ++link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) + ## additional libraries +-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) ++set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) + + ## define source files + ## set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) +@@ -124,7 +124,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -145,7 +145,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if0.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -166,7 +166,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if0_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -187,7 +187,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if1.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -208,7 +208,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_no_if1_methods.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -229,7 +229,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_fail_init.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +@@ -250,7 +250,7 @@ add_library( ${RVS_TARGET} SHARED src/rvs_module_fail_create_action.cpp) + set_target_properties(${RVS_TARGET} PROPERTIES + SUFFIX .so.${LIB_VERSION_STRING} + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +-target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS} ) ++target_link_libraries(${RVS_TARGET} rvslib ${PROJECT_LINK_LIBS}) + add_dependencies(${RVS_TARGET} rvslib) + + add_custom_command(TARGET ${RVS_TARGET} POST_BUILD +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index adad90b646e628..03b1c0d45ee004 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,12 +15,16 @@ class RocmValidationSuite(CMakePackage): computing environment, enabled using the ROCm software stack on a compatible platform.""" - homepage = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite" - url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/ROCmValidationSuite" + url = "https://github.com/ROCm/ROCmValidationSuite/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] - maintainers("srekolam", "renjithravindrankannath") + license("MIT") + maintainers("srekolam", "renjithravindrankannath") + version("6.0.0", sha256="a84e36b5e50e70ba033fb6bc6fa99da2e32bf7eaef2098df3164365a77a8f14c") + version("5.7.1", sha256="202f2b6e014bbbeec40af5d3ec630c042f09a61087a77bd70715d81044ea4d65") + version("5.7.0", sha256="f049b7786a220e9b6dfe099f17727dd0d9e41be9e680fe8309eae400cc5536ea") version("5.6.1", sha256="d5e4100e2d07311dfa101563c15d026a8130442cdee8af9ef861832cd7866c0d") version("5.6.0", sha256="54cc5167055870570c97ee7114f48d24d5415f984e0c9d7b58b83467e0cf18fb") version("5.5.1", sha256="0fbfaa9f68642b590ef04f9778013925bbf3f17bdcd35d4c85a8ffd091169a6e") @@ -117,9 +121,10 @@ class RocmValidationSuite(CMakePackage): ) patch( "007-cleanup-path-reference-donot-download-googletest-yaml-library-path_5.6.patch", - when="@5.6:", + when="@5.6", ) - + patch("008-correcting-library-and-include-path-WITHOUT-RVS-BUILD-TESTS.patch", when="@5.7") + patch("009-replacing-rocm-path-with-package-path.patch", when="@6.0") depends_on("cmake@3.5:", type="build") depends_on("zlib-api", type="link") depends_on("yaml-cpp~shared") @@ -158,6 +163,9 @@ def setup_build_environment(self, build_env): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocminfo@" + ver, when="@" + ver) @@ -194,12 +202,13 @@ def patch(self): def cmake_args(self): args = [ + self.define("RVS_BUILD_TESTS", False), self.define("HIP_PATH", self.spec["hip"].prefix), self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix), self.define("ROCM_SMI_DIR", self.spec["rocm-smi-lib"].prefix), self.define("ROCBLAS_DIR", self.spec["rocblas"].prefix), self.define("YAML_INC_DIR", self.spec["yaml-cpp"].prefix.include), - self.define("YAML_LIB_DIR", self.spec["yaml-cpp"].libs.directories[0]), + self.define("YAML_LIB_DIR", self.spec["yaml-cpp"].prefix.lib64), ] if self.spec.satisfies("@4.5.0:"): args.append(self.define("UT_INC", self.spec["googletest"].prefix.include)) diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index 92fcd8c826cc3c..a71259914a38e9 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,14 +10,17 @@ class Rocminfo(CMakePackage): """Radeon Open Compute (ROCm) Runtime rocminfo tool""" - homepage = "https://github.com/RadeonOpenCompute/rocminfo" - git = "https://github.com/RadeonOpenCompute/rocminfo.git" - url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocminfo" + git = "https://github.com/ROCm/rocminfo.git" + url = "https://github.com/ROCm/rocminfo/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath", "haampie") version("master", branch="master") + version("6.0.0", sha256="bc29f1798644b6dea73895353dffada9db7366d0058274e587ebd3291a4d3844") + version("5.7.1", sha256="642dc2ec4254b3c30c43064e6690861486db820b25f4906ec78bdb47e68dcd0b") + version("5.7.0", sha256="a5a3c19513bf26f17f163a03ba5288c5c761619ef55f0cb9e15472771748b93e") version("5.6.1", sha256="780b186ac7410a503eca1060f4bbc35db1b7b4d1d714d15c7534cd26d8af7b54") version("5.6.0", sha256="87d98a736e4f7510d1475d35717842068d826096a0af7c15a395bcf9d36d7fa0") version("5.5.1", sha256="bcab27bb3595d5a4c981e2416458d169e85c27e603c22e743d9240473bfbe98a") @@ -132,12 +135,15 @@ class Rocminfo(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", "master", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rocmlir/package.py b/var/spack/repos/builtin/packages/rocmlir/package.py index 4df599d253f24e..0c57ef3b4fc59a 100644 --- a/var/spack/repos/builtin/packages/rocmlir/package.py +++ b/var/spack/repos/builtin/packages/rocmlir/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,9 +12,9 @@ class Rocmlir(CMakePackage): targetting AMD hardware. This generator is mainly used from MIOpen and MIGraphX, but it can be used on a standalone basis.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR" - git = "https://github.com/ROCmSoftwarePlatform/rocMLIR.git" - url = "https://github.com/ROCmSoftwarePlatform/rocMLIR/archive/refs/tags/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocMLIR" + git = "https://github.com/ROCm/rocMLIR.git" + url = "https://github.com/ROCm/rocMLIR/archive/refs/tags/rocm-6.0.0.tar.gz" maintainers("srekolam") version("5.5.1", commit="8c29325e7e68e3248e863172bf0e7f97055d45ee") diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 5394f73958f428..fc0e594d15258e 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,13 +9,17 @@ class Rocprim(CMakePackage): """Radeon Open Compute Parallel Primitives Library""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM" - git = "https://github.com/ROCmSoftwarePlatform/rocPRIM.git" - url = "https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocPRIM" + git = "https://github.com/ROCm/rocPRIM.git" + url = "https://github.com/ROCm/rocPRIM/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] - maintainers("cgmb", "srekolam", "renjithravindrankannath") + license("MIT") + maintainers("cgmb", "srekolam", "renjithravindrankannath") + version("6.0.0", sha256="51f26c9f891a64c8db8df51d75d86d404d682092fd9d243e966ac6b2a6de381a") + version("5.7.1", sha256="15d820a0f61aed60efbba88b6efe6942878b02d912f523f9cf8f33a4583d6cd7") + version("5.7.0", sha256="a1bf94bbad13a0410b49476771270606d8a9d257188ee3ec3a37eee80540fe9b") version("5.6.1", sha256="e9ec1b0039c07cf3096653a04224fe5fe755afc6ba000f6838b3a8bc84df27de") version("5.6.0", sha256="360d6ece3c4a3c289dd88043432026fb989e982ae4d05230d8cdc858bcd50466") version("5.5.1", sha256="63cdc682afb39efd18f097faf695ce64c851c4a550a8ad96fa89d694451b6a42") @@ -142,6 +146,9 @@ class Rocprim(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("comgr@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index 7da0ef96de2469..b9375fd7ac57d8 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,13 +11,16 @@ class RocprofilerDev(CMakePackage): """ROCPROFILER library for AMD HSA runtime API extension support""" - homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler" - git = "https://github.com/ROCm-Developer-Tools/rocprofiler.git" - url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/refs/tags/rocm-5.4.3.tar.gz" + homepage = "https://github.com/ROCm/rocprofiler" + git = "https://github.com/ROCm/rocprofiler.git" + url = "https://github.com/ROCm/rocprofiler/archive/refs/tags/rocm-5.4.3.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["librocprofiler64"] + + license("MIT") + version("5.4.3", sha256="86c3f43ee6cb9808796a21409c853cc8fd496578b9eef4de67ca77830229cac1") version("5.4.0", sha256="0322cbe5d1d3182e616f472da31f0707ad6040833c38c28f2b39381a85210f43") version("5.3.3", sha256="07ee28f3420a07fc9d45910e78ad7961b388109cfc0e74cfdf2666789e6af171") @@ -130,7 +133,7 @@ class RocprofilerDev(CMakePackage): depends_on("roctracer-dev-api@" + ver, when="@" + ver) depends_on("numactl", type="link", when="@4.3.1") - # See https://github.com/ROCm-Developer-Tools/rocprofiler/pull/50 + # See https://github.com/ROCm/rocprofiler/pull/50 patch("fix-includes.patch") patch("0001-Continue-build-in-absence-of-aql-profile-lib.patch", when="@5.3:") diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index eb6496d3386b3d..d83857f346b030 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,17 +14,21 @@ class Rocrand(CMakePackage): """The rocRAND project provides functions that generate pseudo-random and quasi-random numbers.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND" - git = "https://github.com/ROCmSoftwarePlatform/rocRAND.git" - url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocRAND" + git = "https://github.com/ROCm/rocRAND.git" + url = "https://github.com/ROCm/rocRAND/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") libraries = ["librocrand"] + license("MIT") + version("develop", branch="develop") version("master", branch="master") - + version("6.0.0", sha256="cee93231c088be524bb2cb0e6093ec47e62e61a55153486bebbc2ca5b3d49360") + version("5.7.1", sha256="885cd905bbd23d02ba8f3f87d5c0b79bc44bd020ea9af190f3959cf5aa33d07d") + version("5.7.0", sha256="d6053d986821e5cbc6cfec0778476efb1411ef943f11e7a8b973b1814a259dcf") version("5.6.1", sha256="6bf71e687ffa0fcc1b00e3567dd43da4147a82390f1b2db5e6f1f594dee6066d") version("5.6.0", sha256="cc894d2f1af55e16b62c179062063946609c656043556189c656a115fd7d6f5f") version("5.5.1", sha256="e8bed3741b19e296bd698fc55b43686206f42f4deea6ace71513e0c48258cc6e") @@ -146,7 +150,7 @@ class Rocrand(CMakePackage): ]: resource( name="hipRAND", - git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", + git="https://github.com/ROCm/hipRAND.git", commit=d_commit, destination="", placement="hiprand", @@ -154,7 +158,7 @@ class Rocrand(CMakePackage): ) resource( name="hipRAND", - git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", + git="https://github.com/ROCm/hipRAND.git", branch="master", destination="", placement="hiprand", @@ -162,7 +166,7 @@ class Rocrand(CMakePackage): ) resource( name="hipRAND", - git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", + git="https://github.com/ROCm/hipRAND.git", branch="develop", destination="", placement="hiprand", @@ -197,6 +201,9 @@ class Rocrand(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 3b1cfcb51173dd..576675a3714170 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,9 +13,9 @@ class Rocsolver(CMakePackage): """rocSOLVER is a work-in-progress implementation of a subset of LAPACK functionality on the ROCm platform.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER" - git = "https://github.com/ROCmSoftwarePlatform/rocSOLVER.git" - url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocSOLVER" + git = "https://github.com/ROCm/rocSOLVER.git" + url = "https://github.com/ROCm/rocSOLVER/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "haampie") @@ -37,8 +37,13 @@ class Rocsolver(CMakePackage): for small matrix sizes", ) + license("BSD-2-Clause") + version("develop", branch="develop") version("master", branch="master") + version("6.0.0", sha256="5fcaba96f3efafc2ecc3f4ec104095d96545c16e1b9f95410bd571cb0fc643ae") + version("5.7.1", sha256="83e0c137b8690dbeb2e85d9e25415d96bd06979f09f2b10b2aff8e4c9f833fa4") + version("5.7.0", sha256="bb16d360f14b34fe6e8a6b8ddc6e631672a5ffccbdcb25f0ce319edddd7f9682") version("5.6.1", sha256="6a8f366218aee599a0e56755030f94ee690b34f30e6d602748632226c5dc21bb") version("5.6.0", sha256="54baa7f35f3c53da9005054e6f7aeecece5526dafcb277af32cbcb3996b0cbbc") version("5.5.1", sha256="8bf843e42d2e89203ea5fdb6e6082cea90da8d02920ab4c09bcc2b6f69909760") @@ -126,20 +131,17 @@ class Rocsolver(CMakePackage): depends_on("cmake@3.8:", type="build", when="@4.1.0:") depends_on("cmake@3.5:", type="build") depends_on("fmt@7:", type="build", when="@4.5.0:") + depends_on("fmt@7:8.0.1", type="test", when="@5.6:") depends_on("googletest@1.10.0:", type="test") depends_on("netlib-lapack@3.7.1:", type="test") patch("link-clients-blas.patch", when="@4.3.0:4.3.2") - # Backport https://github.com/ROCmSoftwarePlatform/rocSOLVER/commit/2bbfb8976f6e4d667499c77e41a6433850063e88 + # Backport https://github.com/ROCm/rocSOLVER/commit/2bbfb8976f6e4d667499c77e41a6433850063e88 patch("fmt-8.1-compatibility.patch", when="@4.5.0:5.1.3") # Maximize compatibility with other libraries that are using fmt. patch("fmt-9-compatibility.patch", when="@5.2.0:5.5") - def check(self): - exe = join_path(self.build_directory, "clients", "staging", "rocsolver-test") - self.run_test(exe, options=["--gtest_filter=checkin*-*known_bug*"]) - depends_on("hip@4.1.0:", when="@4.1.0:") depends_on("rocm-cmake@master", type="build", when="@master:") depends_on("rocm-cmake@4.5.0:", type="build", when="@4.5.0:") @@ -177,10 +179,13 @@ def check(self): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) - for ver in ["5.6.0", "5.6.1"]: + for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocsparse@5.2:", when="@5.6:") for tgt in itertools.chain(["auto"], amdgpu_targets): @@ -236,3 +241,9 @@ def cmake_args(self): def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) + + @run_after("build") + @on_package_attributes(run_tests=True) + def check_build(self): + exe = Executable(join_path(self.build_directory, "clients", "staging", "rocsolver-test")) + exe("--gtest_filter=checkin*-*known_bug*") diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 4fb8fb1646b4fc..211afb0d364c2a 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,9 +15,9 @@ class Rocsparse(CMakePackage): and toolchains. rocSPARSE is created using the HIP programming language and optimized for AMD's latest discrete GPUs.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE" - git = "https://github.com/ROCmSoftwarePlatform/rocSPARSE.git" - url = "https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocSPARSE" + git = "https://github.com/ROCm/rocSPARSE.git" + url = "https://github.com/ROCm/rocSPARSE/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") @@ -33,6 +33,10 @@ class Rocsparse(CMakePackage): ) variant("test", default=False, description="Build rocsparse-test client") + license("MIT") + version("6.0.0", sha256="bdc618677ec78830c6af315d61194d6ab8532345b8daeeb115aca96f274d4ca4") + version("5.7.1", sha256="4c09b182b371124675d4057246021b5ed45e2833fdbf265b37a9b06b668baf0a") + version("5.7.0", sha256="a42f0eb531b015b719e2bdcdff0cfb214e9894f73107966260f26931f982ecbc") version("5.6.1", sha256="6a50a64354507f1374e1a86aa7f5c07d1aaa96ac193ac292c279153087bb5d54") version("5.6.0", sha256="5797db3deb4a532e691447e3e8c923b93bd9fe4c468f3a88f00cecd80bebcae4") version("5.5.1", sha256="1dd2d18898dfebdf898e8fe7d1c1198e8f8451fd70ff12a1990ec1419cf359e1") @@ -147,6 +151,9 @@ class Rocsparse(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) @@ -311,10 +318,13 @@ class Rocsparse(CMakePackage): destination="mtx", ) - def check(self): + @run_after("build") + def check_build(self): if self.spec.satisfies("+test"): - exe = join_path(self.build_directory, "clients", "staging", "rocsparse-test") - self.run_test(exe, options=["--gtest_filter=*quick*:*pre_checkin*-*known_bug*"]) + exe = Executable( + join_path(self.build_directory, "clients", "staging", "rocsparse-test") + ) + exe("--gtest_filter=*quick*:*pre_checkin*-*known_bug*") def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 196bd7eaa15408..01da0551b1cd2d 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,15 @@ class Rocthrust(CMakePackage): HIP/ROCm platform, which uses the rocPRIM library. The HIP ported library works on HIP/ROCm platforms""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust" - git = "https://github.com/ROCmSoftwarePlatform/rocThrust.git" - url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocThrust" + git = "https://github.com/ROCm/rocThrust.git" + url = "https://github.com/ROCm/rocThrust/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath") - + version("6.0.0", sha256="a3fdafe4b6124118e07f23a3b0270d91740da324f61aaa3e8c034da08d9312b1") + version("5.7.1", sha256="b7cb9ea6c42b2c6b610c34d2c438443e0f99245bd391aff18591949bf1cd53ee") + version("5.7.0", sha256="64e10f071acfc5b8e3c168b9178289cf1afc7b168bf1962793fc256b25074d3a") version("5.6.1", sha256="63df61d5ab46d4cfda6066d748274bacecc77151692e372e6f7df5e91852bdc2") version("5.6.0", sha256="e52a27bcb4add38a5f0f3a5c7e409c230bf4ba9afae19bd2e06c2be00d39db59") version("5.5.1", sha256="66f126e5ea46ca761533411f81e83402773f95d3184cb7645ca73df227413023") @@ -146,6 +148,9 @@ class Rocthrust(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py index c7a80816c4ed0e..e93c202ccfd455 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,12 +11,17 @@ class RoctracerDevApi(Package): package, mainly to avoid circular dependencies in the ROCm ecosystem. For the ROC-tracer library, please check out roctracer-dev.""" - homepage = "https://github.com/ROCm-Developer-Tools/roctracer" - git = "https://github.com/ROCm-Developer-Tools/roctracer.git" - url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/roctracer" + git = "https://github.com/ROCm/roctracer.git" + url = "https://github.com/ROCm/roctracer/archive/refs/tags/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("MIT") + maintainers("srekolam", "renjithravindrankannath") + version("6.0.0", sha256="941166a0363c5689bfec118d54e986c43fb1ec8cbf18d95721d9a824bd52c0f8") + version("5.7.1", sha256="ec0453adac7e62b142eb0df1e1e2506863aac4c3f2ce9d117c3184c08c0c6b48") + version("5.7.0", sha256="40bb757920488466e29df90bb80a975cc340bf7f8771fb1d754dfbb6b688d78e") version("5.6.1", sha256="007c498be25b067ad9a7631a2b0892f9129150ee9714e471a921225875d45e69") version("5.6.0", sha256="cbcfe4fa2e8b627006b320a93992fb3078696d8ef2ef049b4b880b6b7d57e13e") version("5.5.1", sha256="3afc31ebfdb14b0365185ca6b9326a83b1503a94a51d910f5ce7ced192d8c133") diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index 328aa0844bfa4f..3c5f81e64368ef 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,13 +13,18 @@ class RoctracerDev(CMakePackage, ROCmPackage): The goal of the implementation is to provide a generic independent from specific runtime profiler to trace API and asyncronous activity.""" - homepage = "https://github.com/ROCm-Developer-Tools/roctracer" - git = "https://github.com/ROCm-Developer-Tools/roctracer.git" - url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/roctracer" + git = "https://github.com/ROCm/roctracer.git" + url = "https://github.com/ROCm/roctracer/archive/rocm-6.0.0.tar.gz" tags = ["rocm"] maintainers("srekolam", "renjithravindrankannath") libraries = ["libroctracer64"] + + license("MIT") + version("6.0.0", sha256="941166a0363c5689bfec118d54e986c43fb1ec8cbf18d95721d9a824bd52c0f8") + version("5.7.1", sha256="ec0453adac7e62b142eb0df1e1e2506863aac4c3f2ce9d117c3184c08c0c6b48") + version("5.7.0", sha256="40bb757920488466e29df90bb80a975cc340bf7f8771fb1d754dfbb6b688d78e") version("5.6.1", sha256="007c498be25b067ad9a7631a2b0892f9129150ee9714e471a921225875d45e69") version("5.6.0", sha256="cbcfe4fa2e8b627006b320a93992fb3078696d8ef2ef049b4b880b6b7d57e13e") version("5.5.1", sha256="3afc31ebfdb14b0365185ca6b9326a83b1503a94a51d910f5ce7ced192d8c133") @@ -76,6 +81,9 @@ class RoctracerDev(CMakePackage, ROCmPackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) @@ -98,7 +106,7 @@ class RoctracerDev(CMakePackage, ROCmPackage): ]: depends_on("rocprofiler-dev@" + ver, when="@" + ver) - for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1"]: + for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-core@" + ver, when="@" + ver) patch("0001-include-rocprofiler-dev-path.patch", when="@5.3:5.4") diff --git a/var/spack/repos/builtin/packages/rocwmma/package.py b/var/spack/repos/builtin/packages/rocwmma/package.py index 96978f7862ba70..ee5418b1c82176 100644 --- a/var/spack/repos/builtin/packages/rocwmma/package.py +++ b/var/spack/repos/builtin/packages/rocwmma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,12 +19,17 @@ class Rocwmma(CMakePackage): generation of kernel assembly, and does not incur additional overhead costs of linking to external runtime libraries or having to launch separate kernels.""" - homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA" - git = "https://github.com/ROCmSoftwarePlatform/rocWMMA.git" - url = "https://github.com/ROCmSoftwarePlatform/rocWMMA/archive/refs/tags/rocm-5.5.0.tar.gz" + homepage = "https://github.com/ROCm/rocWMMA" + git = "https://github.com/ROCm/rocWMMA.git" + url = "https://github.com/ROCm/rocWMMA/archive/refs/tags/rocm-6.0.0.tar.gz" tags = ["rocm"] + license("MIT") + maintainers("srekolam", "renjithravindrankannath") + version("6.0.0", sha256="f9e97e7c6c552d43ef8c7348e4402bead2cd978d0f81a9657d6a0f6c83a6139b") + version("5.7.1", sha256="a998a1385e6ad7062707ddb9ff82bef727ca48c39a10b4d861667024e3ffd2a3") + version("5.7.0", sha256="a8f1b090e9e504a149a924c80cfb6aca817359b43833a6512ba32e178245526f") version("5.6.1", sha256="41a5159ee1ad5fc411fe6220f37bd754e26d3883c24c0f2378f50ef628bc1b8f") version("5.6.0", sha256="78b6ab10fce71d10a9d762b2eaab3390eb13b05c764f47a3b0a303ec3d37acf8") version("5.5.1", sha256="ada30d5e52df5da0d3f4e212a25efb492dbedc129628f4db4ef4ed77667da228") @@ -72,6 +77,9 @@ class Rocwmma(CMakePackage): "5.5.1", "5.6.0", "5.6.1", + "5.7.0", + "5.7.1", + "6.0.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver) @@ -79,7 +87,7 @@ class Rocwmma(CMakePackage): depends_on("rocblas@" + ver, type="build", when="@" + ver) depends_on("rocm-openmp-extras@" + ver, type="build", when="@" + ver) - for ver in ["5.6.0", "5.6.1"]: + for ver in ["5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0"]: depends_on("rocm-smi-lib@" + ver, when="@" + ver) for tgt in itertools.chain(["auto"], amdgpu_targets): diff --git a/var/spack/repos/builtin/packages/rodinia/package.py b/var/spack/repos/builtin/packages/rodinia/package.py index de3118a7a17549..f3e7fe2911961a 100644 --- a/var/spack/repos/builtin/packages/rodinia/package.py +++ b/var/spack/repos/builtin/packages/rodinia/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/roms/package.py b/var/spack/repos/builtin/packages/roms/package.py index 5590c22c036c9a..1f8b78c80eaa65 100644 --- a/var/spack/repos/builtin/packages/roms/package.py +++ b/var/spack/repos/builtin/packages/roms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,15 +15,12 @@ class Roms(MakefilePackage): the scientific community for a diverse range of applications""" homepage = "https://www.myroms.org/" - url = "file://{0}/roms_3.8_source.tar.gz".format(os.getcwd()) - manual_download = True + url = "https://github.com/myroms/roms/archive/refs/tags/roms-4.1.tar.gz" - # TODO: ROMS v3.8 (svn version 986) require credentials to download and use - # Spack recipe expects ROMS source code in .tar.gz format - # checksum may differ from what is provided here. - # user can skip checksum verification by placing "--no-checksum" - # next to "spack install" - version("3.8", sha256="5da7a61b69bd3e1f84f33f894a9f418971f3ba61cf9f5ef0a806a722161e2c9a") + version("4.1", sha256="cf25625066be3ea40fdd7bbe361f830d4415170636163b05bd338ac299809d4e") + version("4.0", sha256="d14b4920e791ad24684f439c4751c2f1c38dbf9b82aa0d4d57def93e50a5a747") + version("3.9", sha256="8e93f6ed40040e3f1b88d456ea9411ed3c06f280dc50b2787d6e5f793f58f1bc") + version("3.8", sha256="99fb69239e70edaef35771d82e203e43cd301dde4f2a5662da038499b7258ae7") variant("openmp", default=False, description="Turn on shared-memory parallelization in ROMS") variant("mpi", default=True, description="Turn on distributed-memory parallelization in ROMS") @@ -77,22 +74,16 @@ def _edit_arch(self, spec, prefix, lib): """ Edit Linux-flang.mk makefile to support AOCC compiler """ - fflags = [ - "-fveclib=AMDLIBM", - "-O3", - "-ffast-math", - "-funroll-loops", - "-Mstack_arrays", - "-std=f2008", - ] + fflags = ["-fveclib=AMDLIBM", "-O3", "-ffast-math", "-funroll-loops", "-std=f2008"] make_aocc = join_path("Compilers", "{0}-{1}.mk".format(self.arch, lib)) - filter_file(r"\sFC := gfortran*$", "FC := {0}".format(lib), make_aocc) - filter_file(r"\sFFLAGS\s:=.*$", "FFLAGS := {0}".format(" ".join(fflags)), make_aocc) + filter_file(r"\sFC := gfortran*$", " FC := {0}".format(lib), make_aocc) + filter_file(r"\sFFLAGS :=.*$", " FFLAGS := {0}".format(" ".join(fflags)), make_aocc) + filter_file("-fallow-argument-mismatch", "", make_aocc, string=True) filter_file( - r"\sLIBS\s:= [$]", "LIBS := {0} $".format(spec["amdlibm"].libs.ld_flags), make_aocc + r"\sLIBS :=.*", " LIBS := {0}".format(spec["amdlibm"].libs.ld_flags), make_aocc ) - filter_file(r"\sFREEFLAGS\s:=.*", "FREEFLAGS := -ffree-form", make_aocc) + filter_file(r"\sFREEFLAGS :=.*", " FREEFLAGS := -ffree-form", make_aocc) def edit(self, spec, prefix): # ROMS doesn't have support for AOCC out of the box @@ -102,6 +93,14 @@ def edit(self, spec, prefix): self._copy_arch_file(lib_info) self._edit_arch(spec, prefix, lib_info) + # With gfortran >= 10 requires '-fallow-argument-mismatch' flag + if spec.satisfies("@:4.0 %gcc@10:"): + filter_file( + r"\sFFLAGS := ", + " FFLAGS := -fallow-argument-mismatch ", + "Compilers/Linux-gfortran.mk", + ) + makefile = FileFilter("makefile") app_type = self.selected_roms_application @@ -144,4 +143,8 @@ def build(self, spec, prefix): def install(self, spec, prefix): mkdirp(prefix.bin) + # Keep ROMS External Standard input scripts + mkdirp(spec.prefix.ROMS) + install("roms*", prefix.bin) + install_tree("./ROMS/External", join_path(spec.prefix.ROMS.External)) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 8504c6f894e7a5..bb6161d6030e5c 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,18 +32,24 @@ class Root(CMakePackage): version("master", branch="master") # Development version (when more recent than production). + version("develop", branch="master") # Production version + version("6.30.02", sha256="7965a456d1ad1ee0d5fe4769bf5a8fec291af684ed93db0f3080a9c362435183") + version("6.30.00", sha256="0592c066954cfed42312957c9cb251654456064fe2d8dabdcb8826f1c0099d71") + version("6.28.10", sha256="69d6fdeb607e6b20bd02c757fa6217024c0b6132c1e9b1dff4d85d9a2bb7e51e") version("6.28.06", sha256="af3b673b9aca393a5c9ae1bf86eab2672aaf1841b658c5c6e7a30ab93c586533") version("6.28.04", sha256="70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965") version("6.28.02", sha256="6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa") version("6.28.00", sha256="afa1c5c06d0915411cb9492e474ea9ab12b09961a358e7e559013ed63b5d8084") + version("6.26.14", sha256="81045a35a1958906c3eadecd9b01127a6087dadc19385af8e92ae5c84f06ce35") version("6.26.10", sha256="8e56bec397104017aa54f9eb554de7a1a134474fe0b3bb0f43a70fc4fabd625f") version("6.26.08", sha256="4dda043e7918b40743ad0299ddd8d526b7078f0a3822fd06066df948af47940e") version("6.26.06", sha256="b1f73c976a580a5c56c8c8a0152582a1dfc560b4dd80e1b7545237b65e6c89cb") version("6.26.04", sha256="a271cf82782d6ed2c87ea5eef6681803f2e69e17b3036df9d863636e9358421e") version("6.26.02", sha256="7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb") version("6.26.00", sha256="5fb9be71fdf0c0b5e5951f89c2f03fcb5e74291d043f6240fb86f5ca977d4b31") + version("6.24.08", sha256="882c41fe36e94456fb10443d08ef9152375a90d1f910a10add1793d6e838bc44") version("6.24.06", sha256="907f69f4baca1e4f30eeb4979598ca7599b6aa803ca046e80e25b6bbaa0ef522") version("6.24.02", sha256="0507e1095e279ccc7240f651d25966024325179fa85a1259b694b56723ad7c1c") version("6.24.00", sha256="9da30548a289211c3122d47dacb07e85d35e61067fac2be6c5a5ff7bda979989") @@ -104,6 +110,12 @@ class Root(CMakePackage): sha256="397f2de7db95a445afdb311fc91c40725fcfad485d58b4d72e6c3cdd0d0c5de7", when="@6.26:6.26.06 +root7 ^nlohmann-json@3.11:", ) + # Support recent versions of protobuf with their own CMake config + # (provided the CMake being used supports targets), _cf_ + # https://github.com/root-project/root/commit/f6cfe3bdab544e5f7fd49514562147ebd5d67d7c + patch("protobuf-config.patch", level=0, when="@:6.30.02 ^protobuf ^cmake@3.9:") + + patch("webgui.patch", level=0, when="@6.26.00:6.26.10,6.28.00:6.28.08,6.30.00 +webgui") patch("webgui.patch", level=0, when="@6.26.00:6.26.10,6.28.00:6.28.08 +webgui") @@ -114,6 +126,12 @@ class Root(CMakePackage): # Resolve circular dependency, _cf_ # https://sft.its.cern.ch/jira/browse/ROOT-8226. patch("root6-60606-mathmore.patch", when="@6.06.06") + # Fix macOS build when cocoa is disabled: + patch( + "https://github.com/root-project/root/pull/14387.patch?full_index=1", + sha256="559495f7bdd6b7674d3b1019da9b76e8b374f6dca3dbe72fb1320b0be2b00e53", + when="@6.30:6.30.3 ~aqua", + ) # ###################### Variants ########################## # See README.md for specific notes about what ROOT configuration @@ -121,6 +139,8 @@ class Root(CMakePackage): variant("aqua", default=False, description="Enable Aqua interface") variant("arrow", default=False, description="Enable Arrow interface") + variant("cuda", when="@6.08.00:", default=False, description="Enable CUDA support") + variant("cudnn", when="@6.20.02:", default=False, description="Enable cuDNN support") variant("davix", default=True, description="Compile with external Davix") variant("dcache", default=False, description="Enable support for dCache") variant("emacs", default=False, description="Enable Emacs support") @@ -162,9 +182,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") @@ -180,6 +202,31 @@ class Root(CMakePackage): variant("tbb", default=True, description="TBB multi-threading support") variant("threads", default=True, description="Enable using thread library") variant("tmva", default=False, description="Build TMVA multi variate analysis library") + variant( + "tmva-cpu", + when="@6.15.02:", + default=True, + description="Build TMVA with CPU support for deep learning (requires BLAS)", + ) + variant( + "tmva-gpu", + when="@6.15.02:", + default=False, + description="Build TMVA with GPU support for deep learning (requries CUDA)", + ) + variant( + "tmva-pymva", + when="@6.17.02:", + default=False, + description="Enable support for Python in TMVA (requires numpy)", + ) + variant( + "tmva-sofie", + when="@6.25.02:", + default=False, + description="Build TMVA with support for sofie - " + "fast inference code generation (requires protobuf 3)", + ) variant("unuran", default=True, description="Use UNURAN for random number generation") variant("vc", default=False, description="Enable Vc for adding new types for SIMD programming") variant("vdt", default=True, description="Enable set of fast and vectorisable math functions") @@ -214,7 +261,6 @@ class Root(CMakePackage): depends_on("cmake@3.19:", type="build", when="@6.28.00: platform=darwin") depends_on("pkgconfig", type="build") - depends_on("blas") depends_on("freetype") depends_on("jpeg") depends_on("libice") @@ -235,6 +281,9 @@ class Root(CMakePackage): depends_on("libxft", when="+x") depends_on("libxpm", when="+x") depends_on("libsm", when="+x") + depends_on("fontconfig", when="+x", type="build") + depends_on("xproto", when="+x", type="build") + depends_on("xextproto", when="+x", type="build") # OpenGL depends_on("ftgl@2.4.0:", when="+opengl") @@ -249,14 +298,20 @@ class Root(CMakePackage): # Python depends_on("python@2.7:", when="+python", type=("build", "run")) depends_on("python@2.7:3.10", when="@:6.26.09 +python", type=("build", "run")) - depends_on("py-numpy", type=("build", "run"), when="+tmva") - # This numpy dependency was not intended and will hopefully - # be fixed in 6.20.06. + depends_on("py-numpy", type=("build", "run"), when="+tmva-pymva") # See: https://sft.its.cern.ch/jira/browse/ROOT-10626 depends_on("py-numpy", type=("build", "run"), when="@6.20.00:6.20.05 +python") + # TMVA + depends_on("blas", when="+tmva-cpu") + depends_on("cuda", when="+tmva-gpu") + depends_on("protobuf@3:", when="+tmva-sofie") + # Optional dependencies depends_on("arrow", when="+arrow") + depends_on("cuda", when="+cuda") + depends_on("cuda", when="+cudnn") + depends_on("cudnn", when="+cudnn") depends_on("davix @0.7.1:", when="+davix") depends_on("dcap", when="+dcache") depends_on("cfitsio", when="+fits") @@ -292,6 +347,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,8 +376,15 @@ class Root(CMakePackage): conflicts("+math", when="~gsl", msg="root+math requires GSL") conflicts("+tmva", when="~gsl", msg="root+tmva requires GSL") conflicts("+tmva", when="~mlp", msg="root+tmva requires MLP") + conflicts("+tmva-cpu", when="~tmva", msg="root+tmva-cpu requires TMVA") + conflicts("+tmva-gpu", when="~tmva", msg="root+tmva-gpu requires TMVA") + conflicts("+tmva-gpu", when="~cuda", msg="root+tmva-gpu requires CUDA") + conflicts("+tmva-pymva", when="~tmva", msg="root+tmva-pymva requires TMVA") + conflicts("+tmva-sofie", when="~tmva", msg="root+tmva-sofie requires TMVA") + conflicts("~http", when="@6.29.00: +webgui", msg="root+webgui requires HTTP") 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" ) @@ -340,6 +403,13 @@ class Root(CMakePackage): # See https://github.com/root-project/root/issues/11135 conflicts("+ipo", msg="LTO is not a supported configuration for building ROOT") + def patch(self): + filter_file( + r"#include ", + "#include \n#include ", + "graf3d/eve7/inc/ROOT/REveTypes.hxx", + ) + @classmethod def filter_detected_exes(cls, prefix, exes_in_prefix): result = [] @@ -428,6 +498,10 @@ def _add_variant(variants, features, featurename, variantname): _add_variant(v, f, "table", "+table") _add_variant(v, f, "thread", "+threads") _add_variant(v, f, "tmva", "+tmva") + _add_variant(v, f, "tmva-cpu", "+tmva-cpu") + _add_variant(v, f, "tmva-gpu", "+tmva-gpu") + _add_variant(v, f, "tmva-pymva", "+tmva-pymva") + _add_variant(v, f, "tmva-sofie", "+tmva-sofie") _add_variant(v, f, "unuran", "+unuran") _add_variant(v, f, "vc", "+vc") _add_variant(v, f, "vdt", "+vdt") @@ -439,7 +513,6 @@ def _add_variant(variants, features, featurename, variantname): return " ".join(v) def cmake_args(self): - spec = self.spec define = self.define define_from_variant = self.define_from_variant options = [] @@ -449,7 +522,6 @@ def cmake_args(self): # Options controlling gross build / config behavior. options += [ - define("cxxmodules", False), define("exceptions", True), define("explicitlink", True), define("fail-on-missing", True), @@ -470,6 +542,9 @@ def cmake_args(self): define("CLING_CXX_PATH", self.compiler.cxx), ] + if self.spec.satisfies("@:6.28.99"): + options.append(define("cxxmodules", False)) + # Options related to ROOT's ability to download and build its own # dependencies. Per Spack convention, this should generally be avoided. @@ -577,6 +652,9 @@ def cmake_args(self): define_from_variant("xrootd"), ] + if self.spec.satisfies("@6.08.00:"): + options.append(define_from_variant("cuda")) + # Necessary due to name change of variant (webui->webgui) # https://github.com/root-project/root/commit/d631c542909f2f793ca7b06abc622e292dfc4934 if self.spec.satisfies("@:6.17.02"): @@ -585,11 +663,22 @@ def cmake_args(self): options.append(define_from_variant("webgui", "webgui")) # Some special features + if self.spec.satisfies("@6.15.02:"): + options.append(define_from_variant("tmva-cpu")) + options.append(define_from_variant("tmva-gpu")) + + if self.spec.satisfies("@6.17.02:"): + options.append(define_from_variant("tmva-pymva")) + if self.spec.satisfies("@6.20.02:"): + options.append(define_from_variant("cudnn")) options.append(define_from_variant("pyroot", "python")) else: options.append(define_from_variant("python")) + if self.spec.satisfies("@6.25.02:"): + options.append(define_from_variant("tmva-sofie")) + # #################### Compiler options #################### if sys.platform == "darwin" and self.compiler.cc == "gcc": @@ -606,9 +695,6 @@ def cmake_args(self): ftgl_prefix = self.spec["ftgl"].prefix options.append(define("FTGL_ROOT_DIR", ftgl_prefix)) options.append(define("FTGL_INCLUDE_DIR", ftgl_prefix.include)) - if "+python" in self.spec: - # See https://github.com/spack/spack/pull/11579 - options.append(define("PYTHON_EXECUTABLE", spec["python"].command.path)) return options diff --git a/var/spack/repos/builtin/packages/root/protobuf-config.patch b/var/spack/repos/builtin/packages/root/protobuf-config.patch new file mode 100644 index 00000000000000..da02b775f66030 --- /dev/null +++ b/var/spack/repos/builtin/packages/root/protobuf-config.patch @@ -0,0 +1,57 @@ +--- cmake/modules/SearchInstalledSoftware.cmake 2023-08-28 06:26:43.000000000 -0500 ++++ cmake/modules/SearchInstalledSoftware.cmake 2023-11-03 10:26:13.383171830 -0500 +@@ -1711,8 +1711,12 @@ + + if(tmva-sofie) + message(STATUS "Looking for Protobuf") +- find_package(Protobuf) ++ set(protobuf_MODULE_COMPATIBLE TRUE) ++ find_package(Protobuf CONFIG) + if(NOT Protobuf_FOUND) ++ find_package(Protobuf MODULE) ++ endif() ++ if(NOT Protobuf_FOUND) + if(fail-on-missing) + message(FATAL_ERROR "Protobuf libraries not found and they are required (tmva-sofie option enabled)") + else() +--- tmva/sofie/test/CMakeLists.txt 2023-08-28 06:26:43.000000000 -0500 ++++ tmva/sofie/test/CMakeLists.txt 2023-11-03 10:41:04.048362415 -0500 +@@ -46,7 +46,7 @@ + ${CMAKE_BINARY_DIR}/ginclude # this is for RConfigure.h + ) + +-target_link_libraries(emitFromONNX ${Protobuf_LIBRARIES} ROOTTMVASofie ROOTTMVASofieParser) ++target_link_libraries(emitFromONNX protobuf::libprotobuf ROOTTMVASofie ROOTTMVASofieParser) + set_target_properties(emitFromONNX PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + ## silence protobuf warnings seen in version 3.0 and 3.6. Not needed from protobuf version 3.17 + target_compile_options(emitFromONNX PRIVATE -Wno-unused-parameter -Wno-array-bounds) +@@ -88,7 +88,7 @@ + ${CMAKE_SOURCE_DIR}/core/foundation/inc + ${CMAKE_BINARY_DIR}/ginclude # this is for RConfigure.h + ) +-target_link_libraries(emitFromROOT ${Protobuf_LIBRARIES} ROOTTMVASofie ROOTTMVASofieParser) ++target_link_libraries(emitFromROOT protobuf::libprotobuf ROOTTMVASofie ROOTTMVASofieParser) + set_target_properties(emitFromROOT PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + ## silence protobuf warnings seen in version 3.0 and 3.6. Not needed from protobuf version 3.17 + target_compile_options(emitFromROOT PRIVATE -Wno-unused-parameter -Wno-array-bounds) +--- tmva/sofie_parsers/CMakeLists.txt 2023-08-28 06:26:43.000000000 -0500 ++++ tmva/sofie_parsers/CMakeLists.txt 2023-11-03 10:46:44.101759248 -0500 +@@ -55,8 +55,8 @@ + src/ParseFuseConvTransposeAdd.cxx + src/ParseFuseMatMulAdd.cxx + ${PROTO_SRCS} +- LIBRARIES +- ${Protobuf_LIBRARIES} ++ LIBRARIES PUBLIC ++ protobuf::libprotobuf + DEPENDENCIES + TMVA + ROOTTMVASofie +@@ -64,7 +64,5 @@ + + target_include_directories(ROOTTMVASofieParser PUBLIC + $) +-target_include_directories(ROOTTMVASofieParser PUBLIC +- ${Protobuf_INCLUDE_DIRS}) + set_target_properties(ROOTTMVASofieParser PROPERTIES + POSITION_INDEPENDENT_CODE TRUE) diff --git a/var/spack/repos/builtin/packages/root/webgui.patch b/var/spack/repos/builtin/packages/root/webgui.patch index b97dea6ef38746..b1b1c0f3bb7fbc 100644 --- a/var/spack/repos/builtin/packages/root/webgui.patch +++ b/var/spack/repos/builtin/packages/root/webgui.patch @@ -23,3 +23,4 @@ # Use https protocol for the http server (default - no) WebGui.UseHttps: no WebGui.ServerCert: rootserver.pem + diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index 11ccc9d7e712db..0978eb0e88fafc 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Rose(AutotoolsPackage): # ROSE Versions # -------------------------------------------------------------------------- + license("BSD-3-Clause") + version("0.9.13.0", sha256="64092793dfd38d476152696721e29a410bb31dc3eeb6064c7520087aa8c904a6") # Version for edg binary is found in src/frontend/CxxFrontend/EDG_VERSION diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py index 95ce34e7a9dab0..53910e4039be0c 100644 --- a/var/spack/repos/builtin/packages/ross/package.py +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ross(CMakePackage): git = "https://github.com/ROSS-org/ROSS.git" url = "https://github.com/ROSS-org/ROSS/archive/v7.0.0.tar.gz" + license("BSD-3-Clause") + version("develop", branch="develop") version("master", branch="master") version("7.2.0", sha256="c937f4c7baa1918b6cd08f4eafae8cab44eddcd4aaa1175c23ff8562583ad726") diff --git a/var/spack/repos/builtin/packages/routinator/package.py b/var/spack/repos/builtin/packages/routinator/package.py index 0b2bd94baab4a7..e6845beec6ba0d 100644 --- a/var/spack/repos/builtin/packages/routinator/package.py +++ b/var/spack/repos/builtin/packages/routinator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Routinator(Package): maintainers("aweits") + license("BSD-3-Clause") + version("0.12.1", sha256="8150fe544f89205bb2d65bca46388f055cf13971d3163fe17508bf231f9ab8bc") version( "0.11.2", diff --git a/var/spack/repos/builtin/packages/routino/package.py b/var/spack/repos/builtin/packages/routino/package.py index 00326fdc94ef2e..602e18a3079266 100644 --- a/var/spack/repos/builtin/packages/routino/package.py +++ b/var/spack/repos/builtin/packages/routino/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rpcsvc-proto/package.py b/var/spack/repos/builtin/packages/rpcsvc-proto/package.py index 85b7c208d36144..30cf5138be5ea5 100644 --- a/var/spack/repos/builtin/packages/rpcsvc-proto/package.py +++ b/var/spack/repos/builtin/packages/rpcsvc-proto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class RpcsvcProto(AutotoolsPackage): homepage = "https://github.com/thkukuk/rpcsvc-proto" url = "https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4.3/rpcsvc-proto-1.4.3.tar.xz" + license("BSD-3-Clause") + version("1.4.3", sha256="69315e94430f4e79c74d43422f4a36e6259e97e67e2677b2c7d7060436bd99b1") version("1.4.2", sha256="678851b9f7ddf4410d2859c12016b65a6dd1a0728d478f18aeb54d165352f17c") version("1.4.1", sha256="9429e143bb8dd33d34bf0663f571d4d4a1103e1afd7c49791b367b7ae1ef7f35") diff --git a/var/spack/repos/builtin/packages/rpm/package.py b/var/spack/repos/builtin/packages/rpm/package.py index 66bce60f177a6c..840651798bf381 100644 --- a/var/spack/repos/builtin/packages/rpm/package.py +++ b/var/spack/repos/builtin/packages/rpm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rpp/0003-changes-to-rpp-unit-tests.patch b/var/spack/repos/builtin/packages/rpp/0003-changes-to-rpp-unit-tests.patch new file mode 100644 index 00000000000000..b38e526563c0c9 --- /dev/null +++ b/var/spack/repos/builtin/packages/rpp/0003-changes-to-rpp-unit-tests.patch @@ -0,0 +1,62 @@ +From: Afzal Patel +Date: Tue Jan 9 09:57:48 PST 2024 +Subject: [PATCH] changes-to-rpp-unit-tests +Description: This patch makes changes to the CMakeLists.txt for the rpp unit tests. + It adds the directory which contains half.hpp and also modifies the method + the libjpegturbo library is linked. +--- +diff git a/utilities/test_suite/HIP/CMakeLists.txt b/utilities/test_suite/HIP/CMakeLists.txt +index 8f32a66..456999e 100644 +--- a/utilities/test_suite/HIP/CMakeLists.txt ++++ b/utilities/test_suite/HIP/CMakeLists.txt +@@ -55,7 +55,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + if(TurboJpeg_FOUND) + message("-- ${Green}${PROJECT_NAME} set to build with rpp and TurboJpeg${ColourReset}") + include_directories(${TurboJpeg_INCLUDE_DIRS}) +- set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${TurboJpeg_LIBRARIES_DIR}) ++ set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${TurboJpeg_LIBRARIES}) + else() + message("-- ${Yellow}Error: TurboJpeg must be installed to install ${PROJECT_NAME} successfully!${ColourReset}") + endif() +@@ -72,7 +72,7 @@ if (hip_FOUND AND OpenCV_FOUND) + + add_executable(Tensor_hip Tensor_hip.cpp) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGPU_SUPPORT=1 -DRPP_BACKEND_HIP=1 -std=gnu++14") +- target_link_libraries(Tensor_hip ${OpenCV_LIBS} -lturbojpeg -lrpp ${hip_LIBRARIES} pthread ${LINK_LIBRARY_LIST} hip::device) ++ target_link_libraries(Tensor_hip ${OpenCV_LIBS} -lrpp ${hip_LIBRARIES} pthread ${LINK_LIBRARY_LIST} hip::device) + else() + message("-- ${Yellow}Error: OpenCV and hip must be installed to install ${PROJECT_NAME} successfully!${ColourReset}") +-endif() +\ No newline at end of file ++endif() +diff --git a/utilities/test_suite/HOST/CMakeLists.txt b/utilities/test_suite/HOST/CMakeLists.txt +index bad0d60..5a8fd5c 100644 +--- a/utilities/test_suite/HOST/CMakeLists.txt ++++ b/utilities/test_suite/HOST/CMakeLists.txt +@@ -50,10 +50,13 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS} -ggdb -O0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} OpenMP::OpenMP_CXX) + ++find_path(HALF_INCLUDE_DIR half.hpp) ++include_directories(${HALF_INCLUDE_DIR}) ++ + if(TurboJpeg_FOUND) + message("-- ${Green}${PROJECT_NAME} set to build with rpp and TurboJpeg${ColourReset}") + include_directories(${TurboJpeg_INCLUDE_DIRS}) +- set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${TurboJpeg_LIBRARIES_DIR}) ++ set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${TurboJpeg_LIBRARIES}) + else() + message("-- ${Yellow}Error: TurboJpeg must be installed to install ${PROJECT_NAME} successfully!${ColourReset}") + endif() +@@ -67,8 +70,8 @@ if (OpenCV_FOUND) + add_executable(Tensor_host Tensor_host.cpp) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") +- target_link_libraries(Tensor_host ${OpenCV_LIBS} -lturbojpeg -lrpp pthread ${LINK_LIBRARY_LIST}) ++ target_link_libraries(Tensor_host ${OpenCV_LIBS} -lrpp pthread ${LINK_LIBRARY_LIST}) + + else() + message("-- ${Yellow}Error: OpenCV must be installed to install ${PROJECT_NAME} successfully!${ColourReset}") +-endif() +\ No newline at end of file ++endif() diff --git a/var/spack/repos/builtin/packages/rpp/0003-include-half-through-spack-package.patch b/var/spack/repos/builtin/packages/rpp/0003-include-half-through-spack-package.patch new file mode 100644 index 00000000000000..2e7e08c2ac76cf --- /dev/null +++ b/var/spack/repos/builtin/packages/rpp/0003-include-half-through-spack-package.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 137896e..ca82e98 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,6 +129,9 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) + + # OpenMP + find_package(OpenMP REQUIRED) ++find_path(HALF_INCLUDE_DIR half.hpp) ++message(STATUS "HALF_INCLUDE_DIR: ${HALF_INCLUDE_DIR}") ++ + if(APPLE) + if(CMAKE_C_COMPILER_ID MATCHES "Clang") + set(OpenMP_C "${CMAKE_C_COMPILER}") +@@ -278,6 +281,7 @@ target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${ROCM_PATH}/include ++ ${HALF_INCLUDE_DIR} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/src/include/cpu + ${CMAKE_CURRENT_SOURCE_DIR}/src/include/common +diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt +index 2a64d77..80c5686 100644 +--- a/src/modules/CMakeLists.txt ++++ b/src/modules/CMakeLists.txt +@@ -81,6 +81,8 @@ if("${TIME_INFO}" STREQUAL "1") + endif() + + # Backend specific settings ++find_path(HALF_INCLUDE_DIR half.hpp) ++message(STATUS "HALF_INCLUDE_DIR: ${HALF_INCLUDE_DIR}") + + if( "${BACKEND}" STREQUAL "HIP") + # Add HIP kernels +@@ -99,7 +101,7 @@ if( "${BACKEND}" STREQUAL "HIP") + # Add HIP specific includes + set(ROCM_INC ${ROCM_PATH}/include/) + list(APPEND HIP_LOCAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/include/hip/ ${CMAKE_SOURCE_DIR}/src/include/common/) +- set(INCLUDE_LIST ${ROCM_INC} ${HIP_LOCAL_INCLUDE_DIRS} ${INCLUDE_LIST}) ++ set(INCLUDE_LIST ${ROCM_INC} ${HIP_LOCAL_INCLUDE_DIRS} ${INCLUDE_LIST} ${HALF_INCLUDE_DIR}) + elseif( "${BACKEND}" STREQUAL "OCL") + # Add OpenCL kernels + file(GLOB MOD_CL_CPP "cl/*.cpp" ) +@@ -114,7 +116,7 @@ elseif( "${BACKEND}" STREQUAL "OCL") + # Add OpenCL specific includes + set(ROCM_INC ${ROCM_PATH}/include/) + list(APPEND OCL_LOCAL_INCLUDE_LIST ${CMAKE_SOURCE_DIR}/src/include/cl/ ${CMAKE_SOURCE_DIR}/src/include/common/) +- set(INCLUDE_LIST ${ROCM_INC} ${OCL_LOCAL_INCLUDE_LIST} ${INCLUDE_LIST}) ++ set(INCLUDE_LIST ${ROCM_INC} ${OCL_LOCAL_INCLUDE_LIST} ${INCLUDE_LIST} ${HALF_INCLUDE_DIR}) + elseif( "${BACKEND}" STREQUAL "CPU") + # Add CPU specific includes + set(INCLUDE_LIST ${CMAKE_SOURCE_DIR}/src/include/common/) +@@ -136,6 +138,7 @@ target_include_directories( ${PROJECT_NAME} + PUBLIC + ${CMAKE_SOURCE_DIR}/include + ${ROCM_INC} ++ ${HALF_INCLUDE_DIR} + PRIVATE + ${CMAKE_SOURCE_DIR}/src/include/cpu + ${CMAKE_SOURCE_DIR}/src/include/common \ No newline at end of file diff --git a/var/spack/repos/builtin/packages/rpp/package.py b/var/spack/repos/builtin/packages/rpp/package.py index bb30bca21b6ade..7049b342cd7c8a 100644 --- a/var/spack/repos/builtin/packages/rpp/package.py +++ b/var/spack/repos/builtin/packages/rpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,11 +15,24 @@ class Rpp(CMakePackage): homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp" git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git" - url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/0.97.tar.gz" + url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/refs/tags/rocm-5.7.0.tar.gz" + + def url_for_version(self, version): + if version >= Version("5.7.0"): + url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/refs/tags/rocm-{0}.tar.gz" + else: + url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/{0}.tar.gz" + return url.format(version) maintainers = ["srekolam", "afzpatel"] tags = ["rocm"] + license("MIT") + + version("6.0.0", sha256="3626a648bc773520f5cd5ca15f494de6e74b422baf32491750ce0737c3367f15") + version("5.7.1", sha256="36fff5f1c52d969c3e2e0c75b879471f731770f193c9644aa6ab993fb8fa4bbf") + version("5.7.0", sha256="1c612cde3c3d3840ae75ee5c1ee59bd8d61b1fdbf84421ae535cda863470fc06") + version("1.2.0", sha256="660a11e1bd8706967835597b26daa874fd1507459bfebe22818149444bec540c") version("1.1.0", sha256="9b1b9e721df27ee577819710b261071c68b2dccba96d9daf5d0535ee5f0e045f") version("1.0.0", sha256="040601e356b0a06c4ffb2043320ae822ab0da78af867392002c7b68dbd85989c") version("0.99", sha256="f1d7ec65d0148ddb7b3ce836a7e058727036df940d72d1683dee590a913fd44a") @@ -36,9 +49,19 @@ class Rpp(CMakePackage): variant("opencl", default=False, description="Use OPENCL as the backend") variant("hip", default=True, description="Use HIP as backend") variant("cpu", default=False, description="Use CPU as backend") + variant( + "add_tests", + default=False, + description="add utilities folder which contains rpp unit tests", + ) - patch("0001-include-half-openmp-through-spack-package.patch") + patch("0001-include-half-openmp-through-spack-package.patch", when="@:5.7") patch("0002-declare-handle-in-header.patch") + patch("0003-include-half-through-spack-package.patch", when="@6.0:") + + # adds half.hpp include directory and modifies how the libjpegturbo + # library is linked for the rpp unit test + patch("0003-changes-to-rpp-unit-tests.patch", when="+add_tests") def patch(self): if self.spec.satisfies("+hip"): @@ -52,6 +75,31 @@ def patch(self): "cmake/FindOpenCL.cmake", string=True, ) + if self.spec.satisfies("+add_tests"): + filter_file( + "${ROCM_PATH}/include/rpp", + self.spec.prefix.include.rpp, + "utilities/test_suite/HOST/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + self.spec.prefix.lib, + "utilities/test_suite/HOST/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/include/rpp", + self.spec.prefix.include.rpp, + "utilities/test_suite/HIP/CMakeLists.txt", + string=True, + ) + filter_file( + "${ROCM_PATH}/lib", + self.spec.prefix.lib, + "utilities/test_suite/HIP/CMakeLists.txt", + string=True, + ) depends_on("cmake@3.5:", type="build") depends_on("pkgconfig", type="build") @@ -64,18 +112,26 @@ def patch(self): "opencv@4.5:" "+calib3d+features2d+highgui+imgcodecs+imgproc" "+video+videoio+flann+photo+objdetect", - type="build", + type=("build", "link"), when="@1.0:", ) - depends_on("libjpeg-turbo", type="build") + depends_on("libjpeg-turbo", type=("build", "link")) depends_on("rocm-openmp-extras") conflicts("+opencl+hip") with when("+hip"): - depends_on("hip@5:") + with when("@5.7:"): + for ver in ["5.7.0", "5.7.1", "6.0.0"]: + depends_on("hip@" + ver, when="@" + ver) + with when("@:1.2"): + depends_on("hip@5:") with when("~hip"): depends_on("rocm-opencl@5:") + def setup_run_environment(self, env): + if self.spec.satisfies("+add_tests"): + env.set("TURBO_JPEG_PATH", self.spec["libjpeg-turbo"].prefix) + def cmake_args(self): spec = self.spec args = [] @@ -93,3 +149,9 @@ def cmake_args(self): ) ) return args + + @run_after("install") + def add_tests(self): + if self.spec.satisfies("+add_tests"): + install_tree("utilities", self.spec.prefix.utilities) + install_tree("cmake", self.spec.prefix.cmake) diff --git a/var/spack/repos/builtin/packages/rr/package.py b/var/spack/repos/builtin/packages/rr/package.py index a4fd6c6f8979d5..c89b3a457cab07 100644 --- a/var/spack/repos/builtin/packages/rr/package.py +++ b/var/spack/repos/builtin/packages/rr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rrdtool/package.py b/var/spack/repos/builtin/packages/rrdtool/package.py index 413024b47e4149..a7827fa6dbfd52 100644 --- a/var/spack/repos/builtin/packages/rrdtool/package.py +++ b/var/spack/repos/builtin/packages/rrdtool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Rrdtool(AutotoolsPackage): homepage = "https://oss.oetiker.ch/rrdtool" url = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz" + license("GPL-2.0-or-later") + version("1.7.2", sha256="a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db") version("1.7.1", sha256="989b778eda6967aa5192c73abafe43e7b10e6100776971a7e79d249942781aae") version("1.7.0", sha256="f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b") diff --git a/var/spack/repos/builtin/packages/rsbench/package.py b/var/spack/repos/builtin/packages/rsbench/package.py index eecf959374b4bc..449af96b288108 100644 --- a/var/spack/repos/builtin/packages/rsbench/package.py +++ b/var/spack/repos/builtin/packages/rsbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rsem/package.py b/var/spack/repos/builtin/packages/rsem/package.py index 125c82e75e096b..1038f21a63b81a 100644 --- a/var/spack/repos/builtin/packages/rsem/package.py +++ b/var/spack/repos/builtin/packages/rsem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rsem(MakefilePackage): homepage = "https://deweylab.github.io/RSEM/" url = "https://github.com/deweylab/RSEM/archive/v1.3.0.tar.gz" + license("GPL-3.0-or-later") + version("1.3.3", sha256="90e784dd9df8346caa2a7e3ad2ad07649608a51df1c69bfb6e16f45e611a40dc") version("1.3.1", sha256="93c749a03ac16e94b1aab94d032d4fd5687d3261316ce943ecb89d3ae3ec2e11") version("1.3.0", sha256="ecfbb79c23973e1c4134f05201f4bd89b0caf0ce4ae1ffd7c4ddc329ed4e05d2") diff --git a/var/spack/repos/builtin/packages/rsl/package.py b/var/spack/repos/builtin/packages/rsl/package.py index f2339360c76da5..8627f862d63f0c 100644 --- a/var/spack/repos/builtin/packages/rsl/package.py +++ b/var/spack/repos/builtin/packages/rsl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rsl(AutotoolsPackage): homepage = "https://trmm-fc.gsfc.nasa.gov/trmm_gv/software/rsl/" url = "https://trmm-fc.gsfc.nasa.gov/trmm_gv/software/rsl/software/rsl-v1.50.tar.gz" + license("LGPL-2.0-only") + version("1.50", sha256="9e4e3fe45eb1e4aebea63255d4956b00eb69527044a83f182cde1b43510bd342") depends_on("bzip2") diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py index ce0ab0df9c4d07..14442b8692ac1a 100644 --- a/var/spack/repos/builtin/packages/rstart/package.py +++ b/var/spack/repos/builtin/packages/rstart/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rstudio/package.py b/var/spack/repos/builtin/packages/rstudio/package.py index e1bad025cb7ebd..e28b243e4d9c89 100644 --- a/var/spack/repos/builtin/packages/rstudio/package.py +++ b/var/spack/repos/builtin/packages/rstudio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rsync/package.py b/var/spack/repos/builtin/packages/rsync/package.py index 5b5f7ceeb12386..aba593db40d723 100644 --- a/var/spack/repos/builtin/packages/rsync/package.py +++ b/var/spack/repos/builtin/packages/rsync/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Rsync(AutotoolsPackage): homepage = "https://rsync.samba.org" url = "https://download.samba.org/pub/rsync/src/rsync-3.2.4.tar.gz" + license("GPL-3.0-or-later") + version("3.2.7", sha256="4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb") version("3.2.6", sha256="fb3365bab27837d41feaf42e967c57bd3a47bc8f10765a3671efd6a3835454d3") version("3.2.5", sha256="2ac4d21635cdf791867bc377c35ca6dda7f50d919a58be45057fd51600c69aba") diff --git a/var/spack/repos/builtin/packages/rsyslog/package.py b/var/spack/repos/builtin/packages/rsyslog/package.py index 73ec7dc8ca48ef..9722a270bd87e0 100644 --- a/var/spack/repos/builtin/packages/rsyslog/package.py +++ b/var/spack/repos/builtin/packages/rsyslog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Rsyslog(AutotoolsPackage): homepage = "https://www.rsyslog.com/" url = "https://github.com/rsyslog/rsyslog/archive/v8.2006.0.tar.gz" + license("Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later", checked_by="tgamblin") + version("8.2006.0", sha256="dc30a2ec02d5fac91d3a4f15a00641e0987941313483ced46592ab0b0d68f324") version("8.2004.0", sha256="b56b985fec076a22160471d389b7ff271909dfd86513dad31e401a775a6dfdc2") version("8.2002.0", sha256="b31d56311532335212ef2ea7be4501508224cb21f1bef9d262c6d78e21959ea1") diff --git a/var/spack/repos/builtin/packages/rt-tests/package.py b/var/spack/repos/builtin/packages/rt-tests/package.py index 1f04278618ac58..f02be36b17a0d6 100644 --- a/var/spack/repos/builtin/packages/rt-tests/package.py +++ b/var/spack/repos/builtin/packages/rt-tests/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RtTests(MakefilePackage): homepage = "https://git.kernel.org" url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/rt-tests-1.2.tar.gz" + license("GPL-2.0-only") + version("1.2", sha256="7ccde036059c87681a4b00e7138678d9551b1232113441f6edda31ea45452426") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/rtags/package.py b/var/spack/repos/builtin/packages/rtags/package.py index 88e3cc8e6f1f98..16641b714ef11c 100644 --- a/var/spack/repos/builtin/packages/rtags/package.py +++ b/var/spack/repos/builtin/packages/rtags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Rtags(CMakePackage): url = "https://github.com/Andersbakken/rtags/releases/download/v2.38/rtags-2.38.tar.gz" maintainers("vmiheer") + license("GPL-3.0-or-later") + version("2.38", sha256="e19d9cf5823cccc43266ca57c19ae0bb879cbe138511cb3f0343958860481a5d") version("2.20", sha256="9d73399421327147dc47b0ae5b95e12e8355f30291ad1954a78c0ef68b4b501f") version("2.17", sha256="288fa49fedf647fb15e2ef10f0ebcd9de1a4ef1bbae3a3940870e136d32a3a60") diff --git a/var/spack/repos/builtin/packages/rtax/package.py b/var/spack/repos/builtin/packages/rtax/package.py index 0a09ece77a52a7..89ab78992b285f 100644 --- a/var/spack/repos/builtin/packages/rtax/package.py +++ b/var/spack/repos/builtin/packages/rtax/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/rtmpdump/package.py b/var/spack/repos/builtin/packages/rtmpdump/package.py index a868e6e3d0d8c9..e8a5bc843237d1 100644 --- a/var/spack/repos/builtin/packages/rtmpdump/package.py +++ b/var/spack/repos/builtin/packages/rtmpdump/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py b/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py index a567f65b7ac401..dc50323dde241c 100644 --- a/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py +++ b/var/spack/repos/builtin/packages/ruby-asciidoctor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RubyAsciidoctor(RubyPackage): homepage = "https://asciidoctor.org/" url = "https://github.com/asciidoctor/asciidoctor/archive/v2.0.10.tar.gz" + license("MIT") + version("2.0.17", sha256="ca939b978d5d3bfe0cfcf1bcf5513f199aa77813e4a19f568dc6b6f17b892728") version("2.0.10", sha256="afca74837e6d4b339535e8ba0b79f2ad00bd1eef78bf391cc36995ca2e31630a") diff --git a/var/spack/repos/builtin/packages/ruby-erubis/package.py b/var/spack/repos/builtin/packages/ruby-erubis/package.py index 838be712dd7b73..759ea95bf6f99a 100644 --- a/var/spack/repos/builtin/packages/ruby-erubis/package.py +++ b/var/spack/repos/builtin/packages/ruby-erubis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyErubis(RubyPackage): homepage = "http://www.kuwata-lab.com/erubis/" git = "https://github.com/kwatch/erubis.git" + license("MIT") + version("master", branch="master") version("2.7.0", commit="14d3eab57fbc361312c8f3af350cbf9a5bafce17") diff --git a/var/spack/repos/builtin/packages/ruby-gist/package.py b/var/spack/repos/builtin/packages/ruby-gist/package.py index 1003e2a3677c2f..fc79942d36d8b7 100644 --- a/var/spack/repos/builtin/packages/ruby-gist/package.py +++ b/var/spack/repos/builtin/packages/ruby-gist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py index b7e2efa4925586..563b6550a89a6a 100644 --- a/var/spack/repos/builtin/packages/ruby-gnuplot/package.py +++ b/var/spack/repos/builtin/packages/ruby-gnuplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ruby-hpricot/package.py b/var/spack/repos/builtin/packages/ruby-hpricot/package.py index 2f917a40e84067..1d30534f8e87bf 100644 --- a/var/spack/repos/builtin/packages/ruby-hpricot/package.py +++ b/var/spack/repos/builtin/packages/ruby-hpricot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,4 +16,6 @@ class RubyHpricot(RubyPackage): homepage = "https://github.com/hpricot/hpricot" url = "https://github.com/hpricot/hpricot/archive/0.8.6.tar.gz" + license("MIT") + version("0.8.6", sha256="792f63cebe2f2b02058974755b4c8a3aef52e5daf37f779a34885d5ff2876017") diff --git a/var/spack/repos/builtin/packages/ruby-mustache/package.py b/var/spack/repos/builtin/packages/ruby-mustache/package.py index 50110c063ef1f8..8838701fc9a462 100644 --- a/var/spack/repos/builtin/packages/ruby-mustache/package.py +++ b/var/spack/repos/builtin/packages/ruby-mustache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RubyMustache(RubyPackage): homepage = "https://github.com/mustache/mustache" url = "https://github.com/mustache/mustache/archive/v1.1.1.tar.gz" + license("MIT") + version("1.1.1", sha256="9ab4a9842a37d5278789ba26152b0b78f649e3020266809ec33610a89f7e65ea") depends_on("ruby@2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index 62df319cdcfa31..5b976cd4e104ee 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class RubyNarray(RubyPackage): url = "https://github.com/ruby-numo/numo-narray/archive/v0.9.1.8.tar.gz" git = "https://github.com/ruby-numo/numo-narray.git" + license("BSD-3-Clause") + version("master", branch="master") version("0.9.1.8", sha256="48814c6ebf2c4846fcf6cfd2705a15a97a608960c1676cb6c7b5c9254b0dd51b") diff --git a/var/spack/repos/builtin/packages/ruby-rake/package.py b/var/spack/repos/builtin/packages/ruby-rake/package.py index 6f3442875350d4..768b2427917745 100644 --- a/var/spack/repos/builtin/packages/ruby-rake/package.py +++ b/var/spack/repos/builtin/packages/ruby-rake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyRake(RubyPackage): homepage = "https://github.com/ruby/rake" url = "https://github.com/ruby/rake/archive/v13.0.1.tar.gz" + license("MIT") + version("13.0.6", sha256="a39d555a08a3cbd6961a98d0bf222a01018683760664ede3c1610af5ca5de0cc") version("13.0.1", sha256="d865329b5e0c38bd9d11ce70bd1ad6e0d5676c4eee74fd818671c55ec49d92fd") diff --git a/var/spack/repos/builtin/packages/ruby-rdiscount/package.py b/var/spack/repos/builtin/packages/ruby-rdiscount/package.py index 3caaee2b49c1ed..b85aa30bd27307 100644 --- a/var/spack/repos/builtin/packages/ruby-rdiscount/package.py +++ b/var/spack/repos/builtin/packages/ruby-rdiscount/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyRdiscount(RubyPackage): homepage = "https://dafoster.net/projects/rdiscount/" url = "https://github.com/davidfstr/rdiscount/archive/2.2.0.2.tar.gz" + license("BSD-3-Clause") + version("2.2.0.2", sha256="a6956059fc61365c242373b03c5012582d7342842eae38fe59ebc1bc169744db") depends_on("ruby@1.9.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-ronn/package.py b/var/spack/repos/builtin/packages/ruby-ronn/package.py index 5a5602e0af1cef..74696331c8053c 100644 --- a/var/spack/repos/builtin/packages/ruby-ronn/package.py +++ b/var/spack/repos/builtin/packages/ruby-ronn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RubyRonn(RubyPackage): homepage = "https://rtomayko.github.io/ronn/" url = "https://github.com/rtomayko/ronn/archive/0.7.3.tar.gz" + license("MIT") + version("0.7.3", sha256="808aa6668f636ce03abba99c53c2005cef559a5099f6b40bf2c7aad8e273acb4") version("0.7.0", sha256="ea14337093de8707aa8a67b97357332fa8a03b0df722bdbf4f027fbe4379b185") diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py index 1dec713fe97061..6617635a26ac47 100644 --- a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ruby-svn2git/package.py b/var/spack/repos/builtin/packages/ruby-svn2git/package.py index 2173a294e0d9be..9939362f841c48 100644 --- a/var/spack/repos/builtin/packages/ruby-svn2git/package.py +++ b/var/spack/repos/builtin/packages/ruby-svn2git/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class RubySvn2git(RubyPackage): homepage = "https://github.com/nirvdrum/svn2git/" url = "https://github.com/nirvdrum/svn2git/archive/v2.4.0.tar.gz" + license("MIT") + version("2.4.0", sha256="81d0a3eff5b12b729d0fe8ad117db386954c635067f1c86007360c6c76dec253") depends_on("git") diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py index 18fad9839e4d34..3623491183bfd6 100644 --- a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyTerminalTable(RubyPackage): homepage = "https://github.com/tj/terminal-table" url = "https://github.com/tj/terminal-table/archive/v1.8.0.tar.gz" + license("MIT") + version("1.8.0", sha256="69b8e157f5dc3f056b5242923ab3e729a16c6f893b3a5d540e71135a973e5fbe") depends_on("ruby-unicode-display-width@1.1.1:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-thor/package.py b/var/spack/repos/builtin/packages/ruby-thor/package.py index a6fcae833415ff..e6337c55664e80 100644 --- a/var/spack/repos/builtin/packages/ruby-thor/package.py +++ b/var/spack/repos/builtin/packages/ruby-thor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyThor(RubyPackage): homepage = "http://whatisthor.com/" url = "https://github.com/erikhuda/thor/archive/v1.0.1.tar.gz" + license("MIT") + version("1.0.1", sha256="e6b902764e237ce296cf9e339c93f8ca83bec5b59be0bf8bacd7ffddc6684d07") depends_on("ruby@2.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py index 20b828d1ce4176..7023a6677dbc77 100644 --- a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyTmuxinator(RubyPackage): homepage = "https://github.com/tmuxinator/tmuxinator" url = "https://github.com/tmuxinator/tmuxinator/archive/v2.0.1.tar.gz" + license("MIT") + version("2.0.1", sha256="a2c8428d239a6e869da516cecee3ac64db47ba1f1932317eb397b1afd698ee09") depends_on("ruby@2.5.8:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py b/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py index 1d34f4cea17817..28be78bd7cc65c 100644 --- a/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py +++ b/var/spack/repos/builtin/packages/ruby-unicode-display-width/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class RubyUnicodeDisplayWidth(RubyPackage): homepage = "https://github.com/janlelis/unicode-display_width" url = "https://github.com/janlelis/unicode-display_width/archive/v1.7.0.tar.gz" + license("MIT") + version("1.7.0", sha256="2dd6faa95e022a9f52841d29be6c622c58fff9fb0b84fb2cb30d4f0e13fa8a73") depends_on("ruby@1.9.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/ruby-xdg/package.py b/var/spack/repos/builtin/packages/ruby-xdg/package.py index 6e96e482b9aeb5..ead065c8551cf8 100644 --- a/var/spack/repos/builtin/packages/ruby-xdg/package.py +++ b/var/spack/repos/builtin/packages/ruby-xdg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class RubyXdg(RubyPackage): # https://github.com/rubyworks/xdg but I was unable to get it to build # from source + license("Hippocratic-2.1") + version( "2.2.5", sha256="f3a5f799363852695e457bb7379ac6c4e3e8cb3a51ce6b449ab47fbb1523b913", diff --git a/var/spack/repos/builtin/packages/ruby-zentest/package.py b/var/spack/repos/builtin/packages/ruby-zentest/package.py index 8af96ba82d4bb6..0fbaa30af732f5 100644 --- a/var/spack/repos/builtin/packages/ruby-zentest/package.py +++ b/var/spack/repos/builtin/packages/ruby-zentest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index 694c2551e1b372..6c2b491f77d063 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Ruby(AutotoolsPackage, NMakePackage): list_depth = 1 tags = ["windows"] + license("Ruby AND BSD-2-Clause AND MIT", checked_by="tgamblin") + version("3.1.0", sha256="50a0504c6edcb4d61ce6b8cfdbddaa95707195fab0ecd7b5e92654b2a9412854") version("3.0.2", sha256="5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1") version("3.0.1", sha256="369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727") diff --git a/var/spack/repos/builtin/packages/runc/package.py b/var/spack/repos/builtin/packages/runc/package.py index b025ce9a3c8e76..d1088eb20557c3 100644 --- a/var/spack/repos/builtin/packages/runc/package.py +++ b/var/spack/repos/builtin/packages/runc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Runc(MakefilePackage): url = "https://github.com/opencontainers/runc/releases/download/v1.0.2/runc.tar.xz" maintainers("bernhardkaindl") + license("Apache-2.0") + version("1.1.6", sha256="548506fc1de8f0a4790d8e937eeede17db4beb79c53d66acb4f7ec3edbc31668") version("1.1.4", sha256="9f5972715dffb0b2371e4d678c1206cc8c4ec5eb80f2d48755d150bac49be35b") version("1.0.2", sha256="740acb49e33eaf4958b5109c85363c1d3900f242d4cab47fbdbefa6f8f3c6909") diff --git a/var/spack/repos/builtin/packages/rust-bindgen/package.py b/var/spack/repos/builtin/packages/rust-bindgen/package.py index 6f8cc6106cb6c5..b05818412e1b40 100644 --- a/var/spack/repos/builtin/packages/rust-bindgen/package.py +++ b/var/spack/repos/builtin/packages/rust-bindgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class RustBindgen(Package): homepage = "https://www.rust-lang.org" url = "https://github.com/servo/rust-bindgen/archive/v0.20.5.tar.gz" + license("BSD-3-Clause") + version("0.20.5", sha256="4f5236e7979d262c43267afba365612b1008b91b8f81d1efc6a8a2199d52bb37") extends("rust") diff --git a/var/spack/repos/builtin/packages/rust-bootstrap/package.py b/var/spack/repos/builtin/packages/rust-bootstrap/package.py index 337618e20e38f2..b4cd9b1baa6d5d 100644 --- a/var/spack/repos/builtin/packages/rust-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/rust-bootstrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,28 @@ class RustBootstrap(Package): # should update these binary releases as bootstrapping requirements are # modified by new releases of Rust. rust_releases = { + "1.75.0": { + "darwin": { + "x86_64": "ad066e4dec7ae5948c4e7afe68e250c336a5ab3d655570bb119b3eba9cf22851", + "aarch64": "878ecf81e059507dd2ab256f59629a4fb00171035d2a2f5638cb582d999373b1", + }, + "linux": { + "x86_64": "473978b6f8ff216389f9e89315211c6b683cf95a966196e7914b46e8cf0d74f6", + "aarch64": "30828cd904fcfb47f1ac43627c7033c903889ea4aca538f53dcafbb3744a9a73", + "powerpc64le": "2599cdfea5860b4efbceb7bca69845a96ac1c96aa50cf8261151e82280b397a0", + }, + }, + "1.73.0": { + "darwin": { + "x86_64": "ece9646bb153d4bc0f7f1443989de0cbcd8989a7d0bf3b7fb9956e1223954f0c", + "aarch64": "9c96e4c57328fb438ee2d87aa75970ce89b4426b49780ccb3c16af0d7c617cc6", + }, + "linux": { + "x86_64": "aa4cf0b7e66a9f5b7c623d4b340bb1ac2864a5f2c2b981f39f796245dc84f2cb", + "aarch64": "e54d7d886ba413ae573151f668e76ea537f9a44406d3d29598269a4a536d12f6", + "powerpc64le": "8fa215ee3e274fb64364e7084613bc570369488fa22cf5bc8e0fe6dc810fe2b9", + }, + }, "1.70.0": { "darwin": { "x86_64": "e5819fdbfc7f1a4d5d82cb4c3b7662250748450b45a585433bfb75648bc45547", diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index b660697df3653e..47309cadc2490d 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -1,8 +1,9 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os import re from spack.package import * @@ -17,35 +18,13 @@ class Rust(Package): maintainers("alecbcs") - # Core dependencies - depends_on("cmake@3.13.4:", type="build") - depends_on("curl+nghttp2") - depends_on("libgit2") - depends_on("ninja", type="build") - depends_on("openssl") - depends_on("pkgconfig", type="build") - depends_on("python", type="build") - - # Compiling Rust requires a previous version of Rust. - # The easiest way to bootstrap a Rust environment is to - # download the binary distribution of the compiler and build with that. - depends_on("rust-bootstrap", type="build") - - # Pre-release version dependencies - depends_on("rust-bootstrap@beta", type="build", when="@beta") - depends_on("rust-bootstrap@nightly", type="build", when="@master") - depends_on("rust-bootstrap@nightly", type="build", when="@nightly") - - # Stable version dependencies - depends_on("rust-bootstrap@1.59:1.60", type="build", when="@1.60") - depends_on("rust-bootstrap@1.64:1.65", type="build", when="@1.65") - depends_on("rust-bootstrap@1.69:1.70", type="build", when="@1.70") + license("Apache-2.0 OR MIT") # When adding a version of Rust you may need to add an additional version # to rust-bootstrap as the minimum bootstrapping requirements increase. # As a general rule of thumb Rust can be built with either the previous major # version or the current version of the compiler as shown above. - + # # Pre-release versions. # Note: If you plan to use these versions remember to install with # `-n` to prevent Spack from failing due to failed checksums. @@ -57,24 +36,48 @@ class Rust(Package): version("nightly") # Stable versions. + version("1.75.0", sha256="5b739f45bc9d341e2d1c570d65d2375591e22c2d23ef5b8a37711a0386abc088") + version("1.74.0", sha256="882b584bc321c5dcfe77cdaa69f277906b936255ef7808fcd5c7492925cf1049") + version("1.73.0", sha256="96d62e6d1f2d21df7ac8acb3b9882411f9e7c7036173f7f2ede9e1f1f6b1bb3a") version("1.70.0", sha256="b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c") version("1.65.0", sha256="5828bb67f677eabf8c384020582b0ce7af884e1c84389484f7f8d00dd82c0038") version("1.60.0", sha256="20ca826d1cf674daf8e22c4f8c4b9743af07973211c839b85839742314c838b7") variant( - "analysis", + "dev", default=False, - description="Outputs code analysis that can be consumed by other tools", - ) - variant( - "clippy", - default=True, - description="A bunch of lints to catch common mistakes and improve your Rust code.", + description="Include rust developer tools like rustfmt, clippy, and rust-analyzer.", ) - variant("docs", default=False, description="Build Rust documentation.") - variant("rustfmt", default=True, description="Formatting tool for Rust code.") + variant("docs", default=False, description="Build Rust core documentation.") variant("src", default=True, description="Include standard library source files.") + # Core dependencies + depends_on("cmake@3.13.4:", type="build") + depends_on("curl+nghttp2") + depends_on("libgit2") + depends_on("ninja", type="build") + depends_on("openssl") + depends_on("pkgconfig", type="build") + depends_on("python", type="build") + + # Compiling Rust requires a previous version of Rust. + # The easiest way to bootstrap a Rust environment is to + # download the binary distribution of the compiler and build with that. + depends_on("rust-bootstrap", type="build") + + # Pre-release version dependencies + depends_on("rust-bootstrap@beta", type="build", when="@beta") + depends_on("rust-bootstrap@nightly", type="build", when="@master") + depends_on("rust-bootstrap@nightly", type="build", when="@nightly") + + # Stable version dependencies + depends_on("rust-bootstrap@1.59:1.60", type="build", when="@1.60") + depends_on("rust-bootstrap@1.64:1.65", type="build", when="@1.65") + depends_on("rust-bootstrap@1.69:1.70", type="build", when="@1.70") + depends_on("rust-bootstrap@1.72:1.73", type="build", when="@1.73") + depends_on("rust-bootstrap@1.73:1.74", type="build", when="@1.74") + depends_on("rust-bootstrap@1.74:1.75", type="build", when="@1.75") + extendable = True executables = ["^rustc$", "^cargo$"] @@ -86,14 +89,41 @@ def determine_version(csl, exe): match = re.match(r"rustc (\S+)", output) return match.group(1) if match else None + def setup_dependent_package(self, module, dependent_spec): + module.cargo = Executable(os.path.join(self.spec.prefix.bin, "cargo")) + def setup_build_environment(self, env): # Manually inject the path of ar for build. ar = which("ar", required=True) env.set("AR", ar.path) - # Manually inject the path of openssl's certs for build. - certs = join_path(self.spec["openssl"].prefix, "etc/openssl/cert.pem") - env.set("CARGO_HTTP_CAINFO", certs) + # Manually inject the path of openssl's certs for build + # if certs are present on system via Spack or via external + # openssl. + def get_test_path(p): + certs = join_path(p, "cert.pem") + if os.path.exists(certs): + return certs + return None + + # find certs, don't set if no file is found in case + # ca-certificates isn't installed + certs = None + openssl = self.spec["openssl"] + if openssl.external: + try: + output = which("openssl", required=True)("version", "-d", output=str, error=str) + openssl_dir = re.match('OPENSSLDIR: "([^"]+)"', output) + if openssl_dir: + certs = get_test_path(openssl_dir.group(1)) + except ProcessError: + pass + + if certs is None: + certs = get_test_path(join_path(openssl.prefix, "etc/openssl")) + + if certs is not None: + env.set("CARGO_HTTP_CAINFO", certs) def configure(self, spec, prefix): opts = [] @@ -122,23 +152,16 @@ def configure(self, spec, prefix): # Convert opts to '--set key=value' format. flags = [flag for opt in opts for flag in ("--set", opt)] - # Include both cargo and rustdoc in minimal install to match - # standard download of rust. - tools = ["cargo", "rustdoc"] + # Core rust tools to install. + tools = ["cargo"] # Add additional tools as directed by the package variants. - if spec.satisfies("+analysis"): - tools.append("analysis") - - if spec.satisfies("+clippy"): - tools.append("clippy") + if spec.satisfies("+dev"): + tools.extend(["clippy", "rustdoc", "rustfmt", "rust-analyzer"]) if spec.satisfies("+src"): tools.append("src") - if spec.satisfies("+rustfmt"): - tools.append("rustfmt") - # Compile tools into flag for configure. flags.append(f"--tools={','.join(tools)}") diff --git a/var/spack/repos/builtin/packages/sabre/package.py b/var/spack/repos/builtin/packages/sabre/package.py index fea74532d91a80..341e026645c556 100644 --- a/var/spack/repos/builtin/packages/sabre/package.py +++ b/var/spack/repos/builtin/packages/sabre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Sabre(MakefilePackage): homepage = "https://github.com/najoshi/sabre" git = "https://github.com/najoshi/sabre.git" + license("MIT") + version("2013-09-27", commit="039a55e500ba07b7e6432ea6ec2ddcfb3471d949") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/saga-gis/package.py b/var/spack/repos/builtin/packages/saga-gis/package.py index 7eb9a3b0668d22..ed313b19cc1237 100644 --- a/var/spack/repos/builtin/packages/saga-gis/package.py +++ b/var/spack/repos/builtin/packages/saga-gis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): sourceforge_mirror_path = "SAGA%20-%205.0.0/saga-5.0.0.tar.gz" git = "git://git.code.sf.net/p/saga-gis/code" + license("GPL-2.0-or-later") + version("develop", branch="master") version("7.4.0", branch="release-7.4.0") version("7.3.0", branch="release-7.3.0") diff --git a/var/spack/repos/builtin/packages/sailfish/package.py b/var/spack/repos/builtin/packages/sailfish/package.py index d9d13f45bdf833..c6e65a2c00b19e 100644 --- a/var/spack/repos/builtin/packages/sailfish/package.py +++ b/var/spack/repos/builtin/packages/sailfish/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Sailfish(CMakePackage): homepage = "https://www.cs.cmu.edu/~ckingsf/software/sailfish" url = "https://github.com/kingsfordgroup/sailfish/archive/v0.10.1.tar.gz" + license("GPL-3.0-only") + version("0.10.1", sha256="a0d6d944382f2e07ffbfd0371132588e2f22bb846ecfc3d3435ff3d81b30d6c6") depends_on("boost@1.55:") diff --git a/var/spack/repos/builtin/packages/salmon-tddft/package.py b/var/spack/repos/builtin/packages/salmon-tddft/package.py index f8172fb2af6a47..55da0a2cd50151 100644 --- a/var/spack/repos/builtin/packages/salmon-tddft/package.py +++ b/var/spack/repos/builtin/packages/salmon-tddft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class SalmonTddft(CMakePackage): homepage = "https://salmon-tddft.jp" url = "https://salmon-tddft.jp/download/SALMON-v.2.0.0.tar.gz" + license("BSD-3-Clause-Open-MPI") + version("2.0.0", sha256="c3bb80bc5d338cba21cd8f345acbf2f2d81ef75af069a0a0ddbdc0acf358456c") version("1.2.1", sha256="a5045149e49abe9dd9edefe00cd1508a1323081bc3d034632176b728effdbaeb") diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index 332c9885055e23..9b90af0ff01d0f 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Salmon(CMakePackage): url = "https://github.com/COMBINE-lab/salmon/archive/v0.8.2.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("1.10.2", sha256="976989182160fef3afb4429ee8b85d8dd39ed6ca212bb14d6a65cde0e985fb98") version("1.9.0", sha256="450d953a5c43fe63fd745733f478d3fbaf24d926cb52731fd38ee21c4990d613") version("1.4.0", sha256="6d3e25387450710f0aa779a1e9aaa9b4dec842324ff8551d66962d7c7606e71d") diff --git a/var/spack/repos/builtin/packages/salome-configuration/package.py b/var/spack/repos/builtin/packages/salome-configuration/package.py index aeb4551012eef1..13f15926ac27dc 100644 --- a/var/spack/repos/builtin/packages/salome-configuration/package.py +++ b/var/spack/repos/builtin/packages/salome-configuration/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/salome-med/package.py b/var/spack/repos/builtin/packages/salome-med/package.py index 4173d572c4c607..19c0eca618b8e3 100644 --- a/var/spack/repos/builtin/packages/salome-med/package.py +++ b/var/spack/repos/builtin/packages/salome-med/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class SalomeMed(CMakePackage): homepage = "https://docs.salome-platform.org/latest/dev/MEDCoupling/developer/med-file.html" url = "ftp://ftp.cea.fr/pub/salome/prerequisites/med-4.1.0.tar.gz" + license("LGPL-3.0-only") + version("4.1.0", sha256="847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce") version("4.0.0", sha256="a474e90b5882ce69c5e9f66f6359c53b8b73eb448c5f631fa96e8cd2c14df004") version("3.3.1", sha256="856e9c4bb75eb0cceac3d5a5c65b1ce52fb3c46b9182920e1c9f34ae69bd2d5f") diff --git a/var/spack/repos/builtin/packages/salome-medcoupling/package.py b/var/spack/repos/builtin/packages/salome-medcoupling/package.py index dd0f7dee38b45f..629141d67279dd 100644 --- a/var/spack/repos/builtin/packages/salome-medcoupling/package.py +++ b/var/spack/repos/builtin/packages/salome-medcoupling/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class SalomeMedcoupling(CMakePackage): homepage = "https://docs.salome-platform.org/latest/dev/MEDCoupling/developer/index.html" git = "https://git.salome-platform.org/gitpub/tools/medcoupling.git" + license("LGPL-2.1-or-later") + version("9.7.0", tag="V9_7_0", commit="773434a7f2a5cbacc2f50e93ea6d6a48a157acd9") version("9.6.0", tag="V9_6_0", commit="2c14a65b40252770b3503945405f5bdb2f29f8e2") version("9.5.0", tag="V9_5_0", commit="dd75474d950baf8ff862b03cb1685f2a2d562846") diff --git a/var/spack/repos/builtin/packages/sam2p/package.py b/var/spack/repos/builtin/packages/sam2p/package.py index 3fca39dad28573..7b90b5b59da6ea 100644 --- a/var/spack/repos/builtin/packages/sam2p/package.py +++ b/var/spack/repos/builtin/packages/sam2p/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sam2p(Package): maintainers("robertu94") + license("GPL-2.0-or-later") + version("master", branch="master") version("2021-05-04", commit="f3e9cc0a2df1880a63f9f37c96e3595bca890cfa") diff --git a/var/spack/repos/builtin/packages/sambamba/package.py b/var/spack/repos/builtin/packages/sambamba/package.py index 7f70d58f17fcc2..c8600dc279c419 100644 --- a/var/spack/repos/builtin/packages/sambamba/package.py +++ b/var/spack/repos/builtin/packages/sambamba/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sambamba(Package): homepage = "https://lomereiter.github.io/sambamba/" git = "https://github.com/lomereiter/sambamba.git" + license("GPL-2.0-only") + version( "0.6.6", tag="v0.6.6", commit="63cfd5c7b3053e1f7045dec0b5a569f32ef73d06", submodules=True ) diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py index de5d86ac8df8ed..9191ab9ae0800a 100644 --- a/var/spack/repos/builtin/packages/samblaster/package.py +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Samblaster(MakefilePackage): homepage = "https://github.com/GregoryFaust/samblaster" url = "https://github.com/GregoryFaust/samblaster/archive/v.0.1.24.tar.gz" + license("MIT") + version("0.1.24", sha256="72c42e0a346166ba00152417c82179bd5139636fea859babb06ca855af93d11f") version("0.1.23", sha256="0d35ce629771946e3d6fc199025747054e5512bffa1ba4446ed81160fffee57a") diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index 58e0df44ec2747..2495476b13308b 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/samtools/package.py b/var/spack/repos/builtin/packages/samtools/package.py index d71ab637a954eb..2561b563ad387e 100644 --- a/var/spack/repos/builtin/packages/samtools/package.py +++ b/var/spack/repos/builtin/packages/samtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,9 +11,15 @@ class Samtools(Package): the SAM format, including sorting, merging, indexing and generating alignments in a per-position format""" + maintainers("jbeal-work") + homepage = "https://www.htslib.org" url = "https://github.com/samtools/samtools/releases/download/1.13/samtools-1.13.tar.bz2" + license("MIT") + + version("1.19", sha256="fa6b3b18e20851b6f3cb55afaf3205d02fcb79dae3b849fcf52e8fc10ff08b83") + version("1.18", sha256="d686ffa621023ba61822a2a50b70e85d0b18e79371de5adb07828519d3fc06e1") version("1.17", sha256="3adf390b628219fd6408f14602a4c4aa90e63e18b395dad722ab519438a2a729") version("1.16.1", sha256="2fa0a25f78594cf23d07c9d32d5060a14f1c5ee14d7b0af7a8a71abc9fdf1d07") version("1.15.1", sha256="708c525ac76b0532b25f14aadea34a4d11df667bc19bf0a74dae617d80526c6e") @@ -43,6 +49,8 @@ class Samtools(Package): depends_on("python", type="run") # htslib became standalone @1.3.1, must use corresponding version + depends_on("htslib@1.19", when="@1.19") + depends_on("htslib@1.18", when="@1.18") depends_on("htslib@1.17", when="@1.17") depends_on("htslib@1.16", when="@1.16.1") depends_on("htslib@1.15.1", when="@1.15.1") diff --git a/var/spack/repos/builtin/packages/sandbox/package.py b/var/spack/repos/builtin/packages/sandbox/package.py index 7cded530aebdc9..2bd88f2295158a 100644 --- a/var/spack/repos/builtin/packages/sandbox/package.py +++ b/var/spack/repos/builtin/packages/sandbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sandbox(AutotoolsPackage): homepage = "https://www.gentoo.org/proj/en/portage/sandbox/" url = "https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz" + license("GPL-2.0-or-later") + version("2.25", sha256="24055986a1ed9b933da608e41e3284ee53c5a724f3c2457009f8e09e9c581ca8") version("2.12", sha256="265a490a8c528237c55ad26dfd7f62336fa5727c82358fc9cfbaa2e52c47fc50") diff --git a/var/spack/repos/builtin/packages/sartre/package.py b/var/spack/repos/builtin/packages/sartre/package.py index 638e9f12bbe86c..e22e69092008be 100644 --- a/var/spack/repos/builtin/packages/sartre/package.py +++ b/var/spack/repos/builtin/packages/sartre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Sartre(CMakePackage): maintainers("wdconinc") + license("GPL-3.0-or-later") + version("1.39", sha256="82ed77243bea61bb9335f705c4b132f0b53d0de17c26b89389fa9cd3adcef44d") parallel = False diff --git a/var/spack/repos/builtin/packages/sarus/package.py b/var/spack/repos/builtin/packages/sarus/package.py index 737cc1ccbedb0d..8fe36fdef9d11a 100644 --- a/var/spack/repos/builtin/packages/sarus/package.py +++ b/var/spack/repos/builtin/packages/sarus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Sarus(CMakePackage): git = "https://github.com/eth-cscs/sarus.git" maintainers("Madeeks", "taliaga", "teonnik") + license("BSD-3-Clause") + version("develop", branch="develop") version("master", branch="master") version("1.4.1", commit="a73f6ca9cafb768f3132cfcef8c826af34eeff94") diff --git a/var/spack/repos/builtin/packages/satsuma2/package.py b/var/spack/repos/builtin/packages/satsuma2/package.py index 1103dd79cb7835..3dfa800cf08ae2 100644 --- a/var/spack/repos/builtin/packages/satsuma2/package.py +++ b/var/spack/repos/builtin/packages/satsuma2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/savanna/package.py b/var/spack/repos/builtin/packages/savanna/package.py index 0d976b710e50cb..6daf3e48241d7a 100644 --- a/var/spack/repos/builtin/packages/savanna/package.py +++ b/var/spack/repos/builtin/packages/savanna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/saws/package.py b/var/spack/repos/builtin/packages/saws/package.py index e843afbda42bcc..55514d4b02dd6f 100644 --- a/var/spack/repos/builtin/packages/saws/package.py +++ b/var/spack/repos/builtin/packages/saws/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sblim-sfcc/package.py b/var/spack/repos/builtin/packages/sblim-sfcc/package.py index 1e14b7a36188b5..f3e70b5fc8d46f 100644 --- a/var/spack/repos/builtin/packages/sblim-sfcc/package.py +++ b/var/spack/repos/builtin/packages/sblim-sfcc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class SblimSfcc(AutotoolsPackage): homepage = "https://sourceforge.net/projects/sblim" url = "https://github.com/kkaempf/sblim-sfcc/archive/SFCC_2_2_1.tar.gz" + license("EPL-1.0") + version("2_2_8", sha256="d8d0bf06a487483df507f512ddf0c7b2c1b878a1c9b039bf5c2357c4ba13b882") version("2_2_7", sha256="bb85bc75efd112411eb76e83a38413a33b3fb8b6b725c8d08fe326efcbea427f") version("2_2_6", sha256="65a8b70047c449f8b60e519ec1a47aa50b6476d3876a698e8484467650e9ee78") diff --git a/var/spack/repos/builtin/packages/sbml/package.py b/var/spack/repos/builtin/packages/sbml/package.py index d5e25c8e9b1ba2..d30d2ee6b487b5 100644 --- a/var/spack/repos/builtin/packages/sbml/package.py +++ b/var/spack/repos/builtin/packages/sbml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sbml(CMakePackage): homepage = "https://sbml.org" maintainers("rblake-llnl") + license("LGPL-2.1-or-later") + version("5.18.0", sha256="6c01be2306ec0c9656b59cb082eb7b90176c39506dd0f912b02e08298a553360") version("5.17.0", sha256="189216e1472777e4464b791c506b79267d07a5454cb23ac991452711f8e0ed3a") version("5.16.0", sha256="c6855481434dd2a667fef73e1ff2feade509aa2f3a76d4d06e29022975ce1496") diff --git a/var/spack/repos/builtin/packages/sbp/package.py b/var/spack/repos/builtin/packages/sbp/package.py index de9d126a9ed31c..22cc6128837b48 100644 --- a/var/spack/repos/builtin/packages/sbp/package.py +++ b/var/spack/repos/builtin/packages/sbp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sbp(CMakePackage): maintainers("jayvdb") + license("MIT") + version( "3.4.10", tag="v3.4.10", commit="d8ec454a3d7f1b2f8b8f515934612c184b8d5fa3", submodules=True ) diff --git a/var/spack/repos/builtin/packages/sbt/package.py b/var/spack/repos/builtin/packages/sbt/package.py index 143a88da5ecc11..2f34e6da376e06 100644 --- a/var/spack/repos/builtin/packages/sbt/package.py +++ b/var/spack/repos/builtin/packages/sbt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sbt(Package): homepage = "https://www.scala-sbt.org" url = "https://github.com/sbt/sbt/releases/download/v1.1.4/sbt-1.1.4.tgz" + license("Apache-2.0") + version("1.8.3", sha256="21f4210786fd68fd15dca3f4c8ee9cae0db249c54e1b0ef6e829e9fa4936423a") version("1.1.6", sha256="f545b530884e3abbca026df08df33d5a15892e6d98da5b8c2297413d1c7b68c1") version("1.1.5", sha256="8303d7496bc70eb441e8136bd29ffc295c629dadecefa4e7a475176ab4d282d5") diff --git a/var/spack/repos/builtin/packages/scafacos/package.py b/var/spack/repos/builtin/packages/scafacos/package.py new file mode 100644 index 00000000000000..dcad460838fd41 --- /dev/null +++ b/var/spack/repos/builtin/packages/scafacos/package.py @@ -0,0 +1,40 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Scafacos(AutotoolsPackage): + """ScaFaCoS is a library of scalable fast coulomb solvers.""" + + homepage = "http://www.scafacos.de/" + url = "https://github.com/scafacos/scafacos/releases/download/v1.0.4/scafacos-1.0.4.tar.gz" + + maintainers("hmenke") + + license("GPL-3.0-or-later OR LGPL-3.0-or-later") + + version("1.0.4", sha256="6634c4202e825e771d1dd75bbe9cac5cee41136c87653fde98fbd634681c1be6") + version("1.0.3", sha256="d3579f4cddb10a562722c190c2452ebc455592d44f6dbde8f155849ba6e2b3d0") + version("1.0.2", sha256="158078665e48e28fd12b7895063db056cee5d135423fc36802e39c9160102b97") + version("1.0.1", sha256="2b125f313795c81b0e87eb920082e91addf94c17444f9486d979e691aaded99b") + version("1.0.0", sha256="cc5762edbecfec0323126b6a6a535dcc3e134fcfef4b00f63eb05fae15244a96") + + depends_on("fftw") + depends_on("file") + depends_on("gmp") + depends_on("gsl") + depends_on("mpi") + depends_on("pfft") + depends_on("pnfft") + + def configure_args(self): + args = [ + "--disable-doc", + "--enable-fcs-solvers=direct,ewald,fmm,p3m", + "FC={0}".format(self.spec["mpi"].mpifc), + "F77={0}".format(self.spec["mpi"].mpif77), + ] + return args diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py index 41e14b24ef3ef6..4bb3cce92e117c 100644 --- a/var/spack/repos/builtin/packages/scala/package.py +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Scala(Package): homepage = "https://www.scala-lang.org/" url = "https://downloads.lightbend.com/scala/2.12.1/scala-2.12.1.tgz" + license("Apache-2.0") + version("2.13.1", sha256="6918ccc494e34810a7254ad2c4e6f0e1183784c22e7b4801b7dbc8d1994a04db") version("2.12.10", sha256="3b12bda3300fedd91f64fc7f9165fd45c58328b1b760af24ca6ffe92e3b0656a") version("2.12.6", sha256="1ac7444c5a85ed1ea45db4a268ee9ea43adf80e7f5724222863afb5492883416") diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index 1c611be1b2b66a..35e34fef5dec63 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scale/package.py b/var/spack/repos/builtin/packages/scale/package.py index 7ebeb1de0dde5d..d8ef261220564d 100644 --- a/var/spack/repos/builtin/packages/scale/package.py +++ b/var/spack/repos/builtin/packages/scale/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Scale(MakefilePackage): maintainers("t-yamaura") + license("BSD-2-Clause") + version( "5.4.4", sha256="7d0ec4069c15d8b9ec7166f32c9a2eda772d975a8e08e420e6b16891ceebb316", diff --git a/var/spack/repos/builtin/packages/scallop/package.py b/var/spack/repos/builtin/packages/scallop/package.py index 79015ee74afaf1..e3150343e95aaa 100644 --- a/var/spack/repos/builtin/packages/scallop/package.py +++ b/var/spack/repos/builtin/packages/scallop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class Scallop(AutotoolsPackage): homepage = "https://github.com/Kingsford-Group/scallop" url = "https://github.com/Kingsford-Group/scallop/releases/download/v0.10.5/scallop-0.10.5.tar.gz" + license("BSD-3-Clause") + version("0.10.5", sha256="b09e3c61f1b3b1da2a96d9d8429d80326a3bb14f5fe6af9b5e87570d4b86937a") version("0.10.3", sha256="04eb3ab27ed8c7ae38e1780d6b2af16b6a2c01807ffafd59e819d33bfeff58a0") diff --git a/var/spack/repos/builtin/packages/scalpel/package.py b/var/spack/repos/builtin/packages/scalpel/package.py index acbf58ee8e284b..85e1ff2ee61ab3 100644 --- a/var/spack/repos/builtin/packages/scalpel/package.py +++ b/var/spack/repos/builtin/packages/scalpel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Scalpel(MakefilePackage, SourceforgePackage): homepage = "http://scalpel.sourceforge.net/index.html" sourceforge_mirror_path = "scalpel/scalpel-0.5.4.tar.gz" + license("MIT") + version("0.5.4", sha256="506f731b3886def158c15fd8b74fa98390f304a507d2040972e6b09ddefac8f0") version("0.5.3", sha256="d45b569fe3aa5934883bc7216c243d53168351c23e020d96a46fa77a1563b65e") diff --git a/var/spack/repos/builtin/packages/scan-for-matches/package.py b/var/spack/repos/builtin/packages/scan-for-matches/package.py index 31862b27b24d71..6df17616b8be0d 100644 --- a/var/spack/repos/builtin/packages/scan-for-matches/package.py +++ b/var/spack/repos/builtin/packages/scan-for-matches/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scantailor/package.py b/var/spack/repos/builtin/packages/scantailor/package.py index 3ffb13c790ebc5..7618e5bfd0aea1 100644 --- a/var/spack/repos/builtin/packages/scantailor/package.py +++ b/var/spack/repos/builtin/packages/scantailor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scc/package.py b/var/spack/repos/builtin/packages/scc/package.py new file mode 100644 index 00000000000000..c6d70053b38900 --- /dev/null +++ b/var/spack/repos/builtin/packages/scc/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class Scc(GoPackage): + """ + Sloc, Cloc and Code: scc is a very fast accurate code counter with + complexity calculations and COCOMO estimates written in pure Go. + """ + + homepage = "https://github.com/boyter/scc" + url = "https://github.com/boyter/scc/archive/refs/tags/v3.1.0.tar.gz" + git = "https://github.com/boyter/scc.git" + + license("MIT") + + version("3.1.0", sha256="bffea99c7f178bc48bfba3c64397d53a20a751dfc78221d347aabdce3422fd20") diff --git a/var/spack/repos/builtin/packages/scine-core/package.py b/var/spack/repos/builtin/packages/scine-core/package.py index d11dd987926443..b006e324f873d8 100644 --- a/var/spack/repos/builtin/packages/scine-core/package.py +++ b/var/spack/repos/builtin/packages/scine-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineCore(CMakePackage): url = "https://github.com/qcscine/core/archive/refs/tags/4.0.2.tar.gz" git = "https://github.com/qcscine/core.git" + license("BSD-3-Clause") + version("master", branch="master") version("4.0.2", sha256="7181c6f93d71def22f1e0e5767afc7587c04b49abc03516f6926394868e7adc6") diff --git a/var/spack/repos/builtin/packages/scine-database/package.py b/var/spack/repos/builtin/packages/scine-database/package.py index 8d1449fbdf9a90..7efd86781b0ac6 100644 --- a/var/spack/repos/builtin/packages/scine-database/package.py +++ b/var/spack/repos/builtin/packages/scine-database/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineDatabase(CMakePackage): url = "https://github.com/qcscine/database/archive/refs/tags/1.1.0.tar.gz" git = "https://github.com/qcscine/database.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.1.0", sha256="a9144631dfb90e06f6924cf58fc5db13719cf8577fcd3bbf788a135060a70c18") @@ -49,11 +51,8 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define("SCINE_BUILD_PYTHON_BINDINGS", "+python" in self.spec), self.define("SCINE_MARCH", ""), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/scine-molassembler/package.py b/var/spack/repos/builtin/packages/scine-molassembler/package.py index 61e549fe5483ac..6c1bc8766376d4 100644 --- a/var/spack/repos/builtin/packages/scine-molassembler/package.py +++ b/var/spack/repos/builtin/packages/scine-molassembler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineMolassembler(CMakePackage): url = "https://github.com/qcscine/molassembler/archive/refs/tags/1.2.1.tar.gz" git = "https://github.com/qcscine/molassembler.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.2.1", sha256="c9fea41d383b7f54cf8a3ed4dabebe9e942fe3ef5b47895e3533e8ce42dacd38") @@ -82,7 +84,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("BUILD_SHARED_LIBS", True), self.define("SCINE_BUILD_TESTS", self.run_tests), self.define("SCINE_BUILD_PYTHON_BINDINGS", "+python" in self.spec), @@ -93,6 +95,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/scine-qcmaquis/package.py b/var/spack/repos/builtin/packages/scine-qcmaquis/package.py index 0f076227abf64e..8bf3c206761bd3 100644 --- a/var/spack/repos/builtin/packages/scine-qcmaquis/package.py +++ b/var/spack/repos/builtin/packages/scine-qcmaquis/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scine-readuct/package.py b/var/spack/repos/builtin/packages/scine-readuct/package.py index 369cdb546f4e31..f00bc645e48bd6 100644 --- a/var/spack/repos/builtin/packages/scine-readuct/package.py +++ b/var/spack/repos/builtin/packages/scine-readuct/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class ScineReaduct(CMakePackage): homepage = "https://scine.ethz.ch/download/readuct" url = "https://github.com/qcscine/readuct/archive/refs/tags/4.1.0.tar.gz" + license("BSD-3-Clause") + version("4.1.0", sha256="9cec0192a444403d6a8fd096509798c49fbd1eec298ec7194aba915e31f50782") resource( @@ -52,7 +54,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define("SCINE_BUILD_PYTHON_BINDINGS", "+python" in self.spec), self.define("SCINE_MARCH", ""), @@ -62,6 +64,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/scine-serenity/package.py b/var/spack/repos/builtin/packages/scine-serenity/package.py index 5e1dc57dc346ea..7dd6d8dd396fbe 100644 --- a/var/spack/repos/builtin/packages/scine-serenity/package.py +++ b/var/spack/repos/builtin/packages/scine-serenity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineSerenity(CMakePackage): url = "https://github.com/qcscine/serenity_wrapper/archive/refs/tags/1.0.1.tar.gz" git = "https://github.com/qcscine/serenity_wrapper" + license("BSD-3-Clause") + version("master", branch="master") version("1.0.1", sha256="e2e5cc265a68ccab05f1bc934b957ca07c4f1c6004e662684023da451da69299") @@ -55,7 +57,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define_from_variant("SCINE_BUILD_PYTHON_BINDINGS", "python"), self.define("SCINE_MARCH", ""), @@ -67,6 +69,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/scine-sparrow/package.py b/var/spack/repos/builtin/packages/scine-sparrow/package.py index eeec265e28ba26..44d1ccf84a8f44 100644 --- a/var/spack/repos/builtin/packages/scine-sparrow/package.py +++ b/var/spack/repos/builtin/packages/scine-sparrow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class ScineSparrow(CMakePackage): maintainers("frobnitzem") + license("BSD-3-Clause") + version("master", branch="master") version("3.1.0", sha256="91412de0f2670a1735c4ca76406db5bea04236eeac0bc1f93ccfe18104aa7ce4") version("3.0.0", sha256="70636871694c9363ae3fb2df5050bddb22667b71d875d5a7e9afd872f6a2b65d") @@ -74,7 +76,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define("SCINE_BUILD_PYTHON_BINDINGS", "+python" in self.spec), self.define("SCINE_MARCH", ""), @@ -84,9 +86,6 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args # Adapted from ddd in MacPorts: cmake will build the executable # "sparrow" right next to the copy of the source directory "Sparrow". diff --git a/var/spack/repos/builtin/packages/scine-utilities/package.py b/var/spack/repos/builtin/packages/scine-utilities/package.py index 93da28a8cfbf7d..3dcf0fb2a9e112 100644 --- a/var/spack/repos/builtin/packages/scine-utilities/package.py +++ b/var/spack/repos/builtin/packages/scine-utilities/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineUtilities(CMakePackage): url = "https://github.com/qcscine/utilities/archive/refs/tags/6.0.0.tar.gz" git = "https://github.com/qcscine/utilities.git" + license("BSD-3-Clause") + version("master", branch="master") version("6.0.0", sha256="e4387d5562b7442a8e31e4dfc028bacfeb6d12e39f2d8aa6effc6db380863b4a") version("5.0.0", sha256="a304c89d9a196fe304f38610dea6b066d74590c0d434e4bd09a9796340700465") @@ -65,7 +67,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define_from_variant("SCINE_BUILD_PYTHON_BINDINGS", "python"), self.define("SCINE_MARCH", ""), @@ -75,7 +77,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - - return args diff --git a/var/spack/repos/builtin/packages/scine-xtb/package.py b/var/spack/repos/builtin/packages/scine-xtb/package.py index b3184750ac372a..9cd7dca1827763 100644 --- a/var/spack/repos/builtin/packages/scine-xtb/package.py +++ b/var/spack/repos/builtin/packages/scine-xtb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScineXtb(CMakePackage): url = "https://github.com/qcscine/xtb_wrapper/archive/refs/tags/1.0.2.tar.gz" git = "https://github.com/qcscine/xtb_wrapper.git" + license("BSD-3-Clause") + version("master", branch="master") version("1.0.2", sha256="9beb1103467f3cfd9ad33beb2f3ec650bc3e6dc7094876774be3cc4e6f210487") @@ -50,7 +52,7 @@ def patch(self): os.rename("_dev", "dev") def cmake_args(self): - args = [ + return [ self.define("SCINE_BUILD_TESTS", self.run_tests), self.define("SCINE_BUILD_PYTHON_BINDINGS", "+python" in self.spec), self.define("SCINE_MARCH", ""), @@ -60,6 +62,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/scipoptsuite/package.py b/var/spack/repos/builtin/packages/scipoptsuite/package.py index bc0f42f024f915..441c87fd2666a3 100644 --- a/var/spack/repos/builtin/packages/scipoptsuite/package.py +++ b/var/spack/repos/builtin/packages/scipoptsuite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scitokens-cpp/package.py b/var/spack/repos/builtin/packages/scitokens-cpp/package.py index 5bfd4bcc3a0b66..c52e8500981f40 100644 --- a/var/spack/repos/builtin/packages/scitokens-cpp/package.py +++ b/var/spack/repos/builtin/packages/scitokens-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class ScitokensCpp(CMakePackage): maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb") + license("Apache-2.0") + version("1.0.1", sha256="d4660521fa17189e7a7858747d066052dd8ea8f430ce7649911c157d4423c412") version("1.0.0", sha256="88376c5cd065aac8d92445184a02ccf5186dc4890ccd7518e88be436978675c0") version("0.7.3", sha256="7d3c438596588cd74cf1af8255c55f44ca86a34293b81415ee24b33de64f886a") diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 933e5e1becfc4c..77cd015bea0962 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Scons(PythonPackage): tags = ["build-tools", "windows"] + license("MIT") + version("4.5.2", sha256="813360b2bce476bc9cc12a0f3a22d46ce520796b352557202cb07d3e402f5458") version("4.5.1", sha256="9daeabe4d87ba2bd4ea15410765fc1ed2d931b723e4dc730a487a3911b9a1738") version("4.4.0", sha256="7703c4e9d2200b4854a31800c1dbd4587e1fa86e75f58795c740bcfa7eca7eaa") diff --git a/var/spack/repos/builtin/packages/scorec-core/package.py b/var/spack/repos/builtin/packages/scorec-core/package.py index d393a2ba651b0a..b5f4c35efb440d 100644 --- a/var/spack/repos/builtin/packages/scorec-core/package.py +++ b/var/spack/repos/builtin/packages/scorec-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class ScorecCore(CMakePackage): homepage = "https://www.scorec.rpi.edu/" git = "https://github.com/SCOREC/core.git" + license("BSD-3-Clause") + version("develop") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 316173a73e297d..30d36e19f357b3 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scorpio/package.py b/var/spack/repos/builtin/packages/scorpio/package.py index 7eca9b539077e3..360e54dc06dcc7 100644 --- a/var/spack/repos/builtin/packages/scorpio/package.py +++ b/var/spack/repos/builtin/packages/scorpio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Scorpio(CMakePackage): maintainers("pbrady", "zjibben") + license("LGPL-3.0-only") + version("develop", branch="truchas") version("2021-12-10", commit="b802f16877a6562ccdbeca8887910d3bd3e25cbb", preferred=True) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index 5906d77ab96a9b..52375286175bd2 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index 2048d1b57d1541..a047fa522a2cc8 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/screen/package.py b/var/spack/repos/builtin/packages/screen/package.py index 0f9002df7d5f45..d4c4dc5ecf3213 100644 --- a/var/spack/repos/builtin/packages/screen/package.py +++ b/var/spack/repos/builtin/packages/screen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Screen(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/screen/" gnu_mirror_path = "screen/screen-4.3.1.tar.gz" + license("GPL-3.0-or-later") + version("4.9.1", sha256="26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69") version("4.9.0", sha256="f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4") version("4.8.0", sha256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1") diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py index 6fe86f5ff8ccfe..d7e3b34c3d2a2f 100644 --- a/var/spack/repos/builtin/packages/scripts/package.py +++ b/var/spack/repos/builtin/packages/scripts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py index 4e4284e3c32dd9..3a256eb81bb18d 100644 --- a/var/spack/repos/builtin/packages/scrnsaverproto/package.py +++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Scrnsaverproto(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/scrnsaverproto" xorg_mirror_path = "proto/scrnsaverproto-1.2.2.tar.gz" + license("X11") + version("1.2.2", sha256="d8dee19c52977f65af08fad6aa237bacee11bc5a33e1b9b064e8ac1fd99d6e79") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/scrot/package.py b/var/spack/repos/builtin/packages/scrot/package.py index 4e39799d8ab60b..0aeb0ba2a06123 100644 --- a/var/spack/repos/builtin/packages/scrot/package.py +++ b/var/spack/repos/builtin/packages/scrot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Scrot(AutotoolsPackage): homepage = "https://github.com/resurrecting-open-source-projects/scrot" url = "https://github.com/resurrecting-open-source-projects/scrot/releases/download/1.5/scrot-1.5.tar.gz" + license("MIT") + version("1.6", sha256="42f64d38f04ec530c8b4ebdae04cce8b6893b2f8d30627391d390edcba917090") version("1.5", sha256="42fcf1c97940f4b4e34ca69990a0fc9b98991357bd6a4b67f30ebe0ccc10f093") diff --git a/var/spack/repos/builtin/packages/scs/package.py b/var/spack/repos/builtin/packages/scs/package.py index 0641bacc8db0bb..cdb33aa6fbcb34 100644 --- a/var/spack/repos/builtin/packages/scs/package.py +++ b/var/spack/repos/builtin/packages/scs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Scs(MakefilePackage): homepage = "https://github.com/cvxgrp/scs" url = "https://github.com/cvxgrp/scs/archive/2.1.1.tar.gz" + license("MIT") + version("2.1.1", sha256="0e20b91e8caf744b84aa985ba4e98cc7235ee33612b2bad2bf31ea5ad4e07d93") variant("cuda", default=False, description="Build with Cuda support") diff --git a/var/spack/repos/builtin/packages/sctk/package.py b/var/spack/repos/builtin/packages/sctk/package.py index b79e716f8176d7..b0c6ff307430d1 100644 --- a/var/spack/repos/builtin/packages/sctk/package.py +++ b/var/spack/repos/builtin/packages/sctk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sdl2-image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py index 35ebcc8e3767be..4e94341aec863a 100644 --- a/var/spack/repos/builtin/packages/sdl2-image/package.py +++ b/var/spack/repos/builtin/packages/sdl2-image/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Sdl2Image(AutotoolsPackage): homepage = "http://sdl.beuc.net/sdl.wiki/SDL_image" url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz" + license("Zlib") + version("2.6.3", sha256="931c9be5bf1d7c8fae9b7dc157828b7eee874e23c7f24b44ba7eff6b4836312c") version("2.0.1", sha256="3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64") diff --git a/var/spack/repos/builtin/packages/sdl2-ttf/package.py b/var/spack/repos/builtin/packages/sdl2-ttf/package.py index a1632aa4afb3e3..9bc5c7a69ba861 100644 --- a/var/spack/repos/builtin/packages/sdl2-ttf/package.py +++ b/var/spack/repos/builtin/packages/sdl2-ttf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Sdl2Ttf(CMakePackage): url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.20.2.tar.gz" git = "https://github.com/libsdl-org/SDL_ttf.git" + license("Zlib") + version("2.20.2", sha256="9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053") depends_on("sdl2") diff --git a/var/spack/repos/builtin/packages/sdl2/package.py b/var/spack/repos/builtin/packages/sdl2/package.py index 763117dbcea324..d8c598de9fa368 100644 --- a/var/spack/repos/builtin/packages/sdl2/package.py +++ b/var/spack/repos/builtin/packages/sdl2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Sdl2(CMakePackage): git = "https://github.com/libsdl-org/SDL.git" list_url = "https://github.com/libsdl-org/SDL.git" + license("Zlib") + version("2.26.5", sha256="ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7") version("2.24.1", sha256="bc121588b1105065598ce38078026a414c28ea95e66ed2adab4c44d80b309e1b") version("2.0.22", sha256="fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e") diff --git a/var/spack/repos/builtin/packages/sdsl-lite/package.py b/var/spack/repos/builtin/packages/sdsl-lite/package.py index a1a53314a056aa..928f3ca12c8500 100644 --- a/var/spack/repos/builtin/packages/sdsl-lite/package.py +++ b/var/spack/repos/builtin/packages/sdsl-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py index 44b4b6a6034cce..13726f1607dc2e 100644 --- a/var/spack/repos/builtin/packages/seacas/package.py +++ b/var/spack/repos/builtin/packages/seacas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,10 +29,17 @@ class Seacas(CMakePackage): url = "https://github.com/sandialabs/seacas/archive/v2019-08-20.tar.gz" maintainers("gsjaardema") + license("Intel") + # ###################### Versions ########################## version("master", branch="master") version( - "2023-10-24", sha256="f93bf0327329c302ed3feb6adf2e3968f01ec325084a457b2c2dbbf6c4f751a2" + "2023-11-27", sha256="fea1c0a6959d46af7478c9c16aac64e76c6dc358da38e2fe8793c15c1cffa8fc" + ) + version( + "2023-10-24", + sha256="f93bf0327329c302ed3feb6adf2e3968f01ec325084a457b2c2dbbf6c4f751a2", + deprecated=True, ) version( "2023-05-30", sha256="3dd982841854466820a3902163ad1cf1b3fbab65ed7542456d328f2d1a5373c1" diff --git a/var/spack/repos/builtin/packages/seal/package.py b/var/spack/repos/builtin/packages/seal/package.py index 2a97e4995c9009..a101a276234152 100644 --- a/var/spack/repos/builtin/packages/seal/package.py +++ b/var/spack/repos/builtin/packages/seal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Seal(CMakePackage): maintainers("wohlbier") + license("MIT") + version("4.1.1", sha256="af9bf0f0daccda2a8b7f344f13a5692e0ee6a45fea88478b2b90c35648bf2672") version("3.7.1", sha256="6737177bfb582cc1a2863ef1e96cc6c39b119257e7192981a3190eb79e0fcfd3") version("3.7.0", sha256="06ea835d6c9cdbbc4edb72a8db4bd4b1115995f075774043b9f31938d0624543") diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py index 3cc60384d76295..ee9e868a7065d8 100644 --- a/var/spack/repos/builtin/packages/sed/package.py +++ b/var/spack/repos/builtin/packages/sed/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sed(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/sed/" gnu_mirror_path = "sed/sed-4.8.tar.xz" + license("GPL-3.0-or-later") + version("4.9", sha256="6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181") version("4.8", sha256="f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633") version("4.2.2", sha256="f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7") @@ -23,6 +25,8 @@ class Sed(AutotoolsPackage, GNUMirrorPackage): executables = ["^sed$"] + tags = ["build-tools"] + def url_for_version(self, version): if Version("4.2") <= version < Version("4.3.0"): self.gnu_mirror_path = "sed/sed-{0}.tar.bz2".format(version) diff --git a/var/spack/repos/builtin/packages/selalib/package.py b/var/spack/repos/builtin/packages/selalib/package.py index d36a4d20538ca3..0486604567f5aa 100644 --- a/var/spack/repos/builtin/packages/selalib/package.py +++ b/var/spack/repos/builtin/packages/selalib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/semiprof/package.py b/var/spack/repos/builtin/packages/semiprof/package.py index d934da0fbb70d0..d26b4248c798af 100644 --- a/var/spack/repos/builtin/packages/semiprof/package.py +++ b/var/spack/repos/builtin/packages/semiprof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Semiprof(CMakePackage): variant("examples", default=False, description="Enable examples") variant("shared", default=True, description="Build shared libraries") + license("BSD-3-Clause") + version("0.1", sha256="4fb3823c65a4f5dfbe05e8cbe1911dfd25cd7740597f82c7b3a84472de26f0dc") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/sensei/package.py b/var/spack/repos/builtin/packages/sensei/package.py index 6e4e0bf6741c9e..96e4dd4393c6ed 100644 --- a/var/spack/repos/builtin/packages/sensei/package.py +++ b/var/spack/repos/builtin/packages/sensei/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,10 @@ class Sensei(CMakePackage): git = "https://github.com/SENSEI-insitu/SENSEI.git" maintainers("sshudler", "kwryankrattiger") + license("BSD-3-Clause-LBNL") + version("develop", branch="develop") + version("5.0.0", sha256="3ef948d753d37dfddbbc2c993c823487d4ce40543d35abc008e90c75dfbfa16e") version("4.1.0", sha256="e1154240c022069fee454c747d7c60e065d36b4d1dc71852b3cd527c22b531c1") version("4.0.0", sha256="fc1538aa1051789dbdefbe18b7f251bc46e7a6ae1db3a940c123552e0318db8b") version("3.2.2", sha256="d554b654880e899d97d572f02de87b0202faadaf899420ef871093b5bce320c0") @@ -113,27 +116,30 @@ class Sensei(CMakePackage): def cmake_args(self): spec = self.spec + prefix = "" + if spec.satisfies("@5:"): + prefix = "SENSEI_" # -Ox flags are set by default in CMake based on the build type args = [ self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define("SENSEI_USE_EXTERNAL_pugixml", True), - self.define("ENABLE_SENSEI", True), + self.define(f"{prefix}ENABLE_SENSEI", True), self.define("MPI_C_COMPILER", spec["mpi"].mpicc), self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx), # Don"t rely on MPI found in cray environment for cray systems. # On non-cray systems this should be a no-op - self.define("ENABLE_CRAY_MPICH", False), - self.define_from_variant("ENABLE_ASCENT", "ascent"), - self.define_from_variant("ENABLE_VTKM", "vtkm"), - self.define_from_variant("ENABLE_CATALYST", "catalyst"), - self.define_from_variant("ENABLE_LIBSIM", "libsim"), - self.define_from_variant("ENABLE_VTK_IO", "vtkio"), - self.define_from_variant("ENABLE_PYTHON", "python"), - self.define_from_variant("ENABLE_ADIOS2", "adios2"), - self.define_from_variant("ENABLE_HDF5", "hdf5"), - self.define_from_variant("ENABLE_PARALLEL3D", "miniapps"), - self.define_from_variant("ENABLE_OSCILLATORS", "miniapps"), + self.define(f"{prefix}ENABLE_CRAY_MPICH", False), + self.define_from_variant(f"{prefix}ENABLE_ASCENT", "ascent"), + self.define_from_variant(f"{prefix}ENABLE_VTKM", "vtkm"), + self.define_from_variant(f"{prefix}ENABLE_CATALYST", "catalyst"), + self.define_from_variant(f"{prefix}ENABLE_LIBSIM", "libsim"), + self.define_from_variant(f"{prefix}ENABLE_VTK_IO", "vtkio"), + self.define_from_variant(f"{prefix}ENABLE_PYTHON", "python"), + self.define_from_variant(f"{prefix}ENABLE_ADIOS2", "adios2"), + self.define_from_variant(f"{prefix}ENABLE_HDF5", "hdf5"), + self.define_from_variant(f"{prefix}ENABLE_PARALLEL3D", "miniapps"), + self.define_from_variant(f"{prefix}ENABLE_OSCILLATORS", "miniapps"), ] if "+adios2" in spec: @@ -148,11 +154,8 @@ def cmake_args(self): args.append("-DVISIT_DIR:PATH={0}/current/linux-x86_64".format(spec["visit"].prefix)) if "+python" in spec: - args.append(self.define("PYTHON_EXECUTABLE", spec["python"].command.path)) - args.append(self.define("Python_EXECUTABLE", spec["python"].command.path)) - args.append(self.define("Python3_EXECUTABLE", spec["python"].command.path)) if spec.satisfies("@3:"): args.append(self.define("SENSEI_PYTHON_VERSION", 3)) - args.append(self.define_from_variant("ENABLE_CATALYST_PYTHON", "catalyst")) + args.append(self.define_from_variant(f"{prefix}ENABLE_CATALYST_PYTHON", "catalyst")) return args diff --git a/var/spack/repos/builtin/packages/sentencepiece/package.py b/var/spack/repos/builtin/packages/sentencepiece/package.py index 989d9fb125bde7..845dea6add8b72 100644 --- a/var/spack/repos/builtin/packages/sentencepiece/package.py +++ b/var/spack/repos/builtin/packages/sentencepiece/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Sentencepiece(CMakePackage): maintainers("adamjstewart") + license("Apache-2.0") + version("0.1.91", sha256="acbc7ea12713cd2a8d64892f8d2033c7fd2bb4faecab39452496120ace9a4b1b") version("0.1.85", sha256="dd4956287a1b6af3cbdbbd499b7227a859a4e3f41c9882de5e6bdd929e219ae6") diff --git a/var/spack/repos/builtin/packages/sentieon-genomics/package.py b/var/spack/repos/builtin/packages/sentieon-genomics/package.py index 397ab9ffcabcad..4520afbe20b8ca 100644 --- a/var/spack/repos/builtin/packages/sentieon-genomics/package.py +++ b/var/spack/repos/builtin/packages/sentieon-genomics/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sepp/package.py b/var/spack/repos/builtin/packages/sepp/package.py index ddb7ac9782245b..a3cb7cea55ffbf 100644 --- a/var/spack/repos/builtin/packages/sepp/package.py +++ b/var/spack/repos/builtin/packages/sepp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sepp(Package): url = "https://github.com/smirarab/sepp/archive/refs/tags/4.5.1.tar.gz" maintainers("snehring") + license("GPL-3.0-or-later") + version("4.5.1", sha256="51e052569ae89f586a1a94c804f09fe1b7910a3ffff7664e2005f18c7d3f717b") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/seq-gen/package.py b/var/spack/repos/builtin/packages/seq-gen/package.py index 6bc60a2f71ac15..2aa4cca47e5095 100644 --- a/var/spack/repos/builtin/packages/seq-gen/package.py +++ b/var/spack/repos/builtin/packages/seq-gen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/seqan/package.py b/var/spack/repos/builtin/packages/seqan/package.py index b2022f0f9fa0b2..5650cc43a0add8 100644 --- a/var/spack/repos/builtin/packages/seqan/package.py +++ b/var/spack/repos/builtin/packages/seqan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Seqan(CMakePackage): homepage = "https://www.seqan.de" url = "https://github.com/seqan/seqan/archive/seqan-v2.4.0.tar.gz" + license("BSD-3-Clause") + version("2.4.0", sha256="d7084d17729214003e84818e0280a16f223c8f1c6a30eeef040c27e0c0047bd7") depends_on("cmake@3.4.0:", type="build") diff --git a/var/spack/repos/builtin/packages/seqkit/package.py b/var/spack/repos/builtin/packages/seqkit/package.py index 69ad10b8350a21..05a2d6ed00381e 100644 --- a/var/spack/repos/builtin/packages/seqkit/package.py +++ b/var/spack/repos/builtin/packages/seqkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/seqprep/package.py b/var/spack/repos/builtin/packages/seqprep/package.py index 37eb04380e9e9e..ab756237428426 100644 --- a/var/spack/repos/builtin/packages/seqprep/package.py +++ b/var/spack/repos/builtin/packages/seqprep/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Seqprep(MakefilePackage): homepage = "https://github.com/jstjohn/SeqPrep" url = "https://github.com/jstjohn/SeqPrep/archive/v1.3.2.tar.gz" + license("MIT") + version("1.3.2", sha256="2b8a462a0e0a3e51f70be7730dc77b1f2bb69e74845dd0fbd2110a921c32265a") depends_on("zlib-api", type="link") diff --git a/var/spack/repos/builtin/packages/seqtk/package.py b/var/spack/repos/builtin/packages/seqtk/package.py index 337cb8989a0c8b..6334292fbb92af 100644 --- a/var/spack/repos/builtin/packages/seqtk/package.py +++ b/var/spack/repos/builtin/packages/seqtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Seqtk(Package): homepage = "https://github.com/lh3/seqtk" url = "https://github.com/lh3/seqtk/archive/v1.1.tar.gz" + license("MIT") + version("1.4", sha256="d124604ec24f29ed14ce127426ab90e0f3a2c0280c80d1a3ff8b1c09feede19c") version("1.3", sha256="5a1687d65690f2f7fa3f998d47c3c5037e792f17ce119dab52fff3cfdca1e563") version("1.2", sha256="bd53316645ab10f0aaba59e1e72c28442ee4c9c37fddaacce5e24757eff78d7b") diff --git a/var/spack/repos/builtin/packages/serenity-libint/package.py b/var/spack/repos/builtin/packages/serenity-libint/package.py index a9bf0f456b774e..3447d11845fe48 100644 --- a/var/spack/repos/builtin/packages/serenity-libint/package.py +++ b/var/spack/repos/builtin/packages/serenity-libint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class SerenityLibint(CMakePackage): homepage = "https://thclab.uni-muenster.de/serenity/libint" url = "https://thclab.uni-muenster.de/serenity/libint/-/raw/e3eb756c/libint-2.7.0-beta.6.tgz" + license("LGPL-3.0-or-later") + version( "2.7.0-beta.6", sha256="53af60c7be74374b2a2d893b3d2d37fa6a3078a72d98067bf71ba4ede4e807df" ) diff --git a/var/spack/repos/builtin/packages/serenity/package.py b/var/spack/repos/builtin/packages/serenity/package.py index 47e342aaff13ee..12c05b147ab339 100644 --- a/var/spack/repos/builtin/packages/serenity/package.py +++ b/var/spack/repos/builtin/packages/serenity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Serenity(CMakePackage): url = "https://github.com/qcserenity/serenity/archive/refs/tags/1.4.0.tar.gz" git = "https://github.com/qcserenity/serenity.git" + license("LGPL-3.0-only") + version("master", branch="master") version("1.4.0", sha256="c7a87fc8e6f8ca21685a27e08d09d49824d9a1e9947fc6abb40d20fbba0cc6e8") @@ -113,7 +115,7 @@ def patch(self): ) def cmake_args(self): - args = [ + return [ self.define("SERENITY_BUILD_TESTS", self.run_tests), self.define_from_variant("SERENITY_BUILD_PYTHON_BINDINGS", "python"), self.define("SERENITY_MARCH", ""), @@ -135,6 +137,3 @@ def cmake_args(self): self.define("BOOST_NO_SYSTEM_PATHS", True), self.define("Boost_NO_BOOST_CMAKE", True), ] - if "+python" in self.spec: - args.append(self.define("PYTHON_EXECUTABLE", self.spec["python"].command.path)) - return args diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index fea878d02e2dec..192d84f4a9d94e 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Serf(SConsPackage): maintainers("cosmicexplorer") + license("Apache-2.0") + version("1.3.10", sha256="be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6") version("1.3.9", sha256="549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc") version("1.3.8", sha256="e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590") diff --git a/var/spack/repos/builtin/packages/serialbox/package.py b/var/spack/repos/builtin/packages/serialbox/package.py index def3f21260d585..9905b581b9bd91 100644 --- a/var/spack/repos/builtin/packages/serialbox/package.py +++ b/var/spack/repos/builtin/packages/serialbox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Serialbox(CMakePackage): maintainers("skosukhin") + license("BSD-2-Clause") + version("2.6.1", sha256="b795ce576e8c4fd137e48e502b07b136079c595c82c660cfa2e284b0ef873342") version("2.6.0", sha256="9199f8637afbd7f2b3c5ba932d1c63e9e14d553a0cafe6c29107df0e04ee9fae") version("2.5.4", sha256="f4aee8ef284f58e6847968fe4620e222ac7019d805bbbb26c199e4b6a5094fee") diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py index 3c240e9be9554b..12d0804d92eed8 100644 --- a/var/spack/repos/builtin/packages/sessreg/package.py +++ b/var/spack/repos/builtin/packages/sessreg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sessreg(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/sessreg" xorg_mirror_path = "app/sessreg-1.1.0.tar.gz" + license("ICU") + version("1.1.3", sha256="6e3e917e881132a7a9ccb181ddd83fe08a99668892455d808c911ad38beea215") version("1.1.2", sha256="dbfe74c9af90696b2c6800bd58799e937a6a10eb48a49cc22053e3538fbe361a") version("1.1.1", sha256="3e38f72ff690eaffc0f5eaff533a236bb5e93d4b91ed4fff60e9a2505347d009") diff --git a/var/spack/repos/builtin/packages/setserial/package.py b/var/spack/repos/builtin/packages/setserial/package.py index 8eebff6b02f63d..65bb951974a9ca 100644 --- a/var/spack/repos/builtin/packages/setserial/package.py +++ b/var/spack/repos/builtin/packages/setserial/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Setserial(AutotoolsPackage): "https://udomain.dl.sourceforge.net/project/setserial/setserial/2.17/setserial-2.17.tar.gz" ) + license("GPL-2.0-only") + version("2.17", sha256="7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index f8179dc38016f7..d68814690a67af 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Setxkbmap(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/setxkbmap" xorg_mirror_path = "app/setxkbmap-1.3.1.tar.gz" + license("MIT") + version("1.3.3", sha256="51ba28edf93a464a7444b53b154fd5e93dedd1e9bbcc85b636f4cf56986c4842") version("1.3.2", sha256="7e934afc55f161406f7dd99b5be8837e5d1478d8263776697b159d48461a1d3c") version("1.3.1", sha256="e24a73669007fa3b280eba4bdc7f75715aeb2e394bf2d63f5cc872502ddde264") diff --git a/var/spack/repos/builtin/packages/sfcgal/package.py b/var/spack/repos/builtin/packages/sfcgal/package.py index 59bc6e70c533cf..3d01ae506b1520 100644 --- a/var/spack/repos/builtin/packages/sfcgal/package.py +++ b/var/spack/repos/builtin/packages/sfcgal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Sfcgal(CMakePackage): homepage = "http://www.sfcgal.org/" url = "https://github.com/Oslandia/SFCGAL/archive/v1.3.8.tar.gz" + license("LGPL-2.0-or-later") + version("1.3.8", sha256="5154bfc67a5e99d95cb653d70d2b9d9293d3deb3c8f18b938a33d68fec488a6d") version("1.3.7", sha256="30ea1af26cb2f572c628aae08dd1953d80a69d15e1cac225390904d91fce031b") diff --git a/var/spack/repos/builtin/packages/sfcio/package.py b/var/spack/repos/builtin/packages/sfcio/package.py index bd82260984e272..2a90345d26081c 100644 --- a/var/spack/repos/builtin/packages/sfcio/package.py +++ b/var/spack/repos/builtin/packages/sfcio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sga/package.py b/var/spack/repos/builtin/packages/sga/package.py index d220800555c4bd..f99cf55c9718e1 100644 --- a/var/spack/repos/builtin/packages/sga/package.py +++ b/var/spack/repos/builtin/packages/sga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sgpp/package.py b/var/spack/repos/builtin/packages/sgpp/package.py index 4aa479aaf094bf..635f047166e423 100644 --- a/var/spack/repos/builtin/packages/sgpp/package.py +++ b/var/spack/repos/builtin/packages/sgpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/shadow/package.py b/var/spack/repos/builtin/packages/shadow/package.py index ea15b130ebf47d..c6b1df9b8c9af8 100644 --- a/var/spack/repos/builtin/packages/shadow/package.py +++ b/var/spack/repos/builtin/packages/shadow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Shadow(AutotoolsPackage): url = "https://github.com/shadow-maint/shadow/releases/download/4.7/shadow-4.7.tar.gz" git = "https://github.com/shadow-maint/shadow.git" + license("BSD-3-Clause") + version("4.13", sha256="813057047499c7fe81108adcf0cffa3ad4ec75e19a80151f9cbaa458ff2e86cd") version("4.8.1", sha256="3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a") version("4.7", sha256="5135b0ca2a361a218fab59e63d9c1720d2a8fc1faa520c819a654b638017286f") diff --git a/var/spack/repos/builtin/packages/shapeit/package.py b/var/spack/repos/builtin/packages/shapeit/package.py index 2b9f6a2b3b7bd1..4c288012b6549b 100644 --- a/var/spack/repos/builtin/packages/shapeit/package.py +++ b/var/spack/repos/builtin/packages/shapeit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/shapeit4/package.py b/var/spack/repos/builtin/packages/shapeit4/package.py index 56003075e94ceb..42d5e950ac1e8f 100644 --- a/var/spack/repos/builtin/packages/shapeit4/package.py +++ b/var/spack/repos/builtin/packages/shapeit4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Shapeit4(MakefilePackage): homepage = "https://odelaneau.github.io/shapeit4/" url = "https://github.com/odelaneau/shapeit4/archive/v4.1.3.tar.gz" + license("MIT") + version("4.2.2", sha256="9f109e307b5cc22ab68e7bf77de2429a9bbb2212d66303386e6a3dd81a5bc556") version("4.1.3", sha256="d209731277b00bca1e3478b7e0a0cbe40fbe23826c3d640ad12e0dd6033cbbb8") diff --git a/var/spack/repos/builtin/packages/shapelib/package.py b/var/spack/repos/builtin/packages/shapelib/package.py index b6496a8ff208b7..a10310cc6ab03c 100644 --- a/var/spack/repos/builtin/packages/shapelib/package.py +++ b/var/spack/repos/builtin/packages/shapelib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,4 +15,6 @@ class Shapelib(CMakePackage): homepage = "http://shapelib.maptools.org/" url = "https://github.com/OSGeo/shapelib/archive/v1.5.0.tar.gz" + license("LGPL-2.0-only OR MIT") + version("1.5.0", sha256="48de3a6a8691b0b111b909c0b908af4627635c75322b3a501c0c0885f3558cad") diff --git a/var/spack/repos/builtin/packages/shapemapper/package.py b/var/spack/repos/builtin/packages/shapemapper/package.py index 1037f44b6b5152..730326f7fa2802 100644 --- a/var/spack/repos/builtin/packages/shapemapper/package.py +++ b/var/spack/repos/builtin/packages/shapemapper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,22 +18,38 @@ class Shapemapper(CMakePackage): maintainers("snehring") + license("MIT") + + version( + "2.2.0", + sha256="eec1bfca339731816142bf2e7826dfb2e125588d72a1f7c36aaa927393e6fbec", + url="https://github.com/Weeks-UNC/shapemapper2/releases/download/2.2.0/shapemapper2-2.2-source-only.tar.gz", + ) version( "2.1.5", sha256="0846a5d8b5f01d2d039fad4b957df0b6220a8505463f1a410368a1b90d2b227c", url="https://github.com/Weeks-UNC/shapemapper2/releases/download/2.1.5/shapemapper-2.1.5-source-only.tar.gz", ) - depends_on("bowtie2@2.3.0: ^perl+threads", type="run") + depends_on("bowtie2@2.3.0:", type="run", when="@2.1.5") + depends_on("bowtie2@2.3.4:", type="run", when="@2.2.0:") + depends_on("perl+threads", type="run") + depends_on("pv@1.6.20:", type="run") # hard version dep due to jni depends_on("bbmap@37.78", type="run") depends_on("boost+filesystem+program_options+iostreams+system") depends_on("star@2.5.2:", type="run") depends_on("pv@1.6.0:", type="run") - depends_on("python@3.7:", type="run") - depends_on("graphviz@2.38.0:", type="run") - depends_on("py-scikit-learn@0.18.1:", type="run") - depends_on("py-matplotlib@1.5.1:3.3", type="run") + depends_on("python@3.7:", type="run", when="@2.1.5") + depends_on("python@3.9.12:", type="run", when="@2.2.0") + depends_on("graphviz@2.38.0:", type="run", when="@2.1.5") + depends_on("graphviz@7.1.0:", type="run", when="@2.2.0:") + depends_on("py-numpy@1.19.5:1.19", type="run", when="@2.2.0:") + depends_on("py-scikit-learn@0.18.1:", type="run", when="@2.1.5") + depends_on("py-scikit-learn@1.1.2:", type="run", when="@2.2.0:") + depends_on("py-matplotlib@1.5.1:3.3", type="run", when="@2.1.5") + depends_on("py-matplotlib@3.6.2:3.6", type="run", when="@2.2.0:") + depends_on("zlib-api") build_directory = "build" diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 76d9905b0a7ff3..7da52d5052d61a 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class SharedMimeInfo(AutotoolsPackage): homepage = "https://freedesktop.org/wiki/Software/shared-mime-info" url = "http://freedesktop.org/~hadess/shared-mime-info-1.8.tar.xz" + license("GPL-2.0-or-later") + version("1.10", sha256="c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf") version("1.9", sha256="5c0133ec4e228e41bdf52f726d271a2d821499c2ab97afd3aa3d6cf43efcdc83") version("1.8", sha256="2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9") diff --git a/var/spack/repos/builtin/packages/shark/package.py b/var/spack/repos/builtin/packages/shark/package.py index d17cbbb1c71870..fcec7ed1f1ff58 100644 --- a/var/spack/repos/builtin/packages/shark/package.py +++ b/var/spack/repos/builtin/packages/shark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Shark(CMakePackage): homepage = "https://www.shark-ml.org/" url = "https://github.com/Shark-ML/Shark/archive/v4.0.1.tar.gz" + license("LGPL-3.0-only") + version("4.0.1", sha256="1caf9c73c5ebf54f9543a090e2b05ac646f95559aa1de483cd7662c378c1ec21") version("4.0.0", sha256="19d4099776327d5f8a2e2be286818c6081c61eb13ca279c1e438c86e70d90210") version("3.1.4", sha256="160c35ddeae3f6aeac3ce132ea4ba2611ece39eee347de2faa3ca52639dc6311") diff --git a/var/spack/repos/builtin/packages/shc/package.py b/var/spack/repos/builtin/packages/shc/package.py index 23a58b13a27bf0..5ff617eebc655e 100644 --- a/var/spack/repos/builtin/packages/shc/package.py +++ b/var/spack/repos/builtin/packages/shc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Shc(AutotoolsPackage): homepage = "https://neurobin.org/projects/softwares/unix/shc/" url = "https://github.com/neurobin/shc/archive/4.0.3.tar.gz" + license("GPL-3.0-or-later") + version("4.0.3", sha256="7d7fa6a9f5f53d607ab851d739ae3d3b99ca86e2cb1425a6cab9299f673aee16") version("4.0.2", sha256="881b9a558466529dcdba79b7fafed028ee02a9afc0371fc1e11a26f1f586a4a6") version("4.0.1", sha256="494666df8b28069a7d73b89f79919bdc04e929a176746c98c3544a639978ba52") diff --git a/var/spack/repos/builtin/packages/sheenbidi/package.py b/var/spack/repos/builtin/packages/sheenbidi/package.py index 3452ce1c1dcbcc..5b9351b2a4ecdd 100644 --- a/var/spack/repos/builtin/packages/sheenbidi/package.py +++ b/var/spack/repos/builtin/packages/sheenbidi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Sheenbidi(MesonPackage): url = "https://github.com/Tehreer/SheenBidi/archive/v2.6.tar.gz" git = "https://github.com/Tehreer/SheenBidi.git" + license("Apache-2.0") + version("2.6", sha256="f538f51a7861dd95fb9e3f4ad885f39204b5c670867019b5adb7c4b410c8e0d9") diff --git a/var/spack/repos/builtin/packages/shellcheck/package.py b/var/spack/repos/builtin/packages/shellcheck/package.py index 869c3ab53db41e..0def9a5cb575c5 100644 --- a/var/spack/repos/builtin/packages/shellcheck/package.py +++ b/var/spack/repos/builtin/packages/shellcheck/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -35,6 +35,8 @@ class Shellcheck(Package): # challenges with Haskell, and see the pandoc package for a precedent of # downloading a Haskell-derived binary. + license("GPL-3.0") + for ver, packages in _versions.items(): system = platform.system().lower() machine = platform.machine().lower() diff --git a/var/spack/repos/builtin/packages/shengbte/package.py b/var/spack/repos/builtin/packages/shengbte/package.py index be82b95a174844..c56dac10cd14ea 100644 --- a/var/spack/repos/builtin/packages/shengbte/package.py +++ b/var/spack/repos/builtin/packages/shengbte/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Shengbte(MakefilePackage): homepage = "www.shengbte.org" url = "www.shengbte.org/downloads/ShengBTE-v1.1.1-8a63749.tar.bz2" + license("GPL-3.0-only") + version( "1.1.1-8a63749", sha256="43920740d19ae854c8ecae0b648acfdf1d7726ca4c2b44f1a1684457f2f88522" ) diff --git a/var/spack/repos/builtin/packages/sherpa/package.py b/var/spack/repos/builtin/packages/sherpa/package.py index 7ae8efc2e45997..5bb347021635d2 100644 --- a/var/spack/repos/builtin/packages/sherpa/package.py +++ b/var/spack/repos/builtin/packages/sherpa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Sherpa(AutotoolsPackage): maintainers("wdconinc", "vvolkl") + license("GPL-3.0-only") + version("2.2.15", sha256="0300fd719bf6a089b7dc5441f720e669ac1cb030045d87034a4733bee98e7bbc") version("2.2.14", sha256="f17d88d7f3bc4234a9db3872e8a3c1f3ef99e1e2dc881ada5ddf848715dc82da") version("2.2.13", sha256="ed1fd1372923c191ca44897802d950702b810382260e7464d36ac3234c5c8a64") @@ -217,7 +219,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")) diff --git a/var/spack/repos/builtin/packages/shiro/package.py b/var/spack/repos/builtin/packages/shiro/package.py index 9d04aee2afd46a..66d69629fb965f 100644 --- a/var/spack/repos/builtin/packages/shiro/package.py +++ b/var/spack/repos/builtin/packages/shiro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Shiro(MavenPackage): homepage = "https://shiro.apache.org/" url = "https://github.com/apache/shiro/archive/shiro-root-1.6.0.tar.gz" + license("Apache-2.0") + version("1.6.0", sha256="50338badfd3261076060fbe70330089512d38071bc51aa3f84ad23e707d2b7c9") version("1.5.3", sha256="25c5d99eddf790969e0f80bd9769f773465c9c9e1e8ec1f549f476bdae8c6983") diff --git a/var/spack/repos/builtin/packages/shocklibs/package.py b/var/spack/repos/builtin/packages/shocklibs/package.py index 23a5ea1c84d32b..079f3d6e497619 100644 --- a/var/spack/repos/builtin/packages/shocklibs/package.py +++ b/var/spack/repos/builtin/packages/shocklibs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Shocklibs(Package): homepage = "https://github.com/MG-RAST/Shock" url = "https://github.com/MG-RAST/Shock/archive/v0.9.24.tar.gz" + license("BSD-2-Clause") + version("0.9.24", sha256="465d06f33df2570eaf3ffd535a38fc464084ac95a2f145ead5c71f34beeb0a35") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/shoremap/package.py b/var/spack/repos/builtin/packages/shoremap/package.py index 0c0562084e369e..be2c189b4f2387 100644 --- a/var/spack/repos/builtin/packages/shoremap/package.py +++ b/var/spack/repos/builtin/packages/shoremap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Shoremap(MakefilePackage): homepage = "http://bioinfo.mpipz.mpg.de/shoremap/" url = "http://bioinfo.mpipz.mpg.de/shoremap/SHOREmap_v3.6.tar.gz" + license("GPL-3.0-or-later") + version("3.6", sha256="0da4179e92cbc68434a9d8eff7bd5fff55c89fd9a543a2db6bd0f69074f2ec70") depends_on("dislin") diff --git a/var/spack/repos/builtin/packages/shortbred/package.py b/var/spack/repos/builtin/packages/shortbred/package.py index 9e55e5e98f0e88..cb2950a113ae04 100644 --- a/var/spack/repos/builtin/packages/shortbred/package.py +++ b/var/spack/repos/builtin/packages/shortbred/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/shortstack/package.py b/var/spack/repos/builtin/packages/shortstack/package.py index 7779cc684f76ac..f61f310ec86494 100644 --- a/var/spack/repos/builtin/packages/shortstack/package.py +++ b/var/spack/repos/builtin/packages/shortstack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Shortstack(Package): homepage = "https://sites.psu.edu/axtell/software/shortstack/" url = "https://github.com/MikeAxtell/ShortStack/archive/v3.8.3.tar.gz" + license("MIT") + version("4.0.1", sha256="d8ca2d5b245d13c9f2b2e6fa06bc34bc8f6bacbe07efebe3750b0178141cbeb6") version("3.8.3", sha256="7c76f51ed949ca95ec5df7cb54803ae2350658fd64c75909351d5a856abb0dbe") diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py index 4daef21239cc65..794ed08ae67f82 100644 --- a/var/spack/repos/builtin/packages/showfont/package.py +++ b/var/spack/repos/builtin/packages/showfont/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/shtools/package.py b/var/spack/repos/builtin/packages/shtools/package.py index 09ace06e7441d4..6bfdb4e0504741 100644 --- a/var/spack/repos/builtin/packages/shtools/package.py +++ b/var/spack/repos/builtin/packages/shtools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/shuffile/package.py b/var/spack/repos/builtin/packages/shuffile/package.py index cf05d17b3d2c83..ee1697dacd04c0 100644 --- a/var/spack/repos/builtin/packages/shuffile/package.py +++ b/var/spack/repos/builtin/packages/shuffile/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Shuffile(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.3.0", sha256="3463ad4a23fd31aa9a3426346ada04399fb9369dd1f40d22df9f19f9c0c1f8ae") version("0.2.0", sha256="467ffef72214c109b69f09d03e42be5e9254f13751b09c71168c14fa99117521") diff --git a/var/spack/repos/builtin/packages/sickle/package.py b/var/spack/repos/builtin/packages/sickle/package.py index 90c3e25d0b3a8d..ad0db8556895ff 100644 --- a/var/spack/repos/builtin/packages/sickle/package.py +++ b/var/spack/repos/builtin/packages/sickle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sickle(MakefilePackage): homepage = "https://github.com/najoshi/sickle" url = "https://github.com/najoshi/sickle/archive/v1.33.tar.gz" + license("MIT") + version("1.33", sha256="eab271d25dc799e2ce67c25626128f8f8ed65e3cd68e799479bba20964624734") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/sicm/package.py b/var/spack/repos/builtin/packages/sicm/package.py index db7ef6fc1d9ee9..68ab4de4efebd0 100644 --- a/var/spack/repos/builtin/packages/sicm/package.py +++ b/var/spack/repos/builtin/packages/sicm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sicm(CMakePackage): homepage = "https://github.com/lanl/SICM/" git = "https://github.com/lanl/SICM.git" + license("BSD-2-Clause") + version("master") depends_on("jemalloc jemalloc_prefix=je_") diff --git a/var/spack/repos/builtin/packages/siesta/package.py b/var/spack/repos/builtin/packages/siesta/package.py index e0eab1a1cb3839..aa41d69581b9ed 100644 --- a/var/spack/repos/builtin/packages/siesta/package.py +++ b/var/spack/repos/builtin/packages/siesta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Siesta(MakefilePackage): homepage = "https://departments.icmab.es/leem/siesta/" + license("GPL-3.0-or-later") + version("4.0.2", sha256="bafbda19358f0c1dd39bb1253c92ee548791a1c0f648977051d2657216874f7e") version( "4.0.1", diff --git a/var/spack/repos/builtin/packages/sigcpp/package.py b/var/spack/repos/builtin/packages/sigcpp/package.py index 4bd7905864ef06..b4afc0f1b31d07 100644 --- a/var/spack/repos/builtin/packages/sigcpp/package.py +++ b/var/spack/repos/builtin/packages/sigcpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sigcpp(CMakePackage): homepage = "https://libsigcplusplus.github.io/libsigcplusplus/" url = "https://github.com/libsigcplusplus/libsigcplusplus/archive/refs/tags/3.0.7.tar.gz" + license("LGPL-3.0-only") + version("3.2.0", sha256="f9c36331b5d5ac7a1651477288f47eec51394c03ade8bb1a05d1c46eac5f77e7") version("3.0.7", sha256="063b6ab86e4d8703ea65d894d78e8482b1fc34b92be8849f82ce1c5b05cf2b8d") diff --git a/var/spack/repos/builtin/packages/sigio/package.py b/var/spack/repos/builtin/packages/sigio/package.py index 069ad8accefda3..57c1f6f3fd5eda 100644 --- a/var/spack/repos/builtin/packages/sigio/package.py +++ b/var/spack/repos/builtin/packages/sigio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/signalp/package.py b/var/spack/repos/builtin/packages/signalp/package.py index a72e3a4d5d78fe..f61b9e1557784f 100644 --- a/var/spack/repos/builtin/packages/signalp/package.py +++ b/var/spack/repos/builtin/packages/signalp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/signify/package.py b/var/spack/repos/builtin/packages/signify/package.py index 77ec25454aa678..5c7e6c37c1241a 100644 --- a/var/spack/repos/builtin/packages/signify/package.py +++ b/var/spack/repos/builtin/packages/signify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Signify(MakefilePackage): homepage = "https://github.com/aperezdc/signify" url = "https://github.com/aperezdc/signify/archive/v23.tar.gz" + license("ISC") + version("31", sha256="8111af7424f4cc69dab5cd43a14ccd607ca2d171ac77dd3ae288264a53254e5f") version("23", sha256="1c690bf0e4283e0764a4a9dd784cb3debf4bb456b975b275dd1aaac7d5afe030") diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 2678b0d7c56021..435255a4dea5cf 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/simde/package.py b/var/spack/repos/builtin/packages/simde/package.py index d939f9e24b484f..becbbdea6e8b33 100644 --- a/var/spack/repos/builtin/packages/simde/package.py +++ b/var/spack/repos/builtin/packages/simde/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Simde(MesonPackage): url = "https://github.com/simd-everywhere/simde/archive/v0.6.0.tar.gz" git = "https://github.com/simd-everywhere/simde.git" + license("MIT") + version("0.7.6", sha256="c63e6c61392e324728da1c7e5de308cb31410908993a769594f5e21ff8de962b") version("0.7.2", sha256="366d5e9a342c30f1e40d1234656fb49af5ee35590aaf53b3c79b2afb906ed4c8") version("0.6.0", sha256="25a8b8c69c17ddc2f6209e86caa6b12d4ed91c0f841617efc56e5675eea84915") diff --git a/var/spack/repos/builtin/packages/simgrid/package.py b/var/spack/repos/builtin/packages/simgrid/package.py index c21ef353ab1c77..d164029b39960f 100644 --- a/var/spack/repos/builtin/packages/simgrid/package.py +++ b/var/spack/repos/builtin/packages/simgrid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,10 @@ class Simgrid(CMakePackage): maintainers("viniciusvgp") + license("LGPL-2.1-or-later") + + version("3.35", sha256="b4570d3de18d319cbd2e16c5a669f90760307673c0cc9940d4d11cfc537e69a8") + version("3.34", sha256="161f1c6c0ebb588c587aea6388114307bb31b3c6d5332fa3dc678151f1d0564d") version("3.32", sha256="837764eb81562f04e49dd20fbd8518d9eb1f94df00a4e4555e7ec7fa8aa341f0") version("3.31", sha256="4b44f77ad40c01cf4e3013957c9cbe39f33dec9304ff0c9c3d9056372ed4c61d") version("3.30", sha256="0cad48088c106e72efb42fb423e65d77fc9053cc03d6f3a5ff7ba4c712bb4eb8") diff --git a/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py b/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py index 5b1db1e4567d66..65fe64d19d67a0 100644 --- a/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py +++ b/var/spack/repos/builtin/packages/simmetrix-simmodsuite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/simple-dftd3/package.py b/var/spack/repos/builtin/packages/simple-dftd3/package.py index 060fad6760ac91..dda976818a48d9 100644 --- a/var/spack/repos/builtin/packages/simple-dftd3/package.py +++ b/var/spack/repos/builtin/packages/simple-dftd3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class SimpleDftd3(MesonPackage): maintainers("awvwgk") + license("LGPL-3.0-or-later") + version("main", branch="main") version("0.7.0", sha256="5390b20102474a3c37240f38226f3a54a809b34bcb910317bdd109b8c2865f4e") version("0.6.0", sha256="c057361565f570cb128489c70131487f71b6891a40e5292dfe37041596810dfe") diff --git a/var/spack/repos/builtin/packages/simplemoc/package.py b/var/spack/repos/builtin/packages/simplemoc/package.py index 20eaebd9956a2b..edae6d58e48f5e 100644 --- a/var/spack/repos/builtin/packages/simplemoc/package.py +++ b/var/spack/repos/builtin/packages/simplemoc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Simplemoc(MakefilePackage): homepage = "https://github.com/ANL-CESAR/SimpleMOC/" url = "https://github.com/ANL-CESAR/SimpleMOC/archive/v4.tar.gz" + license("MIT") + version("4", sha256="a39906014fdb234c43bf26e1919bdc8a13097788812e0b353a492b8e568816a6") tags = ["proxy-app"] diff --git a/var/spack/repos/builtin/packages/simsipm/package.py b/var/spack/repos/builtin/packages/simsipm/package.py index beb1a455fc4d6d..c60d3c1fe82199 100644 --- a/var/spack/repos/builtin/packages/simsipm/package.py +++ b/var/spack/repos/builtin/packages/simsipm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Simsipm(CMakePackage): maintainers("vvolkl") + license("MIT") + version("2.0.2", sha256="ba60ed88b54b1b29d089f583dbce93b3272b0b13d47772941339f1503ee3fa48") version("1.2.4", sha256="1c633bebb19c490b5e6dfa5ada4a6bc7ec36348237c2626d57843a25af923211") diff --git a/var/spack/repos/builtin/packages/simul/package.py b/var/spack/repos/builtin/packages/simul/package.py index f21ebd72e6524e..a415be56c79745 100644 --- a/var/spack/repos/builtin/packages/simul/package.py +++ b/var/spack/repos/builtin/packages/simul/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index 735e3404da870f..0ca06958f0136f 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Simulationio(CMakePackage): maintainers("eschnett") + license("LGPL-3.0-only") + version("master", branch="master") version("9.0.3", sha256="d07192fb69ae0d43364dc5807ce788c6cf1f8fbaa46f83028311b6935fd76aa8") version("9.0.2", sha256="3dd3422e64f6a75215783f6157effd07430e1d0af5884e565f73388a815511f8") diff --git a/var/spack/repos/builtin/packages/sina/package.py b/var/spack/repos/builtin/packages/sina/package.py index 97d96c0f89c856..1131cfba3a0398 100644 --- a/var/spack/repos/builtin/packages/sina/package.py +++ b/var/spack/repos/builtin/packages/sina/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/singularity-eos/package.py b/var/spack/repos/builtin/packages/singularity-eos/package.py index b11dd607db3896..45970a4f5c09dc 100644 --- a/var/spack/repos/builtin/packages/singularity-eos/package.py +++ b/var/spack/repos/builtin/packages/singularity-eos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,10 +18,21 @@ class SingularityEos(CMakePackage, CudaPackage): maintainers("rbberger") + license("BSD-3-Clause") + version("main", branch="main") + version("1.8.0", sha256="1f1ec496f714aa23cc7003c88a85bd10d0e53e37659ba7310541248e48a66558") version("1.7.0", sha256="ce0825db2e9d079503e98cecf1c565352be696109042b3a0941762b35f36dc49") - version("1.6.2", sha256="9c85fca679139a40cc9c72fcaeeca78a407cc1ca184734785236042de364b942") - version("1.6.1", sha256="c6d92dfecf9689ffe2df615791c039f7e527e9f47799a862e26fa4e3420fe5d7") + version( + "1.6.2", + sha256="9c85fca679139a40cc9c72fcaeeca78a407cc1ca184734785236042de364b942", + deprecated=True, + ) + version( + "1.6.1", + sha256="c6d92dfecf9689ffe2df615791c039f7e527e9f47799a862e26fa4e3420fe5d7", + deprecated=True, + ) # build with kokkos, kokkos-kernels for offloading support variant("kokkos", default=False, description="Enable kokkos") @@ -47,20 +58,36 @@ class SingularityEos(CMakePackage, CudaPackage): # build the Python bindings variant("python", default=False, description="Enable building Python bindings") - variant("eospac", default=True, description="Pull in EOSPAC") + variant("eospac", default=True, description="Enable EOSPAC for table reads") + + variant("hdf5", default=False, description="Enable HDF5 support") + + variant("spiner", default=True, description="Use Spiner") + + variant("closure", default=True, description="Build closure module") # building/testing/docs - depends_on("cmake@3.14:", type="build") - depends_on("catch2@2.13.7", type="test") + depends_on("cmake@3.19:", type="build") depends_on("python@3:", when="+python") depends_on("py-pybind11@2.9.1:", when="+python") + depends_on("catch2@2.13.7", type="test") + depends_on("py-numpy", type="test") # linear algebra when not using GPUs - depends_on("eigen@3.3.8", when="~cuda") + depends_on("eigen@3.3.8", when="~kokkos-kernels~cuda") depends_on("eospac", when="+eospac") - depends_on("spiner") - depends_on("spiner +kokkos", when="+kokkos") + + depends_on("ports-of-call@1.4.2,1.5.2:", when="@:1.7.0") + depends_on("ports-of-call@1.5.2:", when="@1.7.1:") + depends_on("ports-of-call@main", when="@main") + + depends_on("spiner +kokkos", when="+kokkos+spiner") + depends_on("spiner +hdf5", when="+hdf5+spiner") + + depends_on("spiner@:1.6.0", when="@:1.7.0 +spiner") + depends_on("spiner@1.6.1:", when="@1.8.0: +spiner") + depends_on("spiner@main", when="@main +spiner") depends_on("mpark-variant") depends_on( @@ -72,14 +99,18 @@ class SingularityEos(CMakePackage, CudaPackage): when="+cuda", ) + for _myver, _kver in zip(("@:1.6.2", "@1.7.0:"), ("@3.2:", "@3.3:")): + depends_on("kokkos" + _kver, when=_myver + "+kokkos") + depends_on("kokkos-kernels" + _kver, when=_myver + "+kokkos-kernels") + # set up kokkos offloading dependencies for _flag in ("~cuda", "+cuda", "~openmp", "+openmp"): - depends_on("kokkos@3.2: ~shared" + _flag, when="+kokkos" + _flag) - depends_on("kokkos-kernels@3.2:" + _flag, when="+kokkos-kernels" + _flag) + depends_on("kokkos ~shared" + _flag, when="+kokkos" + _flag) + depends_on("kokkos-kernels" + _flag, when="+kokkos-kernels" + _flag) depends_on("spiner" + _flag, when="+kokkos" + _flag) # specfic specs when using GPU/cuda offloading - depends_on("kokkos +wrapper+cuda_lambda+cuda_relocatable_device_code", when="+cuda+kokkos") + depends_on("kokkos +wrapper+cuda_lambda", when="+cuda+kokkos") # fix for older spacks if spack.version.Version(spack.spack_version) >= spack.version.Version("0.17"): @@ -92,19 +123,21 @@ class SingularityEos(CMakePackage, CudaPackage): conflicts("cuda_arch=none", when="+cuda", msg="CUDA architecture is required") - # NOTE: we can do depends_on("libfoo cppflags='-fPIC -O2'") for compiler options - # these are mirrored in the cmake configuration conflicts("+cuda", when="~kokkos") conflicts("+openmp", when="~kokkos") conflicts("+kokkos-kernels", when="~kokkos") + conflicts("+hdf5", when="~spiner") + + conflicts("+fortran", when="~closure") # NOTE: these are set so that dependencies in downstream projects share # common MPI dependence for _flag in ("~mpi", "+mpi"): - depends_on("hdf5~cxx+hl" + _flag, when=_flag) + depends_on("hdf5~cxx+hl" + _flag, when="+hdf5" + _flag) depends_on("py-h5py" + _flag, when="@:1.6.2 " + _flag) + # can be removed once <1.8.0 versions have been removed def flag_handler(self, name, flags): if name == "fflags": if self.spec.satisfies("%cce+fortran"): @@ -122,8 +155,10 @@ def cmake_args(self): self.define_from_variant("SINGULARITY_USE_KOKKOS", "kokkos"), self.define_from_variant("SINGULARITY_USE_KOKKOSKERNELS", "kokkos-kernels"), self.define_from_variant("SINGULARITY_USE_FORTRAN", "fortran"), - self.define_from_variant("SINGULARITY_BUILD_CLOSURE", "fortran"), + self.define_from_variant("SINGULARITY_BUILD_CLOSURE", "closure"), self.define_from_variant("SINGULARITY_BUILD_PYTHON", "python"), + self.define_from_variant("SINGULARITY_USE_SPINER", "spiner"), + self.define_from_variant("SINGULARITY_USE_SPINER_WITH_HDF5", "hdf5"), self.define("SINGULARITY_BUILD_TESTS", self.run_tests), self.define( "SINGULARITY_BUILD_SESAME2SPINER", @@ -142,8 +177,8 @@ def cmake_args(self): ("stellarcollapse" in self.spec.variants["build_extra"].value and self.run_tests), ), self.define("SINGULARITY_TEST_PYTHON", ("+python" in self.spec and self.run_tests)), - self.define("SINGULARITY_USE_HDF5", "^hdf5" in self.spec), - self.define("SINGULARITY_USE_EOSPAC", "^eospac" in self.spec), + self.define_from_variant("SINGULARITY_USE_HDF5", "hdf5"), + self.define_from_variant("SINGULARITY_USE_EOSPAC", "eospac"), ] if "+kokkos+cuda" in self.spec: @@ -151,34 +186,7 @@ def cmake_args(self): return args - # specify the name of the auto-generated cmake cache config - @property - def cmake_config_fname(self): - return "singularity-eos_spackconfig.cmake" - - # generate the pre-configured cmake cache file that reflects the spec options - # NOTE: this file isn't replaced if the same spec is already installed - - # you may need to uninstall the old spec first - @run_after("cmake") - def generate_cmake_configuration(self): - config_fname = self.cmake_config_fname - cmake_config = self.cmake_args() - - with working_dir("cmake-gen", create=True): - with open(config_fname, "w") as cmc: - for arg in cmake_config: - kt, v = arg.replace("-D", "").split("=") - k, t = kt.split(":") - cmc.write('set({} "{}" CACHE {} "" FORCE)\n'.format(k, v, t)) - install(config_fname, join_path(prefix, config_fname)) - - # run when loaded - # NOTE: to use: - # cmake -C $SINGULARITY_SPACK_CMAKE_CONFIG ... def setup_run_environment(self, env): - env.set( - "SINGULARITY_SPACK_CMAKE_CONFIG", os.path.join(self.prefix, self.cmake_config_fname) - ) if os.path.isdir(self.prefix.lib64): lib_dir = self.prefix.lib64 else: diff --git a/var/spack/repos/builtin/packages/singularity-hpc/package.py b/var/spack/repos/builtin/packages/singularity-hpc/package.py index add13addfa715e..8e649af1074aa6 100644 --- a/var/spack/repos/builtin/packages/singularity-hpc/package.py +++ b/var/spack/repos/builtin/packages/singularity-hpc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class SingularityHpc(PythonPackage): homepage = "https://github.com/singularityhub/singularity-hpc" pypi = "singularity-hpc/singularity-hpc-0.1.16.tar.gz" + license("MPL-2.0") + version("0.1.16", sha256="00aca234259b962914987ec725181dafc11096fa721d610485615585753d769f") version("0.1.12", sha256="760cbcae7b07b319ff6147938578648ce6f0af760701e62bf5f88649ef08f793") diff --git a/var/spack/repos/builtin/packages/singularity-legacy/package.py b/var/spack/repos/builtin/packages/singularity-legacy/package.py index 89d6f2eb79c417..3cd875286a5456 100644 --- a/var/spack/repos/builtin/packages/singularity-legacy/package.py +++ b/var/spack/repos/builtin/packages/singularity-legacy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index e02659a8c7f987..317c3ac8278b32 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Singularity(SingularityBase): git = "https://github.com/hpcng/singularity.git" url = "https://github.com/hpcng/singularity/releases/download/v3.8.5/singularity-3.8.5.tar.gz" + license("BSD-3-Clause AND BSD-3-Clause-LBNL") + version( "3.8.7", sha256="3329f2e583f84a8343cb2c0380a1d6cbceafae7d1e633b5cbcadf7143eac859b", diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py index 4fccdd059c6088..ca7a49d9d39289 100644 --- a/var/spack/repos/builtin/packages/singularityce/package.py +++ b/var/spack/repos/builtin/packages/singularityce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -197,6 +197,8 @@ class Singularityce(SingularityBase): url = "https://github.com/sylabs/singularity/releases/download/v3.9.1/singularity-ce-3.9.1.tar.gz" git = "https://github.com/sylabs/singularity.git" + license("Apache-2.0") + maintainers("alalazo") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/sio/package.py b/var/spack/repos/builtin/packages/sio/package.py index 351fa4c3d571cf..972f6821076d2f 100644 --- a/var/spack/repos/builtin/packages/sio/package.py +++ b/var/spack/repos/builtin/packages/sio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,7 +18,10 @@ class Sio(CMakePackage): maintainers("vvolkl", "tmadlener", "jmcarcell") + license("BSD-3-Clause") + version("master", branch="master") + version("0.2", sha256="416c93402e7314b7aadedba8e7f9e0d4b0b4f4e34ce26285b04cebb505ecfab2") version("0.1", sha256="0407c0daeae53660c0562f9302a220f72ab51547050cd9fe9113b995804ab4b4") version("0.0.4", sha256="72e96e6a1cc8dd3641d3e2bb9876e75bf6af8074e1617220da9e52df522ef5c0") version("0.0.3", sha256="4c8b9c08480fb53cd10abb0e1260071a8c3f68d06a8acfd373f6560a916155cc") diff --git a/var/spack/repos/builtin/packages/sionlib/package.py b/var/spack/repos/builtin/packages/sionlib/package.py index 34292ac56bc5b8..c329066b0eaa7d 100644 --- a/var/spack/repos/builtin/packages/sionlib/package.py +++ b/var/spack/repos/builtin/packages/sionlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sionlib(AutotoolsPackage): maintainers("pramodk") + license("BSD-3-Clause") + version( "1.7.6", sha256="e85253ed3cd17a3b1c124ccd704caea3ad3c200abfcca9cc0851cb14f5a60691", diff --git a/var/spack/repos/builtin/packages/sirius/fj.patch b/var/spack/repos/builtin/packages/sirius/fj.patch new file mode 100644 index 00000000000000..567ced347e083d --- /dev/null +++ b/var/spack/repos/builtin/packages/sirius/fj.patch @@ -0,0 +1,13 @@ +diff --git a/src/hamiltonian/hamiltonian.cpp b/src/hamiltonian/hamiltonian.cpp +index 54a91df..ea66ecf 100644 +--- a/src/hamiltonian/hamiltonian.cpp ++++ b/src/hamiltonian/hamiltonian.cpp +@@ -74,7 +74,7 @@ Hamiltonian0::Hamiltonian0(Potential& potential__, bool precompute_lapw__) + for (int j1 = 0; j1 <= j2; j1++) { + int lm1 = type.indexb(j1).lm; + int idxrf1 = type.indexb(j1).idxrf; +- hmt_[ia](j1, j2) = atom.radial_integrals_sum_L3(idxrf1, idxrf2, ++ hmt_[ia](j1, j2) = atom.template radial_integrals_sum_L3(idxrf1, idxrf2, + type.gaunt_coefs().gaunt_vector(lm1, lm2)); + hmt_[ia](j2, j1) = std::conj(hmt_[ia](j1, j2)); + } diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index 20f5a4246d420c..6f67f5c8507cb2 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,9 +18,14 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): maintainers("simonpintarelli", "haampie", "dev-zero", "AdhocMan", "toxa81") + license("BSD-2-Clause") + version("develop", branch="develop") version("master", branch="master") + version("7.5.2", sha256="9ae01935578532c84f1d0d673dbbcdd490e26be22efa6c4acf7129f9dc1a0c60") + version("7.5.1", sha256="aadfa7976e90a109aeb1677042454388a8d1a50d75834d59c86c8aef06bc12e4") + version("7.5.0", sha256="c583f88ffc02e9acac24e786bc35c7c32066882d2f70a1e0c14b5780b510365d") version("7.4.3", sha256="015679a60a39fa750c5d1bd8fb1ce73945524bef561270d8a171ea2fd4687fec") version("7.4.0", sha256="f9360a695a1e786d8cb9d6702c82dd95144a530c4fa7e8115791c7d1e92b020b") version("7.3.2", sha256="a256508de6b344345c295ad8642dbb260c4753cd87cc3dd192605c33542955d7") @@ -79,17 +84,11 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): variant("shared", default=True, description="Build shared libraries") variant("openmp", default=True, description="Build with OpenMP support") - variant( - "boost_filesystem", - default=False, - description="Use Boost filesystem for self-consistent field method " - "mini-app. Only required when the compiler does not " - "support std::experimental::filesystem nor std::filesystem", - ) variant("fortran", default=False, description="Build Fortran bindings") variant("python", default=False, description="Build Python bindings") variant("memory_pool", default=True, description="Build with memory pool") variant("elpa", default=False, description="Use ELPA") + variant("dlaf", default=False, when="@7.5.0:", description="Use DLA-Future") variant("vdwxc", default=False, description="Enable libvdwxc support") variant("scalapack", default=False, description="Enable scalapack support") variant("magma", default=False, description="Enable MAGMA support") @@ -107,6 +106,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): variant( "profiler", default=True, description="Use internal profiler to measure execution time" ) + variant("nvtx", default=False, description="Use NVTX profiler") depends_on("cmake@3.23:", type="build") depends_on("mpi") @@ -133,7 +133,6 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): extends("python", when="+python") depends_on("magma", when="+magma") - depends_on("boost cxxstd=14 +filesystem", when="+boost_filesystem") depends_on("spfft@0.9.13:", when="@7.0.1:") depends_on("spfft+single_precision", when="+single_precision ^spfft") @@ -154,13 +153,18 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): depends_on("scalapack", when="+scalapack") + with when("+dlaf"): + depends_on("dla-future@0.3.0:") + depends_on("dla-future +scalapack", when="+scalapack") + depends_on("dla-future +cuda", when="+cuda") + depends_on("dla-future +rocm", when="+rocm") + depends_on("rocblas", when="+rocm") depends_on("rocsolver", when="@7.5.0: +rocm") # FindHIP cmake script only works for < 4.1 depends_on("hip@:4.0", when="@:7.2.0 +rocm") - conflicts("+boost_filesystem", when="~apps") conflicts("^libxc@5.0.0") # known to produce incorrect results conflicts("+single_precision", when="@:7.2.4") conflicts("+scalapack", when="^cray-libsci") @@ -179,7 +183,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): depends_on("eigen@3.4.0:", when="@7.3.2: +tests") - depends_on("costa+shared", when="@7.3.2:") + depends_on("costa", when="@7.3.2:") with when("@7.5: +memory_pool"): depends_on("umpire~cuda~rocm", when="~cuda~rocm") @@ -187,6 +191,7 @@ class Sirius(CMakePackage, CudaPackage, ROCmPackage): depends_on("umpire+rocm~device_alloc", when="+rocm") patch("mpi_datatypes.patch", when="@:7.2.6") + patch("fj.patch", when="@7.3.2: %fj") def cmake_args(self): spec = self.spec @@ -203,15 +208,17 @@ def cmake_args(self): self.define_from_variant(cm_label + "USE_VDWXC", "vdwxc"), self.define_from_variant(cm_label + "USE_MEMORY_POOL", "memory_pool"), self.define_from_variant(cm_label + "USE_SCALAPACK", "scalapack"), + self.define_from_variant(cm_label + "USE_DLAF", "dlaf"), self.define_from_variant(cm_label + "CREATE_FORTRAN_BINDINGS", "fortran"), self.define_from_variant(cm_label + "CREATE_PYTHON_MODULE", "python"), self.define_from_variant(cm_label + "USE_CUDA", "cuda"), self.define_from_variant(cm_label + "USE_ROCM", "rocm"), self.define_from_variant(cm_label + "BUILD_APPS", "apps"), - self.define_from_variant(cm_label + "BUILD_SHARED_LIBS", "shared"), self.define_from_variant(cm_label + "USE_FP32", "single_precision"), self.define_from_variant(cm_label + "USE_PROFILER", "profiler"), + self.define_from_variant(cm_label + "USE_NVTX", "nvtx"), self.define_from_variant(cm_label + "USE_WANNIER90", "wannier90"), + self.define_from_variant("BUILD_SHARED_LIBS", "shared"), self.define_from_variant("BUILD_TESTING", "tests"), ] @@ -254,7 +261,7 @@ def cmake_args(self): cuda_arch = spec.variants["cuda_arch"].value if cuda_arch[0] != "none": # Make SIRIUS handle it - if "@6:7.4.3" in spec: + if "@:7.4.3" in spec: args.append(self.define("CMAKE_CUDA_ARCH", ";".join(cuda_arch))) else: args.append(self.define("CMAKE_CUDA_ARCHITECTURES", ";".join(cuda_arch))) diff --git a/var/spack/repos/builtin/packages/sjpeg/package.py b/var/spack/repos/builtin/packages/sjpeg/package.py index 1479c736154120..82b120f4d95306 100644 --- a/var/spack/repos/builtin/packages/sjpeg/package.py +++ b/var/spack/repos/builtin/packages/sjpeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sjpeg(CMakePackage): homepage = "https://github.com/webmproject/sjpeg" git = "https://github.com/webmproject/sjpeg.git" + license("Apache-2.0") + version("master", branch="master") depends_on("cmake@2.8.7:", type="build") diff --git a/var/spack/repos/builtin/packages/skilion-onedrive/package.py b/var/spack/repos/builtin/packages/skilion-onedrive/package.py index 7f74ff5728a972..116864412f6d64 100644 --- a/var/spack/repos/builtin/packages/skilion-onedrive/package.py +++ b/var/spack/repos/builtin/packages/skilion-onedrive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class SkilionOnedrive(MakefilePackage): homepage = "https://github.com/skilion/onedrive" url = "https://github.com/skilion/onedrive/archive/v1.1.1.tar.gz" + license("GPL-3.0-or-later") + version("1.1.1", sha256="fb51c81ec95c28f3fe3b29e3b7f915e30161bd5f4b14bb53ae5c2233cc1e92e9") depends_on("dmd") @@ -26,7 +28,7 @@ def edit(self, spec, prefix): makefile.filter("$(shell git describe --tags)", "{0}".format(spec.version), string=True) # Patch sqlite.d https://github.com/skilion/onedrive/issues/392 sqlited = FileFilter("src/sqlite.d") - sqlited.filter("std.c.stdlib", "core.stdc.stdlib", String=True) + sqlited.filter("std.c.stdlib", "core.stdc.stdlib", string=True) def build(self, spec, prefix): make("onedrive", "DESTDIR={0}".format(prefix), "PREFIX=/") diff --git a/var/spack/repos/builtin/packages/skopeo/package.py b/var/spack/repos/builtin/packages/skopeo/package.py index a62a71251d6bc0..218b98bfc3a989 100644 --- a/var/spack/repos/builtin/packages/skopeo/package.py +++ b/var/spack/repos/builtin/packages/skopeo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Skopeo(MakefilePackage): homepage = "https://github.com/containers/skopeo" url = "https://github.com/containers/skopeo/archive/v0.1.39.tar.gz" + license("Apache-2.0") + version("0.1.40", sha256="ee1e33245938fcb622f5864fac860e2d8bfa2fa907af4b5ffc3704ed0db46bbf") version("0.1.39", sha256="e9d70f7f7b891675a816f06a22df0490285ad20eefbd91f5da69ca12f56c29f2") version("0.1.38", sha256="104ceb9c582dc5c3a49dd1752c4c326bba03f2f801596f089372e831f48ed705") diff --git a/var/spack/repos/builtin/packages/sl/package.py b/var/spack/repos/builtin/packages/sl/package.py index c20608833e1133..8061eb601ea5b7 100644 --- a/var/spack/repos/builtin/packages/sl/package.py +++ b/var/spack/repos/builtin/packages/sl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sl(MakefilePackage): homepage = "https://github.com/mtoyoda/sl" url = "https://github.com/mtoyoda/sl/archive/5.02.tar.gz" + license("MIT") + version("5.02", sha256="1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/slang/package.py b/var/spack/repos/builtin/packages/slang/package.py index fd4e0209bc3bf7..3da247a8e2dca8 100644 --- a/var/spack/repos/builtin/packages/slang/package.py +++ b/var/spack/repos/builtin/packages/slang/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Slang(AutotoolsPackage): homepage = "https://www.jedsoft.org/slang" url = "https://www.jedsoft.org/releases/slang/slang-2.3.2.tar.bz2" + license("GPL-2.0-or-later") + version("2.3.3", sha256="f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18") version("2.3.2", sha256="fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a") version("2.3.1", sha256="a810d5da7b0c0c8c335393c6b4f12884be6fa7696d9ca9521ef21316a4e00f9d") diff --git a/var/spack/repos/builtin/packages/slate/package.py b/var/spack/repos/builtin/packages/slate/package.py index 778beda83ae1d4..284a350624226d 100644 --- a/var/spack/repos/builtin/packages/slate/package.py +++ b/var/spack/repos/builtin/packages/slate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Slate(CMakePackage, CudaPackage, ROCmPackage): tags = ["e4s"] test_requires_compiler = True + license("BSD-3-Clause") + version("master", branch="master") version( "2023.08.25", sha256="0894d8669ed88358cc7c4cb7b77d8467336613245a7b843f3504e9224632ce0e" diff --git a/var/spack/repos/builtin/packages/sleef/package.py b/var/spack/repos/builtin/packages/sleef/package.py index 79227766691a76..cf64f3eb341175 100644 --- a/var/spack/repos/builtin/packages/sleef/package.py +++ b/var/spack/repos/builtin/packages/sleef/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Sleef(CMakePackage): url = "https://github.com/shibatch/sleef/archive/3.2.tar.gz" git = "https://github.com/shibatch/sleef.git" + license("BSL-1.0") + version("master", branch="master") version("3.5.1_2020-12-22", commit="e0a003ee838b75d11763aa9c3ef17bf71a725bff") # py-torch@1.8: version( @@ -53,10 +55,9 @@ class Sleef(CMakePackage): # conflicts("^mpfr@4.2:") def cmake_args(self): - # Taken from PyTorch's aten/src/ATen/CMakeLists.txt + # https://salsa.debian.org/science-team/sleef/-/blob/master/debian/rules return [ - self.define("BUILD_SHARED_LIBS", False), self.define("BUILD_DFT", False), - self.define("BUILD_GNUABI_LIBS", False), + self.define("SLEEF_TEST_ALL_IUT", True), self.define("BUILD_TESTS", False), ] diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 979a252dd8ae3a..3b88b858e3ebf6 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): test_requires_compiler = True version("main", branch="main") + version("3.20.1", sha256="5a36b664895881d3858d0644f56bf7bb922bdab70d732fa11cbf6442fec11806") version("3.20.0", sha256="780c50260a9bc9b72776cb920774800c73832370938f1d48c2ea5c66d31b7380") version("3.19.2", sha256="ca7ed906795971fbe35f08ee251a26b86a4442a18609b878cba00835c9d62034") version("3.19.1", sha256="280737e9ef762d7f0079ad3ad29913215c799ebf124651c723c1972f71fbc0db") diff --git a/var/spack/repos/builtin/packages/slf4j/package.py b/var/spack/repos/builtin/packages/slf4j/package.py index e8cd345aaf5fa9..897e4233616def 100644 --- a/var/spack/repos/builtin/packages/slf4j/package.py +++ b/var/spack/repos/builtin/packages/slf4j/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Slf4j(MavenPackage): homepage = "http://www.slf4j.org/" url = "https://github.com/qos-ch/slf4j/archive/v_1.7.30.tar.gz" + license("MIT") + version("1.7.30", sha256="217519588d0dd1f85cee2357ca31afdd7c0a1a8a6963953b3bf455cf5174633e") version("1.7.29", sha256="e584f1f380d8c64ed8a45944cec3c2fb4d6b850783fd5bc166a9246bc8b6ac56") version("1.7.28", sha256="14063bfcbc942bda03e07759e64307163c1646d70a42c632f066812a8630eec7") diff --git a/var/spack/repos/builtin/packages/slirp4netns/package.py b/var/spack/repos/builtin/packages/slirp4netns/package.py index f1ae2beadeefed..83e97fcc5b3980 100644 --- a/var/spack/repos/builtin/packages/slirp4netns/package.py +++ b/var/spack/repos/builtin/packages/slirp4netns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Slirp4netns(AutotoolsPackage): url = "https://github.com/rootless-containers/slirp4netns/archive/v1.1.12.tar.gz" maintainers("bernhardkaindl") + license("GPL-2.0-or-later") + version("1.2.0", sha256="b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727") version("1.1.12", sha256="279dfe58a61b9d769f620b6c0552edd93daba75d7761f7c3742ec4d26aaa2962") diff --git a/var/spack/repos/builtin/packages/sloccount/package.py b/var/spack/repos/builtin/packages/sloccount/package.py index 2ab7a6120d818b..ace22a2d3d0726 100644 --- a/var/spack/repos/builtin/packages/sloccount/package.py +++ b/var/spack/repos/builtin/packages/sloccount/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sloccount(MakefilePackage): homepage = "https://dwheeler.com/sloccount/" url = "https://dwheeler.com/sloccount/sloccount-2.26.tar.gz" + license("GPL-2.0-or-later") + version("2.26", sha256="fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b") # md5sum needed at run-time diff --git a/var/spack/repos/builtin/packages/slurm-drmaa/package.py b/var/spack/repos/builtin/packages/slurm-drmaa/package.py index 100b328b9a4dfc..c240de83291d9c 100644 --- a/var/spack/repos/builtin/packages/slurm-drmaa/package.py +++ b/var/spack/repos/builtin/packages/slurm-drmaa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,7 +10,7 @@ class SlurmDrmaa(AutotoolsPackage): """ DRMAA for Slurm is an implementation of Open Grid Forum DRMAA 1.0 (Distributed Resource Management Application API) specification for submission and control of - jobs to SLURM. Using DRMAA, grid applications builders, portal developers and + jobs to Slurm. Using DRMAA, grid applications builders, portal developers and ISVs can use the same high-level API to link their software with different cluster/resource management systems. """ @@ -21,6 +21,8 @@ class SlurmDrmaa(AutotoolsPackage): maintainers("pwablito") + license("GPL-3.0-or-later") + version("main", branch="main", submodules=True) version("1.1.2", sha256="5bfe25d501de83729df3c8c8f28535b9da3e99aea7738e259903abd6f1f5c836") diff --git a/var/spack/repos/builtin/packages/slurm/package.py b/var/spack/repos/builtin/packages/slurm/package.py index aa4f126018bf39..058bcf9adac0a9 100644 --- a/var/spack/repos/builtin/packages/slurm/package.py +++ b/var/spack/repos/builtin/packages/slurm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,13 @@ class Slurm(AutotoolsPackage): homepage = "https://slurm.schedmd.com" url = "https://github.com/SchedMD/slurm/archive/slurm-21-08-8-2.tar.gz" + license("GPL-2.0-or-later") + + version("23-11-1-1", sha256="31506df24c6d24e0ea0329cac1395ab9b645bbde1518f5c469f7711df5e22c11") + version("23-11-0-1", sha256="3780773a80b73ea2edb4353318b4220188f4eda92c31ab3a2bdd3a4fdec76be9") + version("23-02-7-1", sha256="3f60ad5b5a492312d1febb9f9167caa3aee7f8438bb032590a993f5a65c5e4db") + version("23-02-6-1", sha256="ed44d4e591c0f91874d535cb8c9ea67dd2a38bfa4e96fa6c71687293f6a1d3bb") + version("23-02-5-1", sha256="4fee743a34514d8fe487080048256f5ee032374ed5f42d0eae342110dcd59edf") version("23-02-4-1", sha256="7290143a71ce2797d0df3423f08396fd5c0ae4504749ff372d6860b2d6a3a1b0") version("23-02-3-1", sha256="c41747e4484011cf376d6d4bc73b6c4696cdc0f7db4f64174f111bb9f53fb603") version("23-02-2-1", sha256="71edcf187a7d68176cca06143adf98e8f332d42cdf000cb534b03b13834ad537") diff --git a/var/spack/repos/builtin/packages/smalt/package.py b/var/spack/repos/builtin/packages/smalt/package.py index 06af4f6309c260..4890f6d867419a 100644 --- a/var/spack/repos/builtin/packages/smalt/package.py +++ b/var/spack/repos/builtin/packages/smalt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Smalt(AutotoolsPackage, SourceforgePackage): homepage = "https://www.sanger.ac.uk/science/tools/smalt-0" sourceforge_mirror_path = "smalt/smalt-0.7.6.tar.gz" + license("GPL-3.0-only") + version("0.7.6", sha256="89ccdfe471edba3577b43de9ebfdaedb5cd6e26b02bf4000c554253433796b31") diff --git a/var/spack/repos/builtin/packages/smartdenovo/package.py b/var/spack/repos/builtin/packages/smartdenovo/package.py index 61b0732ff98208..2a933fdf0c36e3 100644 --- a/var/spack/repos/builtin/packages/smartdenovo/package.py +++ b/var/spack/repos/builtin/packages/smartdenovo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Smartdenovo(MakefilePackage): homepage = "https://github.com/ruanjue/smartdenovo" git = "https://github.com/ruanjue/smartdenovo.git" + license("GPL-3.0-only") + version("master", branch="master") depends_on("sse2neon", when="target=aarch64:") diff --git a/var/spack/repos/builtin/packages/smartmontools/package.py b/var/spack/repos/builtin/packages/smartmontools/package.py index 301e6b057b2459..a8fa3cde213d3c 100644 --- a/var/spack/repos/builtin/packages/smartmontools/package.py +++ b/var/spack/repos/builtin/packages/smartmontools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Smartmontools(AutotoolsPackage): homepage = "https://smartmontools.sourceforge.net" url = "https://nchc.dl.sourceforge.net/project/smartmontools/smartmontools/6.6/smartmontools-6.6.tar.gz" + license("GPL-2.0-or-later") + version("6.6", sha256="51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054") def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/smee-client/package.py b/var/spack/repos/builtin/packages/smee-client/package.py new file mode 100644 index 00000000000000..649aa609aa4058 --- /dev/null +++ b/var/spack/repos/builtin/packages/smee-client/package.py @@ -0,0 +1,41 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class SmeeClient(Package): + """ + Client and CLI for smee.io, a service that delivers webhooks to your + local development environment. + """ + + homepage = "https://smee.io" + url = "https://github.com/probot/smee-client/archive/refs/tags/v1.2.5.tar.gz" + + maintainers("alecbcs") + + license("ISC") + + version("1.2.3", sha256="b9afff843fc7a3c2b5d6659acf45357b5db7a739243b99f6d18a9b110981a328") + + depends_on("node-js", type=("build", "link", "run")) + depends_on("npm", type="build") + depends_on("typescript", type="build") + + phases = ["build", "install"] + + def build(self, spec, prefix): + npm = which("npm", required=True) + + # Allow tsc to fail with typing "errors" which don't affect results + output = npm("run", "build", output=str, error=str, fail_on_error=False) + if npm.returncode not in (0, 2): + raise InstallError(output) + + def install(self, spec, prefix): + npm = which("npm", required=True) + npm("install", "--global", f"--prefix={prefix}") diff --git a/var/spack/repos/builtin/packages/smof/package.py b/var/spack/repos/builtin/packages/smof/package.py index a751c220cb88a5..6f9a812e637944 100644 --- a/var/spack/repos/builtin/packages/smof/package.py +++ b/var/spack/repos/builtin/packages/smof/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Smof(Package): homepage = "https://github.com/incertae-sedis/smof" url = "https://github.com/incertae-sedis/smof/archive/2.13.1.tar.gz" + license("GPL-2.0-or-later") + version("2.13.1", sha256="bae75703728c62398f2af58b142ab2555f9be2224e13ff108913607777ea2a2e") depends_on("python@3:", type="run") diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py index d39f22e5d3e5bb..1c9d463ea60abb 100644 --- a/var/spack/repos/builtin/packages/smproxy/package.py +++ b/var/spack/repos/builtin/packages/smproxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index a331b0e5c2aa94..226fdb5bae3e56 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,9 +10,20 @@ class Snakemake(PythonPackage): """Snakemake is an MIT-licensed workflow management system.""" homepage = "https://snakemake.readthedocs.io/en/stable/" - pypi = "snakemake/snakemake-6.12.3.tar.gz" + pypi = "snakemake/snakemake-7.32.4.tar.gz" maintainers("marcusboden") + license("MIT") + + version("7.32.4", sha256="fdc3f15dd7b06fabb7da30d460e0a3b1fba08e4ea91f9c32c47a83705cdc7b6e") + version("7.31.1", sha256="6fadcc9a051737aa187dccf437879b3b83ddc917fff9bd7d400e056cf17a1788") + version("7.30.2", sha256="0cb86cf9b43b9f2f45d5685cd932595131031c7087690f64c5bc7eaec88df029") + version("7.29.0", sha256="c420a545924b599390efe9e2fa7a07c01d167cceac63d1d06fa6eff5e7b43be0") + version("7.28.3", sha256="4d0d5f9643d97154cd8925830bdb3922e4bd9cfcf7f8b619df75e4ddfdbc3f9e") + version("7.26.0", sha256="5e5b4750a943f73a1b62979ccac203f4bc87876559f5e44d0ce9305ac198aff0") + version("7.25.4", sha256="e89146fd0df196a9135dcf41c9c70841551aa4735a18da9e0402bda6746afdcc") + version("7.24.2", sha256="3e9bcbb9743aa2a073922e90659e9209edbea89e6d22bf7b29ea538e60983908") + version("7.23.1", sha256="4dc960a721d2d8eaebd9b10e56564e3742f78c65d36cd31966ed205afcc4253d") version("7.22.0", sha256="68d7bb4ab7555f7b58a3ba748a880024df919042cfb670da231886385de697cd") version("7.21.0", sha256="ebf91f4ca5c70809fcbfd2e8cbc982096cdadac1ec34138bb147b4a8c975c85b") version("7.20.0", sha256="f5b45191f1d419ebf28606880cb9bfac3bfa7c5949d1d2b64f551586d4212a2a") @@ -23,55 +34,74 @@ class Snakemake(PythonPackage): version("6.13.1", sha256="22f57dcd8b1ca8a30aaa45c5d2c0f56d381d4731abd0988f24f9de46b7d9827c") version("6.12.3", sha256="af86af9a540da3dceb05dad1040f1d3d733e6a695f8b3f8c30f8cf3bc6570a88") - depends_on("py-setuptools", type=("build", "run")) - depends_on("py-setuptools@42:", type=("build", "run"), when="@7:") + depends_on("python@3.11:", type=("build", "run"), when="@8:") + depends_on("python@3.7:", type=("build", "run"), when="@7.31.1:7") + depends_on("python@3.9:", type=("build", "run"), when="@7.30.2:7.31.1") - # See https://github.com/snakemake/snakemake/pull/2065 + depends_on("py-setuptools@42:", type=("build", "run"), when="@7:") + depends_on("py-setuptools", type=("build", "run")) depends_on("py-tomli", type=("build"), when="@7.20.0: ^python@:3.10") - # See https://github.com/snakemake/snakemake/blob/v7.20.0/setup.cfg#L44 - depends_on("py-humanfriendly", type=("build", "run"), when="@7.20.0:") - # See https://github.com/snakemake/snakemake/blob/v7.18.2/setup.py#L56 - depends_on("py-wrapt", type=("build", "run")) - depends_on("py-requests", type=("build", "run")) - depends_on("py-throttler", type=("build", "run"), when="@7:") - depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-configargparse", type=("build", "run")) + depends_on("py-appdirs", type=("build", "run")) + depends_on("py-configargparse", type=("build", "run")) + depends_on("py-connectionpool@0.0.3:", type=("build", "run")) depends_on("py-datrie", type=("build", "run")) - depends_on("py-jsonschema", type=("build", "run")) depends_on("py-docutils", type=("build", "run")) depends_on("py-gitpython", type=("build", "run")) - depends_on("py-psutil", type=("build", "run")) + depends_on("py-humanfriendly", type=("build", "run"), when="@7.20.0:") + depends_on("py-jinja2@3", type=("build", "run"), when="@7:") + depends_on("py-jsonschema", type=("build", "run")) depends_on("py-nbformat", type=("build", "run")) - depends_on("py-toposort", type=("build", "run")) - depends_on("py-connectionpool@0.0.3:", type=("build", "run")) + depends_on("py-packaging", type=("build", "run"), when="@7.29.0:") + depends_on("py-psutil", type=("build", "run")) depends_on("py-pulp@2:", type=("build", "run")) + depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-requests", type=("build", "run")) + depends_on("py-reretry", type=("build", "run"), when="@7:") depends_on("py-smart-open@3:", type=("build", "run")) - depends_on("py-filelock", type=("build", "run"), when="@:6") depends_on("py-stopit", type=("build", "run")) depends_on("py-tabulate", type=("build", "run")) - depends_on("py-ratelimiter", type=("build", "run"), when="@:6") - depends_on("py-yte@1", type=("build", "run"), when="@7:") - depends_on("py-jinja2@3", type=("build", "run"), when="@7:") - depends_on("py-reretry", type=("build", "run"), when="@7:") + depends_on("py-throttler", type=("build", "run"), when="@7:") + depends_on("py-toposort@1.10:", type=("build", "run"), when="@7.24.0:") + depends_on("py-toposort", type=("build", "run"), when="@:7.23") + depends_on("py-wrapt", type=("build", "run")) + depends_on("py-yte@1.5.1:1", type=("build", "run"), when="@7.28.1:") + depends_on("py-yte@1", type=("build", "run"), when="@7:7.28.0") variant("reports", default=False, description="Generate self-contained HTML reports") + with when("+reports"): - depends_on("py-jinja2", type=("build", "run"), when="@:7.19.1") depends_on("py-pygments", type=("build", "run")) - # https://github.com/snakemake/snakemake/pull/1470 + # Historical dependencies + depends_on("py-jinja2", type=("build", "run"), when="@:7.19.1") depends_on("py-networkx", type=("build", "run"), when="@:7.1.1") depends_on("py-pygraphviz", type=("build", "run"), when="@:7.1.1") variant("google-cloud", default=False, description="Enable Google Cloud execution") + with when("+google-cloud"): - depends_on("py-oauth2client", type=("build", "run")) - depends_on("py-google-crc32c", type=("build", "run")) depends_on("py-google-api-python-client", type=("build", "run")) depends_on("py-google-cloud-storage", type=("build", "run")) + depends_on("py-google-crc32c", type=("build", "run")) + depends_on("py-oauth2client", type=("build", "run")) + + variant("azure", default=False, description="Enable Azure execution", when="@7.28.0:") + + with when("+azure"): + depends_on("py-azure-storage-blob", type=("build", "run")) + depends_on("py-azure-batch", type=("build", "run")) + depends_on("py-azure-core", type=("build", "run")) + depends_on("py-azure-identity", type=("build", "run")) + depends_on("py-azure-mgmt-batch", type=("build", "run")) + + # Historical dependencies + depends_on("py-msrest", type=("build", "run"), when="@7.28.0") + depends_on("py-filelock", type=("build", "run"), when="@:6") + depends_on("py-ratelimiter", type=("build", "run"), when="@:6") # These variants are not in PyPI/pip, but they are undocumented dependencies # needed to make certain parts of Snakemake work. + variant("ftp", default=False, description="Enable snakemake.remote.FTP") depends_on("py-ftputil", when="+ftp", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/snap-berkeley/package.py b/var/spack/repos/builtin/packages/snap-berkeley/package.py index ab9e3f6e0d1e0e..03fed202d81a16 100644 --- a/var/spack/repos/builtin/packages/snap-berkeley/package.py +++ b/var/spack/repos/builtin/packages/snap-berkeley/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class SnapBerkeley(MakefilePackage): url = "https://github.com/amplab/snap/archive/v1.0beta.18.tar.gz" maintainers("snehring") + license("Apache-2.0") + version("2.0.3", sha256="8a47cfa929827e60d45dbd436ba2d1119cb2161bd5b6be99eaedac01fb6fc33a") version("2.0.1", sha256="30f199c583e054c50ca6f3b61f27066640b7c829e5c5e8083841596a2869c064") version( diff --git a/var/spack/repos/builtin/packages/snap-korf/package.py b/var/spack/repos/builtin/packages/snap-korf/package.py index d7988fe677d680..1887b94da563f8 100644 --- a/var/spack/repos/builtin/packages/snap-korf/package.py +++ b/var/spack/repos/builtin/packages/snap-korf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class SnapKorf(MakefilePackage): url = "http://korflab.ucdavis.edu/Software/snap-2013-11-29.tar.gz" git = "https://github.com/KorfLab/SNAP.git" + license("MIT") + version("2021-11-04", commit="62ff3120fceccb03b5eea9d21afec3167dedfa94") version( "2013-11-29", sha256="e2a236392d718376356fa743aa49a987aeacd660c6979cee67121e23aeffc66a" diff --git a/var/spack/repos/builtin/packages/snap/package.py b/var/spack/repos/builtin/packages/snap/package.py index 5a4e42a8da53ad..1c26c4a03c8a72 100644 --- a/var/spack/repos/builtin/packages/snap/package.py +++ b/var/spack/repos/builtin/packages/snap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Snap(MakefilePackage): tags = ["proxy-app"] + license("Unlicense") + version("master") variant("openmp", default=False, description="Build with OpenMP support") diff --git a/var/spack/repos/builtin/packages/snappy/package.py b/var/spack/repos/builtin/packages/snappy/package.py index 971d635291b144..796ea1af8493ed 100644 --- a/var/spack/repos/builtin/packages/snappy/package.py +++ b/var/spack/repos/builtin/packages/snappy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Snappy(CMakePackage): homepage = "https://github.com/google/snappy" url = "https://github.com/google/snappy/archive/1.1.8.tar.gz" + license("BSD-3-Clause") + version("1.1.10", sha256="49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90") version("1.1.9", sha256="75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7") version("1.1.8", sha256="16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f") diff --git a/var/spack/repos/builtin/packages/snbone/package.py b/var/spack/repos/builtin/packages/snbone/package.py index 1011f78eafe7ec..3671cda0640999 100644 --- a/var/spack/repos/builtin/packages/snbone/package.py +++ b/var/spack/repos/builtin/packages/snbone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sniffles/package.py b/var/spack/repos/builtin/packages/sniffles/package.py index ffa92ae83810a2..2c8e4d65c536a6 100644 --- a/var/spack/repos/builtin/packages/sniffles/package.py +++ b/var/spack/repos/builtin/packages/sniffles/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sniffles(CMakePackage): homepage = "https://github.com/fritzsedlazeck/Sniffles/wiki" url = "https://github.com/fritzsedlazeck/Sniffles/archive/v1.0.5.tar.gz" + license("MIT") + version("1.0.7", sha256="03fa703873bdf9c32055c584448e1eece45f94b4bc68e60c9624cf3841e6d8a9") version("1.0.5", sha256="386c6536bdaa4637579e235bac48444c08297337c490652d1e165accd34b258f") diff --git a/var/spack/repos/builtin/packages/snpeff/package.py b/var/spack/repos/builtin/packages/snpeff/package.py index 0381ad02c3c5d3..975cf0b0f669f5 100644 --- a/var/spack/repos/builtin/packages/snpeff/package.py +++ b/var/spack/repos/builtin/packages/snpeff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/snphylo/package.py b/var/spack/repos/builtin/packages/snphylo/package.py index 108a98403b2fad..7b5d1a47bf3c83 100644 --- a/var/spack/repos/builtin/packages/snphylo/package.py +++ b/var/spack/repos/builtin/packages/snphylo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Snphylo(Package): homepage = "http://chibba.pgml.uga.edu/snphylo/" url = "https://github.com/thlee/SNPhylo/archive/refs/tags/20180901.tar.gz" + license("GPL-2.0-only") + version("20180901", sha256="46273bcafc8f6cc2465fc524926af7dd122bcc7b7ce1b7c3f5c278111c3a9ddd") version( "2016-02-04", diff --git a/var/spack/repos/builtin/packages/snptest/package.py b/var/spack/repos/builtin/packages/snptest/package.py index 6c79de1d7ae8f0..1795b605e7f718 100644 --- a/var/spack/repos/builtin/packages/snptest/package.py +++ b/var/spack/repos/builtin/packages/snptest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py index 6dd83ef30e2905..b57bc0e2cd8a66 100644 --- a/var/spack/repos/builtin/packages/soapdenovo-trans/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo-trans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class SoapdenovoTrans(MakefilePackage): url = "https://github.com/aquaskyline/SOAPdenovo-Trans/archive/1.0.4.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("1.0.5", sha256="c1903c0d81142270db95916e2833400f72c4841b5c9194f182c19ebda418936f") version("1.0.4", sha256="378a54cde0ebe240fb515ba67197c053cf95393645c1ae1399b3a611be2a9795") diff --git a/var/spack/repos/builtin/packages/soapdenovo2/package.py b/var/spack/repos/builtin/packages/soapdenovo2/package.py index 57f84d00c79dca..201506ba90c071 100644 --- a/var/spack/repos/builtin/packages/soapdenovo2/package.py +++ b/var/spack/repos/builtin/packages/soapdenovo2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Soapdenovo2(MakefilePackage): url = "https://github.com/aquaskyline/SOAPdenovo2/archive/r240.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("242", sha256="a0043ceb41bc17a1c3fd2b8abe4f9029a60ad3edceb2b15af3c2cfabd36aa11b") version("240", sha256="cc9e9f216072c0bbcace5efdead947e1c3f41f09baec5508c7b90f933a090909") diff --git a/var/spack/repos/builtin/packages/socat/package.py b/var/spack/repos/builtin/packages/socat/package.py index 44fc720654314b..6b19b479a613e8 100644 --- a/var/spack/repos/builtin/packages/socat/package.py +++ b/var/spack/repos/builtin/packages/socat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Socat(AutotoolsPackage): maintainers("michaelkuhn") + license("GPL-2.0-only WITH OpenSSL-Exception") + version("1.7.4.4", sha256="fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac") depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/soci/package.py b/var/spack/repos/builtin/packages/soci/package.py index c9f478c394efbc..ef165f41953dff 100644 --- a/var/spack/repos/builtin/packages/soci/package.py +++ b/var/spack/repos/builtin/packages/soci/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Soci(CMakePackage): homepage = "https://github.com/SOCI/soci" url = "https://github.com/SOCI/soci/archive/v4.0.2.tar.gz" + license("BSL-1.0") + version("4.0.2", sha256="f293192a412ed82693d17dfe46e2734b140bff835bc3259e3cbd7c315e5e2d74") version("4.0.0", sha256="359b988d8cbe81357835317821919f7e270c0705e41951a92ac1627cb9fe8faf") version( diff --git a/var/spack/repos/builtin/packages/sofa-c/package.py b/var/spack/repos/builtin/packages/sofa-c/package.py index 4ede096dad2719..758b5c3583e157 100644 --- a/var/spack/repos/builtin/packages/sofa-c/package.py +++ b/var/spack/repos/builtin/packages/sofa-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sollve/package.py b/var/spack/repos/builtin/packages/sollve/package.py index 6a617eae342979..3cb3e5cd7eb8a4 100644 --- a/var/spack/repos/builtin/packages/sollve/package.py +++ b/var/spack/repos/builtin/packages/sollve/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -259,7 +259,6 @@ def cmake_args(self): "-DLLVM_ENABLE_RTTI:BOOL=ON", "-DLLVM_ENABLE_EH:BOOL=ON", "-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp", - "-DPYTHON_EXECUTABLE:PATH={0}".format(spec["python"].command.path), ] # TODO: Instead of unconditionally disabling CUDA, add a "cuda" variant diff --git a/var/spack/repos/builtin/packages/sollya/package.py b/var/spack/repos/builtin/packages/sollya/package.py index dba1d6981adcd1..f146d78900554a 100644 --- a/var/spack/repos/builtin/packages/sollya/package.py +++ b/var/spack/repos/builtin/packages/sollya/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sollya(AutotoolsPackage): homepage = "https://www.sollya.org" url = "https://www.sollya.org/releases/sollya-7.0/sollya-7.0.tar.bz2" + license("LGPL-3.0-or-later") + version("7.0", sha256="15745871f7dd3e96e12915098dd6df2078b815853a38143b2bc6c01477044984") depends_on("gmp") diff --git a/var/spack/repos/builtin/packages/solr/package.py b/var/spack/repos/builtin/packages/solr/package.py index 39312733a118a0..5b7ff248e79598 100644 --- a/var/spack/repos/builtin/packages/solr/package.py +++ b/var/spack/repos/builtin/packages/solr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Solr(Package): depends_on("java", type="run") + license("CC-BY-2.5") + version("8.11.2", sha256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6") version("8.6.0", sha256="4519ccdb531619df770f1065db6adcedc052c7aa94b42806d541966550956aa5") version("8.5.2", sha256="c457d6c7243241cad141e1df34c6f669d58a6c60e537f4217d032616dd066dcf") diff --git a/var/spack/repos/builtin/packages/somatic-sniper/package.py b/var/spack/repos/builtin/packages/somatic-sniper/package.py index 38a704a1ab4c17..da9be147fa448b 100644 --- a/var/spack/repos/builtin/packages/somatic-sniper/package.py +++ b/var/spack/repos/builtin/packages/somatic-sniper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class SomaticSniper(CMakePackage): homepage = "https://gmt.genome.wustl.edu/packages/somatic-sniper" url = "https://github.com/genome/somatic-sniper/archive/v1.0.5.0.tar.gz" + license("MIT") + version("1.0.5.0", sha256="fc41e90237b059fcc591e404830c4b1be678642dd5afd76ce545b97b4b7b3de1") depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/sombrero/package.py b/var/spack/repos/builtin/packages/sombrero/package.py index 23fcfcf148c143..4fcde4280dc817 100644 --- a/var/spack/repos/builtin/packages/sombrero/package.py +++ b/var/spack/repos/builtin/packages/sombrero/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sombrero(MakefilePackage): homepage = "https://github.com/sa2c/sombrero" url = "https://github.com/sa2c/sombrero/archive/refs/tags/1.0.tar.gz" + license("GPL-2.0-only") + version( "2021-08-16", sha256="f62aa1934fef6a025449a9e037345043072be6198f92087853c58c67f1342f73" ) diff --git a/var/spack/repos/builtin/packages/sonlib/package.py b/var/spack/repos/builtin/packages/sonlib/package.py index a3c268b0fb90d1..7c31f41883bde3 100644 --- a/var/spack/repos/builtin/packages/sonlib/package.py +++ b/var/spack/repos/builtin/packages/sonlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Sonlib(MakefilePackage): url = "https://github.com/ComparativeGenomicsToolkit/sonLib" git = "https://github.com/ComparativeGenomicsToolkit/sonLib.git" + license("MIT") + version("master", branch="master") version("2020-04-01", commit="7ebe2ede05a6ee366d93a7a993db69a99943a68f") diff --git a/var/spack/repos/builtin/packages/sortmerna/package.py b/var/spack/repos/builtin/packages/sortmerna/package.py index 8a9cec6c261108..11213ac876187d 100644 --- a/var/spack/repos/builtin/packages/sortmerna/package.py +++ b/var/spack/repos/builtin/packages/sortmerna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Sortmerna(CMakePackage): homepage = "https://github.com/biocore/sortmerna" git = "https://github.com/biocore/sortmerna.git" + license("LGPL-3.0-or-later") + version("2017-07-13", commit="8bde6fa113a5d99a23ae81b48eeea6760e966094") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/sos/package.py b/var/spack/repos/builtin/packages/sos/package.py index 9234c7ab9d5d7a..fc3465624bf881 100644 --- a/var/spack/repos/builtin/packages/sos/package.py +++ b/var/spack/repos/builtin/packages/sos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sos(AutotoolsPackage): # notify when the package is updated. maintainers("rscohn2") + license("GPL-2.0-or-later") + version("1.5.2", sha256="c9df8c6ab43890e5d8970467c188ae2fad736845875ca4c370ff047dbb37d017") version("1.5.1", sha256="0a6303dcbdd713ef2d83c617c1eb821227603c98cb9816c53585fd993da8a984") version("1.5.0", sha256="02679da6085cca2919f900022c46bad48479690586cb4e7f971ec3a735bab4d4") diff --git a/var/spack/repos/builtin/packages/sosflow/package.py b/var/spack/repos/builtin/packages/sosflow/package.py index 35794faa3da49b..0551a3bd6aab96 100644 --- a/var/spack/repos/builtin/packages/sosflow/package.py +++ b/var/spack/repos/builtin/packages/sosflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/source-highlight/package.py b/var/spack/repos/builtin/packages/source-highlight/package.py index 777aef051d1210..c4fdf0f0c294e9 100644 --- a/var/spack/repos/builtin/packages/source-highlight/package.py +++ b/var/spack/repos/builtin/packages/source-highlight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class SourceHighlight(AutotoolsPackage, GNUMirrorPackage): gnu_mirror_path = "src-highlite/source-highlight-3.1.8.tar.gz" git = "https://git.savannah.gnu.org/git/src-highlite.git" + license("GPL-3.0-or-later") + version("master", branch="master") version("3.1.9", sha256="3a7fd28378cb5416f8de2c9e77196ec915145d44e30ff4e0ee8beb3fe6211c91") version("3.1.8", sha256="01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3") diff --git a/var/spack/repos/builtin/packages/sourmash/package.py b/var/spack/repos/builtin/packages/sourmash/package.py index 2c02ce865d502c..102fc499ee5aaa 100644 --- a/var/spack/repos/builtin/packages/sourmash/package.py +++ b/var/spack/repos/builtin/packages/sourmash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sowing/package.py b/var/spack/repos/builtin/packages/sowing/package.py index 2b21b54dbdab76..d4f4b32edad961 100644 --- a/var/spack/repos/builtin/packages/sowing/package.py +++ b/var/spack/repos/builtin/packages/sowing/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sox/package.py b/var/spack/repos/builtin/packages/sox/package.py index 70f3c567d89070..f3f74d329970be 100644 --- a/var/spack/repos/builtin/packages/sox/package.py +++ b/var/spack/repos/builtin/packages/sox/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sp/package.py b/var/spack/repos/builtin/packages/sp/package.py index ad96799da4d4da..cc20911c3418db 100644 --- a/var/spack/repos/builtin/packages/sp/package.py +++ b/var/spack/repos/builtin/packages/sp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spack/package.py b/var/spack/repos/builtin/packages/spack/package.py index ba1e026e81c69c..2be50b2314c9c4 100644 --- a/var/spack/repos/builtin/packages/spack/package.py +++ b/var/spack/repos/builtin/packages/spack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,11 @@ class Spack(Package): url = "https://github.com/spack/spack/releases/download/v0.16.2/spack-0.16.2.tar.gz" maintainers("haampie") + license("Apache-2.0 OR MIT") + version("develop", branch="develop") + version("0.21.1", sha256="9a66bc8b59d436d5c0bd7b052c36d2177b228665ece6c9a2c339c2acb3f9103e") + version("0.21.0", sha256="98680e52591428dc194a021e673a79bdc7799f394c1217b3fc22c89465159a84") version("0.20.1", sha256="141be037b56e4b095840a95ac51c428c29dad078f7f88140ae6355b2a1b32dc3") version("0.20.0", sha256="a189b4e8173eefdf76617445125b329d912f730767048846c38c8a2637396a7d") version("0.19.2", sha256="4978b37da50f5690f4e1aa0cfe3975a89ccef85d96c68d417ea0716a8ce3aa98") @@ -65,6 +69,7 @@ class Spack(Package): depends_on("python@2.6.0:2.7,3.5:", type="run") depends_on("python@2.7.0:2.7,3.5:", type="run", when="@0.18.0:") depends_on("python@2.7.0:2.7,3.6:", type="run", when="@0.19.0:") + depends_on("python@3.6:", type="run", when="@0.20.0:") # Old Spack unfortunately depends on distutils, removed in Python 3.12 depends_on("python@:3.12", type="run", when="@0.18:0.20.1") diff --git a/var/spack/repos/builtin/packages/spades/package.py b/var/spack/repos/builtin/packages/spades/package.py index d257645a91e900..d5cbb114392c64 100644 --- a/var/spack/repos/builtin/packages/spades/package.py +++ b/var/spack/repos/builtin/packages/spades/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/span-lite/package.py b/var/spack/repos/builtin/packages/span-lite/package.py index e72266a06ac61f..0ea94646d69362 100644 --- a/var/spack/repos/builtin/packages/span-lite/package.py +++ b/var/spack/repos/builtin/packages/span-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class SpanLite(CMakePackage): url = "https://github.com/martinmoene/span-lite/archive/v0.10.3.tar.gz" git = "https://github.com/martinmoene/span-lite" + license("BSL-1.0") + version("0.10.3", sha256="04ac8148760369f11d4cdbc7969d66cb3d372357b6b5c7744841a60551ccb50b") version("0.9.2", sha256="7562802aac9b78e0140c3d59933cf4dc5825c0712c63daad2f7fff8c67e62eb4") version("0.8.1", sha256="2136dba54988c16b03f7c652ea977205bf624bfde90c24331177027d6529386d") diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index bb1b582224f6eb..faf15b8398c4d4 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Spark(Package): depends_on("java", type=("build", "run")) depends_on("hadoop", when="+hadoop", type=("build", "run")) + license("Apache-2.0") + version("3.1.1", sha256="2d16f527016993e69a7c801233e661a170e3099ae2d9b950f7457729d63062f4") version("3.0.2", sha256="1a904f9bfa44a1218cb440c99800dd2ae729249a73c63b3bb10e431ed5b58406") version("3.0.1", sha256="ddda310ac09e3f2da9c33ad278b1665fbad2411d8da127d0de86b90019e962dc") diff --git a/var/spack/repos/builtin/packages/sparrow/package.py b/var/spack/repos/builtin/packages/sparrow/package.py index 17cedfba92ee82..249d8e12fb78d1 100644 --- a/var/spack/repos/builtin/packages/sparrow/package.py +++ b/var/spack/repos/builtin/packages/sparrow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sparse/package.py b/var/spack/repos/builtin/packages/sparse/package.py index 18f5e0da090c4a..c1d7313076b65c 100644 --- a/var/spack/repos/builtin/packages/sparse/package.py +++ b/var/spack/repos/builtin/packages/sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sparse(MakefilePackage): maintainers("wortiz") + license("MIT") + version("1.4b", sha256="63e6646244fd8f4d89f7f70fbf4cfd46b7688d21b22840a0ce57d294a7496d28") variant("pic", default=True, description="Build with position independent code") diff --git a/var/spack/repos/builtin/packages/sparsehash/package.py b/var/spack/repos/builtin/packages/sparsehash/package.py index 1e6761634cbe97..77559709326968 100644 --- a/var/spack/repos/builtin/packages/sparsehash/package.py +++ b/var/spack/repos/builtin/packages/sparsehash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,5 +12,7 @@ class Sparsehash(AutotoolsPackage): homepage = "https://github.com/sparsehash/sparsehash" url = "https://github.com/sparsehash/sparsehash/archive/sparsehash-2.0.4.tar.gz" + license("BSD-3-Clause") + version("2.0.4", sha256="8cd1a95827dfd8270927894eb77f62b4087735cbede953884647f16c521c7e58") version("2.0.3", sha256="05e986a5c7327796dad742182b2d10805a8d4f511ad090da0490f146c1ff7a8c") diff --git a/var/spack/repos/builtin/packages/sparskit/package.py b/var/spack/repos/builtin/packages/sparskit/package.py index 3d029158554a74..67d3741712e88f 100644 --- a/var/spack/repos/builtin/packages/sparskit/package.py +++ b/var/spack/repos/builtin/packages/sparskit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Sparskit(MakefilePackage): homepage = "https://www-users.cse.umn.edu/~saad/software/SPARSKIT/" + license("LGPL-2.1-or-later") + version( "develop", sha256="ecdd0a9968d6b45153a328710a42fe87600f0bba0e3c53896090b8ae1c113b7a", diff --git a/var/spack/repos/builtin/packages/sparta/package.py b/var/spack/repos/builtin/packages/sparta/package.py index 995cf3c1b7d61b..059779186389cf 100644 --- a/var/spack/repos/builtin/packages/sparta/package.py +++ b/var/spack/repos/builtin/packages/sparta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spath/package.py b/var/spack/repos/builtin/packages/spath/package.py index fb4441bd1f10c0..62cac22998c280 100644 --- a/var/spack/repos/builtin/packages/spath/package.py +++ b/var/spack/repos/builtin/packages/spath/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Spath(CMakePackage): maintainers("CamStan", "gonsie") + license("MIT") + version("main", branch="main") version("0.3.0", sha256="cb155a31cebde8b7bf397123de3be290fd99d3863509b4ba9b0252caba660082") version("0.2.0", sha256="2de8a25547b53ef064664d79b543141bc3020219f40ff0e1076f676e13a9e77a") diff --git a/var/spack/repos/builtin/packages/spdk/package.py b/var/spack/repos/builtin/packages/spdk/package.py index 0dab950c55ebe9..d4766691db68cd 100644 --- a/var/spack/repos/builtin/packages/spdk/package.py +++ b/var/spack/repos/builtin/packages/spdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Spdk(AutotoolsPackage): git = "https://github.com/spdk/spdk" maintainers("hyoklee") + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version( "23.01", tag="v23.01", commit="10edc60aa8b5f1b04d6496fea976dec75e276a95", submodules=True diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index 36dc0a19b9a8ee..a1281c3ab8726a 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Spdlog(CMakePackage): homepage = "https://github.com/gabime/spdlog" url = "https://github.com/gabime/spdlog/archive/v0.9.0.tar.gz" + license("MIT") + version("1.12.0", sha256="4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9") version("1.11.0", sha256="ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb") version("1.10.0", sha256="697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224") diff --git a/var/spack/repos/builtin/packages/specfem3d-globe/package.py b/var/spack/repos/builtin/packages/specfem3d-globe/package.py index 320cd255a7c61a..937975855c08c6 100644 --- a/var/spack/repos/builtin/packages/specfem3d-globe/package.py +++ b/var/spack/repos/builtin/packages/specfem3d-globe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Specfem3dGlobe(AutotoolsPackage, CudaPackage): homepage = "https://github.com/geodynamics/specfem3d_globe" url = "https://github.com/geodynamics/specfem3d_globe/archive/v7.0.2.tar.gz" + license("GPL-3.0-only") + version("8.0.0", sha256="3e234e66fce4cc5484c651584187b255f951ee6cd1ec057e6aa6d42aced9052d") version("7.0.2", sha256="78b4cfbe4e5121927ab82a8c2e821b65cdfff3e94d017303bf21af7805186d9b") diff --git a/var/spack/repos/builtin/packages/spectra/package.py b/var/spack/repos/builtin/packages/spectra/package.py index eee0c76141eab0..5288beecfe5b65 100644 --- a/var/spack/repos/builtin/packages/spectra/package.py +++ b/var/spack/repos/builtin/packages/spectra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Spectra(CMakePackage): url = "https://github.com/yixuan/spectra/archive/refs/tags/v1.0.1.tar.gz" maintainers("snehring") + license("MPL-2.0") + version("1.0.1", sha256="919e3fbc8c539a321fd5a0766966922b7637cc52eb50a969241a997c733789f3") version("1.0.0", sha256="45228b7d77b916b5384245eb13aa24bc994f3b0375013a8ba6b85adfd2dafd67") version("0.9.0", sha256="2966757d432e8fba5958c2a05ad5674ce34eaae3718dd546c1ba8760b80b7a3d") diff --git a/var/spack/repos/builtin/packages/spectre/package.py b/var/spack/repos/builtin/packages/spectre/package.py index df0ff30acd88db..6d288e8fea0f97 100644 --- a/var/spack/repos/builtin/packages/spectre/package.py +++ b/var/spack/repos/builtin/packages/spectre/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -28,6 +28,8 @@ class Spectre(CMakePackage): generator("ninja") + license("MIT") + version("develop", branch="develop") version( "2023.10.11", sha256="f25d17bc80cc49ebdd81726326701fe9ecd2b6705d86e6e3d48d9e4a458c8aff" @@ -305,7 +307,6 @@ def cmake_args(self): args = [ self.define("CHARM_ROOT", self.spec["charmpp"].prefix), self.define_from_variant("BUILD_SHARED_LIBS", "shared"), - self.define("Python_EXECUTABLE", self.spec["python"].command.path), self.define_from_variant("BUILD_PYTHON_BINDINGS", "python"), self.define("BUILD_TESTING", self.run_tests), self.define_from_variant("BUILD_DOCS", "doc"), diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py index ea5c29d322db16..ca7a55e599c2a6 100644 --- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py +++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -56,6 +56,14 @@ def get_spack_compiler_spec(compilers_found): break return actual_compiler.spec if actual_compiler else None + def get_opal_prefix(exe): + output = Executable(exe)(output=str, error=str) + match = re.search(r"Prefix: (\S+)", output) + if not match: + return None + opal_prefix = match.group(1) + return opal_prefix + results = [] for exe in exes: dirname = os.path.dirname(exe) @@ -83,9 +91,14 @@ def get_spack_compiler_spec(compilers_found): # results.append((variant, {'compilers': compilers_found})) # # Otherwise, use this simpler attribute - results.append(variant) else: - results.append("") + variant = "" + opal_prefix = get_opal_prefix(exe) + if opal_prefix: + extra_attributes = {"opal_prefix": opal_prefix} + results.append((variant, extra_attributes)) + else: + results.append(variant) return results def setup_dependent_package(self, module, dependent_spec): @@ -148,3 +161,6 @@ def setup_run_environment(self, env): env.set("MPICXX", os.path.join(self.prefix.bin, "mpic++")) env.set("MPIF77", os.path.join(self.prefix.bin, "mpif77")) env.set("MPIF90", os.path.join(self.prefix.bin, "mpif90")) + + env.set("OPAL_PREFIX", self.spec.extra_attributes.get("opal_prefix", self.prefix)) + env.set("MPI_ROOT", self.spec.extra_attributes.get("opal_prefix", self.prefix)) diff --git a/var/spack/repos/builtin/packages/speex/package.py b/var/spack/repos/builtin/packages/speex/package.py index ce21d93f5bcea0..63867eca451957 100644 --- a/var/spack/repos/builtin/packages/speex/package.py +++ b/var/spack/repos/builtin/packages/speex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class Speex(AutotoolsPackage): homepage = "https://speex.org" url = "http://downloads.us.xiph.org/releases/speex/speex-1.2.0.tar.gz" + license("BSD-3-Clause") + version("1.2.1", sha256="4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea") version("1.2.0", sha256="eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094") diff --git a/var/spack/repos/builtin/packages/speexdsp/package.py b/var/spack/repos/builtin/packages/speexdsp/package.py index 5587801083f67c..8e5ebd571cc0e6 100644 --- a/var/spack/repos/builtin/packages/speexdsp/package.py +++ b/var/spack/repos/builtin/packages/speexdsp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Speexdsp(AutotoolsPackage): homepage = "https://github.com/xiph/speexdsp" url = "https://github.com/xiph/speexdsp/archive/SpeexDSP-1.2.0.tar.gz" + license("BSD-3-Clause") + version("1.2.1", sha256="d17ca363654556a4ff1d02cc13d9eb1fc5a8642c90b40bd54ce266c3807b91a7") version("1.2.0", sha256="d7032f607e8913c019b190c2bccc36ea73fc36718ee38b5cdfc4e4c0a04ce9a4") diff --git a/var/spack/repos/builtin/packages/sperr/package.py b/var/spack/repos/builtin/packages/sperr/package.py index 5def42991f7d5b..e048996bb68a3e 100644 --- a/var/spack/repos/builtin/packages/sperr/package.py +++ b/var/spack/repos/builtin/packages/sperr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Sperr(CMakePackage): git = "https://github.com/NCAR/SPERR.git" maintainers("shaomeng", "robertu94") + license("GPL-3.0-only") + # Versions version("main", branch="main") version("0.7.1", sha256="1c3f46200be365427d1f57f5873f1b0b6dbcd297de4603a47a7fa3f41b273d79") diff --git a/var/spack/repos/builtin/packages/spfft/package.py b/var/spack/repos/builtin/packages/spfft/package.py index 89217b56260dfa..7ccd6fe67a2273 100644 --- a/var/spack/repos/builtin/packages/spfft/package.py +++ b/var/spack/repos/builtin/packages/spfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Spfft(CMakePackage, CudaPackage, ROCmPackage): maintainers("AdhocMan", "haampie") + license("BSD-3-Clause") + version("develop", branch="develop") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/spglib/package.py b/var/spack/repos/builtin/packages/spglib/package.py index 1d00091c13158c..ebba58e5520d4b 100644 --- a/var/spack/repos/builtin/packages/spglib/package.py +++ b/var/spack/repos/builtin/packages/spglib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -9,7 +9,7 @@ class Spglib(CMakePackage): """C library for finding and handling crystal symmetries.""" - homepage = "https://atztogo.github.io/spglib/" + homepage = "https://spglib.readthedocs.io/" url = "https://github.com/spglib/spglib/archive/v2.0.2.tar.gz" maintainers("RMeli") @@ -18,6 +18,9 @@ class Spglib(CMakePackage): # patch by Krishnendu Ghosh patch("fix_cpp.patch", when="@:1.10.3") + license("BSD-3-Clause") + + version("2.2.0", sha256="ac929e20ec9d4621411e2cdec59b1442e02506c1e546005bbe2c7f781e9bd49a") version("2.1.0", sha256="31bca273a1bc54e1cff4058eebe7c0a35d5f9b489579e84667d8e005c73dcc13") version("2.0.2", sha256="10e44a35099a0a5d0fc6ee0cdb39d472c23cb98b1f5167c0e2b08f6069f3db1e") version("2.0.1", sha256="d7407c0d67174a0c5e41a82ed62948c43fcaf1b5529f97238d7fadd1123ffe22") @@ -49,6 +52,10 @@ class Spglib(CMakePackage): variant("openmp", default=True, description="Build with OpenMP support", when="@1.16.2:") variant("fortran", default=True, description="Build Fortran interface", when="@1.16.4:") + variant("tests", default=False, description="Build with tests", when="@2.1.0:") + + depends_on("cmake@3.15:", type="build", when="@2.1.0:") + depends_on("cmake@3.24:", type="build", when="+tests") @property def libs(self): @@ -59,4 +66,5 @@ def cmake_args(self): return [ self.define_from_variant(pfx + "USE_OMP", "openmp"), self.define_from_variant(pfx + "WITH_Fortran", "fortran"), + self.define_from_variant(pfx + "WITH_TESTS", "tests"), ] diff --git a/var/spack/repos/builtin/packages/sph2pipe/package.py b/var/spack/repos/builtin/packages/sph2pipe/package.py index 370252fb0fed49..562ac4b553e356 100644 --- a/var/spack/repos/builtin/packages/sph2pipe/package.py +++ b/var/spack/repos/builtin/packages/sph2pipe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spherepack/package.py b/var/spack/repos/builtin/packages/spherepack/package.py index aed4b8b9c529ac..c2931c51e51328 100644 --- a/var/spack/repos/builtin/packages/spherepack/package.py +++ b/var/spack/repos/builtin/packages/spherepack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spindle/package.py b/var/spack/repos/builtin/packages/spindle/package.py index 36f3a925fc0cd0..b1b2e1e526504b 100644 --- a/var/spack/repos/builtin/packages/spindle/package.py +++ b/var/spack/repos/builtin/packages/spindle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spiner/package.py b/var/spack/repos/builtin/packages/spiner/package.py index a1ef3d637dacd9..485387254b744f 100644 --- a/var/spack/repos/builtin/packages/spiner/package.py +++ b/var/spack/repos/builtin/packages/spiner/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Spiner(CMakePackage, CudaPackage): maintainers("rbberger") + license("BSD-3-Clause") + version("main", branch="main") version("1.6.2", sha256="91fb403ce3b151fbdf8b6ff5aed0d8dde1177749f5633951027b100ebc7080d3") version("1.6.1", sha256="52774322571d3b9b0dc3c6b255257de9af0e8e6170834360f2252c1ac272cbe7") diff --git a/var/spack/repos/builtin/packages/spiral-package-fftx/package.py b/var/spack/repos/builtin/packages/spiral-package-fftx/package.py index e7bb9bc13377c7..979b705a4d4a38 100644 --- a/var/spack/repos/builtin/packages/spiral-package-fftx/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-fftx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,7 @@ class SpiralPackageFftx(Package): combined with DFT transforms.""" homepage = "https://spiralgen.com" - url = "https://github.com/spiral-software/spiral-package-fftx/archive/refs/tags/1.2.2.tar.gz" + url = "https://github.com/spiral-software/spiral-package-fftx/archive/refs/tags/1.3.0.tar.gz" git = "https://github.com/spiral-software/spiral-package-fftx.git" maintainers("spiralgen") @@ -21,8 +21,11 @@ class SpiralPackageFftx(Package): # such. If this package is required spiral-software should be installed # with the +fftx variant active + license("BSD-2-Clause-FreeBSD") + version("develop", branch="develop") version("main", branch="main") + version("1.3.0", sha256="f798165bd9a96b41262e889ca235d86dfda4e0fdc414bfb9b463c50ca86f480b") version("1.2.2", sha256="18dacc3f974c4bd58295be2ea61f8ae0aada9a239f27b93d7806df564612cf22") version("1.2.1", sha256="3f15aa5949c1b09eb59257cf1c5f6fcddc6e46f77ae9d5fce8acd8b9f99ce941") version("1.1.1", sha256="99ec7fab9274d378524b4933917fae23f9590255518c7a124cb46bd5e8d9af37") diff --git a/var/spack/repos/builtin/packages/spiral-package-hcol/package.py b/var/spack/repos/builtin/packages/spiral-package-hcol/package.py index 07ea2a3c46ec9b..c4857fe4fa504b 100644 --- a/var/spack/repos/builtin/packages/spiral-package-hcol/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-hcol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class SpiralPackageHcol(Package): # such. If this package is required spiral-software should be installed # with the +hcol variant active + license("BSD-2-Clause-FreeBSD") + version("master", branch="master") version("1.0.0", sha256="18ae6f0a090de03723612a6c91ca17cf62971129540936d8c2738bd8f807a511") diff --git a/var/spack/repos/builtin/packages/spiral-package-jit/package.py b/var/spack/repos/builtin/packages/spiral-package-jit/package.py index c0d37abfbedc61..3e1f4a67f314a0 100644 --- a/var/spack/repos/builtin/packages/spiral-package-jit/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-jit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,7 +11,7 @@ class SpiralPackageJit(Package): Compilation (RTC).""" homepage = "https://spiralgen.com" - url = "https://github.com/spiral-software/spiral-package-jit/archive/refs/tags/1.0.3.tar.gz" + url = "https://github.com/spiral-software/spiral-package-jit/archive/refs/tags/1.1.0.tar.gz" git = "https://github.com/spiral-software/spiral-package-jit.git" maintainers("spiralgen") @@ -19,8 +19,11 @@ class SpiralPackageJit(Package): # such. If this package is required spiral-software should be installed # with the +jit variant active + license("BSD-2-Clause-FreeBSD") + version("develop", branch="develop") version("main", branch="main") + version("1.1.0", sha256="64cebf31b7a02fdcb3992a581c2fef67576f92bf893eaf88cd5ed1b1d853d550") version("1.0.3", sha256="97ff0d7d46ed4e53b1971ca279a30b27f0d9b328c70585d4cc0c56dfe6701894") version("1.0.2", sha256="d7fac0493ac406a8b1874491223c3a9a1c6727ea1aa39de7ef4694c59aac9d26") version("1.0.1", sha256="acf22db04e705276f06642d7f2ebf161f6c347f93bb1bdd6e3ddcfc4b7be5707") diff --git a/var/spack/repos/builtin/packages/spiral-package-mpi/package.py b/var/spack/repos/builtin/packages/spiral-package-mpi/package.py index 6c4ae70d5a21c9..130378d17399db 100644 --- a/var/spack/repos/builtin/packages/spiral-package-mpi/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class SpiralPackageMpi(Package): # such. If this package is required spiral-software should be installed # with the +mpi variant active + license("BSD-2-Clause-FreeBSD") + version("develop", branch="develop") version("main", branch="main") version("1.1.0", sha256="baf3c9dac7fee330e4bb4adbd24cc7e55f27fc27417644c0b216124f9052f1f5") diff --git a/var/spack/repos/builtin/packages/spiral-package-simt/package.py b/var/spack/repos/builtin/packages/spiral-package-simt/package.py index 9dc727e0f0ca55..8a80702a973795 100644 --- a/var/spack/repos/builtin/packages/spiral-package-simt/package.py +++ b/var/spack/repos/builtin/packages/spiral-package-simt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class SpiralPackageSimt(Package): # such. If this package is required spiral-software should be installed # with the +simt variant active + license("BSD-2-Clause-FreeBSD") + version("develop", branch="develop") version("main", branch="main") version("1.1.0", sha256="4d6a5e586889b9e000968c99f3068ba86a12cc389665c6deadc4734117ef7a95") diff --git a/var/spack/repos/builtin/packages/spiral-software/package.py b/var/spack/repos/builtin/packages/spiral-software/package.py index 7f97bca8b89051..cc380f8078133c 100644 --- a/var/spack/repos/builtin/packages/spiral-software/package.py +++ b/var/spack/repos/builtin/packages/spiral-software/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,13 +12,16 @@ class SpiralSoftware(CMakePackage): spectrum of hardware platforms.""" homepage = "https://spiralgen.com" - url = "https://github.com/spiral-software/spiral-software/archive/refs/tags/8.5.0.tar.gz" + url = "https://github.com/spiral-software/spiral-software/archive/refs/tags/8.5.1.tar.gz" git = "https://github.com/spiral-software/spiral-software.git" maintainers("spiralgen") + license("BSD-2-Clause-FreeBSD") + version("develop", branch="develop") version("master", branch="master") + version("8.5.1", sha256="845630a69c93c915435100fcb4c800e9f0b181a44bb1debbf8e3a68993ce7797") version("8.5.0", sha256="829345b8ca3ab0069a1a6e230f60ab03257060a8f05c021cee022e294eef592d") version("8.4.0", sha256="d0c58de65c678130eeee6b8b8b48061bbe463468990f66d9b452225ce46dee19") version("8.3.0", sha256="41cf0e7f14f9497e98353baa1ef4ca6204ce5ca525db8093f5bb44e89992abdf") diff --git a/var/spack/repos/builtin/packages/spla/package.py b/var/spack/repos/builtin/packages/spla/package.py index 616d90bf2d7128..37eaba4bcaa401 100644 --- a/var/spack/repos/builtin/packages/spla/package.py +++ b/var/spack/repos/builtin/packages/spla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Spla(CMakePackage): maintainers("AdhocMan", "haampie") + license("BSD-3-Clause") + version("1.5.5", sha256="bc0c366e228344b1b2df55b9ce750d73c1165380e512da5a04d471db126d66ce") version("1.5.4", sha256="de30e427d24c741e2e4fcae3d7668162056ac2574afed6522c0bb49d6f1d0f79") version("1.5.3", sha256="527c06e316ce46ec87309a16bfa4138b1abad23fd276fe789c78a2de84f05637") diff --git a/var/spack/repos/builtin/packages/spm/package.py b/var/spack/repos/builtin/packages/spm/package.py index 65e1ae14c624b6..37b19bee4dde9f 100644 --- a/var/spack/repos/builtin/packages/spm/package.py +++ b/var/spack/repos/builtin/packages/spm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py index 20d20b84ad5fa6..d5aa234e98e554 100644 --- a/var/spack/repos/builtin/packages/spot/package.py +++ b/var/spack/repos/builtin/packages/spot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Spot(AutotoolsPackage): homepage = "https://spot.lrde.epita.fr/" url = "https://www.lrde.epita.fr/dload/spot/spot-1.99.3.tar.gz" + license("MIT") + version("2.11.5", sha256="3acfd5cd112d00576ac234baeb34e1c6adf8c03155d4cda973e6317ac8bd1774") version("2.11.4", sha256="91ecac6202819ea1de4534902ce457ec6eec0573d730584d6494d06b0bcaa0b4") version("2.9.4", sha256="e11208323baabe9b5f98098d4b9bb39803fb102a68abbbaf900f1fcd578f0f85") diff --git a/var/spack/repos/builtin/packages/sprng/package.py b/var/spack/repos/builtin/packages/sprng/package.py index d6f32bebd049de..4c014a3b8ad10e 100644 --- a/var/spack/repos/builtin/packages/sprng/package.py +++ b/var/spack/repos/builtin/packages/sprng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Sprng(AutotoolsPackage): homepage = "http://www.sprng.org" url = "http://www.sprng.org/Version5.0/sprng5.tar.bz2" + license("GPL-2.0-only") + version("5.0", sha256="9172a495472cc24893e7489ce9b5654300dc60cba4430e436ce50d28eb749a66") variant("mpi", default=True, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/sqlcipher/package.py b/var/spack/repos/builtin/packages/sqlcipher/package.py index 82b29b96c753cc..52887ccff05e37 100644 --- a/var/spack/repos/builtin/packages/sqlcipher/package.py +++ b/var/spack/repos/builtin/packages/sqlcipher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Sqlcipher(AutotoolsPackage): maintainers("rmsds") + license("BSD-3-Clause") + version("4.4.1", sha256="a36ed7c879a5e9af1054942201c75fc56f1db22e46bf6c2bbae3975dfeb6782d") version("4.4.0", sha256="0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148") version("4.3.0", sha256="fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f") diff --git a/var/spack/repos/builtin/packages/sqlite-jdbc/package.py b/var/spack/repos/builtin/packages/sqlite-jdbc/package.py index b713541b15da07..b39bdea8947d4e 100644 --- a/var/spack/repos/builtin/packages/sqlite-jdbc/package.py +++ b/var/spack/repos/builtin/packages/sqlite-jdbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class SqliteJdbc(MavenPackage): homepage = "https://github.com/xerial/sqlite-jdbc" url = "https://github.com/xerial/sqlite-jdbc/archive/3.32.3.2.tar.gz" + license("Apache-2.0") + version("3.32.3.2", sha256="9168ad02cb8b01449271eabd8a2a81461954c2c3fa854d3828a37dc07a1fefec") version("3.32.3.1", sha256="455e2a009101ede40f9510cf2c34e76f30d411f290957bfd9296da12d6e06591") version("3.32.3", sha256="19725caa4742960d385472a6094b8164bb8f29e816f04b830fa65c56517b4564") diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 19890314707597..c7bedfcd9fb722 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,12 +10,15 @@ from spack.package import * -class Sqlite(AutotoolsPackage): +class Sqlite(AutotoolsPackage, NMakePackage): """SQLite is a C-language library that implements a small, fast, self-contained, high-reliability, full-featured, SQL database engine. """ homepage = "https://www.sqlite.org" + tags = ["windows"] + + license("blessing") version("3.43.2", sha256="6d422b6f62c4de2ca80d61860e3a3fb693554d2f75bb1aaca743ccc4d6f609f0") version("3.42.0", sha256="7abcfd161c6e2742ca5c6c0895d1f853c940f203304a0b49da4e1eca5d088ca6") @@ -47,20 +50,40 @@ class Sqlite(AutotoolsPackage): # All versions prior to 3.26.0 are vulnerable to Magellan when FTS # is enabled, see https://blade.tencent.com/magellan/index_en.html - variant( - "functions", - default=False, - when="+dynamic_extensions", - description="Provide mathematical and string extension functions for SQL " - "queries using the loadable extensions mechanism", - ) - variant("fts", default=True, description="Include fts4 and fts5 support") - variant("column_metadata", default=True, description="Build with COLUMN_METADATA") - variant("dynamic_extensions", default=True, description="Support loadable extensions") - variant("rtree", default=True, description="Build with Rtree module") + # no hard readline dep on Windows + no variant support, makefile has minimal to no options + for plat in ["linux", "darwin", "cray", "freebsd"]: + variant( + "functions", + default=False, + description="Provide mathematical and string extension functions for SQL " + "queries using the loadable extensions mechanism", + when=f"+dynamic_extensions platform={plat}", + ) + variant( + "fts", + default=True, + description="Include fts4 and fts5 support", + when=f"platform={plat}", + ) + variant( + "column_metadata", + default=True, + description="Build with COLUMN_METADATA", + when=f"platform={plat}", + ) + variant( + "dynamic_extensions", + default=True, + description="Support loadable extensions", + when=f"platform={plat}", + ) + variant( + "rtree", default=True, description="Build with Rtree module", when=f"platform={plat}" + ) + depends_on("readline", when=f"platform={plat}") - depends_on("readline") depends_on("zlib-api") + depends_on("tcl", when="platform=windows") # See https://blade.tencent.com/magellan/index_en.html conflicts("+fts", when="@:3.25") @@ -87,6 +110,10 @@ class Sqlite(AutotoolsPackage): # compiler is used. patch("remove_overflow_builtins.patch", when="@3.17.0:3.20%intel") + patch("quote_compiler_in_makefile.patch", when="platform=windows") + + build_system("autotools", "nmake") + executables = ["^sqlite3$"] @classmethod @@ -184,10 +211,34 @@ def url_for_version(self, version): def libs(self): return find_libraries("libsqlite3", root=self.prefix.lib) - def get_arch(self): - host_platform = spack.platforms.host() - return str(host_platform.target("default_target")) + def test_example(self): + """check example table dump""" + + test_data_dir = self.test_suite.current_test_data_dir + db_filename = test_data_dir.join("packages.db") + + # Ensure the database only contains one table + sqlite3 = which(self.prefix.bin.sqlite3) + out = sqlite3(db_filename, ".tables", output=str.split, error=str.split) + assert "packages" in out + + # Ensure the database dump matches expectations, where special + # characters are replaced with spaces in the expected and actual + # output to avoid pattern errors. + expected = get_escaped_text_output(test_data_dir.join("dump.out")) + out = sqlite3(db_filename, ".dump", output=str.split, error=str.split) + check_outputs(expected, out) + + def test_version(self): + """ensure version is expected""" + vers_str = str(self.spec.version) + + sqlite3 = which(self.prefix.bin.sqlite3) + out = sqlite3("-version", output=str.split, error=str.split) + assert vers_str in out + +class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder): def configure_args(self): args = [] @@ -209,6 +260,10 @@ def configure_args(self): return args + def get_arch(self): + host_platform = spack.platforms.host() + return str(host_platform.target("default_target")) + @run_after("install") def build_libsqlitefunctions(self): if "+functions" in self.spec: @@ -224,28 +279,18 @@ def build_libsqlitefunctions(self): ) install(libraryname, self.prefix.lib) - def test_example(self): - """check example table dump""" - - test_data_dir = self.test_suite.current_test_data_dir - db_filename = test_data_dir.join("packages.db") - - # Ensure the database only contains one table - sqlite3 = which(self.prefix.bin.sqlite3) - out = sqlite3(db_filename, ".tables", output=str.split, error=str.split) - assert "packages" in out - # Ensure the database dump matches expectations, where special - # characters are replaced with spaces in the expected and actual - # output to avoid pattern errors. - expected = get_escaped_text_output(test_data_dir.join("dump.out")) - out = sqlite3(db_filename, ".dump", output=str.split, error=str.split) - check_outputs(expected, out) - - def test_version(self): - """ensure version is expected""" - vers_str = str(self.spec.version) - - sqlite3 = which(self.prefix.bin.sqlite3) - out = sqlite3("-version", output=str.split, error=str.split) - assert vers_str in out +class NMakeBuilder(spack.build_systems.nmake.NMakeBuilder): + @property + def makefile_name(self): + return "Makefile.msc" + + def install(self, pkg, spec, prefix): + with working_dir(self.build_directory): + mkdirp(prefix.include) + mkdirp(prefix.lib) + mkdirp(prefix.bin) + install(f"{self.build_directory}\\*.exe", prefix.bin) + install(f"{self.build_directory}\\*.dll", prefix.bin) + install(f"{self.build_directory}\\*.lib", prefix.lib) + install(f"{self.build_directory}\\*.h", prefix.include) diff --git a/var/spack/repos/builtin/packages/sqlite/quote_compiler_in_makefile.patch b/var/spack/repos/builtin/packages/sqlite/quote_compiler_in_makefile.patch new file mode 100644 index 00000000000000..3f2ad4656cf8d0 --- /dev/null +++ b/var/spack/repos/builtin/packages/sqlite/quote_compiler_in_makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.msc b/Makefile.msc +index 95f0eee0d..8fc173e98 100644 +--- a/Makefile.msc ++++ b/Makefile.msc +@@ -441,6 +441,8 @@ PROGRAMFILES_X86 = $(PROGRAMFILES_X86:\\=\) + # + !IFNDEF CC + CC = cl.exe ++!ELSE ++CC = "$(CC)" + !ENDIF + + # Check for the predefined command macro CSC. This should point to a working diff --git a/var/spack/repos/builtin/packages/sqlitebrowser/package.py b/var/spack/repos/builtin/packages/sqlitebrowser/package.py index 16da039b10ed54..1b23b7f7d436b2 100644 --- a/var/spack/repos/builtin/packages/sqlitebrowser/package.py +++ b/var/spack/repos/builtin/packages/sqlitebrowser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sqlitebrowser(CMakePackage): homepage = "https://sqlitebrowser.org" url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz" + license("GPL-3.0-only") + version("3.12.2", sha256="645f98d38e5d128a449e93cebf03c8070f9eacd2d16b10e433a781d54a9d478a") version("3.10.1", sha256="36eb53bc75192c687dce298c79f1532c410ce4ecbeeacfb07b9d02a307f16bef") diff --git a/var/spack/repos/builtin/packages/sqoop/package.py b/var/spack/repos/builtin/packages/sqoop/package.py index 8ee52aa3f1aea3..1b0bff211b71d1 100644 --- a/var/spack/repos/builtin/packages/sqoop/package.py +++ b/var/spack/repos/builtin/packages/sqoop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Sqoop(MavenPackage): list_url = "https://downloads.apache.org/sqoop/" list_depth = 1 + license("Apache-2.0") + version("1.99.7", sha256="caca533554235d9e999435be59a13b5ecae514b3c914ca3b54868fca43a3b74a") depends_on("java@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/squashfs-mount/package.py b/var/spack/repos/builtin/packages/squashfs-mount/package.py index af476e4638db74..b90f3f5a6d1522 100644 --- a/var/spack/repos/builtin/packages/squashfs-mount/package.py +++ b/var/spack/repos/builtin/packages/squashfs-mount/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class SquashfsMount(MakefilePackage): maintainers("haampie") + license("BSD-3-Clause") + version("0.4.0", sha256="0b17c797b4befdab172fc58a74f3b647bbdf127ff5bdaf7c21d907b7a9714339") version("0.1.0", sha256="37841ede7a7486d437fd06ae13e432560f81806f69addc72cfc8e564c8727bc6") diff --git a/var/spack/repos/builtin/packages/squashfs/package.py b/var/spack/repos/builtin/packages/squashfs/package.py index d71da4bc5e23f3..73d37fab5b9a93 100644 --- a/var/spack/repos/builtin/packages/squashfs/package.py +++ b/var/spack/repos/builtin/packages/squashfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Squashfs(MakefilePackage): homepage = "http://squashfs.sourceforge.net" url = "https://downloads.sourceforge.net/project/squashfs/squashfs/squashfs4.3/squashfs4.3.tar.gz" + license("GPL-2.0-or-later") + # version sha1 version("4.6.1", sha256="94201754b36121a9f022a190c75f718441df15402df32c2b520ca331a107511c") version( diff --git a/var/spack/repos/builtin/packages/squashfuse/package.py b/var/spack/repos/builtin/packages/squashfuse/package.py index 85b7c03c8a8a42..89461c45d36a4c 100644 --- a/var/spack/repos/builtin/packages/squashfuse/package.py +++ b/var/spack/repos/builtin/packages/squashfuse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Squashfuse(AutotoolsPackage): maintainers("haampie") + license("BSD-2-Clause") + version("master", branch="master") version("0.5.0", sha256="d7602c7a3b1d0512764547d27cb8cc99d1b21181e1c9819e76461ee96c2ab4d9") version("0.1.104", sha256="aa52460559e0d0b1753f6b1af5c68cfb777ca5a13913285e93f4f9b7aa894b3a") diff --git a/var/spack/repos/builtin/packages/squid/package.py b/var/spack/repos/builtin/packages/squid/package.py index cf03654399d08b..87b89b53223a73 100644 --- a/var/spack/repos/builtin/packages/squid/package.py +++ b/var/spack/repos/builtin/packages/squid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,4 +12,6 @@ class Squid(AutotoolsPackage): homepage = "http://eddylab.org/software.html" url = "http://eddylab.org/software/squid/squid-1.9g.tar.gz" + license("GPL-2.0-or-later") + version("1.9g", sha256="302f42e8794aa4dbcfa0996c14fb7a70a7c4397fc45c2bbd2748055460d8dca7") diff --git a/var/spack/repos/builtin/packages/sra-tools/package.py b/var/spack/repos/builtin/packages/sra-tools/package.py index 432adf002a52e1..19461f17d42ed0 100644 --- a/var/spack/repos/builtin/packages/sra-tools/package.py +++ b/var/spack/repos/builtin/packages/sra-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sratoolkit/package.py b/var/spack/repos/builtin/packages/sratoolkit/package.py index 934fd7db244d72..8f212889938415 100644 --- a/var/spack/repos/builtin/packages/sratoolkit/package.py +++ b/var/spack/repos/builtin/packages/sratoolkit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py index 0724c7cd527d1d..4dcf19637bde9e 100644 --- a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py +++ b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/srcml/package.py b/var/spack/repos/builtin/packages/srcml/package.py index 20850641add370..ceae7cb7de9fc4 100644 --- a/var/spack/repos/builtin/packages/srcml/package.py +++ b/var/spack/repos/builtin/packages/srcml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Srcml(CMakePackage): maintainers("meyersbs") + license("GPL-3.0-or-later") + version("1.0.0", sha256="3ddf33271c3b3953d5e3ecbb14c4f925fc0e609a81250d921d3516537dcffae2") depends_on("cmake@3.14:", type="build") diff --git a/var/spack/repos/builtin/packages/srilm/package.py b/var/spack/repos/builtin/packages/srilm/package.py index 41613fba6e2775..2a4af0175fd2ae 100644 --- a/var/spack/repos/builtin/packages/srilm/package.py +++ b/var/spack/repos/builtin/packages/srilm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sse2neon/package.py b/var/spack/repos/builtin/packages/sse2neon/package.py index 4ad956212651df..9ac1f23a12a660 100644 --- a/var/spack/repos/builtin/packages/sse2neon/package.py +++ b/var/spack/repos/builtin/packages/sse2neon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sse2neon(Package): git = "https://github.com/DLTcollab/sse2neon.git" url = "https://github.com/DLTcollab/sse2neon/archive/refs/tags/v1.6.0.tar.gz" + license("MIT") + version("master", branch="master") version("1.6.0", sha256="06f4693219deccb91b457135d836fc514a1c0a57e9fa66b143982901d2d19677") version("1.5.1", sha256="4001e2dfb14fcf3831211581ed83bcc83cf6a3a69f638dcbaa899044a351bb2a") diff --git a/var/spack/repos/builtin/packages/sshfs/package.py b/var/spack/repos/builtin/packages/sshfs/package.py index 6ab1dfcd28fc4a..36dc287f873d5b 100644 --- a/var/spack/repos/builtin/packages/sshfs/package.py +++ b/var/spack/repos/builtin/packages/sshfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sshfs(MesonPackage): maintainers("haampie") + license("GPL-2.0-or-later") + version("3.7.1", sha256="fe5d3436d61b46974889e0c4515899c21a9d67851e3793c209989f72353d7750") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/sshpass/package.py b/var/spack/repos/builtin/packages/sshpass/package.py index 754da4b214745c..bd8250dc6f6636 100644 --- a/var/spack/repos/builtin/packages/sshpass/package.py +++ b/var/spack/repos/builtin/packages/sshpass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sshpass(AutotoolsPackage): homepage = "https://sourceforge.net/projects/sshpass/" url = "https://sourceforge.net/projects/sshpass/files/sshpass/1.06/sshpass-1.06.tar.gz" + license("GPL-2.0-or-later") + version("1.06", sha256="c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60") version("1.05", sha256="c3f78752a68a0c3f62efb3332cceea0c8a1f04f7cf6b46e00ec0c3000bc8483e") version("1.04", sha256="e8abb9a409f25928722251a5855a74854f6d64af3eb136b804a04fd630d70c80") diff --git a/var/spack/repos/builtin/packages/ssht/package.py b/var/spack/repos/builtin/packages/ssht/package.py index 182bc51e133bd4..d71bfab09f05cf 100644 --- a/var/spack/repos/builtin/packages/ssht/package.py +++ b/var/spack/repos/builtin/packages/ssht/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Ssht(CMakePackage): maintainers("eschnett") + license("GPL-3.0-only") + version("1.5.2", sha256="6ce3e48d36a4af57cab9d96f5f845f905808dac8ac8b3ec195f6b49d017a890d") version("1.5.1", sha256="f0b6fb6a1de40354fcf4eafe09b953c96a72ba9c533a42e290802e93cd14170c") version("1.5.0", sha256="ff42103463c973a11da84b757d2a6661679c8a60745e44f0ccf697f88593083a") diff --git a/var/spack/repos/builtin/packages/ssmtp/package.py b/var/spack/repos/builtin/packages/ssmtp/package.py index 85f46aa28d799e..282a35146a915e 100644 --- a/var/spack/repos/builtin/packages/ssmtp/package.py +++ b/var/spack/repos/builtin/packages/ssmtp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Ssmtp(AutotoolsPackage): homepage = "https://salsa.debian.org/debian/ssmtp" url = "https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2" + license("GPL-2.0") + version("2.64", sha256="22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36") variant("ssl", default=True, description="Enable support for secure connection to mail server") diff --git a/var/spack/repos/builtin/packages/sspace-longread/package.py b/var/spack/repos/builtin/packages/sspace-longread/package.py index 54d491631e5050..adf74af139b869 100644 --- a/var/spack/repos/builtin/packages/sspace-longread/package.py +++ b/var/spack/repos/builtin/packages/sspace-longread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py index e7a095128b830b..22c2b85cecce13 100644 --- a/var/spack/repos/builtin/packages/sspace-standard/package.py +++ b/var/spack/repos/builtin/packages/sspace-standard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sst-core/package.py b/var/spack/repos/builtin/packages/sst-core/package.py index 860d30d0b38289..cc8931be35c447 100644 --- a/var/spack/repos/builtin/packages/sst-core/package.py +++ b/var/spack/repos/builtin/packages/sst-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,10 +14,13 @@ class SstCore(AutotoolsPackage): homepage = "https://github.com/sstsimulator" git = "https://github.com/sstsimulator/sst-core.git" - url = "https://github.com/sstsimulator/sst-core/releases/download/v13.0.0_Final/sstcore-13.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-core/releases/download/v13.1.0_Final/sstcore-13.1.0.tar.gz" maintainers("berquist", "naromero77") + license("BSD-3-Clause") + + version("13.1.0", sha256="0a44c62ee0b18a20a3cb089f4e0d43e293dc5adc6c3fa7639d40986cf5b9854c") version("13.0.0", sha256="c9d868dcdd75d59bef7c73146709a3b2a52a78f0df5ec2c3dc9f21434c51d935") version("12.1.0", sha256="f7530226643439678e2f4183ec4dbadf7750411bdaa44d9443887f81feb97574") version("12.0.1", sha256="8662a778354e587e55b909725943dd5bb01d55121b1abc1a384a4eea161e9f5a") @@ -61,7 +64,7 @@ class SstCore(AutotoolsPackage): variant("preview", default=False, description="Preview build with deprecated features removed") variant("profile", default=False, description="Enable performance profiling of core features") - depends_on("python", type=("build", "run", "link")) + depends_on("python@:3.11", type=("build", "run", "link")) depends_on("mpi", when="+pdes_mpi") depends_on("zoltan", when="+zoltan") depends_on("hdf5", when="+hdf5") diff --git a/var/spack/repos/builtin/packages/sst-dumpi/package.py b/var/spack/repos/builtin/packages/sst-dumpi/package.py index c09e7140a3262b..c53e0cd97709e0 100644 --- a/var/spack/repos/builtin/packages/sst-dumpi/package.py +++ b/var/spack/repos/builtin/packages/sst-dumpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class SstDumpi(AutotoolsPackage): maintainers("berquist", "jpkenny", "calewis") + license("BSD-3-Clause") + version("13.0.0", sha256="0eaa5cf5826c9fbba6cfeed42f52af67c5a7d45bc8cbb485c2a3867b7438229b") version("12.1.0", sha256="b718658cbb0be957d28883f7cc914617bff97b3629fad7017cd62e14ed667d9d") version("12.0.1", sha256="6e74e5f16ee26c83b17ecd5c272a61ec37977f07f531066533dd610805f9117b") diff --git a/var/spack/repos/builtin/packages/sst-elements/package.py b/var/spack/repos/builtin/packages/sst-elements/package.py index 49677daf049f7b..be4125fb9cc80c 100644 --- a/var/spack/repos/builtin/packages/sst-elements/package.py +++ b/var/spack/repos/builtin/packages/sst-elements/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,12 +14,16 @@ class SstElements(AutotoolsPackage): homepage = "https://github.com/sstsimulator" git = "https://github.com/sstsimulator/sst-elements.git" - url = "https://github.com/sstsimulator/sst-elements/releases/download/v13.0.0_Final/sstelements-13.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-elements/releases/download/v13.1.0_Final/sstelements-13.1.0.tar.gz" maintainers("berquist", "naromero77") + license("BSD-3-Clause") + + version("13.1.0", sha256="ebda6ee5af858192dff8a7faf3125010001d5c439beec22afe5b9828a74adf1a") version("13.0.0", sha256="1f6f6b403a8c1b22a27cdf2943c9e505825ee14866891e7bc944d4471b7b0321") version("12.1.0", sha256="77948cf8e1f8bf8d238d475cea111c9a72b307cbf403cb429ef0426d0cf708a4") + version("12.0.1", sha256="fe6bd9e2c14ffca77cfb31ee39410d0df3a353524b6a5a35270104dd25836e48") version("12.0.0", sha256="d3caacf8ba621a644151e1670dfc0fd8e91b45a583699998f94312897b0eca26") version("11.1.0", sha256="2dd20ecf2e0896b59eb9d65d31ef928daa0188239016216f4ad11b7e6447ca0b") version("11.0.0", sha256="bf265cb25afc041b74422cc5cddc8e3ae1e7c3efa3e37e699dac4e3f7629be6e") @@ -40,7 +44,6 @@ class SstElements(AutotoolsPackage): # Contact SST developers (https://github.com/sstsimulator) # if your use case requires support for: # - balar - # - OTF2 # - stake (riscv simulator) variant("pin", default=False, description="Enable the Ariel CPU model") @@ -56,7 +59,7 @@ class SstElements(AutotoolsPackage): variant("otf", default=False, description="Build with OTF") variant("otf2", default=False, description="Build with OTF2") - depends_on("python", type=("build", "run")) + depends_on("python@:3.11", type=("build", "run")) depends_on("sst-core") depends_on("sst-core@develop", when="@develop") depends_on("sst-core@master", when="@master") @@ -85,7 +88,6 @@ class SstElements(AutotoolsPackage): conflicts("+dumpi", msg="Dumpi not currently supported, contact SST Developers for help") conflicts("+otf", msg="OTF not currently supported, contact SST Developers for help") - conflicts("+otf2", msg="OTF2 not currently supported, contact SST Developers for help") conflicts( "~dramsim2", when="+hybridsim", diff --git a/var/spack/repos/builtin/packages/sst-macro/package.py b/var/spack/repos/builtin/packages/sst-macro/package.py index df129cfb4f7549..5cb45ec347202b 100644 --- a/var/spack/repos/builtin/packages/sst-macro/package.py +++ b/var/spack/repos/builtin/packages/sst-macro/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,12 +17,14 @@ class SstMacro(AutotoolsPackage): homepage = "https://github.com/sstsimulator" git = "https://github.com/sstsimulator/sst-macro.git" - url = "https://github.com/sstsimulator/sst-macro/releases/download/v13.0.0_Final/sstmacro-13.0.0.tar.gz" + url = "https://github.com/sstsimulator/sst-macro/releases/download/v13.1.0_Final/sstmacro-13.1.0.tar.gz" maintainers("berquist") + version("13.1.0", sha256="022e39daae1067b56c0011dbe87e3234fee4587049fd53671e1ed6b23233f70e") version("13.0.0", sha256="410dad4ac0c7a4c0e16c54da308b6c6b631112af18ae2c37585c8a14472987d4") version("12.1.0", sha256="ee57e08acfd4b6429a0500d981d468ee6ded2638ec5abec7b47f172388b267f1") + version("12.0.1", sha256="1491a149f4554777a6c3aa62730b3cd1a24c43a8d3d7fb61edfb4fe5c773aed8") version("12.0.0", sha256="259237a47cf341830ce3956cfadfd6e77ff1824da05da4a7b212fc5867ce64b2") version("11.1.0", sha256="4b1226e75e2e99faa42b218461d85e8e17c1d4f333dd973e72a5dc052328d34c") version("11.0.0", sha256="30367baed670b5b501320a068671556c9071286a0f0c478f9994a30d8fe5bdea") @@ -50,10 +52,8 @@ class SstMacro(AutotoolsPackage): depends_on("otf2", when="+otf2") depends_on("llvm+clang@5:9", when="+skeletonizer") depends_on("mpi", when="+pdes_mpi") - depends_on("sst-core@develop", when="@develop+core") - depends_on("sst-core@master", when="@master+core") - depends_on("sst-core@10.1.0", when="@10.1.0+core") - depends_on("sst-core@10.0.0", when="@10.0.0+core") + # Allow mismatch between core dependency version and current macro version. + depends_on("sst-core", when="+core") depends_on("gettext") variant("pdes_threads", default=True, description="Enable thread-parallel PDES simulation") diff --git a/var/spack/repos/builtin/packages/sst-transports/package.py b/var/spack/repos/builtin/packages/sst-transports/package.py index e096aa27355ede..a3d84df8188c3a 100644 --- a/var/spack/repos/builtin/packages/sst-transports/package.py +++ b/var/spack/repos/builtin/packages/sst-transports/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class SstTransports(CMakePackage): maintainers("jjwilke") + license("BSD-3-Clause") + version("master", branch="master") depends_on("sst-macro") diff --git a/var/spack/repos/builtin/packages/stacks/package.py b/var/spack/repos/builtin/packages/stacks/package.py index eebc9aacf43800..8fed579fd7bffb 100644 --- a/var/spack/repos/builtin/packages/stacks/package.py +++ b/var/spack/repos/builtin/packages/stacks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Stacks(AutotoolsPackage): homepage = "https://catchenlab.life.illinois.edu/stacks/" url = "https://catchenlab.life.illinois.edu/stacks/source/stacks-1.46.tar.gz" + license("GPL-3.0-or-later") + version("2.53", sha256="ee1efceaeeeb7a39f0c2e804ad7c0a003094db28c9101120c38ddb02846e90fd") version("2.3b", sha256="a46786d8811a730ebcdc17891e89f50d4f4ae196734439dac86091f45c92ac72") version("1.46", sha256="45a0725483dc0c0856ad6b1f918e65d91c1f0fe7d8bf209f76b93f85c29ea28a") diff --git a/var/spack/repos/builtin/packages/staden-io-lib/package.py b/var/spack/repos/builtin/packages/staden-io-lib/package.py index 402e448735ea63..18531e0a7f00e8 100644 --- a/var/spack/repos/builtin/packages/staden-io-lib/package.py +++ b/var/spack/repos/builtin/packages/staden-io-lib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class StadenIoLib(AutotoolsPackage): "https://sourceforge.net/projects/staden/files/io_lib/1.14.8/io_lib-1.14.8.tar.gz/download" ) + license("BSD-3-Clause") + version("1.14.8", sha256="3bd560309fd6d70b14bbb8230e1baf8706b804eb6201220bb6c3d6db72003d1b") variant("curl", default=False, description="Build with curl support") diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py index a68430d47e4b3c..66748f11c74f0c 100644 --- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py +++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index 18c7f9450c51bb..4b0d1822ac4932 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Star(MakefilePackage): homepage = "https://github.com/alexdobin/STAR" url = "https://github.com/alexdobin/STAR/archive/2.7.6a.tar.gz" + license("MIT") + version("2.7.10b", sha256="0d1b71de6c5be1c5d90b32130d2abcd5785a4fc7c1e9bf19cc391947f2dc46e5") version("2.7.10a", sha256="af0df8fdc0e7a539b3ec6665dce9ac55c33598dfbc74d24df9dae7a309b0426a") version("2.7.6a", sha256="9320797c604673debea0fe8f2e3762db364915cc59755de1a0d87c8018f97d51") diff --git a/var/spack/repos/builtin/packages/starlight/package.py b/var/spack/repos/builtin/packages/starlight/package.py index c5a652717d2565..b9b11bc3300846 100644 --- a/var/spack/repos/builtin/packages/starlight/package.py +++ b/var/spack/repos/builtin/packages/starlight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/starpu/package.py b/var/spack/repos/builtin/packages/starpu/package.py index 45a2ca2cd2e09f..4620bdb450dc3c 100644 --- a/var/spack/repos/builtin/packages/starpu/package.py +++ b/var/spack/repos/builtin/packages/starpu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,7 @@ class Starpu(AutotoolsPackage): maintainers("nfurmento", "sthibaul") + version("1.4.2", sha256="6c1fce80593a96d599881c1e9697a10e2072195b1c4c64a99528192b6715ddd6") version("1.4.1", sha256="f023aa53da245a0f43944c3a13f63b4bfdf1324f3e66bf5cd367ce51e2044925") version("1.4.0", sha256="5058127761a0604606a852fd6d20b07040d5fbd9f798c5383e49f336b4eeaca1") version("1.3.11", sha256="580c6d98d49bacd2c666504c88890335d2689b6547d97f6a088d4ab4812df36e") diff --git a/var/spack/repos/builtin/packages/startup-notification/package.py b/var/spack/repos/builtin/packages/startup-notification/package.py index 3428821b9a2dd7..6ec0622e0f3e6d 100644 --- a/var/spack/repos/builtin/packages/startup-notification/package.py +++ b/var/spack/repos/builtin/packages/startup-notification/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class StartupNotification(AutotoolsPackage): homepage = "https://www.freedesktop.org/wiki/Software/startup-notification/" url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz" + license("LGPL-2.0-or-later") + version("0.12", sha256="3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a") depends_on("libx11") diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 4cd405e48b7752..fab3a29213a582 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/stata/package.py b/var/spack/repos/builtin/packages/stata/package.py index e4292590e10f7b..8a04763badae78 100644 --- a/var/spack/repos/builtin/packages/stata/package.py +++ b/var/spack/repos/builtin/packages/stata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/static-analysis-suite/package.py b/var/spack/repos/builtin/packages/static-analysis-suite/package.py index 1699138296f284..f2e75c06b232e0 100644 --- a/var/spack/repos/builtin/packages/static-analysis-suite/package.py +++ b/var/spack/repos/builtin/packages/static-analysis-suite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 299e14d15e1ca3..75ab2ee83711a8 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/stdexec/package.py b/var/spack/repos/builtin/packages/stdexec/package.py index eeebe847d91bd0..14fc4328c4186d 100644 --- a/var/spack/repos/builtin/packages/stdexec/package.py +++ b/var/spack/repos/builtin/packages/stdexec/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Stdexec(CMakePackage): git = "https://github.com/NVIDIA/stdexec.git" maintainers("msimberg", "aurianer") + license("Apache-2.0") + version("23.03", sha256="2c9dfb6e56a190543049d2300ccccd1b626f4bb82af5b607869c626886fadd15") version("main", branch="main") diff --git a/var/spack/repos/builtin/packages/steps/package.py b/var/spack/repos/builtin/packages/steps/package.py index efa11ef924ccc1..f616d30d152363 100644 --- a/var/spack/repos/builtin/packages/steps/package.py +++ b/var/spack/repos/builtin/packages/steps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Steps(CMakePackage): maintainers("tristan0x") + license("GPL-3.0-or-later") + version("develop", branch="master", submodules=True) version("4.1.1", submodules=True) @@ -83,7 +85,6 @@ def patch(self): def cmake_args(self): args = [ self.define("BLAS_LIBRARIES", self.spec["blas"].libs.joined(";")), - self.define("PYTHON_EXECUTABLE", self.spec["python"].command), self.define("STEPS_INSTALL_PYTHON_DEPS", False), self.define_from_variant("BUILD_STOCHASTIC_TESTS", "stochtests"), self.define_from_variant("BUILD_TESTING", "codechecks"), diff --git a/var/spack/repos/builtin/packages/stinger/package.py b/var/spack/repos/builtin/packages/stinger/package.py index c62cb163b86b51..8f11bf8429bd9c 100644 --- a/var/spack/repos/builtin/packages/stinger/package.py +++ b/var/spack/repos/builtin/packages/stinger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/storm/package.py b/var/spack/repos/builtin/packages/storm/package.py index 1e62622485a0b0..d18dfd853e5b80 100644 --- a/var/spack/repos/builtin/packages/storm/package.py +++ b/var/spack/repos/builtin/packages/storm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Storm(Package): list_url = "https://archive.apache.org/dist/storm/" list_depth = 1 + license("CC-BY-4.0") + version("2.3.0", sha256="49c2255b26633c6fd96399c520339e459fcda29a0e7e6d0c8775cefcff6c3636") version("2.2.0", sha256="f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675") version("2.1.0", sha256="e279a495dda42af7d9051543989f74a1435a5bda53e795a1de4a1def32027fc4") diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index 9d5bec3b874185..cec0871bd52a69 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Stow(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/stow/" gnu_mirror_path = "stow/stow-2.2.2.tar.bz2" + license("GPL-3.0-or-later") + version("2.3.1", sha256="26a6cfdfdaca0eea742db5487798c15fcd01889dc86bc5aa62614ec9415a422f") version("2.2.2", sha256="a0022034960e47a8d23dffb822689f061f7a2d9101c9835cf11bf251597aa6fd") version("2.2.0", sha256="86bc30fe1d322a5c80ff3bd7580c2758149aad7c3bbfa18b48a9d95c25d66b05") diff --git a/var/spack/repos/builtin/packages/strace/package.py b/var/spack/repos/builtin/packages/strace/package.py index 26acd2abdec369..9870692bccd01d 100644 --- a/var/spack/repos/builtin/packages/strace/package.py +++ b/var/spack/repos/builtin/packages/strace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Strace(AutotoolsPackage): maintainers("michaelkuhn") + license("BSD-3-Clause") + version("5.19", sha256="aa3dc1c8e60e4f6ff3d396514aa247f3c7bf719d8a8dc4dd4fa793be786beca3") version("5.17", sha256="5fb298dbd1331fd1e1bc94c5c32395860d376101b87c6cd3d1ba9f9aa15c161f") version("5.12", sha256="29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4") diff --git a/var/spack/repos/builtin/packages/stream/package.py b/var/spack/repos/builtin/packages/stream/package.py index 931d40369fb185..842a9b2e8a8875 100644 --- a/var/spack/repos/builtin/packages/stream/package.py +++ b/var/spack/repos/builtin/packages/stream/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/stress-ng/package.py b/var/spack/repos/builtin/packages/stress-ng/package.py index 44a82def7eb0ba..aed596ce330264 100644 --- a/var/spack/repos/builtin/packages/stress-ng/package.py +++ b/var/spack/repos/builtin/packages/stress-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class StressNg(MakefilePackage): homepage = "https://kernel.ubuntu.com/~cking/stress-ng/" url = "https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.12.06.tar.xz" + license("GPL-2.0-or-later") + version("0.12.06", sha256="75eb340266b1bbae944d8f9281af978bd5bc2c8085df97a098d5500d6f177296") depends_on("libaio") diff --git a/var/spack/repos/builtin/packages/stress/package.py b/var/spack/repos/builtin/packages/stress/package.py index 3d6fcbd969e567..ec7859d3c99f4a 100644 --- a/var/spack/repos/builtin/packages/stress/package.py +++ b/var/spack/repos/builtin/packages/stress/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,4 +17,6 @@ class Stress(AutotoolsPackage): homepage = "https://github.com/javiroman/system-stress" url = "https://github.com/javiroman/system-stress/archive/v1.0.4.tar.gz" + license("GPL-2.0-or-later") + version("1.0.4", sha256="b03dbb9664d7f8dcb3eadc918c2e8eb822f5a3ba47d9bd51246540bac281bd75") diff --git a/var/spack/repos/builtin/packages/stressapptest/package.py b/var/spack/repos/builtin/packages/stressapptest/package.py index 514d5a14ce599a..84191c6c06426d 100644 --- a/var/spack/repos/builtin/packages/stressapptest/package.py +++ b/var/spack/repos/builtin/packages/stressapptest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,5 +19,7 @@ class Stressapptest(AutotoolsPackage): url = "https://github.com/stressapptest/stressapptest/archive/refs/tags/v1.0.9.tar.gz" maintainers("saqibkh") + license("Apache-2.0") + version("1.0.9", sha256="2ba470587ad4f6ae92057d427c3a2a2756e5f10bd25cd91e62eaef55a40b30a1") version("1.0.8", sha256="b0432f39055166156ed04eb234f3c226b17a42f802a3f81d76ee999838e205df") diff --git a/var/spack/repos/builtin/packages/string-view-lite/package.py b/var/spack/repos/builtin/packages/string-view-lite/package.py index 9321c1f100f2dc..1f93927eb02b8f 100644 --- a/var/spack/repos/builtin/packages/string-view-lite/package.py +++ b/var/spack/repos/builtin/packages/string-view-lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class StringViewLite(CMakePackage): homepage = "https://github.com/martinmoene/string-view-lite" url = "https://github.com/martinmoene/string-view-lite/archive/v1.0.0.tar.gz" + license("BSL-1.0") + version("1.7.0", sha256="265eaec08c4555259b46f5b03004dbc0f7206384edfac1cd5a837efaa642e01c") version("1.2.0", sha256="de5c8be782831bac7e7f9656b7fa185b015ae39fac8123195aeba7cbde019da4") version("1.1.0", sha256="88fb33ad7a345a25aca4ddf3244afd81b8d54787e5fb316a7ed60f702bc646cd") diff --git a/var/spack/repos/builtin/packages/stringtie/package.py b/var/spack/repos/builtin/packages/stringtie/package.py index 6fe5170ba463fb..13428929af2724 100644 --- a/var/spack/repos/builtin/packages/stringtie/package.py +++ b/var/spack/repos/builtin/packages/stringtie/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Stringtie(MakefilePackage): homepage = "https://ccb.jhu.edu/software/stringtie" url = "https://github.com/gpertea/stringtie/archive/v1.3.3b.tar.gz" + license("MIT") + version("2.2.1", sha256="19592aa37e293f4dcd684a4c6e0a1439ee34876d9f22944fb4edceba8c09631b") version("1.3.4d", sha256="0134c0adc264efd31a1df4301b33bfcf3b3fe96bd3990ce3df90819bad9af968") version("1.3.4a", sha256="6164a5fa9bf8807ef68ec89f47e3a61fe57fa07fe858f52fb6627f705bf71add") diff --git a/var/spack/repos/builtin/packages/stripack/package.py b/var/spack/repos/builtin/packages/stripack/package.py index c869a4988b878d..9f38c8dc3c36e5 100644 --- a/var/spack/repos/builtin/packages/stripack/package.py +++ b/var/spack/repos/builtin/packages/stripack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/structure/package.py b/var/spack/repos/builtin/packages/structure/package.py index 6fe79cc104dda3..6620fc0536b84c 100644 --- a/var/spack/repos/builtin/packages/structure/package.py +++ b/var/spack/repos/builtin/packages/structure/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index a82b3784b49a32..795fa1756babbf 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -30,6 +30,8 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): test_requires_compiler = True + license("BSD-3-Clause-LBNL") + version("master", branch="master") version("7.2.0", sha256="6988c00c3213f13e53d75fb474102358f4fecf07a4b4304b7123d86fdc784639") version("7.1.3", sha256="c951f38ee7af20da3ff46429e38fcebd57fb6f12619b2c56040d6da5096abcb0") diff --git a/var/spack/repos/builtin/packages/su2/package.py b/var/spack/repos/builtin/packages/su2/package.py index 3e835484cdb58b..8f73b02d8e51fa 100644 --- a/var/spack/repos/builtin/packages/su2/package.py +++ b/var/spack/repos/builtin/packages/su2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Su2(MesonPackage): url = "https://github.com/su2code/SU2/archive/v7.0.3.tar.gz" git = "https://github.com/su2code/SU2.git" + license("BSD-3-Clause") + version("7.5.1", commit="09ba9e3a9605c02d38290e34f42aa6982cb4dd05", submodules=True) version("7.5.0", commit="8e8ea59fe6225c8ec4e94d0e0a4b6690ea4294e5", submodules=True) version("7.4.0", commit="745e5d922c63c8ec6963b31808c20df2e3bfd075", submodules=True) diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py index 312658e3bf53dc..64862976a4b554 100644 --- a/var/spack/repos/builtin/packages/sublime-text/package.py +++ b/var/spack/repos/builtin/packages/sublime-text/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/subread/package.py b/var/spack/repos/builtin/packages/subread/package.py index ae63d69d02f68d..bc5b2b8c4df4cb 100644 --- a/var/spack/repos/builtin/packages/subread/package.py +++ b/var/spack/repos/builtin/packages/subread/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Subread(MakefilePackage): url = "https://sourceforge.net/projects/subread/files/subread-1.5.2/subread-1.5.2-source.tar.gz/download" maintainers("snehring") + license("GPL-3.0-or-later") + version("2.0.6", sha256="f0fdda6b98634d2946028948c220253e10a0f27c7fa5f24913b65b3ac6cbb045") version("2.0.4", sha256="c54b37ed83b34318d8f119b5c02fb9d0a65c811195bcc9e1745df6daf74ca2db") version("2.0.2", sha256="0b64bd51f39f8d322c4594697fa5f0f64fbe60283113eadadff9f4268f897079") diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py index f5bbe55b0cc95b..5bc6d732368db2 100644 --- a/var/spack/repos/builtin/packages/subversion/package.py +++ b/var/spack/repos/builtin/packages/subversion/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,9 @@ class Subversion(AutotoolsPackage): tags = ["build-tools"] + # internal lz4, x509, and utf8proc code have different licenses. + license("Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT", checked_by="tgamblin") + version("1.14.2", sha256="fd826afad03db7a580722839927dc664f3e93398fe88b66905732c8530971353") version("1.14.1", sha256="dee2796abaa1f5351e6cc2a60b1917beb8238af548b20d3e1ec22760ab2f0cad") version("1.14.0", sha256="ef3d1147535e41874c304fb5b9ea32745fbf5d7faecf2ce21d4115b567e937d0") diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index b53cc04f84f187..a01a9611123eec 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class SuiteSparse(Package): url = "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v4.5.3.tar.gz" git = "https://github.com/DrTimothyAldenDavis/SuiteSparse.git" + license("Apache-2.0") + version("5.13.0", sha256="59c6ca2959623f0c69226cf9afb9a018d12a37fab3a8869db5f6d7f83b6b147d") version("5.12.0", sha256="5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de") version("5.11.0", sha256="fdd957ed06019465f7de73ce931afaf5d40e96e14ae57d91f60868b8c123c4c8") diff --git a/var/spack/repos/builtin/packages/sumaclust/package.py b/var/spack/repos/builtin/packages/sumaclust/package.py index 3f67b2822613fb..ce38f13e4d8eea 100644 --- a/var/spack/repos/builtin/packages/sumaclust/package.py +++ b/var/spack/repos/builtin/packages/sumaclust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sumaclust(MakefilePackage): homepage = "https://git.metabarcoding.org/obitools/sumaclust" + license("CECILL-2.0") + version( "1.0.20", sha256="b697495f9a2b93fe069ecdb3bc6bba75b07ec3ef9f01ed66c4dd69587a40cfc1", diff --git a/var/spack/repos/builtin/packages/sumo/package.py b/var/spack/repos/builtin/packages/sumo/package.py index 8396c475158f71..a8b49d2e7579e4 100644 --- a/var/spack/repos/builtin/packages/sumo/package.py +++ b/var/spack/repos/builtin/packages/sumo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sumo(CMakePackage): homepage = "https://projects.eclipse.org/projects/technology.sumo" url = "https://github.com/eclipse/sumo/archive/v1_5_0.tar.gz" + license("EPL-2.0") + version("1.5.0", sha256="be6ba0361b487a5e71c81e60b4c07a67826d5e170500c10c37374c1086ac2cb6") variant("gdal", default=True, description="gdal support, for arcgis") diff --git a/var/spack/repos/builtin/packages/sundials/Change-HIP_PLATFORM-from-HCC-to-AMD-and-NVCC-to-NVIDIA.patch b/var/spack/repos/builtin/packages/sundials/Change-HIP_PLATFORM-from-HCC-to-AMD-and-NVCC-to-NVIDIA.patch new file mode 100644 index 00000000000000..4dd9dc7a479359 --- /dev/null +++ b/var/spack/repos/builtin/packages/sundials/Change-HIP_PLATFORM-from-HCC-to-AMD-and-NVCC-to-NVIDIA.patch @@ -0,0 +1,28 @@ +From d4afbed86fc4f9925e55367267b3796a522ba5d5 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Sun, 14 Jan 2024 10:20:21 +0000 +Subject: [PATCH] Change HIP_PLATFORM from HCC to AMD and NVCC to NVIDIA + +--- + include/sundials/sundials_hip_policies.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/sundials/sundials_hip_policies.hpp b/include/sundials/sundials_hip_policies.hpp +index d759bbc..f6dfe41 100644 +--- a/include/sundials/sundials_hip_policies.hpp ++++ b/include/sundials/sundials_hip_policies.hpp +@@ -30,9 +30,9 @@ namespace sundials + namespace hip + { + +-#if defined(__HIP_PLATFORM_HCC__) ++#if defined(__HIP_PLATFORM_AMD__) + constexpr const sunindextype WARP_SIZE = 64; +-#elif defined(__HIP_PLATFORM_NVCC__) ++#elif defined(__HIP_PLATFORM_NVIDIA__) + constexpr const sunindextype WARP_SIZE = 32; + #endif + constexpr const sunindextype MAX_BLOCK_SIZE = 1024; +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 71ae9186a00578..3a906e6c2cfee2 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,11 +22,14 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): test_requires_compiler = True maintainers("balos1", "cswoodward", "gardner48") + license("BSD-3-Clause") # ========================================================================== # Versions # ========================================================================== version("develop", branch="develop") + version("6.7.0", sha256="5f113a1564a9d2d98ff95249f4871a4c815a05dbb9b8866a82b13ab158c37adb") + version("6.6.2", sha256="08f8223a5561327e44c072e46faa7f665c0c0bc8cd7e45d23f486c3d24c65009") version("6.6.1", sha256="21f71e4aef95b18f954c8bbdc90b62877443950533d595c68051ab768b76984b") version("6.6.0", sha256="f90029b8da846c8faff5530fd1fa4847079188d040554f55c1d5d1e04743d29d") version("6.5.1", sha256="4252303805171e4dbdd19a01e52c1dcfe0dafc599c3cfedb0a5c2ffb045a8a75") @@ -282,6 +285,10 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): # https://github.com/spack/spack/issues/29526 patch("nvector-pic.patch", when="@6.1.0:6.2.0 +rocm") + # Backward compatibility is stopped from ROCm 6.0 + # Need to follow the changes similar to PR https://github.com/LLNL/RAJA/pull/1568 + patch("Change-HIP_PLATFORM-from-HCC-to-AMD-and-NVCC-to-NVIDIA.patch", when="^hip@6.0.0 +rocm") + # remove OpenMP header file and function from hypre vector test code patch("test_nvector_parhyp.patch", when="@2.7.0:3.0.0") patch("FindPackageMultipass.cmake.patch", when="@5.0.0") diff --git a/var/spack/repos/builtin/packages/suntans/package.py b/var/spack/repos/builtin/packages/suntans/package.py index 2e6ca8e6f17881..355ce3b8b2c719 100644 --- a/var/spack/repos/builtin/packages/suntans/package.py +++ b/var/spack/repos/builtin/packages/suntans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Suntans(MakefilePackage): maintainers("ofringer", "zyaj", "mrayson", "jadelson", "lhxone") + license("LGPL-2.1-or-later") + version("3.1", sha256="9b5d0dee5502a5650e37bf72f64b1124be86c084e7408aa517c214ddb25e36de") depends_on("libx11@1.6.3") diff --git a/var/spack/repos/builtin/packages/superchic/package.py b/var/spack/repos/builtin/packages/superchic/package.py index fba9ba05f47f80..e1cbcf3c7a320b 100644 --- a/var/spack/repos/builtin/packages/superchic/package.py +++ b/var/spack/repos/builtin/packages/superchic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 241dc4b552c7ff..e4ccfe3665623d 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="master") version("amd", branch="amd") + version("8.2.1", sha256="b77d065cafa6bc1a1dcc15bf23fd854f54b05762b165badcffc195835ad2bddf") + version("8.2.0", sha256="d53573e5a399b2b4ab1fcc36e8421c1b6fab36345c0af14f8fa20326e3365f1f") version("8.1.2", sha256="7b16c442bb01ea8b298c0aab9a2584aa4615d09786aac968cb2f3118c058206b") version("8.1.1", sha256="766d70b84ece79d88249fe10ff51d2a397a29f274d9fd1e4a4ac39179a9ef23f") version("8.1.0", sha256="9308844b99a7e762d5704934f7e9f79daf158b0bfc582994303c2e0b31518b34") @@ -53,14 +55,16 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): ), ) variant("shared", default=True, description="Build shared libraries") + variant("parmetis", default=True, description="Enable ParMETIS library") depends_on("mpi") depends_on("blas") depends_on("lapack") - depends_on("parmetis +int64", when="+int64") - depends_on("metis@5: +int64", when="+int64") - depends_on("parmetis ~int64", when="~int64") - depends_on("metis@5: ~int64", when="~int64") + with when("+parmetis"): + depends_on("metis@5: +int64", when="+int64") + depends_on("parmetis +int64", when="+int64") + depends_on("metis@5: ~int64", when="~int64") + depends_on("parmetis ~int64", when="~int64") depends_on("cmake@3.18.1:", type="build", when="@7.1.0:") depends_on("hipblas", when="+rocm") depends_on("rocsolver", when="+rocm") @@ -93,13 +97,17 @@ def append_from_variant(*args): append_define("TPL_LAPACK_LIBRARIES", spec["lapack"].libs) append_define("TPL_ENABLE_LAPACKLIB", True) append_define("USE_XSDK_DEFAULTS", True) - append_define( - "TPL_PARMETIS_LIBRARIES", [spec["parmetis"].libs.ld_flags, spec["metis"].libs.ld_flags] - ) - append_define( - "TPL_PARMETIS_INCLUDE_DIRS", - [spec["parmetis"].prefix.include, spec["metis"].prefix.include], - ) + + append_from_variant("TPL_ENABLE_PARMETISLIB", "parmetis") + if "+parmetis" in spec: + append_define( + "TPL_PARMETIS_LIBRARIES", + [spec["parmetis"].libs.ld_flags, spec["metis"].libs.ld_flags], + ) + append_define( + "TPL_PARMETIS_INCLUDE_DIRS", + [spec["parmetis"].prefix.include, spec["metis"].prefix.include], + ) append_define("XSDK_INDEX_SIZE", "64" if "+int64" in spec else "32") diff --git a/var/spack/repos/builtin/packages/superlu-mt/package.py b/var/spack/repos/builtin/packages/superlu-mt/package.py index b27c289a8ada78..788500d536d05b 100644 --- a/var/spack/repos/builtin/packages/superlu-mt/package.py +++ b/var/spack/repos/builtin/packages/superlu-mt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index 9ad86ab21932f6..df5c7bcaaf00f6 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Superlu(CMakePackage, Package): test_requires_compiler = True + license("BSD-3-Clause") + version("6.0.0", sha256="5c199eac2dc57092c337cfea7e422053e8f8229f24e029825b0950edd1d17e8e") version( "5.3.0", diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py index 0a96a5b2cb0c28..0d54b1bb64bb3a 100644 --- a/var/spack/repos/builtin/packages/supernova/package.py +++ b/var/spack/repos/builtin/packages/supernova/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/survey/package.py b/var/spack/repos/builtin/packages/survey/package.py index 1fc4c550f0d37e..5ad6e6bb6c4fd1 100644 --- a/var/spack/repos/builtin/packages/survey/package.py +++ b/var/spack/repos/builtin/packages/survey/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -34,6 +34,7 @@ class Survey(CMakePackage): version("master", branch="master") version("1.0.9", branch="1.0.9") + version("1.0.8.1", branch="1.0.8.1") version("1.0.8", tag="1.0.8") version("1.0.7", tag="1.0.7") version("1.0.6", tag="1.0.6") @@ -69,7 +70,7 @@ class Survey(CMakePackage): depends_on("llvm-openmp@12.0.1", type=("build", "link"), when="@1.0.3:") # MPI Installation - depends_on("mpi", when="+mpi") + depends_on("mpi", type="build", when="+mpi") depends_on("python@3:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/sw4/package.py b/var/spack/repos/builtin/packages/sw4/package.py index c5f601ff883c91..a277513d66d991 100644 --- a/var/spack/repos/builtin/packages/sw4/package.py +++ b/var/spack/repos/builtin/packages/sw4/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sw4lite/package.py b/var/spack/repos/builtin/packages/sw4lite/package.py index 84b4fa1e34403c..3caeb8fb915ed2 100644 --- a/var/spack/repos/builtin/packages/sw4lite/package.py +++ b/var/spack/repos/builtin/packages/sw4lite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/swan/package.py b/var/spack/repos/builtin/packages/swan/package.py index 01759af3174007..e510cb90f331bc 100644 --- a/var/spack/repos/builtin/packages/swan/package.py +++ b/var/spack/repos/builtin/packages/swan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/swap-assembler/package.py b/var/spack/repos/builtin/packages/swap-assembler/package.py index 090722df777c0b..ef7c2eb7d813ad 100644 --- a/var/spack/repos/builtin/packages/swap-assembler/package.py +++ b/var/spack/repos/builtin/packages/swap-assembler/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/swarm/package.py b/var/spack/repos/builtin/packages/swarm/package.py index ef83ce3ebce261..9bcc5b9b2771dd 100644 --- a/var/spack/repos/builtin/packages/swarm/package.py +++ b/var/spack/repos/builtin/packages/swarm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Swarm(MakefilePackage): homepage = "https://github.com/torognes/swarm" url = "https://github.com/torognes/swarm/archive/v2.1.13.tar.gz" + license("AGPL-3.0-only") + version("3.0.0", sha256="b63761a9914ebf1fee14befaffd93af9c795b692c006c644d049a6d985b55810") version("2.1.13", sha256="ec4b22cc1874ec6d2c89fe98e23a2fb713aec500bc4a784f0556389d22c02650") diff --git a/var/spack/repos/builtin/packages/swfft/package.py b/var/spack/repos/builtin/packages/swfft/package.py index 1840f0d55ea11e..230afb227156ac 100644 --- a/var/spack/repos/builtin/packages/swfft/package.py +++ b/var/spack/repos/builtin/packages/swfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/swftools/package.py b/var/spack/repos/builtin/packages/swftools/package.py index d4cf3bed62c950..ecf06eb8d3cabb 100644 --- a/var/spack/repos/builtin/packages/swftools/package.py +++ b/var/spack/repos/builtin/packages/swftools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Swftools(AutotoolsPackage): homepage = "http://swftools.org" url = "http://swftools.org/swftools-0.9.2.tar.gz" + license("GPL-2.0-only") + version("0.9.2", sha256="bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1") patch("configure.patch") diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index 0094c04131cf34..5bb38e1bebcbd5 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Swiftsim(AutotoolsPackage): homepage = "http://icc.dur.ac.uk/swift/" url = "https://gitlab.cosma.dur.ac.uk/api/v4/projects/swift%2Fswiftsim/repository/archive.tar.gz?sha=v0.9.0" + license("GPL-3.0-only") + version("0.9.0", sha256="5b4477289c165838c3823ef47a2a94eff7129927babbf5eb8785f8e4bf686117") version("0.7.0", sha256="d570e83e1038eb31bc7ae95d1903a2371fffbca90d08f60b6b32bb0fd8a6f516") version("0.3.0", sha256="dd26075315cb2754dc1292e8d838bbb83739cff7f068a98319b80b9c2b0f84bc") diff --git a/var/spack/repos/builtin/packages/swig/package.py b/var/spack/repos/builtin/packages/swig/package.py index b45813a21d88cb..99e35b1b3e4b87 100644 --- a/var/spack/repos/builtin/packages/swig/package.py +++ b/var/spack/repos/builtin/packages/swig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Swig(AutotoolsPackage, SourceforgePackage): executables = ["^swig$"] + license("GPL-3.0-only") + version("master", git="https://github.com/swig/swig.git") version( "4.1.1", diff --git a/var/spack/repos/builtin/packages/swipl/package.py b/var/spack/repos/builtin/packages/swipl/package.py index 3afeac5fcecfab..3d4db45c9c5a27 100644 --- a/var/spack/repos/builtin/packages/swipl/package.py +++ b/var/spack/repos/builtin/packages/swipl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/symengine/package.py b/var/spack/repos/builtin/packages/symengine/package.py index 6bcfac92322248..68f45f6139700f 100644 --- a/var/spack/repos/builtin/packages/symengine/package.py +++ b/var/spack/repos/builtin/packages/symengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Symengine(CMakePackage): git = "https://github.com/symengine/symengine.git" maintainers("HaoZeke", "jppelteret") + license("MIT") + version("master", branch="master") version("0.9.0", sha256="dcf174ac708ed2acea46691f6e78b9eb946d8a2ba62f75e87cf3bf4f0d651724") version("0.8.1", sha256="41eb6ae6901c09e53d7f61f0758f9201e81fc534bfeecd4b2bd4b4e6f6768693") diff --git a/var/spack/repos/builtin/packages/symlinks/package.py b/var/spack/repos/builtin/packages/symlinks/package.py index a8a86daaa1020d..5d5f8cef227a4b 100644 --- a/var/spack/repos/builtin/packages/symlinks/package.py +++ b/var/spack/repos/builtin/packages/symlinks/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sympack/package.py b/var/spack/repos/builtin/packages/sympack/package.py new file mode 100644 index 00000000000000..7796aa224678ba --- /dev/null +++ b/var/spack/repos/builtin/packages/sympack/package.py @@ -0,0 +1,90 @@ +# 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 Sympack(CMakePackage, CudaPackage): + """symPACK is a sparse symmetric matrix direct linear solver, + with optional support for CUDA devices""" + + homepage = "https://go.lbl.gov/sympack" + url = "https://github.com/symPACK/symPACK/archive/refs/tags/v3.0.tar.gz" + git = "https://github.com/symPACK/symPACK.git" + + maintainers("bonachea") + + version("master", branch="master") + + version("3.0", sha256="bd04284bb6a309a71cd4f9f54f72345ff98fa7ba5719498df1e8a00ef05c41de") + version("2.0.1", sha256="21c172e902531c94c3bb5932c15de4b4ec9adf9c0d8e2071bb12cdbdfa25ca52") + version("2.0", sha256="93fcfbadab73718e249e7ed12641a3c6be58b19cafdf6bad12a6a09c3d1eb4a1") + + depends_on("cmake@3.11:", type="build") + + depends_on("upcxx@2019.9.0:") + depends_on("upcxx@2022.3.0:+cuda", when="+cuda") + + depends_on("mpi") + depends_on("blas") + + variant( + "cuda", + default=False, + when="@3.0:", + description="Enables solver to offload large operations to CUDA GPUs", + ) + conflicts("+cuda", when="@:2", msg="symPACK version 3.0 or later required for CUDA support") + depends_on("cuda@6.0:", when="+cuda") + + variant("scotch", default=False, description="Enable SCOTCH ordering") + depends_on("scotch", when="+scotch") + + variant("ptscotch", default=False, description="Enable PT-SCOTCH ordering") + depends_on("scotch+mpi", when="+ptscotch") + + variant("metis", default=False, description="Enable MeTiS ordering") + depends_on("metis", when="+metis") + + variant("parmetis", default=False, description="Enable ParMETIS ordering") + depends_on("parmetis", when="+parmetis") + + variant( + "network", + default="auto", + multi=False, + values=("auto", "ibv", "udp", "ofi", "ucx", "aries", "mpi"), + description="The hardware-dependent UPC++ network backend to use.\n" + + "'auto' selects the default network provided by the UPC++ install.\n" + + "Note: smp-conduit is currently incompatible with symPACK, " + + "udp is recommended for single-node configurations.", + ) + + build_targets = ["all", "run_sympack2D"] + + def cmake_args(self): + # UPC++ is picky about what C++ compiler we use: + meta = join_path(self.spec["upcxx"].prefix.bin, "upcxx-meta") + cxx = Executable(meta)("CXX", output=str, error=str).strip() + args = [ + self.define("CMAKE_CXX_COMPILER", cxx), + self.define_from_variant("ENABLE_CUDA", "cuda"), + self.define_from_variant("ENABLE_SCOTCH", "scotch"), + self.define_from_variant("ENABLE_PTSCOTCH", "ptscotch"), + self.define_from_variant("ENABLE_METIS", "metis"), + self.define_from_variant("ENABLE_PARMETIS", "parmetis"), + ] + return args + + def setup_build_environment(self, env): + spec = self.spec + if "network=auto" not in spec: + env.set("UPCXX_NETWORK", spec.variants["network"].value) + + @run_after("install") + def finish_install(self): + # Test driver is not installed by default + mkdirp(self.prefix.bin) + install(join_path(self.build_directory, "run_sympack2D"), self.prefix.bin) diff --git a/var/spack/repos/builtin/packages/sympol/package.py b/var/spack/repos/builtin/packages/sympol/package.py index e73e27bd9c6505..45511c400e998d 100644 --- a/var/spack/repos/builtin/packages/sympol/package.py +++ b/var/spack/repos/builtin/packages/sympol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Sympol(CMakePackage): homepage = "https://www.math.uni-rostock.de/~rehn/software/sympol.html" url = "https://www.math.uni-rostock.de/~rehn/software/sympol-0.1.8.tar.gz" + license("GPL-2.0-only") + version("0.1.8", sha256="8f4c013fa563e696fc8c27c408fd1f3d47783639815e8141e3a99826f1f3d54f") depends_on("cmake@2.6:", type="build") diff --git a/var/spack/repos/builtin/packages/sys-sage/package.py b/var/spack/repos/builtin/packages/sys-sage/package.py index 9670e01aa98b5c..c96dd329a39d0a 100644 --- a/var/spack/repos/builtin/packages/sys-sage/package.py +++ b/var/spack/repos/builtin/packages/sys-sage/package.py @@ -1,25 +1,80 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack.package import * class SysSage(CMakePackage): - """A library for capturing hadrware topology and attributes of compute systems.""" + """A library for capturing hardware topology and attributes of compute systems.""" - homepage = "https://github.com/stepanvanecek/sys-sage" - url = "https://github.com/stepanvanecek/sys-sage/archive/refs/tags/v0.1.1-alpha.2.tar.gz" - git = "https://github.com/stepanvanecek/sys-sage.git" + homepage = "https://github.com/caps-tum/sys-sage" + url = "https://github.com/caps-tum/sys-sage/archive/refs/tags/v0.4.3.tar.gz" + git = "https://github.com/caps-tum/sys-sage.git" maintainers("stepanvanecek") + license("Apache-2.0") + + version("0.4.3", sha256="e24313c4274576c1511a62e1b27c86a78cea7e4c123b8a53303cfc70de978faa") version("master", branch="master") - version( - "0.1.1-alpha.2", sha256="991a77cf37b061a911c8566fd4486f914de4f4c8cdf39112ec8a32903450c178" + version("develop", branch="develop") + + conflicts("%gcc@:7", msg="gcc can be used from version 8 and above") + + variant( + "nvidia_mig", + default=False, + description="Build and install functionality regarding NVidia MIG(multi-instance GPU, " + "ampere or newer).", + ) + variant( + "cpuinfo", + default=True, + description="Build and install functionality regarding Linux cpuinfo (only x86) -- " + "default ON.", + ) + variant( + "build_data_sources", + default=False, + when="platform=linux", + description="Build all data sources (programs to collect data about the machine sys-sage " + "runs on).", + ) + variant( + "ds_hwloc", + default=False, + description="Builds the hwloc data source for retrieving the CPU topology", + ) + variant( + "ds_numa", + default=False, + when="platform=linux", + description="builds the caps-numa-benchmark. If turned on, includes Linux-specific " + "libraries.", ) - depends_on("cmake@3.21:", type="build") + depends_on("cmake@3.22:", type="build") depends_on("libxml2@2.9.13:") + + depends_on("numactl", when="+build_data_sources platform=linux") + depends_on("numactl", when="+ds_numa platform=linux") + depends_on("hwloc@2.9:", when="+build_data_sources") + depends_on("hwloc@2.9:", when="+ds_hwloc") + depends_on("cuda", when="+nvidia_mig platform=linux") + depends_on("cuda", when="+build_data_sources platform=linux") + + def cmake_args(self): + spec = self.spec + args = [] + args.append(self.define_from_variant("NVIDIA_MIG", "nvidia_mig")) + if "+cpuinfo" in spec and spec.target == "x86_64" and spec.platform == "linux": + args.append(self.define("CPUINFO", True)) + else: + args.append(self.define("CPUINFO", False)) + if "+ds_hwloc" in spec or "+build_data_sources" in spec: + args.append(self.define("DS_HWLOC", True)) + if "+ds_numa" in spec or "+build_data_sources" in spec: + args.append(self.define("DS_NUMA", True)) + return args diff --git a/var/spack/repos/builtin/packages/sysbench/package.py b/var/spack/repos/builtin/packages/sysbench/package.py index b84bc9df27596f..b1843bf49d9cb4 100644 --- a/var/spack/repos/builtin/packages/sysbench/package.py +++ b/var/spack/repos/builtin/packages/sysbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Sysbench(AutotoolsPackage): homepage = "https://github.com/akopytov/sysbench" url = "https://github.com/akopytov/sysbench/archive/1.0.20.tar.gz" + license("GPL-2.0") + version("1.0.20", sha256="e8ee79b1f399b2d167e6a90de52ccc90e52408f7ade1b9b7135727efe181347f") version("1.0.19", sha256="39cde56b58754d97b2fe6a1688ffc0e888d80c262cf66daee19acfb2997f9bdd") version("1.0.18", sha256="c679b285e633c819d637bdafaeacc1bec13f37da5b3357c7e17d97a71bf28cb1") diff --git a/var/spack/repos/builtin/packages/syscalc/package.py b/var/spack/repos/builtin/packages/syscalc/package.py index 1c68e8b993ef95..eb59fef8c4a262 100644 --- a/var/spack/repos/builtin/packages/syscalc/package.py +++ b/var/spack/repos/builtin/packages/syscalc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sysfsutils/package.py b/var/spack/repos/builtin/packages/sysfsutils/package.py index fda63ad94cc2e6..b2267ef7218d67 100644 --- a/var/spack/repos/builtin/packages/sysfsutils/package.py +++ b/var/spack/repos/builtin/packages/sysfsutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Sysfsutils(AutotoolsPackage): homepage = "https://github.com/linux-ras/sysfsutils/" url = "https://github.com/linux-ras/sysfsutils/archive/sysfsutils_0_5.tar.gz" + license("GPL-2.0-only AND LGPL-2.1-only", checked_by="tgamblin") + version("0_5", sha256="6878c8a4281e7de52e57b40fe543b1b4e01d6fbce4ffd45a36e5fc25e376746f") version("0_4_0", sha256="9c78edb118c6bd962e04558ddb2df46d456273284fe3f23bb930dc287225aea5") version("0_3_0", sha256="f10250aa09513d245cb4ed61ac0dbfd7dfb2e7810bcd8804a07b3fe18f08a74a") diff --git a/var/spack/repos/builtin/packages/sysget/package.py b/var/spack/repos/builtin/packages/sysget/package.py index bfd75803d709cf..bbad2d22448e45 100644 --- a/var/spack/repos/builtin/packages/sysget/package.py +++ b/var/spack/repos/builtin/packages/sysget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sysget(MakefilePackage): homepage = "https://github.com/emilengler/sysget" url = "https://github.com/emilengler/sysget/archive/v2.3.tar.gz" + license("GPL-3.0-only") + version("2.3", sha256="bba647bfd7093d18ee2b471a79f0cc50d84846aa3a04d790244acfefded79477") version("2.2", sha256="8f55ee8402d6de3cc16fa0577148b484e35da6688ad5f3ee3e9c1be04c88863a") version("2.1", sha256="0590aaae10494ca76c6749264925feb0e40b6e4b3822a8a4d148761addcb66c1") diff --git a/var/spack/repos/builtin/packages/sysstat/package.py b/var/spack/repos/builtin/packages/sysstat/package.py index 6f242b9c70212a..e4fab86b95cfd7 100644 --- a/var/spack/repos/builtin/packages/sysstat/package.py +++ b/var/spack/repos/builtin/packages/sysstat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Sysstat(AutotoolsPackage): homepage = "https://github.com/sysstat" url = "https://github.com/sysstat/sysstat/archive/v12.1.6.tar.gz" + license("GPL-2.0-or-later") + version("12.4.5", sha256="4e35abdd9eaf766ecdab55786f459093f3e1c350db23e57a15561afda417ff0d") version("12.2.0", sha256="614ab9fe8e7937a3edb7b2b6760792a3764ea3a7310ac540292dd0e3dfac86a6") diff --git a/var/spack/repos/builtin/packages/systemc/package.py b/var/spack/repos/builtin/packages/systemc/package.py index 4566b26c9d0a6e..403bbf28a224f9 100644 --- a/var/spack/repos/builtin/packages/systemc/package.py +++ b/var/spack/repos/builtin/packages/systemc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Systemc(CMakePackage): maintainers("nicmcd") + license("Apache-2.0") + version("2.3.3", sha256="5781b9a351e5afedabc37d145e5f7edec08f3fd5de00ffeb8fa1f3086b1f7b3f") variant( diff --git a/var/spack/repos/builtin/packages/systemtap/package.py b/var/spack/repos/builtin/packages/systemtap/package.py index 939f6cba0f140d..8e5a3184489786 100644 --- a/var/spack/repos/builtin/packages/systemtap/package.py +++ b/var/spack/repos/builtin/packages/systemtap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Systemtap(AutotoolsPackage): homepage = "https://sourceware.org/systemtap/" url = "https://sourceware.org/systemtap/ftp/releases/systemtap-4.3.tar.gz" + license("GPL-2.0-only") + version("4.3", sha256="f8e206ed654c13a8b42245a342c1b5a4aafdf817c97bf3becbe3c8a43a4489ce") version("4.2", sha256="0984ebe3162274988252ec35074021dc1e8420d87a8b35f437578562fce08781") version("4.1", sha256="8efa1ee2b34f1c6b2f33a25313287d59c8ed1b00265e900aea874da8baca1e1d") diff --git a/var/spack/repos/builtin/packages/sz-cpp/package.py b/var/spack/repos/builtin/packages/sz-cpp/package.py index 03703812cd3985..f59ea178fcb271 100644 --- a/var/spack/repos/builtin/packages/sz-cpp/package.py +++ b/var/spack/repos/builtin/packages/sz-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py index 587c24120b010d..30c9faa74fbeee 100644 --- a/var/spack/repos/builtin/packages/sz/package.py +++ b/var/spack/repos/builtin/packages/sz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/sz3/package.py b/var/spack/repos/builtin/packages/sz3/package.py index b28d09ba0ee480..9e94f347059d2f 100644 --- a/var/spack/repos/builtin/packages/sz3/package.py +++ b/var/spack/repos/builtin/packages/sz3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/szauto/package.py b/var/spack/repos/builtin/packages/szauto/package.py index ff6897a122d85b..02c19e38bf5fd1 100644 --- a/var/spack/repos/builtin/packages/szauto/package.py +++ b/var/spack/repos/builtin/packages/szauto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/t8code/package.py b/var/spack/repos/builtin/packages/t8code/package.py index a922c9a3485696..9ba18b9993a997 100644 --- a/var/spack/repos/builtin/packages/t8code/package.py +++ b/var/spack/repos/builtin/packages/t8code/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class T8code(AutotoolsPackage): maintainers = ["Davknapp", "melven"] + license("GPL-2.0-or-later") + version("1.4.1", sha256="b0ec0c9b4a182f8ac7e930ba80cd20e6dc5baefc328630e4a9dac8c688749e9a") variant("mpi", default=True, description="Enable MPI parallel code") diff --git a/var/spack/repos/builtin/packages/tabix/package.py b/var/spack/repos/builtin/packages/tabix/package.py index 06d3140e878e2d..7ae1e07804c4eb 100644 --- a/var/spack/repos/builtin/packages/tabix/package.py +++ b/var/spack/repos/builtin/packages/tabix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tajo/package.py b/var/spack/repos/builtin/packages/tajo/package.py index 7a3b01e6e95d47..d08f67589caf0e 100644 --- a/var/spack/repos/builtin/packages/tajo/package.py +++ b/var/spack/repos/builtin/packages/tajo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/talass/package.py b/var/spack/repos/builtin/packages/talass/package.py index cf512d8c1ed5b3..d98e7d01ce5521 100644 --- a/var/spack/repos/builtin/packages/talass/package.py +++ b/var/spack/repos/builtin/packages/talass/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/talloc/package.py b/var/spack/repos/builtin/packages/talloc/package.py index be4b13ec319762..567950dcdcd543 100644 --- a/var/spack/repos/builtin/packages/talloc/package.py +++ b/var/spack/repos/builtin/packages/talloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Talloc(AutotoolsPackage): homepage = "https://talloc.samba.org" url = "https://www.samba.org/ftp/talloc/talloc-2.1.9.tar.gz" + license("LGPL-3.0-or-later") + version("2.4.0", sha256="6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba") version("2.3.1", sha256="ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77") version("2.3.0", sha256="75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6") diff --git a/var/spack/repos/builtin/packages/tamaas/package.py b/var/spack/repos/builtin/packages/tamaas/package.py index f09c098852a968..298287e463b98d 100644 --- a/var/spack/repos/builtin/packages/tamaas/package.py +++ b/var/spack/repos/builtin/packages/tamaas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tandem/package.py b/var/spack/repos/builtin/packages/tandem/package.py index 4bb56cc557302e..f984a5d57d8cf8 100644 --- a/var/spack/repos/builtin/packages/tandem/package.py +++ b/var/spack/repos/builtin/packages/tandem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,9 @@ class Tandem(CMakePackage): homepage = "https://tandem.readthedocs.io/en/latest/" git = "https://github.com/TEAR-ERC/tandem.git" + + license("BSD-3-Clause") + version("main", branch="main", submodules=True) # we cannot use the tar.gz file because it does not contains submodules diff --git a/var/spack/repos/builtin/packages/tangram/package.py b/var/spack/repos/builtin/packages/tangram/package.py index 5b0d4814d460e3..4c0886d94c9ebc 100644 --- a/var/spack/repos/builtin/packages/tangram/package.py +++ b/var/spack/repos/builtin/packages/tangram/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Tangram(CMakePackage): maintainers("raovgarimella") + license("GPL-3.0-or-later") + version("1.0.5", sha256="4fa61d5fecd67215237ab3df8fe64bc6c4d018b22313f2174923486026e93e53") version("1.0.1", sha256="8f2f8c01bb2d726b0f64e5a5bc3aa2bd8057ccaee7a29c68f1439d16e39aaa90") version("master", branch="master", submodules=True) diff --git a/var/spack/repos/builtin/packages/tantan/package.py b/var/spack/repos/builtin/packages/tantan/package.py index f9b99efa5e8d43..30ac674556d579 100644 --- a/var/spack/repos/builtin/packages/tantan/package.py +++ b/var/spack/repos/builtin/packages/tantan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tantan(MakefilePackage): homepage = "http://cbrc3.cbrc.jp/~martin/tantan" url = "http://cbrc3.cbrc.jp/~martin/tantan/tantan-13.zip" + license("GPL-3.0-only") + version("13", sha256="3f7ba7d8d04a32c3716ea3e4e2f0798942fb93e5123574ce01c9436e1854a518") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index 9e0c9b2e500c87..7b5af9403c2b61 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Tar(AutotoolsPackage, GNUMirrorPackage): tags = ["core-packages"] + license("GPL-3.0-or-later") + version("1.34", sha256="03d908cf5768cfe6b7ad588c921c6ed21acabfb2b79b788d1330453507647aed") version("1.32", sha256="b59549594d91d84ee00c99cf2541a3330fed3a42c440503326dab767f2fbb96c") version("1.31", sha256="b471be6cb68fd13c4878297d856aebd50551646f4e3074906b1a74549c40d5a2") diff --git a/var/spack/repos/builtin/packages/targetp/package.py b/var/spack/repos/builtin/packages/targetp/package.py index 7b37cca7a10af2..45e661174cefab 100644 --- a/var/spack/repos/builtin/packages/targetp/package.py +++ b/var/spack/repos/builtin/packages/targetp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/task/package.py b/var/spack/repos/builtin/packages/task/package.py index 5f7240886656b3..65f71a6218d186 100644 --- a/var/spack/repos/builtin/packages/task/package.py +++ b/var/spack/repos/builtin/packages/task/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Task(CMakePackage): homepage = "https://www.taskwarrior.org" url = "https://taskwarrior.org/download/task-2.4.4.tar.gz" + license("MIT") + version("2.6.2", sha256="b1d3a7f000cd0fd60640670064e0e001613c9e1cb2242b9b3a9066c78862cfec") version("2.5.1", sha256="d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15") version("2.4.4", sha256="7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b") diff --git a/var/spack/repos/builtin/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py index 602ef9c2e5ed5d..96a818d4ce5d3b 100644 --- a/var/spack/repos/builtin/packages/taskd/package.py +++ b/var/spack/repos/builtin/packages/taskd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Taskd(CMakePackage): homepage = "https://www.taskwarrior.org" url = "https://taskwarrior.org/download/taskd-1.1.0.tar.gz" + license("MIT") + version("1.1.0", sha256="7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4") depends_on("uuid") diff --git a/var/spack/repos/builtin/packages/taskflow/package.py b/var/spack/repos/builtin/packages/taskflow/package.py index df921639b28781..1e00312654a5b9 100644 --- a/var/spack/repos/builtin/packages/taskflow/package.py +++ b/var/spack/repos/builtin/packages/taskflow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,10 @@ class Taskflow(CMakePackage): url = "https://github.com/taskflow/taskflow/archive/v2.7.0.tar.gz" git = "https://github.com/taskflow/taskflow.git" + license("MIT") + version("master", branch="master") + version("3.6.0", sha256="5a1cd9cf89f93a97fcace58fd73ed2fc8ee2053bcb43e047acb6bc121c3edf4c") version("2.7.0", sha256="bc2227dcabec86abeba1fee56bb357d9d3c0ef0184f7c2275d7008e8758dfc3e") # Compiler must offer C++14 support diff --git a/var/spack/repos/builtin/packages/tasmanian/package.py b/var/spack/repos/builtin/packages/tasmanian/package.py index b4d4ead7bf3842..c9285453f4dd9b 100644 --- a/var/spack/repos/builtin/packages/tasmanian/package.py +++ b/var/spack/repos/builtin/packages/tasmanian/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -114,11 +114,6 @@ def cmake_args(self): args.append("-DBLAS_LIBRARIES={0}".format(spec["blas"].libs.joined(";"))) args.append("-DLAPACK_LIBRARIES={0}".format(spec["lapack"].libs.joined(";"))) - if spec.satisfies("+python"): - args.append( - "-DPYTHON_EXECUTABLE:FILEPATH={0}".format(self.spec["python"].command.path) - ) - return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/tassel/package.py b/var/spack/repos/builtin/packages/tassel/package.py index fccd43899472b2..46a66b60f3dcb4 100644 --- a/var/spack/repos/builtin/packages/tassel/package.py +++ b/var/spack/repos/builtin/packages/tassel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 56cf5f1d721a7b..3feca73fa36675 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Tau(Package): tags = ["e4s"] + license("MIT") + version("master", branch="master") version("2.33", sha256="04d9d67adb495bc1ea56561f33c5ce5ba44f51cc7f64996f65bd446fac5483d9") version("2.32.1", sha256="0eec3de46b0873846dfc639270c5e30a226b463dd6cb41aa12e975b7563f0eeb") @@ -107,7 +109,8 @@ class Tau(Package): depends_on("zlib-api", type="link") depends_on("pdt", when="+pdt") # Required for TAU instrumentation depends_on("scorep", when="+scorep") - depends_on("otf2@2.1:2.3", when="+otf2") + depends_on("otf2@2.1:2.3", when="@:2.33.0 +otf2") + depends_on("otf2@3:", when="@2.33.1: +otf2") depends_on("likwid", when="+likwid") depends_on("papi", when="+papi") depends_on("libdwarf", when="+libdwarf") @@ -272,8 +275,12 @@ def install(self, spec, prefix): if "+fortran" in spec: env["F77"] = spec["mpi"].mpif77 env["FC"] = spec["mpi"].mpifc - options.append("-mpiinc=%s" % spec["mpi"].prefix.include) - options.append("-mpilib=%s" % spec["mpi"].prefix.lib) + if spec["mpi"].name == "intel-oneapi-mpi": + options.append("-mpiinc=%s" % spec["mpi"].package.component_prefix) + options.append("-mpilib=%s" % spec["mpi"].package.component_prefix) + else: + options.append("-mpiinc=%s" % spec["mpi"].prefix.include) + options.append("-mpilib=%s" % spec["mpi"].prefix.lib) options.append("-mpi") if "+comm" in spec: diff --git a/var/spack/repos/builtin/packages/tauola/package.py b/var/spack/repos/builtin/packages/tauola/package.py index dc5213deb9455e..7275fb93583aed 100644 --- a/var/spack/repos/builtin/packages/tauola/package.py +++ b/var/spack/repos/builtin/packages/tauola/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Tauola(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("1.1.8", sha256="3f734e8a967682869cca2c1ffebd3e055562613c40853cc81820d8b666805ed5") variant("hepmc", default=True, description="Enable hepmc 2.x support") diff --git a/var/spack/repos/builtin/packages/tbl2asn/package.py b/var/spack/repos/builtin/packages/tbl2asn/package.py index 7bbac69383326c..abea200fb4a422 100644 --- a/var/spack/repos/builtin/packages/tbl2asn/package.py +++ b/var/spack/repos/builtin/packages/tbl2asn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tblite/package.py b/var/spack/repos/builtin/packages/tblite/package.py index 6e89a147480599..52661f07449400 100644 --- a/var/spack/repos/builtin/packages/tblite/package.py +++ b/var/spack/repos/builtin/packages/tblite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Tblite(MesonPackage): maintainers("awvwgk") + license("LGPL-3.0-or-later") + version("0.3.0", sha256="46d77c120501ac55ed6a64dea8778d6593b26fb0653c591f8e8c985e35884f0a") variant("openmp", default=True, description="Use OpenMP parallelisation") diff --git a/var/spack/repos/builtin/packages/tcl-itcl/package.py b/var/spack/repos/builtin/packages/tcl-itcl/package.py index db5c621e5377a6..d7a42c60f8c099 100644 --- a/var/spack/repos/builtin/packages/tcl-itcl/package.py +++ b/var/spack/repos/builtin/packages/tcl-itcl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tcl-tcllib/package.py b/var/spack/repos/builtin/packages/tcl-tcllib/package.py index cf938089622225..d0a0ccaa3d7f4e 100644 --- a/var/spack/repos/builtin/packages/tcl-tcllib/package.py +++ b/var/spack/repos/builtin/packages/tcl-tcllib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class TclTcllib(AutotoolsPackage): list_url = "https://sourceforge.net/projects/tcllib/files/tcllib/" list_depth = 1 + license("TCL") + version("1.19", sha256="01fe87cf1855b96866cf5394b6a786fd40b314022714b34110aeb6af545f6a9c") version("1.18", sha256="72667ecbbd41af740157ee346db77734d1245b41dffc13ac80ca678dd3ccb515") version("1.17", sha256="00c16aa28512ff6a67f199ffa5e04acaeb7b8464b2b7dc70ad8d00ce4c8d25ce") diff --git a/var/spack/repos/builtin/packages/tcl-tclxml/package.py b/var/spack/repos/builtin/packages/tcl-tclxml/package.py index c886aab99775e7..5d39a94ec79b6c 100644 --- a/var/spack/repos/builtin/packages/tcl-tclxml/package.py +++ b/var/spack/repos/builtin/packages/tcl-tclxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py index dee78161bb1149..0d1dd1e8191af6 100644 --- a/var/spack/repos/builtin/packages/tcl/package.py +++ b/var/spack/repos/builtin/packages/tcl/package.py @@ -1,17 +1,35 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os +import sys from llnl.util.filesystem import find_first from spack.package import * from spack.util.environment import is_system_path +is_windows = sys.platform == "win32" -class Tcl(AutotoolsPackage, SourceforgePackage): + +class TclHelper: + @staticmethod + def find_script_dir(spec): + # Put more-specific prefixes first + check_prefixes = [ + join_path(spec.prefix, "share", "tcl{0}".format(spec.package.version.up_to(2))), + spec.prefix, + ] + for prefix in check_prefixes: + result = find_first(prefix, "init.tcl") + if result: + return os.path.dirname(result) + raise RuntimeError("Cannot locate init.tcl") + + +class Tcl(AutotoolsPackage, NMakePackage, SourceforgePackage, TclHelper): """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more. Open source @@ -20,6 +38,9 @@ class Tcl(AutotoolsPackage, SourceforgePackage): homepage = "https://www.tcl.tk/" sourceforge_mirror_path = "tcl/tcl8.6.11-src.tar.gz" + tags = ["windows"] + + license("TCL") version("8.6.12", sha256="26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6") version("8.6.11", sha256="8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258") @@ -35,53 +56,30 @@ class Tcl(AutotoolsPackage, SourceforgePackage): depends_on("zlib-api") - configure_directory = "unix" - - filter_compiler_wrappers("tclConfig.sh", relative_root="lib") - - def install(self, spec, prefix): - with working_dir(self.build_directory): - make("install") - - # https://wiki.tcl-lang.org/page/kitgen - if self.spec.satisfies("@8.6:"): - make("install-headers") - - # Some applications like Expect require private Tcl headers. - make("install-private-headers") - - # Copy source to install tree - # A user-provided install option might re-do this - # https://github.com/spack/spack/pull/4102/files - installed_src = join_path(self.spec.prefix, "share", self.name, "src") - stage_src = os.path.realpath(self.stage.source_path) - install_tree(stage_src, installed_src) - - # Replace stage dir -> installed src dir in tclConfig - filter_file( - stage_src, - installed_src, - join_path(self.spec["tcl"].libs.directories[0], "tclConfig.sh"), - ) - - # Don't install binaries in src/ tree - with working_dir(join_path(installed_src, self.configure_directory)): - make("clean") - - @run_after("install") - def symlink_tclsh(self): - with working_dir(self.prefix.bin): - symlink("tclsh{0}".format(self.version.up_to(2)), "tclsh") + # No compiler wrappers on Windows + for plat in ["linux", "darwin", "cray", "freebsd"]: + filter_compiler_wrappers("tclConfig.sh", relative_root="lib", when=f"platform={plat}") + build_system("autotools", "nmake") + patch("tcl-quote-cc-path.patch", when="platform=windows") # ======================================================================== # Set up environment to make install easy for tcl extensions. # ======================================================================== + @property + def _tcl_name(self): + ver_suffix = self.version.up_to(2) + win_suffix = "" + if is_windows: + if self.spec.satisfies("@:8.7"): + win_suffix = "t" + ver_suffix = ver_suffix.joined + return f"{ver_suffix}{win_suffix}" + @property def libs(self): - return find_libraries( - ["libtcl{0}".format(self.version.up_to(2))], root=self.prefix, recursive=True - ) + lib = "lib" if not is_windows else "" + return find_libraries([f"{lib}tcl{self._tcl_name}"], root=self.prefix, recursive=True) @property def command(self): @@ -93,21 +91,8 @@ def command(self): # Although we symlink tclshX.Y to tclsh, we also need to support external # installations that may not have this symlink, or may have multiple versions # of Tcl installed in the same directory. - return Executable( - os.path.realpath(self.prefix.bin.join("tclsh{0}".format(self.version.up_to(2)))) - ) - - def _find_script_dir(self): - # Put more-specific prefixes first - check_prefixes = [ - join_path(self.prefix, "share", "tcl{0}".format(self.version.up_to(2))), - self.prefix, - ] - for prefix in check_prefixes: - result = find_first(prefix, "init.tcl") - if result: - return os.path.dirname(result) - raise RuntimeError("Cannot locate init.tcl") + exe = ".exe" if is_windows else "" + return Executable(os.path.realpath(self.prefix.bin.join(f"tclsh{self._tcl_name}{exe}"))) def setup_run_environment(self, env): """Set TCL_LIBRARY to the directory containing init.tcl. @@ -118,7 +103,41 @@ def setup_run_environment(self, env): """ # When using tkinter from within spack provided python+tkinter, # python will not be able to find Tcl unless TCL_LIBRARY is set. - env.set("TCL_LIBRARY", self._find_script_dir()) + env.set("TCL_LIBRARY", TclHelper.find_script_dir(self.spec)) + + def setup_dependent_run_environment(self, env, dependent_spec): + """Set TCLLIBPATH to include the tcl-shipped directory for + extensions and any other tcl extension it depends on. + + For further info see: + + * https://wiki.tcl-lang.org/page/TCLLIBPATH + """ + if dependent_spec.package.extends(self.spec): + # Tcl libraries may be installed in lib or lib64, see #19546 + for lib in ["lib", "lib64"]: + tcllibpath = join_path(dependent_spec.prefix, lib) + if os.path.exists(tcllibpath): + env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ") + + +class BaseBuilder(TclHelper, metaclass=spack.builder.PhaseCallbacksMeta): + @run_after("install") + def symlink_tclsh(self): + # There's some logic regarding this suffix in the build system + # but the way Spack builds tcl, the Windows suffix is always 't' + # unless the version is >= 8.7, in which case there is no suffix + # if the build is ever switched to static, this will need to change + # to be "s[t]" + win_suffix = "" + ver_suffix = self.pkg.version.up_to(2) + if is_windows: + win_suffix = "t" if self.spec.satisfies("@:8.7") else "" + win_suffix += ".exe" + ver_suffix = ver_suffix.joined + + with working_dir(self.prefix.bin): + symlink(f"tclsh{ver_suffix}{win_suffix}", "tclsh") def setup_dependent_build_environment(self, env, dependent_spec): """Set TCL_LIBRARY to the directory containing init.tcl. @@ -130,15 +149,15 @@ def setup_dependent_build_environment(self, env, dependent_spec): * https://wiki.tcl-lang.org/page/TCL_LIBRARY * https://wiki.tcl-lang.org/page/TCLLIBPATH """ - env.set("TCL_LIBRARY", self._find_script_dir()) + env.set("TCL_LIBRARY", TclHelper.find_script_dir(self.spec)) # If we set TCLLIBPATH, we must also ensure that the corresponding # tcl is found in the build environment. This to prevent cases # where a system provided tcl is run against the standard libraries # of a Spack built tcl. See issue #7128 that relates to python but # it boils down to the same situation we have here. - if not is_system_path(self.prefix.bin): - env.prepend_path("PATH", self.prefix.bin) + if not is_system_path(self.spec.prefix.bin): + env.prepend_path("PATH", self.spec.prefix.bin) # WARNING: paths in $TCLLIBPATH must be *space* separated, # its value is meant to be a Tcl list, *not* an env list @@ -160,17 +179,51 @@ def setup_dependent_build_environment(self, env, dependent_spec): if os.path.exists(tcllibpath): env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ") - def setup_dependent_run_environment(self, env, dependent_spec): - """Set TCLLIBPATH to include the tcl-shipped directory for - extensions and any other tcl extension it depends on. - For further info see: +class AutotoolsBuilder(BaseBuilder, spack.build_systems.autotools.AutotoolsBuilder): + configure_directory = "unix" - * https://wiki.tcl-lang.org/page/TCLLIBPATH - """ - if dependent_spec.package.extends(self.spec): - # Tcl libraries may be installed in lib or lib64, see #19546 - for lib in ["lib", "lib64"]: - tcllibpath = join_path(dependent_spec.prefix, lib) - if os.path.exists(tcllibpath): - env.prepend_path("TCLLIBPATH", tcllibpath, separator=" ") + def install(self, pkg, spec, prefix): + with working_dir(self.build_directory): + make("install") + + # https://wiki.tcl-lang.org/page/kitgen + if self.spec.satisfies("@8.6:"): + make("install-headers") + + # Some applications like Expect require private Tcl headers. + make("install-private-headers") + + # Copy source to install tree + # A user-provided install option might re-do this + # https://github.com/spack/spack/pull/4102/files + installed_src = join_path(self.spec.prefix, "share", pkg.name, "src") + stage_src = os.path.realpath(pkg.stage.source_path) + install_tree(stage_src, installed_src) + + # Replace stage dir -> installed src dir in tclConfig + filter_file( + stage_src, + installed_src, + join_path(self.spec["tcl"].libs.directories[0], "tclConfig.sh"), + ) + + # Don't install binaries in src/ tree + with working_dir(join_path(installed_src, self.configure_directory)): + make("clean") + + +class NMakeBuilder(BaseBuilder, spack.build_systems.nmake.NMakeBuilder): + build_targets = ["all"] + install_targets = ["install"] + + @property + def makefile_root(self): + return f"{self.stage.source_path}\\win" + + @property + def makefile_name(self): + return "makefile.vc" + + def nmake_install_args(self): + return [self.define("INSTALLDIR", self.spec.prefix)] diff --git a/var/spack/repos/builtin/packages/tcl/tcl-quote-cc-path.patch b/var/spack/repos/builtin/packages/tcl/tcl-quote-cc-path.patch new file mode 100644 index 00000000000000..53039c1aa2813a --- /dev/null +++ b/var/spack/repos/builtin/packages/tcl/tcl-quote-cc-path.patch @@ -0,0 +1,13 @@ +diff --git a/win/rules.vc b/win/rules.vc +index 8a91b58b46..9e888ce8cb 100644 +--- a/win/rules.vc ++++ b/win/rules.vc +@@ -416,7 +416,7 @@ _INSTALLDIR=$(_INSTALLDIR)\lib + # MACHINE - same as $(ARCH) - legacy + # _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed + +-cc32 = $(CC) # built-in default. ++cc32 = "$(CC)" # built-in default. + link32 = link + lib32 = lib + rc32 = $(RC) # built-in default. diff --git a/var/spack/repos/builtin/packages/tclap/package.py b/var/spack/repos/builtin/packages/tclap/package.py index 8f351ccb19ff09..a2ab335f318f64 100644 --- a/var/spack/repos/builtin/packages/tclap/package.py +++ b/var/spack/repos/builtin/packages/tclap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tclap(AutotoolsPackage, SourceforgePackage): homepage = "http://tclap.sourceforge.net" sourceforge_mirror_path = "tclap/tclap-1.2.2.tar.gz" + license("MIT") + version("1.2.5", sha256="bb649f76dae35e8d0dcba4b52acfd4e062d787e6a81b43f7a4b01275153165a6") version("1.2.4", sha256="634c5b59dbb1ccbc9d6a5f6de494a257e29a3f59dcb6fc30445ff39b45188574") version("1.2.3", sha256="19e7db5281540f154348770bc3a7484575f4f549aef8e00aabcc94b395f773c9") diff --git a/var/spack/repos/builtin/packages/tcoffee/package.py b/var/spack/repos/builtin/packages/tcoffee/package.py index b15f38ffbdd12b..1564b43ef891f8 100644 --- a/var/spack/repos/builtin/packages/tcoffee/package.py +++ b/var/spack/repos/builtin/packages/tcoffee/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tcpdump/package.py b/var/spack/repos/builtin/packages/tcpdump/package.py index c0fc218824d373..57c2a3f0dc2d40 100644 --- a/var/spack/repos/builtin/packages/tcpdump/package.py +++ b/var/spack/repos/builtin/packages/tcpdump/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Tcpdump(AutotoolsPackage): homepage = "https://www.tcpdump.org/" url = "https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz" + license("BSD-3-Clause") + version("4.99.4", sha256="0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea") version("4.99.0", sha256="8cf2f17a9528774a7b41060323be8b73f76024f7778f59c34efa65d49d80b842") version("4.9.3", sha256="2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410") diff --git a/var/spack/repos/builtin/packages/tcptrace/package.py b/var/spack/repos/builtin/packages/tcptrace/package.py index 3a9b2600873236..6803f55ba24398 100644 --- a/var/spack/repos/builtin/packages/tcptrace/package.py +++ b/var/spack/repos/builtin/packages/tcptrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Tcptrace(AutotoolsPackage): homepage = "http://www.tcptrace.org/" url = "http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz" + license("GPL-2.0-only") + version("6.6.7", sha256="63380a4051933ca08979476a9dfc6f959308bc9f60d45255202e388eb56910bd") depends_on("bison", type="build") diff --git a/var/spack/repos/builtin/packages/tcsh/package.py b/var/spack/repos/builtin/packages/tcsh/package.py index bf7ae34a367ca6..5196673c87dab7 100644 --- a/var/spack/repos/builtin/packages/tcsh/package.py +++ b/var/spack/repos/builtin/packages/tcsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Tcsh(AutotoolsPackage): url = "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/tcsh-6.20.00.tar.gz" list_url = "https://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/" + license("BSD-3-Clause") + version("6.24.00", sha256="60be2c504bd8f1fa6e424b1956495d7e7ced52a2ac94db5fd27f4b6bfc8f74f0") version("6.22.02", sha256="ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b") version("6.21.00", sha256="c438325448371f59b12a4c93bfd3f6982e6f79f8c5aef4bc83aac8f62766e972") diff --git a/var/spack/repos/builtin/packages/tdengine/package.py b/var/spack/repos/builtin/packages/tdengine/package.py index b70f58b8ea6fe1..6b6d5488873be1 100644 --- a/var/spack/repos/builtin/packages/tdengine/package.py +++ b/var/spack/repos/builtin/packages/tdengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tdengine(CMakePackage): homepage = "https://github.com/taosdata/TDengine" url = "https://github.com/taosdata/TDengine/archive/ver-2.0.2.2.tar.gz" + license("AGPL-3.0-only") + version("2.0.3.2", sha256="3eb8df894998d5592cce377b4f7e267972aee8adf9fc1ce60d1af532ffa9c1c6") version("2.0.3.1", sha256="69418815afcac8051f1aab600415669003b4aeec4ec2aaf09cab24636edaf51f") diff --git a/var/spack/repos/builtin/packages/tealeaf/package.py b/var/spack/repos/builtin/packages/tealeaf/package.py index 0dd5f8d8c3ebe2..64cd5a5db38759 100644 --- a/var/spack/repos/builtin/packages/tealeaf/package.py +++ b/var/spack/repos/builtin/packages/tealeaf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Tealeaf(MakefilePackage): tags = ["proxy-app"] + license("LGPL-3.0-only") + version("1.0", sha256="e11799d1a3fbe76041333ba98858043b225c5d65221df8c600479bc55e7197ce") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/tecio/package.py b/var/spack/repos/builtin/packages/tecio/package.py index d54636eefb35eb..37db797f49f234 100644 --- a/var/spack/repos/builtin/packages/tecio/package.py +++ b/var/spack/repos/builtin/packages/tecio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/teckit/package.py b/var/spack/repos/builtin/packages/teckit/package.py index ab0c13f9405088..ad918cfdb6e8c6 100644 --- a/var/spack/repos/builtin/packages/teckit/package.py +++ b/var/spack/repos/builtin/packages/teckit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Teckit(AutotoolsPackage): homepage = "https://scripts.sil.org/cms/scripts/page.php?cat_id=TECkit" git = "https://github.com/silnrsi/teckit.git" + license("CPL-1.0") + version("2.5.11", commit="fea17dbf17266387c96f74fd9c0ce44d065f0f50") version("2.5.10", commit="1c510d4de7ff844207b1273e856fd27a15b3486d") version("2.5.9", commit="e2434cef98d59487514450304513efb42c376365") diff --git a/var/spack/repos/builtin/packages/tecplot/package.py b/var/spack/repos/builtin/packages/tecplot/package.py index a877c9da76d95f..c11d28d9a1be44 100644 --- a/var/spack/repos/builtin/packages/tecplot/package.py +++ b/var/spack/repos/builtin/packages/tecplot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/telegraf/package.py b/var/spack/repos/builtin/packages/telegraf/package.py index 02581ba32bcc5c..92d4084bc05046 100644 --- a/var/spack/repos/builtin/packages/telegraf/package.py +++ b/var/spack/repos/builtin/packages/telegraf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Telegraf(MakefilePackage): homepage = "https://github.com/influxdata/telegraf" url = "https://github.com/influxdata/telegraf/archive/refs/tags/v1.19.3.tar.gz" + license("MIT") + version("1.20.3", sha256="cf8fd4d38970648281101e8a71b1a48c5765c8aaa9d67619c00272c9192e9057") version("1.19.3", sha256="d2fb8a3519a5690c801e1221e22c3693ed95204f70f6c57eb13267ca1964c659") diff --git a/var/spack/repos/builtin/packages/tempestremap/package.py b/var/spack/repos/builtin/packages/tempestremap/package.py index 65f0175e20aacb..faf870e61fe018 100644 --- a/var/spack/repos/builtin/packages/tempestremap/package.py +++ b/var/spack/repos/builtin/packages/tempestremap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/templight-tools/package.py b/var/spack/repos/builtin/packages/templight-tools/package.py index 40220ce148cb51..c2951943bad17e 100644 --- a/var/spack/repos/builtin/packages/templight-tools/package.py +++ b/var/spack/repos/builtin/packages/templight-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class TemplightTools(CMakePackage): homepage = "https://github.com/mikael-s-persson/templight-tools" git = "https://github.com/mikael-s-persson/templight-tools.git" + license("GPL-3.0-only") + version("develop", branch="master") depends_on("cmake @2.8.7:", type="build") diff --git a/var/spack/repos/builtin/packages/templight/package.py b/var/spack/repos/builtin/packages/templight/package.py index f0bd4071c0ff71..76df5f2bed9eed 100644 --- a/var/spack/repos/builtin/packages/templight/package.py +++ b/var/spack/repos/builtin/packages/templight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -128,7 +128,6 @@ def cmake_args(self): cmake_args = [ "-DLLVM_REQUIRES_RTTI:BOOL=ON", "-DCLANG_DEFAULT_OPENMP_RUNTIME:STRING=libomp", - "-DPYTHON_EXECUTABLE:PATH={0}".format(spec["python"].command.path), "-DLLVM_EXTERNAL_POLLY_BUILD:Bool=OFF", "-DLLVM_TOOL_POLLY_BUILD:Bool=OFF", "-DLLVM_POLLY_BUILD:Bool=OFF", diff --git a/var/spack/repos/builtin/packages/tempo/package.py b/var/spack/repos/builtin/packages/tempo/package.py index 4ce4e021fd112c..95215a857d0a2f 100644 --- a/var/spack/repos/builtin/packages/tempo/package.py +++ b/var/spack/repos/builtin/packages/tempo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tengine/package.py b/var/spack/repos/builtin/packages/tengine/package.py index 343d8e0bb91a6b..73412eb30d7585 100644 --- a/var/spack/repos/builtin/packages/tengine/package.py +++ b/var/spack/repos/builtin/packages/tengine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py b/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py index 314ecc4a02d187..38dd6e7fd2cb8e 100644 --- a/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py +++ b/var/spack/repos/builtin/packages/tensorflow-serving-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class TensorflowServingClient(CMakePackage): homepage = "https://github.com/figroc/tensorflow-serving-client" url = "https://github.com/figroc/tensorflow-serving-client/archive/v2.3.0.tar.gz" + license("Apache-2.0") + version("2.3.0", sha256="621b1df1da521fe1ba873b4b5546c1b794cfa8a13bca91608783acc4c8748fb1") version("2.2.0", sha256="010b464b3b09c3c33c5dc2aebbc85447c4d5f775b9cd45d90a9035ca015c1c08") version("2.1.0", sha256="7a31d8cfa1d861f73953d4728665dd6d74e205d1fa01062a6c2b1aeee4674f73") diff --git a/var/spack/repos/builtin/packages/tensorpipe/package.py b/var/spack/repos/builtin/packages/tensorpipe/package.py index 3db5a5a2408d43..e2e58e2efc87e8 100644 --- a/var/spack/repos/builtin/packages/tensorpipe/package.py +++ b/var/spack/repos/builtin/packages/tensorpipe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tensorpipe(CMakePackage): homepage = "https://github.com/pytorch/tensorpipe" git = "https://github.com/pytorch/tensorpipe.git" + license("BSD-3-Clause") + version("master", branch="master", submodules=True) version( "2021-05-13", commit="05e4c890d4bd5f8ac9a4ba8f3c21e2eba3f66eda", submodules=True diff --git a/var/spack/repos/builtin/packages/termcap/package.py b/var/spack/repos/builtin/packages/termcap/package.py index e0cc0094222487..58cf70e46605a6 100644 --- a/var/spack/repos/builtin/packages/termcap/package.py +++ b/var/spack/repos/builtin/packages/termcap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class Termcap(AutotoolsPackage): homepage = "https://www.gnu.org/software/termutils/manual/termcap-1.3/html_mono/termcap.html" url = "https://ftp.gnu.org/gnu/termcap/termcap-1.3.1.tar.gz" + license("GPL-2.0-or-later") + version("1.3.1", sha256="91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100") version("1.3", sha256="3eb4b98ae08408ca65dd9275f3c8e56e2feac1261fae914a9b21273db51cf000") diff --git a/var/spack/repos/builtin/packages/tesseract/package.py b/var/spack/repos/builtin/packages/tesseract/package.py index d3110819c1c95e..f74fdda513ddbe 100644 --- a/var/spack/repos/builtin/packages/tesseract/package.py +++ b/var/spack/repos/builtin/packages/tesseract/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tesseract(AutotoolsPackage): homepage = "https://github.com/tesseract-ocr/tesseract" url = "https://github.com/tesseract-ocr/tesseract/archive/4.1.1.tar.gz" + license("Apache-2.0") + version("4.1.1", sha256="2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb") version("4.1.0", sha256="5c5ed5f1a76888dc57a83704f24ae02f8319849f5c4cf19d254296978a1a1961") version("4.0.0", sha256="a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd") diff --git a/var/spack/repos/builtin/packages/test-drive/package.py b/var/spack/repos/builtin/packages/test-drive/package.py index b5221570db9c00..921bc213c23ca5 100644 --- a/var/spack/repos/builtin/packages/test-drive/package.py +++ b/var/spack/repos/builtin/packages/test-drive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class TestDrive(MesonPackage): maintainers("awvwgk") + license("Apache-2.0") + version("0.4.0", "effabe5d46ea937a79f3ea8d37eea43caf38f9f1377398bad0ca02784235e54a") diff --git a/var/spack/repos/builtin/packages/testdfsio/package.py b/var/spack/repos/builtin/packages/testdfsio/package.py index 2b29dfdf07dae8..f002893c21c431 100644 --- a/var/spack/repos/builtin/packages/testdfsio/package.py +++ b/var/spack/repos/builtin/packages/testdfsio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/testu01/package.py b/var/spack/repos/builtin/packages/testu01/package.py index 157462231aba36..be693dd6529496 100644 --- a/var/spack/repos/builtin/packages/testu01/package.py +++ b/var/spack/repos/builtin/packages/testu01/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tetgen/package.py b/var/spack/repos/builtin/packages/tetgen/package.py index e491bbb10106cb..7faeedc9fe9317 100644 --- a/var/spack/repos/builtin/packages/tetgen/package.py +++ b/var/spack/repos/builtin/packages/tetgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Tetgen(Package): homepage = "https://wias-berlin.de/software/tetgen/" + license("AGPL-3.0-only") + version( "1.6.0", sha256="87b5e61ebd3a471fc4f2cdd7124c2b11dd6639f4feb1f941a5d2f5110d05ce39", diff --git a/var/spack/repos/builtin/packages/tethex/package.py b/var/spack/repos/builtin/packages/tethex/package.py index 7094c69ce8f76f..2698cde1c28110 100644 --- a/var/spack/repos/builtin/packages/tethex/package.py +++ b/var/spack/repos/builtin/packages/tethex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tetranscripts/package.py b/var/spack/repos/builtin/packages/tetranscripts/package.py index a01f26c1dcd5ef..060ef11c8006c4 100644 --- a/var/spack/repos/builtin/packages/tetranscripts/package.py +++ b/var/spack/repos/builtin/packages/tetranscripts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tetranscripts(PythonPackage): homepage = "https://hammelllab.labsites.cshl.edu/software/#TEtranscripts" pypi = "TEtranscripts/TEtranscripts-2.2.3.tar.gz" + license("GPL-3.0-only") + version("2.2.3", sha256="e53577e8e73e41c6495fb819977e3e537bbeac7b2fa1635029201a37ee0bf7b8") # python dependencies diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index 052dee4b4db795..bc1bc5b64be871 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): tags = ["build-tools"] + license("GPL-3.0-or-later") + version("7.0.3", sha256="3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683") version("7.0", sha256="9261d4ee11cdf6b61895e213ffcd6b746a61a64fe38b9741a3aaa73125b35170") version("6.8", sha256="8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08") diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py index 6046dd006a11c3..654ad2553fb34a 100644 --- a/var/spack/repos/builtin/packages/texlive/package.py +++ b/var/spack/repos/builtin/packages/texlive/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class Texlive(AutotoolsPackage): list_url = "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive" list_depth = 1 + license("GPL-2.0-or-later AND GPL-3.0-or-later", checked_by="tgamblin") + # Below is the url for a binary distribution. This was originally how this # was distributed in Spack, but should be considered deprecated. Note that # the "live" version will pull down the packages so it requires an Internet diff --git a/var/spack/repos/builtin/packages/texstudio/package.py b/var/spack/repos/builtin/packages/texstudio/package.py index 8a55cad80c9a4c..a775f1688696df 100644 --- a/var/spack/repos/builtin/packages/texstudio/package.py +++ b/var/spack/repos/builtin/packages/texstudio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Texstudio(QMakePackage): url = "https://github.com/texstudio-org/texstudio/archive/2.12.16.tar.gz" git = "https://github.com/texstudio-org/texstudio.git" + license("GPL-3.0-or-later") + version("master", branch="master") version("3.0.1", sha256="0a2a7d266fecdfa3ea4a454fd66833a54590e610f880c6a97644cdcfc2116191") version("3.0.0", sha256="c1f704f84b2007621c5f8ec7fd3b4cf96693f98fd25724ee8fe9c3dccdc7ab2a") diff --git a/var/spack/repos/builtin/packages/textparser/package.py b/var/spack/repos/builtin/packages/textparser/package.py index e4b54c95712201..54658a61baeff1 100644 --- a/var/spack/repos/builtin/packages/textparser/package.py +++ b/var/spack/repos/builtin/packages/textparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Textparser(CMakePackage): homepage = "https://github.com/avr-aics-riken/TextParser" git = "https://github.com/avr-aics-riken/TextParser.git" + license("BSD-2-Clause") + version("master", branch="master") version("1.8.8", commit="31ec1f23df21611d0765c27a6458fdbbf4cde66d") diff --git a/var/spack/repos/builtin/packages/tfel/package.py b/var/spack/repos/builtin/packages/tfel/package.py index cfbd22f6ddda6a..39d13b29cda0ef 100644 --- a/var/spack/repos/builtin/packages/tfel/package.py +++ b/var/spack/repos/builtin/packages/tfel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -32,8 +32,12 @@ class Tfel(CMakePackage): git = "https://github.com/thelfer/tfel.git" maintainers("thelfer") + license("CECILL-2.1") + # development branches version("master", branch="master") + version("rliv-4.2", branch="rliv-4.2") + version("rliv-4.1", branch="rliv-4.1") version("rliv-4.0", branch="rliv-4.0") version("rliv-3.4", branch="rliv-3.4") version("rliv-3.3", branch="rliv-3.3") @@ -45,18 +49,29 @@ class Tfel(CMakePackage): # released version version( - "4.0.0", - sha256="7a0c32c8a9cd2fd65cbcb54fff802f303665d7cba5d46f92ff3d55f057c92845", + "4.2.0", + sha256="cf8a309c4d19a8e36232f8540ff28aa0d6285645f8dfb1ac57dd481ba3453e02", preferred=True, ) + version("4.1.1", sha256="e0f229094e88a2d6c6a78ae60fa77d2f4b8294e9d810c21fd7df61004bf29a33") + version("4.1.0", sha256="7505c41da9df5fb3c281651ff29b58a18fd4d91b92f839322f0267269c5f1375") + version("4.0.2", sha256="f5c8a285e00f334fd3e1a95f9a393fed393990ee827dae3766da1decfaa1074e") + version("4.0.1", sha256="f54741b7e654cb12511ca68c6494a4789ba41b5ada4cd345ad2bc7da631309d1") + version("4.0.0", sha256="7a0c32c8a9cd2fd65cbcb54fff802f303665d7cba5d46f92ff3d55f057c92845") + version("3.4.5", sha256="064d6926106e0052829182087a025f58fc3e98dfb69967e0795d9cdb4e1500b9") + version("3.4.4", sha256="a518a7a761fec6c92fab6dc9df5694c28aad2554c7c649d707dfdc71fe93d2ca") version("3.4.3", sha256="e58515effe57d473385fe0b592d9e1d1286c0901496c61268d9efd92a2550849") version("3.4.2", sha256="f39e65b2282fd3b108081388f161ba662407b192fed68fafe324c7528026a202") version("3.4.1", sha256="04cd4257e39e1b05e02b12ad941106fff4d439934bdfe6e950c08bab23e2a4ba") version("3.4.0", sha256="176feb4c1726d0f21f4c656b20620dce6f99ab7f5f09a66905aeb643a316bbc1") + version("3.3.4", sha256="3829e0b07520a14b17a8e75f879683a0d97b04b897aeb3ad0dd96dc94c0fcd6b") version("3.3.3", sha256="5a1fb43a8086e594e0a7234c1f227e6e005d384fd84affe3acadccb68fe2bbf6") version("3.3.2", sha256="17127ffdf92367c10041258f70a88ac3dcb0a7d89c1766a6aa1ebaeb4d03d55d") version("3.3.1", sha256="ad07329c25874832fbacc999b5f88d9b9ab84415bc897a6f3cae5b4afcd7661f") version("3.3.0", sha256="884ad68b0fbbededc3a602d559433c24114ae4534dc9f0a759d31ca3589dace0") + version("3.2.9", sha256="4ee26f2b5db24dc10113100ae0165cbbe8c7960c99c0e64ec96410788774aa54") + version("3.2.8", sha256="8bc3db975a87c3f0da3a857ab45cd237ee02f4ab35094a7db28b01d92676a78c") + version("3.2.7", sha256="05a055a955dd52f0b2dbf9d518a86c58805b2b63f3766268d72cacd6126c187d") version("3.2.6", sha256="ae80c76d92aeae207e307436aed32bbaed913a437ae57b5ee128ce4f543f20a9") version("3.2.5", sha256="194e799ca8d2f7ffea25aa3842c48cfc12850c252d851ce03941b5e3ae533b21") version("3.2.4", sha256="e7ac7e61fb3e02301285885bb3dc81ca1b09bd6e2929d15c755555d66088fe33") @@ -64,6 +79,8 @@ class Tfel(CMakePackage): version("3.2.2", sha256="69b01ae0d1f9140b619aaa9135948284ff40d4654672c335e55ab4934c02eb43") version("3.2.1", sha256="12786480524a7fe86889120fb334fa00211dfd44ad5ec71e2279e7adf1ddc807") version("3.2.0", sha256="089d79745e9f267a2bd03dcd8841d484e668bd27f5cc2ff7453634cb39016848") + version("3.1.12", sha256="770aa4680063ddd7be4f735ed1ec9402e83502d1ceb688c79cdba27490b7bf98") + version("3.1.11", sha256="578e3463db029bfed7b24bfa1226394e6998cc95959b46246ab9bf5cfb6d65f0") version("3.1.10", sha256="635a2507f139bb6d893e0a7bb223cd1d9ddab5dfddee179a3b2e9f8b0b63e065") version("3.1.9", sha256="8aeb020beddd125c207271e01d3e7d3985a91268dbf0bbc6132d217cc72b12a8") version("3.1.8", sha256="8c99ef80a27b3e791d78de2ceb1111396989942424697eccbc886edc3983163f") @@ -75,6 +92,8 @@ class Tfel(CMakePackage): version("3.1.2", sha256="2eaa191f0699031786d8845ac769320a42c7e035991d82b3738289886006bfba") version("3.1.1", sha256="a4c0c21c6c22752cc90c82295a6bafe637b3395736c66fcdfcfe4aeccb5be7af") version("3.1.0", sha256="dd67b400b5f157aef503aa3615b9bf6b52333876a29e75966f94ee3f79ab37ad") + version("3.0.12", sha256="f7dae9e5a00c721445b3167ec7bc71747bab047ddb36103f232b72d3e4d3cd00") + version("3.0.11", sha256="3d2d249534563887d301f6be5c4c2e4be33258b9d712d550d4c71271b764cc2d") version("3.0.10", sha256="1604f22948b4af6ef84839d97909f7011ce614254e1a6de092ddc61832f7d343") version("3.0.9", sha256="461dbb9e78fb6de9eaff21e387f5441020a077bba51d47b6510f11312e5ee333") version("3.0.8", sha256="3639f11d14278e20814e8673e097d26161e26117128289516be5b1b1e1387e57") @@ -110,17 +129,11 @@ class Tfel(CMakePackage): variant("comsol", default=True, description="Enables comsol interface") variant("diana-fea", default=True, description="Enables DIANA-FEA interface") - variant( - "build_type", - default="Release", - description="The build type to build", - values=("Debug", "Release"), - ) - depends_on("java", when="+java") depends_on("python", when="+python", type=("build", "link", "run")) depends_on("python", when="+python_bindings", type=("build", "link", "run")) depends_on("py-numpy", when="+python_bindings", type=("build", "link", "run")) + # As boost+py has py runtime dependency, boost+py needs types link and run as well: depends_on( "boost+python+numpy+exception+container", @@ -167,6 +180,8 @@ def cmake_args(self): args.append("-Denable-python-bindings=OFF") if ("+python" in self.spec) or ("+python_bindings" in self.spec): + # Note: calls find_package(PythonLibs) before find_package(PythonInterp), so these + # variables are required. python = self.spec["python"] args.append("-DPYTHON_LIBRARY={0}".format(python.libs[0])) args.append("-DPYTHON_INCLUDE_DIR={0}".format(python.headers.directories[0])) diff --git a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py index a4b2da6bce3075..1a5d7819373c30 100644 --- a/var/spack/repos/builtin/packages/the-platinum-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/the-silver-searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py index b99fabdd767fe7..5d0d3caa9ba52e 100644 --- a/var/spack/repos/builtin/packages/the-silver-searcher/package.py +++ b/var/spack/repos/builtin/packages/the-silver-searcher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class TheSilverSearcher(AutotoolsPackage): homepage = "https://geoff.greer.fm/ag/" url = "https://geoff.greer.fm/ag/releases/the_silver_searcher-0.32.0.tar.gz" + license("Apache-2.0") + version("2.2.0", sha256="d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170") version("2.1.0", sha256="d4652bd91c3a05e87a15809c5f3f14ad2e5e1f80185af510e3fa4ad2038c15d4") version("0.32.0", sha256="944ca77e498f344b2bfbd8df6d5d8df7bbc1c7e080b50c0bab3d1a9a55151b60") diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index f1fe8300f0a447..e15de0489037c6 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,8 +14,11 @@ class Thepeg(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + # The commented out versions exist, but may need patches # and/or recipe changes + version("2.3.0", sha256="ac35979ae89c29608ca92c156a49ff68aace7a5a12a0c92f0a01a833d2d34572") version("2.2.3", sha256="f21473197a761fc32917b08a8d24d2bfaf93ff57f3441fd605da99ac9de5d50b") version("2.2.2", sha256="97bf55d4391b0a070a3303d3845f8160afec403f1573dfb0e857709ad6262e3e") version("2.2.1", sha256="63abc7215e6ad45c11cf9dac013738e194cc38556a8368b850b70ab1b57ea58f") diff --git a/var/spack/repos/builtin/packages/thermo4pfm/package.py b/var/spack/repos/builtin/packages/thermo4pfm/package.py index 00d7ada9367ce7..421fc050281468 100644 --- a/var/spack/repos/builtin/packages/thermo4pfm/package.py +++ b/var/spack/repos/builtin/packages/thermo4pfm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Thermo4pfm(CMakePackage): maintainers("jeanlucf22") + license("BSD-3-Clause") + version("1.1.1", sha256="cff3c83405224a39bb34c57e444e208e94c6782d84303acd0588d1dfa61513a1") depends_on("boost") diff --git a/var/spack/repos/builtin/packages/thornado-mini/package.py b/var/spack/repos/builtin/packages/thornado-mini/package.py index a35bfef1c5d6b1..efe7b935cb04d0 100644 --- a/var/spack/repos/builtin/packages/thornado-mini/package.py +++ b/var/spack/repos/builtin/packages/thornado-mini/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index af4510cf9695e6..4ad8a10f1b0d97 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Thrift(Package): maintainers("thomas-bouvier") + license("Apache-2.0") + version("0.18.1", sha256="04c6f10e5d788ca78e13ee2ef0d2152c7b070c0af55483d6b942e29cff296726") version("0.17.0", sha256="b272c1788bb165d99521a2599b31b97fa69e5931d099015d91ae107a0b0cc58f") version("0.16.0", sha256="f460b5c1ca30d8918ff95ea3eb6291b3951cf518553566088f3f2be8981f6209") diff --git a/var/spack/repos/builtin/packages/thrust/package.py b/var/spack/repos/builtin/packages/thrust/package.py index 9e8def55ef860a..ab37e4b347d446 100644 --- a/var/spack/repos/builtin/packages/thrust/package.py +++ b/var/spack/repos/builtin/packages/thrust/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Thrust(Package): homepage = "https://thrust.github.io" url = "https://github.com/NVIDIA/thrust/archive/1.12.0.tar.gz" + license("BSL-1.0") + version("1.16.0", sha256="93b9553e3ee544e05395022bea67e6d600f8f3eb680950ec7cf73c0f55162487") version("1.15.0", sha256="0eeaf5a77cd7cb143f3443bd96b215ae1c4eacf18a712762e6a5c85213f80cc2") version("1.14.0", sha256="ddba9f3ed47b1a33562a4aea2d000a2ca2abcd45ff760af12aa81b8b7e492962") diff --git a/var/spack/repos/builtin/packages/tidy-html5/package.py b/var/spack/repos/builtin/packages/tidy-html5/package.py index 9f2000550c1bf5..34cb4ff9ef2e84 100644 --- a/var/spack/repos/builtin/packages/tidy-html5/package.py +++ b/var/spack/repos/builtin/packages/tidy-html5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tig/package.py b/var/spack/repos/builtin/packages/tig/package.py index 09124ae482f470..04f93a8ece8add 100644 --- a/var/spack/repos/builtin/packages/tig/package.py +++ b/var/spack/repos/builtin/packages/tig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tig(AutotoolsPackage): homepage = "https://jonas.github.io/tig/" url = "https://github.com/jonas/tig/releases/download/tig-2.2.2/tig-2.2.2.tar.gz" + license("GPL-2.0-or-later") + version("2.5.8", sha256="b70e0a42aed74a4a3990ccfe35262305917175e3164330c0889bd70580406391") version("2.2.2", sha256="316214d87f7693abc0cbe8ebbb85decdf5e1b49d7ad760ac801af3dd73385e35") diff --git a/var/spack/repos/builtin/packages/tiled-mm/package.py b/var/spack/repos/builtin/packages/tiled-mm/package.py index e44e92fb321de4..6df0851b5ff22d 100644 --- a/var/spack/repos/builtin/packages/tiled-mm/package.py +++ b/var/spack/repos/builtin/packages/tiled-mm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class TiledMm(CMakePackage, CudaPackage, ROCmPackage): maintainers("mtaillefumier", "simonpintarelli", "RMeli") + license("BSD-3-Clause") + version("master", branch="master") version("2.2", sha256="6d0b49c9588ece744166822fd44a7bc5bec3dc666b836de8bf4bf1a7bb675aac") version("2.0", sha256="ea554aea8c53d7c8e40044e6d478c0e8137d7e8b09d7cb9650703430d92cf32e") diff --git a/var/spack/repos/builtin/packages/time/package.py b/var/spack/repos/builtin/packages/time/package.py index f31c0059b8d7c4..bb9be7139423fe 100644 --- a/var/spack/repos/builtin/packages/time/package.py +++ b/var/spack/repos/builtin/packages/time/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Time(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/time/" gnu_mirror_path = "time/time-1.9.tar.gz" + license("GPL-3.0-only") + version("1.9", sha256="fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e") build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/timedatex/package.py b/var/spack/repos/builtin/packages/timedatex/package.py index 3d1f17ddbb921e..2f9483160efbcb 100644 --- a/var/spack/repos/builtin/packages/timedatex/package.py +++ b/var/spack/repos/builtin/packages/timedatex/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Timedatex(MakefilePackage): homepage = "https://github.com/mlichvar/timedatex" url = "https://github.com/mlichvar/timedatex/archive/v0.6.tar.gz" + license("GPL-2.0-or-later") + version("0.6", sha256="6e24c015769ee49a92bde3b1f167e25119068a00e377f9e4187a425c262ce964") version("0.5", sha256="bc54960bb9554bb2b34985ba2b8a78480db568c3c6a9d26f2ab34de1bc0aab11") version("0.4", sha256="204285eb03c6cec9ae1c7fdb99e7c996259ec5a918d72bf6bc28564a6f738d4a") diff --git a/var/spack/repos/builtin/packages/timemory/package.py b/var/spack/repos/builtin/packages/timemory/package.py index dec4e27cb29df4..290a85bc9f042f 100644 --- a/var/spack/repos/builtin/packages/timemory/package.py +++ b/var/spack/repos/builtin/packages/timemory/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Timemory(CMakePackage, PythonExtension): git = "https://github.com/NERSC/timemory.git" maintainers("jrmadsen") + license("MIT") + version("master", branch="master", submodules=True) version("develop", branch="develop", submodules=True) version("3.2.3", commit="d535e478646e331a4c65cfd8c8f759c9a363ccc9", submodules=True) @@ -320,11 +322,6 @@ def cmake_args(self): self.define_from_variant("TIMEMORY_USE_ALLINEA_MAP", "allinea_map"), ] - if "+python" in spec: - pyexe = spec["python"].command.path - args.append(self.define("PYTHON_EXECUTABLE=", pyexe)) - args.append(self.define("Python3_EXECUTABLE", pyexe)) - if "+mpi" in spec: args.append(self.define("MPI_C_COMPILER", spec["mpi"].mpicc)) args.append(self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx)) diff --git a/var/spack/repos/builtin/packages/tini/package.py b/var/spack/repos/builtin/packages/tini/package.py index 89239e6d39fd7c..5fdf47d9ae3c27 100644 --- a/var/spack/repos/builtin/packages/tini/package.py +++ b/var/spack/repos/builtin/packages/tini/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,5 +14,7 @@ class Tini(CMakePackage): url = "https://github.com/krallin/tini/archive/refs/tags/v0.19.0.tar.gz" maintainers("teonnik", "Madeeks") + license("MIT") + version("0.19.0", sha256="0fd35a7030052acd9f58948d1d900fe1e432ee37103c5561554408bdac6bbf0d") patch("tini_static_rpath_issue.patch", when="@0.19.0:") diff --git a/var/spack/repos/builtin/packages/tinker/package.py b/var/spack/repos/builtin/packages/tinker/package.py index 5ed16784e5c970..1d26543d8d547e 100644 --- a/var/spack/repos/builtin/packages/tinker/package.py +++ b/var/spack/repos/builtin/packages/tinker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tinygltf/package.py b/var/spack/repos/builtin/packages/tinygltf/package.py index f00d79fdbdc576..31f7e6581df17c 100644 --- a/var/spack/repos/builtin/packages/tinygltf/package.py +++ b/var/spack/repos/builtin/packages/tinygltf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tinygltf(CMakePackage): url = "https://github.com/syoyo/tinygltf/archive/refs/tags/v2.5.0.tar.gz" git = "https://github.com/syoyo/tinygltf/" + license("MIT") + version("release", branch="release") version("2.8.14", sha256="63cd43746c9ddfe5777494500422e831a312299e386fbf80922839dc1a5575f8") version("2.7.0", sha256="a1bbc0b831719e3a809a1bb01ce299a60e80b4e15221f58e822303ba22a69d45") diff --git a/var/spack/repos/builtin/packages/tinyobjloader/package.py b/var/spack/repos/builtin/packages/tinyobjloader/package.py index e6f533b535183d..8f89fb0369edce 100644 --- a/var/spack/repos/builtin/packages/tinyobjloader/package.py +++ b/var/spack/repos/builtin/packages/tinyobjloader/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tinyobjloader(CMakePackage): homepage = "https://github.com/tinyobjloader/tinyobjloader" url = "https://github.com/tinyobjloader/tinyobjloader/archive/refs/tags/v1.0.6.tar.gz" + license("MIT") + version("1.0.6", sha256="19ee82cd201761954dd833de551edb570e33b320d6027e0d91455faf7cd4c341") depends_on("cmake@2.8.11:", type="build") diff --git a/var/spack/repos/builtin/packages/tinyxml/package.py b/var/spack/repos/builtin/packages/tinyxml/package.py index 6f26998ea094ca..254305f011eeeb 100644 --- a/var/spack/repos/builtin/packages/tinyxml/package.py +++ b/var/spack/repos/builtin/packages/tinyxml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Tinyxml(CMakePackage): homepage = "http://grinninglizard.com/tinyxml/" url = "https://downloads.sourceforge.net/project/tinyxml/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz" + license("Zlib") + version("2.6.2", sha256="15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593") variant("shared", default=True, description="Build a shared library") diff --git a/var/spack/repos/builtin/packages/tinyxml2/package.py b/var/spack/repos/builtin/packages/tinyxml2/package.py index f24877a4dd279f..4aca62c7e4af58 100644 --- a/var/spack/repos/builtin/packages/tinyxml2/package.py +++ b/var/spack/repos/builtin/packages/tinyxml2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tinyxml2(CMakePackage): homepage = "http://grinninglizard.com/tinyxml2/" url = "https://github.com/leethomason/tinyxml2/archive/3.0.0.tar.gz" + license("Zlib") + version("6.2.0", sha256="cdf0c2179ae7a7931dba52463741cf59024198bbf9673bf08415bcb46344110f") version("4.0.1", sha256="14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20") version("4.0.0", sha256="90add44f06de081047d431c08d7269c25b4030e5fe19c3bc8381c001ce8f258c") diff --git a/var/spack/repos/builtin/packages/tioga/package.py b/var/spack/repos/builtin/packages/tioga/package.py index 13051476d20fca..8a453c39f9d168 100644 --- a/var/spack/repos/builtin/packages/tioga/package.py +++ b/var/spack/repos/builtin/packages/tioga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Tioga(CMakePackage): maintainers("jrood-nrel") + license("LGPL-3.0-only") + # The original TIOGA repo has possibly been abandoned, # so work on TIOGA has continued in the Exawind project version("develop", git="https://github.com/Exawind/tioga.git", branch="exawind") diff --git a/var/spack/repos/builtin/packages/tippecanoe/package.py b/var/spack/repos/builtin/packages/tippecanoe/package.py index 015ce91807bf90..420aa6cc643270 100644 --- a/var/spack/repos/builtin/packages/tippecanoe/package.py +++ b/var/spack/repos/builtin/packages/tippecanoe/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tippecanoe(MakefilePackage): homepage = "https://github.com/mapbox/tippecanoe" url = "https://github.com/mapbox/tippecanoe/archive/1.34.3.tar.gz" + license("BSD-2-Clause") + version("1.36.0", sha256="0e385d1244a0d836019f64039ea6a34463c3c2f49af35d02c3bf241aec41e71b") version("1.34.3", sha256="7a2dd2376a93d66a82c8253a46dbfcab3eaaaaca7bf503388167b9ee251bee54") diff --git a/var/spack/repos/builtin/packages/tiptop/package.py b/var/spack/repos/builtin/packages/tiptop/package.py index 1a4b1c947b9535..6848c1adf46826 100644 --- a/var/spack/repos/builtin/packages/tiptop/package.py +++ b/var/spack/repos/builtin/packages/tiptop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tiptop(AutotoolsPackage): homepage = "https://github.com/FeCastle/tiptop" git = "https://github.com/FeCastle/tiptop.git" + license("GPL-2.0") + version("master", commit="529886d445ec32febad14246245372a8f244b3eb") depends_on("papi") diff --git a/var/spack/repos/builtin/packages/tiramisu/package.py b/var/spack/repos/builtin/packages/tiramisu/package.py index 055cd4c0a2b907..c6e74e1546b997 100644 --- a/var/spack/repos/builtin/packages/tiramisu/package.py +++ b/var/spack/repos/builtin/packages/tiramisu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Tiramisu(CMakePackage, CudaPackage, PythonExtension): generator("ninja") + license("MIT") + version("master", branch="master") version("2023-2-8", commit="2cd0c43cc1656bfa43cfb6e81d06f770cbf7251e") @@ -55,10 +57,7 @@ def cmake_args(self): self.define("USE_FLEXNLP", False), ] if "+python" in spec: - args += [ - self.define("Tiramisu_INSTALL_PYTHONDIR", python_platlib), - self.define("Python3_EXECUTABLE", spec["python"].command.path), - ] + args += [self.define("Tiramisu_INSTALL_PYTHONDIR", python_platlib)] return args @property diff --git a/var/spack/repos/builtin/packages/tix/package.py b/var/spack/repos/builtin/packages/tix/package.py index e1335bf94b6939..c9513d5e9b6f9c 100644 --- a/var/spack/repos/builtin/packages/tix/package.py +++ b/var/spack/repos/builtin/packages/tix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Tix(AutotoolsPackage): homepage = "https://sourceforge.net/projects/tix/" url = "https://sourceforge.net/projects/tix/files/tix/8.4.3/Tix8.4.3-src.tar.gz/download" + license("TCL") + version("8.4.3", sha256="562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb") extends("tcl", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/tixi/package.py b/var/spack/repos/builtin/packages/tixi/package.py index e8cb0c045b1e50..269f1477f96135 100644 --- a/var/spack/repos/builtin/packages/tixi/package.py +++ b/var/spack/repos/builtin/packages/tixi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Tixi(CMakePackage): url = "https://github.com/DLR-SC/tixi/archive/v3.0.3.tar.gz" git = "https://github.com/DLR-SC/tixi.git" + license("Apache-2.0") + version("3.3.0", sha256="988d79ccd53c815d382cff0c244c0bb8e393986377dfb45385792766adf6f6a9") version("3.2.0", sha256="8df65c4d252d56e98c5ef2657c7aff6086a07b5686716e786891609adaca9d2d") version("3.1.0", sha256="4547133e452f3455b5a39045a8528955dce55faf059afe652a350ecf37d709ba") diff --git a/var/spack/repos/builtin/packages/tk/package.py b/var/spack/repos/builtin/packages/tk/package.py index 07e99a403aed0f..494eae85f4c9ac 100644 --- a/var/spack/repos/builtin/packages/tk/package.py +++ b/var/spack/repos/builtin/packages/tk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Tk(AutotoolsPackage, SourceforgePackage): homepage = "https://www.tcl.tk" sourceforge_mirror_path = "tcl/tk8.6.5-src.tar.gz" + license("TCL") + version("8.6.11", sha256="5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282") version("8.6.10", sha256="63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386") version("8.6.8", sha256="49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33") diff --git a/var/spack/repos/builtin/packages/tkrzw/package.py b/var/spack/repos/builtin/packages/tkrzw/package.py index e1541d60a66ea2..1b8f584b8c00c0 100644 --- a/var/spack/repos/builtin/packages/tkrzw/package.py +++ b/var/spack/repos/builtin/packages/tkrzw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tkrzw(AutotoolsPackage): url = "https://dbmx.net/tkrzw/pkg/tkrzw-0.9.22.tar.gz" git = "https://github.com/estraier/tkrzw.git" + license("Apache-2.0") + version("master", branch="master") version("0.9.44", sha256="088ac619fbf7fc22c110674b3f8fe8d8573a1d7088e5616b268fd9f68ba25650") version("0.9.43", sha256="60f7b579edb4f911ecaf35ff6c07f53b3d566424d8bf179b1991ade5071f0bbc") diff --git a/var/spack/repos/builtin/packages/tl-expected/package.py b/var/spack/repos/builtin/packages/tl-expected/package.py index d10be0361f7fe7..cf91fbf1a4a94b 100644 --- a/var/spack/repos/builtin/packages/tl-expected/package.py +++ b/var/spack/repos/builtin/packages/tl-expected/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class TlExpected(CMakePackage): maintainers("charmoniumQ") + license("CC0-1.0") + # Note that the 1.0.0 has this issue: # https://github.com/TartanLlama/expected/issues/114 # But no new patch version has been released, diff --git a/var/spack/repos/builtin/packages/tldd/package.py b/var/spack/repos/builtin/packages/tldd/package.py index f6ef4ccea14f65..b9a75f9703f1a1 100644 --- a/var/spack/repos/builtin/packages/tldd/package.py +++ b/var/spack/repos/builtin/packages/tldd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tldd(MakefilePackage): homepage = "https://gitlab.com/miscripts/tldd" git = "https://gitlab.com/miscripts/tldd.git" + license("GPL-3.0-only") + version("2018-10-05", commit="61cb512cc992ea6cbb7239e99ec7ac92ea072507") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/tmalign/package.py b/var/spack/repos/builtin/packages/tmalign/package.py index 5ea2557490c0db..c8a58261258b86 100644 --- a/var/spack/repos/builtin/packages/tmalign/package.py +++ b/var/spack/repos/builtin/packages/tmalign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tmhmm/package.py b/var/spack/repos/builtin/packages/tmhmm/package.py index dd66b339502c07..51d5ce1c313307 100644 --- a/var/spack/repos/builtin/packages/tmhmm/package.py +++ b/var/spack/repos/builtin/packages/tmhmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tmscore/package.py b/var/spack/repos/builtin/packages/tmscore/package.py index a69e335413996b..146c906035ee8e 100644 --- a/var/spack/repos/builtin/packages/tmscore/package.py +++ b/var/spack/repos/builtin/packages/tmscore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py index 2ce98142ebf907..f9c77ad0fdc596 100644 --- a/var/spack/repos/builtin/packages/tmux/package.py +++ b/var/spack/repos/builtin/packages/tmux/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Tmux(AutotoolsPackage): url = "https://github.com/tmux/tmux/releases/download/2.6/tmux-2.6.tar.gz" git = "https://github.com/tmux/tmux.git" + license("ISC") + version("3.3a", sha256="e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f") version("3.2a", sha256="551553a4f82beaa8dadc9256800bcc284d7c000081e47aa6ecbb6ff36eacd05f") version("3.2", sha256="664d345338c11cbe429d7ff939b92a5191e231a7c1ef42f381cebacb1e08a399") diff --git a/var/spack/repos/builtin/packages/tnftp/package.py b/var/spack/repos/builtin/packages/tnftp/package.py new file mode 100644 index 00000000000000..00a70d38e02ad3 --- /dev/null +++ b/var/spack/repos/builtin/packages/tnftp/package.py @@ -0,0 +1,21 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Tnftp(AutotoolsPackage): + """Tnftp is an FTP client. It is the default FTP client included with many + BSD operating systems and Darwin""" + + homepage = "https://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/tnftpd/README.html" + url = "https://cdn.netbsd.org/pub/NetBSD/misc/tnftp/tnftp-20230507.tar.gz" + + maintainers("EbiArnie") + + version("20230507", sha256="be0134394bd7d418a3b34892b0709eeb848557e86474e1786f0d1a887d3a6580") + + depends_on("bison") + depends_on("ncurses") diff --git a/var/spack/repos/builtin/packages/tomcat/package.py b/var/spack/repos/builtin/packages/tomcat/package.py index 90c67390836606..b3f69890ede536 100644 --- a/var/spack/repos/builtin/packages/tomcat/package.py +++ b/var/spack/repos/builtin/packages/tomcat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Tomcat(Package): homepage = "https://tomcat.apache.org/" url = "https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.30/bin/apache-tomcat-9.0.30.tar.gz" + license("Apache-2.0") + version("9.0.30", sha256="43a9b268671bbd3aace427637fbf577e742b521901e111342321ae901478100b") version("9.0.29", sha256="1bf634413326ec96972fc1c3ac6666e8e4cab49ad3fc9f5e3228b85208d9c4b0") version("9.0.27", sha256="6616a150e1593ef1a622298aaef9b889db70c8ee5122d35ad52adfcda1084d10") diff --git a/var/spack/repos/builtin/packages/toml-f/package.py b/var/spack/repos/builtin/packages/toml-f/package.py index cc1de501c3d56c..4a55fa0bb56bdb 100644 --- a/var/spack/repos/builtin/packages/toml-f/package.py +++ b/var/spack/repos/builtin/packages/toml-f/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class TomlF(MesonPackage): maintainers("awvwgk") + license("Apache-2.0") + version("main", branch="main") version("0.3.1", sha256="7f40f60c8d9ffbb1b99fb051a3e6682c7dd04d7479aa1cf770eff8174b02544f") version("0.3.0", sha256="40ceca008091607165a09961b79312abfdbbda71cbb94a9dc2625b88c93ff45a") diff --git a/var/spack/repos/builtin/packages/toml11/package.py b/var/spack/repos/builtin/packages/toml11/package.py index b9b50b198f253b..cec19cf10ae529 100644 --- a/var/spack/repos/builtin/packages/toml11/package.py +++ b/var/spack/repos/builtin/packages/toml11/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Toml11(CMakePackage): maintainers("ashermancinelli", "ToruNiina") + license("MIT") + version("3.7.1", sha256="afeaa9aa0416d4b6b2cd3897ca55d9317084103077b32a852247d8efd4cf6068") version("3.7.0", sha256="a0b6bec77c0e418eea7d270a4437510884f2fe8f61e7ab121729624f04c4b58e") version("3.6.1", sha256="ca4c390ed8da0d77ae6eca30e70ab0bf5cc92adfc1bc2f71a2066bc5656d8d96") diff --git a/var/spack/repos/builtin/packages/topaz/package.py b/var/spack/repos/builtin/packages/topaz/package.py index 855cba4d6c90b1..7cc42b1e510503 100644 --- a/var/spack/repos/builtin/packages/topaz/package.py +++ b/var/spack/repos/builtin/packages/topaz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Topaz(PythonPackage): homepage = "https://topaz-em.readthedocs.io/" pypi = "topaz-em/topaz-em-0.2.5.tar.gz" + license("GPL-3.0-or-later") + version("0.2.5", sha256="002a6eb775598b6c4df0225f3a488bfe6a6da9246e8ca42eb4e7d58f694c25cc") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/tophat/package.py b/var/spack/repos/builtin/packages/tophat/package.py index 9c5a5a78626a74..a2083894dc5db7 100644 --- a/var/spack/repos/builtin/packages/tophat/package.py +++ b/var/spack/repos/builtin/packages/tophat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tophat(AutotoolsPackage): homepage = "https://ccb.jhu.edu/software/tophat/index.shtml" url = "https://github.com/infphilo/tophat/archive/v2.1.1.tar.gz" + license("BSL-1.0") + version("2.1.2", sha256="15016b82255dad085d4ee7d970e50f0e53a280d466335553d47790d8344ff4b1") version("2.1.1", sha256="991b1b7c840a5f5c4e9a15b2815983257d2b0748246af0b9094c7d07552b023e") diff --git a/var/spack/repos/builtin/packages/torque/package.py b/var/spack/repos/builtin/packages/torque/package.py index c1ac3ed3ae77ab..541eff259672e6 100644 --- a/var/spack/repos/builtin/packages/torque/package.py +++ b/var/spack/repos/builtin/packages/torque/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/totalview/package.py b/var/spack/repos/builtin/packages/totalview/package.py index 437e9b2466e5fb..ff20fe302f0ab3 100644 --- a/var/spack/repos/builtin/packages/totalview/package.py +++ b/var/spack/repos/builtin/packages/totalview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tower-agent/package.py b/var/spack/repos/builtin/packages/tower-agent/package.py deleted file mode 100644 index dc82b05fd0db5a..00000000000000 --- a/var/spack/repos/builtin/packages/tower-agent/package.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import platform - -from spack.package import * - - -class TowerAgent(Package): - """Tower Agent allows Nextflow Tower to launch pipelines - on HPC clusters that do not allow direct access through - an SSH client. - """ - - homepage = "https://github.com/seqeralabs/tower-agent" - maintainers("marcodelapierre") - - if platform.machine() == "x86_64": - if platform.system() == "Linux": - version( - "0.4.5", - sha256="d3f38931ff769299b9f9f7e78d9f6a55f93914878c09117b8eaf5decd0c734ec", - deprecated=True, - url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.5/tw-agent-linux-x86_64", - expand=False, - ) - version( - "0.4.3", - sha256="1125e64d4e3342e77fcf7f6827f045e421084654fe8faafd5389e356e0613cc0", - deprecated=True, - url="https://github.com/seqeralabs/tower-agent/releases/download/v0.4.3/tw-agent-linux-x86_64", - expand=False, - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install(self.stage.archive_file, join_path(prefix.bin, "tw-agent")) - set_executable(join_path(prefix.bin, "tw-agent")) diff --git a/var/spack/repos/builtin/packages/tower-cli/package.py b/var/spack/repos/builtin/packages/tower-cli/package.py deleted file mode 100644 index 2d3b4c52e7c8c0..00000000000000 --- a/var/spack/repos/builtin/packages/tower-cli/package.py +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import platform - -from spack.package import * - - -class TowerCli(Package): - """Tower on the Command Line brings Nextflow Tower concepts - including Pipelines, Actions and Compute Environments - to the terminal. - """ - - homepage = "https://github.com/seqeralabs/tower-cli" - maintainers("marcodelapierre") - - if platform.machine() == "x86_64": - if platform.system() == "Darwin": - version( - "0.7.0", - sha256="b1b3ade4231de2c7303832bac406510c9de171d07d6384a54945903f5123f772", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-osx-x86_64", - expand=False, - ) - version( - "0.6.5", - sha256="8e7369611f3617bad3e76264d93fe467c6039c86af9f18e26142dee5df1e7346", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-osx-x86_64", - expand=False, - ) - version( - "0.6.2", - sha256="2bcc17687d58d4c888e8d57b7f2f769a2940afb3266dc3c6c48b0af0cb490d91", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-osx-x86_64", - expand=False, - ) - elif platform.system() == "Linux": - version( - "0.7.0", - sha256="651f564b80585c9060639f1a8fc82966f81becb0ab3e3ba34e53baf3baabff39", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.7.0/tw-0.7.0-linux-x86_64", - expand=False, - ) - version( - "0.6.5", - sha256="0d1f3a6f53694000c1764bd3b40ce141f4b8923d477e2bdfdce75c66de95be00", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.5/tw-0.6.5-linux-x86_64", - expand=False, - ) - version( - "0.6.2", - sha256="02c6d141416b046b6e8b6f9723331fe0e39d37faa3561c47c152df4d33b37e50", - deprecated=True, - url="https://github.com/seqeralabs/tower-cli/releases/download/v0.6.2/tw-0.6.2-linux-x86_64", - expand=False, - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install(self.stage.archive_file, join_path(prefix.bin, "tw")) - set_executable(join_path(prefix.bin, "tw")) diff --git a/var/spack/repos/builtin/packages/tpm2-tss/package.py b/var/spack/repos/builtin/packages/tpm2-tss/package.py index 1af8a217ab88dc..1cbb0a75754423 100644 --- a/var/spack/repos/builtin/packages/tpm2-tss/package.py +++ b/var/spack/repos/builtin/packages/tpm2-tss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Tpm2Tss(AutotoolsPackage): homepage = "https://tpm2-software.github.io/" url = "https://github.com/tpm2-software/tpm2-tss/archive/3.0.0.tar.gz" + license("BSD-2-Clause") + version("3.0.0", sha256="e88e91aeee2e01ccc45596fb8afcc3b521a660dcebe5a6e1b14ea5e9e5c15cf5") version("2.4.2", sha256="1cec5e834a6a750b138cabcd100b3fcd12b16cd21fa4f9103739914743511f75") version("2.4.1", sha256="cc6f0691307f3c65d5a1375e2cd22508cc72850dbc70eb820b892f0b3d0cbea2") diff --git a/var/spack/repos/builtin/packages/tracer/package.py b/var/spack/repos/builtin/packages/tracer/package.py index 2569349e674633..a6e4e70c6d9c76 100644 --- a/var/spack/repos/builtin/packages/tracer/package.py +++ b/var/spack/repos/builtin/packages/tracer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Tracer(MakefilePackage): maintainers("bhatele") + license("MIT") + version("develop", branch="master") version("2.2", tag="v2.2", commit="fdd1b07a1a0faca14aac53dcbcbccc44237ae7cb") diff --git a/var/spack/repos/builtin/packages/tracy-client/package.py b/var/spack/repos/builtin/packages/tracy-client/package.py index dd219f31ee039a..3237119b8783d5 100644 --- a/var/spack/repos/builtin/packages/tracy-client/package.py +++ b/var/spack/repos/builtin/packages/tracy-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class TracyClient(CMakePackage): url = "https://github.com/wolfpld/tracy/archive/v0.0.0.tar.gz" maintainers("msimberg") + license("BSD-3-Clause") + version("master", git="https://github.com/wolfpld/tracy.git", branch="master") version("0.10", sha256="a76017d928f3f2727540fb950edd3b736caa97b12dbb4e5edce66542cbea6600") version("0.9", sha256="93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc") diff --git a/var/spack/repos/builtin/packages/tracy/package.py b/var/spack/repos/builtin/packages/tracy/package.py index 111b4a86534600..fbb74fd7df4f34 100644 --- a/var/spack/repos/builtin/packages/tracy/package.py +++ b/var/spack/repos/builtin/packages/tracy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Tracy(MakefilePackage): url = "https://github.com/wolfpld/tracy/archive/v0.0.0.tar.gz" maintainers("msimberg") + license("BSD-3-Clause") + version("master", git="https://github.com/wolfpld/tracy.git", branch="master") version("0.10", sha256="a76017d928f3f2727540fb950edd3b736caa97b12dbb4e5edce66542cbea6600") version("0.9", sha256="93a91544e3d88f3bc4c405bad3dbc916ba951cdaadd5fcec1139af6fa56e6bfc") diff --git a/var/spack/repos/builtin/packages/tramonto/package.py b/var/spack/repos/builtin/packages/tramonto/package.py index 33a1d074d0f5fb..718949a66a4f55 100644 --- a/var/spack/repos/builtin/packages/tramonto/package.py +++ b/var/spack/repos/builtin/packages/tramonto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/transabyss/package.py b/var/spack/repos/builtin/packages/transabyss/package.py index 6991314ea9f0a9..a4cdecf6149423 100644 --- a/var/spack/repos/builtin/packages/transabyss/package.py +++ b/var/spack/repos/builtin/packages/transabyss/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/transdecoder/package.py b/var/spack/repos/builtin/packages/transdecoder/package.py index 173a6e9b4342a1..a52fcb2968139a 100644 --- a/var/spack/repos/builtin/packages/transdecoder/package.py +++ b/var/spack/repos/builtin/packages/transdecoder/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Transdecoder(MakefilePackage): homepage = "https://transdecoder.github.io/" url = "https://github.com/TransDecoder/TransDecoder/archive/TransDecoder-v5.5.0.tar.gz" + license("BSD-3-Clause") + version("5.7.1", sha256="41dd5e95f6ba946ff21340417d867e5e99f123b4035779b25d3cffd20b828a30") version("5.7.0", sha256="421b50dd08b12a88f2f09922e20c50903e335f26947843d9f925f5c0e9ddd79f") version("5.5.0", sha256="c800d9226350817471e9f51267c91f7cab99dbc9b26c980527fc1019e7d90a76") diff --git a/var/spack/repos/builtin/packages/transposome/package.py b/var/spack/repos/builtin/packages/transposome/package.py index a14b59684882b0..0a07f5c5703ee6 100644 --- a/var/spack/repos/builtin/packages/transposome/package.py +++ b/var/spack/repos/builtin/packages/transposome/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/transrate/package.py b/var/spack/repos/builtin/packages/transrate/package.py index 3f9eb48bebe3b7..bae1970fa9e3be 100644 --- a/var/spack/repos/builtin/packages/transrate/package.py +++ b/var/spack/repos/builtin/packages/transrate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py index 58208d9907e68f..7df51842e3d005 100644 --- a/var/spack/repos/builtin/packages/transset/package.py +++ b/var/spack/repos/builtin/packages/transset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Transset(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/transset" xorg_mirror_path = "app/transset-1.0.1.tar.gz" + license("MIT") + version("1.0.3", sha256="adba0da81dacdebe5275ec0117dd08685e4f2f31afa0391f423e54906d0fb824") version("1.0.2", sha256="5c7d7d1bac36137f41ac3db84d7ed9b9fdac868608572bcba0bc1de40510ca67") version("1.0.1", sha256="87c560e69e05ae8a5bad17ff62ac31cda43a5065508205b109c756c0ab857d55") diff --git a/var/spack/repos/builtin/packages/trapproto/package.py b/var/spack/repos/builtin/packages/trapproto/package.py index 672678707f3fe6..0a788297aa89eb 100644 --- a/var/spack/repos/builtin/packages/trapproto/package.py +++ b/var/spack/repos/builtin/packages/trapproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tree-sitter/package.py b/var/spack/repos/builtin/packages/tree-sitter/package.py index 8393d43cf7e3b5..bfb36001fea734 100644 --- a/var/spack/repos/builtin/packages/tree-sitter/package.py +++ b/var/spack/repos/builtin/packages/tree-sitter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class TreeSitter(MakefilePackage): maintainers("albestro") + license("MIT") + version("0.20.8", sha256="6181ede0b7470bfca37e293e7d5dc1d16469b9485d13f13a605baec4a8b1f791") version("0.20.6", sha256="4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de") version("0.20.4", sha256="979ad0b36eb90975baf0c65d155d106276cac08afb1c2fe0ad54d4b7d498ce39") diff --git a/var/spack/repos/builtin/packages/tree/package.py b/var/spack/repos/builtin/packages/tree/package.py index 7ffa89fe07af57..e99c343778256a 100644 --- a/var/spack/repos/builtin/packages/tree/package.py +++ b/var/spack/repos/builtin/packages/tree/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Tree(Package): homepage = "http://mama.indstate.edu/users/ice/tree/" url = "http://mama.indstate.edu/users/ice/tree/src/tree-1.7.0.tgz" + license("GPL-2.0-or-later") + version("2.1.0", sha256="0160c535bff2b0dc6a830b9944e981e3427380f63e748da96ced7071faebabf6") version("2.0.3", sha256="ba14e77b5f9dc7f8250c3f702ec5b6be2f93cd0fa87311bab3239676866a3b1d") version("2.0.2", sha256="7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf") diff --git a/var/spack/repos/builtin/packages/treelite/package.py b/var/spack/repos/builtin/packages/treelite/package.py index dbc96a4e26078d..c3ee15474c9af1 100644 --- a/var/spack/repos/builtin/packages/treelite/package.py +++ b/var/spack/repos/builtin/packages/treelite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Treelite(CMakePackage): homepage = "https://github.com/dmlc/treelite" url = "https://github.com/dmlc/treelite/archive/0.93.tar.gz" + license("Apache-2.0") + version("0.93", sha256="7d347372f7fdc069904afe93e69ed0bf696ba42d271fe2f8bf6835d2ab2f45d5") variant("protobuf", default=False, description="Build with protobuf") diff --git a/var/spack/repos/builtin/packages/treesub/package.py b/var/spack/repos/builtin/packages/treesub/package.py index 0720b58bd5c7c5..ac5e699057bf0b 100644 --- a/var/spack/repos/builtin/packages/treesub/package.py +++ b/var/spack/repos/builtin/packages/treesub/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/trexio/package.py b/var/spack/repos/builtin/packages/trexio/package.py index 0909a2be978f5b..e47b403096833f 100644 --- a/var/spack/repos/builtin/packages/trexio/package.py +++ b/var/spack/repos/builtin/packages/trexio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Trexio(AutotoolsPackage): # notify when the package is updated. maintainers("q-posev", "scemama") + license("BSD-3-Clause") + version("master", branch="master") version("2.2.0", sha256="e6340c424fcea18ae0b643a5707e16005c7576ee21a5aac679fbc132d70b36d9") version("2.1.0", sha256="232866c943b98fa8a42d34b55e940f7501634eb5bd426555ba970f5c09775e83") diff --git a/var/spack/repos/builtin/packages/trf/package.py b/var/spack/repos/builtin/packages/trf/package.py index 0db3cfec873682..7d02ecce6b19f5 100644 --- a/var/spack/repos/builtin/packages/trf/package.py +++ b/var/spack/repos/builtin/packages/trf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Trf(AutotoolsPackage): homepage = "https://tandem.bu.edu/trf/trf.html" url = "https://github.com/Benson-Genomics-Lab/TRF/archive/refs/tags/v4.09.1.tar.gz" + license("AGPL-3.0-only") + version("4.09.1", sha256="516015b625473350c3d1c9b83cac86baea620c8418498ab64c0a67029c3fb28a") version("4.09", sha256="9332155384bef82f6c7c449c038d27f1a14b984b2e93000bfcf125f4d44d6aca") diff --git a/var/spack/repos/builtin/packages/triangle/package.py b/var/spack/repos/builtin/packages/triangle/package.py index 01ddcdec2b6c0c..3ec2be22edde0e 100644 --- a/var/spack/repos/builtin/packages/triangle/package.py +++ b/var/spack/repos/builtin/packages/triangle/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Triangle(Package): homepage = "https://www.cs.cmu.edu/~quake/triangle.html" url = "https://www.netlib.org/voronoi/triangle.zip" + license("Unlicense") + version("1.6", sha256="1766327add038495fa3499e9b7cc642179229750f7201b94f8e1b7bee76f8480") depends_on("libx11", type="link") diff --git a/var/spack/repos/builtin/packages/trident/package.py b/var/spack/repos/builtin/packages/trident/package.py index 544a3d05735c10..53839256f4f651 100644 --- a/var/spack/repos/builtin/packages/trident/package.py +++ b/var/spack/repos/builtin/packages/trident/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Trident(Package): homepage = "https://netapp-trident.readthedocs.io" url = "https://github.com/NetApp/trident/archive/v20.01.1.tar.gz" + license("Apache-2.0") + version("23.01.1", sha256="d0aedf2446e09b15abe9b0f052f42145c6acf23014a6e009e22cff5a2ad6c77d") version("20.01.1", sha256="02ba92e569916b98fb1b563c5ef03a94fd7981c3ac1ecb47e69ebb45471dc976") version("20.01.0", sha256="5de190579acf62f5e9945dfd45aeb21989272c4972e85cb10256b7ec605c29c7") diff --git a/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py b/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py index 0e00080e74351a..891929bdb48647 100644 --- a/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py +++ b/var/spack/repos/builtin/packages/trilinos-catalyst-ioss-adapter/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/trilinos/0001-use-the-gcnArchName-inplace-of-gcnArch-as-gcnArch-is.patch b/var/spack/repos/builtin/packages/trilinos/0001-use-the-gcnArchName-inplace-of-gcnArch-as-gcnArch-is.patch new file mode 100644 index 00000000000000..ea2b8b98a44ef2 --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/0001-use-the-gcnArchName-inplace-of-gcnArch-as-gcnArch-is.patch @@ -0,0 +1,26 @@ +From e7fa7ea37423d3d17d77334ac849c5df00feb20e Mon Sep 17 00:00:00 2001 +From: sreenivasa murthy kolam +Date: Tue, 16 Jan 2024 10:09:34 +0000 +Subject: [PATCH] use the gcnArchName inplace of gcnArch as gcnArch is + deprecated from rocm-6.0.0 + +--- + packages/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packages/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp b/packages/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp +index 7840ad9..882d143 100644 +--- a/packages/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp ++++ b/packages/kokkos/core/src/HIP/Kokkos_HIP_Instance.cpp +@@ -86,7 +86,7 @@ void HIPInternal::print_configuration(std::ostream &s) const { + KOKKOS_IMPL_HIP_SAFE_CALL(hipGetDeviceProperties(&hipProp, i)); + + s << "Kokkos::HIP[ " << i << " ] " +- << "gcnArch " << hipProp.gcnArch << ", Total Global Memory: " ++ << "gcnArchName " << hipProp.gcnArchName << ", Total Global Memory: " + << ::Kokkos::Impl::human_memory_size(hipProp.totalGlobalMem) + << ", Shared Memory per Block: " + << ::Kokkos::Impl::human_memory_size(hipProp.sharedMemPerBlock); +-- +2.39.3 + diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 1681ac35d2e9a2..b271e4c5abd1e1 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -42,6 +42,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): version("master", branch="master") version("develop", branch="develop") + version("15.0.0", sha256="5651f1f967217a807f2c418a73b7e649532824dbf2742fa517951d6cc11518fb") version("14.4.0", sha256="8e7d881cf6677aa062f7bfea8baa1e52e8956aa575d6a4f90f2b6f032632d4c6") version("14.2.0", sha256="c96606e5cd7fc9d25b9dc20719cd388658520d7cbbd2b4de77a118440d1e0ccb") version("14.0.0", sha256="054d2fabdf70fce0dfaeb20eed265bd7894045d3e00c3d1ddb72d1c77c339ca1") @@ -95,7 +96,8 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): description="global ordinal type for Tpetra", ) variant("openmp", default=False, description="Enable OpenMP") - variant("python", default=False, description="Build PyTrilinos wrappers") + variant("python", default=False, when="@15:", description="Build PyTrilinos2 wrappers") + variant("python", default=False, when="@:14", description="Build PyTrilinos wrappers") variant("shared", default=True, description="Enables the build of shared libraries") variant("uvm", default=False, when="@13.2: +cuda", description="Turn on UVM for CUDA build") variant("wrapper", default=False, description="Use nvcc-wrapper for CUDA build") @@ -401,6 +403,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on(kokkos_spec, when="@14.4.0 +kokkos {0}".format(arch_str)) depends_on("adios2", when="+adios2") + depends_on("binder@1.3:", when="@15: +python", type="build") depends_on("blas") depends_on("boost+graph+math+exception+stacktrace", when="+boost") # Need to revisit the requirement of STK @@ -420,12 +423,14 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("matio", when="+exodus") depends_on("metis", when="+zoltan") depends_on("mpi", when="+mpi") + depends_on("mpi", when="@15: +python") depends_on("netcdf-c", when="+exodus") depends_on("parallel-netcdf", when="+exodus+mpi") depends_on("parmetis", when="+mpi +zoltan") depends_on("parmetis", when="+scorec") - depends_on("py-mpi4py", when="+mpi+python", type=("build", "run")) + depends_on("py-mpi4py", when="+python", type=("build", "run")) depends_on("py-numpy", when="+python", type=("build", "run")) + depends_on("py-pybind11", when="@15: +python", type=("build", "link")) depends_on("python", when="+python") depends_on("python", when="@13.2: +ifpack +hypre", type="build") depends_on("python", when="@13.2: +ifpack2 +hypre", type="build") @@ -435,7 +440,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("suite-sparse", when="+suite-sparse") depends_on("superlu-dist", when="+superlu-dist") depends_on("superlu@4.3 +pic", when="+superlu") - depends_on("swig", when="+python") + depends_on("swig", when="@:14 +python") depends_on("zlib-api", when="+zoltan") # Trilinos' Tribits config system is limited which makes it very tricky to @@ -484,6 +489,11 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): # workaround an NVCC bug with c++14 (https://github.com/trilinos/Trilinos/issues/6954) # avoid calling deprecated functions with CUDA-11 patch("fix_cxx14_cuda11.patch", when="@13.0.0:13.0.1 cxxstd=14 ^cuda@11:") + patch( + "0001-use-the-gcnArchName-inplace-of-gcnArch-as-gcnArch-is.patch", + when="@15.0.0 ^hip@6.0.0 +rocm", + ) + # Allow building with +teko gotype=long patch( "https://github.com/trilinos/Trilinos/commit/b17f20a0b91e0b9fc5b1b0af3c8a34e2a4874f3f.patch?full_index=1", @@ -620,6 +630,11 @@ def define_enable(suffix, value=None): ] ) + if spec.version >= Version("15"): + options.append(define_trilinos_enable("PyTrilinos2", "python")) + else: + options.append(define_trilinos_enable("PyTrilinos", "python")) + if "+test" in spec: options.append(define_trilinos_enable("TESTS", True)) options.append(define("BUILD_TESTING", True)) @@ -670,7 +685,6 @@ def define_enable(suffix, value=None): define_trilinos_enable("Pike", False), define_trilinos_enable("Piro"), define_trilinos_enable("Phalanx"), - define_trilinos_enable("PyTrilinos", "python"), define_trilinos_enable("ROL"), define_trilinos_enable("Rythmos"), define_trilinos_enable("Sacado"), @@ -743,6 +757,15 @@ def define_enable(suffix, value=None): ] ) + if "@15: +python" in spec: + binder = spec["binder"].prefix.bin.binder + clang_include_dirs = spec["binder"].clang_include_dirs + libclang_include_dir = spec["binder"].libclang_include_dir + options.append(define("PyTrilinos2_BINDER_EXECUTABLE", binder)) + options.append(define("PyTrilinos2_BINDER_clang_include_dirs", clang_include_dirs)) + options.append(define("PyTrilinos2_BINDER_LibClang_include_dir", libclang_include_dir)) + options.append(define_from_variant("PyTrilinos2_ENABLE_TESTS", "test")) + if "+stratimikos" in spec: # Explicitly enable Thyra (ThyraCore is required). If you don't do # this, then you get "NOT setting ${pkg}_ENABLE_Thyra=ON since @@ -789,6 +812,7 @@ def define_tpl(trilinos_name, spack_name, have_dep): ("HDF5", "hdf5", "hdf5"), ("HYPRE", "hypre", "hypre"), ("MUMPS", "mumps", "mumps"), + ("AMD", "suite-sparse", "suite-sparse"), ("UMFPACK", "suite-sparse", "suite-sparse"), ("SuperLU", "superlu", "superlu"), ("SuperLUDist", "superlu-dist", "superlu-dist"), diff --git a/var/spack/repos/builtin/packages/trimal/package.py b/var/spack/repos/builtin/packages/trimal/package.py index f979e19ba1bd16..abf454f927c554 100644 --- a/var/spack/repos/builtin/packages/trimal/package.py +++ b/var/spack/repos/builtin/packages/trimal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Trimal(MakefilePackage): homepage = "https://github.com/scapella/trimal" url = "https://github.com/scapella/trimal/archive/v1.4.1.tar.gz" + license("GPL-3.0-or-later") + version("1.4.1", sha256="cb8110ca24433f85c33797b930fa10fe833fa677825103d6e7f81dd7551b9b4e") build_directory = "source" diff --git a/var/spack/repos/builtin/packages/trimgalore/package.py b/var/spack/repos/builtin/packages/trimgalore/package.py index bc05c4fcbb0b60..b0fae1bcdaba37 100644 --- a/var/spack/repos/builtin/packages/trimgalore/package.py +++ b/var/spack/repos/builtin/packages/trimgalore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Trimgalore(Package): homepage = "https://github.com/FelixKrueger/TrimGalore" url = "https://github.com/FelixKrueger/TrimGalore/archive/0.4.4.tar.gz" + license("GPL-3.0-or-later") + version("0.6.10", sha256="3a4e414fc658d6eb4356f1572351204e8475a9d7dc79f6798270b57d35bda017") version("0.6.9", sha256="d50ce6106f979c316c89c7e7bcb44e5f841935d88bc4f756ccf0bc4cbab4e6f5") version("0.6.6", sha256="b8db8ffd131d9d9e7c8532a5a1f1caee656c0c58d3eafd460fee3c39b9fcab5e") diff --git a/var/spack/repos/builtin/packages/trimmomatic/package.py b/var/spack/repos/builtin/packages/trimmomatic/package.py index 5eab4ea214686b..086e6bf3890609 100644 --- a/var/spack/repos/builtin/packages/trimmomatic/package.py +++ b/var/spack/repos/builtin/packages/trimmomatic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Trimmomatic(Package): homepage = "http://www.usadellab.org/cms/?page=trimmomatic" url = "http://www.usadellab.org/cms/uploads/supplementary/Trimmomatic/Trimmomatic-0.36.zip" + license("GPL-3.0-only") + # Older version aren't explicitly made available, but the URL # works as we'd like it to, so... version("0.39", sha256="2f97e3a237378d55c221abfc38e4b11ea232c8a41d511b8b4871f00c0476abca") diff --git a/var/spack/repos/builtin/packages/trinity/package.py b/var/spack/repos/builtin/packages/trinity/package.py index a74fcc774a2e33..2edfaefc9b34f6 100644 --- a/var/spack/repos/builtin/packages/trinity/package.py +++ b/var/spack/repos/builtin/packages/trinity/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Trinity(MakefilePackage): homepage = "https://trinityrnaseq.github.io/" url = "https://github.com/trinityrnaseq/trinityrnaseq/archive/Trinity-v2.6.6.tar.gz" + license("BSD-3-Clause") + version( "2.15.1.FULL", sha256="ba37e5f696d3d54e8749c4ba439901a3e97e14a4314a5229d7a069ad7b1ee580", diff --git a/var/spack/repos/builtin/packages/trinotate/package.py b/var/spack/repos/builtin/packages/trinotate/package.py index 89ddb1cf6f37c7..c40adb295127c0 100644 --- a/var/spack/repos/builtin/packages/trinotate/package.py +++ b/var/spack/repos/builtin/packages/trinotate/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Trinotate(Package): homepage = "https://trinotate.github.io/" url = "https://github.com/Trinotate/Trinotate/archive/Trinotate-v3.1.1.tar.gz" + license("BSD-3-Clause") + version("3.2.2", sha256="1c41258a544cccb332f77b73f7397b457d5f3d7ce0038505369aeecc1e0650c2") version("3.1.1", sha256="f8af0fa5dbeaaf5a085132cd4ac4f4206b05cc4630f0a17a672c586691f03843") diff --git a/var/spack/repos/builtin/packages/trnascan-se/package.py b/var/spack/repos/builtin/packages/trnascan-se/package.py index 6ac967bb84fcad..c7e043f505a216 100644 --- a/var/spack/repos/builtin/packages/trnascan-se/package.py +++ b/var/spack/repos/builtin/packages/trnascan-se/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class TrnascanSe(AutotoolsPackage): homepage = "http://lowelab.ucsc.edu/tRNAscan-SE/" url = "http://trna.ucsc.edu/software/trnascan-se-2.0.0.tar.gz" + license("GPL-3.0-or-later") + version("2.0.11", sha256="29b74edd0f84ad88139035e119b66397c54a37428e0b61c66a1b3d4733adcd1e") version("2.0.0", sha256="0dde1c07142e4bf77b21d53ddf3eeb1ef8c52248005a42323d13f8d7c798100c") diff --git a/var/spack/repos/builtin/packages/trompeloeil/package.py b/var/spack/repos/builtin/packages/trompeloeil/package.py index 13abdb3dc39a97..1cd132278a582f 100644 --- a/var/spack/repos/builtin/packages/trompeloeil/package.py +++ b/var/spack/repos/builtin/packages/trompeloeil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Trompeloeil(CMakePackage): url = "https://github.com/rollbear/trompeloeil/archive/v43.tar.gz" git = "https://github.com/rollbear/trompeloeil.git" + license("BSL-1.0") + version("master", branch="master") version("45", sha256="124b0aa45d84415193719376b6557fc1f1180cbfebf4dc4f7ca247cb404d6bd8") version("44", sha256="004877db6ba22f24c7867e112e081eeb68858122f55ebe7c7dd9d8d9e3b46c88") diff --git a/var/spack/repos/builtin/packages/truchas/package.py b/var/spack/repos/builtin/packages/truchas/package.py index 80d51aa740fe2f..ad31afc053ee39 100644 --- a/var/spack/repos/builtin/packages/truchas/package.py +++ b/var/spack/repos/builtin/packages/truchas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/tskit/package.py b/var/spack/repos/builtin/packages/tskit/package.py index 7cb33890a5f679..54445ec56227fc 100644 --- a/var/spack/repos/builtin/packages/tskit/package.py +++ b/var/spack/repos/builtin/packages/tskit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Tskit(PythonPackage): homepage = "https://tskit.readthedocs.io/en/latest/" pypi = "tskit/tskit-0.3.1.tar.gz" + license("MIT") + version("0.3.1", sha256="b9c5a9b2fb62a615e389036946345ef8a35b09f1ffee541995b16f97fedb3d36") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/tulip/package.py b/var/spack/repos/builtin/packages/tulip/package.py index 135c6ba3db3faf..226a01c5bfae19 100644 --- a/var/spack/repos/builtin/packages/tulip/package.py +++ b/var/spack/repos/builtin/packages/tulip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Tulip(CMakePackage): homepage = "https://tulip.labri.fr" url = "https://sourceforge.net/projects/auber/files/tulip/tulip-5.4.0/tulip-5.4.0_src.tar.gz" + license("LGPL-3.0-only") + version("5.4.0", sha256="2175e4e1a79028ab7a2479e882242f304fd3e01fedf80e1f29f8f5e9a6eb1325") extends("python") diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index c2e9758c902892..801bf8e5a8fb43 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -57,9 +57,14 @@ def configure_args(self): "--with-c-utils=" + self.spec["exmcutils"].prefix, "--with-adlb=" + self.spec["adlbx"].prefix, "--with-tcl=" + self.spec["tcl"].prefix, - "--with-mpi=" + self.spec["mpi"].prefix, "--disable-static-pkg", ] + + if self.spec.satisfies("^intel-oneapi-mpi"): + args.append("--with-mpi=" + self.spec["intel-oneapi-mpi"].package.component_prefix) + else: + args.append("--with-mpi=" + self.spec["mpi"].prefix) + if "+hdf5" in self.spec: args.append("--with-hdf5=ON") else: diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py index 9222f04dcd5657..de97ce0039b464 100644 --- a/var/spack/repos/builtin/packages/turbomole/package.py +++ b/var/spack/repos/builtin/packages/turbomole/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/turnserver/package.py b/var/spack/repos/builtin/packages/turnserver/package.py index 053937f497badf..2ff2fc4deeca05 100644 --- a/var/spack/repos/builtin/packages/turnserver/package.py +++ b/var/spack/repos/builtin/packages/turnserver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Turnserver(AutotoolsPackage): homepage = "https://coturn.net/turnserver" url = "https://coturn.net/turnserver/v4.5.1.3/turnserver-4.5.1.3.tar.gz" + license("OpenSSL") + version("4.5.1.3", sha256="408bf7fde455d641bb2a23ba2df992ea0ae87b328de74e66e167ef58d8e9713a") depends_on("libevent") diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py index 80f507c30a1403..b350728d02396e 100644 --- a/var/spack/repos/builtin/packages/twm/package.py +++ b/var/spack/repos/builtin/packages/twm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Twm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/twm" xorg_mirror_path = "app/twm-1.0.9.tar.gz" + license("MIT") + version("1.0.12", sha256="4150c9ec595520167ab8c4efcb5cf82641a4c4db78ce0a1cb4834e6aeb7c87fb") version("1.0.11", sha256="410ecabac54e6db7afd5c20a78d89c0134f3c74b149bee71b1fec775e6e060cc") version("1.0.10", sha256="679a1d07078c918fa32454498dc15573b299bbb0f001499e213c408e4b2170f5") diff --git a/var/spack/repos/builtin/packages/tycho2/package.py b/var/spack/repos/builtin/packages/tycho2/package.py index 0e09d46131ee14..16c73d0654a81d 100644 --- a/var/spack/repos/builtin/packages/tycho2/package.py +++ b/var/spack/repos/builtin/packages/tycho2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Tycho2(MakefilePackage): homepage = "https://github.com/lanl/tycho2" git = "https://github.com/lanl/tycho2.git" + license("Unlicense") + version("develop", branch="master") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/typescript/package.py b/var/spack/repos/builtin/packages/typescript/package.py new file mode 100644 index 00000000000000..9e9a04b997650e --- /dev/null +++ b/var/spack/repos/builtin/packages/typescript/package.py @@ -0,0 +1,25 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class Typescript(Package): + """TypeScript is a superset of JavaScript that compiles to clean JavaScript output.""" + + homepage = "https://www.typescriptlang.org" + url = "https://github.com/microsoft/TypeScript/archive/refs/tags/v5.3.2.tar.gz" + + license("Apache-2.0") + + version("5.3.2", sha256="c5a12507006e7d2b8020dec9589191ce070fd88203f2c80aca00d641cee7866f") + + depends_on("node-js", type=("build", "link", "run")) + depends_on("npm", type="build") + + def install(self, spec, prefix): + npm = which("npm", required=True) + npm("install", "--global", f"--prefix={prefix}") diff --git a/var/spack/repos/builtin/packages/typhon/package.py b/var/spack/repos/builtin/packages/typhon/package.py index 7d30fbf72a3fe5..04f9f9300bca30 100644 --- a/var/spack/repos/builtin/packages/typhon/package.py +++ b/var/spack/repos/builtin/packages/typhon/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Typhon(CMakePackage): url = "https://github.com/UK-MAC/Typhon/archive/v3.0.tar.gz" git = "https://github.com/UK-MAC/Typhon.git" + license("GPL-3.0-only") + version("develop", branch="develop") version("3.0.2", sha256="28087eb07bf91d23792900214728b5eea61b5e81aa33df28c032dadd6d89b76e") diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py index 52b2c69e24e6d0..0833a30a06e91e 100644 --- a/var/spack/repos/builtin/packages/typhonio/package.py +++ b/var/spack/repos/builtin/packages/typhonio/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Typhonio(CMakePackage): url = "https://github.com/UK-MAC/typhonio/archive/v1.6_CMake.tar.gz" git = "https://github.com/UK-MAC/typhonio.git" + license("BSD-3-Clause") + version("develop", branch="cmake_build") version("1.6_CMake", sha256="c9b7b2a7f4fa0b786f6b69c6426b67f42efc4ea6871323139d52cd44f4d0ff7c") diff --git a/var/spack/repos/builtin/packages/ucc/package.py b/var/spack/repos/builtin/packages/ucc/package.py new file mode 100644 index 00000000000000..a77295aca5d39a --- /dev/null +++ b/var/spack/repos/builtin/packages/ucc/package.py @@ -0,0 +1,55 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + +class Ucc(AutotoolsPackage, CudaPackage): + """UCC is a collective communication operations API and library that is + flexible, complete, and feature-rich for current and emerging programming + models and runtimes.""" + + homepage = "https://openucx.github.io/ucc/" + url = "https://github.com/openucx/ucc/archive/refs/tags/v1.2.0.tar.gz" + + maintainers("zzzoom") + + version("1.2.0", sha256="c1552797600835c0cf401b82dc89c4d27d5717f4fb805d41daca8e19f65e509d") + + variant("cuda", default=False, description="Enable CUDA TL") + variant("nccl", default=False, description="Enable NCCL TL", when="+cuda") + # RCCL build not tested + # variant("rccl", default=False, description="Enable RCCL TL") + + # https://github.com/openucx/ucc/pull/847 + patch( + "https://github.com/openucx/ucc/commit/9d716eb9c964ec7a7a23e9ec663f28265ff8a357.patch?full_index=1", + sha256="f99d1ba6b94360375d2ea59b04de9cbf6bb3290458bc86ce13891ba90522f7e2", + when="@1.2.0 +cuda", + ) + + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + + depends_on("ucx") + + depends_on("nccl", when="+nccl") + # depends_on("rccl", when="+rccl") + + with when("+nccl"): + for arch in CudaPackage.cuda_arch_values: + depends_on( + "nccl +cuda cuda_arch={0}".format(arch), when="+cuda cuda_arch={0}".format(arch) + ) + + def autoreconf(self, spec, prefix): + Executable("./autogen.sh")() + + def configure_args(self): + args = [] + args.extend(self.with_or_without("cuda", activation_value="prefix")) + args.extend(self.with_or_without("nccl", activation_value="prefix")) + # args.extend(self.with_or_without("rccl", activation_value="prefix")) + return args diff --git a/var/spack/repos/builtin/packages/uchardet/package.py b/var/spack/repos/builtin/packages/uchardet/package.py index 1fe0210249ae84..0af81372d9cb83 100644 --- a/var/spack/repos/builtin/packages/uchardet/package.py +++ b/var/spack/repos/builtin/packages/uchardet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Uchardet(CMakePackage): url = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz" git = "https://gitlab.freedesktop.org/uchardet/uchardet.git" + license("MPL-1.1") + version("master", branch="master") version("0.0.7", sha256="8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61") version("0.0.6", sha256="8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61") diff --git a/var/spack/repos/builtin/packages/ucsc-bedclip/package.py b/var/spack/repos/builtin/packages/ucsc-bedclip/package.py index d22328725edaa7..5173346a714c00 100644 --- a/var/spack/repos/builtin/packages/ucsc-bedclip/package.py +++ b/var/spack/repos/builtin/packages/ucsc-bedclip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py b/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py index 8935078445040d..14833362282c13 100644 --- a/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py +++ b/var/spack/repos/builtin/packages/ucsc-bedgraphtobigwig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ucx/package.py b/var/spack/repos/builtin/packages/ucx/package.py index 4cbbda730fb240..a50f11cba49f71 100644 --- a/var/spack/repos/builtin/packages/ucx/package.py +++ b/var/spack/repos/builtin/packages/ucx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,10 +17,13 @@ class Ucx(AutotoolsPackage, CudaPackage): maintainers("hppritcha") + license("BSD-3-Clause") + # Current - version("1.14.1", sha256="baa0634cafb269a3112f626eb226bcd2ca8c9fcf0fec3b8e2a3553baad5f77aa") + version("1.15.0", sha256="4b202087076bc1c98f9249144f0c277a8ea88ad4ca6f404f94baa9cb3aebda6d") # Still supported + version("1.14.1", sha256="baa0634cafb269a3112f626eb226bcd2ca8c9fcf0fec3b8e2a3553baad5f77aa") version("1.14.0", sha256="9bd95e2059de5dece9dddd049aacfca3d21bfca025748a6a0b1be4486e28afdd") version("1.13.1", sha256="efc37829b68e131d2acc82a3fd4334bfd611156a756837ffeb650ab9a9dd3828") version("1.13.0", sha256="8a3881f21fe2788113789f5bae1c8174e931f7542de0a934322a96ef354e5e3d") @@ -134,6 +137,7 @@ class Ucx(AutotoolsPackage, CudaPackage): depends_on("rdma-core", when="+verbs") depends_on("xpmem", when="+xpmem") depends_on("hip", when="+rocm") + depends_on("hsa-rocr-dev", when="+rocm") conflicts("+gdrcopy", when="~cuda", msg="gdrcopy currently requires cuda support") conflicts("+rocm", when="+gdrcopy", msg="gdrcopy > 2.0 does not support rocm") diff --git a/var/spack/repos/builtin/packages/udunits/package.py b/var/spack/repos/builtin/packages/udunits/package.py index 75a41c45b85a88..90d17688850ebe 100644 --- a/var/spack/repos/builtin/packages/udunits/package.py +++ b/var/spack/repos/builtin/packages/udunits/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Udunits(AutotoolsPackage): maintainers("AlexanderRichert-NOAA") + license("UCAR") + # Unidata now only provides the latest version of each X.Y branch. # Older 2.2 versions have been deprecated accordingly but are still # available in the build cache. diff --git a/var/spack/repos/builtin/packages/ufo-core/package.py b/var/spack/repos/builtin/packages/ufo-core/package.py index 9dc5a24b731572..3154723acfe89b 100644 --- a/var/spack/repos/builtin/packages/ufo-core/package.py +++ b/var/spack/repos/builtin/packages/ufo-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class UfoCore(CMakePackage): homepage = "https://ufo.kit.edu" url = "https://github.com/ufo-kit/ufo-core/archive/v0.14.0.tar.gz" + license("LGPL-3.0-only") + version("0.14.0", sha256="3bf0d1924d6ae3f51673cc8b0b31b17873e79f1a0129a9af54b4062b1b2b3ad7") depends_on("glib") diff --git a/var/spack/repos/builtin/packages/ufo-filters/package.py b/var/spack/repos/builtin/packages/ufo-filters/package.py index 4b9b0fea10924d..de57eec948ca7b 100644 --- a/var/spack/repos/builtin/packages/ufo-filters/package.py +++ b/var/spack/repos/builtin/packages/ufo-filters/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ufs-utils/package.py b/var/spack/repos/builtin/packages/ufs-utils/package.py index 50380bfe5889b2..1333ef3f4c19f0 100644 --- a/var/spack/repos/builtin/packages/ufs-utils/package.py +++ b/var/spack/repos/builtin/packages/ufs-utils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ufs-weather-model/package.py b/var/spack/repos/builtin/packages/ufs-weather-model/package.py index dcc1e47e901a14..4d8e371232cef4 100644 --- a/var/spack/repos/builtin/packages/ufs-weather-model/package.py +++ b/var/spack/repos/builtin/packages/ufs-weather-model/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/uftrace/package.py b/var/spack/repos/builtin/packages/uftrace/package.py index 0ac73ff5f36ddc..ef411830d17c3b 100644 --- a/var/spack/repos/builtin/packages/uftrace/package.py +++ b/var/spack/repos/builtin/packages/uftrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Uftrace(AutotoolsPackage): maintainers("bernhardkaindl") tags = ["trace-tools"] + license("GPL-2.0-or-later") + # The build process uses 'git describe --tags' to get the package version version("master", branch="master", get_full_repo=True) version("0.11", sha256="101dbb13cb3320ee76525ec26426f2aa1de4e3ee5af74f79cb403ae4d2c6c871") diff --git a/var/spack/repos/builtin/packages/umap/package.py b/var/spack/repos/builtin/packages/umap/package.py index a4413f5391560a..57cbcb3202db0c 100644 --- a/var/spack/repos/builtin/packages/umap/package.py +++ b/var/spack/repos/builtin/packages/umap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Umap(CMakePackage): tags = ["e4s"] + license("LGPL-2.1-or-later") + version("develop", branch="develop") version("2.1.0", sha256="dfdc5b717aecdbfbb0da22e8567b9f2ffbc3607000a31122bf7c5ab3b85cecd9") version("2.0.0", sha256="85c4bc68e8790393847a84eb54eaf6fc321acade382a399a2679d541b0e34150") diff --git a/var/spack/repos/builtin/packages/umesimd/package.py b/var/spack/repos/builtin/packages/umesimd/package.py index 90a68a5e2cd04e..3a9286864b3e7c 100644 --- a/var/spack/repos/builtin/packages/umesimd/package.py +++ b/var/spack/repos/builtin/packages/umesimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/umoci/package.py b/var/spack/repos/builtin/packages/umoci/package.py index f6ef7b94c2696d..562dfbf53d2a04 100644 --- a/var/spack/repos/builtin/packages/umoci/package.py +++ b/var/spack/repos/builtin/packages/umoci/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Umoci(MakefilePackage): homepage = "https://umo.ci/" url = "https://github.com/openSUSE/umoci/archive/v0.4.4.tar.gz" + license("Apache-2.0") + version("0.4.4", sha256="bc5c53812e0076d026aa275b197b878857cf7ba7a4f048fd13433de6107b9aed") version("0.4.3", sha256="b7d537fec84d4327b1bbfe27118f69df5591143a74a7a1b66cc9904d85c30226") version("0.4.2", sha256="fbc397dd39bda2570155dc3b1be0835809a36fccc342e2545b3edb9f0f9dc6f5") diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index c64bfdf256db78..e85f48ff1fcff7 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): maintainers("davidbeckingsale") + license("MIT") + version("develop", branch="develop", submodules=False) version("main", branch="main", submodules=False) version( @@ -150,6 +152,13 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): when="@2022.10.0", ) + # https://github.com/LLNL/Umpire/pull/853 + patch( + "https://github.com/LLNL/Umpire/commit/4bd9b2ded81d3216b3f62e2aad62d0e34fe2c256.patch?full_index=1", + sha256="c9ddae1f4212cef72e1050b6ac482ce5b795dad4977d2462cff2e884b8d7aff5", + when="@2022.10:2023.06", + ) + variant("fortran", default=False, description="Build C/Fortran API") variant("c", default=True, description="Build C API") variant("numa", default=False, description="Enable NUMA support") @@ -208,11 +217,6 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): # currently only available for cuda. conflicts("+shared", when="+cuda") - # https://github.com/LLNL/Umpire/issues/653 - # This range looks weird, but it ensures the concretizer looks at it as a - # range, not as a concrete version, so that it also matches 10.3.* versions. - conflicts("%gcc@10.3.0:10.3", when="+cuda") - def _get_sys_type(self, spec): sys_type = spec.architecture if "SYS_TYPE" in env: @@ -308,9 +312,7 @@ def initconfig_package_entries(self): if spec.satisfies("@5.0.0:"): entries.append(cmake_cache_path("camp_DIR", spec["camp"].prefix)) entries.append(cmake_cache_option("{}ENABLE_NUMA".format(option_prefix), "+numa" in spec)) - entries.append( - cmake_cache_option("{}ENABLE_OPENMP".format(option_prefix), "+openmp" in spec) - ) + entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec)) entries.append(cmake_cache_option("ENABLE_BENCHMARKS", "tests=benchmarks" in spec)) entries.append( cmake_cache_option("{}ENABLE_EXAMPLES".format(option_prefix), "+examples" in spec) diff --git a/var/spack/repos/builtin/packages/unblur/package.py b/var/spack/repos/builtin/packages/unblur/package.py index 040f45e2451c72..0965489df8fcb3 100644 --- a/var/spack/repos/builtin/packages/unblur/package.py +++ b/var/spack/repos/builtin/packages/unblur/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/uncrustify/package.py b/var/spack/repos/builtin/packages/uncrustify/package.py index b6bd6ad244e2cb..4e0d627b833b40 100644 --- a/var/spack/repos/builtin/packages/uncrustify/package.py +++ b/var/spack/repos/builtin/packages/uncrustify/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Uncrustify(CMakePackage, AutotoolsPackage): maintainers("gmaurel") + license("GPL-2.0-or-later") + version("master", branch="master") version("0.74", commit="62048b01507304653ea98a74b31e0edbadaf7496") version("0.73", commit="25b765b4ccf1fc50302df3779188ccd402962ee0") diff --git a/var/spack/repos/builtin/packages/unibilium/package.py b/var/spack/repos/builtin/packages/unibilium/package.py index 9db4b04c80bb51..b5b54d6838b842 100644 --- a/var/spack/repos/builtin/packages/unibilium/package.py +++ b/var/spack/repos/builtin/packages/unibilium/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Unibilium(Package): homepage = "https://github.com/mauke/unibilium" url = "https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz" + license("LGPL-3.0-or-later") + version("2.0.0", sha256="78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1") version("1.2.0", sha256="623af1099515e673abfd3cae5f2fa808a09ca55dda1c65a7b5c9424eb304ead8") diff --git a/var/spack/repos/builtin/packages/unifdef/package.py b/var/spack/repos/builtin/packages/unifdef/package.py index 9382eca5b89a4e..a1a8da0e98ca41 100644 --- a/var/spack/repos/builtin/packages/unifdef/package.py +++ b/var/spack/repos/builtin/packages/unifdef/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Unifdef(MakefilePackage): maintainers("matthiasdiener") + license("BSD-2-Clause AND BSD-3-Clause", checked_by="tgamblin") + version("2.12", sha256="43ce0f02ecdcdc723b2475575563ddb192e988c886d368260bc0a63aee3ac400") version("2.11", sha256="828ffc270ac262b88fe011136acef2780c05b0dc3c5435d005651740788d4537") diff --git a/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch b/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch deleted file mode 100644 index f3076cfd54b70b..00000000000000 --- a/var/spack/repos/builtin/packages/unifyfs/include-sys-sysmacros.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -Commit: ef1b4caa70beb0a7ae03fc0ef1250b80efe33afc -Date: Fri, 14 May 2021 15:30:09 -0400 -Subject: [PATCH] Include sys/sysmacros.h in testlib.h - -In recent Linux systems, major() and minor() are defined in -sys/sysmacros.h and sys/types.h no longer includes sys/sysmacros.h. So, -we need to include sys/sysmacros.h in testlib.h. - -Also adds a check for the existence of sys/sysmacros.h in configure.ac. - -Include sys/sysmacros.h in testlib.h ---- - configure.ac | 1 + - examples/src/testlib.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 681cdb7..77719eb 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,7 @@ AC_CHECK_HEADERS([fcntl.h inttypes.h libgen.h limits.h mntent.h strings.h syslog - AC_CHECK_HEADERS([wchar.h wctype.h]) - AC_CHECK_HEADERS([sys/mount.h sys/socket.h sys/statfs.h sys/time.h]) - AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h]) -+AC_CHECK_HEADER([sys/sysmacros.h], [], AC_MSG_ERROR([cannot find required header sys/sysmacros.h])) - - # Checks for library functions. - AC_FUNC_MALLOC -diff --git a/examples/src/testlib.h b/examples/src/testlib.h -index 2b0a698..41c9900 100644 ---- a/examples/src/testlib.h -+++ b/examples/src/testlib.h -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.25.1 - diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py index 9cc1b3db64af90..0c0585e9bd9e5a 100644 --- a/var/spack/repos/builtin/packages/unifyfs/package.py +++ b/var/spack/repos/builtin/packages/unifyfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,25 +16,16 @@ class Unifyfs(AutotoolsPackage): homepage = "https://github.com/LLNL/UnifyFS" git = "https://github.com/LLNL/UnifyFS.git" - url = "https://github.com/LLNL/UnifyFS/releases/download/v0.9.2/unifyfs-0.9.2.tar.gz" + url = "https://github.com/LLNL/UnifyFS/releases/download/v1.1/unifyfs-1.1.tar.gz" maintainers("CamStan") tags = ["e4s"] version("develop", branch="dev") + version("2.0", sha256="a07dfda022bc3094d578dcc5c9b2c4bbe7de479f598e4e358cd01690cd82355b") version("1.1", sha256="1bf5593099d272c9a12c46090d217c61dfeea1504dd4f7184972da3db5afc5f3") version("1.0.1", sha256="d92800778661b15ab50275c4efe345a6c60d8f1802a0d5909fda38db91b12116") version("1.0", sha256="c9ad0d15d382773841a3dab89c661fbdcfd686ec37fa263eb22713f6404258f5") - version( - "0.9.2", - sha256="7046625dc0677535f5d960187cb2e2d58a6f8cfb4dc6a3604f825257eb0891aa", - deprecated=True, - ) - version( - "0.9.1", - sha256="2498a859cfa4961356fdf5c4c17e3afc3de7e034ad013b8c7145a622ef6199a0", - deprecated=True, - ) variant( "auto-mount", @@ -58,28 +49,25 @@ class Unifyfs(AutotoolsPackage): variant("spath", default=True, description="Use spath library to normalize relative paths") depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("automake@1.15:", type="build", when="@0.9.2:") + depends_on("automake@1.15:", type="build") depends_on("libtool", type="build") depends_on("m4", type="build") depends_on("pkgconfig", type="build") # Required dependencies depends_on("gotcha@1.0.4:") - depends_on("mochi-margo@0.4.3", when="@:0.9.1") - depends_on("mochi-margo@0.9.6:0.9.9", when="@0.9.2:1.0.1") + depends_on("mochi-margo@0.9.6:0.9.9", when="@1.0:1.0.1") # Version 1.1 mostly tested on mochi-margo@0.13.1. Leaving this all # inclusive from v0.10 on until any bugs are reported on versions before or # after v0.13.1. depends_on("mochi-margo@0.10:", when="@1.1:") depends_on("mpi") - # unifyfs@:1.1 uses MD5 functions that are deprecated in OpenSSL 3, and - # likely to be removed in the next major release. + # unifyfs@:1.1 uses MD5 functions that are deprecated in OpenSSL 3,these + # were removed in release 2.0. depends_on("openssl@:3") # Mochi-Margo dependencies - depends_on("mercury@1.0.1+bmi", when="@:0.9.1") depends_on("mercury@2.1", when="^mochi-margo@0.9.6:0.9.9") depends_on("mercury~boostsys", when="~boostsys") depends_on("libfabric fabrics=rxm,sockets,tcp", when="^mercury@2:+ofi") @@ -94,9 +82,6 @@ class Unifyfs(AutotoolsPackage): conflicts("%intel", when="+fortran") conflicts("%xl", when="+fortran") - patch("unifyfs-sysio.c.patch", when="@0.9.1") - patch("include-sys-sysmacros.h.patch", when="@0.9.1:0.9.2") - debug_build = False build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch b/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch deleted file mode 100644 index 99e2086b51a44b..00000000000000 --- a/var/spack/repos/builtin/packages/unifyfs/unifyfs-sysio.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spack-src/client/src/unifyfs-sysio.c.bak 2020-12-03 09:04:41.197202000 +0900 -+++ spack-src/client/src/unifyfs-sysio.c 2021-03-04 10:06:32.626989637 +0900 -@@ -245,7 +245,7 @@ - * that is big enough */ - buf = (char*) malloc(len); - if (buf != NULL) { -- strncpy(buf, unifyfs_cwd, len); -+ memcpy(buf, unifyfs_cwd, strlen(unifyfs_cwd)); - } else { - errno = ENOMEM; - } diff --git a/var/spack/repos/builtin/packages/unigen/package.py b/var/spack/repos/builtin/packages/unigen/package.py index a28e6e3e5a3a29..732e8f0a6c1c28 100644 --- a/var/spack/repos/builtin/packages/unigen/package.py +++ b/var/spack/repos/builtin/packages/unigen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Unigen(MakefilePackage): tags = ["hep"] + license("GPL-3.0-only") + version("2.3", sha256="8783bcabbdf8c50dab6e93153cff9cfb267a9a9e61aef51bf1e17679ba42a717") patch("unigen-2.3.patch", level=0) diff --git a/var/spack/repos/builtin/packages/unison/package.py b/var/spack/repos/builtin/packages/unison/package.py index 1e6df0e9d03430..5888b674ecb9ee 100644 --- a/var/spack/repos/builtin/packages/unison/package.py +++ b/var/spack/repos/builtin/packages/unison/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -6,7 +6,7 @@ from spack.package import * -class Unison(Package): +class Unison(MakefilePackage): """Unison is a file-synchronization tool for OSX, Unix, and Windows. It allows two replicas of a collection of files and directories to be stored on different hosts (or different disks @@ -18,19 +18,30 @@ class Unison(Package): url = "https://github.com/bcpierce00/unison/archive/v2.51.2.tar.gz" maintainers("hseara") - version("2.51.2", sha256="a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e") - version("2.48.15v4", sha256="f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec") + license("GPL-3.0-or-later") - depends_on("ocaml@4.10.0:~force-safe-string", type="build") + version("2.53.3", sha256="aaea04fc5bc76dcfe8627683c9659ee4c194d4f992cc8aaa15bbb2820fc8de46") + version( + "2.51.2", + sha256="a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e", + deprecated=True, + ) + version( + "2.48.15v4", + sha256="f8c7e982634bbe1ed6510fe5b36b6c5c55c06caefddafdd9edc08812305fdeec", + deprecated=True, + ) - patch("large.patch", level=0) - patch("4.08-compatibility.patch", when="^ocaml@4.08:") + depends_on("ocaml@4.10.0:~force-safe-string", type=("build", "link")) + + with when("@:2.51.2"): + patch("large.patch", level=0) + patch("4.08-compatibility.patch", when="^ocaml@4.08:") parallel = False - def install(self, spec, prefix): - make("UISTYLE=text DEBUGGING=false THREADS=true") + build_targets = ["UISTYLE=text", "DEBUGGING=false", "THREADS=true"] + def install(self, spec, prefix): mkdirp(prefix.bin) install("src/unison", prefix.bin) - set_executable(join_path(prefix.bin, "unison")) diff --git a/var/spack/repos/builtin/packages/units/package.py b/var/spack/repos/builtin/packages/units/package.py index 19984708e26a1f..45e4660cff1c48 100644 --- a/var/spack/repos/builtin/packages/units/package.py +++ b/var/spack/repos/builtin/packages/units/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Units(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/units/" gnu_mirror_path = "units/units-2.13.tar.gz" + license("GPL-3.0-only") + version("2.22", sha256="5d13e1207721fe7726d906ba1d92dc0eddaa9fc26759ed22e3b8d1a793125848") version("2.13", sha256="0ba5403111f8e5ea22be7d51ab74c8ccb576dc30ddfbf18a46cb51f9139790ab") diff --git a/var/spack/repos/builtin/packages/unittest-cpp/package.py b/var/spack/repos/builtin/packages/unittest-cpp/package.py index 1fe94c682da88e..0c71fdc9b72c57 100644 --- a/var/spack/repos/builtin/packages/unittest-cpp/package.py +++ b/var/spack/repos/builtin/packages/unittest-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,5 +17,7 @@ class UnittestCpp(CMakePackage): homepage = "https://github.com/unittest-cpp/unittest-cpp/wiki" url = "https://github.com/unittest-cpp/unittest-cpp/archive/v1.6.0.tar.gz" + license("MIT") + version("2.0.0", sha256="74852198877dc2fdebdc4e5e9bd074018bf8ee03a13de139bfe41f4585b2f5b9") version("1.6.0", sha256="9fa7e797816e16669d68171418b0dc41ec6b7eaf8483f782441f5f159598c3c0") diff --git a/var/spack/repos/builtin/packages/universal-ctags/package.py b/var/spack/repos/builtin/packages/universal-ctags/package.py index 6f7ca076b36d90..899b475d48eaa0 100644 --- a/var/spack/repos/builtin/packages/universal-ctags/package.py +++ b/var/spack/repos/builtin/packages/universal-ctags/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class UniversalCtags(AutotoolsPackage): url = "https://github.com/universal-ctags/ctags/archive/p5.9.20210912.0.tar.gz" git = "https://github.com/universal-ctags/ctags.git" + license("GPL-2.0-or-later") + version("master", branch="master") version( "5.9.20210912.0", sha256="5082d4f7e5695be3d697c46e2232d76c6d8adff51d22ba7a4b869362f444ee21" diff --git a/var/spack/repos/builtin/packages/universal/package.py b/var/spack/repos/builtin/packages/universal/package.py index 09a1555fda0350..c873dd0b6e47c7 100644 --- a/var/spack/repos/builtin/packages/universal/package.py +++ b/var/spack/repos/builtin/packages/universal/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,4 +14,6 @@ class Universal(CMakePackage): maintainers("eschnett") + license("MIT") + version("3.68", sha256="67de4e0a3276b873a298ab98f1237ff3fd23240178e71405bf813ee38e4b1f62") diff --git a/var/spack/repos/builtin/packages/unixodbc/package.py b/var/spack/repos/builtin/packages/unixodbc/package.py index d9a85956c9c259..171c25961e5d51 100644 --- a/var/spack/repos/builtin/packages/unixodbc/package.py +++ b/var/spack/repos/builtin/packages/unixodbc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Unixodbc(AutotoolsPackage): homepage = "http://www.unixodbc.org/" url = "http://www.unixodbc.org/unixODBC-2.3.4.tar.gz" + license("LGPL-2.0-or-later") + version("2.3.4", sha256="2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39") depends_on("iconv") diff --git a/var/spack/repos/builtin/packages/unqlite/package.py b/var/spack/repos/builtin/packages/unqlite/package.py index eb8c5bf898d92a..301a0b2eed43b2 100644 --- a/var/spack/repos/builtin/packages/unqlite/package.py +++ b/var/spack/repos/builtin/packages/unqlite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Unqlite(CMakePackage): url = "https://github.com/symisc/unqlite/archive/v1.1.9.tar.gz" git = "https://github.com/symisc/unqlite.git" + license("JSON") + version("master", branch="master") version("1.1.9", sha256="33d5b5e7b2ca223942e77d31112d2e20512bc507808414451c8a98a7be5e15c0") diff --git a/var/spack/repos/builtin/packages/unrar/package.py b/var/spack/repos/builtin/packages/unrar/package.py index c4f86b62cb68c6..339f255161a170 100644 --- a/var/spack/repos/builtin/packages/unrar/package.py +++ b/var/spack/repos/builtin/packages/unrar/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/unuran/package.py b/var/spack/repos/builtin/packages/unuran/package.py index cf8f70516120c3..9e185e5a631590 100644 --- a/var/spack/repos/builtin/packages/unuran/package.py +++ b/var/spack/repos/builtin/packages/unuran/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Unuran(AutotoolsPackage): homepage = "https://statmath.wu.ac.at/unuran" url = "https://statmath.wu.ac.at/unuran/unuran-1.8.1.tar.gz" + license("GPL-2.0-or-later") + version("1.8.1", sha256="c270ae96857857dbac6450043df865e0517f52856ddbe5202fd35583b13c5193") variant("shared", default=True, description="Enable the build of shared libraries") diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py index f9399cbaa6fd5b..39deb4e6c08395 100644 --- a/var/spack/repos/builtin/packages/unzip/package.py +++ b/var/spack/repos/builtin/packages/unzip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Unzip(MakefilePackage): homepage = "http://www.info-zip.org/Zip.html" url = "http://downloads.sourceforge.net/infozip/unzip60.tar.gz" + license("custom") + version("6.0", sha256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37") patch("configure-cflags.patch", when="%clang@16:") diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py index 5d8ba9e018b888..f2996d0682a697 100644 --- a/var/spack/repos/builtin/packages/upcxx/package.py +++ b/var/spack/repos/builtin/packages/upcxx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -50,22 +50,46 @@ class Upcxx(Package, CudaPackage, ROCmPackage): tags = ["e4s", "ecp"] + license("BSD-3-Clause-LBNL") + version("develop", branch="develop") version("master", branch="master") + version("2023.9.0", sha256="6bad2976b4bfc0263b497daa967f448159c3c2259827c8376bc96c9bf9171a83") version("2023.3.0", sha256="382af3c093decdb51f0533e19efb4cc7536b6617067b2dd89431e323704a1009") version("2022.9.0", sha256="dbf15fd9ba38bfe2491f556b55640343d6303048a117c4e84877ceddb64e4c7c") version("2022.3.0", sha256="72bccfc9dfab5c2351ee964232b3754957ecfdbe6b4de640e1b1387d45019496") - version("2021.9.0", sha256="9299e17602bcc8c05542cdc339897a9c2dba5b5c3838d6ef2df7a02250f42177") - version("2021.3.0", sha256="3433714cd4162ffd8aad9a727c12dbf1c207b7d6664879fc41259a4b351595b7") + version( + "2021.9.0", + deprecated=True, + sha256="9299e17602bcc8c05542cdc339897a9c2dba5b5c3838d6ef2df7a02250f42177", + ) + version( + "2021.3.0", + deprecated=True, + sha256="3433714cd4162ffd8aad9a727c12dbf1c207b7d6664879fc41259a4b351595b7", + ) version( "2020.11.0", + deprecated=True, sha256="f6f212760a485a9f346ca11bb4751e7095bbe748b8e5b2389ff9238e9e321317", url="https://bitbucket.org/berkeleylab/upcxx/downloads/upcxx-2020.11.0-memory_kinds_prototype.tar.gz", ) - version("2020.10.0", sha256="623e074b512bf8cad770a04040272e1cc660d2749760398b311f9bcc9d381a37") - version("2020.3.2", sha256="978adc315d21089c739d5efda764b77fc9a2a7c5860f169fe5cd2ca1d840620f") - version("2020.3.0", sha256="01be35bef4c0cfd24e9b3d50c88866521b9cac3ad4cbb5b1fc97aea55078810f") + version( + "2020.10.0", + deprecated=True, + sha256="623e074b512bf8cad770a04040272e1cc660d2749760398b311f9bcc9d381a37", + ) + version( + "2020.3.2", + deprecated=True, + sha256="978adc315d21089c739d5efda764b77fc9a2a7c5860f169fe5cd2ca1d840620f", + ) + version( + "2020.3.0", + deprecated=True, + sha256="01be35bef4c0cfd24e9b3d50c88866521b9cac3ad4cbb5b1fc97aea55078810f", + ) # Do NOT add older versions here. # UPC++ releases over 2 years old are not supported. @@ -78,6 +102,9 @@ class Upcxx(Package, CudaPackage, ROCmPackage): + "NOTE: Requires CUDA Driver library be present on the build system", when="@2019.3.0:", ) + conflicts( + "+cuda", when="@:2019.2", msg="UPC++ version 2019.3.0 or newer required for CUDA support" + ) variant( "rocm", @@ -85,6 +112,9 @@ class Upcxx(Package, CudaPackage, ROCmPackage): description="Enables UPC++ support for the ROCm/HIP memory kind on AMD GPUs", when="@2022.3.0:", ) + conflicts( + "+rocm", when="@:2022.2", msg="UPC++ version 2022.3.0 or newer required for ROCm support" + ) variant( "level_zero", @@ -102,8 +132,7 @@ class Upcxx(Package, CudaPackage, ROCmPackage): conflicts( "cross=none", when=is_CrayXC(), - msg="cross=none is unacceptable on Cray XC." - + 'Please specify an appropriate "cross" value', + msg='cross=none is unacceptable on Cray XC. Please specify an appropriate "cross" value', ) # UPC++ always relies on GASNet-EX. diff --git a/var/spack/repos/builtin/packages/upp/package.py b/var/spack/repos/builtin/packages/upp/package.py index 8bdb1187921da4..3a6c52686e649b 100644 --- a/var/spack/repos/builtin/packages/upp/package.py +++ b/var/spack/repos/builtin/packages/upp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Upp(CMakePackage): maintainers("AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA") + license("LGPL-3.0-or-later") + version("develop", branch="develop") version( "11.0.0", diff --git a/var/spack/repos/builtin/packages/uqtk/package.py b/var/spack/repos/builtin/packages/uqtk/package.py index be813701e7e06e..4eb4e7fbdb4bf2 100644 --- a/var/spack/repos/builtin/packages/uqtk/package.py +++ b/var/spack/repos/builtin/packages/uqtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/uriparser/package.py b/var/spack/repos/builtin/packages/uriparser/package.py index db7dca377db1f5..b9bc7a850120ae 100644 --- a/var/spack/repos/builtin/packages/uriparser/package.py +++ b/var/spack/repos/builtin/packages/uriparser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Uriparser(CMakePackage): homepage = "https://uriparser.github.io/" url = "https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.3/uriparser-0.9.3.tar.gz" + license("BSD-3-Clause") + version("0.9.7", sha256="11553b2abd2b5728a6c88e35ab08e807d0a0f23c44920df937778ce8cc4d40ff") version("0.9.6", sha256="10e6f90d359c1087c45f907f95e527a8aca84422251081d1533231e031a084ff") version( diff --git a/var/spack/repos/builtin/packages/usalign/package.py b/var/spack/repos/builtin/packages/usalign/package.py index 70d79b8b23f810..b7ad6867039e83 100644 --- a/var/spack/repos/builtin/packages/usalign/package.py +++ b/var/spack/repos/builtin/packages/usalign/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/usbutils/package.py b/var/spack/repos/builtin/packages/usbutils/package.py index b718f9ed898510..a74b154e2a96e7 100644 --- a/var/spack/repos/builtin/packages/usbutils/package.py +++ b/var/spack/repos/builtin/packages/usbutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Usbutils(AutotoolsPackage): homepage = "http://www.linux-usb.org/" url = "https://github.com/gregkh/usbutils/archive/v012.tar.gz" + license("GPL-2.0-or-later") + version("012", sha256="3f06028134aebd6bb36477019468d7bca2c0014f0f18b9441b7920b7cec7b210") version("011", sha256="9cf6e8c3030efc6abbb3c12de4da49816e0d6c6429f43fa3afb874cf72c2c869") version("010", sha256="e32f3debe6c1308bb9aa9a92c3d86f8565a6f6cf7711bccb07b0f83bf530717d") diff --git a/var/spack/repos/builtin/packages/usearch/package.py b/var/spack/repos/builtin/packages/usearch/package.py index 0bf8de594859c1..6ce96241bcf20c 100644 --- a/var/spack/repos/builtin/packages/usearch/package.py +++ b/var/spack/repos/builtin/packages/usearch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/userspace-rcu/package.py b/var/spack/repos/builtin/packages/userspace-rcu/package.py index 87b1ef314ee279..adbfe989b6159c 100644 --- a/var/spack/repos/builtin/packages/userspace-rcu/package.py +++ b/var/spack/repos/builtin/packages/userspace-rcu/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class UserspaceRcu(AutotoolsPackage): homepage = "https://liburcu.org/" url = "https://github.com/urcu/userspace-rcu/archive/v0.11.1.tar.gz" + license("LGPL-2.1-or-later") + version("0.13.1", sha256="b810481f0c859a5859d82e23eddd2856b410802009f94663d64c330dc2f4403e") version("0.13.0", sha256="c457d17ec9dff7db0e90b103ef1a03737efdeaec13098af82f83a03091c835b5") version("0.12.3", sha256="a61b5aca001f70cb576505cc4869bd74a758484343466cc49cb1342c67028a54") diff --git a/var/spack/repos/builtin/packages/ut/package.py b/var/spack/repos/builtin/packages/ut/package.py index 9c5d9f44603de7..1f76e497d0de88 100644 --- a/var/spack/repos/builtin/packages/ut/package.py +++ b/var/spack/repos/builtin/packages/ut/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,7 +15,11 @@ class Ut(CMakePackage): maintainers("msimberg") + license("BSL-1.0") + version("master", branch="master") + version("2.0.1", sha256="1e43be17045a881c95cedc843d72fe9c1e53239b02ed179c1e39e041ebcd7dad") + version("2.0.0", sha256="8b5b11197d1308dfc1fe20efd6a656e0c833dbec2807e2292967f6e2f7c0420f") version("1.1.9", sha256="1a666513157905aa0e53a13fac602b5673dcafb04a869100a85cd3f000c2ed0d") generator("ninja") diff --git a/var/spack/repos/builtin/packages/utf8cpp/package.py b/var/spack/repos/builtin/packages/utf8cpp/package.py index 930825dcbaceb3..49a2ecc2a61941 100644 --- a/var/spack/repos/builtin/packages/utf8cpp/package.py +++ b/var/spack/repos/builtin/packages/utf8cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/utf8proc/package.py b/var/spack/repos/builtin/packages/utf8proc/package.py index 383469d100a4c7..1ab8b537e18741 100644 --- a/var/spack/repos/builtin/packages/utf8proc/package.py +++ b/var/spack/repos/builtin/packages/utf8proc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/uthash/package.py b/var/spack/repos/builtin/packages/uthash/package.py new file mode 100644 index 00000000000000..1b176904a79670 --- /dev/null +++ b/var/spack/repos/builtin/packages/uthash/package.py @@ -0,0 +1,22 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Uthash(Package): + """C macros for hash tables and more.""" + + homepage = "https://troydhanson.github.io/uthash/" + url = "https://github.com/troydhanson/uthash/archive/refs/tags/v2.3.0.tar.gz" + + license("BSD-2-Clause") + + version("2.3.0", sha256="e10382ab75518bad8319eb922ad04f907cb20cccb451a3aa980c9d005e661acc") + + def install(self, spec, prefix): + mkdirp(prefix.include) + for header in find(join_path(self.stage.source_path, "src"), "*.h"): + install(header, prefix.include) diff --git a/var/spack/repos/builtin/packages/util-linux-uuid/package.py b/var/spack/repos/builtin/packages/util-linux-uuid/package.py index 6d97ef776086b2..d41a9a93ae805b 100644 --- a/var/spack/repos/builtin/packages/util-linux-uuid/package.py +++ b/var/spack/repos/builtin/packages/util-linux-uuid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class UtilLinuxUuid(AutotoolsPackage): list_url = "https://www.kernel.org/pub/linux/utils/util-linux" list_depth = 1 + license("GPL-2.0-or-later") + version("2.38.1", sha256="0820eb8eea90408047e3715424bc6be771417047f683950fecb4bdd2e2cbbc6e") version("2.37.4", sha256="c8b7b4fa541f974cc32c1c6559d9bfca33651020a456ad6ee5fc9b0cacd00151") version("2.36.2", sha256="f5dbe79057e7d68e1a46fc04083fc558b26a49499b1b3f50e4f4893150970463") diff --git a/var/spack/repos/builtin/packages/util-linux/package.py b/var/spack/repos/builtin/packages/util-linux/package.py index b0c04e0f70efc8..72529d2a356ab5 100644 --- a/var/spack/repos/builtin/packages/util-linux/package.py +++ b/var/spack/repos/builtin/packages/util-linux/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class UtilLinux(AutotoolsPackage): list_url = "https://www.kernel.org/pub/linux/utils/util-linux" list_depth = 1 + license("GPL-2.0-only") + version("2.39.1", sha256="d7c8a58eb2c7248a32754eb3a3b6772e368b984d9907ada834c2cf3e13024270") version("2.38.1", sha256="0820eb8eea90408047e3715424bc6be771417047f683950fecb4bdd2e2cbbc6e") version("2.38", sha256="c31d4e54f30b56b0f7ec8b342658c07de81378f2c067941c2b886da356f8ad42") diff --git a/var/spack/repos/builtin/packages/util-macros/package.py b/var/spack/repos/builtin/packages/util-macros/package.py index 592a0c93dc32fe..feca9d82d142a1 100644 --- a/var/spack/repos/builtin/packages/util-macros/package.py +++ b/var/spack/repos/builtin/packages/util-macros/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class UtilMacros(AutotoolsPackage, XorgPackage): maintainers("robert-mijakovic") + license("MIT") + version("1.19.3", sha256="0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971") version("1.19.2", sha256="d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712") version("1.19.1", sha256="18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6") diff --git a/var/spack/repos/builtin/packages/uvw/package.py b/var/spack/repos/builtin/packages/uvw/package.py index 5c972685cb8d79..685ab77ffbb723 100644 --- a/var/spack/repos/builtin/packages/uvw/package.py +++ b/var/spack/repos/builtin/packages/uvw/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Uvw(CMakePackage): homepage = "https://github.com/skypjack/uvw" url = "https://github.com/skypjack/uvw/archive/v1.14.0_libuv-v1.26.tar.gz" + license("MIT") + version("1.14.0", sha256="ef13977c1f87d5659887f6a75d37b7088f2dafbdf0aaff00358240071c70382e") version("1.13.0", sha256="cc9944e5a2cdeb19bb74c61c3c02816c5a02b4339f3ad16e979bb7c8640e22c0") version("1.12.0", sha256="b7751294fa00e8a96cd7d70989beda7a6117f5d9f4751306b7b2bbbb4702aac8") diff --git a/var/spack/repos/builtin/packages/vacuumms/package.py b/var/spack/repos/builtin/packages/vacuumms/package.py index d3a7736738bc7a..96b07689e6ca6b 100644 --- a/var/spack/repos/builtin/packages/vacuumms/package.py +++ b/var/spack/repos/builtin/packages/vacuumms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Vacuumms(CMakePackage): maintainers("frankwillmore") + license("Unlicense") + version("master", branch="master") version("1.1.1", tag="v1.1.1", commit="a395930c87f5b52ab0ab8db278bd2bde592e8f12") version( diff --git a/var/spack/repos/builtin/packages/vala/package.py b/var/spack/repos/builtin/packages/vala/package.py index bc9ccc47232a35..e7e03a4462f4f4 100644 --- a/var/spack/repos/builtin/packages/vala/package.py +++ b/var/spack/repos/builtin/packages/vala/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Vala(AutotoolsPackage): maintainers("benkirk") + license("LGPL-2.0-or-later") + version("0.48.25", sha256="50cb3c5eccddc7fd4368bfa96414a556045e79d2b15a68918c727b8c83b18a24") version("0.48.24", sha256="3649ef84573b6865fc3470640ee603720099eb915b39faad19b7498de1a7df24") version("0.48.23", sha256="de3cc858d995e07474219e25a3e1f0ed998070d2e206d3a313d4379a5f77a06a") diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 74f4b5038efcd3..0820d4c6b664b1 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Valgrind(AutotoolsPackage, SourcewarePackage): sourceware_mirror_path = "valgrind/valgrind-3.13.0.tar.bz2" git = "git://sourceware.org/git/valgrind.git" + license("GPL-2.0-or-later") + version("develop", branch="master") version("3.20.0", sha256="8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6") version("3.19.0", sha256="dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02") diff --git a/var/spack/repos/builtin/packages/valijson/package.py b/var/spack/repos/builtin/packages/valijson/package.py index ba9567992ba5bb..0b7f2ddf1b1e5a 100644 --- a/var/spack/repos/builtin/packages/valijson/package.py +++ b/var/spack/repos/builtin/packages/valijson/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,5 +15,7 @@ class Valijson(CMakePackage): url = "https://github.com/tristanpenman/valijson/archive/refs/tags/v1.0.tar.gz" git = "https://github.com/tristanpenman/valijson.git" + license("BSD-2-Clause") + version("master", branch="master") version("1.0", sha256="6b9f0bc89880feb3fe09aa469cd81f6168897d2fbb4e715853da3b94afd3779a") diff --git a/var/spack/repos/builtin/packages/vampirtrace/package.py b/var/spack/repos/builtin/packages/vampirtrace/package.py index 2d4f7587fd3655..bc28a286d0466f 100644 --- a/var/spack/repos/builtin/packages/vampirtrace/package.py +++ b/var/spack/repos/builtin/packages/vampirtrace/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vapor/package.py b/var/spack/repos/builtin/packages/vapor/package.py new file mode 100644 index 00000000000000..72507b8b86f8ff --- /dev/null +++ b/var/spack/repos/builtin/packages/vapor/package.py @@ -0,0 +1,132 @@ +# 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 re + +from spack.package import * + + +class Vapor(CMakePackage): + """VAPOR is the Visualization and Analysis Platform for Ocean, + Atmosphere, and Solar Researchers. VAPOR provides an interactive 3D + visualization environment that can also produce animations and + still frame images. + """ + + homepage = "https://www.vapor.ucar.edu" + url = "https://github.com/NCAR/VAPOR/archive/refs/tags/v3.9.0.tar.gz" + git = "https://github.com/NCAR/VAPOR.git" + + maintainers("vanderwb") + + version("main", branch="main") + version( + "3.9.0", + sha256="343ababe40b5824ef826f16c935a6dc1fb18e1a4c88ef967c8d64386f28a99a3", + preferred=True, + ) + + variant("doc", default=True, description="Build docs using Doxygen") + variant("ospray", default=False, description="Enable OSPRay raytracing") + + depends_on("cmake@3.17:", type="build") + depends_on("python+ssl", type="build") + depends_on("py-numpy@1.21", type="build") + depends_on("py-scipy", type="build") + depends_on("py-matplotlib", type="build") + + depends_on("zlib-api") + depends_on("gl") + + depends_on("xz") + depends_on("openssl") + depends_on("expat") + depends_on("curl") + depends_on("mesa-glu") + depends_on("libxtst") + depends_on("libxcb") + depends_on("xcb-util") + depends_on("libxkbcommon") + depends_on("libpng") + depends_on("assimp") + depends_on("netcdf-c~dap~byterange") + depends_on("udunits") + depends_on("freetype") + depends_on("proj@:7") + depends_on("libgeotiff") + depends_on("glm") + depends_on("qt+opengl+dbus@5") + + depends_on("ospray~mpi", when="+ospray") + depends_on("doxygen", when="+doc") + + # These images are required but not provided by the source + resource( + name="map-images", + url="https://stratus.ucar.edu/vapor-images/2023-Jun-images.tar.xz", + sha256="3f0c6d40446abdb16d5aaaa314349a140e497b3be6f4971394b3e78f22d47c7d", + placement="share/extras/images", + ) + + def cmake_args(self): + spec = self.spec + pyvers = spec["python"].version.up_to(2) + pypath = "{}/python{}".format(spec.prefix.lib, pyvers) + + args = [ + self.define_from_variant("BUILD_OSP", "ospray"), + self.define_from_variant("BUILD_DOC", "doc"), + self.define("BUILD_PYTHON", False), + self.define("THIRD_PARTY_DIR", spec.prefix), + self.define("THIRD_PARTY_LIB_DIR", spec.prefix.lib), + self.define("THIRD_PARTY_INC_DIR", spec["python"].prefix.include), + self.define("PYTHONVERSION", pyvers), + self.define("PYTHONDIR", spec.prefix), + self.define("PYTHONPATH", pypath), + self.define("NUMPY_INCLUDE_DIR", pypath + "/site-packages/numpy/core/include"), + self.define("MAP_IMAGES_PATH", "extras/images"), + ] + + return args + + # VAPOR depends on custom version of GeometryEngine that is + # packaged with the source code - need to extract and move + @run_before("cmake") + def extract_gte(self): + unzip = which("unzip") + + with working_dir("buildutils"): + unzip("GTE.zip") + move("GTE", "../include") + + # Build will use these optional site defaults which aren't + # generally applicable to other sites + @run_before("cmake") + def clean_local_refs(self): + force_remove("site_files/site.NCAR") + + # Vapor wants all of the Python packages in its build path. This + # somewhat objectionable code copies packages to the tree. It also + # copies the Python library so that the site-library is found. + @run_before("cmake") + def copy_python_library(self): + spec = self.spec + mkdirp(spec.prefix.lib) + pp = re.compile("py-[a-z0-9-]*") + + for pydep in ["python"] + pp.findall(str(spec)): + install_tree(spec[pydep].prefix.lib, spec.prefix.lib) + + # The documentation will not be built without this target (though + # it will try to install!) + @property + def build_targets(self): + targets = [] + + if "+doc" in self.spec: + targets.append("doc") + + return targets + ["all"] diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index 927f3e9de75189..e48185dca3d558 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/variorum/package.py b/var/spack/repos/builtin/packages/variorum/package.py index 9d4a385d0ed118..201061aeff4d08 100644 --- a/var/spack/repos/builtin/packages/variorum/package.py +++ b/var/spack/repos/builtin/packages/variorum/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Variorum(CMakePackage): maintainers("slabasan", "rountree") + license("MIT") + version("0.7.0", sha256="36ec0219379ea2b7c8f9770b3271335c776ff5a3de71585714c33356345b2f0c") version("0.6.0", sha256="c0928a0e6901808ee50142d1034de15edc2c90d7d1b9fbce43757226e7c04306") version("0.5.0", sha256="de331762e7945ee882d08454ff9c66436e2b6f87f761d2b31c6ab3028723bfed") diff --git a/var/spack/repos/builtin/packages/varnish-cache/package.py b/var/spack/repos/builtin/packages/varnish-cache/package.py index b19762456b35f8..9d3fd83987ddbc 100644 --- a/var/spack/repos/builtin/packages/varnish-cache/package.py +++ b/var/spack/repos/builtin/packages/varnish-cache/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class VarnishCache(AutotoolsPackage): homepage = "https://www.varnish-cache.org/" url = "https://github.com/varnishcache/varnish-cache/archive/varnish-6.4.0.tar.gz" + license("BSD-2-Clause") + version("6.4.0", sha256="d9702c2c689c5d4ecd911886f769ddf22f46ac0722e275bee4033928cab09243") version("6.3.2", sha256="e50f3dd4e26d5669c5b73657cdb0d5ddac7dcc3cfa1761a983afa24b659f3785") version("6.3.1", sha256="8cc57360c1db36e8c77fc51304a935803a06247f6d6120fa47e8345efadf17a9") diff --git a/var/spack/repos/builtin/packages/varscan/package.py b/var/spack/repos/builtin/packages/varscan/package.py index 73f590cb203b07..8b08b8a321406b 100644 --- a/var/spack/repos/builtin/packages/varscan/package.py +++ b/var/spack/repos/builtin/packages/varscan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vasp/package.py b/var/spack/repos/builtin/packages/vasp/package.py index 0a8f5393a7d3ce..1f67e9b006bff9 100644 --- a/var/spack/repos/builtin/packages/vasp/package.py +++ b/var/spack/repos/builtin/packages/vasp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vbfnlo/package.py b/var/spack/repos/builtin/packages/vbfnlo/package.py index 5ca78bd6c9ddd2..69d9e2807da875 100644 --- a/var/spack/repos/builtin/packages/vbfnlo/package.py +++ b/var/spack/repos/builtin/packages/vbfnlo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Vbfnlo(AutotoolsPackage): tags = ["hep"] + license("GPL-2.0-only") + # The commented out versions exist, but are not tested version( "3.0.0beta5", sha256="777a3dedb365ea9abc38848a60f30d325da3799cbad69fa308664b94a8c31a90" diff --git a/var/spack/repos/builtin/packages/vbz-compression/package.py b/var/spack/repos/builtin/packages/vbz-compression/package.py new file mode 100644 index 00000000000000..52712253b46618 --- /dev/null +++ b/var/spack/repos/builtin/packages/vbz-compression/package.py @@ -0,0 +1,50 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class VbzCompression(CMakePackage): + """ + VBZ Compression uses variable byte integer encoding to compress nanopore signal data and is built using the following libraries: + + https://github.com/lemire/streamvbyte + https://github.com/facebook/zstd + + The performance of VBZ is achieved by taking advantage of the properties of the raw signal and therefore is most effective when applied to the signal dataset. + Other datasets you may have in your Fast5 files will not be able to take advantage of the default VBZ settings for compression. + VBZ will be used as the default compression scheme in a future release of MinKNOW. + """ + + homepage = "https://nanoporetech.com" + git = "https://github.com/nanoporetech/vbz_compression.git" + + license("MPL-2.0") + + version("1.0.3", commit="02fb8f50b93921ffa3c040106e809aaf8adbe5c5", submodules=True) + version("1.0.2", commit="3f77a01c6a0a41707b7a5bcea959e734178b6ce2", submodules=True) + version("1.0.1", commit="975cbcf33640d131b5cf2d2a124eed1a702b54f7", submodules=True) + version("1.0.0", commit="2db0e3f62fa7a612dc42dc802401c26781eed068", submodules=True) + version("0.9.3", commit="9a748efcdd0754be835e1080cf7086f3451e17d1", submodules=True) + + depends_on("cmake@3.11:", type="build") + depends_on("zstd@1.3.1:") + depends_on("hdf5@1.8.16:") + + variant( + "build_type", + default="Release", + description="CMake build type", + values=("Release", "Default"), + ) + + def cmake_args(self): + args = [ + self.define("ENABLE_CONAN", False), + self.define("ENABLE_PERF_TESTING", False), + self.define("ENABLE_PYTHON", False), + ] + return args diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index f00154e851ed61..a5d549c360ffc6 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,9 @@ class Vc(CMakePackage): git = "https://github.com/VcDevel/Vc.git" url = "https://github.com/VcDevel/Vc/archive/refs/tags/1.3.3.tar.gz" + license("BSD-3-Clause") + + version("1.4.4", sha256="5933108196be44c41613884cd56305df320263981fe6a49e648aebb3354d57f3") version("1.4.3", sha256="988ea0053f3fbf17544ca776a2749c097b3139089408b0286fa4e9e8513e037f") version("1.4.2", sha256="50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952") version("1.4.1", sha256="7e8b57ed5ff9eb0835636203898c21302733973ff8eaede5134dd7cb87f915f6") diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index e592728113f0cb..e533200232f59f 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Vcftools(AutotoolsPackage): homepage = "https://vcftools.github.io/" url = "https://github.com/vcftools/vcftools/releases/download/v0.1.14/vcftools-0.1.14.tar.gz" + license("LGPL-3.0-only") + version("0.1.16", sha256="dbfc774383c106b85043daa2c42568816aa6a7b4e6abc965eeea6c47dde914e3") # this is "a pre-release" # version('0.1.15', sha256='31e47afd5be679d89ece811a227525925b6907cce4af2c86f10f465e080383e3') @@ -23,6 +25,7 @@ class Vcftools(AutotoolsPackage): depends_on("perl", type=("build", "run")) depends_on("zlib-api") + depends_on("pkgconfig") # this needs to be in sync with what setup_run_environment adds to # PERL5LIB below diff --git a/var/spack/repos/builtin/packages/vcsh/package.py b/var/spack/repos/builtin/packages/vcsh/package.py index 2ff8fd9a17ebd2..b109adf5b21750 100644 --- a/var/spack/repos/builtin/packages/vcsh/package.py +++ b/var/spack/repos/builtin/packages/vcsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Vcsh(Package): homepage = "https://github.com/RichiH/vcsh" url = "https://github.com/RichiH/vcsh/archive/v1.20151229.tar.gz" + license("GPL-2.0-or-later") + version( "1.20151229-1", sha256="7682a517eaf88a86ea5e38ad81707800e965375eaff8b5cfd882e210fe2fef71" ) diff --git a/var/spack/repos/builtin/packages/vdt/package.py b/var/spack/repos/builtin/packages/vdt/package.py index a29b924b43029e..0b5a2aafdf9e90 100644 --- a/var/spack/repos/builtin/packages/vdt/package.py +++ b/var/spack/repos/builtin/packages/vdt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -46,10 +46,7 @@ def cmake_args(self): elif spec.satisfies("target=ppc64le:"): disable_features.add("fma") - args = [ - self.define_from_variant("PRELOAD"), - self.define("PYTHON_EXECUTABLE", spec["python"].command), - ] + args = [self.define_from_variant("PRELOAD")] for f in ["sse", "avx", "avx2", "fma", "neon"]: args.append( self.define(f.upper(), f not in disable_features and f in self.spec.target) diff --git a/var/spack/repos/builtin/packages/veccore/package.py b/var/spack/repos/builtin/packages/veccore/package.py index 41a8116b348856..f8a7ab885ebd24 100644 --- a/var/spack/repos/builtin/packages/veccore/package.py +++ b/var/spack/repos/builtin/packages/veccore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Veccore(CMakePackage): maintainers("drbenmorgan", "sethrj") + license("Apache-2.0") + version("master", branch="master") version("0.8.1", sha256="7d7983947c2c6faa55c908b3a968f19f96f4d5c909447c536de30c34b439e008") version("0.8.0", sha256="2f8e49f2b609bf15a776026fbec899b3d5d4ba30f033d4fdac4b07a5220a4fd3") diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 7a403bdd9ee93b..48284544866fdb 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,7 +21,21 @@ class Vecgeom(CMakePackage, CudaPackage): maintainers("drbenmorgan", "sethrj") version("master", branch="master") - version("1.2.5", sha256="af76f0aac34ec3748120969b0fca0f899d91b25cb5727f2c022a6e8304e91327") + version( + "1.2.7", + url="https://gitlab.cern.ch/VecGeom/VecGeom/uploads/e4172cca4f6f731ef15e2780ecbb1645/VecGeom-v1.2.7.tar.gz", + sha256="d264c69b78bf431b9542be1f1af087517eac629da03cf2da62eb1e433fe06021", + ) + version( + "1.2.6", + url="https://gitlab.cern.ch/VecGeom/VecGeom/uploads/0b16aed9907cea62aa5f5914bec99a90/VecGeom-v1.2.6.tar.gz", + sha256="337f8846491930f3d8bfa4b45a1589d46e5d1d87f2d38c8f7006645c3aa90df8", + ) + version( + "1.2.5", + url="https://gitlab.cern.ch/VecGeom/VecGeom/uploads/33b93e656c5bc49d81cfcba291f5be51/VecGeom-v1.2.5.tar.gz", + sha256="d79ea05125e4d03c5605e5ea232994c500841d207b4543ac3d84758adddc15a9", + ) version( "1.2.4", sha256="4f5d43a9cd34a5e0200c41547a438cbb1ed4439f5bb757857c5a225d708590ce", @@ -133,11 +147,6 @@ class Vecgeom(CMakePackage, CudaPackage): commit="a7e0828c915ff936a79e672d1dd84b087a323b51", deprecated=True, ) - version( - "0.3.rc", - sha256="a87a9ea4ab126b59ff9c79182bc0911ead3d76dd197194742e2a35ccd341299d", - deprecated=True, - ) _cxxstd_values = (conditional("11", "14", when="@:1.1"), "17", conditional("20", when="@1.2:")) variant( diff --git a/var/spack/repos/builtin/packages/veclibfort/package.py b/var/spack/repos/builtin/packages/veclibfort/package.py index 8d8e3eab434aae..eac366bfa65512 100644 --- a/var/spack/repos/builtin/packages/veclibfort/package.py +++ b/var/spack/repos/builtin/packages/veclibfort/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Veclibfort(Package): url = "https://github.com/mcg1969/vecLibFort/archive/0.4.2.tar.gz" git = "https://github.com/mcg1969/vecLibFort.git" + license("BSL-1.0") + version("develop", branch="master") version("0.4.3", sha256="fe9e7e0596bfb4aa713b2273b21e7d96c0d7a6453ee4b214a8a50050989d5586") version("0.4.2", sha256="c61316632bffa1c76e3c7f92b11c9def4b6f41973ecf9e124d68de6ae37fbc85") diff --git a/var/spack/repos/builtin/packages/vecmem/package.py b/var/spack/repos/builtin/packages/vecmem/package.py index 2aaa1b10af3f77..30186fd24d977a 100644 --- a/var/spack/repos/builtin/packages/vecmem/package.py +++ b/var/spack/repos/builtin/packages/vecmem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Vecmem(CMakePackage, CudaPackage): maintainers("wdconinc", "HadrienG2") + license("MPL-2.0-no-copyleft-exception") + version("0.24.0", sha256="b395c013fba4e01f02939fefac14b357dbfd8e572b5c8f4ee5a1414adbd2ea93") version("0.22.0", sha256="b8811723bee60b0ea289d4c8b73363883e7c856859baf4cb6276b38816b0b258") version("0.21.0", sha256="97df3beb9a59b89b65c51ceb7e7c9b09172b3875b25f2d8fc070e4f9b061b631") diff --git a/var/spack/repos/builtin/packages/vectorclass-version2/package.py b/var/spack/repos/builtin/packages/vectorclass-version2/package.py index 14951bc8e02ff8..784ece9330960f 100644 --- a/var/spack/repos/builtin/packages/vectorclass-version2/package.py +++ b/var/spack/repos/builtin/packages/vectorclass-version2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class VectorclassVersion2(Package): maintainers("haralmha") + license("Apache-2.0") + version("2.01.04", sha256="7885c343b1af9eb940f4debdd7cd19544130a06ed70e0000e1a8471fb9c15118") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/vegas2/package.py b/var/spack/repos/builtin/packages/vegas2/package.py index 1d613e65999485..8ac5ee83dc9987 100644 --- a/var/spack/repos/builtin/packages/vegas2/package.py +++ b/var/spack/repos/builtin/packages/vegas2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index b470582aa2b25c..2bb6f0840dbb44 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Veloc(CMakePackage): maintainers = ["bnicolae"] tags = ["e4s"] + license("MIT") + version("main", branch="main") version("1.7", sha256="ca50cb300830ea7f7e5679d32e3671ce4ea250eac384e7231def8dbb90e0cf31") version("1.6", sha256="451b46ad13e360270044c0dba09d8e4fbd64149f8e8d71310fdb520424c5eeaa") diff --git a/var/spack/repos/builtin/packages/velvet/package.py b/var/spack/repos/builtin/packages/velvet/package.py index 55c76fee335792..bb418f7eca3371 100644 --- a/var/spack/repos/builtin/packages/velvet/package.py +++ b/var/spack/repos/builtin/packages/velvet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Velvet(MakefilePackage): maintainers("snehring") + license("GPL-2.0-only") + version("1.2.10", sha256="884dd488c2d12f1f89cdc530a266af5d3106965f21ab9149e8cb5c633c977640") variant( diff --git a/var/spack/repos/builtin/packages/velvetoptimiser/package.py b/var/spack/repos/builtin/packages/velvetoptimiser/package.py index 03eb1daed9b4ab..a8da0d6cfe593c 100644 --- a/var/spack/repos/builtin/packages/velvetoptimiser/package.py +++ b/var/spack/repos/builtin/packages/velvetoptimiser/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Velvetoptimiser(Package): homepage = "https://github.com/tseemann/VelvetOptimiser" url = "https://github.com/tseemann/VelvetOptimiser/archive/2.2.6.tar.gz" + license("GPL-2.0-or-later") + version("2.2.6", sha256="b407db61b58ed983760b80a3a40c8f8a355851ecfab3e61a551bed29bf5b40b3") depends_on("velvet@1.1:", type="run") diff --git a/var/spack/repos/builtin/packages/verible/package.py b/var/spack/repos/builtin/packages/verible/package.py new file mode 100644 index 00000000000000..9add4f5f141c6a --- /dev/null +++ b/var/spack/repos/builtin/packages/verible/package.py @@ -0,0 +1,63 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Verible(Package): + """The Verible project’s main mission is to parse SystemVerilog + (IEEE 1800-2017) (as standardized in the [SV-LRM]) for a wide variety of + applications, including developer tools. + + It was born out of a need to parse un-preprocessed source files, which is + suitable for single-file applications like style-linting and formatting. + In doing so, it can be adapted to parse preprocessed source files, which + is what real compilers and toolchains require. + + The spirit of the project is that no-one should ever have to develop a + SystemVerilog parser for their own application, because developing a + standard-compliant parser is an enormous task due to the syntactic + complexity of the language. Verible’s parser is also regularly tested + against an ever-growing suite of (tool-independent) language compliance + tests at https://symbiflow.github.io/sv-tests/. + + A lesser (but notable) objective is that the language-agnostic components + of Verible be usable for rapidly developing language support tools for + other languages.""" + + homepage = "https://chipsalliance.github.io/verible" + git = "https://github.com/chipsalliance/verible.git" + + license("BSD-3-Clause") + + version("master", branch="master") + + version( + "0.0.3483", + sha256="c40591813a7cf6b1a6f46f7e02d81526c999966c3ceb9a67c5542234cf49dddb", + url="https://github.com/chipsalliance/verible/archive/refs/tags/v0.0-3483-ga4d61b11.tar.gz", + ) + version( + "0.0.3430", + sha256="580ab39c82da9f67523658c0bb0859e2b6c662f7c06855859f476eeedd92a7e0", + url="https://github.com/chipsalliance/verible/archive/refs/tags/v0.0-3430-g060bde0f.tar.gz", + ) + version( + "0.0.3428", + sha256="2b83497662b890f875bfe859175aa8e4b87db6e6a177ad08a0694002b8767cb0", + url="https://github.com/chipsalliance/verible/archive/refs/tags/v0.0-3428-gcfcbb82b.tar.gz", + ) + + maintainers("davekeeshan") + + depends_on("flex", type="build") + depends_on("bison", type="build") + depends_on("bazel", type="build") + + conflicts("%gcc@:8", msg="Only works with gcc9 and above") + + def install(self, spec, prefix): + bazel("build", "-c", "opt", "//...") + bazel("run", "-c", "opt", ":install", "--", prefix.bin) diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 90b1f04a2fb524..8ce3c647afaa0e 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -33,38 +33,66 @@ class Verilator(AutotoolsPackage): designs with thousands of modules.""" homepage = "https://www.veripool.org/projects/verilator" - url = "https://www.veripool.org/ftp/verilator-3.920.tgz" + url = "https://github.com/verilator/verilator/archive/refs/tags/v5.020.tar.gz" + git = "https://github.com/verilator/verilator.git" - version("4.108", sha256="8e8ec1de0bf200b6206035214f9071a5acc64bd2e7134361d564271e48552702") - version("4.020", sha256="abd79fc2a54cab9da33dfccd669bda3baa71e79060abec17517f0b7374dbc31a") - version("3.920", sha256="2b5c38aa432d0766a38475219f9548d64d18104ce8bdcb5d29e42f5da06943ff") - version("3.904", sha256="ea95e08b2d70682ad42e6c2f5ba99f59b2e7b220791214076099cdf6b7a8c1cb") + maintainers("davekeeshan") + license("LGPL-3.0-only") + + version("master", branch="master") + + version("5.020", sha256="41ca9abfadf8d2413efbff7f8277379733d0095957fe7769dc38f8fd1bc899a6") + version("5.018", sha256="8b544273eedee379e3c1a3bb849e14c754c9b5035d61ad03acdf3963092ba6c0") + version("5.016", sha256="66fc36f65033e5ec904481dd3d0df56500e90c0bfca23b2ae21b4a8d39e05ef1") + version("5.014", sha256="36e16c8a7c4b376f88d87411cea6ee68710e6d1382a13faf21f35d65b54df4a7") + version("5.012", sha256="db19a7d7615b37d9108654e757427e4c3f44e6e973ed40dd5e0e80cc6beb8467") + version("5.010", sha256="ca82b57ce2d2b34eed3f04d5daf7eae6ad41276cda88efbb59ebd6467e65d635") + version("5.008", sha256="1d19f4cd186eec3dfb363571e3fe2e6d3377386ead6febc6ad45402f0634d2a6") + version("5.006", sha256="eb4ca4157ba854bc78c86173c58e8bd13311984e964006803dd45dc289450cfe") + version("5.004", sha256="7d193a09eebefdbec8defaabfc125663f10cf6ab0963ccbefdfe704a8a4784d2") + version("5.002", sha256="72d68469fc1262e6288d099062b960a2f65e9425bdb546cba141a2507decd951") + version("4.228", sha256="be6af6572757013802be5b0ff9c64cbf509e98066737866abaae692fe04edf09") + version("4.226", sha256="70bc941d86e4810253d51aa94898b0802d916ab76296a398f8ceb8798122c9be") + version("4.224", sha256="010ff2b5c76d4dbc2ed4a3278a5599ba35c8ed4c05690e57296d6b281591367b") + version("4.222", sha256="15c60175807c0f3536c3c5b435f131c2b1e8725aefd30645efd946bf401b4c84") + version("4.220", sha256="e00e0c31a0c00887bebbaf7a8c771efa09420a4d1fbae54d45843baf50df4426") + version("4.218", sha256="ef7b1e6ddb715ddb3cc998fcbefc7150cfa2efc5118cf43ddb594bf41ea41cc7") + version("4.216", sha256="64e5093b629a7e96178e3b2494f208955f218dfac6f310a91e4fc07d050c980b") + version("4.214", sha256="e14c7f6ffb00a6746ae2a8ea0424e90a1a30067e8ae4c96b8c42689ca1ca0b1f") + version("4.212", sha256="7b655859e4e75c9673141aede8f5a20f47e4c380055d1a588d5be60cbbc73619") + version("4.210", sha256="3a2e6f27a5d80116a268ba054a3be61aca924bc54c5556ea25e75ee974201abb") + version("4.204", sha256="dbad9bd3cac34e63bbd945fff9a59eaabe31dae1e1c93c847d0f894db9919498") + version("4.202", sha256="a60c02f299ddb5bb8e963dc7d81983c55c293d97718685c1cd4b66638a33d98e") + version("4.200", sha256="2cd0fd48152f152d0487eaac23803d35ff75e924734435b366a523deb1185407") + version("4.110", sha256="603c23944577a5d53a2e09191d04d5c61740a77b58f3a590a70e56f4526a5a0b") + version("4.108", sha256="ce521dc57754e5a325ff7000c434ce23674c8e1de30e1f2a6506dc3a33bd7c55") + + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + depends_on("help2man", type="build") depends_on("bison", type="build") depends_on("flex") + depends_on("ccache", type=("build", "run"), when="@5.018:") depends_on("perl", type=("build", "run")) + depends_on("bash", type="build") + + conflicts("%gcc@:6", msg="C++14 support required") + + # we need to fix the CXX and LINK paths, as they point to the spack + # wrapper scripts which aren't usable without spack + filter_compiler_wrappers("verilated.mk", relative_root="include") def setup_run_environment(self, env): env.prepend_path("VERILATOR_ROOT", self.prefix) + def autoreconf(self, spec, prefix): + which("bash")("autoconf") + # verilator requires access to its shipped scripts (bin) and include # but the standard make doesn't put it in the correct places @run_before("install") def install_include(self): install_tree("include", prefix.include) install_tree("bin", prefix.bin) - - # we need to fix the CXX and LINK paths, as they point to the spack - # wrapper scripts which aren't usable without spack - @run_after("install") - def patch_cxx(self): - filter_file( - r"^CXX\s*=.*", - "CXX = {0}".format(self.compiler.cxx), - join_path(self.prefix.include, "verilated.mk"), - ) - filter_file( - r"^LINK\s*=.*", - "LINK = {0}".format(self.compiler.cxx), - join_path(self.prefix.include, "verilated.mk"), - ) diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index 6571265d87adf0..dc0cba56c68d5f 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Verrou(AutotoolsPackage): maintainers("HadrienG2") + license("GPL-2.0-only") + version("develop", branch="master") version("2.2.0", sha256="d4ea3d19f0c61329723907b5b145d85776bb702643c1605a31f584484d2c5efc") version("2.1.0", sha256="b1ba49f84aebab15b8ab5649946c9c31b53ad1499f6ffb681c98db41ed28566d") diff --git a/var/spack/repos/builtin/packages/vesta/package.py b/var/spack/repos/builtin/packages/vesta/package.py index d0dd41cf7f8948..4916a973d692b9 100644 --- a/var/spack/repos/builtin/packages/vesta/package.py +++ b/var/spack/repos/builtin/packages/vesta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vgm/package.py b/var/spack/repos/builtin/packages/vgm/package.py index 03c2ec19c8456b..5ec8dd46eb636b 100644 --- a/var/spack/repos/builtin/packages/vgm/package.py +++ b/var/spack/repos/builtin/packages/vgm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Vgm(CMakePackage): maintainer = ["wdconinc"] + license("GPL-3.0-or-later") + version("master", branch="master") version("5-0", sha256="ab929df1aa9b0cda40451f5a98982c3328901865b33e30207ee9b9fe14331344") version("4-8", sha256="4fcd607b4f100fc00a65fec7a5803575daf9d4919d1808bbd6a30be263c001dd") diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py index ebde3f536465e4..d051099a109a55 100644 --- a/var/spack/repos/builtin/packages/videoproto/package.py +++ b/var/spack/repos/builtin/packages/videoproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/viennarna/package.py b/var/spack/repos/builtin/packages/viennarna/package.py index 9091afc9d96899..a0420ed18fb120 100644 --- a/var/spack/repos/builtin/packages/viennarna/package.py +++ b/var/spack/repos/builtin/packages/viennarna/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py index 56b87a6de9af6f..73ea05962684d4 100644 --- a/var/spack/repos/builtin/packages/viewres/package.py +++ b/var/spack/repos/builtin/packages/viewres/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Viewres(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/viewres" xorg_mirror_path = "app/viewres-1.0.4.tar.gz" + license("X11") + version("1.0.7", sha256="5dd63ee19575dd1d40360242ecc1ff96e222d9b80a2b7b8b89e6d1e0f2367d78") version("1.0.6", sha256="2c9f1892dbb5563b704fd06f45cd9d263d8176027033d8438c79a2ceddac200f") version("1.0.5", sha256="9dee5e6b0a18961bb5c33f3f654605d45912087b6ba781cb2277d1941fa35a4b") diff --git a/var/spack/repos/builtin/packages/vifi/package.py b/var/spack/repos/builtin/packages/vifi/package.py index d5d26aedfe7623..8149b678c59d8f 100644 --- a/var/spack/repos/builtin/packages/vifi/package.py +++ b/var/spack/repos/builtin/packages/vifi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Vifi(Package): homepage = "https://github.com/namphuon/ViFi" git = "https://github.com/namphuon/ViFi.git" + license("GPL-3.0-only") + version("master", branch="master") depends_on("perl", type="run") diff --git a/var/spack/repos/builtin/packages/vigra/package.py b/var/spack/repos/builtin/packages/vigra/package.py index a64418d766ec85..6178b1b1a64a2f 100644 --- a/var/spack/repos/builtin/packages/vigra/package.py +++ b/var/spack/repos/builtin/packages/vigra/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Vigra(CMakePackage): "https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz" ) + license("MIT") + version("master", branch="master") version("1.11.1", sha256="a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf") diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py index a5ace95408c3a5..583d12c8f914c7 100644 --- a/var/spack/repos/builtin/packages/vim/package.py +++ b/var/spack/repos/builtin/packages/vim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Vim(AutotoolsPackage): url = "https://github.com/vim/vim/archive/v8.1.0338.tar.gz" maintainers("sethrj") + license("Vim") + version("9.0.0045", sha256="594a31e96e3eda07a358db305de939ca749693b4684de9e027bfa70311b1994d") version( "9.0.0000", diff --git a/var/spack/repos/builtin/packages/virtualgl/package.py b/var/spack/repos/builtin/packages/virtualgl/package.py index 2a991ae9f05715..d7f9330e60ccae 100644 --- a/var/spack/repos/builtin/packages/virtualgl/package.py +++ b/var/spack/repos/builtin/packages/virtualgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Virtualgl(CMakePackage): homepage = "https://www.virtualgl.org/Main/HomePage" url = "http://downloads.sourceforge.net/project/virtualgl/2.5.2/VirtualGL-2.5.2.tar.gz" + license("LGPL-2.1-or-later") + version("2.5.2", sha256="4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238") # This package will only work with libjpeg-turbo, not other jpeg providers diff --git a/var/spack/repos/builtin/packages/virtuoso/package.py b/var/spack/repos/builtin/packages/virtuoso/package.py index 82b597a79fa2ad..806ca826717e7c 100644 --- a/var/spack/repos/builtin/packages/virtuoso/package.py +++ b/var/spack/repos/builtin/packages/virtuoso/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit-cgns/package.py b/var/spack/repos/builtin/packages/visit-cgns/package.py index 6901a7e8f3a46e..c85b86bc998f2a 100644 --- a/var/spack/repos/builtin/packages/visit-cgns/package.py +++ b/var/spack/repos/builtin/packages/visit-cgns/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit-ffp/package.py b/var/spack/repos/builtin/packages/visit-ffp/package.py index b2eff7b7445983..a48b2d5079bf4c 100644 --- a/var/spack/repos/builtin/packages/visit-ffp/package.py +++ b/var/spack/repos/builtin/packages/visit-ffp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit-mfem/package.py b/var/spack/repos/builtin/packages/visit-mfem/package.py index ac4f4b34935153..76c3abf5f23159 100644 --- a/var/spack/repos/builtin/packages/visit-mfem/package.py +++ b/var/spack/repos/builtin/packages/visit-mfem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit-silo/package.py b/var/spack/repos/builtin/packages/visit-silo/package.py index 5fd6df64fb780e..d31402e3f93651 100644 --- a/var/spack/repos/builtin/packages/visit-silo/package.py +++ b/var/spack/repos/builtin/packages/visit-silo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit-unv/package.py b/var/spack/repos/builtin/packages/visit-unv/package.py index 886db76d927aba..3b7063c82647cf 100644 --- a/var/spack/repos/builtin/packages/visit-unv/package.py +++ b/var/spack/repos/builtin/packages/visit-unv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/visit/0001-fix-missing-header-includes-for-QSurfaceFormat.patch b/var/spack/repos/builtin/packages/visit/0001-fix-missing-header-includes-for-QSurfaceFormat.patch new file mode 100644 index 00000000000000..f7c6ebf432d92d --- /dev/null +++ b/var/spack/repos/builtin/packages/visit/0001-fix-missing-header-includes-for-QSurfaceFormat.patch @@ -0,0 +1,76 @@ +From a9f33beccc72e113d95e97b9461e39e87e356d97 Mon Sep 17 00:00:00 2001 +From: Ben Wibking +Date: Sun, 10 Dec 2023 16:42:49 -0500 +Subject: [PATCH] fix missing header includes for QSurfaceFormat + +--- + src/tools/examples/avtexamples/qtviswinExample.C | 1 + + src/tools/examples/avtexamples/qtvtkExample.C | 1 + + src/tools/examples/avtexamples/qvtkopenglExample.C | 1 + + src/tools/examples/mcurvit/main.C | 1 + + src/viewer/main/viewer.C | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/tools/examples/avtexamples/qtviswinExample.C b/src/tools/examples/avtexamples/qtviswinExample.C +index 27c54fcd18..1b8d651c1d 100644 +--- a/src/tools/examples/avtexamples/qtviswinExample.C ++++ b/src/tools/examples/avtexamples/qtviswinExample.C +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + #include // For LIB_VERSION_LE + #if LIB_VERSION_LE(VTK, 8,1,0) +diff --git a/src/tools/examples/avtexamples/qtvtkExample.C b/src/tools/examples/avtexamples/qtvtkExample.C +index 478e9842a9..41e19ff305 100644 +--- a/src/tools/examples/avtexamples/qtvtkExample.C ++++ b/src/tools/examples/avtexamples/qtvtkExample.C +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + #include // For LIB_VERSION_LE + #if LIB_VERSION_LE(VTK,8,1,0) +diff --git a/src/tools/examples/avtexamples/qvtkopenglExample.C b/src/tools/examples/avtexamples/qvtkopenglExample.C +index f25cad6ed2..180c760fca 100644 +--- a/src/tools/examples/avtexamples/qvtkopenglExample.C ++++ b/src/tools/examples/avtexamples/qvtkopenglExample.C +@@ -5,6 +5,7 @@ + #include + + #include ++#include + + #include // For LIB_VERSION_LE + #if LIB_VERSION_LE(VTK, 8,1,0) +diff --git a/src/tools/examples/mcurvit/main.C b/src/tools/examples/mcurvit/main.C +index bc5a54ed73..e877cc0099 100644 +--- a/src/tools/examples/mcurvit/main.C ++++ b/src/tools/examples/mcurvit/main.C +@@ -4,6 +4,7 @@ + + #include + #include ++#include + + #include // For LIB_VERSION_LE + #if LIB_VERSION_LE(VTK, 8,1,0) +diff --git a/src/viewer/main/viewer.C b/src/viewer/main/viewer.C +index ea7e1f3768..7b0b209f46 100644 +--- a/src/viewer/main/viewer.C ++++ b/src/viewer/main/viewer.C +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include + #include +-- +2.43.0 + diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index d26f8b6fa02907..4270c5f3f7ca3d 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -95,6 +95,9 @@ class Visit(CMakePackage): patch("cmake-findvtkh-3.3.patch", when="@3.3.0:3.3.2+vtkm") patch("cmake-findjpeg.patch", when="@3.1.0:3.2.2") patch("cmake-findjpeg-3.3.patch", when="@3.3.0") + # add missing QT header includes for the QSurfaceFormat class + # (needed to fix "incomplete type" compiler errors) + patch("0001-fix-missing-header-includes-for-QSurfaceFormat.patch", when="@3.3.3+gui") # Fix pthread and librt link errors patch("visit32-missing-link-libs.patch", when="@3.2") @@ -167,13 +170,16 @@ class Visit(CMakePackage): depends_on("mfem+shared+exceptions+fms+conduit", when="+mfem") depends_on("libfms@0.2:", when="+mfem") - depends_on("adios2@2.6:", when="+adios2") - depends_on("adios2+hdf5", when="+adios2+hdf5") - depends_on("adios2~hdf5", when="+adios2~hdf5") - depends_on("adios2+mpi", when="+adios2+mpi") - depends_on("adios2~mpi", when="+adios2~mpi") - depends_on("adios2+python", when="+adios2+python") - depends_on("adios2~python", when="+adios2~python") + with when("+adios2"): + depends_on("adios2") + # adios 2.8 removed adios2_taustubs (https://github.com/visit-dav/visit/issues/19209) + depends_on("adios2@:2.7.1") + depends_on("adios2+hdf5", when="+hdf5") + depends_on("adios2~hdf5", when="~hdf5") + depends_on("adios2+mpi", when="+mpi") + depends_on("adios2~mpi", when="~mpi") + depends_on("adios2+python", when="+python") + depends_on("adios2~python", when="~python") # For version 3.3.0 through 3.3.2, we used vtk-h to utilize vtk-m. # For version starting with 3.3.3 we use vtk-m directly. @@ -322,6 +328,9 @@ def cmake_args(self): ] ) + if "+adios2" in spec: + args.extend([self.define("VISIT_ADIOS2_DIR", spec["adios2"].prefix)]) + if "+mfem" in spec: args.extend( [ diff --git a/var/spack/repos/builtin/packages/vite/package.py b/var/spack/repos/builtin/packages/vite/package.py index 94d7cabfd9656f..bf45ae8e66b135 100644 --- a/var/spack/repos/builtin/packages/vite/package.py +++ b/var/spack/repos/builtin/packages/vite/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Vite(CMakePackage): maintainers("trahay") git = "https://gitlab.inria.fr/solverstack/vite.git" + license("CECILL-2.0") + version("master", branch="master") depends_on("cmake@3.1:", type="build") diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py index 99899d3d525c49..747a2900dccccc 100644 --- a/var/spack/repos/builtin/packages/vizglow/package.py +++ b/var/spack/repos/builtin/packages/vizglow/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vmatch/package.py b/var/spack/repos/builtin/packages/vmatch/package.py index 4f48173d840988..e5778416c0d073 100644 --- a/var/spack/repos/builtin/packages/vmatch/package.py +++ b/var/spack/repos/builtin/packages/vmatch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vmc/package.py b/var/spack/repos/builtin/packages/vmc/package.py index 93df47137e6aa9..683f58c350af51 100644 --- a/var/spack/repos/builtin/packages/vmc/package.py +++ b/var/spack/repos/builtin/packages/vmc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Vmc(CMakePackage): maintainers("ChristianTackeGSI") + license("GPL-3.0-only") + version("2-0", sha256="9f4c31d93eeb0e10eca22d6450bb9a1070cbe25e99eaf7e74d4e191612102d9c") version("1-1-p1", sha256="dc0d4d16c81899c0167bcd13b97e39d9ff2817d20552f61e1c0bce357ac69ee5") version("1-0-p3", sha256="46385776d7639fdf23df2a2a5426fb9a9a69836d237c1259b1a22bfb649cb47e") diff --git a/var/spack/repos/builtin/packages/vmd/package.py b/var/spack/repos/builtin/packages/vmd/package.py index 922344b7027532..f4986e0c6d4ff4 100644 --- a/var/spack/repos/builtin/packages/vmd/package.py +++ b/var/spack/repos/builtin/packages/vmd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/volk/package.py b/var/spack/repos/builtin/packages/volk/package.py index c965c715421ce3..601c5190c301d3 100644 --- a/var/spack/repos/builtin/packages/volk/package.py +++ b/var/spack/repos/builtin/packages/volk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -27,6 +27,8 @@ class Volk(CMakePackage): maintainers("aweits") + license("GPL-3.0-or-later") + version("2.3.0", sha256="f42c928f561b128acfe4adb21227e4a62a3f6ab8103592fc3233765ff326d5fc") depends_on("python@3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py index feb505a44028ee..5a07ef7130673a 100644 --- a/var/spack/repos/builtin/packages/voropp/package.py +++ b/var/spack/repos/builtin/packages/voropp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Voropp(MakefilePackage): variant("pic", default=True, description="Position independent code") + license("BSD-3-Clause-LBNL") + version("0.4.6", sha256="ef7970071ee2ce3800daa8723649ca069dc4c71cc25f0f7d22552387f3ea437e") def edit(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py index 1d8ef683c74401..188264df360ef1 100644 --- a/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py +++ b/var/spack/repos/builtin/packages/votca-csg-tutorials/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index 28648f2bdf6345..04ad3d39e51750 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca-csgapps/package.py b/var/spack/repos/builtin/packages/votca-csgapps/package.py index bb2bbdc630d6f2..2654417761a2cd 100644 --- a/var/spack/repos/builtin/packages/votca-csgapps/package.py +++ b/var/spack/repos/builtin/packages/votca-csgapps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca-ctp/package.py b/var/spack/repos/builtin/packages/votca-ctp/package.py index 59f07c33dcb507..e1846fe900ff7e 100644 --- a/var/spack/repos/builtin/packages/votca-ctp/package.py +++ b/var/spack/repos/builtin/packages/votca-ctp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 1ea528c0630b2f..bb47d42a67c345 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca-xtp/package.py b/var/spack/repos/builtin/packages/votca-xtp/package.py index 345b7f3e7d6719..5276740f710e2d 100644 --- a/var/spack/repos/builtin/packages/votca-xtp/package.py +++ b/var/spack/repos/builtin/packages/votca-xtp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/votca/package.py b/var/spack/repos/builtin/packages/votca/package.py index db9d260f86530d..e0edcfefc954c9 100644 --- a/var/spack/repos/builtin/packages/votca/package.py +++ b/var/spack/repos/builtin/packages/votca/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Votca(CMakePackage): maintainers("junghans") version("master", branch="master") + version("2024", sha256="7f342e857f4a6ba6d25937f63830afa3c32cbd906255c8d78aa6c500cfd418c8") + version("2023", sha256="6150a38c77379d05592a56ae4392a00c4636d02198bb06108a3dc739a45115f8") version("2022.1", sha256="358119b2645fe60f88ca621aed508c49fb61f88d29d3e3fa24b5b831ed4a66ec") version("2022", sha256="7991137098ff4511f4ca2c6f1b6c45f53d92d9f84e5c0d0e32fbc31768f73a83") diff --git a/var/spack/repos/builtin/packages/vpfft/package.py b/var/spack/repos/builtin/packages/vpfft/package.py index 93ea6ed0b43fdc..e2b09e2dc24e05 100644 --- a/var/spack/repos/builtin/packages/vpfft/package.py +++ b/var/spack/repos/builtin/packages/vpfft/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Vpfft(MakefilePackage): tag = ["proxy-app"] + license("BSD-3-Clause") + version("develop") depends_on("eigen") diff --git a/var/spack/repos/builtin/packages/vpic/package.py b/var/spack/repos/builtin/packages/vpic/package.py index 2c9a7db86295be..c51eaf3cb2fea6 100644 --- a/var/spack/repos/builtin/packages/vpic/package.py +++ b/var/spack/repos/builtin/packages/vpic/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Vpic(CMakePackage): homepage = "https://github.com/lanl/vpic" git = "https://github.com/lanl/vpic.git" + license("BSD-3-Clause") + version("develop", branch="master", submodules=True) depends_on("cmake@3.1:", type="build") diff --git a/var/spack/repos/builtin/packages/vsearch/package.py b/var/spack/repos/builtin/packages/vsearch/package.py index 0c28ce5a2b88a7..29c9f563d47033 100644 --- a/var/spack/repos/builtin/packages/vsearch/package.py +++ b/var/spack/repos/builtin/packages/vsearch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Vsearch(AutotoolsPackage): url = "https://github.com/torognes/vsearch/archive/v2.4.3.tar.gz" maintainers("snehring") + license("GPL-3.0-only") + version("2.22.1", sha256="c62bf69e7cc3d011a12e3b522ba8c0c91fb90deea782359e9569677d0c991778") version("2.14.1", sha256="388529a39eb0618a09047bf91e0a8ae8c9fd851a05f8d975e299331748f97741") version("2.13.3", sha256="e5f34ece28b76403d3ba4a673eca41178fe399c35a1023dbc87d0c0da5efaa52") diff --git a/var/spack/repos/builtin/packages/vsftpd/package.py b/var/spack/repos/builtin/packages/vsftpd/package.py index 2f91840ce5566d..33d197d039038a 100644 --- a/var/spack/repos/builtin/packages/vsftpd/package.py +++ b/var/spack/repos/builtin/packages/vsftpd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Vsftpd(MakefilePackage): homepage = "https://security.appspot.com/vsftpd.html" url = "https://security.appspot.com/downloads/vsftpd-3.0.3.tar.gz" + license("GPL-2.0-only") + version("3.0.3", sha256="9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7") version("3.0.2", sha256="be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56") version("3.0.1", sha256="65487a9fccc0ae566df5999a84448a9ccb57b556b7643ffd345540299487784c") diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py index 284fa50be01026..9a4d34449c6608 100644 --- a/var/spack/repos/builtin/packages/vt/package.py +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vtable-dumper/package.py b/var/spack/repos/builtin/packages/vtable-dumper/package.py index e3481b29b332ac..7be75560d0400d 100644 --- a/var/spack/repos/builtin/packages/vtable-dumper/package.py +++ b/var/spack/repos/builtin/packages/vtable-dumper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class VtableDumper(MakefilePackage): homepage = "https://github.com/lvc/vtable-dumper" url = "https://github.com/lvc/vtable-dumper/archive/1.2.tar.gz" + license("GPL-2.0-only") + version("1.2", sha256="6993781b6a00936fc5f76dc0db4c410acb46b6d6e9836ddbe2e3c525c6dd1fd2") version("1.1", sha256="f0a57a7b82a0a56845cea9ab56ad449e63f5f01c6a0c9f1467efa4ef60dd4a93") version("1.0", sha256="a222de5a19bf716ab2f35148f43bbf8a052772b54ff622c6387a4ba2440fb9a0") diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 322fc411624877..9a159e4e0bdd1c 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/vtk-m/mr3160-rocthrust-fix.patch b/var/spack/repos/builtin/packages/vtk-m/mr3160-rocthrust-fix.patch new file mode 100644 index 00000000000000..174347033b3f45 --- /dev/null +++ b/var/spack/repos/builtin/packages/vtk-m/mr3160-rocthrust-fix.patch @@ -0,0 +1,74 @@ +From c9ec6ae6a62b9bd257e727e999987ef31384e3ac Mon Sep 17 00:00:00 2001 +From: Vicente Adolfo Bolea Sanchez +Date: Thu, 30 Nov 2023 15:55:32 -0500 +Subject: [PATCH] kokkos: let link vtkm_cont to roc::rocthrust + +Also reorder the declarion of the option VTKm_ENABLE_KOKKOS_THRUST +to be set before calling VTKmDeviceAdapters. +--- + CMake/VTKmDeviceAdapters.cmake | 5 +---- + CMakeLists.txt | 10 +++++----- + vtkm/cont/kokkos/internal/CMakeLists.txt | 3 +++ + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake +index fb13d0bf85..7b8bf2df9b 100644 +--- a/CMake/VTKmDeviceAdapters.cmake ++++ b/CMake/VTKmDeviceAdapters.cmake +@@ -360,10 +360,7 @@ if(VTKm_ENABLE_KOKKOS AND NOT TARGET vtkm_kokkos) + + # Make sure rocthrust is available if requested + if(VTKm_ENABLE_KOKKOS_THRUST) +- find_package(rocthrust) +- if(NOT rocthrust_FOUND) +- message(FATAL_ERROR "rocthrust not found. Please set VTKm_ENABLE_KOKKOS_THRUST to OFF.") +- endif() ++ find_package(rocthrust REQUIRED CONFIG) + endif() + endif() + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39a9b3bc09..d8204114c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,6 +191,11 @@ vtkm_option(VTKm_OVERRIDE_CTEST_TIMEOUT "Disable default ctest timeout" OFF) + # VTKm_ENABLE_MPI=ON. + cmake_dependent_option(VTKm_ENABLE_GPU_MPI "Enable GPU AWARE MPI support" OFF "VTKm_ENABLE_MPI" OFF) + ++# By default: Set VTKm_ENABLE_KOKKOS_THRUST to ON if VTKm_ENABLE_KOKKOS is ON, otherwise ++# disable it (or if the user explicitly turns this option OFF) ++cmake_dependent_option(VTKm_ENABLE_KOKKOS_THRUST "Enable Kokkos thrust support (only valid with CUDA and HIP)" ++ ON "VTKm_ENABLE_KOKKOS;Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_HIP" OFF) ++ + mark_as_advanced( + VTKm_ENABLE_LOGGING + VTKm_NO_ASSERT +@@ -232,11 +237,6 @@ include(VTKmBuildType) + # Include the vtk-m wrappers + include(VTKmWrappers) + +-# By default: Set VTKm_ENABLE_KOKKOS_THRUST to ON if VTKm_ENABLE_KOKKOS is ON, otherwise +-# disable it (or if the user explicitly turns this option OFF) +-cmake_dependent_option(VTKm_ENABLE_KOKKOS_THRUST "Enable Kokkos thrust support (only valid with CUDA and HIP)" +- ON "VTKm_ENABLE_KOKKOS;Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_HIP" OFF) +- + # Create vtkm_compiler_flags library. This is an interface library that + # holds all the C++ compiler flags that are needed for consumers and + # when building VTK-m. +diff --git a/vtkm/cont/kokkos/internal/CMakeLists.txt b/vtkm/cont/kokkos/internal/CMakeLists.txt +index 9f924b0f4b..9b731c9fdd 100644 +--- a/vtkm/cont/kokkos/internal/CMakeLists.txt ++++ b/vtkm/cont/kokkos/internal/CMakeLists.txt +@@ -34,6 +34,9 @@ if (TARGET vtkm_kokkos) + elseif(TARGET vtkm_kokkos_hip) + set_source_files_properties(${sources} TARGET_DIRECTORY vtkm_cont PROPERTIES LANGUAGE HIP) + kokkos_compilation(SOURCE ${sources}) ++ if (VTKm_ENABLE_KOKKOS_THRUST) ++ target_link_libraries(vtkm_cont INTERFACE roc::rocthrust) ++ endif() + endif() + + else() +-- +2.35.3 + diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py index ce58cc1d6f0ad7..6c7e3cda9dfc5c 100644 --- a/var/spack/repos/builtin/packages/vtk-m/package.py +++ b/var/spack/repos/builtin/packages/vtk-m/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,12 +29,12 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage): version("master", branch="master") version("release", branch="release") - version("2.1.0-rc2", sha256="94631fff9f668f40c9c797f03cf32a0d22d57111e309b1e8133c2a3f292b4af1") version( - "2.0.0", - sha256="32643cf3564fa77f8e2a2a5456a574b6b2355bb68918eb62ccde493993ade1a3", + "2.1.0", + sha256="9cf3522b6dc0675281a1a16839464ebd1cc5f9c08c20eabee1719b3bcfdcf41f", preferred=True, ) + version("2.0.0", sha256="32643cf3564fa77f8e2a2a5456a574b6b2355bb68918eb62ccde493993ade1a3") version("1.9.0", sha256="12355dea1a24ec32767260068037adeb71abb3df2f9f920c92ce483f35ff46e4") version("1.8.0", sha256="fcedee6e8f4ac50dde56e8c533d48604dbfb663cea1561542a837e8e80ba8768") version("1.7.1", sha256="7ea3e945110b837a8c2ba49b41e45e1a1d8d0029bb472b291f7674871dbbbb63") @@ -55,12 +55,6 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage): variant("doubleprecision", default=True, description="enable double precision") variant("logging", default=False, when="@1.3:", description="build logging support") - variant( - "ascent_types", - default=True, - when="~64bitids", - description="build support for ascent types", - ) variant( "virtuals", default=False, @@ -123,6 +117,8 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage): ) depends_on("hip@3.7:", when="+rocm") + # CUDA thrust is already include in the CUDA pkg + depends_on("rocthrust", when="@2.1: +kokkos+rocm") # The rocm variant is only valid options for >= 1.7. It would be better if # this could be expressed as a when clause to disable the rocm variant, @@ -147,6 +143,10 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage): # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972 patch("vtkm-cuda-swap-conflict-pr2972.patch", when="@1.9 +cuda ^cuda@12:") + # VTK-M PR#3160 + # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3160 + patch("mr3160-rocthrust-fix.patch", when="@2.1:") + def cmake_args(self): spec = self.spec options = [] @@ -182,8 +182,10 @@ def cmake_args(self): self.define_from_variant("VTKm_INSTALL_EXAMPLES", "examples"), self.define_from_variant("VTKm_NO_DEPRECATED_VIRTUAL", "virtuals"), self.define_from_variant("VTKm_USE_64BIT_IDS", "64bitids"), - self.define_from_variant("VTKm_USE_DEFAULT_TYPES_FOR_ASCENT", "ascent_types"), self.define_from_variant("VTKm_USE_DOUBLE_PRECISION", "doubleprecision"), + self.define( + "VTKm_USE_DEFAULT_TYPES_FOR_ASCENT", "~64bitids +doubleprecision" in spec + ), ] if "+tbb" in spec: diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index d73bb332594ea4..38863fdcc385b3 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Vtk(CMakePackage): maintainers("chuckatkins", "danlipsa") + license("BSD-3-Clause") + version("9.2.6", sha256="06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12") version("9.2.2", sha256="1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075") version("9.1.0", sha256="8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96") @@ -54,6 +56,7 @@ class Vtk(CMakePackage): variant("xdmf", default=False, description="Build XDMF file support") variant("ffmpeg", default=False, description="Build with FFMPEG support") variant("mpi", default=True, description="Enable MPI support") + variant("examples", default=False, description="Enable building & installing the VTK examples") patch("gcc.patch", when="@6.1.0") # patch to fix some missing stl includes @@ -67,7 +70,8 @@ class Vtk(CMakePackage): # Patch for paraview 5.10: +hdf5 ^hdf5@1.13.2: # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9690 - patch("xdmf2-hdf51.13.2.patch", when="@9:9.2 +xdmf") + # patch seems to effectively been added to vtk@9.2.3 (e81a2fe) + patch("xdmf2-hdf51.13.2.patch", when="@9:9.2.2 +xdmf") # We cannot build with both osmesa and qt in spack conflicts("+osmesa", when="+qt") @@ -150,7 +154,7 @@ class Vtk(CMakePackage): depends_on("lz4") depends_on("netcdf-c~mpi", when="~mpi") depends_on("netcdf-c+mpi", when="+mpi") - depends_on("netcdf-cxx") + depends_on("netcdf-cxx4", when="@:8.1.2") depends_on("libpng") depends_on("libtiff") depends_on("zlib-api") @@ -306,8 +310,6 @@ def cmake_args(self): # Enable/Disable wrappers for Python. if "+python" in spec: cmake_args.append("-DVTK_WRAP_PYTHON=ON") - if spec.satisfies("@:8"): - cmake_args.append("-DPYTHON_EXECUTABLE={0}".format(spec["python"].command.path)) if "+mpi" in spec and spec.satisfies("@:8"): cmake_args.append("-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON") if spec.satisfies("@9.0.0: ^python@3:"): @@ -471,4 +473,6 @@ def cmake_args(self): ] ) + cmake_args.append(self.define_from_variant("VTK_BUILD_EXAMPLES", "examples")) + return cmake_args diff --git a/var/spack/repos/builtin/packages/vvtest/package.py b/var/spack/repos/builtin/packages/vvtest/package.py index f9b1a0c0f66285..8bc51b502204f1 100644 --- a/var/spack/repos/builtin/packages/vvtest/package.py +++ b/var/spack/repos/builtin/packages/vvtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Vvtest(Package): git = "https://github.com/rrdrake/vvtest.git" maintainers("mrmundt", "rrdrake") + license("Unlicense") + version("1.2.0", sha256="d6b2432a2e6c43fb0d87ffc0eaa34a74d2268a732f7709ebdcf1344fbcaee154") version("1.1.0", sha256="674585f12d393ab9745a5ab26f59cb0f0e213f9c597b37467125979b5955ca79") version("1.0.0", sha256="acd04e8e6635ed1b1725b793e8287a58831d6380759a81159142a6ff3397a8dd") diff --git a/var/spack/repos/builtin/packages/w3emc/package.py b/var/spack/repos/builtin/packages/w3emc/package.py index 335e9caa5e6fa8..f27000dbda3033 100644 --- a/var/spack/repos/builtin/packages/w3emc/package.py +++ b/var/spack/repos/builtin/packages/w3emc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/w3m/package.py b/var/spack/repos/builtin/packages/w3m/package.py index fd4814a5dc870c..80aa64adca3415 100644 --- a/var/spack/repos/builtin/packages/w3m/package.py +++ b/var/spack/repos/builtin/packages/w3m/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -25,6 +25,8 @@ class W3m(AutotoolsPackage): url = "https://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz" maintainers("ronin_gw") + license("MIT") + version("0.5.3", sha256="e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3") # mandatory dependency diff --git a/var/spack/repos/builtin/packages/w3nco/package.py b/var/spack/repos/builtin/packages/w3nco/package.py index c42637bac0bbfa..90228e315f5c1f 100644 --- a/var/spack/repos/builtin/packages/w3nco/package.py +++ b/var/spack/repos/builtin/packages/w3nco/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wannier90/package.py b/var/spack/repos/builtin/packages/wannier90/package.py index f20333581e6056..8bb4310893611c 100644 --- a/var/spack/repos/builtin/packages/wannier90/package.py +++ b/var/spack/repos/builtin/packages/wannier90/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -19,6 +19,8 @@ class Wannier90(MakefilePackage): url = "https://github.com/wannier-developers/wannier90/archive/v3.1.0.tar.gz" git = "https://github.com/wannier-developers/wannier90.git" + license("GPL-2.0-or-later") + version("develop", branch="develop") version("3.1.0", sha256="40651a9832eb93dec20a8360dd535262c261c34e13c41b6755fa6915c936b254") version("3.0.0", sha256="f196e441dcd7b67159a1d09d2d7de2893b011a9f03aab6b30c4703ecbf20fe5b") diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py index ab883f2c8fcb9d..1b9cc4b727ac0f 100644 --- a/var/spack/repos/builtin/packages/warpx/package.py +++ b/var/spack/repos/builtin/packages/warpx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Warpx(CMakePackage): maintainers("ax3l", "dpgrote", "MaxThevenet", "RemiLehe") tags = ["e4s", "ecp"] + license("BSD-3-Clause-LBNL") + # NOTE: if you update the versions here, also see py-warpx version("develop", branch="development") version("23.08", sha256="67695ff04b83d1823ea621c19488e54ebaf268532b0e5eb4ea8ad293d7ab3ddc") diff --git a/var/spack/repos/builtin/packages/watch/package.py b/var/spack/repos/builtin/packages/watch/package.py index 000bb81905a9b2..5b8712599f2d43 100644 --- a/var/spack/repos/builtin/packages/watch/package.py +++ b/var/spack/repos/builtin/packages/watch/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Watch(AutotoolsPackage): homepage = "https://gitlab.com/procps-ng/procps" git = "https://gitlab.com/procps-ng/procps.git" + license("GPL-2.0-or-later") + version("master", branch="master") version("3.3.15", tag="v3.3.15", commit="7bb949bcba13c107fa0f45d2d0298b1ad6b6d6cc") diff --git a/var/spack/repos/builtin/packages/wayland-protocols/package.py b/var/spack/repos/builtin/packages/wayland-protocols/package.py index f5168941514169..5fd0ab5ac86e07 100644 --- a/var/spack/repos/builtin/packages/wayland-protocols/package.py +++ b/var/spack/repos/builtin/packages/wayland-protocols/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,6 +26,8 @@ class WaylandProtocols(MesonPackage, AutotoolsPackage): default="meson", ) + license("MIT") + version("1.31", sha256="04d3f66eca99d638ec8dbfdfdf79334290e22028f7d0b04c7034d9ef18a3248a") version("1.30", sha256="1c02ce27d5267c904f2f0d31039265f3e4112f15bf274b1c72bdacd5322f243d") version("1.29", sha256="4a85786ae69cd6d53bbe9278572f3c3d6ea342875ea444960edb6089237c3a18") diff --git a/var/spack/repos/builtin/packages/wayland/package.py b/var/spack/repos/builtin/packages/wayland/package.py index baee2fcc817433..7b0d7eb3fb7250 100644 --- a/var/spack/repos/builtin/packages/wayland/package.py +++ b/var/spack/repos/builtin/packages/wayland/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -29,6 +29,8 @@ class Wayland(MesonPackage, AutotoolsPackage): variant("doc", default=False, description="Build documentation") + license("MIT") + version("1.22.0", sha256="bbca9c906a8fb8992409ebf51812f19e2a784b2c169d4b784cdd753b4bb448ef") version("1.21.0", sha256="53b7fa67142e653820030ec049971bcb5e84ac99e05cba5bcb9cb55f43fae4b3") version("1.20.0", sha256="20523cd6f2c18c3c86725467157c6221e19de76fbfad944042a2d494af3c7a92") diff --git a/var/spack/repos/builtin/packages/wcs/package.py b/var/spack/repos/builtin/packages/wcs/package.py index 59354dcb9e11d4..0070396347acec 100644 --- a/var/spack/repos/builtin/packages/wcs/package.py +++ b/var/spack/repos/builtin/packages/wcs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Wcs(CMakePackage): git = "https://github.com/LLNL/wcs.git" maintainers("rblake-llnl") + license("MIT") + version("master", branch="master") version("develop", branch="devel") diff --git a/var/spack/repos/builtin/packages/wcslib/package.py b/var/spack/repos/builtin/packages/wcslib/package.py index e4dbf20f13a757..49b4aff75d6c25 100644 --- a/var/spack/repos/builtin/packages/wcslib/package.py +++ b/var/spack/repos/builtin/packages/wcslib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Wcslib(AutotoolsPackage): homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/" url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.3.tar.bz2" + license("LGPL-3.0-or-later") + version("7.3", sha256="4b01cf425382a26ca4f955ed6841a5f50c55952a2994367f8e067e4183992961") version("6.4", sha256="13c11ff70a7725563ec5fa52707a9965fce186a1766db193d08c9766ea107000") diff --git a/var/spack/repos/builtin/packages/webbench/package.py b/var/spack/repos/builtin/packages/webbench/package.py index ddb5e44d0b51b4..eaf47ee8d8ee29 100644 --- a/var/spack/repos/builtin/packages/webbench/package.py +++ b/var/spack/repos/builtin/packages/webbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Webbench(MakefilePackage): homepage = "http://home.tiscali.cz/~cz210552/webbench.html" git = "https://github.com/EZLippi/WebBench.git" + license("GPL-3.0-or-later") + version("1.5", commit="b1acf3c01cc914729fe188dfc8ed761858028d4f") depends_on("ntirpc") diff --git a/var/spack/repos/builtin/packages/weechat/package.py b/var/spack/repos/builtin/packages/weechat/package.py index 9410c181544452..c93b9658319591 100644 --- a/var/spack/repos/builtin/packages/weechat/package.py +++ b/var/spack/repos/builtin/packages/weechat/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Weechat(CMakePackage): homepage = "https://weechat.org" url = "https://weechat.org/files/src/weechat-2.9.tar.gz" + license("GPL-3.0-or-later") + version("2.9", sha256="3a78063b76c42ba306eacf8f74cb8c9a260f8a61d1915d0b5d76f11d2be69a53") variant("perl", default=False, description="Include perl support") diff --git a/var/spack/repos/builtin/packages/weighttp/package.py b/var/spack/repos/builtin/packages/weighttp/package.py index 3f392be5980ab0..d27a8c070fbd35 100644 --- a/var/spack/repos/builtin/packages/weighttp/package.py +++ b/var/spack/repos/builtin/packages/weighttp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Weighttp(AutotoolsPackage): homepage = "https://weighttp.lighttpd.net/" url = "https://github.com/lighttpd/weighttp/archive/weighttp-0.4.tar.gz" + license("MIT") + version("0.4", sha256="b4954f2a1eca118260ffd503a8e3504dd32942e2e61d0fa18ccb6b8166594447") version("0.3", sha256="376e2311af2decb8f6051e4f968d7c0ba92ca60cd563d768beb4868eb9679f45") version("0.2", sha256="bc2b3955126010ce27e0829285720f973df9f144e9cca2568569a657a3d5e634") diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 5e0dad3573239b..8c55c7aafadd14 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Wget(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/wget/" gnu_mirror_path = "wget/wget-1.19.1.tar.gz" + license("GPL-3.0-or-later WITH OpenSSL-Exception") + version("1.21.3", sha256="5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5") version("1.21.2", sha256="e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497") version("1.21.1", sha256="59ba0bdade9ad135eda581ae4e59a7a9f25e3a4bde6a5419632b31906120e26e") diff --git a/var/spack/repos/builtin/packages/wgl/package.py b/var/spack/repos/builtin/packages/wgl/package.py index 2f772b0f82cdc9..17be11243d8899 100644 --- a/var/spack/repos/builtin/packages/wgl/package.py +++ b/var/spack/repos/builtin/packages/wgl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wgrib2/package.py b/var/spack/repos/builtin/packages/wgrib2/package.py index 45bbb2daa7948d..31ad67e59c368d 100644 --- a/var/spack/repos/builtin/packages/wgrib2/package.py +++ b/var/spack/repos/builtin/packages/wgrib2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wgsim/package.py b/var/spack/repos/builtin/packages/wgsim/package.py index f142338d4c57ac..f2a6d25535b30b 100644 --- a/var/spack/repos/builtin/packages/wgsim/package.py +++ b/var/spack/repos/builtin/packages/wgsim/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/which/package.py b/var/spack/repos/builtin/packages/which/package.py index 30ab0690403aa8..1c36d3ed396309 100644 --- a/var/spack/repos/builtin/packages/which/package.py +++ b/var/spack/repos/builtin/packages/which/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Which(AutotoolsPackage): homepage = "https://savannah.gnu.org/projects/which/" url = "https://ftp.gnu.org/gnu/which/which-2.21.tar.gz" + license("GPL-3.0") + version("2.21", sha256="f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad") executables = ["which"] diff --git a/var/spack/repos/builtin/packages/whip/package.py b/var/spack/repos/builtin/packages/whip/package.py index a269097ad6bc8f..138ce77477831f 100644 --- a/var/spack/repos/builtin/packages/whip/package.py +++ b/var/spack/repos/builtin/packages/whip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Whip(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/eth-cscs/whip.git" maintainers("msimberg", "rasolca") + license("BSD-3-Clause") + version("main", branch="main") version("0.2.0", sha256="d8fec662526accbd1624922fdf01a077d6f312cf253382660e4a2f65e28e8686") version("0.1.0", sha256="5d557794f4afc8332fc660948a342f69e22bc9e5d575ffb3e3944cf526db5ec9") diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index 3297c2eddbe5f1..57241cd6cf1819 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Whizard(AutotoolsPackage): maintainers("vvolkl") + license("GPL-2.0-or-later") + version("master", branch="master") version("3.1.2", sha256="4f706f8ef02a580ae4dba867828691dfe0b3f9f9b8982b617af72eb8cd4c6fa3") version("3.1.1", sha256="dd48e4e39b8a4990be47775ec6171f89d8147cb2e9e293afc7051a7dbc5a23ef") @@ -99,12 +101,21 @@ class Whizard(AutotoolsPackage): ) def setup_build_environment(self, env): + # whizard uses some environment variables to detect dependencies at + # configure time if they are not installed to standard system prefixes + if self.spec.satisfies("+lcio"): + env.set("LCIO", self.spec["lcio"].prefix) + if self.spec.satisfies("hepmc=2"): + env.set("HEPMC_DIR", self.spec["hepmc"].prefix) + if self.spec.satisfies("hepmc=3"): + env.set("HEPMC_DIR", self.spec["hepmc3"].prefix) + if self.spec.satisfies("+openloops"): + env.set("OPENLOOPS_DIR", self.spec["openloops"].prefix) + # whizard uses the compiler during runtime, # and seems incompatible with # filter_compiler_wrappers, thus the # actual compilers need to be used to build - if self.spec.satisfies("+lcio"): - env.set("LCIO", self.spec["lcio"].prefix) env.set("CC", self.compiler.cc) env.set("CXX", self.compiler.cxx) env.set("FC", self.compiler.fc) @@ -112,30 +123,25 @@ def setup_build_environment(self, env): def configure_args(self): spec = self.spec + enable_hepmc = "no" if "hepmc=off" in spec else "yes" args = [ - "TIRPC_CFLAGS=-I%s" % spec["libtirpc"].prefix.include.tirpc, - f"TIRPC_LIBS= -L{spec['libtirpc'].prefix.lib} -ltirpc", - "--enable-hepmc=%s" % ("no" if "hepmc=off" in spec else "yes"), - "--enable-fastjet=%s" % ("yes" if "+fastjet" in spec else "no"), - "--enable-pythia8=%s" % ("yes" if "+pythia8" in spec else "no"), - "--enable-lcio=%s" % ("yes" if "+lcio" in spec else "no"), - "--enable-lhapdf=%s" % ("yes" if "+lhapdf" in spec else "no"), - "--enable-openloops=%s" % ("yes" if "+openloops" in spec else "no"), + f"TIRPC_CFLAGS=-I{spec['libtirpc'].prefix.include.tirpc}", + f"TIRPC_LIBS=-L{spec['libtirpc'].prefix.lib} -ltirpc", + f"--enable-hepmc={enable_hepmc}", # todo: hoppet # todo: recola # todo: looptools # todo: gosam # todo: pythia6 ] + args.extend(self.enable_or_disable("fastjet")) + args.extend(self.enable_or_disable("pythia8")) + args.extend(self.enable_or_disable("lcio")) + args.extend(self.enable_or_disable("lhapdf")) + args.extend(self.enable_or_disable("openloops")) if "+openloops" in spec: - args.append("--with-openloops=%s" % spec["openloops"].prefix) - if "+lcio" in spec: - args.append("--with-lcio=%s" % spec["lcio"].prefix) - if "hepmc=3" in spec: - args.append("--with-hepmc=%s" % spec["hepmc3"].prefix) - if "hepmc=2" in spec: - args.append("--with-hepmc=%s" % spec["hepmc"].prefix) + args.append(f"--with-openloops={spec['openloops'].prefix}") if "+openmp" not in spec: args.append("--disable-openmp") return args diff --git a/var/spack/repos/builtin/packages/wi4mpi/package.py b/var/spack/repos/builtin/packages/wi4mpi/package.py index 17ab885d46bd5d..808dc1d08bc5da 100644 --- a/var/spack/repos/builtin/packages/wi4mpi/package.py +++ b/var/spack/repos/builtin/packages/wi4mpi/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Wi4mpi(CMakePackage): url = "https://github.com/cea-hpc/wi4mpi/archive/v3.4.1.tar.gz" maintainers("adrien-cotte", "marcjoos-cea") + license("CECILL-B") + version("3.6.4", sha256="be1732a1aed1e2946873951a344b572f11f2a55cd06c634580a9398b5877e22a") version("3.6.3", sha256="c327babc892cc3c2bdddfacf3011e6fcb7e00a04e814de31f5e707cba3199c5c") version("3.6.2", sha256="4b784d27decfff9cbd29f072ba75bb0f6c471d6edc7f1037df1ab7ccbcceffba") diff --git a/var/spack/repos/builtin/packages/win-sdk/package.py b/var/spack/repos/builtin/packages/win-sdk/package.py index e40b85898c161c..3c96fb1a9161c8 100644 --- a/var/spack/repos/builtin/packages/win-sdk/package.py +++ b/var/spack/repos/builtin/packages/win-sdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/win-wdk/package.py b/var/spack/repos/builtin/packages/win-wdk/package.py index 07f2a5901877dc..8bf9f5b9d0a1d2 100644 --- a/var/spack/repos/builtin/packages/win-wdk/package.py +++ b/var/spack/repos/builtin/packages/win-wdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -133,7 +133,7 @@ def install(self, spec, prefix): except ProcessError as pe: reg = winreg.WindowsRegistryView( "SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", - root_key=spack.util.windows_registry.HKEY_LOCAL_MACHINE, + root_key=spack.util.windows_registry.HKEY.HKEY_LOCAL_MACHINE, ) if not reg: # No Kits are available, failure was genuine diff --git a/var/spack/repos/builtin/packages/winbison/package.py b/var/spack/repos/builtin/packages/winbison/package.py index ebf50267b16e4a..877188c0cd5d17 100644 --- a/var/spack/repos/builtin/packages/winbison/package.py +++ b/var/spack/repos/builtin/packages/winbison/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Winbison(CMakePackage): executables = [r"^bison(.*)?$"] + license("GFDL-1.3-only") + version("2.5.25", sha256="8e1b71e037b524ba3f576babb0cf59182061df1f19cd86112f085a882560f60b") version("2.5.24", sha256="a49d6e310636e3487e1e066e411d908cfeae2d5b5fde1f3cf74fe1d6d4301062") version("2.5.23", sha256="445bd1bcb90e0c84e97f6e44de76869f8e778c60ddbd7c39a7b2142f8ba43e61") diff --git a/var/spack/repos/builtin/packages/windowswmproto/package.py b/var/spack/repos/builtin/packages/windowswmproto/package.py index d31ae01accea00..6b4b49b72388d2 100644 --- a/var/spack/repos/builtin/packages/windowswmproto/package.py +++ b/var/spack/repos/builtin/packages/windowswmproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wiredtiger/package.py b/var/spack/repos/builtin/packages/wiredtiger/package.py index f03f2c267e85e2..23675d7713b9e5 100644 --- a/var/spack/repos/builtin/packages/wiredtiger/package.py +++ b/var/spack/repos/builtin/packages/wiredtiger/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index 9114d35ad9a465..129677f177b435 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Wireshark(CMakePackage): homepage = "https://www.wireshark.org" url = "https://www.wireshark.org/download/src/all-versions/wireshark-2.6.0.tar.xz" + license("GPL-2.0-or-later") + version("3.2.1", sha256="589f640058d6408ebbd695a80ebbd6e7bd99d8db64ecda253d27100dfd27e85b") version("3.2.0", sha256="4cfd33a19a454ff4002243e9d04d6afd64280a109a21ae652a192f2be2b1b66c") version("3.1.0", sha256="a7b54f9e35fc69291dcac5104ecbef8260534a75dec5b8105605b6c423fd3de3") diff --git a/var/spack/repos/builtin/packages/wise2/package.py b/var/spack/repos/builtin/packages/wise2/package.py index 153305896befc8..8a0a8b11de1fba 100644 --- a/var/spack/repos/builtin/packages/wise2/package.py +++ b/var/spack/repos/builtin/packages/wise2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wonton/package.py b/var/spack/repos/builtin/packages/wonton/package.py index 47367fdd31c5a1..6a6dcf0482391a 100644 --- a/var/spack/repos/builtin/packages/wonton/package.py +++ b/var/spack/repos/builtin/packages/wonton/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -22,6 +22,8 @@ class Wonton(CMakePackage): maintainers("raovgarimella") + license("BitTorrent-1.0") + version("1.3.2", sha256="a03f00cd95290c2dbe8724d430de19537ea644b75161614ed4ac918376fcf64d") version("1.2.11", sha256="613436c799b392a99355db1cbf1062f1da39f3287eed665a5cd43bb65364d926") version("1.2.10", sha256="c5c2c99f040f1fa5a8da21ac5ccbbc5b226d1fd43ce3eb14c76d211601b65a72") diff --git a/var/spack/repos/builtin/packages/wordnet/package.py b/var/spack/repos/builtin/packages/wordnet/package.py index 91348ab5bda095..d7bd40e0920c4a 100644 --- a/var/spack/repos/builtin/packages/wordnet/package.py +++ b/var/spack/repos/builtin/packages/wordnet/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wps/package.py b/var/spack/repos/builtin/packages/wps/package.py index 71cb8d0a6291da..3a3aaa69f5bafc 100644 --- a/var/spack/repos/builtin/packages/wps/package.py +++ b/var/spack/repos/builtin/packages/wps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wrf-io/package.py b/var/spack/repos/builtin/packages/wrf-io/package.py index c0608a582b640f..6b80fdeef76ea1 100644 --- a/var/spack/repos/builtin/packages/wrf-io/package.py +++ b/var/spack/repos/builtin/packages/wrf-io/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wrf/aocc_config.inc b/var/spack/repos/builtin/packages/wrf/aocc_config.inc new file mode 100644 index 00000000000000..8c801966898e9e --- /dev/null +++ b/var/spack/repos/builtin/packages/wrf/aocc_config.inc @@ -0,0 +1,58 @@ +########################################################### +#ARCH AMD Linux x86_64 #serial smpar dmpar dm+sm +# For optimized AMDFCFLAGS and AMDLDFLAGS, please reach out to toolchainsupport@amd.com +# + +DESCRIPTION = AMD ($SFC/$SCC) : AMD ZEN Architectures +DMPARALLEL = # 1 +OMPCPP = # -D_OPENMP +OMP = # -fopenmp +OMPCC = # -fopenmp +SFC = flang +SCC = clang +CCOMP = clang +DM_FC = {MPIFC} +DM_CC = {MPICC} +FC = CONFIGURE_FC +CC = CONFIGURE_CC +LD = $(FC) +RWORDSIZE = CONFIGURE_RWORDSIZE + +AMDMATHLIB = -fveclib=AMDLIBM +AMDLDFLAGS = +AMDFCFLAGS = -mllvm -disable-loop-idiom-memset -mllvm -inline-threshold=3000 \ + -mllvm -inlinehint-threshold=10000 -mllvm -enable-loop-distribute-adv \ + -mllvm -vectorize-non-contiguous-memory-aggressively \ + -mllvm -vectorizer-maximize-bandwidth=true \ + -mllvm -enable-gather -mllvm -legalize-vector-library-calls \ + -finline-aggressive -finline-hint-functions + +PROMOTION = #-fdefault-real-8 +ARCH_LOCAL = -DNONSTANDARD_SYSTEM_SUBR {CTSM_SUBST} +CFLAGS_LOCAL = -w -c -m64 -Ofast +LDFLAGS_LOCAL = -m64 -Ofast -Mstack_arrays $(AMDLDFLAGS) $(AMDMATHLIB) -lamdlibm -lm +CPLUSPLUSLIB = +ESMF_LDFLAG = $(CPLUSPLUSLIB) +FCOPTIM = -Ofast -Mstack_arrays -ftree-vectorize -funroll-loops -finline-aggressive \ + -finline-hint-functions $(AMDMATHLIB) $(AMDFCFLAGS) +FCREDUCEDOPT = -O2 -Mstack_arrays -DFCREDUCEDOPT +FCNOOPT = -O0 +FCDEBUG = # -g $(FCNOOPT) +FORMAT_FIXED = -ffixed-form +FORMAT_FREE = -ffree-form +FCSUFFIX = +BYTESWAPIO = -Mbyteswapio +FCBASEOPTS_NO_G = -w $(FORMAT_FREE) $(BYTESWAPIO) +FCBASEOPTS = $(FCBASEOPTS_NO_G) $(FCDEBUG) +MODULE_SRCH_FLAG= +TRADFLAG = CONFIGURE_TRADFLAG +CPP = /lib/cpp CONFIGURE_CPPFLAGS +AR = llvm-ar +ARFLAGS = ru +M4 = m4 +RANLIB = llvm-ranlib +RLFLAGS = +CC_TOOLS = $(SCC) +NETCDFPAR_BUILD = {NETCDFPAR_BUILD} + +#insert new stanza here diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 1fcc8226d7d44e..15f81f0aace253 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -8,6 +8,7 @@ import sys import time from os.path import basename +from pathlib import Path from subprocess import PIPE, Popen from llnl.util import tty @@ -171,9 +172,9 @@ class Wrf(Package): patch("patches/4.2/add_aarch64.patch", when="@4.2:4.3.1 %gcc target=aarch64:") patch("patches/4.2/add_aarch64_acfl.patch", when="@4.2:4.3.1 %arm target=aarch64:") patch("patches/4.2/configure_aocc_2.3.patch", when="@4.2 %aocc@:2.4.0") - patch("patches/4.2/configure_aocc_3.0.patch", when="@4.2: %aocc@3.0.0:3.2.0") + patch("patches/4.2/configure_aocc_3.0.patch", when="@4.2 %aocc@3.0.0:3.2.0") patch("patches/4.2/hdf5_fix.patch", when="@4.2: %aocc") - patch("patches/4.2/derf_fix.patch", when="@4.2 %aocc") + patch("patches/4.2/derf_fix.patch", when="@=4.2 %aocc") patch( "patches/4.2/add_tools_flags_acfl2304.patch", when="@4.2:4.4.2 %arm@23.04.1: target=aarch64:", @@ -293,6 +294,26 @@ def patch(self): filter_file("^#!/bin/csh -f", "#!/usr/bin/env csh", *files) filter_file("^#!/bin/csh", "#!/usr/bin/env csh", *files) + @run_before("configure", when="%aocc@4:") + def create_aocc_config(self): + param = { + "MPICC": self.spec["mpi"].mpicc, + "MPIFC": self.spec["mpi"].mpifc, + "CTSM_SUBST": ( + "-DWRF_USE_CLM" if self.spec.satisfies("@:4.2.2") else "CONFIGURE_D_CTSM" + ), + "NETCDFPAR_BUILD": ( + "CONFIGURE_NETCDFPAR_BUILD" if self.spec.satisfies("@4.4.0:") else "" + ), + } + + zen_conf = (Path(__file__).parent / "aocc_config.inc").read_text().format(**param) + + if self.spec.satisfies("@4.0:"): + filter_file("#insert new stanza here", zen_conf, "arch/configure.defaults") + else: + filter_file("#insert new stanza here", zen_conf, "arch/configure_new.defaults") + def answer_configure_question(self, outputbuf): # Platform options question: if "Please select from among the following" in outputbuf: diff --git a/var/spack/repos/builtin/packages/wrk/package.py b/var/spack/repos/builtin/packages/wrk/package.py index dd1e8e8af2dd0a..cb2c400a48bef4 100644 --- a/var/spack/repos/builtin/packages/wrk/package.py +++ b/var/spack/repos/builtin/packages/wrk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Wrk(MakefilePackage): homepage = "https://github.com/wg/wrk" url = "https://github.com/wg/wrk/archive/4.1.0.tar.gz" + license("Apache-2.0") + version("4.1.0", sha256="6fa1020494de8c337913fd139d7aa1acb9a020de6f7eb9190753aa4b1e74271e") version("4.0.2", sha256="a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb") version("4.0.1", sha256="c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d") diff --git a/var/spack/repos/builtin/packages/wsmancli/package.py b/var/spack/repos/builtin/packages/wsmancli/package.py index b27907c258f3c7..c5e53721315324 100644 --- a/var/spack/repos/builtin/packages/wsmancli/package.py +++ b/var/spack/repos/builtin/packages/wsmancli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wt/package.py b/var/spack/repos/builtin/packages/wt/package.py index 9043912eeaf219..eb43df3d582f6c 100644 --- a/var/spack/repos/builtin/packages/wt/package.py +++ b/var/spack/repos/builtin/packages/wt/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wtdbg2/package.py b/var/spack/repos/builtin/packages/wtdbg2/package.py index 9795f1a4516818..07d9022276cc5d 100644 --- a/var/spack/repos/builtin/packages/wtdbg2/package.py +++ b/var/spack/repos/builtin/packages/wtdbg2/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Wtdbg2(MakefilePackage): homepage = "https://github.com/ruanjue/wtdbg2" url = "https://github.com/ruanjue/wtdbg2/archive/v2.3.tar.gz" + license("GPL-3.0-only") + version("2.3", sha256="fb61d38a4c60a39b3b194e63b855141c05ddcbe71cf244ae613766a9b0a56621") depends_on("zlib-api") diff --git a/var/spack/repos/builtin/packages/wxparaver/package.py b/var/spack/repos/builtin/packages/wxparaver/package.py index 1018fffa3be9bc..831831e76b8cd0 100644 --- a/var/spack/repos/builtin/packages/wxparaver/package.py +++ b/var/spack/repos/builtin/packages/wxparaver/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Wxparaver(AutotoolsPackage): homepage = "https://tools.bsc.es/paraver" url = "https://ftp.tools.bsc.es/wxparaver/wxparaver-4.9.2-src.tar.bz2" + license("LGPL-2.1-or-later") + version("4.9.2", sha256="83289584040bcedf8cab1b2ae3545191c8bdef0e11ab62b06e54cbf111f2127a") version("4.9.1", sha256="e89fdf563d1fc73ed0018cf0e25b458b6617ec33325ed3fdbf06397c556f3a8e") version("4.9.0", sha256="1f9964d7987032d01a354327845bf53ae369be5d8acf7d4e85bec81699a6ddf6") diff --git a/var/spack/repos/builtin/packages/wxpropgrid/package.py b/var/spack/repos/builtin/packages/wxpropgrid/package.py index 28baa23a77da13..b105d4f92881bd 100644 --- a/var/spack/repos/builtin/packages/wxpropgrid/package.py +++ b/var/spack/repos/builtin/packages/wxpropgrid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/wxwidgets/package.py b/var/spack/repos/builtin/packages/wxwidgets/package.py index 44af2e351998c1..ea4dfac626eca9 100644 --- a/var/spack/repos/builtin/packages/wxwidgets/package.py +++ b/var/spack/repos/builtin/packages/wxwidgets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py index dedbfcc1ee83bb..ef3e402e6605e2 100644 --- a/var/spack/repos/builtin/packages/x11perf/package.py +++ b/var/spack/repos/builtin/packages/x11perf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/x264/package.py b/var/spack/repos/builtin/packages/x264/package.py index 09e190dc16325e..5bd179b8e81330 100644 --- a/var/spack/repos/builtin/packages/x264/package.py +++ b/var/spack/repos/builtin/packages/x264/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -11,6 +11,8 @@ class X264(AutotoolsPackage): homepage = "https://www.videolan.org/developers/x264.html" git = "https://code.videolan.org/videolan/x264.git" + license("GPL-2.0-or-later") + version("20210613", commit="5db6aa6cab1b146e07b60cc1736a01f21da01154") depends_on("nasm") diff --git a/var/spack/repos/builtin/packages/xabclib/package.py b/var/spack/repos/builtin/packages/xabclib/package.py index b2ffef64cee029..9beaf8545d26c0 100644 --- a/var/spack/repos/builtin/packages/xabclib/package.py +++ b/var/spack/repos/builtin/packages/xabclib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xalan-c/package.py b/var/spack/repos/builtin/packages/xalan-c/package.py index 19d0acc2da2234..29dfbed8fb5b15 100644 --- a/var/spack/repos/builtin/packages/xalan-c/package.py +++ b/var/spack/repos/builtin/packages/xalan-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class XalanC(CMakePackage): maintainers("omsai") + license("Apache-2.0") + version("1.12", sha256="ee7d4b0b08c5676f5e586c7154d94a5b32b299ac3cbb946e24c4375a25552da7") variant( diff --git a/var/spack/repos/builtin/packages/xapian-core/package.py b/var/spack/repos/builtin/packages/xapian-core/package.py index 9c138d0a5e5afd..9117b3bb1f3774 100644 --- a/var/spack/repos/builtin/packages/xapian-core/package.py +++ b/var/spack/repos/builtin/packages/xapian-core/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class XapianCore(AutotoolsPackage): homepage = "https://xapian.org" url = "https://oligarchy.co.uk/xapian/1.4.19/xapian-core-1.4.19.tar.xz" + license("GPL-2.0-or-later") + version("1.4.19", sha256="1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3") version("1.4.11", sha256="9f16b2f3e2351a24034d7636f73566ab74c3f0729e9e0492934e956b25c5bc07") version("1.4.3", sha256="7d5295511ca2de70463a29e75f6a2393df5dc1485bf33074b778c66e1721e475") diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py index 46631ec116802f..c4a792f1d44a8d 100644 --- a/var/spack/repos/builtin/packages/xauth/package.py +++ b/var/spack/repos/builtin/packages/xauth/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xauth(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xauth" xorg_mirror_path = "app/xauth-1.0.9.tar.gz" + license("custom") + version("1.1.2", sha256="84d27a1023d8da524c134f424b312e53cb96e08871f96868aa20316bfcbbc054") version("1.1.1", sha256="0f558ef33e76843cf16a78cd3910ef8ec0809bea85d14e091c559dcec092c671") version("1.1", sha256="e9fce796c8c5c9368594b9e8bbba237fb54b6615f5fd60e8d0a5b3c52a92c5ef") diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py index a31315135c909e..0392228ac297fc 100644 --- a/var/spack/repos/builtin/packages/xbacklight/package.py +++ b/var/spack/repos/builtin/packages/xbacklight/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xbacklight(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xbacklight" xorg_mirror_path = "app/xbacklight-1.2.1.tar.gz" + license("MIT") + version("1.2.3", sha256="d2a8dd962454d8de3675286eab4edc4d1376ac7da040a3a8729ee250e6e798c1") version("1.2.2", sha256="9812497b95b28776539808ba75e8b8a2d48a57416e172e04e9580e65c76a61bb") version("1.2.1", sha256="82c80cd851e3eb6d7a216d92465fcf6d5e456c2d5ac12c63cd2757b39fb65b10") diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py index ad348c01ecc98b..0e7f535e307bdd 100644 --- a/var/spack/repos/builtin/packages/xbiff/package.py +++ b/var/spack/repos/builtin/packages/xbiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xbiff(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xbiff" xorg_mirror_path = "app/xbiff-1.0.3.tar.gz" + license("X11") + version("1.0.4", sha256="8a0ca5628e6893340a2448b461a103b48a174ae777500beb9a9f56f99330ce62") version("1.0.3", sha256="b4b702348674985741685e3ec7fcb5640ffb7bf20e753fc2d708f70f2e4c304d") diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py index e7a293863ab4dc..172f716cbc141d 100644 --- a/var/spack/repos/builtin/packages/xbitmaps/package.py +++ b/var/spack/repos/builtin/packages/xbitmaps/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,12 @@ class Xbitmaps(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/data/bitmaps/" xorg_mirror_path = "data/xbitmaps-1.1.1.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.1.3", sha256="93b433b7ff223c4685fdba583b4bd30f2706be2413a670021084422d85b0269d") + version("1.1.2", sha256="27e700e8ee02c43f7206f4eca8f1953ad15236cac95d7a0f08505c3f7d99c265") version("1.1.1", sha256="3bc89e05be4179ce4d3dbba1ae554da4591d41f7a489d9e2735a18cfd8378188") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index ba5770b34bfdb9..eb845dad60f430 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py index 3e5d4c49914ce3..ea4145c2725f0e 100644 --- a/var/spack/repos/builtin/packages/xcalc/package.py +++ b/var/spack/repos/builtin/packages/xcalc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xcalc(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xcalc" xorg_mirror_path = "app/xcalc-1.0.6.tar.gz" + license("MIT") + version("1.1.1", sha256="9219c889bfb2d0e168ef9a14700662c5cde829b69b12875cb6d59b70d4b68f3b") version("1.1.0", sha256="a86418d9af9d0e57e5253ba1c29e754480509c828d369aaaca48400b2045e630") version("1.0.7", sha256="2b00129583f51a45acfcaaa461750169e530996e190b31f7a92891846380f1f5") diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py index 2c499d49f1b1bf..f023755b03afb4 100644 --- a/var/spack/repos/builtin/packages/xcb-demo/package.py +++ b/var/spack/repos/builtin/packages/xcb-demo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index b60245ce0778d4..1d345d6b731475 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,11 @@ class XcbProto(AutotoolsPackage): homepage = "https://xcb.freedesktop.org/" url = "https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-1.14.1.tar.xz" + license("MIT") + + maintainers("wdconinc") + + version("1.16.0", sha256="a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119") version("1.15.2", sha256="7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed") version("1.14.1", sha256="f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3") version("1.14", sha256="186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605") diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index d56cac093d94cb..3c408d0ed6fdd2 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtilCursor(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor" xorg_mirror_path = "lib/xcb-util-cursor-0.1.4.tar.xz" + license("MIT") + version("0.1.4", sha256="28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb") version( "0.1.3", diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index b85b63a5107ad4..c6f28d2ccb3ef4 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index 46e7adbfd635e4..ecd793cb640080 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtilImage(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image" xorg_mirror_path = "lib/xcb-util-image-0.4.1.tar.xz" + license("MIT") + version("0.4.1", sha256="ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d") version( "0.4.0", diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index 1db444465ebab2..e7c19ebb57fdec 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtilKeysyms(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms" xorg_mirror_path = "lib/xcb-util-keysyms-0.4.1.tar.xz" + license("MIT") + version("0.4.1", sha256="7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638") version( "0.4.0", diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index 11018a4260f9ad..6ae06aa0bdc46c 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtilRenderutil(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-renderutil" xorg_mirror_path = "lib/xcb-util-renderutil-0.3.10.tar.xz" + license("MIT") + version("0.3.10", sha256="3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba") version( "0.3.9", diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index c3b7bf4773cecf..3f825e83b5db3c 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtilWm(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm" xorg_mirror_path = "lib/xcb-util-wm-0.4.2.tar.xz" + license("MIT") + version("0.4.2", sha256="62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b") version( "0.4.1", diff --git a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py index 0e2503535cc9af..cdf160d1491e8c 100644 --- a/var/spack/repos/builtin/packages/xcb-util-xrm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-xrm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class XcbUtilXrm(AutotoolsPackage): homepage = "https://github.com/Airblader/xcb-util-xrm" git = "https://github.com/Airblader/xcb-util-xrm.git" + license("MIT") + # This GitHub project includes some git submodules, which must be fetched # in order to build it. version("1.2", tag="v1.2", commit="a45b3d0bbaa94bf8a68405ab8c5c61404da464ce", submodules=True) diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index e96c044c469f75..65f539510fef62 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class XcbUtil(AutotoolsPackage, XorgPackage): homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-util" xorg_mirror_path = "lib/xcb-util-0.4.1.tar.xz" + license("MIT") + version("0.4.1", sha256="5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512") version( "0.4.0", diff --git a/var/spack/repos/builtin/packages/xcdf/package.py b/var/spack/repos/builtin/packages/xcdf/package.py new file mode 100644 index 00000000000000..8de53544631fc7 --- /dev/null +++ b/var/spack/repos/builtin/packages/xcdf/package.py @@ -0,0 +1,26 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Xcdf(CMakePackage): + """Binary data format designed to store data fields with user-specified accuracy.""" + + homepage = "https://github.com/jimbraun/XCDF" + url = "https://github.com/jimbraun/XCDF/archive/refs/tags/v3.00.03.tar.gz" + + license("BSD-2-Clause") + + version("3.01", sha256="39fe816f40d6af18e16e71ffcf958258fdac4959ac894a60d1b863efaa57754e") + version("3.00.03", sha256="4e445a2fea947ba14505d08177c8d5b55856f8411f28de1fe4d4c00f6824b711") + + patch("remove_python_support.patch", when="@3.00.03") + + depends_on("python@3.7:", when="@3.01:") + depends_on("py-pybind11", when="@3.01:", type="build") + + def setup_run_environment(self, env): + env.prepend_path("PYTHONPATH", self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/xcdf/remove_python_support.patch b/var/spack/repos/builtin/packages/xcdf/remove_python_support.patch new file mode 100644 index 00000000000000..12b3f86c410ce2 --- /dev/null +++ b/var/spack/repos/builtin/packages/xcdf/remove_python_support.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3270f47..e5648d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,7 +45,6 @@ SET (XCDF_PATCH_VERSION 1 CACHE STRING "Patch number") + # ------------------------------------------------------------------------------ + SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + INCLUDE (Utility) +-INCLUDE (Python) + + INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/include) + INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/include/utility) diff --git a/var/spack/repos/builtin/packages/xcfun/package.py b/var/spack/repos/builtin/packages/xcfun/package.py index 2c1c4aea61f172..737e8b356ed862 100644 --- a/var/spack/repos/builtin/packages/xcfun/package.py +++ b/var/spack/repos/builtin/packages/xcfun/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xcfun(CMakePackage): maintainers("robertodr", "bast") + license("MPL-2.0-no-copyleft-exception") + version("2.1.1", sha256="8b602df74c7be83d501532565deafd1b7881946d94789122f24c309a669298ab") version("2.1.0", sha256="64aac8c933cc129ce6326f3827e342abfd10b94ea4a302aaca9f10d342ad7656") version("2.0.2", sha256="b79a71861a9e1d0e33c1be89b34f6f052d430cd495a7df982c407ad0140c1dcd") @@ -34,7 +36,6 @@ def cmake_args(self): "-DPYMOD_INSTALL_LIBDIR=/python{0}/site-packages".format(spec["python"].version[:-1]), "-DXCFUN_MAX_ORDER=8", "-DXCFUN_PYTHON_INTERFACE=ON", - "-DPYTHON_EXECUTABLE={0}".format(spec["python"].command), "-DENABLE_TESTALL=OFF", ] return args diff --git a/var/spack/repos/builtin/packages/xclip/package.py b/var/spack/repos/builtin/packages/xclip/package.py index 7533ed81d13898..9335a847299565 100644 --- a/var/spack/repos/builtin/packages/xclip/package.py +++ b/var/spack/repos/builtin/packages/xclip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Xclip(AutotoolsPackage): homepage = "https://github.com/astrand/xclip" git = "https://github.com/astrand/xclip.git" + license("GPL-2.0-or-later") + version("0.13", commit="9aa7090c3b8b437c6489edca32ae43d82e0c1281") depends_on("libxmu") diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py index 2341b787697237..df29c0afefccb3 100644 --- a/var/spack/repos/builtin/packages/xclipboard/package.py +++ b/var/spack/repos/builtin/packages/xclipboard/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py index c2fbe4cd486599..d7f3ff4c9c8d99 100644 --- a/var/spack/repos/builtin/packages/xclock/package.py +++ b/var/spack/repos/builtin/packages/xclock/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xclock(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xclock" xorg_mirror_path = "app/xclock-1.0.7.tar.gz" + license("MIT") + version("1.1.1", sha256="be0f90645b0fe21d2cbfdd77102cc3168f01cb794663fd8db2b305fed261e4c3") version("1.1.0", sha256="2798db1a9e8bc6b417d813ac46f8e8326d59d4a00f10457609f9712debe58670") version("1.0.9", sha256="4f0dd4d7d969b55c64f6e58242bca201d19e49eb8c9736dc099330bb0c5385b1") diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py index 315119b1b13e68..d358bc2b9c8519 100644 --- a/var/spack/repos/builtin/packages/xcmiscproto/package.py +++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py index 6c4587d7f81adc..4537b3f4383591 100644 --- a/var/spack/repos/builtin/packages/xcmsdb/package.py +++ b/var/spack/repos/builtin/packages/xcmsdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xcmsdb(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xcmsdb" xorg_mirror_path = "app/xcmsdb-1.0.5.tar.gz" + license("custom") + version("1.0.6", sha256="640b42c746eb34bdd71ca2850f2bc9fb0ade194c9f152a8d002425a0684df077") version("1.0.5", sha256="8442352ee5eb3ea0d3a489c26d734e784ef6964150c2a173401d0dc6638ca236") diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py index 392fd6f79957b3..d555c4369c9963 100644 --- a/var/spack/repos/builtin/packages/xcompmgr/package.py +++ b/var/spack/repos/builtin/packages/xcompmgr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xcompmgr(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xcompmgr" xorg_mirror_path = "app/xcompmgr-1.1.7.tar.gz" + license("MIT") + version("1.1.9", sha256="978294a31bf8decb90acae750c9630b986b78a98c3e0517bd63486a62fa10030") version("1.1.8", sha256="ba10933678a5665d06fa7096bd08f37316add8ed84aaacd7ba26a97e8f2e0498") version("1.1.7", sha256="ef4b23c370f99403bbd9b6227f8aa4edc3bc83fc6d57ee71f6f442397cef505a") diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index bcb6ab9c2cbe84..2a8b3fecc42899 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py index 8dc19eee80141d..316e7e42db1b8a 100644 --- a/var/spack/repos/builtin/packages/xcursor-themes/package.py +++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py index d795dcd7c00217..0a082116b1b833 100644 --- a/var/spack/repos/builtin/packages/xcursorgen/package.py +++ b/var/spack/repos/builtin/packages/xcursorgen/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py index e3eb8381fb2fda..22e8a1de489a1f 100644 --- a/var/spack/repos/builtin/packages/xdbedizzy/package.py +++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xdelta/package.py b/var/spack/repos/builtin/packages/xdelta/package.py index 625f8c687d96d6..551a4d2cba4bfa 100644 --- a/var/spack/repos/builtin/packages/xdelta/package.py +++ b/var/spack/repos/builtin/packages/xdelta/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py index 0f07cc1558437a..48e809ab3ad132 100644 --- a/var/spack/repos/builtin/packages/xditview/package.py +++ b/var/spack/repos/builtin/packages/xditview/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xditview(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xditview" xorg_mirror_path = "app/xditview-1.0.4.tar.gz" + license("X11") + version("1.0.6", sha256="2b158cdc3b3eb63a9ba2cc2c31908ab9bd3bc834b2f01f1792a30690229237dd") version("1.0.5", sha256="67c4522a24dd7e8762ae458fe216c5bddc12101af295e78c19ff7313fa8cbfad") version("1.0.4", sha256="73ad88cfc879edcc6ede65999c11d670da27575388126795d71f3ad60286d379") diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 0354440e0ff348..7b811992aeb59a 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xdm(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xdm" xorg_mirror_path = "app/xdm-1.1.11.tar.gz" + license("MIT") + version("1.1.14", sha256="bcc543c3c120094d58d9cc9837958d4303693c2116ba342ba3dd9440137b4026") version("1.1.13", sha256="2f05aa58c205dcf10443ba414d27535b74ec11466dc95228343b0ce4f0c2a307") version("1.1.12", sha256="8ea737945f69e172afbbc8b5060e4c7ea8079f402eb0a458572197c907020bb4") diff --git a/var/spack/repos/builtin/packages/xdmf3/package.py b/var/spack/repos/builtin/packages/xdmf3/package.py index ba54eed8413081..22a6d923455226 100644 --- a/var/spack/repos/builtin/packages/xdmf3/package.py +++ b/var/spack/repos/builtin/packages/xdmf3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Xdmf3(CMakePackage): homepage = "https://xdmf.org" git = "https://gitlab.kitware.com/xdmf/xdmf.git" + license("BSD-3-Clause") + # There is no official release of XDMF and development has largely ceased, # but the current version, 3.x, is maintained on the master branch. version("2019-01-14", commit="8d9c98081d89ac77a132d56bc8bef53581db4078") diff --git a/var/spack/repos/builtin/packages/xdotool/package.py b/var/spack/repos/builtin/packages/xdotool/package.py index 82bbc5b9ebe0fe..66df65bb4784ff 100644 --- a/var/spack/repos/builtin/packages/xdotool/package.py +++ b/var/spack/repos/builtin/packages/xdotool/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xdotool(MakefilePackage): homepage = "https://github.com/jordansissel/xdotool" url = "https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz" + license("BSD-3-Clause") + version( "3.20211022.1", sha256="96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada" ) diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py index d039c9d1be78f7..9cf8c460cd5a17 100644 --- a/var/spack/repos/builtin/packages/xdpyinfo/package.py +++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Xdpyinfo(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xdpyinfo" xorg_mirror_path = "app/xdpyinfo-1.3.2.tar.gz" + license("custom") + version("1.3.3", sha256="2ae7b8213ea839b8376843477496276e8d69550c48bff081e16376539fc27c5a") version("1.3.2", sha256="ef39935e8e9b328e54a85d6218d410d6939482da6058db1ee1b39749d98cbcf2") diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py index 4cd4e30a099375..d9d1b15ec36a14 100644 --- a/var/spack/repos/builtin/packages/xdriinfo/package.py +++ b/var/spack/repos/builtin/packages/xdriinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xdriinfo(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xdriinfo" xorg_mirror_path = "app/xdriinfo-1.0.5.tar.gz" + license("custom") + version("1.0.7", sha256="9fab95510b1f67409632fb8af01369b128f4d12763fe1a2662f5666976a7d30c") version("1.0.6", sha256="c59d1d97d8b1066ea470407237c87fb131ca9f6c4db4652a6e9461ae03c698ad") version("1.0.5", sha256="e4e6abaa4591c540ab63133927a6cebf0a5f4d27dcd978878ab4a422d62a838e") diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py index 967b5543205be8..dad2b3cdec2737 100644 --- a/var/spack/repos/builtin/packages/xedit/package.py +++ b/var/spack/repos/builtin/packages/xedit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xedit(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xedit" xorg_mirror_path = "app/xedit-1.2.2.tar.gz" + license("BSD-3-Clause") + version("1.2.3", sha256="3c8be175613f72858b24d973b0d66ae2d3c9a48a5f0bd637920d85b283feede7") version("1.2.2", sha256="7e2dacbc2caed81d462ee028e108866893217d55e35e4b860b09be2b409ee18f") diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index b31bb5525e57e5..5c42b25cb59abf 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class XercesC(AutotoolsPackage): homepage = "https://xerces.apache.org/xerces-c" url = "https://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.1.tar.bz2" + license("Apache-2.0") + version("3.2.4", sha256="74aa626fc71e729ee227602870dd29a5a01cd8c9c1c7330837a51da2eb5722cc") version("3.2.3", sha256="45c2329e684405f2b8854ecbddfb8d5b055cdf0fe4d35736cc352c504989bbb6") version("3.2.2", sha256="1f2a4d1dbd0086ce0f52b718ac0fa4af3dc1ce7a7ff73a581a05fbe78a82bce0") diff --git a/var/spack/repos/builtin/packages/xeus/package.py b/var/spack/repos/builtin/packages/xeus/package.py index bc8dbe5d966b84..ab4cd48d19bfea 100644 --- a/var/spack/repos/builtin/packages/xeus/package.py +++ b/var/spack/repos/builtin/packages/xeus/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xeus(CMakePackage): maintainers("tomstitt") + license("BSD-3-Clause") + version("develop", branch="master") version("1.0.4", sha256="7324ff013eb97d579fd3b6f9770a13f8863d6046c8bbcdbe2fc7d2ac02f0161f") version("0.15.0", sha256="bc99235b24d5757dc129f3ed531501fb0d0667913927ed39ee24281952649183") diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index 75288608ec7dc2..e6c418d4c77b0e 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class Xev(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xev" xorg_mirror_path = "app/xev-1.2.2.tar.gz" + license("MIT") + version("1.2.5", sha256="a948974ede621a8402ed9ea64f1ec83992285aa4fbb9d40b52985156c61a358a") version("1.2.4", sha256="6b1f94813f008a4ba45e0a2d4e1b64deaab1def56fabd7fac3621106cbaa3383") version("1.2.3", sha256="a3c5fbf339f43ba625a6d84e52ab1a7170581505ef498be6aa4e7bdfbd8d5cef") diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py index 613df04b7f5eae..1b5f4ca83efc8f 100644 --- a/var/spack/repos/builtin/packages/xextproto/package.py +++ b/var/spack/repos/builtin/packages/xextproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py index fd56ec2960170d..8d72001bb563c4 100644 --- a/var/spack/repos/builtin/packages/xeyes/package.py +++ b/var/spack/repos/builtin/packages/xeyes/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xeyes(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xeyes" xorg_mirror_path = "app/xeyes-1.1.1.tar.gz" + license("MIT") + version("1.2.0", sha256="727e651fd4597f6aa131b67474372a081dccd28ea2cdd364f21dae6e59003ee8") version("1.1.2", sha256="4a675b34854da362bd8dff4f21ff92e0c19798b128ea0af24b7fc7c5ac2feea3") version("1.1.1", sha256="3a1871a560ab87c72a2e2ecb7fd582474448faec3e254c9bd8bead428ab1bca3") diff --git a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py index dd1aaecc2727a2..7ef9adf3273b73 100644 --- a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py +++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py index 3e19250f7c6f36..64a48a6b0889c1 100644 --- a/var/spack/repos/builtin/packages/xf86dga/package.py +++ b/var/spack/repos/builtin/packages/xf86dga/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xf86dgaproto/package.py b/var/spack/repos/builtin/packages/xf86dgaproto/package.py index 70dc28bd55560a..7242c4c3ba9875 100644 --- a/var/spack/repos/builtin/packages/xf86dgaproto/package.py +++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py index ed44e952355905..953be0c91295a8 100644 --- a/var/spack/repos/builtin/packages/xf86driproto/package.py +++ b/var/spack/repos/builtin/packages/xf86driproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Xf86driproto(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/proto/xf86driproto" xorg_mirror_path = "proto/xf86driproto-2.1.1.tar.gz" + license("MIT") + version("2.1.1", sha256="18ff8de129b89fa24a412a1ec1799f8687f96c186c655b44b1a714a3a5d15d6c") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/xf86miscproto/package.py b/var/spack/repos/builtin/packages/xf86miscproto/package.py index 2e0e00fe925067..69de74bb79465d 100644 --- a/var/spack/repos/builtin/packages/xf86miscproto/package.py +++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xf86rushproto/package.py b/var/spack/repos/builtin/packages/xf86rushproto/package.py index 8e1abff6870a8b..4ad729f9155a2d 100644 --- a/var/spack/repos/builtin/packages/xf86rushproto/package.py +++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py index 61c201c1a5511c..1f310726d2e3da 100644 --- a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py +++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py index 86bbc0ea2e803d..e5a69e915920d3 100644 --- a/var/spack/repos/builtin/packages/xfd/package.py +++ b/var/spack/repos/builtin/packages/xfd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xfd(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xfd" xorg_mirror_path = "app/xfd-1.1.2.tar.gz" + license("X11") + version("1.1.4", sha256="58d3c4e1395a1d901529b1d80331d810836cb56b2db950c15444ea71d2af21fd") version("1.1.3", sha256="4a1bd18f324c239b1a807ed4ccaeb172ba771d65a7307fb492d8dd8d27f01527") version("1.1.2", sha256="4eff3e15b2526ceb48d0236d7ca126face399289eabc0ef67e6ed3b3fdcb60ad") diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py index 69df1edc205b77..e2bb1ef186407b 100644 --- a/var/spack/repos/builtin/packages/xfindproxy/package.py +++ b/var/spack/repos/builtin/packages/xfindproxy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py index 44eee09fddc0db..5ad88b7f1ab018 100644 --- a/var/spack/repos/builtin/packages/xfontsel/package.py +++ b/var/spack/repos/builtin/packages/xfontsel/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xfontsel(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xfontsel" xorg_mirror_path = "app/xfontsel-1.0.5.tar.gz" + license("MIT") + version("1.1.0", sha256="32938f671c706dc15644ceebf5daebbf0f2f1fe45afa2d06d2b905cc7d6c7de2") version("1.0.6", sha256="a7b025cb96b678f03caeb61a2770890359bdab34dc37e09d447b30c54c4df35e") version("1.0.5", sha256="9b3ad0cc274398d22be9fa7efe930f4e3749fd4b1b61d9c31a7fb6c1f1ff766e") diff --git a/var/spack/repos/builtin/packages/xforms/package.py b/var/spack/repos/builtin/packages/xforms/package.py index 8dc817a7cb7105..fcceb73bb5f91a 100644 --- a/var/spack/repos/builtin/packages/xforms/package.py +++ b/var/spack/repos/builtin/packages/xforms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xforms(AutotoolsPackage): homepage = "https://www.nongnu.org/xforms/" url = "http://download.savannah.gnu.org/releases/xforms/xforms-1.0.91.tar.gz" + license("LGPL-2.1-or-later") + version("1.2.4", sha256="78cc6b07071bbeaa1f906e0a22d5e9980e48f8913577bc082d661afe5cb75696") version("1.2.3", sha256="7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61") version("1.0.91", sha256="88684237c77489bcb1fbc9a794621a2919aa800e1c0a6d83d679b97980e3441d") diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py index 0fc3e2b5c63b16..0641d14a979a7d 100644 --- a/var/spack/repos/builtin/packages/xfs/package.py +++ b/var/spack/repos/builtin/packages/xfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xfs(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xfs" xorg_mirror_path = "app/xfs-1.1.4.tar.gz" + license("X11") + version("1.2.1", sha256="76df0106dbf845cb44534eb89f1ed7e9fb4d466125200baeb4719eb2586ded29") version("1.2.0", sha256="56ebdc5ff85af332a0c5dc60c9b971551624bbc312bf6af3d13b925600ea367f") version("1.1.4", sha256="28f89b854d1ff14fa1efa5b408e5e1c4f6a145420310073c4e44705feeb6d23b") diff --git a/var/spack/repos/builtin/packages/xfsdump/package.py b/var/spack/repos/builtin/packages/xfsdump/package.py index 0a9145bd029756..dde23593d41f59 100644 --- a/var/spack/repos/builtin/packages/xfsdump/package.py +++ b/var/spack/repos/builtin/packages/xfsdump/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py index a777ca429ee876..fc8b1ebca800ee 100644 --- a/var/spack/repos/builtin/packages/xfsinfo/package.py +++ b/var/spack/repos/builtin/packages/xfsinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xfsprogs/package.py b/var/spack/repos/builtin/packages/xfsprogs/package.py index 7fa69615918e70..b67540ecb7e6e1 100644 --- a/var/spack/repos/builtin/packages/xfsprogs/package.py +++ b/var/spack/repos/builtin/packages/xfsprogs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xfsprogs(AutotoolsPackage): homepage = "https://github.com/mtanski/xfsprogs" url = "http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.17.0.tar.xz" + license("LGPL-2.1-or-later") + version("5.11.0", sha256="0e9c390fcdbb8a79e1b8f5e6e25fd529fc9f9c2ef8f2d5e647b3556b82d1b353") version("5.8.0", sha256="8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b") version("5.7.0", sha256="8f2348a68a686a3f4491dda5d62dd32d885fbc52d32875edd41e2c296e7b4f35") diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py index 52c0286d69a880..2ee35cea525cf9 100644 --- a/var/spack/repos/builtin/packages/xfwp/package.py +++ b/var/spack/repos/builtin/packages/xfwp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py index 5bd043651d1bd5..c5d08e2421fd31 100644 --- a/var/spack/repos/builtin/packages/xgamma/package.py +++ b/var/spack/repos/builtin/packages/xgamma/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xgamma(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xgamma" xorg_mirror_path = "app/xgamma-1.0.6.tar.gz" + license("custom") + version("1.0.7", sha256="61f5ef02883d65ab464678ad3d8c5445a0ff727fe6255af90b1b842ddf77370d") version("1.0.6", sha256="66da1d67e84146518b69481c6283c5d8f1027ace9ff7e214d3f81954842e796a") diff --git a/var/spack/repos/builtin/packages/xgboost/package.py b/var/spack/repos/builtin/packages/xgboost/package.py index c5a25c5721f5ba..dd82b452d164b2 100644 --- a/var/spack/repos/builtin/packages/xgboost/package.py +++ b/var/spack/repos/builtin/packages/xgboost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Xgboost(CMakePackage, CudaPackage): maintainers("adamjstewart") + license("Apache-2.0") + version("master", branch="master", submodules=True) version( "1.6.2", tag="v1.6.2", commit="b9934246faa9a25e10a12339685dfbe56d56f70b", submodules=True diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py index 108c8e197e3cff..4ddedf216b11a7 100644 --- a/var/spack/repos/builtin/packages/xgc/package.py +++ b/var/spack/repos/builtin/packages/xgc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xhmm/package.py b/var/spack/repos/builtin/packages/xhmm/package.py index 2891722a3457c1..fb3eb7f2706f71 100644 --- a/var/spack/repos/builtin/packages/xhmm/package.py +++ b/var/spack/repos/builtin/packages/xhmm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py index c2ab95a9d66c8e..9e083dcb2552d9 100644 --- a/var/spack/repos/builtin/packages/xhost/package.py +++ b/var/spack/repos/builtin/packages/xhost/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xhost(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xhost" xorg_mirror_path = "app/xhost-1.0.7.tar.gz" + license("MIT") + version("1.0.9", sha256="ca850367593fcddc4bff16de7ea1598aa4f6817daf5a803a1258dff5e337f7c3") version("1.0.8", sha256="e5aabce1533dc778ceb5bbc207105cf3770f710629caceaad64675b00c38c3f8") version("1.0.7", sha256="8dd1b6245dfbdef45a64a18ea618f233f77432c2f30881b1db9dc40d510d9490") diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py index 75b203dadf1234..43327786feaa59 100644 --- a/var/spack/repos/builtin/packages/xineramaproto/package.py +++ b/var/spack/repos/builtin/packages/xineramaproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py index 24fcb25b0b8034..1d9bdf11d065bb 100644 --- a/var/spack/repos/builtin/packages/xinit/package.py +++ b/var/spack/repos/builtin/packages/xinit/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xinit(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xinit" xorg_mirror_path = "app/xinit-1.3.4.tar.gz" + license("MIT") + version("1.4.2", sha256="9121c9162f6dedab1229a8c4ed4021c4d605699cb0da580ac2ee1b0c96b3f60e") version("1.4.1", sha256="ca33ec3de6c39589c753620e5b3bcbc8277218b949bfa2df727779b03a8d2357") version("1.4.0", sha256="17548a5df41621b87d395f1074dfb88b0dc6917f9127540b89c6de4a80f33776") diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py index 2d06b27df16b6c..b6e9007af47b5b 100644 --- a/var/spack/repos/builtin/packages/xinput/package.py +++ b/var/spack/repos/builtin/packages/xinput/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xinput(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xinput" xorg_mirror_path = "app/xinput-1.6.2.tar.gz" + license("MIT") + version("1.6.3", sha256="9f29f9bfe387c5a3d582f9edc8c5a753510ecc6fdfb154c03b5cea5975b10ce4") version("1.6.2", sha256="2c8ca5ff2a8703cb7d898629a4311db720dbd30d0c162bfe37f18849a727bd42") diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index c310f8e9a44d5f..b1b7dc7afc95e3 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py index a3678f5761ae03..3e5c6783d0a6b7 100644 --- a/var/spack/repos/builtin/packages/xkbcomp/package.py +++ b/var/spack/repos/builtin/packages/xkbcomp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,9 +14,15 @@ class Xkbcomp(AutotoolsPackage, XorgPackage): keyboard. It also includes a number of keyboard controls designed to make keyboards more accessible to people with physical impairments.""" - homepage = "https://www.x.org/wiki/XKB/" + homepage = "https://cgit.freedesktop.org/xorg/app/xkbcomp" xorg_mirror_path = "app/xkbcomp-1.3.1.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.4.6", sha256="b216a2c8c0eab83f3dc4a3d5ee2bdf7827b30e49c8907035d0f222138eca0987") + version("1.4.5", sha256="e88a4d86b9925ea1e8685dd5ea29c815abafb8ddf19bf5f1a1e0650839252c23") version("1.4.4", sha256="159fba6b62ef4a3fb16ef7fc4eb4fc26f3888652471ceb604c495783dda020bc") version("1.3.1", sha256="018e83a922430652d4bc3f3db610d2296e618c76c9b3fbcdccde975aeb655749") diff --git a/var/spack/repos/builtin/packages/xkbdata/package.py b/var/spack/repos/builtin/packages/xkbdata/package.py index 87e1812149d4ab..a637213222586d 100644 --- a/var/spack/repos/builtin/packages/xkbdata/package.py +++ b/var/spack/repos/builtin/packages/xkbdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py index 57b3ae109821fa..6aec9481662a14 100644 --- a/var/spack/repos/builtin/packages/xkbevd/package.py +++ b/var/spack/repos/builtin/packages/xkbevd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py index 04aebb658ff8ce..92e1f634f8a351 100644 --- a/var/spack/repos/builtin/packages/xkbprint/package.py +++ b/var/spack/repos/builtin/packages/xkbprint/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index 473bbf4ec4fad8..ab80af7039060b 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py index f91d2ad1789262..50436f37ef23d8 100644 --- a/var/spack/repos/builtin/packages/xkeyboard-config/package.py +++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class XkeyboardConfig(AutotoolsPackage, XorgPackage): homepage = "https://www.freedesktop.org/wiki/Software/XKeyboardConfig/" xorg_mirror_path = "data/xkeyboard-config/xkeyboard-config-2.18.tar.gz" + license("MIT") + version("2.34", sha256="a5882238b4199ca90428aea102790aaa847e6e214653d956bf2abba3027107ba") version("2.18", sha256="d5c511319a3bd89dc40622a33b51ba41a2c2caad33ee2bfe502363fcc4c3817d") diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py index fef7449a567eeb..52f43925797f12 100644 --- a/var/spack/repos/builtin/packages/xkill/package.py +++ b/var/spack/repos/builtin/packages/xkill/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xkill(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xkill" xorg_mirror_path = "app/xkill-1.0.4.tar.gz" + license("MIT") + version("1.0.6", sha256="3b35a2f4b67dda1e98b6541488cd7f7343eb6e3dbe613aeff3d5a5a4c4c64b58") version("1.0.5", sha256="98fab8a8af78d5aae4e1f284b580c60e3d25ed2a72daa4dbce419b28d8adaf8a") version("1.0.4", sha256="f80115f2dcca3d4b61f3c28188752c21ca7b2718b54b6e0274c0497a7f827da0") diff --git a/var/spack/repos/builtin/packages/xlc/detection_test.yaml b/var/spack/repos/builtin/packages/xlc/detection_test.yaml new file mode 100644 index 00000000000000..e76c608abaaa7c --- /dev/null +++ b/var/spack/repos/builtin/packages/xlc/detection_test.yaml @@ -0,0 +1,18 @@ +paths: + - layout: + - executables: + - "bin/xlc" + - "bin/xlc++" + - "bin/xlc_r" + - "bin/xlc++_r" + script: | + echo "IBM XL C/C++ for Linux, V16.1.1 (5725-C73, 5765-J13)" + echo "Version: 16.01.0001.0006" + - executables: + - "bin/xlcuf" + script: | + echo "IBM XL Fortran for Linux, V16.1.1 (5725-C73, 5765-J13)" + echo "Version: 16.01.0001.0006" + results: + - spec: "xlc+r@16.1" + - spec: "xlc~r@16.1" diff --git a/var/spack/repos/builtin/packages/xlc/package.py b/var/spack/repos/builtin/packages/xlc/package.py index 314cf61fdd7e56..983db7739b46b6 100644 --- a/var/spack/repos/builtin/packages/xlc/package.py +++ b/var/spack/repos/builtin/packages/xlc/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xlf/detection_test.yaml b/var/spack/repos/builtin/packages/xlf/detection_test.yaml new file mode 100644 index 00000000000000..461ef007d74a55 --- /dev/null +++ b/var/spack/repos/builtin/packages/xlf/detection_test.yaml @@ -0,0 +1,11 @@ +paths: + - layout: + - executables: + - "bin/xlf" + - "bin/xlf_r" + script: | + echo "IBM XL Fortran for Linux, V16.1.1 (5725-C73, 5765-J13)" + echo "Version: 16.01.0001.0006" + results: + - spec: "xlf+r@16.1" + - spec: "xlf~r@16.1" diff --git a/var/spack/repos/builtin/packages/xlf/package.py b/var/spack/repos/builtin/packages/xlf/package.py index 6c3d7cda489851..dc26e7fd91630f 100644 --- a/var/spack/repos/builtin/packages/xlf/package.py +++ b/var/spack/repos/builtin/packages/xlf/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index c1950daaf0cdbb..7c6b24fcde1dc0 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xload(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xload" xorg_mirror_path = "app/xload-1.1.3.tar.gz" + license("MIT") + version("1.1.4", sha256="4e3d240ab63e02f2ddac8182519d94bea82bda4887e3e364dd8832a04ca8436a") version("1.1.3", sha256="9952e841d25ab2fd0ce5e27ba91858331c3f97575d726481772d4deb89432483") version("1.1.2", sha256="4863ad339d22c41a0ca030dc5886404f5ae8b8c47cd5e09f0e36407edbdbe769") diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py index ab7b90218c4cff..aa556d31abdfc1 100644 --- a/var/spack/repos/builtin/packages/xlogo/package.py +++ b/var/spack/repos/builtin/packages/xlogo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py index b7bed3f578fed5..7f28f2bd5b1432 100644 --- a/var/spack/repos/builtin/packages/xlsatoms/package.py +++ b/var/spack/repos/builtin/packages/xlsatoms/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py index 577a52e32b5c93..bf42cd27cda516 100644 --- a/var/spack/repos/builtin/packages/xlsclients/package.py +++ b/var/spack/repos/builtin/packages/xlsclients/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py index fc747d5752968b..4efceb02beea17 100644 --- a/var/spack/repos/builtin/packages/xlsfonts/package.py +++ b/var/spack/repos/builtin/packages/xlsfonts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py index 6f2905fee7d1d9..18ece436a9755f 100644 --- a/var/spack/repos/builtin/packages/xmag/package.py +++ b/var/spack/repos/builtin/packages/xmag/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xmag(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xmag" xorg_mirror_path = "app/xmag-1.0.6.tar.gz" + license("custom") + version("1.0.7", sha256="bf94f5ac6ad0dd423b3ee8fb78710d1e47ad7e9fc8b4cf561851fba5370e38eb") version("1.0.6", sha256="07c5ec9114376dcd9a3303a38779e79b949d486f3b832d4a438550357d797aa5") diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py index 0bd3759f63bf72..48ed103f021cca 100644 --- a/var/spack/repos/builtin/packages/xman/package.py +++ b/var/spack/repos/builtin/packages/xman/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xman(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xman" xorg_mirror_path = "app/xman-1.1.4.tar.gz" + license("X11") + version("1.1.5", sha256="ff0aeb164fcb736b381bd7722c27aa0284cafb9a5d1b3940c3c3ee0af642f204") version("1.1.4", sha256="72fd0d479624a31d9a7330e5fdd220b7aa144744781f8e78aa12deece86e05c7") diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py index 7950328b28909b..26727768863084 100644 --- a/var/spack/repos/builtin/packages/xmessage/package.py +++ b/var/spack/repos/builtin/packages/xmessage/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xmessage(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xmessage" xorg_mirror_path = "app/xmessage-1.0.4.tar.gz" + license("MIT") + version("1.0.6", sha256="46acfb25c531f59a24abc85b14b956c9c03c870757dddae4d6d083833924a071") version("1.0.5", sha256="99533a90ab66e268180a8400796950a7f560ea9421e2c3f32284cabc1858806b") version("1.0.4", sha256="883099c3952c8cace5bd11d3df2e9ca143fc07375997435d5ff4f2d50353acca") diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index 51bf420ec2405c..e751b144d8c0ea 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xmlf90/package.py b/var/spack/repos/builtin/packages/xmlf90/package.py index f9d964b94b4ceb..715c4ccf14eafb 100644 --- a/var/spack/repos/builtin/packages/xmlf90/package.py +++ b/var/spack/repos/builtin/packages/xmlf90/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xmlf90(AutotoolsPackage): homepage = "https://launchpad.net/xmlf90" url = "https://launchpad.net/xmlf90/trunk/1.5/+download/xmlf90-1.5.4.tar.gz" + license("BSD-2-Clause") + version("1.5.4", sha256="a0b1324ff224d5b5ad1127a6ad4f90979f6b127f1a517f98253eea377237bbe4") version("1.5.3", sha256="a5378a5d9df4b617f51382092999eb0f20fa1a90ab49afbccfd80aa51650d27c") version("1.5.2", sha256="666694db793828d1d1e9aea665f75c75ee21772693465a88b43e6370862abfa6") diff --git a/var/spack/repos/builtin/packages/xmlrpc-c/package.py b/var/spack/repos/builtin/packages/xmlrpc-c/package.py index 95ec6f7f92d2a6..080b08658495c8 100644 --- a/var/spack/repos/builtin/packages/xmlrpc-c/package.py +++ b/var/spack/repos/builtin/packages/xmlrpc-c/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class XmlrpcC(AutotoolsPackage): homepage = "https://sourceforge.net/projects/xmlrpc-c/" url = "https://sourceforge.net/projects/xmlrpc-c/files/Xmlrpc-c%20Super%20Stable/1.51.06/xmlrpc-c-1.51.06.tgz" + license("BSD-3-Clause AND MIT", checked_by="tgamblin") + version("1.51.06", sha256="06dcd87d9c88374559369ffbe83b3139cf41418c1a2d03f20e08808085f89fd0") variant("curl", default=False, description="Build the XMLRPC curl client") diff --git a/var/spack/repos/builtin/packages/xmlto/package.py b/var/spack/repos/builtin/packages/xmlto/package.py index ca5748188176fd..d70e6f6dda5cd0 100644 --- a/var/spack/repos/builtin/packages/xmlto/package.py +++ b/var/spack/repos/builtin/packages/xmlto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xmlto(AutotoolsPackage): homepage = "https://pagure.io/xmlto" url = "https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.gz" + license("GPL-2.0-or-later") + version("0.0.28", sha256="2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3") # FIXME: missing a lot of dependencies diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py index be5cde1e882625..d3544926c5c453 100644 --- a/var/spack/repos/builtin/packages/xmodmap/package.py +++ b/var/spack/repos/builtin/packages/xmodmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Xmodmap(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xmodmap" xorg_mirror_path = "app/xmodmap-1.0.9.tar.gz" + license("MIT") + version("1.0.11", sha256="c4fac9df448b98ac5a1620f364e74ed5f7084baae0d09123700f34d4b63cb5d8") version("1.0.10", sha256="d4e9dc4cb034d0d774d059498d05348869934c52b0f24b0f3913823090b88640") version("1.0.9", sha256="73427a996f0fcda2a2c7ac96cfc4edd5985aeb13b48053f55ae7f63a668fadef") diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py index d46661e560e223..782484dc156edd 100644 --- a/var/spack/repos/builtin/packages/xmore/package.py +++ b/var/spack/repos/builtin/packages/xmore/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xnnpack/package.py b/var/spack/repos/builtin/packages/xnnpack/package.py index 4307c2da2b6d54..9549e256db2613 100644 --- a/var/spack/repos/builtin/packages/xnnpack/package.py +++ b/var/spack/repos/builtin/packages/xnnpack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xnnpack(CMakePackage): homepage = "https://github.com/google/XNNPACK" git = "https://github.com/google/XNNPACK.git" + license("BSD-3-Clause") + version("master", branch="master") version("2022-02-16", commit="ae108ef49aa5623b896fc93d4298c49d1750d9ba") # py-torch@1.12 version("2021-06-21", commit="79cd5f9e18ad0925ac9a050b00ea5a36230072db") # py-torch@1.10:1.11 diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index c34c2ff9e165fa..578c10e7f4d2e4 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class XorgCfFiles(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/util/cf" xorg_mirror_path = "util/xorg-cf-files-1.0.6.tar.gz" + license("custom") + version("1.0.6", sha256="6d56094e5d1a6c7d7a9576ac3a0fc2c042344509ea900d59f4b23df668b96c7a") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py index 80819f75333ffe..73a861422d9e23 100644 --- a/var/spack/repos/builtin/packages/xorg-docs/package.py +++ b/var/spack/repos/builtin/packages/xorg-docs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py index ead98fca38ce8f..1a22f1256536c3 100644 --- a/var/spack/repos/builtin/packages/xorg-gtest/package.py +++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py index ece6599acad4d0..3bafc23339d2d8 100644 --- a/var/spack/repos/builtin/packages/xorg-server/package.py +++ b/var/spack/repos/builtin/packages/xorg-server/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class XorgServer(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/xserver" xorg_mirror_path = "xserver/xorg-server-1.18.99.901.tar.gz" + license("MIT") + version( "1.18.99.901", sha256="c8425163b588de2ee7e5c8e65b0749f2710f55a7e02a8d1dc83b3630868ceb21" ) diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py index 7d12795ba89121..a92365b1344784 100644 --- a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py +++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class XorgSgmlDoctools(AutotoolsPackage, XorgPackage): maintainers("wdconinc") + license("MIT") + version("1.12", sha256="985a0329e6a6dadd6ad517f8d54f8766ab4b52bb8da7b07d02ec466bec444bdb") version("1.11", sha256="986326d7b4dd2ad298f61d8d41fe3929ac6191c6000d6d7e47a8ffc0c34e7426") diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py index f1987f323a6379..3eec5ffc2163e5 100644 --- a/var/spack/repos/builtin/packages/xphelloworld/package.py +++ b/var/spack/repos/builtin/packages/xphelloworld/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xplor-nih/package.py b/var/spack/repos/builtin/packages/xplor-nih/package.py index c86a8a3becaf40..4dd10cb874e142 100644 --- a/var/spack/repos/builtin/packages/xplor-nih/package.py +++ b/var/spack/repos/builtin/packages/xplor-nih/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py index 3126d083b2abae..901bfaa0e4836f 100644 --- a/var/spack/repos/builtin/packages/xplsprinters/package.py +++ b/var/spack/repos/builtin/packages/xplsprinters/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xpmem/package.py b/var/spack/repos/builtin/packages/xpmem/package.py index c8091478d49b37..cd437e3cf76530 100644 --- a/var/spack/repos/builtin/packages/xpmem/package.py +++ b/var/spack/repos/builtin/packages/xpmem/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Xpmem(AutotoolsPackage): maintainers("skosukhin") + license("LGPL-2.1-or-later") + version("master", branch="master") # Versions starting 2.6.4 are neither tagged nor released in the repo diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py index f6fdda96203c2b..291aa4e031add6 100644 --- a/var/spack/repos/builtin/packages/xpr/package.py +++ b/var/spack/repos/builtin/packages/xpr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py index cbb15de408bedc..5ad7f37fb3ccc2 100644 --- a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py +++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index 25b151ca5996da..b426118a02f53e 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xprop(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xprop" xorg_mirror_path = "app/xprop-1.2.2.tar.gz" + license("MIT") + version("1.2.6", sha256="58ee5ee0c47fa454d3b16312e778c3f549605a8ad0fd0daafc70d2d6174b116d") version("1.2.5", sha256="b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670") version("1.2.4", sha256="dddb6e208ffa515e68f001c22077a465f1365a4bcf91d9b37f336a6c0d15400d") diff --git a/var/spack/repos/builtin/packages/xproperty/package.py b/var/spack/repos/builtin/packages/xproperty/package.py index f95d484b6bcb09..9d8a0d1483192d 100644 --- a/var/spack/repos/builtin/packages/xproperty/package.py +++ b/var/spack/repos/builtin/packages/xproperty/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xproperty(CMakePackage): maintainers("tomstitt") + license("BSD-3-Clause") + version("master", branch="master") version("0.11.0", sha256="bf86a11c6758308aa0aa0f64d8dd24cd3e9d78378467b74002f552bfb75fc0eb") diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py index 0a2233603a04c7..b7403f13bd03cb 100644 --- a/var/spack/repos/builtin/packages/xproto/package.py +++ b/var/spack/repos/builtin/packages/xproto/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py index 1e8efb255e3e14..a9a148972290ed 100644 --- a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py +++ b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xqilla/package.py b/var/spack/repos/builtin/packages/xqilla/package.py index 5c9f1ca2f33338..03efa9b1b4bbdc 100644 --- a/var/spack/repos/builtin/packages/xqilla/package.py +++ b/var/spack/repos/builtin/packages/xqilla/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xqilla(AutotoolsPackage, SourceforgePackage): homepage = "http://xqilla.sourceforge.net/HomePage" sourceforge_mirror_path = "xqilla/XQilla-2.3.3.tar.gz" + license("Apache-2.0") + version("2.3.3", sha256="8f76b9b4f966f315acc2a8e104e426d8a76ba4ea3441b0ecfdd1e39195674fd6") variant("debug", default=False, description="Build a debugging version.") diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py index ed1ed9ef9eeea2..cbebdf46176c46 100644 --- a/var/spack/repos/builtin/packages/xrandr/package.py +++ b/var/spack/repos/builtin/packages/xrandr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,12 @@ class Xrandr(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xrandr" xorg_mirror_path = "app/xrandr-1.5.0.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.5.2", sha256="efd062cd228dc18a7de26422c81bc4be6a7e62f7f0ad6f9bebdd9ff8385c5668") + version("1.5.1", sha256="7b99edb7970a1365eaf5bcaf552144e4dfc3ccf510c4abc08569849929fb366e") version("1.5.0", sha256="ddfe8e7866149c24ccce8e6aaa0623218ae19130c2859cadcaa4228d8bb4a46d") depends_on("libxrandr@1.5:") diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py index 1ccc0d6ecb73d0..d60b5a4ddb0a6a 100644 --- a/var/spack/repos/builtin/packages/xrdb/package.py +++ b/var/spack/repos/builtin/packages/xrdb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xrdb(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xrdb" xorg_mirror_path = "app/xrdb-1.1.0.tar.gz" + license("MIT") + version("1.2.1", sha256="e674f5fb081a023e54878c0aac728dc30feb821207c989cff17a60f0c4a80ced") version("1.2.0", sha256="7dec50e243d55c6a0623ff828355259b6a110de74a0c65c40529514324ef7938") version("1.1.1", sha256="d19f856296c5f1742a703afc620654efc76fedfb86e1afe0bff9f1038b9e8a47") diff --git a/var/spack/repos/builtin/packages/xrdcl-record/package.py b/var/spack/repos/builtin/packages/xrdcl-record/package.py index c43f668a612149..606fade55c4295 100644 --- a/var/spack/repos/builtin/packages/xrdcl-record/package.py +++ b/var/spack/repos/builtin/packages/xrdcl-record/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,7 +13,7 @@ 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") + license("BSD-3-Clause") version("5.4.2", sha256="fb76284491ff4e723bce4c9e9d87347e98e278e70c597167bc39a162bc876734") diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index c7b65bddbca23e..d9fa199988387d 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xrefresh(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xrefresh" xorg_mirror_path = "app/xrefresh-1.0.5.tar.gz" + license("MIT") + version("1.0.7", sha256="f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337") version("1.0.6", sha256="0dda726365d341c00aed0f9cfebf3d2cfaa0c661212c73c0114cbb4ce92f357e") version("1.0.5", sha256="b373cc1ecd37c3d787e7074ce89a8a06ea173d7ba9e73fa48de973c759fbcf38") diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 37255235235b37..8b96436899329c 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Xrootd(CMakePackage): maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb", "wdconinc") + license("LGPL-3.0-only") + version("5.6.1", sha256="9afc48ab0fb3ba69611b1edc1b682a185d49b45caf197323eecd1146d705370c") version("5.6.0", sha256="cda0d32d29f94220be9b6627a80386eb33fac2dcc25c8104569eaa4ea3563009") version("5.5.5", sha256="0710caae527082e73d3bf8f9d1dffe95808afd3fcaaaa15ab0b937b8b226bc1f") @@ -201,12 +203,7 @@ def cmake_args(self): ] # see https://github.com/spack/spack/pull/11581 if "+python" in self.spec: - options.extend( - [ - define("PYTHON_EXECUTABLE", spec["python"].command.path), - define("XRD_PYTHON_REQ_VERSION", spec["python"].version.up_to(2)), - ] - ) + options.append(define("XRD_PYTHON_REQ_VERSION", spec["python"].version.up_to(2))) if "+scitokens-cpp" in self.spec: options.append("-DSCITOKENS_CPP_DIR=%s" % spec["scitokens-cpp"].prefix) diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py index abf5f692166ac1..b354252f5c1ca3 100644 --- a/var/spack/repos/builtin/packages/xrx/package.py +++ b/var/spack/repos/builtin/packages/xrx/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py index 4e152807cc2334..5525b5be471770 100644 --- a/var/spack/repos/builtin/packages/xsbench/package.py +++ b/var/spack/repos/builtin/packages/xsbench/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py index 239307c9ad17b7..43b8a3aa4dcd24 100644 --- a/var/spack/repos/builtin/packages/xscope/package.py +++ b/var/spack/repos/builtin/packages/xscope/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xscope(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xscope" xorg_mirror_path = "app/xscope-1.4.1.tar.gz" + license("MIT") + version("1.4.3", sha256="86f9da3cf0422b5964191c9e8f792e107577818de094b38db0a6dbce403a9b54") version("1.4.2", sha256="e12d634a69ce1ec36b0afd1d40814215e262801a030ddf83d7d0348cd046b381") version("1.4.1", sha256="f99558a64e828cd2c352091ed362ad2ef42b1c55ef5c01cbf782be9735bb6de3") diff --git a/var/spack/repos/builtin/packages/xsd/package.py b/var/spack/repos/builtin/packages/xsd/package.py index b56b50a06eaa19..44fa3fc14b1110 100644 --- a/var/spack/repos/builtin/packages/xsd/package.py +++ b/var/spack/repos/builtin/packages/xsd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xsdk-examples/package.py b/var/spack/repos/builtin/packages/xsdk-examples/package.py index 1f39bcada70f1f..4978f57049d925 100644 --- a/var/spack/repos/builtin/packages/xsdk-examples/package.py +++ b/var/spack/repos/builtin/packages/xsdk-examples/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -39,14 +39,20 @@ class XsdkExamples(CMakePackage, CudaPackage, ROCmPackage): # Use ^dealii~hdf5 because of HDF5 linking issue in deal.II 9.4.0. # Disable 'arborx' to remove the 'kokkos' dependency which conflicts with # the internal Kokkos used by 'trilinos': - depends_on("xsdk@0.8.0 ~arborx ^mfem+pumi ^dealii~hdf5", when="@0.4.0") - depends_on("xsdk@0.8.0 ^mfem+strumpack", when="@0.4.0 ^xsdk+strumpack") - depends_on("xsdk@0.8.0 ^mfem+ginkgo", when="@0.4.0 ^xsdk+ginkgo") - depends_on("xsdk@0.8.0 ^mfem+hiop", when="@0.4.0 ^xsdk+hiop") - depends_on("xsdk@0.8.0 ^sundials+magma", when="@0.4.0 +cuda") - depends_on("xsdk@0.7.0", when="@0.3.0") - depends_on("xsdk@0.7.0 ^mfem+strumpack", when="@0.3.0 ^xsdk+strumpack") - depends_on("xsdk@0.7.0 ^sundials+magma", when="@0.3.0 +cuda") + with when("@0.4.0"): + depends_on("xsdk@0.8.0 ~arborx") + depends_on("mfem+pumi") + depends_on("dealii~hdf5") + depends_on("mfem+strumpack", when="^xsdk+strumpack") + depends_on("mfem+ginkgo", when="^xsdk+ginkgo") + depends_on("mfem+hiop", when="^xsdk+hiop") + depends_on("sundials+magma", when="+cuda") + + with when("@0.3.0"): + depends_on("xsdk@0.7.0") + depends_on("mfem+strumpack", when="^xsdk+strumpack") + depends_on("sundials+magma", when="+cuda") + depends_on("mpi") depends_on("cmake@3.21:", type="build", when="@0.3.0:") diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 3e02dbd8b36a61..cf4990a99c1265 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -85,9 +85,11 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): maintainers("balay", "luszczek", "balos1", "shuds13", "v-dobrev") version("develop") + version("1.0.0") version("0.8.0") version("0.7.0", deprecated=True) + variant("sycl", default=False, sticky=True, description="Enable sycl variant of xsdk packages") variant("trilinos", default=True, sticky=True, description="Enable trilinos package build") variant("datatransferkit", default=True, description="Enable datatransferkit package build") variant("omega-h", default=True, description="Enable omega-h package build") @@ -107,8 +109,14 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): variant("exago", default=True, description="Enable exago build") variant("hiop", default=True, description="Enable hiop build") variant("raja", default=(sys.platform != "darwin"), description="Enable raja for hiop, exago") + variant("pflotran", default=True, description="Enable pflotran package build") - xsdk_depends_on("hypre@develop+superlu-dist+shared", when="@develop", cuda_var="cuda") + xsdk_depends_on( + "hypre@develop+superlu-dist+shared", when="@develop", cuda_var="cuda", rocm_var="rocm" + ) + xsdk_depends_on( + "hypre@2.30.0+superlu-dist+shared", when="@1.0.0", cuda_var="cuda", rocm_var="rocm" + ) xsdk_depends_on("hypre@2.26.0+superlu-dist+shared", when="@0.8.0", cuda_var="cuda") xsdk_depends_on("hypre@2.23.0+superlu-dist+shared", when="@0.7.0", cuda_var="cuda") @@ -118,6 +126,12 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): cuda_var="cuda", rocm_var="rocm", ) + xsdk_depends_on( + "mfem@4.6.0+shared+mpi+superlu-dist+petsc+sundials+examples+miniapps", + when="@1.0.0", + cuda_var="cuda", + rocm_var="rocm", + ) xsdk_depends_on( "mfem@4.5.0+shared+mpi+superlu-dist+petsc+sundials+examples+miniapps", when="@0.8.0", @@ -131,16 +145,26 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): rocm_var="rocm", ) - xsdk_depends_on("superlu-dist@develop", when="@develop") + xsdk_depends_on("superlu-dist@develop", when="@develop", cuda_var="cuda", rocm_var="rocm") + xsdk_depends_on("superlu-dist@8.2.1", when="@1.0.0", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("superlu-dist@8.1.2", when="@0.8.0") xsdk_depends_on("superlu-dist@7.1.1", when="@0.7.0") + + xsdk_depends_on("trilinos +superlu-dist", when="@1.0.0: +trilinos ~cuda ~rocm") xsdk_depends_on( - "trilinos@develop+hypre+superlu-dist+hdf5~mumps+boost" + "trilinos@develop+hypre+hdf5~mumps+boost" + "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2" + "~exodus~dtk+intrepid2+shards+stratimikos gotype=int" + " cxxstd=14", when="@develop +trilinos", ) + xsdk_depends_on( + "trilinos@14.4.0+hypre+hdf5~mumps+boost" + + "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2" + + "~exodus~dtk+intrepid2+shards+stratimikos gotype=int" + + " cxxstd=17", + when="@1.0.0 +trilinos", + ) xsdk_depends_on( "trilinos@13.4.1+hypre+superlu-dist+hdf5~mumps+boost" + "~suite-sparse+tpetra+nox+ifpack2+zoltan+zoltan2+amesos2" @@ -157,17 +181,25 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): ) xsdk_depends_on("datatransferkit@master", when="@develop +trilinos +datatransferkit") + xsdk_depends_on("datatransferkit@3.1.1", when="@1.0.0 +trilinos +datatransferkit") dtk7ver = "3.1-rc2" if sys.platform == "darwin" else "3.1-rc3" xsdk_depends_on("datatransferkit@" + dtk7ver, when="@0.8.0 +trilinos +datatransferkit") xsdk_depends_on("datatransferkit@" + dtk7ver, when="@0.7.0 +trilinos +datatransferkit") xsdk_depends_on("petsc +batch", when="@0.7.0: ^cray-mpich") + xsdk_depends_on("petsc +sycl +kokkos", when="@1.0.0: +sycl") xsdk_depends_on( "petsc@main+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64", when="@develop", cuda_var="cuda", rocm_var="rocm", ) + xsdk_depends_on( + "petsc@3.20.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64", + when="@1.0.0", + cuda_var="cuda", + rocm_var="rocm", + ) xsdk_depends_on( "petsc@3.18.1+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64", when="@0.8.0", @@ -184,9 +216,14 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("dealii ~trilinos", when="~trilinos +dealii") xsdk_depends_on( "dealii@master~assimp~python~doc~gmsh+petsc+slepc+mpi~int64" - + "~netcdf+metis+sundials~ginkgo~symengine~nanoflann~simplex~arborx~cgal", + + "~netcdf+metis+sundials~ginkgo~symengine~nanoflann~simplex~arborx~cgal~oce", when="@develop +dealii", ) + xsdk_depends_on( + "dealii@9.5.1~assimp~python~doc~gmsh+petsc+slepc+mpi~int64" + + "~netcdf+metis+sundials~ginkgo~symengine~simplex~arborx~cgal~oce", + when="@1.0.0 +dealii", + ) xsdk_depends_on( "dealii@9.4.0~assimp~python~doc~gmsh+petsc+slepc+mpi~int64" + "~netcdf+metis+sundials~ginkgo~symengine~simplex~arborx~cgal", @@ -198,22 +235,31 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): when="@0.7.0 +dealii", ) - xsdk_depends_on("pflotran@develop", when="@develop") - xsdk_depends_on("pflotran@4.0.1", when="@0.8.0") - xsdk_depends_on("pflotran@3.0.2", when="@0.7.0") + xsdk_depends_on("pflotran@develop", when="@develop +pflotran") + xsdk_depends_on("pflotran@5.0.0", when="@1.0.0 +pflotran") + xsdk_depends_on("pflotran@4.0.1", when="@0.8.0 +pflotran") + xsdk_depends_on("pflotran@3.0.2", when="@0.7.0 +pflotran") xsdk_depends_on("alquimia@master", when="@develop +alquimia") + xsdk_depends_on("alquimia@1.1.0", when="@1.0.0 +alquimia") xsdk_depends_on("alquimia@1.0.10", when="@0.8.0 +alquimia") xsdk_depends_on("alquimia@1.0.9", when="@0.7.0 +alquimia") xsdk_depends_on("sundials +trilinos", when="+trilinos @0.7.0:") xsdk_depends_on("sundials +ginkgo", when="+ginkgo @0.8.0:") + xsdk_depends_on("sundials +sycl cxxstd=17", when="@1.0.0: +sycl") xsdk_depends_on( "sundials@develop~int64+hypre+petsc+superlu-dist", when="@develop", cuda_var=["cuda", "?magma"], rocm_var=["rocm", "?magma"], ) + xsdk_depends_on( + "sundials@6.6.2~int64+hypre+petsc+superlu-dist", + when="@1.0.0", + cuda_var=["cuda", "?magma"], + rocm_var=["rocm", "?magma"], + ) xsdk_depends_on( "sundials@6.4.1~int64+hypre+petsc+superlu-dist", when="@0.8.0", @@ -228,13 +274,16 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): ) xsdk_depends_on("plasma@develop:", when="@develop %gcc@6.0:") + xsdk_depends_on("plasma@23.8.2:", when="@1.0.0 %gcc@6.0:") xsdk_depends_on("plasma@22.9.29:", when="@0.8.0 %gcc@6.0:") xsdk_depends_on("plasma@21.8.29:", when="@0.7.0 %gcc@6.0:") xsdk_depends_on("magma@master", when="@develop", cuda_var="?cuda", rocm_var="?rocm") + xsdk_depends_on("magma@2.7.1", when="@1.0.0", cuda_var="?cuda", rocm_var="?rocm") xsdk_depends_on("magma@2.7.0", when="@0.8.0", cuda_var="?cuda", rocm_var="?rocm") xsdk_depends_on("magma@2.6.1", when="@0.7.0", cuda_var="?cuda", rocm_var="?rocm") + xsdk_depends_on("amrex +sycl", when="@1.0.0: +sycl") xsdk_depends_on( "amrex@develop+sundials", when="@develop %intel", cuda_var="cuda", rocm_var="rocm" ) @@ -244,6 +293,9 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on( "amrex@develop+sundials", when="@develop %cce", cuda_var="cuda", rocm_var="rocm" ) + xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %intel", cuda_var="cuda", rocm_var="rocm") + xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %gcc", cuda_var="cuda", rocm_var="rocm") + xsdk_depends_on("amrex@23.08+sundials", when="@1.0.0 %cce", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %intel", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %gcc", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("amrex@22.09+sundials", when="@0.8.0 %cce", cuda_var="cuda", rocm_var="rocm") @@ -252,32 +304,39 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("amrex@21.10+sundials", when="@0.7.0 %cce", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("slepc@main", when="@develop") + xsdk_depends_on("slepc@3.20.0", when="@1.0.0", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("slepc@3.18.1", when="@0.8.0", cuda_var="cuda", rocm_var="rocm") xsdk_depends_on("slepc@3.16.0", when="@0.7.0") xsdk_depends_on("omega-h +trilinos", when="+trilinos +omega-h") xsdk_depends_on("omega-h ~trilinos", when="~trilinos +omega-h") xsdk_depends_on("omega-h@main", when="@develop +omega-h") + xsdk_depends_on("omega-h@scorec.10.6.0", when="@1.0.0 +omega-h") xsdk_depends_on("omega-h@9.34.13", when="@0.8.0 +omega-h") xsdk_depends_on("omega-h@9.34.1", when="@0.7.0 +omega-h") xsdk_depends_on("strumpack ~cuda", when="~cuda @0.7.0: +strumpack") xsdk_depends_on("strumpack ~slate~openmp", when="~slate @0.8.0: +strumpack") xsdk_depends_on("strumpack@master", when="@develop +strumpack", cuda_var=["cuda"]) + xsdk_depends_on("strumpack@7.2.0", when="@1.0.0 +strumpack", cuda_var=["cuda"]) xsdk_depends_on("strumpack@7.0.1", when="@0.8.0 +strumpack", cuda_var=["cuda"]) xsdk_depends_on("strumpack@6.1.0~slate~openmp", when="@0.7.0 +strumpack") xsdk_depends_on("pumi@master+shared", when="@develop") + xsdk_depends_on("pumi@2.2.8+shared", when="@1.0.0") xsdk_depends_on("pumi@2.2.7+shared", when="@0.8.0") xsdk_depends_on("pumi@2.2.6", when="@0.7.0") tasmanian_openmp = "~openmp" if sys.platform == "darwin" else "+openmp" xsdk_depends_on( - "tasmanian@develop+xsdkflags+blas" + tasmanian_openmp, + "tasmanian@develop+blas" + tasmanian_openmp, when="@develop", cuda_var=["cuda", "?magma"], rocm_var=["rocm", "?magma"], ) + xsdk_depends_on( + "tasmanian@8.0+mpi+blas" + tasmanian_openmp, when="@1.0.0", cuda_var=["cuda", "?magma"] + ) xsdk_depends_on( "tasmanian@7.9+xsdkflags+mpi+blas" + tasmanian_openmp, when="@0.8.0", @@ -290,6 +349,8 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): ) xsdk_depends_on("arborx@master", when="@develop +arborx") + xsdk_depends_on("arborx+sycl", when="@1.0.0: +arborx +sycl") + xsdk_depends_on("arborx@1.4.1", when="@1.0.0 +arborx") xsdk_depends_on("arborx@1.2", when="@0.8.0 +arborx") xsdk_depends_on("arborx@1.1", when="@0.7.0 +arborx") @@ -302,12 +363,17 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("phist kernel_lib=tpetra", when="+trilinos +phist") xsdk_depends_on("phist kernel_lib=petsc", when="~trilinos +phist") xsdk_depends_on("phist@develop ~fortran ~scamac ~openmp ~host ~int64", when="@develop +phist") + xsdk_depends_on("phist@1.12.0 ~fortran ~scamac ~openmp ~host ~int64", when="@1.0.0 +phist") xsdk_depends_on("phist@1.11.2 ~fortran ~scamac ~openmp ~host ~int64", when="@0.8.0 +phist") xsdk_depends_on("phist@1.9.5 ~fortran ~scamac ~openmp ~host ~int64", when="@0.7.0 +phist") + xsdk_depends_on("ginkgo+sycl", when="@1.0.0: +ginkgo +sycl") xsdk_depends_on( "ginkgo@develop +mpi ~openmp", when="@develop +ginkgo", cuda_var="cuda", rocm_var="rocm" ) + xsdk_depends_on( + "ginkgo@1.7.0 +mpi ~openmp", when="@1.0.0 +ginkgo", cuda_var="cuda", rocm_var="rocm" + ) xsdk_depends_on( "ginkgo@1.5.0 +mpi ~openmp", when="@0.8.0 +ginkgo", cuda_var="cuda", rocm_var="rocm" ) @@ -317,6 +383,8 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("py-libensemble@develop+petsc4py", when="@develop +libensemble") xsdk_depends_on("py-petsc4py@main", when="@develop +libensemble") + xsdk_depends_on("py-libensemble@1.0.0+petsc4py", when="@1.0.0 +libensemble") + xsdk_depends_on("py-petsc4py@3.20.1", when="@1.0.0 +libensemble") xsdk_depends_on("py-libensemble@0.9.3+petsc4py", when="@0.8.0 +libensemble") xsdk_depends_on("py-petsc4py@3.18.1", when="@0.8.0 +libensemble") xsdk_depends_on("py-libensemble@0.8.0+petsc4py", when="@0.7.0 +libensemble") @@ -324,11 +392,13 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): xsdk_depends_on("precice ~petsc", when="+precice ^cray-mpich") xsdk_depends_on("precice@develop", when="@develop +precice") + xsdk_depends_on("precice@2.5.0", when="@1.0.0 +precice") xsdk_depends_on("precice@2.5.0", when="@0.8.0 +precice") xsdk_depends_on("precice@2.3.0", when="@0.7.0 +precice") bfpk_openmp = "~openmp" if sys.platform == "darwin" else "+openmp" xsdk_depends_on("butterflypack@master", when="@develop +butterflypack") + xsdk_depends_on("butterflypack@2.4.0" + bfpk_openmp, when="@1.0.0 +butterflypack") xsdk_depends_on("butterflypack@2.2.2" + bfpk_openmp, when="@0.8.0 +butterflypack") xsdk_depends_on("butterflypack@2.0.0", when="@0.7.0 +butterflypack") @@ -338,6 +408,12 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): cuda_var=["cuda", "?magma"], rocm_var=["rocm", "?magma"], ) + xsdk_depends_on( + "heffte@2.4.0+fftw", + when="@1.0.0 +heffte", + cuda_var=["cuda", "?magma"], + rocm_var=["rocm", "?magma"], + ) xsdk_depends_on( "heffte@2.3.0+fftw", when="@0.8.0 +heffte", @@ -352,15 +428,20 @@ class Xsdk(BundlePackage, CudaPackage, ROCmPackage): ) xsdk_depends_on("slate@master", when="@develop +slate", cuda_var="cuda") + xsdk_depends_on("slate@2023.08.25", when="@1.0.0 +slate", cuda_var="cuda") xsdk_depends_on("slate@2022.07.00", when="@0.8.0 +slate", cuda_var="cuda") xsdk_depends_on("slate@2021.05.02", when="@0.7.0 +slate %gcc@6.0:", cuda_var="cuda") xsdk_depends_on("exago@develop~ipopt~hiop~python", when="@develop +exago ~raja") xsdk_depends_on("exago@develop~ipopt+hiop+raja", when="@develop +exago +raja", cuda_var="cuda") + xsdk_depends_on("exago@1.6.0~ipopt~hiop~python", when="@1.0.0 +exago ~raja") + xsdk_depends_on("exago@1.6.0~ipopt+hiop+raja", when="@1.0.0 +exago +raja", cuda_var="cuda") xsdk_depends_on("exago@1.5.0~ipopt~hiop~python", when="@0.8.0 +exago ~raja") xsdk_depends_on("exago@1.5.0~ipopt+hiop+raja", when="@0.8.0 +exago +raja", cuda_var="cuda") xsdk_depends_on("hiop@develop", when="@develop +hiop ~raja") xsdk_depends_on("hiop@develop+raja", when="@develop +hiop +raja", cuda_var="cuda") + xsdk_depends_on("hiop@1.0.0", when="@1.0.0 +hiop ~raja") + xsdk_depends_on("hiop@1.0.0+raja", when="@1.0.0 +hiop +raja", cuda_var="cuda") xsdk_depends_on("hiop@0.7.1", when="@0.8.0 +hiop ~raja") xsdk_depends_on("hiop@0.7.1+raja", when="@0.8.0 +hiop +raja", cuda_var="cuda") diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py index 92f0d8d5f9255a..8727bbdb435fca 100644 --- a/var/spack/repos/builtin/packages/xset/package.py +++ b/var/spack/repos/builtin/packages/xset/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xset(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xset" xorg_mirror_path = "app/xset-1.2.3.tar.gz" + license("MIT") + version("1.2.5", sha256="2068d1356d80c29ce283f0fff5895667b38f24ea95df363d3dde7b8c8a92fffe") version("1.2.4", sha256="3a05e8626298c7a79002ec5fb4949dcba8abc7a2b95c03ed5e0f5698c3b4dea0") version("1.2.3", sha256="5ecb2bb2cbf3c9349b735080b155a08c97b314dacedfc558c7f5a611ee1297f7") diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py index 3e6bb7e77a137c..bc477070784267 100644 --- a/var/spack/repos/builtin/packages/xsetmode/package.py +++ b/var/spack/repos/builtin/packages/xsetmode/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py index 4d4e198ed9ecf7..0a77e1f8440269 100644 --- a/var/spack/repos/builtin/packages/xsetpointer/package.py +++ b/var/spack/repos/builtin/packages/xsetpointer/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py index 7413a5224edd20..4c701d31dd39b8 100644 --- a/var/spack/repos/builtin/packages/xsetroot/package.py +++ b/var/spack/repos/builtin/packages/xsetroot/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xsetroot(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xsetroot" xorg_mirror_path = "app/xsetroot-1.1.1.tar.gz" + license("MIT") + version("1.1.3", sha256="80dbb0d02807e89294a042298b8a62f9aa0c3a94d89244ccbc35e4cf80fcaaba") version("1.1.2", sha256="9d007f5119be09924ac3a5d2bd506f32e6c164b82633c88d2aff26311e1a2a2b") version("1.1.1", sha256="6cdd48757d18835251124138b4a8e4008c3bbc51cf92533aa39c6ed03277168b") diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py index 0e570c8ea29895..b17899e084dee5 100644 --- a/var/spack/repos/builtin/packages/xsimd/package.py +++ b/var/spack/repos/builtin/packages/xsimd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xsimd(CMakePackage): maintainers("ax3l") + license("BSD-3-Clause") + version("develop", branch="master") version("8.1.0", sha256="d52551360d37709675237d2a0418e28f70995b5b7cdad7c674626bcfbbf48328") version("8.0.5", sha256="0e1b5d973b63009f06a3885931a37452580dbc8d7ca8ad40d4b8c80d2a0f84d7") diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py index f3933f8de6353b..5104bb886f8ad4 100644 --- a/var/spack/repos/builtin/packages/xsm/package.py +++ b/var/spack/repos/builtin/packages/xsm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py index 5726172e782fe4..bf4d21b0edc909 100644 --- a/var/spack/repos/builtin/packages/xstdcmap/package.py +++ b/var/spack/repos/builtin/packages/xstdcmap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xtb/package.py b/var/spack/repos/builtin/packages/xtb/package.py index b93d10497ec650..b8bab6d0d17079 100644 --- a/var/spack/repos/builtin/packages/xtb/package.py +++ b/var/spack/repos/builtin/packages/xtb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xtb(MesonPackage): maintainers("awvwgk") + license("LGPL-3.0-only") + version("6.6.0", sha256="8460113f2678dcb23220af17b734f1221af302f42126bb54e3ae356530933b85") version("6.5.1", sha256="0922205cc224fe79e28f3d75be4e10c03efa8f3f666aedec8346fed82b272cad") version("6.5.0", sha256="5f780656bf7b440a8e1f753a9a877401a7d497fb3160762f48bdefc8a9914976") diff --git a/var/spack/repos/builtin/packages/xtcdata/package.py b/var/spack/repos/builtin/packages/xtcdata/package.py index 1f540a214c7bf7..fa87a2f6cf1792 100644 --- a/var/spack/repos/builtin/packages/xtcdata/package.py +++ b/var/spack/repos/builtin/packages/xtcdata/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xtensor-blas/package.py b/var/spack/repos/builtin/packages/xtensor-blas/package.py index 3e6e8a220a8c4e..c43cd4a4da3cc8 100644 --- a/var/spack/repos/builtin/packages/xtensor-blas/package.py +++ b/var/spack/repos/builtin/packages/xtensor-blas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class XtensorBlas(CMakePackage): url = "https://github.com/xtensor-stack/xtensor-blas/archive/refs/tags/0.20.0.tar.gz" git = "git://github.com/xtensor-stack/xtensor-blas.git" + license("BSD-3-Clause") + version("develop", branch="master") version("0.20.0", sha256="272f5d99bb7511a616bfe41b13a000e63de46420f0b32a25fa4fb935b462c7ff") version("0.19.2", sha256="ef678c0e3f581cc8d61ea002c904c76513c8b0f798f9c9acaf980a835f9d09aa") diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py index 6dc6003ae04878..0d277428cdf3fd 100644 --- a/var/spack/repos/builtin/packages/xtensor-python/package.py +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class XtensorPython(CMakePackage): maintainers("ax3l") + license("BSD-3-Clause") + version("develop", branch="master") version("0.23.1", sha256="450b25f5c739df174b2a50774b89e68b23535fdc37cb55bd542ffdb7c78991ab") version("0.17.0", sha256="30f2e8c99376e38f942d62c0d2959bc1e52a562a4f8cc5e27ddc4d572a25e34c") @@ -31,11 +33,3 @@ class XtensorPython(CMakePackage): depends_on("python", type=("build", "link", "run")) extends("python") - - def cmake_args(self): - spec = self.spec - - python_exe = spec["python"].command.path - - args = ["-DPYTHON_EXECUTABLE={0}".format(python_exe)] - return args diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index adc882f21cd741..b7f1a3fa9e9858 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xtensor(CMakePackage): maintainers("ax3l") + license("BSD-3-Clause") + version("develop", branch="master") version("0.24.1", sha256="dd1bf4c4eba5fbcf386abba2627fcb4a947d14a806c33fde82d0cc1194807ee4") version("0.24.0", sha256="37738aa0865350b39f048e638735c05d78b5331073b6329693e8b8f0902df713") diff --git a/var/spack/repos/builtin/packages/xterm/package.py b/var/spack/repos/builtin/packages/xterm/package.py index 2280b267b67001..8e8f48ec587914 100644 --- a/var/spack/repos/builtin/packages/xterm/package.py +++ b/var/spack/repos/builtin/packages/xterm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xterm(AutotoolsPackage): homepage = "https://invisible-island.net/xterm/" url = "ftp://ftp.invisible-island.net/xterm/xterm-327.tgz" + license("MIT") + version("353", sha256="e521d3ee9def61f5d5c911afc74dd5c3a56ce147c7071c74023ea24cac9bb768") version("350", sha256="aefb59eefd310268080d1a90a447368fb97a9a6737bfecfc3800bf6cc304104d") version("340", sha256="b5c7f77b7afade798461e2a2f86d5af64f9c9c9f408b1af0f545add978df722a") diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py index 13138e099cfd17..c9d3029548c8d9 100644 --- a/var/spack/repos/builtin/packages/xtl/package.py +++ b/var/spack/repos/builtin/packages/xtl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xtl(CMakePackage): maintainers("ax3l") + license("BSD-3-Clause") + version("develop", branch="master") version("0.7.4", sha256="3c88be0e696b64150c4de7a70f9f09c00a335186b0b0b409771ef9f56bca7d9a") version("0.7.2", sha256="95c221bdc6eaba592878090916383e5b9390a076828552256693d5d97f78357c") diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py index 93c57feee585bf..83b2c02c38f58e 100644 --- a/var/spack/repos/builtin/packages/xtrans/package.py +++ b/var/spack/repos/builtin/packages/xtrans/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,11 @@ class Xtrans(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libxtrans" xorg_mirror_path = "lib/xtrans-1.3.5.tar.gz" + license("MIT") + + maintainers("wdconinc") + + version("1.5.0", sha256="a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86") version("1.4.0", sha256="48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9") version("1.3.5", sha256="b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d") diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py index 95d99a9f4aaa08..9f2abfbb095a0b 100644 --- a/var/spack/repos/builtin/packages/xtrap/package.py +++ b/var/spack/repos/builtin/packages/xtrap/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xts/package.py b/var/spack/repos/builtin/packages/xts/package.py index c64d9851b2115f..31ff532a8dc482 100644 --- a/var/spack/repos/builtin/packages/xts/package.py +++ b/var/spack/repos/builtin/packages/xts/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xv/package.py b/var/spack/repos/builtin/packages/xv/package.py index 2cdfb1e9bd2cbe..30a56226ee54b8 100644 --- a/var/spack/repos/builtin/packages/xv/package.py +++ b/var/spack/repos/builtin/packages/xv/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py index 7478eaaee72ee6..eeb9d3096a2fb9 100644 --- a/var/spack/repos/builtin/packages/xvidtune/package.py +++ b/var/spack/repos/builtin/packages/xvidtune/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xvidtune(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xvidtune" xorg_mirror_path = "app/xvidtune-1.0.3.tar.gz" + license("MIT") + version("1.0.4", sha256="e5982c9e6c5009f0061c187a9cc82368215bd004cfa464a3d738c90e1d258668") version("1.0.3", sha256="c0e158388d60e1ce054ce462958a46894604bd95e13093f3476ec6d9bbd786d4") diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py index 4143dbb8bd8eae..5b1f3aabb1a773 100644 --- a/var/spack/repos/builtin/packages/xvinfo/package.py +++ b/var/spack/repos/builtin/packages/xvinfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xvinfo(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xvinfo" xorg_mirror_path = "app/xvinfo-1.1.3.tar.gz" + license("MIT") + version("1.1.5", sha256="76fdc89a4e4207d0069ae3e511b4e30a60fcf86b630d01ef56d32ba5856e76c4") version("1.1.4", sha256="43d06be36fe10f247295fbe2edf1062740064343f2228d6a61b4f9feac4f7396") version("1.1.3", sha256="1c1c2f97abfe114389e94399cc7bf3dfd802ed30ad41ba23921d005bd8a6c39f") diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py index c7d176a5e906c2..954b8b2d6d8d52 100644 --- a/var/spack/repos/builtin/packages/xwd/package.py +++ b/var/spack/repos/builtin/packages/xwd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -12,6 +12,8 @@ class Xwd(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xwd" xorg_mirror_path = "app/xwd-1.0.6.tar.gz" + license("custom") + version("1.0.8", sha256="066d10a1b66a47efd7caa7d7aa670c0c26ff90c8408f0e30b4dfb29dcb39d4c4") version("1.0.7", sha256="1c5e86806234a96a29c90be1872128293c6def5ba69ecb70e161efe325e2ba03") version("1.0.6", sha256="ff01f0a4b736f955aaf7c8c3942211bc52f9fb75d96f2b19777f33fff5dc5b83") diff --git a/var/spack/repos/builtin/packages/xwidgets/package.py b/var/spack/repos/builtin/packages/xwidgets/package.py index fa7ef898c75d8c..aa108f75876e32 100644 --- a/var/spack/repos/builtin/packages/xwidgets/package.py +++ b/var/spack/repos/builtin/packages/xwidgets/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Xwidgets(CMakePackage): maintainers("tomstitt") + license("BSD-3-Clause") + version("master", branch="master") version("0.25.0", sha256="7b6d36999e3b926c40389167c48b33f234a075365f089f89571b33a160421d8e") diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index 23b4d9a2882ec1..57f8308b5d3d35 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Xwininfo(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xwininfo" xorg_mirror_path = "app/xwininfo-1.1.3.tar.gz" + license("MIT") + version("1.1.5", sha256="aaa915909bb509320c3c775c79babaccc063fd3edc39e520a3c0352e265e9f58") version("1.1.4", sha256="3561f6c37eec416ad306f41ff24172b86cbed00854dff8912915e97d2cc17c34") version("1.1.3", sha256="784f8b9c9ddab24ce4faa65fde6430a8d7cf3c0564573582452cc99c599bd941") diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py index 1d62fcd7c6e828..9a5098c512d0c4 100644 --- a/var/spack/repos/builtin/packages/xwud/package.py +++ b/var/spack/repos/builtin/packages/xwud/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/xxd-standalone/package.py b/var/spack/repos/builtin/packages/xxd-standalone/package.py index 553501aa94833b..c0bf61e3c76574 100644 --- a/var/spack/repos/builtin/packages/xxd-standalone/package.py +++ b/var/spack/repos/builtin/packages/xxd-standalone/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class XxdStandalone(MakefilePackage): provides("xxd") + license("Vim") + version("8.2.1201", sha256="39032fe866f44724b104468038dc9ac4ff2c00a4b18c9a1e2c27064ab1f1143d") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/xxdiff/package.py b/var/spack/repos/builtin/packages/xxdiff/package.py index f0b2705b2951e7..6acd871f836701 100644 --- a/var/spack/repos/builtin/packages/xxdiff/package.py +++ b/var/spack/repos/builtin/packages/xxdiff/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Xxdiff(MakefilePackage): maintainers("vanderwb") + license("GPL-2.0-or-later") + version("master", branch="master") version("2023-01-10", commit="604300ea9875611726ba885fb14f872b964df579") diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py index 5162efade5ca22..99661986c42598 100644 --- a/var/spack/repos/builtin/packages/xxhash/package.py +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -17,6 +17,8 @@ class Xxhash(MakefilePackage): homepage = "https://github.com/Cyan4973/xxHash" url = "https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz" + license("BSD-2-Clause") + version("0.8.1", sha256="3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c") version("0.8.0", sha256="7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f") version("0.7.4", sha256="4d9706c9da4fbdf901598f5e3b71db0eddd4ac962e827a73ebf75d66dfd820fe") diff --git a/var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch b/var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch similarity index 68% rename from var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch rename to var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch index 19def5492c22e5..66de5795796935 100644 --- a/var/spack/repos/builtin/packages/xyce/454-oneapi-xyce.patch +++ b/var/spack/repos/builtin/packages/xyce/454-cmake-xyce.patch @@ -1,16 +1,3 @@ -diff --git a/src/LinearAlgebraServicesPKG/ksparse/alloc.c b/src/LinearAlgebraServicesPKG/ksparse/alloc.c -index 320878d7817273269e8805acaa9f6f7a252443f1..af40b7e800e5e8b573a69608aae49c324f2a0253 100644 ---- a/src/LinearAlgebraServicesPKG/ksparse/alloc.c -+++ b/src/LinearAlgebraServicesPKG/ksparse/alloc.c -@@ -53,6 +53,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. - */ - - void bye_bye(i) -+ int i; - { - printf ("inv = %d\n",1/i); - } - diff --git a/cmake/tps.cmake b/cmake/tps.cmake index 3732758f6..b3f00bb7a 100644 --- a/cmake/tps.cmake diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py index 743bc870857b19..b0ea837eee94bd 100644 --- a/var/spack/repos/builtin/packages/xyce/package.py +++ b/var/spack/repos/builtin/packages/xyce/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -10,13 +10,18 @@ class Xyce(CMakePackage): """Xyce (rhymes with 'spice') is an open source, SPICE-compatible, - high-performance analog circuit simulator, capable of solving extremely - large circuit problems by supporting large-scale parallel computing - platforms. - Xyce also supports serial execution on all common desktop platforms, - and small-scale parallel runs on Unix-like systems. In addition to analog - electronic simulation, Xyce has also been used to investigate more general - network systems, such as neural networks and power grids. + high-performance analog circuit simulator, Xyce supports the standard + analysis capabilities found in other SPICE-like codes, such as DC, + transient, AC, and small-signal noise analyses; it also has less common + capabilities, such as harmonic balance, sensitivity analysis, and + uncertainty propagation techniques. Xyce supplies industry-standard compact + models and can support custom models via its Verilog-A model compiler. + Foundry process-development kits (PDKs) in other SPICE syntax can be used + via the XDM netlist translator, which is included as part of the Xyce + package. In addition to supporting use on all common desktop platforms + (Mac, Windows, Linux), Xyce can also be compiled to run in a large-scale + parallel mode to provide scalable, numerically accurate analog simulation + of circuits containing millions of devices, or more. """ homepage = "https://xyce.sandia.gov" @@ -24,19 +29,42 @@ class Xyce(CMakePackage): url = "https://github.com/Xyce/Xyce/archive/Release-7.2.0.tar.gz" maintainers("kuberry", "tbird2001") + license("GPL-3.0-or-later") + version("master", branch="master") + version("7.8.0", sha256="f763b7d5ad6defd25d2c7e5cc95155958cd12510a5e22a179daab459b21fa713") version("7.7.0", sha256="1b95450e1905c3af3c16b42c41d5ef1f8ab0e640f48086d0cb4d52961a90a175") - version("7.6.0", sha256="fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c") - version("7.5.0", sha256="854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd") - version("7.4.0", sha256="2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91") - version("7.3.0", sha256="43869a70967f573ff6f00451db3f4642684834bdad1fd3926380e3789016b446") - version("7.2.0", sha256="cf49705278ecda46373784bb24925cb97f9017b6adff49e4416de146bdd6a4b5") + version( + "7.6.0", + sha256="fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c", + deprecated=True, + ) + version( + "7.5.0", + sha256="854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd", + deprecated=True, + ) + version( + "7.4.0", + sha256="2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91", + deprecated=True, + ) + version( + "7.3.0", + sha256="43869a70967f573ff6f00451db3f4642684834bdad1fd3926380e3789016b446", + deprecated=True, + ) + version( + "7.2.0", + sha256="cf49705278ecda46373784bb24925cb97f9017b6adff49e4416de146bdd6a4b5", + deprecated=True, + ) - depends_on("cmake@3.13:", type="build") + depends_on("cmake@3.22:", type="build") depends_on("flex") depends_on("bison") - variant("mpi", default=True, description="Enable MPI support") + variant("mpi", default=False, description="Enable MPI support") depends_on("mpi", when="+mpi") variant("plugin", default=False, description="Enable plug-in support for Xyce") @@ -56,8 +84,8 @@ class Xyce(CMakePackage): variant("cxxstd", default="11", description="C++ standard", values=cxxstd_choices, multi=False) variant("pymi", default=False, description="Enable Python Model Interpreter for Xyce") - # Downstream dynamic library symbols from pip installed numpy and other - # pip installed python packages can cause conflicts. This is most often + # Downstream dynamic library symbols from pip-installed numpy and other + # pip-installed python packages can cause conflicts. This is most often # seen with blas symbols from numpy, and building blas static resolves # this issue. variant( @@ -74,16 +102,20 @@ class Xyce(CMakePackage): depends_on( "trilinos" - "+amesos+amesos2+anasazi+aztec+basker+belos+complex+epetra+epetraext" - "+explicit_template_instantiation+fortran+ifpack+kokkos+nox" - "+sacado+suite-sparse+trilinoscouplings+stokhos+epetraextbtf" - "+epetraextexperimental+epetraextgraphreorderings" + "+amesos+amesos2+aztec+basker+belos+complex+epetra+epetraext" + "+epetraextbtf+epetraextexperimental+epetraextgraphreorderings" + "+ifpack+nox+sacado+stokhos+suite-sparse+trilinoscouplings" ) depends_on("trilinos+isorropia+zoltan", when="+mpi") - # tested versions of Trilinos for everything up to 7.4.0 - depends_on("trilinos@12.12.1:13.4", when="@:7.5") - depends_on("trilinos@13.5.0:develop", when="@7.6.0:master") + # Currently supported versions of Xyce + depends_on("trilinos@15.0.0:develop", when="@7.8.0:") + depends_on("trilinos+rol", when="@7.7.0:") + + # tested versions of Trilinos against older versions of Xyce + depends_on("trilinos@13.5.0:14.4", when="@7.6.0:7.7.0") + depends_on("trilinos@12.12.1:13.4", when="@7.5") + depends_on("trilinos@12.12.1", when="@:7.4") depends_on("trilinos gotype=all cxxstd=11", when="^trilinos@:12.15") # pymi requires Kokkos/KokkosKernels >= 3.3, Trilinos 13.2 onward depends_on("trilinos@13.2.0:", when="+pymi") @@ -95,7 +127,7 @@ class Xyce(CMakePackage): # The default settings for various Trilinos variants would require the # installation of many more packages than are needed for Xyce. - depends_on("trilinos~float~ifpack2~ml~muelu~zoltan2") + depends_on("trilinos~anasazi~float~ifpack2~ml~muelu~zoltan2") # Issue #1712 forces explicitly enumerating blas packages to propagate variants with when("+pymi_static_tpls"): @@ -143,11 +175,23 @@ class Xyce(CMakePackage): when="@7.4:7.6 +pymi", ) - # fix oneapi issue + # fix missing type + patch( + "https://github.com/Xyce/Xyce/commit/47d9dd04ec55cd8722cb3704a88beb228dfcf363.patch?full_index=1", + sha256="62c3d0c17b3225be5f61b6ec3d9cf762cc08bb20a80e768d87a37e87c522bbf1", + when="@:7.7", + ) + + # Xyce CMake relies on Kokkos to report if OpenMP was used. However, the + # OpenMP requirement does not always propogate via the Spack packages, for + # various esoteric reasons. Therefore, when Xyce checks to see if it can + # compile against Trilinos, the check might erroneously fail. Since Spack + # should be handling everything properly, we simply disable the Trilinos + # compile test. See the Xyce internal issue 454 for more information. patch( - "454-oneapi-xyce.patch", - sha256="76a3ff987e43d1657f24d55cfd864b487876a72a9a7c8a37c3151a9b586a21c1", - when="%oneapi", + "454-cmake-xyce.patch", + sha256="4d47cd1f10607205e64910ac124c6dd329f1ecbf861416e9da24a1736f2149ff", + when="@7.6:", ) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index 333df8fda0a33b..2a8825758900d9 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -24,6 +24,8 @@ class Xz(MSBuildPackage, AutotoolsPackage, SourceforgePackage): executables = [r"^xz$"] + license("GPL-2.0-or-later AND Public-Domain AND LGPL-2.1-or-later", checked_by="tgamblin") + version("5.4.1", sha256="dd172acb53867a68012f94c17389401b2f274a1aa5ae8f84cbfb8b7e383ea8d3") version("5.2.10", sha256="01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408") version("5.2.7", sha256="b65f1d0c2708e57716f4dd2216989a73847ac6fdb4168ffceb155767e22b834b") diff --git a/var/spack/repos/builtin/packages/yade/package.py b/var/spack/repos/builtin/packages/yade/package.py index 95ee8f96e9b4fc..eabbcc4ccd4b1c 100644 --- a/var/spack/repos/builtin/packages/yade/package.py +++ b/var/spack/repos/builtin/packages/yade/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Yade(CMakePackage): maintainers("lmagdanello") + license("GPL-2.0-only") + version("2023.02a", sha256="f76b5a0aa7f202716efa94cd730e4bc442ffcb40a99caaf6e579ab8695efb0c1") version("2022.01a", sha256="3b76185b706aba6113d1e932c5b883cd772e8d8c6b4e5230a01f3370e2b6904c") version("2021.01a", sha256="3afab3380e8f5d185af7929213f63341445d6a5ee6bc21bbae102d8ffd93df1d") diff --git a/var/spack/repos/builtin/packages/yafyaml/package.py b/var/spack/repos/builtin/packages/yafyaml/package.py index 59eb22c2ab4913..5c216a80a0934a 100644 --- a/var/spack/repos/builtin/packages/yafyaml/package.py +++ b/var/spack/repos/builtin/packages/yafyaml/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -26,8 +26,11 @@ class Yafyaml(CMakePackage): maintainers("mathomp4", "tclune") + license("Apache-2.0") + version("main", branch="main") + version("1.2.0", sha256="912a4248bbf2e2e84cf3e36f2ae8483bee6b32d2eaa4406dd2100ad660c9bfc6") version("1.1.0", sha256="f0be81afe643adc2452055e5485f09cdb509a8fdd5a4ec5547b0c31dd22b4830") version("1.0.7", sha256="54f5c87e86c12e872e615fbc9540610ae38053f844f1e75d1e753724fea85c64") version("1.0.6", sha256="8075e1349d900985f5b5a81159561568720f21c5f011c43557c46f5bbedd0661") diff --git a/var/spack/repos/builtin/packages/yajl/package.py b/var/spack/repos/builtin/packages/yajl/package.py index 3aa9b7a835375a..686714cadbd358 100644 --- a/var/spack/repos/builtin/packages/yajl/package.py +++ b/var/spack/repos/builtin/packages/yajl/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,5 +13,7 @@ class Yajl(CMakePackage): url = "https://github.com/lloyd/yajl/archive/2.1.0.zip" git = "https://github.com/lloyd/yajl.git" + license("MIT") + version("develop", branch="master") version("2.1.0", sha256="7458c4ed10ebe52c54f57e741bbfde69c73495e76e0f6a45d6d1986cf24794bc") diff --git a/var/spack/repos/builtin/packages/yaksa/package.py b/var/spack/repos/builtin/packages/yaksa/package.py index 5d94f42740a41d..e24ee70d050be5 100644 --- a/var/spack/repos/builtin/packages/yaksa/package.py +++ b/var/spack/repos/builtin/packages/yaksa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index cf76f28f0627d2..d554b0bbbc9719 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -20,6 +20,8 @@ class Yambo(AutotoolsPackage): homepage = "http://www.yambo-code.org/index.php" url = "https://github.com/yambo-code/yambo/archive/4.2.2.tar.gz" + license("GPL-2.0-or-later") + version("5.1.1", sha256="c85036ca60507e627c47b6c6aee8241830349e88110e1ce9132ef03ab2c4e9f6") version("4.2.2", sha256="86b4ebe679387233266aba49948246c85a32b1e6840d024f162962bd0112448c") version("4.2.1", sha256="8ccd0ca75cc32d9266d4a37edd2a7396cf5038f3a68be07c0f0f77d1afc72bdc") diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index d63dd81db74b04..5954481cff980c 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -18,6 +18,8 @@ class YamlCpp(CMakePackage): git = "https://github.com/jbeder/yaml-cpp.git" maintainers("eschnett") + license("MIT") + version("develop", branch="master") version("0.7.0", sha256="43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3") version("0.6.3", sha256="77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed") diff --git a/var/spack/repos/builtin/packages/yara/package.py b/var/spack/repos/builtin/packages/yara/package.py index 41fca2af2d8c4f..e80978bd1c83db 100644 --- a/var/spack/repos/builtin/packages/yara/package.py +++ b/var/spack/repos/builtin/packages/yara/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Yara(AutotoolsPackage): homepage = "https://virustotal.github.io/yara/" url = "https://github.com/VirusTotal/yara/archive/v3.9.0.tar.gz" + license("BSD-3-Clause") + version("3.9.0", sha256="ebe7fab0abadb90449a62afbd24e196e18b177efe71ffd8bf22df95c5386f64d") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/yarn/package.py b/var/spack/repos/builtin/packages/yarn/package.py index fa258424f87458..c63d3303e6325c 100644 --- a/var/spack/repos/builtin/packages/yarn/package.py +++ b/var/spack/repos/builtin/packages/yarn/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Yarn(Package): depends_on("node-js@4.0:", type="run") + license("BSD-2-Clause") + version("1.22.4", sha256="bc5316aa110b2f564a71a3d6e235be55b98714660870c5b6b2d2d3f12587fb58") version("1.22.2", sha256="de4cff575ae7151f8189bf1d747f026695d768d0563e2860df407ab79c70693d") version("1.22.1", sha256="3af905904932078faa8f485d97c928416b30a86dd09dcd76e746a55c7f533b72") diff --git a/var/spack/repos/builtin/packages/yasm/package.py b/var/spack/repos/builtin/packages/yasm/package.py index 97b48df0947057..4c2f9ae8b690a4 100644 --- a/var/spack/repos/builtin/packages/yasm/package.py +++ b/var/spack/repos/builtin/packages/yasm/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Yasm(AutotoolsPackage): url = "https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" git = "https://github.com/yasm/yasm.git" + license("BSD-2-Clause") + version("develop", branch="master") version("1.3.0", sha256="3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f") diff --git a/var/spack/repos/builtin/packages/ycruncher/package.py b/var/spack/repos/builtin/packages/ycruncher/package.py index 8519fadeffe023..a98f9599d1371c 100644 --- a/var/spack/repos/builtin/packages/ycruncher/package.py +++ b/var/spack/repos/builtin/packages/ycruncher/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/ycsb/package.py b/var/spack/repos/builtin/packages/ycsb/package.py index 5d97a5cf836b82..d0867aa8042eac 100644 --- a/var/spack/repos/builtin/packages/ycsb/package.py +++ b/var/spack/repos/builtin/packages/ycsb/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Ycsb(MavenPackage): url = "https://github.com/brianfrankcooper/YCSB/archive/0.17.0.tar.gz" git = "https://github.com/brianfrankcooper/YCSB.git" + license("Apache-2.0") + version("master", branch="master") version("0.17.0", sha256="5dd1a3d4dd7ac336eadccc83b097c811e142cfe1b23fc278f247054a1892c0e0") version("0.16.0", sha256="4296fd5e90d7d6d7dfcbad90039ddf16e785706a07f99c1c8a06e6ee06440f71") diff --git a/var/spack/repos/builtin/packages/yoda/package.py b/var/spack/repos/builtin/packages/yoda/package.py index 4cf2854566a616..1360dd130615b1 100644 --- a/var/spack/repos/builtin/packages/yoda/package.py +++ b/var/spack/repos/builtin/packages/yoda/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Yoda(AutotoolsPackage): tags = ["hep"] + license("GPL-3.0-or-later") + version("1.9.8", sha256="7bc3062468abba50aff3ecb8b22ce677196036009890688ef4533aaa7f92e6e4") version("1.9.7", sha256="8d07bb04dcb79364858718a18203452d8d9fa00029fa94239eafa8529032b8ff") version("1.9.6", sha256="21523fa2f6b6c8f3348959f3a948734a930ca25951d3c9190b4424e13735f2a4") diff --git a/var/spack/repos/builtin/packages/yorick/package.py b/var/spack/repos/builtin/packages/yorick/package.py index 91765f18564c17..fa3ef816f07b89 100644 --- a/var/spack/repos/builtin/packages/yorick/package.py +++ b/var/spack/repos/builtin/packages/yorick/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/yosys/package.py b/var/spack/repos/builtin/packages/yosys/package.py new file mode 100644 index 00000000000000..8b05f23627a6b1 --- /dev/null +++ b/var/spack/repos/builtin/packages/yosys/package.py @@ -0,0 +1,85 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Yosys(MakefilePackage): + """Yosys is a framework for RTL synthesis tools. It currently has extensive + Verilog-2005 support and provides a basic set of synthesis algorithms for + various application domains. + + Yosys can be adapted to perform any synthesis job by combining the existing + passes (algorithms) using synthesis scripts and adding additional passes + as needed by extending the yosys C++ code base. + + Yosys is free software licensed under the ISC license (a GPL compatible + license that is similar in terms to the MIT license or the 2-clause BSD license). + """ + + homepage = "https://yosyshq.net/yosys" + url = "https://github.com/YosysHQ/yosys/archive/refs/tags/yosys-0.37.tar.gz" + git = "https://github.com/YosysHQ/yosys.git" + + maintainers("davekeeshan") + + license("ISC") + + version("master", branch="master") + + version("0.37", sha256="98e91253b116728e5db037512a4d837529d408269358f06fe7b4633c89cf8756") + version("0.36", sha256="d69beedcb76db80681c2a0f445046311f3ba16716d5d0c3c5034dabcb6bd9b23") + version("0.35", sha256="a00643cf4cf83701bfa2b358066eb9d360393d30e8f5a8e65f619ab1fd10474a") + version("0.34", sha256="57897bc3fe5fdc940e9f3f3ae03b84f5f8e9149b6f26d3699f7ecb9f31a41ae0") + version("0.33", sha256="c240fa4fcc71c73b8989ab500f7bfa3109436fa1d7ba8d7e1028af4c42688f29") + version("0.32", sha256="07b168491fa103a57231483a80f8e03545d0c957672e96b73d4eb9c8c8c43930") + version("0.31", sha256="aadbd885b72a6c705035abcf7e2eb58d25689b18824ad91c71efd1d966f0bf50") + version("0.30", sha256="1b29c9ed3d396046b67c48f0900a5f2156c6136f2e0651671d05ee26369f147d") + version("0.29", sha256="475ba8cd06eec9050ebfd63a01e7a7c894d8f06c838b35459b7e29bbc89f4a22") + version("0.28", sha256="36048ef3493ab43cfaac0bb89fa405715b22acd3927bf7fd3c4b25f8ad541c22") + version("0.27", sha256="bd6c933daf48c0929b4a9b3f75713d1f79c173be4bdb82fc5d2f5feb97f3668b") + version("0.26", sha256="e869e3770797f7edf352fd3033d5bba8606d40d6b32bae5051d917d120b9a177") + version("0.25", sha256="673e87eecb68fd5e889ac94b93dc9ae070f1a27d94dacbd738212cf09f39578c") + version("0.24", sha256="6a00b60e2d6bc8df0db1e66aa27af42a0694121cfcd6a3cf6f39c9329ed91263") + version("0.23", sha256="ec982a9393b3217deecfbd3cf9a64109b85310a949e46a51cf2e07fba1071aeb") + version("0.22", sha256="2a0c29b6f66b3ee70316dd734eceb14f452445a83ccac600b97100ffd7c7a7aa") + version("0.21", sha256="2b0e140f47d682e1069b1ca53b1fd91cbb1c1546932bd5cb95566f59a673cd8d") + version("0.20", sha256="ee261487badf1b554616d555da8496a7c84ef21ae66a979ddd946b6949a780a4") + + variant("abc", default=True, description="build with abc support") + variant("ccache", default=False, description="build with ccache support") + + depends_on("automake", type="build") + depends_on("flex") + depends_on("bison") + depends_on("libffi") + depends_on("readline") + depends_on("pkg-config") + depends_on("tcl") + depends_on("zlib") + depends_on("llvm") + depends_on("ccache", type=("build", "run"), when="+ccache") + + def edit(self, spec, prefix): + makefile = FileFilter("Makefile") + + makefile.filter(r"ENABLE_ABC :=", "ENABLE_ABC ?=") + makefile.filter(r"ENABLE_CCACHE :=", "ENABLE_CCACHE ?=") + + def setup_build_environment(self, env): + env.set("PREFIX", self.prefix) + env.set("CXXFLAGS", f'-I{self.spec["readline"].prefix.include}') + env.set( + "LDFLAGS", f'-L{self.spec["readline"].prefix.lib} -L{self.spec["zlib"].prefix.lib}' + ) + if self.spec.satisfies("+abc"): + env.set("ENABLE_ABC", "1") + env.set("ABC_READLINE_INCLUDES", f'-I{self.spec["readline"].prefix.include}') + else: + env.set("ENABLE_ABC", "0") + if self.spec.satisfies("+ccache"): + env.set("ENABLE_CCACHE", "1") + else: + env.set("ENABLE_CCACHE", "0") diff --git a/var/spack/repos/builtin/packages/z-checker/package.py b/var/spack/repos/builtin/packages/z-checker/package.py index b16665035753dc..fde46b05137a8c 100644 --- a/var/spack/repos/builtin/packages/z-checker/package.py +++ b/var/spack/repos/builtin/packages/z-checker/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class ZChecker(AutotoolsPackage): maintainers("disheng222") + license("BSD-3-Clause") + version("0.9.0", sha256="44436ad5971a24dd26a09d8262bc1fcd8c9fd0b746aff009a91ccbe57330baa1") version("0.7.0", sha256="02caf3af2dc59d116496f877da888dd2c2dffb9375c413b1d74401927963df3f") version("0.6.0", sha256="b01c2c78157234a734c2f4c10a7ab82c329d3cd1a8389d597e09386fa33a3117") diff --git a/var/spack/repos/builtin/packages/z3/package.py b/var/spack/repos/builtin/packages/z3/package.py index 7d0a2524ce5dd7..e386e050c848ce 100644 --- a/var/spack/repos/builtin/packages/z3/package.py +++ b/var/spack/repos/builtin/packages/z3/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,11 @@ class Z3(CMakePackage): homepage = "https://github.com/Z3Prover/z3/wiki" url = "https://github.com/Z3Prover/z3/archive/z3-4.5.0.tar.gz" + maintainers("vmiheer") + + license("MIT") + + version("4.12.4", sha256="25e9b18d04ee22f1d872dfe0daaf4c39034744525214e34fedd206e25140e96e") version("4.11.2", sha256="e3a82431b95412408a9c994466fad7252135c8ed3f719c986cd75c8c5f234c7e") version("4.8.16", sha256="75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6") version("4.8.15", sha256="2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac") diff --git a/var/spack/repos/builtin/packages/zabbix/package.py b/var/spack/repos/builtin/packages/zabbix/package.py index abf33a081d5b25..0d3b389b73360b 100644 --- a/var/spack/repos/builtin/packages/zabbix/package.py +++ b/var/spack/repos/builtin/packages/zabbix/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Zabbix(AutotoolsPackage): homepage = "https://www.zabbix.com" url = "https://github.com/zabbix/zabbix/archive/5.0.3.tar.gz" + license("GPL-2.0-or-later") + version("5.0.3", sha256="d579c5fa4e9065e8041396ace24d7132521ef5054ce30dfd9d151cbb7f0694ec") version("4.0.24", sha256="c7e4962d745277d67797d90e124555ce27d198822a7e65c55d86aee45d3e93fc") version("4.0.23", sha256="652143614f52411cad47db64e93bf3ba1cd547d6ca9591296223b5f0528b3b61") diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py index 6eb092ea530c46..805c4dcafd3e82 100644 --- a/var/spack/repos/builtin/packages/zfp/package.py +++ b/var/spack/repos/builtin/packages/zfp/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Zfp(CMakePackage, CudaPackage): maintainers("lindstro", "GarrettDMorrison") tags = ["radiuss", "e4s"] + license("BSD-3-Clause") + # Versions version("develop", branch="develop") version("1.0.0", sha256="0ea08ae3e50e3c92f8b8cf41ba5b6e2de8892bc4a4ca0c59b8945b6c2ab617c4") diff --git a/var/spack/repos/builtin/packages/zfs/package.py b/var/spack/repos/builtin/packages/zfs/package.py index a8fa8bc9179bd9..fb31c68811b315 100644 --- a/var/spack/repos/builtin/packages/zfs/package.py +++ b/var/spack/repos/builtin/packages/zfs/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zfs(AutotoolsPackage): homepage = "https://zfsonlinux.org/" url = "https://github.com/openzfs/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz" + license("CDDL-1.0") + version("0.8.3", sha256="545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd") version("0.8.2", sha256="47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8") version("0.8.1", sha256="0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799") diff --git a/var/spack/repos/builtin/packages/zig/package.py b/var/spack/repos/builtin/packages/zig/package.py index 785d8284210ecc..cfeda3ac65c28b 100644 --- a/var/spack/repos/builtin/packages/zig/package.py +++ b/var/spack/repos/builtin/packages/zig/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zig(CMakePackage): maintainers("alalazo") + license("MIT") + version("0.11.0", tag="0.11.0", commit="67709b638224ac03820226c6744d8b6ead59184c") version("0.10.1", tag="0.10.1", commit="b57081f039bd3f8f82210e8896e336e3c3a6869b") version( diff --git a/var/spack/repos/builtin/packages/zip/package.py b/var/spack/repos/builtin/packages/zip/package.py index b03caae54975be..354f6d624d7365 100644 --- a/var/spack/repos/builtin/packages/zip/package.py +++ b/var/spack/repos/builtin/packages/zip/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class Zip(MakefilePackage): homepage = "https://www.info-zip.org/Zip.html" url = "https://downloads.sourceforge.net/infozip/zip30.tar.gz" + license("Info-ZIP") + version("3.0", sha256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369") depends_on("bzip2") diff --git a/var/spack/repos/builtin/packages/zipkin/package.py b/var/spack/repos/builtin/packages/zipkin/package.py index 6499f45f73d301..2aaec4628a1134 100644 --- a/var/spack/repos/builtin/packages/zipkin/package.py +++ b/var/spack/repos/builtin/packages/zipkin/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,8 @@ class Zipkin(MavenPackage): homepage = "https://zipkin.io/" url = "https://github.com/openzipkin/zipkin/archive/2.21.5.tar.gz" + license("Apache-2.0") + version("2.21.5", sha256="e643a810f82f9ea50e2cb6847694c7645507d3deae77685a3a1bb841e0f885a2") version("2.21.4", sha256="ee7b0110b3852479c925b6429ff278aa38b1d5da27f4762891b1f863e67bdad5") version("2.21.3", sha256="02526e2ba4de85938b510cb2db01865ec46cdad53157862c39fa5e9b6cbd15b6") diff --git a/var/spack/repos/builtin/packages/zlib-ng/package.py b/var/spack/repos/builtin/packages/zlib-ng/package.py index 8444736856a3c2..0215d336628178 100644 --- a/var/spack/repos/builtin/packages/zlib-ng/package.py +++ b/var/spack/repos/builtin/packages/zlib-ng/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -16,6 +16,9 @@ class ZlibNg(AutotoolsPackage, CMakePackage): maintainers("haampie") + license("Zlib") + + version("2.1.5", sha256="3f6576971397b379d4205ae5451ff5a68edf6c103b2f03c4188ed7075fbb5f04") version("2.1.4", sha256="a0293475e6a44a3f6c045229fe50f69dc0eebc62a42405a51f19d46a5541e77a") version( "2.1.3", diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 144e3b0ec610bf..d17db27bef5216 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/builtin/packages/zoltan/package.py b/var/spack/repos/builtin/packages/zoltan/package.py index 87f8b6bd7be9e4..63427a6a9000c5 100644 --- a/var/spack/repos/builtin/packages/zoltan/package.py +++ b/var/spack/repos/builtin/packages/zoltan/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -23,6 +23,8 @@ class Zoltan(AutotoolsPackage): homepage = "https://sandialabs.github.io/Zoltan/" url = "https://github.com/sandialabs/Zoltan/archive/v3.83.tar.gz" + license("Unlicense") + version("3.901", sha256="030c22d9f7532d3076e40cba1f03a63b2ee961d8cc9a35149af4a3684922a910") version("3.83", sha256="17320a9f08e47f30f6f3846a74d15bfea6f3c1b937ca93c0ab759ca02c40e56c") diff --git a/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py b/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py index 7a89e405cd3243..e2f53e7437f50f 100644 --- a/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py +++ b/var/spack/repos/builtin/packages/zookeeper-benchmark/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -14,6 +14,8 @@ class ZookeeperBenchmark(MavenPackage): homepage = "https://zookeeper.apache.org" git = "https://github.com/brownsys/zookeeper-benchmark.git" + license("BSD-3-Clause") + version("master", branch="master") depends_on("zookeeper", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/zookeeper/package.py b/var/spack/repos/builtin/packages/zookeeper/package.py index 9d1b14f15181b0..edac1784e72827 100644 --- a/var/spack/repos/builtin/packages/zookeeper/package.py +++ b/var/spack/repos/builtin/packages/zookeeper/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zookeeper(Package): homepage = "https://archive.apache.org" url = "https://archive.apache.org/dist/zookeeper/zookeeper-3.4.11/zookeeper-3.4.11.tar.gz" + license("Apache-2.0") + version("3.4.11", sha256="f6bd68a1c8f7c13ea4c2c99f13082d0d71ac464ffaf3bf7a365879ab6ad10e84") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/zopfli/package.py b/var/spack/repos/builtin/packages/zopfli/package.py index f2d6d895ecce82..b1ec085cfb6230 100644 --- a/var/spack/repos/builtin/packages/zopfli/package.py +++ b/var/spack/repos/builtin/packages/zopfli/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zopfli(CMakePackage): variant("shared", default=False, description="Build shared libraries") + license("Apache-2.0") + version("1.0.3", sha256="e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd") def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/zpares/package.py b/var/spack/repos/builtin/packages/zpares/package.py index ba319b0dd80151..c0a0956beec681 100644 --- a/var/spack/repos/builtin/packages/zpares/package.py +++ b/var/spack/repos/builtin/packages/zpares/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -13,6 +13,8 @@ class Zpares(MakefilePackage): homepage = "https://zpares.cs.tsukuba.ac.jp/" url = "http://zpares.cs.tsukuba.ac.jp/download/zpares_0.9.6a.tar.gz" + license("BSD-3-Clause") + version("0.9.6a", sha256="3c34257d249451b0b984abc985e296ebb73ae5331025f1b8ea08d50301c7cf9a") variant("mpi", default=False, description="Activates MPI support") diff --git a/var/spack/repos/builtin/packages/zsh/package.py b/var/spack/repos/builtin/packages/zsh/package.py index 1f497fa19667d1..11ca3f8cce1430 100644 --- a/var/spack/repos/builtin/packages/zsh/package.py +++ b/var/spack/repos/builtin/packages/zsh/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zsh(AutotoolsPackage): homepage = "https://www.zsh.org" url = "http://downloads.sourceforge.net/project/zsh/zsh/5.4.2/zsh-5.4.2.tar.xz" + license("custom") + version("5.8", sha256="dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27") version("5.7.1", sha256="7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8") version("5.6.2", sha256="a50bd66c0557e8eca3b8fa24e85d0de533e775d7a22df042da90488623752e9e") diff --git a/var/spack/repos/builtin/packages/zstd/package.py b/var/spack/repos/builtin/packages/zstd/package.py index d0612985e94268..84b4bc24399321 100644 --- a/var/spack/repos/builtin/packages/zstd/package.py +++ b/var/spack/repos/builtin/packages/zstd/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -21,6 +21,8 @@ class Zstd(CMakePackage, MakefilePackage): maintainers("haampie") + license("BSD-3-Clause OR GPL-2.0-or-later") + version("develop", branch="dev") version("1.5.5", sha256="98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1") version("1.5.4", sha256="35ad983197f8f8eb0c963877bf8be50490a0b3df54b4edeb8399ba8a8b2f60a4") diff --git a/var/spack/repos/builtin/packages/zstr/package.py b/var/spack/repos/builtin/packages/zstr/package.py index 6750d7bbb568eb..26131cecf4764d 100644 --- a/var/spack/repos/builtin/packages/zstr/package.py +++ b/var/spack/repos/builtin/packages/zstr/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) @@ -15,6 +15,8 @@ class Zstr(Package): maintainers("bvanessen") + license("MIT") + version("1.0.7", sha256="8d2ddae68ff7bd0a6fce6150a8f52ad9ce1bed2c4056c8846f4dec4f2dc60819") version("1.0.4", sha256="a594a3a9c192a6d9e93f9585910d41f7ee6791eb7c454d40c922656324b3058e") version("1.0.3", sha256="d42f1b08e4c3a26e3b42433691d32765015cf89f089ae075b1acb819ccba585f") diff --git a/var/spack/repos/builtin/packages/zziplib/package.py b/var/spack/repos/builtin/packages/zziplib/package.py index 08a00cdb2d280e..13fc3fee33fef0 100644 --- a/var/spack/repos/builtin/packages/zziplib/package.py +++ b/var/spack/repos/builtin/packages/zziplib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/compiler_runtime.test/packages/a/package.py b/var/spack/repos/compiler_runtime.test/packages/a/package.py new file mode 100644 index 00000000000000..01cb6fe3ccc9ae --- /dev/null +++ b/var/spack/repos/compiler_runtime.test/packages/a/package.py @@ -0,0 +1,13 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + +class A(Package): + homepage = "http://www.example.com" + has_code = False + + version("1.0") + depends_on("b") diff --git a/var/spack/repos/compiler_runtime.test/packages/b/package.py b/var/spack/repos/compiler_runtime.test/packages/b/package.py new file mode 100644 index 00000000000000..e840a363a5c476 --- /dev/null +++ b/var/spack/repos/compiler_runtime.test/packages/b/package.py @@ -0,0 +1,12 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack.package import * + + +class B(Package): + homepage = "http://www.example.com" + has_code = False + + version("1.0") diff --git a/var/spack/repos/compiler_runtime.test/packages/gcc-runtime/package.py b/var/spack/repos/compiler_runtime.test/packages/gcc-runtime/package.py new file mode 100644 index 00000000000000..a522afce8357fb --- /dev/null +++ b/var/spack/repos/compiler_runtime.test/packages/gcc-runtime/package.py @@ -0,0 +1,13 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class GccRuntime(Package): + homepage = "https://example.com" + has_code = False + tags = ["runtime"] + requires("%gcc") diff --git a/var/spack/repos/compiler_runtime.test/packages/gcc/package.py b/var/spack/repos/compiler_runtime.test/packages/gcc/package.py new file mode 100644 index 00000000000000..c70ff4faff2698 --- /dev/null +++ b/var/spack/repos/compiler_runtime.test/packages/gcc/package.py @@ -0,0 +1,32 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class Gcc(Package): + homepage = "http://www.example.com/" + has_code = False + + version("13.2.0") + version("12.3.0") + + @classmethod + def runtime_constraints(cls, *, compiler, pkg): + pkg("*").depends_on( + "gcc-runtime", + when="%gcc", + type="link", + description="If any package uses %gcc, it depends on gcc-runtime", + ) + pkg("*").depends_on( + f"gcc-runtime@{str(compiler.version)}:", + when=f"%{str(compiler.spec)}", + type="link", + description=f"If any package uses %{str(compiler.spec)}, " + f"it depends on gcc-runtime@{str(compiler.version)}:", + ) + # The version of gcc-runtime is the same as the %gcc used to "compile" it + pkg("gcc-runtime").requires(f"@={str(compiler.version)}", when=f"%{str(compiler.spec)}") diff --git a/var/spack/repos/compiler_runtime.test/repo.yaml b/var/spack/repos/compiler_runtime.test/repo.yaml new file mode 100644 index 00000000000000..1be826a641f3b0 --- /dev/null +++ b/var/spack/repos/compiler_runtime.test/repo.yaml @@ -0,0 +1,2 @@ +repo: + namespace: compiler_runtime.test diff --git a/var/spack/repos/duplicates.test/packages/cycle-a/package.py b/var/spack/repos/duplicates.test/packages/cycle-a/package.py index 207f5aac447937..b9f3b7fd99beb5 100644 --- a/var/spack/repos/duplicates.test/packages/cycle-a/package.py +++ b/var/spack/repos/duplicates.test/packages/cycle-a/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/cycle-b/package.py b/var/spack/repos/duplicates.test/packages/cycle-b/package.py index ef190a5649139f..977bb0c86355e6 100644 --- a/var/spack/repos/duplicates.test/packages/cycle-b/package.py +++ b/var/spack/repos/duplicates.test/packages/cycle-b/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/gmake/package.py b/var/spack/repos/duplicates.test/packages/gmake/package.py index 64eed7ef67f66e..95f6b012265adb 100644 --- a/var/spack/repos/duplicates.test/packages/gmake/package.py +++ b/var/spack/repos/duplicates.test/packages/gmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/hdf5/package.py b/var/spack/repos/duplicates.test/packages/hdf5/package.py index 98082cbbf95439..e959d7b0b075f2 100644 --- a/var/spack/repos/duplicates.test/packages/hdf5/package.py +++ b/var/spack/repos/duplicates.test/packages/hdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/pinned-gmake/package.py b/var/spack/repos/duplicates.test/packages/pinned-gmake/package.py index 71e90b1a824c65..3df400b0c80056 100644 --- a/var/spack/repos/duplicates.test/packages/pinned-gmake/package.py +++ b/var/spack/repos/duplicates.test/packages/pinned-gmake/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/pkg-config/package.py b/var/spack/repos/duplicates.test/packages/pkg-config/package.py index eb7b84b88fc87c..6f2c674d995f04 100644 --- a/var/spack/repos/duplicates.test/packages/pkg-config/package.py +++ b/var/spack/repos/duplicates.test/packages/pkg-config/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/py-floating/package.py b/var/spack/repos/duplicates.test/packages/py-floating/package.py index 2921b617bd76ad..96256ca96e3757 100644 --- a/var/spack/repos/duplicates.test/packages/py-floating/package.py +++ b/var/spack/repos/duplicates.test/packages/py-floating/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/py-numpy/package.py b/var/spack/repos/duplicates.test/packages/py-numpy/package.py index 2af50e4910b48c..42cb2aecc72cf6 100644 --- a/var/spack/repos/duplicates.test/packages/py-numpy/package.py +++ b/var/spack/repos/duplicates.test/packages/py-numpy/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/py-setuptools/package.py b/var/spack/repos/duplicates.test/packages/py-setuptools/package.py index eaf78506975817..975bfaee842db2 100644 --- a/var/spack/repos/duplicates.test/packages/py-setuptools/package.py +++ b/var/spack/repos/duplicates.test/packages/py-setuptools/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/py-shapely/package.py b/var/spack/repos/duplicates.test/packages/py-shapely/package.py index b471bbda5ea7b4..091f8c9938ee52 100644 --- a/var/spack/repos/duplicates.test/packages/py-shapely/package.py +++ b/var/spack/repos/duplicates.test/packages/py-shapely/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/python/package.py b/var/spack/repos/duplicates.test/packages/python/package.py index 0c4db4781e9179..9567bbf0aad658 100644 --- a/var/spack/repos/duplicates.test/packages/python/package.py +++ b/var/spack/repos/duplicates.test/packages/python/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/duplicates.test/packages/virtual-build/package.py b/var/spack/repos/duplicates.test/packages/virtual-build/package.py index 17fc60955d9b4f..6810728b393fb3 100644 --- a/var/spack/repos/duplicates.test/packages/virtual-build/package.py +++ b/var/spack/repos/duplicates.test/packages/virtual-build/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/edges.test/packages/blas-only-client/package.py b/var/spack/repos/edges.test/packages/blas-only-client/package.py index 9e9652a752f44a..890d90262b369a 100644 --- a/var/spack/repos/edges.test/packages/blas-only-client/package.py +++ b/var/spack/repos/edges.test/packages/blas-only-client/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/edges.test/packages/conditional-edge/package.py b/var/spack/repos/edges.test/packages/conditional-edge/package.py index 964596fcc14a7e..977de05ce650a1 100644 --- a/var/spack/repos/edges.test/packages/conditional-edge/package.py +++ b/var/spack/repos/edges.test/packages/conditional-edge/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/edges.test/packages/openblas/package.py b/var/spack/repos/edges.test/packages/openblas/package.py index d162e069b0bae0..82a7b04ed61bda 100644 --- a/var/spack/repos/edges.test/packages/openblas/package.py +++ b/var/spack/repos/edges.test/packages/openblas/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/edges.test/packages/zlib/package.py b/var/spack/repos/edges.test/packages/zlib/package.py index 66dfc4f58bb94b..4f7faffa5a8eb0 100644 --- a/var/spack/repos/edges.test/packages/zlib/package.py +++ b/var/spack/repos/edges.test/packages/zlib/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/tutorial/packages/armadillo/package.py b/var/spack/repos/tutorial/packages/armadillo/package.py index a4885bcfdcd51e..475b6c63add57e 100644 --- a/var/spack/repos/tutorial/packages/armadillo/package.py +++ b/var/spack/repos/tutorial/packages/armadillo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/tutorial/packages/elpa/package.py b/var/spack/repos/tutorial/packages/elpa/package.py index fcfc6b0251f9eb..c6b08cfb2fe372 100644 --- a/var/spack/repos/tutorial/packages/elpa/package.py +++ b/var/spack/repos/tutorial/packages/elpa/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py index 94335d4ae40c52..35fb3c7c279bd3 100644 --- a/var/spack/repos/tutorial/packages/hdf5/package.py +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/tutorial/packages/mpich/package.py b/var/spack/repos/tutorial/packages/mpich/package.py index 26c1cd3ee2c388..06138bee9462cd 100644 --- a/var/spack/repos/tutorial/packages/mpich/package.py +++ b/var/spack/repos/tutorial/packages/mpich/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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) diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py index 96925d3117358a..1b9ec9a56083aa 100644 --- a/var/spack/repos/tutorial/packages/netlib-lapack/package.py +++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# 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)